fix: use selectionTarget.checkoutCwd for post-checkout status query

cursoragent · juliusmarminge · cursoragent · commit 914c24bd8e45 · 2026-03-09T19:10:15.000Z
The git status call after checkout was still using branchCwd instead of
selectionTarget.checkoutCwd, causing incorrect branch detection when
switching from a secondary worktree to the default branch.

Co-authored-by: Julius Marminge &lt;juliusmarminge@users.noreply.github.com&gt;
diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -213,7 +213,7 @@ export function BranchToolbarBranchSelector({
 
       let nextBranchName = selectedBranchName;
       if (branch.isRemote) {
-        const status = await api.git.status({ cwd: branchCwd }).catch(() => null);
+        const status = await api.git.status({ cwd: selectionTarget.checkoutCwd }).catch(() => null);
         if (status?.branch) {
           nextBranchName = status.branch;
         }

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ export function BranchToolbarBranchSelector({`
`213`	`213`
`214`	`214`	`let nextBranchName = selectedBranchName;`
`215`	`215`	`if (branch.isRemote) {`
`216`		`- const status = await api.git.status({ cwd: branchCwd }).catch(() => null);`
	`216`	`+ const status = await api.git.status({ cwd: selectionTarget.checkoutCwd }).catch(() => null);`
`217`	`217`	`if (status?.branch) {`
`218`	`218`	`nextBranchName = status.branch;`
`219`	`219`	`}`