Fix branch creation condition and remove redundant null check

cursoragent · juliusmarminge · cursoragent · commit 75853dcaa1d9 · 2026-03-09T19:02:20.000Z
- Restore effectiveEnvMode === 'local' guard for canCreateBranch instead of
  !isSelectingWorktreeBase, which unintentionally allowed branch creation in
  worktree mode when env was locked or a worktree path was active.
- Remove redundant !parsedReference check in handleConfirm's second guard,
  since the first guard already returns early when parsedReference is falsy.

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
@@ -116,7 +116,7 @@ export function BranchToolbarBranchSelector({
   const checkoutPullRequestItemValue = prReference && onCheckoutPullRequestRequest
     ? `__checkout_pull_request__:${prReference}`
     : null;
-  const canCreateBranch = !isSelectingWorktreeBase && trimmedBranchQuery.length > 0;
+  const canCreateBranch = effectiveEnvMode === "local" && trimmedBranchQuery.length > 0;
   const hasExactBranchMatch = branchByName.has(trimmedBranchQuery);
   const createBranchItemValue = canCreateBranch
     ? `__create_new_branch__:${trimmedBranchQuery}`
diff --git a/apps/web/src/components/ComposerPullRequestCommandMenu.tsx b/apps/web/src/components/ComposerPullRequestCommandMenu.tsx
@@ -107,7 +107,7 @@ export function ComposerPullRequestCommandMenu({
       setReferenceDirty(true);
       return;
     }
-    if (!parsedReference || !resolvedPullRequest || !cwd) {
+    if (!resolvedPullRequest || !cwd) {
       return;
     }
     setPreparingMode(mode);

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ export function ComposerPullRequestCommandMenu({`
`107`	`107`	`setReferenceDirty(true);`
`108`	`108`	`return;`
`109`	`109`	`}`
`110`		`- if (!parsedReference \|\| !resolvedPullRequest \|\| !cwd) {`
	`110`	`+ if (!resolvedPullRequest \|\| !cwd) {`
`111`	`111`	`return;`
`112`	`112`	`}`
`113`	`113`	`setPreparingMode(mode);`