Commit d6ecf1580510cd7f156dbe831c68f357fe162210 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-02-11 15:36:11-08:00
committer	Julius Marminge <julius0216@outlook.com> 2026-02-11 15:36:11-08:00
log	d6ecf1580510cd7f156dbe831c68f357fe162210
tree	c6c1e9f3569cd1fa7bd9e2ecc91dd3d2b7d55b4b
parent	5b7af7b9f641b8e8f1bdffabcdd423d3f09e9d80

Fix worktree→local branch switch causing 'already used by worktree' error

When in a secondary worktree and selecting a branch checked out in the
main worktree (e.g. main), the code skipped the worktree redirect
(because worktreePath === project.cwd) and tried git checkout, which
git rejected.

Now any branch with a worktreePath is handled as a redirect — main
worktree redirects to local (worktreePath=null), secondary worktrees
redirect to their path.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

1 files changed, 7 insertions(+), 6 deletions(-)

apps
- web
  - src
    components
    BranchToolbar.tsx

apps/web/src/components/BranchToolbar.tsx+7-6

 @@ -128,13 +128,14 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
       return;
     }
-    // If the branch already lives in a secondary worktree, point the thread
+    // If the branch already lives in a worktree, redirect there instead of
-    // there instead of trying to checkout (which git would reject).
+    // trying to checkout (which git would reject with "already used by worktree").
-    // Ignore the main worktree (project cwd) — that's just a normal local checkout.
+    if (branch.worktreePath) {
-    const isSecondaryWorktree = branch.worktreePath && branch.worktreePath !== activeProject?.cwd;
+      const isMainWorktree = branch.worktreePath === activeProject?.cwd;
-    if (isSecondaryWorktree) {
       setThreadError(null);
-      setThreadBranch(branch.name, branch.worktreePath);
+      // Main worktree → switch back to local (project cwd, worktreePath=null).
+      // Secondary worktree → point the thread at that worktree path.
+      setThreadBranch(branch.name, isMainWorktree ? null : branch.worktreePath);
       setIsBranchMenuOpen(false);
       return;
     }