Prevent duplicate sends and sync worktree branch state

- Guard `onSend` with an in-flight ref to block double submits - Set send phase before worktree prep and always clear in-flight state in `finally` - Sync thread branch/worktree path immediately and await setup script execution

Julius Marminge committed 8 months ago

Commit 7b0ae431 parent 69dbc5d1 file · +15 −2Browse files

Unified · Split

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

   const textareaRef = useRef<HTMLTextAreaElement>(null);
   const composerCommandInputRef = useRef<HTMLInputElement>(null);
   const composerImagesRef = useRef<ComposerImageAttachment[]>([]);
+  const sendInFlightRef = useRef(false);
   const dragDepthRef = useRef(0);
   const terminalOpenByThreadRef = useRef<Record<string, boolean>>({});
   const onSend = async (e: React.SubmitEvent | React.KeyboardEvent) => {
     e.preventDefault();
     const api = readNativeApi();
-    if (!api || !activeThread || isSendBusy || isConnecting) return;
+    if (!api || !activeThread || isSendBusy || isConnecting || sendInFlightRef.current) return;
     const trimmed = prompt.trim();
     if (!trimmed && composerImages.length === 0) return;
     if (!activeProject) return;
       return;
     }
+    sendInFlightRef.current = true;
+    setSendPhase(baseBranchForWorktree ? "preparing-worktree" : "sending-turn");
     const composerImagesSnapshot = [...composerImages];
     const messageIdForSend = newMessageId();
     const messageCreatedAt = new Date().toISOString();
           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) {
-          void runProjectScript(setupScript, {
+          await runProjectScript(setupScript, {
             cwd: result.worktree.path,
             worktreePath: result.worktree.path,
             rememberAsLastInvoked: false,
         err instanceof Error ? err.message : "Failed to send message.",
       );
     } finally {
+      sendInFlightRef.current = false;
       setSendPhase("idle");
     }
   };