55 FolderGit2Icon ,
66 FolderGitIcon ,
77 FolderIcon ,
8- HistoryIcon ,
98 ScaleIcon ,
109} from "lucide-react" ;
1110import {
@@ -41,6 +40,7 @@ import {
4140} from "./BranchToolbarBranchSelector" ;
4241import { BranchToolbarEnvironmentSelector } from "./BranchToolbarEnvironmentSelector" ;
4342import { BranchToolbarEnvModeSelector } from "./BranchToolbarEnvModeSelector" ;
43+ import { PreviousWorktreeItemContent } from "./PreviousWorktreeItemContent" ;
4444import { ComposerControl } from "./chat/ComposerControl" ;
4545import {
4646 Menu ,
@@ -105,6 +105,7 @@ interface MobileRunContextSelectorProps {
105105 activeWorktreePath : string | null ;
106106 onEnvModeChange : ( mode : EnvMode ) => void ;
107107 previousWorktreeLabel : string | null ;
108+ previousWorktreeBranch : string | null ;
108109 onUsePreviousWorktree : ( ) => void ;
109110}
110111
@@ -123,6 +124,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
123124 activeWorktreePath,
124125 onEnvModeChange,
125126 previousWorktreeLabel,
127+ previousWorktreeBranch,
126128 onUsePreviousWorktree,
127129} : MobileRunContextSelectorProps ) {
128130 const composerFloatingLayerProps = useComposerMenuProps ( ) ;
@@ -217,7 +219,12 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
217219 { triggerContent }
218220 < ChevronDownIcon className = "size-3 shrink-0 opacity-50" />
219221 </ MenuTrigger >
220- < MenuPopup align = "start" side = "top" { ...composerFloatingLayerProps } >
222+ < MenuPopup
223+ align = "start"
224+ side = "top"
225+ className = { previousWorktreeLabel ? "w-[min(21rem,calc(100vw-2rem))]" : undefined }
226+ { ...composerFloatingLayerProps }
227+ >
221228 { showEnvironmentPicker && availableEnvironments && onEnvironmentChange ? (
222229 < >
223230 < MenuGroup >
@@ -295,10 +302,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
295302 </ MenuRadioItem >
296303 { previousWorktreeLabel ? (
297304 < MenuRadioItem disabled = { envModeLocked } value = "previous-worktree" closeOnClick >
298- < span className = "flex min-w-0 items-center gap-1.5" >
299- < HistoryIcon className = "size-3" />
300- < MiddleTruncate value = { previousWorktreeLabel } />
301- </ span >
305+ < PreviousWorktreeItemContent branch = { previousWorktreeBranch } />
302306 </ MenuRadioItem >
303307 ) : null }
304308 </ MenuRadioGroup >
@@ -630,6 +634,7 @@ export const BranchToolbar = memo(function BranchToolbar({
630634 activeWorktreePath = { activeWorktreePath }
631635 onEnvModeChange = { onEnvModeChange }
632636 previousWorktreeLabel = { previousWorktreeLabel }
637+ previousWorktreeBranch = { previousWorktreeSeed ?. branch ?? null }
633638 onUsePreviousWorktree = { onUsePreviousWorktree }
634639 />
635640 </ div >
@@ -669,6 +674,7 @@ export const BranchToolbar = memo(function BranchToolbar({
669674 activeWorktreePath = { activeWorktreePath }
670675 onEnvModeChange = { onEnvModeChange }
671676 previousWorktreeLabel = { previousWorktreeLabel }
677+ previousWorktreeBranch = { previousWorktreeSeed ?. branch ?? null }
672678 onUsePreviousWorktree = { onUsePreviousWorktree }
673679 />
674680 ) : null }
0 commit comments