From d4ae94e7e8a0ae66e5c47d2954849765f8a50381 Mon Sep 17 00:00:00 2001
From: Hwanseo Choi <hwanseoc@nvidia.com>
Date: Thu, 29 Oct 2026 12:39:21 -0700
Subject: [PATCH] fix(web): show the worktree picker in the composer strip at
 default width

When a project can run on more than one machine, the composer strip merged
the machine and workspace pickers into one button below a 48rem container
width, which the default 46rem chat width never reaches. That button shows
only the machine name, so the Local / New worktree choice was hidden.

Lower the split breakpoint to 36rem. The 48rem breakpoint reserved room for
the collapsed composer controls the strip no longer hosts, and the strip
already collapses labels to icons when it runs out of room.
---
 apps/web/src/components/BranchToolbar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index 4d57bc7332525..27639044e758c 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -747,7 +747,7 @@ export const BranchToolbar = memo(function BranchToolbar({
       className={cn("gap-1 text-xs font-normal text-foreground/70 dark:text-muted-foreground")}
     >
       {showGitControls ? (
-        <div className="contents @3xl/composer-surface:hidden">
+        <div className="contents @xl/composer-surface:hidden">
           <RunContextSelector
             forceNewWorktree={forceNewWorktree}
             autoEnvironmentLabel={autoEnvironmentLabel}
@@ -774,7 +774,7 @@ export const BranchToolbar = memo(function BranchToolbar({
         <div
           className={cn(
             "min-h-7 min-w-10 items-center gap-1 sm:min-h-6",
-            showGitControls ? "hidden @3xl/composer-surface:flex" : "flex",
+            showGitControls ? "hidden @xl/composer-surface:flex" : "flex",
             "flex-1",
           )}
         >
@@ -817,7 +817,7 @@ export const BranchToolbar = memo(function BranchToolbar({
         <BranchToolbarBranchSelector
           forceNewWorktree={forceNewWorktree}
           ref={branchSelectorRef}
-          className="min-w-0 flex-initial justify-end @3xl/composer-surface:ml-auto"
+          className="min-w-0 flex-initial justify-end @xl/composer-surface:ml-auto"
           environmentId={environmentId}
           threadId={threadId}
           {...(draftId ? { draftId } : {})}