Merge pull request #55 from kirill-markin/codex/chat-panel-composer-refactor

Refactor chat panel composer ownership

Author: kirill-markin

apps/web/src/chat/ChatPanel.new-chat.test.tsx

@@ -32,7 +32,6 @@ const {
   setLocalePreference,
   unmountChatPanel,
   clickNewConversation,
-  clickAddAttachment,
   sendMessage,
 } = setupChatPanelTest();
 
@@ -108,14 +107,12 @@ describe("ChatPanel new chat", () => {
     expect(textarea).not.toBeNull();
 
     await setTextareaValue(textarea as HTMLTextAreaElement, "pending draft");
-    await clickAddAttachment();
     await flushAsync();
 
     const draftsBeforeNew = loadChatDraftWorkspaceState("workspace-1");
     const draftSessionIdsBeforeNew = Object.keys(draftsBeforeNew);
     expect(draftSessionIdsBeforeNew).toHaveLength(0);
     expect(textarea?.value).toBe("pending draft");
-    expect(getContainer().textContent).toContain("attached.txt");
 
     await clickNewConversation();
     await flushAsync();
@@ -126,7 +123,6 @@ describe("ChatPanel new chat", () => {
     expect(Object.keys(draftsAfterNew)).toHaveLength(0);
     expect(createNewChatSessionMock.mock.calls[1]?.[0]).toMatch(UUID_PATTERN);
     expect(textarea?.value).toBe("");
-    expect(getContainer().textContent).not.toContain("attached.txt");
   });
 
   it("clears a stale pending post-run sync flag when starting a new conversation", async () => {
@@ -397,6 +393,7 @@ describe("ChatPanel new chat", () => {
 
     expect(createNewChatSessionMock).toHaveBeenCalledWith(
       expect.any(String),
+      "workspace-1",
       "es-MX",
     );
   });
@@ -432,7 +429,7 @@ describe("ChatPanel new chat", () => {
         messages: [],
       },
     }));
-    createNewChatSessionMock.mockImplementation((sessionId: string, uiLocale: string) => {
+    createNewChatSessionMock.mockImplementation((sessionId: string, _workspaceId: string, uiLocale: string) => {
       if (uiLocale === "en") {
         return Promise.resolve({
           ok: true,
@@ -461,7 +458,7 @@ describe("ChatPanel new chat", () => {
 
     expect(createNewChatSessionMock).toHaveBeenCalledTimes(2);
     expect(createNewChatSessionMock.mock.calls[0]?.[0]).toBe(createNewChatSessionMock.mock.calls[1]?.[0]);
-    expect(createNewChatSessionMock.mock.calls[1]?.[1]).toBe("es-MX");
+    expect(createNewChatSessionMock.mock.calls[1]?.[2]).toBe("es-MX");
     expect(getContainer().textContent).not.toContain("Study with spaced repetition");
     expect(secondRequestResolved).toBe(false);
 
@@ -496,7 +493,7 @@ describe("ChatPanel new chat", () => {
         messages: [],
       },
     }));
-    createNewChatSessionMock.mockImplementation((sessionId: string, uiLocale: string) => {
+    createNewChatSessionMock.mockImplementation((sessionId: string, _workspaceId: string, uiLocale: string) => {
       if (uiLocale === "en") {
         return Promise.resolve({
           ok: true,
@@ -551,7 +548,7 @@ describe("ChatPanel new chat", () => {
       chatConfig: ReturnType<typeof createChatSnapshot>["chatConfig"];
     }) => void) | null = null;
 
-    createNewChatSessionMock.mockImplementation((sessionId: string, uiLocale: string) => {
+    createNewChatSessionMock.mockImplementation((sessionId: string, _workspaceId: string, uiLocale: string) => {
       if (uiLocale === "en") {
         if (createNewChatSessionMock.mock.calls.length === 1) {
           return Promise.resolve({
@@ -586,7 +583,7 @@ describe("ChatPanel new chat", () => {
     expect(createNewChatSessionMock).toHaveBeenCalledTimes(3);
     expect(createNewChatSessionMock.mock.calls[1]?.[0]).toBe(freshSessionId);
     expect(createNewChatSessionMock.mock.calls[2]?.[0]).toBe(freshSessionId);
-    expect(createNewChatSessionMock.mock.calls[2]?.[1]).toBe("es-MX");
+    expect(createNewChatSessionMock.mock.calls[2]?.[2]).toBe("es-MX");
 
     resolveSpanishRequest?.({
       ok: true,

apps/web/src/chat/ChatPanel.post-run-sync.test.tsx

@@ -239,12 +239,12 @@ describe("ChatPanel post-run sync", () => {
       runSync: runSyncMock,
       setErrorMessage: vi.fn(),
     }));
-    consumeChatLiveStreamMock.mockImplementation(async ({ onEvent }) => {
+    consumeChatLiveStreamMock.mockImplementation(async ({ onEvent, runId, sessionId }) => {
       onEvent({
         type: "assistant_tool_call",
-        sessionId: "session-1",
-        conversationScopeId: "session-1",
-        runId: "run-1",
+        sessionId,
+        conversationScopeId: sessionId,
+        runId,
         sequenceNumber: 1,
         streamEpoch: "epoch-1",
         cursor: "cursor-1",
@@ -259,9 +259,9 @@ describe("ChatPanel post-run sync", () => {
       });
       onEvent({
         type: "run_terminal",
-        sessionId: "session-1",
-        conversationScopeId: "session-1",
-        runId: "run-1",
+        sessionId,
+        conversationScopeId: sessionId,
+        runId,
         sequenceNumber: 2,
         streamEpoch: "epoch-1",
         cursor: null,
@@ -288,12 +288,12 @@ describe("ChatPanel post-run sync", () => {
       runSync: runSyncMock,
       setErrorMessage: vi.fn(),
     }));
-    consumeChatLiveStreamMock.mockImplementation(async ({ onEvent }) => {
+    consumeChatLiveStreamMock.mockImplementation(async ({ onEvent, runId, sessionId }) => {
       onEvent({
         type: "assistant_tool_call",
-        sessionId: "session-1",
-        conversationScopeId: "session-1",
-        runId: "run-1",
+        sessionId,
+        conversationScopeId: sessionId,
+        runId,
         sequenceNumber: 1,
         streamEpoch: "epoch-1",
         cursor: "cursor-1",
@@ -308,9 +308,9 @@ describe("ChatPanel post-run sync", () => {
       });
       onEvent({
         type: "assistant_message_done",
-        sessionId: "session-1",
-        conversationScopeId: "session-1",
-        runId: "run-1",
+        sessionId,
+        conversationScopeId: sessionId,
+        runId,
         sequenceNumber: 2,
         streamEpoch: "epoch-1",
         cursor: "cursor-2",
@@ -324,9 +324,9 @@ describe("ChatPanel post-run sync", () => {
       });
       onEvent({
         type: "run_terminal",
-        sessionId: "session-1",
-        conversationScopeId: "session-1",
-        runId: "run-1",
+        sessionId,
+        conversationScopeId: sessionId,
+        runId,
         sequenceNumber: 3,
         streamEpoch: "epoch-1",
         cursor: "cursor-3",

apps/web/src/chat/ChatPanel.send-lifecycle.test.tsx

@@ -20,7 +20,7 @@ import {
   transcribeChatAudioMock,
   useAppDataMock,
 } from "./ChatPanelTestSupport";
-import { getChatComposerCapabilities } from "./ChatPanel";
+import { getChatComposerCapabilities } from "./chatComposerState";
 import {
   createUnverifiedWorkspaceAppDataMock,
   createVerifiedWorkspaceAppDataMock,
@@ -160,7 +160,7 @@ describe("ChatPanel send lifecycle", () => {
     await renderChatPanel();
     await flushAsync();
 
-    expect(getChatSnapshotMock).toHaveBeenCalledWith("session-local-fresh");
+    expect(getChatSnapshotMock).toHaveBeenCalledWith("session-local-fresh", "workspace-1");
   });
 
   it("opens a stale warm-start session as a fresh local chat without loading the stale session", async () => {
@@ -238,7 +238,7 @@ describe("ChatPanel send lifecycle", () => {
     await renderChatPanel();
     await flushAsync();
 
-    expect(getChatSnapshotMock).toHaveBeenCalledWith("session-assistant-only");
+    expect(getChatSnapshotMock).toHaveBeenCalledWith("session-assistant-only", "workspace-1");
     expect(createNewChatSessionMock).not.toHaveBeenCalled();
   });