Skip to content

fix(web): show the worktree picker in the composer strip at default width #27114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maria-rcks merged 3 commits into from
Oct 31, 2026
Merged

fix(web): show the worktree picker in the composer strip at default width #27114

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4ae94e
fix(web): show the worktree picker in the composer strip at default w…
hwanseoc Oct 29, 2026
9ab4a61
chore: merge main into worktree picker fix
maria-rcks Oct 30, 2026
016a2ba
Merge branch 'main' into hwanseoc/fix-worktree-selection-menu
hwanseoc Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/web/src/components/BranchToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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",
)}
>
Expand Down Expand Up @@ -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 } : {})}
Expand Down
Loading