Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Extract branch selector and refresh branches on menu open

Julius Marmingefabb3e07348e
diff --git a/apps/web/src/components/BranchToolbar.logic.test.ts b/apps/web/src/components/BranchToolbar.logic.test.ts
index cf55fa457..ea164b363 100644
--- a/apps/web/src/components/BranchToolbar.logic.test.ts
+++ b/apps/web/src/components/BranchToolbar.logic.test.ts
@@ -3,9 +3,42 @@ import { describe, expect, it } from "vitest";
import {
dedupeRemoteBranchesWithLocalMatches,
deriveLocalBranchNameFromRemoteRef,
+ resolveDraftEnvModeAfterBranchChange,
resolveBranchToolbarValue,
} from "./BranchToolbar.logic";
+describe("resolveDraftEnvModeAfterBranchChange", () => {
+ it("switches to local mode when returning from an existing worktree to the main worktree", () => {
+ expect(
+ resolveDraftEnvModeAfterBranchChange({
+ nextWorktreePath: null,
+ currentWorktreePath: "/repo/.t3/worktrees/feature-a",
+ effectiveEnvMode: "worktree",
+ }),
+ ).toBe("local");
+ });
+
+ it("keeps new-worktree mode when selecting a base branch before worktree creation", () => {
+ expect(
+ resolveDraftEnvModeAfterBranchChange({
+ nextWorktreePath: null,
+ currentWorktreePath: null,
+ effectiveEnvMode: "worktree",
+ }),
+ ).toBe("worktree");
+ });
+
+ it("uses worktree mode when selecting a branch already attached to a worktree", () => {
+ expect(
+ resolveDraftEnvModeAfterBranchChange({
+ nextWorktreePath: "/repo/.t3/worktrees/feature-a",
+ currentWorktreePath: null,
+ effectiveEnvMode: "local",
+ }),
+ ).toBe("worktree");
+ });
+});
+
describe("resolveBranchToolbarValue", () => {
it("defaults new-worktree mode to current git branch when no explicit base branch is set", () => {
expect(
diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts
index eabe23afc..dd1912fb2 100644
--- a/apps/web/src/components/BranchToolbar.logic.ts
+++ b/apps/web/src/components/BranchToolbar.logic.ts
@@ -1,5 +1,20 @@
import type { GitBranch } from "@t3tools/contracts";
+export function resolveDraftEnvModeAfterBranchChange(input: {
+ nextWorktreePath: string | null;
+ currentWorktreePath: string | null;
+ effectiveEnvMode: "local" | "worktree";
+}): "local" | "worktree" {
+ const { nextWorktreePath, currentWorktreePath, effectiveEnvMode } = input;
+ if (nextWorktreePath) {
+ return "worktree";
+ }
+ if (effectiveEnvMode === "worktree" && !currentWorktreePath) {
+ return "worktree";
+ }
+ return "local";
+}
+
export function resolveBranchToolbarValue(input: {
envMode: "local" | "worktree";
activeWorktreePath: string | null;
diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index 288c7ae35..9d208a32c 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -1,30 +1,13 @@
-import type { GitBranch, ThreadId } from "@t3tools/contracts";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useVirtualizer } from "@tanstack/react-virtual";
-import { useCallback, useEffect, useMemo, useOptimistic, useRef, useState, useTransition } from "react";
+import type { ThreadId } from "@t3tools/contracts";
+import { useCallback } from "react";
import { newCommandId } from "../lib/utils";
-import { gitBranchesQueryOptions, invalidateGitQueries } from "../lib/gitReactQuery";
import { readNativeApi } from "../nativeApi";
import { useComposerDraftStore } from "../composerDraftStore";
import { useStore } from "../store";
-import {
- dedupeRemoteBranchesWithLocalMatches,
- deriveLocalBranchNameFromRemoteRef,
- resolveBranchToolbarValue,
-} from "./BranchToolbar.logic";
+import { resolveDraftEnvModeAfterBranchChange } from "./BranchToolbar.logic";
+import { BranchToolbarBranchSelector } from "./BranchToolbarBranchSelector";
import { Button } from "./ui/button";
-import {
- Combobox,
- ComboboxEmpty,
- ComboboxInput,
- ComboboxItem,
- ComboboxList,
- ComboboxPopup,
- ComboboxTrigger,
-} from "./ui/combobox";
-import { ChevronDownIcon } from "lucide-react";
-import { toastManager } from "./ui/toast";
interface BranchToolbarProps {
threadId: ThreadId;
@@ -46,11 +29,6 @@ export default function BranchToolbar({
const setThreadBranchAction = useStore((store) => store.setThreadBranch);
const draftThread = useComposerDraftStore((store) => store.getDraftThread(threadId));
const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext);
- const queryClient = useQueryClient();
-
- const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
- const [branchQuery, setBranchQuery] = useState("");
- const branchListScrollElementRef = useRef<HTMLDivElement | null>(null);
const serverThread = threads.find((thread) => thread.id === threadId);
const activeProjectId = serverThread?.projectId ?? draftThread?.projectId ?? null;
@@ -65,65 +43,6 @@ export default function BranchToolbar({
? "worktree"
: envMode;
- // ── Queries ───────────────────────────────────────────────────────────
-
- const branchesQuery = useQuery(gitBranchesQueryOptions(branchCwd));
-
- const branches = useMemo(
- () => dedupeRemoteBranchesWithLocalMatches(branchesQuery.data?.branches ?? []),
- [branchesQuery.data?.branches],
- );
- const currentGitBranch = branches.find((branch) => branch.current)?.name ?? null;
- const canonicalActiveBranch = resolveBranchToolbarValue({
- envMode: effectiveEnvMode,
- activeWorktreePath,
- activeThreadBranch,
- currentGitBranch,
- });
- const branchNames = useMemo(() => branches.map((branch) => branch.name), [branches]);
- const branchByName = useMemo(
- () => new Map(branches.map((branch) => [branch.name, branch] as const)),
- [branches],
- );
- const trimmedBranchQuery = branchQuery.trim();
- const normalizedBranchQuery = trimmedBranchQuery.toLowerCase();
- const canCreateBranch = effectiveEnvMode === "local" && trimmedBranchQuery.length > 0;
- const hasExactBranchMatch = branchByName.has(trimmedBranchQuery);
- const createBranchItemValue = canCreateBranch
- ? `__create_new_branch__:${trimmedBranchQuery}`
- : null;
- const branchPickerItems = useMemo(
- () =>
- createBranchItemValue && !hasExactBranchMatch
- ? [...branchNames, createBranchItemValue]
- : branchNames,
- [branchNames, createBranchItemValue, hasExactBranchMatch],
- );
- const filteredBranchPickerItems = useMemo(
- () =>
- normalizedBranchQuery.length === 0
- ? branchPickerItems
- : branchPickerItems.filter((itemValue) => {
- if (createBranchItemValue && itemValue === createBranchItemValue) return true;
- return itemValue.toLowerCase().includes(normalizedBranchQuery);
- }),
- [branchPickerItems, createBranchItemValue, normalizedBranchQuery],
- );
-
- // ── Helpers ───────────────────────────────────────────────────────────
-
- const [resolvedActiveBranch, setOptimisticBranch] = useOptimistic(
- canonicalActiveBranch,
- (_currentBranch: string | null, optimisticBranch: string | null) => optimisticBranch,
- );
- const [isBranchActionPending, startBranchActionTransition] = useTransition();
- const runBranchAction = (action: () => Promise<void>) => {
- startBranchActionTransition(async () => {
- await action().catch(() => undefined);
- await invalidateGitQueries(queryClient).catch(() => undefined);
- });
- };
-
const setThreadBranch = useCallback(
(branch: string | null, worktreePath: string | null) => {
if (!activeThreadId) return;
@@ -154,10 +73,15 @@ export default function BranchToolbar({
setThreadBranchAction(activeThreadId, branch, worktreePath);
return;
}
+ const nextDraftEnvMode = resolveDraftEnvModeAfterBranchChange({
+ nextWorktreePath: worktreePath,
+ currentWorktreePath: activeWorktreePath,
+ effectiveEnvMode,
+ });
setDraftThreadContext(threadId, {
branch,
worktreePath,
- envMode: effectiveEnvMode,
+ envMode: nextDraftEnvMode,
});
},
[
@@ -172,138 +96,6 @@ export default function BranchToolbar({
],
);
- const branchListVirtualizer = useVirtualizer({
- count: filteredBranchPickerItems.length,
- estimateSize: () => 28,
- getScrollElement: () => branchListScrollElementRef.current,
- overscan: 12,
- enabled: isBranchMenuOpen,
- initialRect: {
- height: 224,
- width: 0,
- },
- });
- const virtualBranchRows = branchListVirtualizer.getVirtualItems();
- const setBranchListRef = useCallback(
- (element: HTMLDivElement | null) => {
- branchListScrollElementRef.current = (element?.parentElement as HTMLDivElement | null) ?? null;
- if (element) {
- branchListVirtualizer.measure();
- }
- },
- [branchListVirtualizer],
- );
-
- useEffect(() => {
- if (effectiveEnvMode !== "worktree" || activeWorktreePath || activeThreadBranch || !currentGitBranch) {
- return;
- }
- setThreadBranch(currentGitBranch, null);
- }, [activeThreadBranch, activeWorktreePath, currentGitBranch, effectiveEnvMode, setThreadBranch]);
-
- useEffect(() => {
- if (!isBranchMenuOpen) return;
- queueMicrotask(() => {
- branchListVirtualizer.measure();
- });
- }, [branchListVirtualizer, filteredBranchPickerItems.length, isBranchMenuOpen]);
-
- const selectBranch = (branch: GitBranch) => {
- const api = readNativeApi();
- if (!api || !activeThreadId || !branchCwd || isBranchActionPending) return;
-
- // For new worktree mode, selecting a branch picks the base branch.
- if (effectiveEnvMode === "worktree" && !envLocked && !activeWorktreePath) {
- setThreadBranch(branch.name, null);
- setIsBranchMenuOpen(false);
- onComposerFocusRequest?.();
- return;
- }
-
- // If the branch already lives in a worktree, redirect there instead of
- // trying to checkout (which git would reject with "already used by worktree").
- if (branch.worktreePath) {
- const isMainWorktree = branch.worktreePath === activeProject?.cwd;
- // 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);
- onComposerFocusRequest?.();
- return;
- }
-
- const selectedBranchName = branch.isRemote
- ? deriveLocalBranchNameFromRemoteRef(branch.name)
- : branch.name;
-
- setIsBranchMenuOpen(false);
- onComposerFocusRequest?.();
-
- runBranchAction(async () => {
- setOptimisticBranch(selectedBranchName);
- try {
- await api.git.checkout({ cwd: branchCwd, branch: branch.name });
- await invalidateGitQueries(queryClient);
- } catch (error) {
- toastManager.add({
- type: "error",
- title: "Failed to checkout branch.",
- description: error instanceof Error ? error.message : "An error occurred.",
- });
- return;
- }
-
- let nextBranchName = selectedBranchName;
- if (branch.isRemote) {
- const status = await api.git.status({ cwd: branchCwd }).catch(() => null);
- if (status?.branch) {
- nextBranchName = status.branch;
- }
- }
-
- setOptimisticBranch(nextBranchName);
- setThreadBranch(nextBranchName, activeWorktreePath);
- });
- };
-
- const createBranch = (rawName: string) => {
- const name = rawName.trim();
- const api = readNativeApi();
- if (!api || !activeThreadId || !branchCwd || !name || isBranchActionPending) return;
-
- setIsBranchMenuOpen(false);
- onComposerFocusRequest?.();
-
- runBranchAction(async () => {
- setOptimisticBranch(name);
-
- try {
- await api.git.createBranch({ cwd: branchCwd, branch: name });
- try {
- await api.git.checkout({ cwd: branchCwd, branch: name });
- } catch (error) {
- toastManager.add({
- type: "error",
- title: "Failed to checkout branch.",
- description: error instanceof Error ? error.message : "An error occurred.",
- });
- return;
- }
- } catch (error) {
- toastManager.add({
- type: "error",
- title: "Failed to create branch.",
- description: error instanceof Error ? error.message : "An error occurred.",
- });
- return;
- }
-
- setOptimisticBranch(name);
- setThreadBranch(name, activeWorktreePath);
- setBranchQuery("");
- });
- };
-
if (!activeThreadId || !activeProject) return null;
return (
@@ -326,128 +118,16 @@ export default function BranchToolbar({
)}
</div>
- <Combobox
- items={branchPickerItems}
- filteredItems={filteredBranchPickerItems}
- autoHighlight
- virtualized
- onItemHighlighted={(_value, eventDetails) => {
- if (!isBranchMenuOpen || eventDetails.index < 0) return;
- branchListVirtualizer.scrollToIndex(eventDetails.index, { align: "auto" });
- }}
- onOpenChange={(open) => {
- setIsBranchMenuOpen(open);
- if (!open) setBranchQuery("");
- }}
- open={isBranchMenuOpen}
- value={resolvedActiveBranch}
- >
- <ComboboxTrigger
- render={<Button variant="ghost" size="xs" />}
- className="text-muted-foreground/70 hover:text-foreground/80"
- disabled={branchesQuery.isLoading || isBranchActionPending}
- >
- <span className="max-w-[240px] truncate">
- {resolvedActiveBranch
- ? effectiveEnvMode === "worktree" && !activeWorktreePath
- ? `From ${resolvedActiveBranch}`
- : resolvedActiveBranch
- : "Select branch"}
- </span>
- <ChevronDownIcon />
- </ComboboxTrigger>
- <ComboboxPopup align="end" side="top" className="w-64">
- <div className="border-b p-1">
- <ComboboxInput
- className="[&_input]:font-sans rounded-md"
- inputClassName="ring-0"
- placeholder="Search branches..."
- showTrigger={false}
- size="sm"
- value={branchQuery}
- onChange={(event) => setBranchQuery(event.target.value)}
- />
- </div>
- <ComboboxEmpty>No branches found.</ComboboxEmpty>
-
- <ComboboxList ref={setBranchListRef} className="max-h-56">
- <div
- className="relative"
- style={{
- height: `${branchListVirtualizer.getTotalSize()}px`,
- }}
- >
- {virtualBranchRows.map((virtualRow) => {
- const itemValue = filteredBranchPickerItems[virtualRow.index];
- if (!itemValue) return null;
- if (createBranchItemValue && itemValue === createBranchItemValue) {
- return (
- <ComboboxItem
- hideIndicator
- key={itemValue}
- index={virtualRow.index}
- value={itemValue}
- style={{
- position: "absolute",
- top: 0,
- left: 0,
- width: "100%",
- transform: `translateY(${virtualRow.start}px)`,
- }}
- onClick={() => createBranch(trimmedBranchQuery)}
- >
- <span className="truncate">Create new branch "{trimmedBranchQuery}"</span>
- </ComboboxItem>
- );
- }
-
- const branch = branchByName.get(itemValue);
- if (!branch) return null;
-
- const hasSecondaryWorktree =
- branch.worktreePath && branch.worktreePath !== activeProject.cwd;
- const badge = branch.current
- ? "current"
- : hasSecondaryWorktree
- ? "worktree"
- : branch.isRemote
- ? "remote"
- : branch.isDefault
- ? "default"
- : null;
- return (
- <ComboboxItem
- hideIndicator
- key={itemValue}
- index={virtualRow.index}
- value={itemValue}
- className={
- itemValue === resolvedActiveBranch ? "bg-accent text-foreground" : undefined
- }
- style={{
- position: "absolute",
- top: 0,
- left: 0,
- width: "100%",
- transform: `translateY(${virtualRow.start}px)`,
- }}
- onClick={() => selectBranch(branch)}
- >
- <div className="flex w-full items-center justify-between gap-2">
- <span className="truncate">{itemValue}</span>
- {badge && (
- <span className="shrink-0 text-[10px] text-muted-foreground/45">
- {badge}
- </span>
- )}
- </div>
- </ComboboxItem>
- );
- })}
- </div>
- </ComboboxList>
- </ComboboxPopup>
- </Combobox>
+ <BranchToolbarBranchSelector
+ activeProjectCwd={activeProject.cwd}
+ activeThreadBranch={activeThreadBranch}
+ activeWorktreePath={activeWorktreePath}
+ branchCwd={branchCwd}
+ effectiveEnvMode={effectiveEnvMode}
+ envLocked={envLocked}
+ onSetThreadBranch={setThreadBranch}
+ {...(onComposerFocusRequest ? { onComposerFocusRequest } : {})}
+ />
</div>
);
}
diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
new file mode 100644
index 000000000..bb3170981
--- /dev/null
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -0,0 +1,394 @@
+import type { GitBranch } from "@t3tools/contracts";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { ChevronDownIcon } from "lucide-react";
+import { useCallback, useEffect, useMemo, useOptimistic, useRef, useState, useTransition } from "react";
+
+import { gitBranchesQueryOptions, gitQueryKeys, invalidateGitQueries } from "../lib/gitReactQuery";
+import { readNativeApi } from "../nativeApi";
+import {
+ dedupeRemoteBranchesWithLocalMatches,
+ deriveLocalBranchNameFromRemoteRef,
+ resolveBranchToolbarValue,
+} from "./BranchToolbar.logic";
+import { Button } from "./ui/button";
+import {
+ Combobox,
+ ComboboxEmpty,
+ ComboboxInput,
+ ComboboxItem,
+ ComboboxList,
+ ComboboxPopup,
+ ComboboxTrigger,
+} from "./ui/combobox";
+import { toastManager } from "./ui/toast";
+
+interface BranchToolbarBranchSelectorProps {
+ activeProjectCwd: string;
+ activeThreadBranch: string | null;
+ activeWorktreePath: string | null;
+ branchCwd: string | null;
+ effectiveEnvMode: "local" | "worktree";
+ envLocked: boolean;
+ onSetThreadBranch: (branch: string | null, worktreePath: string | null) => void;
+ onComposerFocusRequest?: () => void;
+}
+
+function toBranchActionErrorMessage(error: unknown): string {
+ return error instanceof Error ? error.message : "An error occurred.";
+}
+
+function getBranchTriggerLabel(input: {
+ activeWorktreePath: string | null;
+ effectiveEnvMode: "local" | "worktree";
+ resolvedActiveBranch: string | null;
+}): string {
+ const { activeWorktreePath, effectiveEnvMode, resolvedActiveBranch } = input;
+ if (!resolvedActiveBranch) {
+ return "Select branch";
+ }
+ if (effectiveEnvMode === "worktree" && !activeWorktreePath) {
+ return `From ${resolvedActiveBranch}`;
+ }
+ return resolvedActiveBranch;
+}
+
+export function BranchToolbarBranchSelector({
+ activeProjectCwd,
+ activeThreadBranch,
+ activeWorktreePath,
+ branchCwd,
+ effectiveEnvMode,
+ envLocked,
+ onSetThreadBranch,
+ onComposerFocusRequest,
+}: BranchToolbarBranchSelectorProps) {
+ const queryClient = useQueryClient();
+ const [isBranchMenuOpen, setIsBranchMenuOpen] = useState(false);
+ const [branchQuery, setBranchQuery] = useState("");
+
+ const branchesQuery = useQuery(gitBranchesQueryOptions(branchCwd));
+ const branches = useMemo(
+ () => dedupeRemoteBranchesWithLocalMatches(branchesQuery.data?.branches ?? []),
+ [branchesQuery.data?.branches],
+ );
+ const currentGitBranch = branches.find((branch) => branch.current)?.name ?? null;
+ const canonicalActiveBranch = resolveBranchToolbarValue({
+ envMode: effectiveEnvMode,
+ activeWorktreePath,
+ activeThreadBranch,
+ currentGitBranch,
+ });
+ const branchNames = useMemo(() => branches.map((branch) => branch.name), [branches]);
+ const branchByName = useMemo(
+ () => new Map(branches.map((branch) => [branch.name, branch] as const)),
+ [branches],
+ );
+ const trimmedBranchQuery = branchQuery.trim();
+ const normalizedBranchQuery = trimmedBranchQuery.toLowerCase();
+ const canCreateBranch = effectiveEnvMode === "local" && trimmedBranchQuery.length > 0;
+ const hasExactBranchMatch = branchByName.has(trimmedBranchQuery);
+ const createBranchItemValue = canCreateBranch
+ ? `__create_new_branch__:${trimmedBranchQuery}`
+ : null;
+ const branchPickerItems = useMemo(
+ () =>
+ createBranchItemValue && !hasExactBranchMatch
+ ? [...branchNames, createBranchItemValue]
+ : branchNames,
+ [branchNames, createBranchItemValue, hasExactBranchMatch],
+ );
+ const filteredBranchPickerItems = useMemo(
+ () =>
+ normalizedBranchQuery.length === 0
+ ? branchPickerItems
+ : branchPickerItems.filter((itemValue) => {
+ if (createBranchItemValue && itemValue === createBranchItemValue) return true;
+ return itemValue.toLowerCase().includes(normalizedBranchQuery);
+ }),
+ [branchPickerItems, createBranchItemValue, normalizedBranchQuery],
+ );
+ const [resolvedActiveBranch, setOptimisticBranch] = useOptimistic(
+ canonicalActiveBranch,
+ (_currentBranch: string | null, optimisticBranch: string | null) => optimisticBranch,
+ );
+ const [isBranchActionPending, startBranchActionTransition] = useTransition();
+
+ const runBranchAction = (action: () => Promise<void>) => {
+ startBranchActionTransition(async () => {
+ await action().catch(() => undefined);
+ await invalidateGitQueries(queryClient).catch(() => undefined);
+ });
+ };
+
+ const selectBranch = (branch: GitBranch) => {
+ const api = readNativeApi();
+ if (!api || !branchCwd || isBranchActionPending) return;
+
+ // In new-worktree mode, selecting a branch sets the base branch.
+ if (effectiveEnvMode === "worktree" && !envLocked && !activeWorktreePath) {
+ onSetThreadBranch(branch.name, null);
+ setIsBranchMenuOpen(false);
+ onComposerFocusRequest?.();
+ return;
+ }
+
+ // If the branch already lives in a worktree, point the thread there.
+ if (branch.worktreePath) {
+ const isMainWorktree = branch.worktreePath === activeProjectCwd;
+ onSetThreadBranch(branch.name, isMainWorktree ? null : branch.worktreePath);
+ setIsBranchMenuOpen(false);
+ onComposerFocusRequest?.();
+ return;
+ }
+
+ const selectedBranchName = branch.isRemote
+ ? deriveLocalBranchNameFromRemoteRef(branch.name)
+ : branch.name;
+
+ setIsBranchMenuOpen(false);
+ onComposerFocusRequest?.();
+
+ runBranchAction(async () => {
+ setOptimisticBranch(selectedBranchName);
+ try {
+ await api.git.checkout({ cwd: branchCwd, branch: branch.name });
+ await invalidateGitQueries(queryClient);
+ } catch (error) {
+ toastManager.add({
+ type: "error",
+ title: "Failed to checkout branch.",
+ description: toBranchActionErrorMessage(error),
+ });
+ return;
+ }
+
+ let nextBranchName = selectedBranchName;
+ if (branch.isRemote) {
+ const status = await api.git.status({ cwd: branchCwd }).catch(() => null);
+ if (status?.branch) {
+ nextBranchName = status.branch;
+ }
+ }
+
+ setOptimisticBranch(nextBranchName);
+ onSetThreadBranch(nextBranchName, activeWorktreePath);
+ });
+ };
+
+ const createBranch = (rawName: string) => {
+ const name = rawName.trim();
+ const api = readNativeApi();
+ if (!api || !branchCwd || !name || isBranchActionPending) return;
+
+ setIsBranchMenuOpen(false);
+ onComposerFocusRequest?.();
+
+ runBranchAction(async () => {
+ setOptimisticBranch(name);
+
+ try {
+ await api.git.createBranch({ cwd: branchCwd, branch: name });
+ try {
+ await api.git.checkout({ cwd: branchCwd, branch: name });
+ } catch (error) {
+ toastManager.add({
+ type: "error",
+ title: "Failed to checkout branch.",
+ description: toBranchActionErrorMessage(error),
+ });
+ return;
+ }
+ } catch (error) {
+ toastManager.add({
+ type: "error",
+ title: "Failed to create branch.",
+ description: toBranchActionErrorMessage(error),
+ });
+ return;
+ }
+
+ setOptimisticBranch(name);
+ onSetThreadBranch(name, activeWorktreePath);
+ setBranchQuery("");
+ });
+ };
+
+ useEffect(() => {
+ if (effectiveEnvMode !== "worktree" || activeWorktreePath || activeThreadBranch || !currentGitBranch) {
+ return;
+ }
+ onSetThreadBranch(currentGitBranch, null);
+ }, [
+ activeThreadBranch,
+ activeWorktreePath,
+ currentGitBranch,
+ effectiveEnvMode,
+ onSetThreadBranch,
+ ]);
+
+ const handleOpenChange = useCallback(
+ (open: boolean) => {
+ setIsBranchMenuOpen(open);
+ if (!open) {
+ setBranchQuery("");
+ return;
+ }
+ void queryClient.invalidateQueries({
+ queryKey: gitQueryKeys.branches(branchCwd),
+ });
+ },
+ [branchCwd, queryClient],
+ );
+
+ const branchListScrollElementRef = useRef<HTMLDivElement | null>(null);
+ const branchListVirtualizer = useVirtualizer({
+ count: filteredBranchPickerItems.length,
+ estimateSize: () => 28,
+ getScrollElement: () => branchListScrollElementRef.current,
+ overscan: 12,
+ enabled: isBranchMenuOpen,
+ initialRect: {
+ height: 224,
+ width: 0,
+ },
+ });
+ const virtualBranchRows = branchListVirtualizer.getVirtualItems();
+ const setBranchListRef = useCallback(
+ (element: HTMLDivElement | null) => {
+ branchListScrollElementRef.current =
+ (element?.parentElement as HTMLDivElement | null) ?? null;
+ if (element) {
+ branchListVirtualizer.measure();
+ }
+ },
+ [branchListVirtualizer],
+ );
+
+ useEffect(() => {
+ if (!isBranchMenuOpen) return;
+ queueMicrotask(() => {
+ branchListVirtualizer.measure();
+ });
+ }, [branchListVirtualizer, filteredBranchPickerItems.length, isBranchMenuOpen]);
+
+ const triggerLabel = getBranchTriggerLabel({
+ activeWorktreePath,
+ effectiveEnvMode,
+ resolvedActiveBranch,
+ });
+
+ return (
+ <Combobox
+ items={branchPickerItems}
+ filteredItems={filteredBranchPickerItems}
+ autoHighlight
+ virtualized
+ onItemHighlighted={(_value, eventDetails) => {
+ if (!isBranchMenuOpen || eventDetails.index < 0) return;
+ branchListVirtualizer.scrollToIndex(eventDetails.index, { align: "auto" });
+ }}
+ onOpenChange={handleOpenChange}
+ open={isBranchMenuOpen}
+ value={resolvedActiveBranch}
+ >
+ <ComboboxTrigger
+ render={<Button variant="ghost" size="xs" />}
+ className="text-muted-foreground/70 hover:text-foreground/80"
+ disabled={branchesQuery.isLoading || isBranchActionPending}
+ >
+ <span className="max-w-[240px] truncate">{triggerLabel}</span>
+ <ChevronDownIcon />
+ </ComboboxTrigger>
+ <ComboboxPopup align="end" side="top" className="w-64">
+ <div className="border-b p-1">
+ <ComboboxInput
+ className="[&_input]:font-sans rounded-md"
+ inputClassName="ring-0"
+ placeholder="Search branches..."
+ showTrigger={false}
+ size="sm"
+ value={branchQuery}
+ onChange={(event) => setBranchQuery(event.target.value)}
+ />
+ </div>
+ <ComboboxEmpty>No branches found.</ComboboxEmpty>
+
+ <ComboboxList ref={setBranchListRef} className="max-h-56">
+ <div
+ className="relative"
+ style={{
+ height: `${branchListVirtualizer.getTotalSize()}px`,
+ }}
+ >
+ {virtualBranchRows.map((virtualRow) => {
+ const itemValue = filteredBranchPickerItems[virtualRow.index];
+ if (!itemValue) return null;
+ if (createBranchItemValue && itemValue === createBranchItemValue) {
+ return (
+ <ComboboxItem
+ hideIndicator
+ key={itemValue}
+ index={virtualRow.index}
+ value={itemValue}
+ style={{
+ position: "absolute",
+ top: 0,
+ left: 0,
+ width: "100%",
+ transform: `translateY(${virtualRow.start}px)`,
+ }}
+ onClick={() => createBranch(trimmedBranchQuery)}
+ >
+ <span className="truncate">Create new branch "{trimmedBranchQuery}"</span>
+ </ComboboxItem>
+ );
+ }
+
+ const branch = branchByName.get(itemValue);
+ if (!branch) return null;
+
+ const hasSecondaryWorktree =
+ branch.worktreePath && branch.worktreePath !== activeProjectCwd;
+ const badge = branch.current
+ ? "current"
+ : hasSecondaryWorktree
+ ? "worktree"
+ : branch.isRemote
+ ? "remote"
+ : branch.isDefault
+ ? "default"
+ : null;
+ return (
+ <ComboboxItem
+ hideIndicator
+ key={itemValue}
+ index={virtualRow.index}
+ value={itemValue}
+ className={
+ itemValue === resolvedActiveBranch ? "bg-accent text-foreground" : undefined
+ }
+ style={{
+ position: "absolute",
+ top: 0,
+ left: 0,
+ width: "100%",
+ transform: `translateY(${virtualRow.start}px)`,
+ }}
+ onClick={() => selectBranch(branch)}
+ >
+ <div className="flex w-full items-center justify-between gap-2">
+ <span className="truncate">{itemValue}</span>
+ {badge && (
+ <span className="shrink-0 text-[10px] text-muted-foreground/45">{badge}</span>
+ )}
+ </div>
+ </ComboboxItem>
+ );
+ })}
+ </div>
+ </ComboboxList>
+ </ComboboxPopup>
+ </Combobox>
+ );
+}