Make new thread workspace intent explicit

KEYBINDINGS.md

@@ -52,9 +52,9 @@ Invalid rules are ignored. Invalid config files are ignored. Warnings are logged
 - `terminal.split`: split terminal (in focused terminal context by default)
 - `terminal.new`: create new terminal (in focused terminal context by default)
 - `terminal.close`: close/kill the focused terminal (in focused terminal context by default)
-- `chat.new`: create a new chat thread preserving the active thread's branch/worktree state
+- `chat.new`: create a new chat thread using the target project's configured workspace default
 - `chat.newLocal`: create a new chat thread for the active project in a new environment (local/worktree determined by app settings (default `local`))
-- `chat.newTerminal`: create a new terminal-first thread preserving the active thread's branch/worktree state
+- `chat.newTerminal`: create a new terminal-first thread using the target project's configured workspace default; if a configured worktree has no concrete path, safely fall back to the project's local checkout
 - `composer.focus.toggle`: focus or blur the chat prompt composer
 - `editor.openFavorite`: open current project/worktree in the last-used editor
 - `script.{id}.run`: run a project script by id (for example `script.test.run`)

apps/web/src/components/AppSnapCoordinator.tsx

@@ -49,6 +49,10 @@ import { transientAlertManager } from "../notifications/transientAlert";
 import { useSplitViewStore } from "../splitViewStore";
 import { useStore } from "../store";
 import { useTerminalStateStore } from "../terminalStateStore";
+import {
+  coordinateExternalRouteNavigation,
+  draftNavigationSlotKey,
+} from "../lib/stagedDraftNavigation";
 
 const MAX_REMEMBERED_CAPTURE_IDS = 100;
 const APPSNAP_LISTENER_ACTIVITY_KEY = "appsnap:listener";
@@ -327,6 +331,8 @@ export function AppSnapCoordinator() {
 
   const activateExistingTarget = useCallback(
     async (target: AppSnapThreadTarget) => {
+      const mayActivate = await coordinateExternalRouteNavigation(draftNavigationSlotKey());
+      if (!mayActivate) return;
       openChatThreadPage(target.threadId);
       // Same thread is only "already active" when the split pane matches too;
       // a capture aimed at another pane still needs activation below.

apps/web/src/components/BranchToolbar.tsx

@@ -261,7 +261,7 @@ export default function BranchToolbar({
   });
 
   const setThreadWorkspace = useCallback(
-    (patch: ThreadWorkspacePatch) => {
+    (patch: ThreadWorkspacePatch, options?: { preserveDraftWorkspaceOrigin?: boolean }) => {
       if (!activeThreadId) return;
       const branch = patch.branch !== undefined ? patch.branch : activeThreadBranch;
       const worktreePath =
@@ -328,13 +328,17 @@ export default function BranchToolbar({
         branch,
         worktreePath,
         envMode: nextDraftEnvMode,
+        ...(options?.preserveDraftWorkspaceOrigin && draftThread
+          ? { workspaceOrigin: draftThread.workspaceOrigin }
+          : {}),
       });
     },
     [
       activeThreadId,
       activeThreadBranch,
       serverThread?.session,
       activeWorktreePath,
+      draftThread,
       hasServerThread,
       setThreadWorkspaceAction,
       serverThread?.associatedWorktreePath,

apps/web/src/components/BranchToolbarBranchSelector.tsx

@@ -90,7 +90,10 @@ interface BranchToolbarBranchSelectorProps {
   effectiveEnvMode: EnvMode;
   envLocked: boolean;
   hasServerThread: boolean;
-  onSetThreadWorkspace: (patch: ThreadWorkspacePatch) => void;
+  onSetThreadWorkspace: (
+    patch: ThreadWorkspacePatch,
+    options?: { preserveDraftWorkspaceOrigin?: boolean },
+  ) => void;
   onCheckoutPullRequestRequest?: (reference: string) => void;
   onComposerFocusRequest?: () => void;
   variant?: BranchSelectorVariant;
@@ -510,7 +513,10 @@ export function BranchToolbarBranchSelector({
       return;
     }
 
-    onSetThreadWorkspace({ branch: currentGitBranch, worktreePath: null });
+    onSetThreadWorkspace(
+      { branch: currentGitBranch, worktreePath: null },
+      { preserveDraftWorkspaceOrigin: true },
+    );
   }, [
     activeThreadBranch,
     activeWorktreePath,
@@ -736,7 +742,10 @@ export function BranchToolbarBranchSelector({
     ) {
       return;
     }
-    onSetThreadWorkspace({ branch: currentGitBranch, worktreePath: null });
+    onSetThreadWorkspace(
+      { branch: currentGitBranch, worktreePath: null },
+      { preserveDraftWorkspaceOrigin: true },
+    );
   }, [
     activeThreadBranch,
     activeWorktreePath,