Preserve live turn ids for edit regeneration

Author: zip700

src/features/app/hooks/useAppServerEvents.test.tsx

@@ -61,6 +61,7 @@ describe("useAppServerEvents", () => {
       onPlanDelta: vi.fn(),
       onApprovalRequest: vi.fn(),
       onRequestUserInput: vi.fn(),
+      onItemStarted: vi.fn(),
       onItemCompleted: vi.fn(),
       onAgentMessageCompleted: vi.fn(),
       onAccountRateLimitsUpdated: vi.fn(),
@@ -324,6 +325,7 @@ describe("useAppServerEvents", () => {
           method: "item/completed",
           params: {
             threadId: "thread-1",
+            turnId: "turn-2",
             item: { type: "agentMessage", id: "item-2", text: "Done" },
           },
         },
@@ -332,6 +334,7 @@ describe("useAppServerEvents", () => {
     expect(handlers.onItemCompleted).toHaveBeenCalledWith("ws-1", "thread-1", {
       type: "agentMessage",
       id: "item-2",
+      turnId: "turn-2",
       text: "Done",
     });
     expect(handlers.onAgentMessageCompleted).toHaveBeenCalledWith({
@@ -341,6 +344,25 @@ describe("useAppServerEvents", () => {
       text: "Done",
     });
 
+    act(() => {
+      listener?.({
+        workspace_id: "ws-1",
+        message: {
+          method: "item/started",
+          params: {
+            threadId: "thread-1",
+            turnId: "turn-3",
+            item: { type: "userMessage", id: "item-3" },
+          },
+        },
+      });
+    });
+    expect(handlers.onItemStarted).toHaveBeenCalledWith("ws-1", "thread-1", {
+      type: "userMessage",
+      id: "item-3",
+      turnId: "turn-3",
+    });
+
     act(() => {
       listener?.({
         workspace_id: "ws-1",

src/features/app/hooks/useAppServerEvents.ts

@@ -467,8 +467,10 @@ export function useAppServerEvents(handlers: AppServerEventHandlers) {
       if (method === "item/completed") {
         const threadId = String(params.threadId ?? params.thread_id ?? "");
         const item = params.item as Record<string, unknown> | undefined;
+        const turnId = String(params.turnId ?? params.turn_id ?? "").trim();
         if (threadId && item) {
-          currentHandlers.onItemCompleted?.(workspace_id, threadId, item);
+          const itemWithTurnId = turnId ? { ...item, turnId } : item;
+          currentHandlers.onItemCompleted?.(workspace_id, threadId, itemWithTurnId);
         }
         if (threadId && item?.type === "agentMessage") {
           const itemId = String(item.id ?? "");
@@ -488,8 +490,10 @@ export function useAppServerEvents(handlers: AppServerEventHandlers) {
       if (method === "item/started") {
         const threadId = String(params.threadId ?? params.thread_id ?? "");
         const item = params.item as Record<string, unknown> | undefined;
+        const turnId = String(params.turnId ?? params.turn_id ?? "").trim();
         if (threadId && item) {
-          currentHandlers.onItemStarted?.(workspace_id, threadId, item);
+          const itemWithTurnId = turnId ? { ...item, turnId } : item;
+          currentHandlers.onItemStarted?.(workspace_id, threadId, itemWithTurnId);
         }
         return;
       }