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

Julius Marminge committed 8 months ago

Commit 69dbc5d1 parent 645aaa51 file · +15 −22Browse files

Unified · Split

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

       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();
       },
     ]);
-    // 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("");
           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,