Harden edit regenerate turn ids and edit gating

Author: Andrew T.

src/features/messages/components/Messages.test.tsx

@@ -1507,6 +1507,39 @@ describe("Messages", () => {
     expect(screen.getByText("Plan ready")).toBeTruthy();
   });
 
+  it("hides edit entry points while regenerate is in flight", () => {
+    const items: ConversationItem[] = [
+      {
+        id: "msg-1",
+        kind: "message",
+        role: "user",
+        text: "First",
+      },
+      {
+        id: "msg-2",
+        kind: "message",
+        role: "user",
+        text: "Second",
+      },
+    ];
+    const onStartEdit = vi.fn();
+
+    render(
+      <Messages
+        items={items}
+        threadId="thread-1"
+        workspaceId="ws-1"
+        isThinking={false}
+        openTargets={[]}
+        selectedOpenAppId=""
+        isRegeneratingEdit
+        onStartEdit={onStartEdit}
+      />,
+    );
+
+    expect(screen.queryByRole("button", { name: "Edit message" })).toBeNull();
+  });
+
   it("calls the plan follow-up callbacks", () => {
     const onPlanAccept = vi.fn();
     const onPlanSubmitChanges = vi.fn();

src/features/messages/components/Messages.tsx

@@ -168,6 +168,7 @@ export const Messages = memo(function Messages({
     if (item.kind === "message") {
       const isCopied = copiedMessageId === item.id;
       const isEditingThis = editingItemId === item.id;
+      const editAction = isThinking || isRegeneratingEdit ? undefined : onStartEdit;
       return (
         <MessageRow
           key={item.id}
@@ -185,7 +186,7 @@ export const Messages = memo(function Messages({
           editText={isEditingThis ? editText : undefined}
           isConfirming={isEditingThis ? isConfirmingEdit : undefined}
           isRegenerating={isEditingThis ? isRegeneratingEdit : undefined}
-          onStartEdit={isThinking ? undefined : onStartEdit}
+          onStartEdit={editAction}
           onCancelEdit={onCancelEdit}
           onUpdateEditText={onUpdateEditText}
           onRequestRegenerate={onRequestRegenerate}

src/features/messages/hooks/useMessageEdit.test.tsx

@@ -175,4 +175,37 @@ describe("useMessageEdit", () => {
     expect(result.current.isConfirming).toBe(false);
     expect(result.current.isRegenerating).toBe(false);
   });
+
+  it("ignores startEdit while regenerate is already in flight", async () => {
+    let resolveRegenerate: (() => void) | null = null;
+    const pendingRegenerate = vi.fn(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveRegenerate = resolve;
+        }),
+    );
+    const { result } = renderHook(() =>
+      useMessageEdit({ onRegenerate: pendingRegenerate }),
+    );
+
+    act(() => {
+      result.current.startEdit("item-1", "text");
+    });
+
+    await act(async () => {
+      void result.current.executeRegenerate();
+    });
+
+    expect(result.current.isRegenerating).toBe(true);
+
+    act(() => {
+      result.current.startEdit("item-2", "other text");
+    });
+
+    expect(result.current.editingItemId).toBe("item-1");
+
+    await act(async () => {
+      resolveRegenerate?.();
+    });
+  });
 });

src/features/messages/hooks/useMessageEdit.ts

@@ -41,11 +41,17 @@ export function useMessageEdit({ onRegenerate }: UseMessageEditOptions): UseMess
   const [isConfirming, setIsConfirming] = useState(false);
   const [isRegenerating, setIsRegenerating] = useState(false);
 
-  const startEdit = useCallback((itemId: string, text: string, images: string[] = []) => {
-    setEditState({ itemId, originalText: text, editText: text, images });
-    setIsConfirming(false);
-    setIsRegenerating(false);
-  }, []);
+  const startEdit = useCallback(
+    (itemId: string, text: string, images: string[] = []) => {
+      if (isRegenerating) {
+        return;
+      }
+      setEditState({ itemId, originalText: text, editText: text, images });
+      setIsConfirming(false);
+      setIsRegenerating(false);
+    },
+    [isRegenerating],
+  );
 
   const cancelEdit = useCallback(() => {
     setEditState(null);

src/utils/threadItems.conversion.ts

@@ -3,7 +3,7 @@ import { parseCollabToolCallItem } from "./threadItems.collab";
 import { asNumber, asString } from "./threadItems.shared";
 
 function extractTurnId(record: Record<string, unknown>) {
-  return asString(record.id ?? record.turnId ?? record.turn_id).trim();
+  return asString(record.turnId ?? record.turn_id ?? record.id).trim();
 }
 
 function extractImageInputValue(input: Record<string, unknown>) {

src/utils/threadItems.test.ts

@@ -940,6 +940,23 @@ describe("threadItems", () => {
     ]);
   });
 
+  it("prefers explicit turn ids over item ids when both are present", () => {
+    const item = buildConversationItem({
+      id: "item-1",
+      turnId: "turn-1",
+      type: "userMessage",
+      content: [{ type: "text", text: "Hello" }],
+    });
+
+    expect(item).toEqual({
+      id: "item-1",
+      turnId: "turn-1",
+      kind: "message",
+      role: "user",
+      text: "Hello",
+    });
+  });
+
   it("parses ISO timestamps for thread updates", () => {
     const timestamp = getThreadTimestamp({ updated_at: "2025-01-01T00:00:00Z" });
     expect(timestamp).toBe(Date.parse("2025-01-01T00:00:00Z"));