Commit 8c91aa5570868091253be8f0ef333a46aa1b0450 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-02-26 20:12:24-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-26 20:51:29-08:00
log	8c91aa5570868091253be8f0ef333a46aa1b0450
tree	7d6499922af59966503df6bc38b38f35d7bc29cf
parent	6db8257b1ed36d9abe04e77e701f6562df62810b

Prevent duplicate sends while composer request is in flight

- Add `sendInFlightRef` guard in `ChatView` send handler
- Set sending state before async work and always clear it in `finally`
- Wrap early send flow in one `try/finally` to avoid double-submit races

1 files changed, 15 insertions(+), 22 deletions(-)

apps
- web
  - src
    components
    ChatView.tsx

apps/web/src/components/ChatView.tsx+15-22

 @@ -1401,6 +1401,20 @@ export default function ChatView({ threadId }: ChatViewProps) {
       isFirstMessage && envMode === "worktree" && !activeThread.worktreePath
         ? activeThread.branch
         : null;
+    // In worktree mode, require an explicit base branch so we don't silently
+    // fall back to local execution when branch selection is missing.
+    const shouldCreateWorktree =
+      isFirstMessage && envMode === "worktree" && !activeThread.worktreePath;
+    if (shouldCreateWorktree && !activeThread.branch) {
+      dispatch({
+        type: "SET_ERROR",
+        threadId: threadIdForSend,
+        error: "Select a base branch before sending in New worktree mode.",
+      });
+      return;
+    }
     const composerImagesSnapshot = [...composerImages];
     const messageIdForSend = newMessageId();
     const messageCreatedAt = new Date().toISOString();
 @@ -1424,19 +1438,6 @@ export default function ChatView({ threadId }: ChatViewProps) {
       },
     ]);
-    // In worktree mode, require an explicit base branch so we don't silently
-    // fall back to local execution when branch selection is missing.
-    const shouldCreateWorktree =
-      activeThread.messages.length === 0 && envMode === "worktree" && !activeThread.worktreePath;
-    if (shouldCreateWorktree && !activeThread.branch) {
-      dispatch({
-        type: "SET_ERROR",
-        threadId: activeThread.id,
-        error: "Select a base branch before sending in New worktree mode.",
-      });
-      return;
-    }
     setThreadError(threadIdForSend, null);
     promptRef.current = "";
     setPrompt("");
 @@ -1462,17 +1463,9 @@ export default function ChatView({ threadId }: ChatViewProps) {
           branch: result.worktree.branch,
           worktreePath: result.worktree.path,
         });
-        // Keep local thread state in sync immediately so terminal drawer opens
-        // with the worktree cwd/env instead of briefly using the project root.
-        dispatch({
-          type: "SET_THREAD_BRANCH",
-          threadId: threadIdForSend,
-          branch: result.worktree.branch,
-          worktreePath: result.worktree.path,
-        });
         const setupScript = setupProjectScript(activeProject.scripts);
         if (setupScript) {
-          await runProjectScript(setupScript, {
+          void runProjectScript(setupScript, {
             cwd: result.worktree.path,
             worktreePath: result.worktree.path,
             rememberAsLastInvoked: false,