fix: keep cloud user message visible while log echo is pending

apps/code/src/renderer/features/sessions/service/service.test.ts

@@ -58,7 +58,7 @@ const mockSessionStoreSetters = vi.hoisted(() => ({
   removeSession: vi.fn(),
   updateSession: vi.fn(),
   appendEvents: vi.fn(),
-  enqueueMessage: vi.fn(),
+  enqueueMessage: vi.fn(() => "queue-id-default"),
   removeQueuedMessage: vi.fn(),
   clearMessageQueue: vi.fn(),
   dequeueMessagesAsText: vi.fn(() => null),
@@ -70,6 +70,7 @@ const mockSessionStoreSetters = vi.hoisted(() => ({
   appendOptimisticItem: vi.fn(),
   clearOptimisticItems: vi.fn(),
   replaceOptimisticWithEvent: vi.fn(),
+  updateCloudStatus: vi.fn(),
 }));
 
 const mockGetConfigOptionByCategory = vi.hoisted(() =>
@@ -915,6 +916,68 @@ describe("SessionService", () => {
     });
   });
 
+  describe("handleCloudTaskUpdate terminal-status routing", () => {
+    it("dequeues queued messages instead of clearing them when the run reaches a terminal status", async () => {
+      const service = getSessionService();
+      let capturedOnData:
+        | ((payload: Record<string, unknown>) => void)
+        | undefined;
+      mockTrpcCloudTask.onUpdate.subscribe.mockImplementation(
+        (
+          _input: unknown,
+          opts: { onData: (p: Record<string, unknown>) => void },
+        ) => {
+          capturedOnData = opts.onData;
+          return { unsubscribe: vi.fn() };
+        },
+      );
+
+      const queuedMessage = {
+        id: "queue-1",
+        content: "gimme a joke",
+        queuedAt: Date.now(),
+      };
+      const session = createMockSession({
+        isCloud: true,
+        cloudStatus: "in_progress",
+        cloudBranch: "main",
+        messageQueue: [queuedMessage],
+      });
+      mockSessionStoreSetters.getSessionByTaskId.mockReturnValue(session);
+      mockSessionStoreSetters.getSessions.mockReturnValue({
+        "run-123": session,
+      });
+      mockSessionStoreSetters.dequeueMessages.mockReturnValue([
+        queuedMessage,
+      ] as never);
+
+      service.watchCloudTask(
+        "task-123",
+        "run-123",
+        "https://api.anthropic.com",
+        123,
+      );
+
+      expect(capturedOnData).toBeDefined();
+      capturedOnData?.({
+        kind: "status",
+        taskId: "task-123",
+        status: "completed",
+        stage: undefined,
+        output: undefined,
+        errorMessage: undefined,
+        branch: "main",
+      });
+
+      // Queue is drained via dequeueMessages (so resumeCloudRun can replay it),
+      // not silently dropped via clearMessageQueue.
+      expect(mockSessionStoreSetters.dequeueMessages).toHaveBeenCalledWith(
+        "task-123",
+      );
+      expect(mockSessionStoreSetters.clearMessageQueue).not.toHaveBeenCalled();
+    });
+  });
+
   describe("reset", () => {
     it("clears connecting tasks", () => {
       const service = getSessionService();
@@ -1050,7 +1113,7 @@ describe("SessionService", () => {
       );
     });
 
-    it("preserves cloud attachment prompts when queueing a follow-up", async () => {
+    it("queues a cloud follow-up locally without dispatching while a prior turn is in flight", async () => {
       const service = getSessionService();
       mockSessionStoreSetters.getSessionByTaskId.mockReturnValue(
         createMockSession({
@@ -1060,24 +1123,22 @@ describe("SessionService", () => {
         }),
       );
 
-      const prompt: ContentBlock[] = [
-        { type: "text", text: "read this" },
-        {
-          type: "resource_link",
-          uri: "file:///tmp/test.txt",
-          name: "test.txt",
-          mimeType: "text/plain",
-        },
-      ];
-
-      const result = await service.sendPrompt("task-123", prompt);
+      const result = await service.sendPrompt("task-123", "Hello cloud");
 
       expect(result.stopReason).toBe("queued");
+      // Held in the local messageQueue (queued bubble visible).
       expect(mockSessionStoreSetters.enqueueMessage).toHaveBeenCalledWith(
         "task-123",
-        "read this\n\nAttached files: test.txt",
-        prompt,
+        "Hello cloud",
+        "Hello cloud",
       );
+      // user_message during a running turn would preempt the prior turn on
+      // the cloud — handleCloudTaskUpdate dispatches via the auto-flush
+      // once end_turn lands.
+      expect(mockTrpcCloudTask.sendCommand.mutate).not.toHaveBeenCalled();
+      expect(
+        mockSessionStoreSetters.appendOptimisticItem,
+      ).not.toHaveBeenCalled();
     });
 
     it("sends prompt via tRPC when session is ready", async () => {