The best way to control Claude Code, Codex and more from any computer or phone
fix(web,server): picking the previous branch after an agent's checkout switches back (#30107)
Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: Julius Marminge <julius0216@outlook.com>
Andrei committed
Nov 15, 2026 at 06:43 UTC
c041761d89ef12b8659fc9bf3e98c26eb5140656
3 files changed
+74
-9
apps/web/src/components/BranchToolbar.logic.test.ts
+26
@@ -8,6 +8,7 @@ import {
8
resolveDraftEnvModeAfterBranchChange,
9
resolveEffectiveEnvMode,
10
resolveBranchToolbarPrBranch,
11
+ resolveConfirmedSelectedRef,
12
resolveDefaultWorktreeBaseBranch,
13
resolveLocalCheckoutBranchMismatch,
14
resolveLockedWorkspaceLabel,
@@ -406,3 +407,28 @@ describe("sanitizeNewRefName", () => {
407
expect(sanitizeNewRefName("foo--bar")).toBe("foo--bar");
408
});
409
});
410
+
411
+describe("resolveConfirmedSelectedRef", () => {
412
+ const listed: VcsRef = {
413
+ name: "previous",
414
+ isRemote: false,
415
+ current: false,
416
+ isDefault: false,
417
+ worktreePath: "/worktree-b",
418
+ };
419
+
420
+ it.each([
421
+ [
422
+ "the claimed worktree still has it checked out",
423
+ [{ ...listed, current: true }],
424
+ "/worktree-b",
425
+ ],
426
+ ["the claimed worktree has moved to another branch", [], null],
427
+ ["the claimed worktree lists it but not as current", [listed], null],
428
+ ["the read failed", null, null],
429
+ ] as const)("%s", (_label, refs, expected) => {
430
+ expect(resolveConfirmedSelectedRef(listed, refs === null ? null : { refs }).worktreePath).toBe(
431
+ expected,
432
+ );
433
+ });
434
+});
apps/web/src/components/BranchToolbar.logic.ts
+14
@@ -288,6 +288,20 @@ export function resolveLocalCheckoutBranchMismatch(input: {
288
return { threadBranch: activeThreadBranch, currentBranch: currentGitBranch };
289
}
290
291
+/**
292
+ * Keeps a picked ref's worktree claim only when a read in that worktree finds it checked out.
293
+ * `freshRead` is `null` when the read failed.
294
+ */
295
+export function resolveConfirmedSelectedRef(
296
+ listedRef: VcsRef,
297
+ freshRead: { readonly refs: ReadonlyArray<VcsRef> } | null,
298
+): VcsRef {
299
+ const checkedOut =
300
+ freshRead?.refs.some((ref) => ref.name === listedRef.name && !ref.isRemote && ref.current) ??
301
+ false;
302
+ return checkedOut ? listedRef : { ...listedRef, worktreePath: null };
303
+}
304
+
305
export function resolveBranchSelectionTarget(input: {
306
activeProjectCwd: string;
307
activeProjectCheckoutRoot?: string | undefined;
apps/web/src/components/BranchToolbarBranchSelector.tsx
+34
-9
@@ -20,6 +20,7 @@ import {
20
useEffectEvent,
21
useImperativeHandle,
22
useOptimistic,
23
+ useRef,
24
useState,
25
useTransition,
26
type MouseEvent as ReactMouseEvent,
@@ -53,6 +54,7 @@ import {
54
resolveBranchToolbarPrBranch,
55
resolveBranchSelectionTarget,
56
resolveBranchToolbarValue,
57
+ resolveConfirmedSelectedRef,
58
resolveDefaultWorktreeBaseBranch,
59
resolveDraftEnvModeAfterBranchChange,
60
resolveEffectiveEnvMode,
@@ -130,6 +132,9 @@ export function BranchToolbarBranchSelector({
132
const switchRef = useAtomCommand(vcsEnvironment.switchRef, {
133
reportFailure: false,
134
});
135
+ const readRefs = useAtomCommand(vcsEnvironment.readRefs, {
136
+ reportFailure: false,
137
+ });
138
const refreshLocalStatusForPicker = useAtomCommand(vcsEnvironment.refreshLocalStatusForPicker, {
139
reportFailure: false,
140
});
@@ -423,17 +428,40 @@ export function BranchToolbarBranchSelector({
428
});
429
};
430
426
- const selectBranch = (refName: VcsRef) => {
431
+ // The picker's list, and the server's coalesced ref listing, can predate a checkout an agent
432
+ // ran itself. Only the claimed worktree's live HEAD confirms the claim; an unconfirmed one
433
+ // falls back to a real checkout, which Git refuses if the branch is checked out elsewhere.
434
+ const latestSelectionIdRef = useRef(0);
435
+ const readSelectedRef = async (worktreePath: string, listedRef: VcsRef): Promise<VcsRef> => {
436
+ const result = await readRefs({
437
+ environmentId,
438
+ input: { cwd: worktreePath, query: listedRef.name, refKind: "local", limit: 1 },
439
+ });
440
+ return resolveConfirmedSelectedRef(listedRef, result._tag === "Success" ? result.value : null);
441
+ };
442
+
443
+ const selectBranch = async (listedRef: VcsRef) => {
444
if (!canUpdateThreadBranch || !branchCwd || !activeProjectCwd || isBranchActionPending) return;
445
+ const selectionId = ++latestSelectionIdRef.current;
446
429
- const latest = readLatestThreadState();
447
+ let latest = readLatestThreadState();
448
if (isSelectingWorktreeBase) {
449
if (latest.worktreePath) return;
432
- setThreadBranch(refName.name, null);
450
+ setThreadBranch(listedRef.name, null);
451
setIsBranchMenuOpen(false);
452
onComposerFocusRequest?.();
453
return;
454
}
455
+
456
+ setIsBranchMenuOpen(false);
457
+ onComposerFocusRequest?.();
458
+
459
+ const refName = listedRef.worktreePath
460
+ ? await readSelectedRef(listedRef.worktreePath, listedRef)
461
+ : listedRef;
462
+ // A later pick made while this one was confirming its worktree wins.
463
+ if (selectionId !== latestSelectionIdRef.current) return;
464
+ latest = readLatestThreadState();
465
const selectionTarget = resolveBranchSelectionTarget({
466
activeProjectCwd,
467
activeProjectCheckoutRoot,
@@ -455,8 +483,6 @@ export function BranchToolbarBranchSelector({
483
!(selectionTarget.staysInActiveCheckout && canWriteSourceControl)
484
) {
485
setThreadBranch(refName.name, selectionTarget.nextWorktreePath);
458
- setIsBranchMenuOpen(false);
459
- onComposerFocusRequest?.();
486
return;
487
}
488
@@ -464,9 +490,6 @@ export function BranchToolbarBranchSelector({
490
? deriveLocalBranchNameFromRemoteRef(refName.name)
491
: refName.name;
492
467
- setIsBranchMenuOpen(false);
468
- onComposerFocusRequest?.();
469
-
493
runBranchAction(async () => {
494
const previousBranch = resolvedActiveBranch;
495
setOptimisticBranch(selectedBranchName);
@@ -531,6 +554,7 @@ export function BranchToolbarBranchSelector({
554
if (!canChangeThreadBranch) return;
555
const name = sanitizeNewRefName(rawName);
556
if (!branchCwd || !name || isBranchActionPending) return;
557
+ latestSelectionIdRef.current++;
558
559
setIsBranchMenuOpen(false);
560
onComposerFocusRequest?.();
@@ -667,6 +691,7 @@ export function BranchToolbarBranchSelector({
691
692
function selectPickerItem(itemValue: string) {
693
if (itemValue === checkoutPullRequestItemValue && prReference && onCheckoutPullRequestRequest) {
694
+ latestSelectionIdRef.current++;
695
handleOpenChange(false);
696
onComposerFocusRequest?.();
697
onCheckoutPullRequestRequest(prReference);
@@ -674,7 +699,7 @@ export function BranchToolbarBranchSelector({
699
createRef(trimmedBranchQuery);
700
} else {
701
const refName = branchByName.get(itemValue);
677
- if (refName) selectBranch(refName);
702
+ if (refName) void selectBranch(refName);
703
}
704
}
705