@@ -6,12 +6,13 @@ import {
66 FolderGit2Icon ,
77 FolderGitIcon ,
88 FolderIcon ,
9+ HistoryIcon ,
910 MonitorIcon ,
1011} from "lucide-react" ;
11- import { memo , useMemo } from "react" ;
12+ import { memo , useCallback , useMemo } from "react" ;
1213
1314import { useComposerDraftStore , type DraftId } from "../composerDraftStore" ;
14- import { useProject , useThread } from "../state/entities" ;
15+ import { useProject , useThread , useThreadShellsForProjectRefs } from "../state/entities" ;
1516import { useIsMobile } from "../hooks/useMediaQuery" ;
1617import {
1718 type EnvMode ,
@@ -20,6 +21,8 @@ import {
2021 resolveEnvModeLabel ,
2122 resolveEffectiveEnvMode ,
2223 resolveLockedWorkspaceLabel ,
24+ resolvePreviousWorktreeLabel ,
25+ resolvePreviousWorktreeSeed ,
2326 shouldShowEnvironmentIndicator ,
2427} from "./BranchToolbar.logic" ;
2528import { BranchToolbarBranchSelector } from "./BranchToolbarBranchSelector" ;
@@ -66,6 +69,8 @@ interface MobileRunContextSelectorProps {
6669 effectiveEnvMode : EnvMode ;
6770 activeWorktreePath : string | null ;
6871 onEnvModeChange : ( mode : EnvMode ) => void ;
72+ previousWorktreeLabel : string | null ;
73+ onUsePreviousWorktree : ( ) => void ;
6974}
7075
7176const MobileRunContextSelector = memo ( function MobileRunContextSelector ( {
@@ -79,6 +84,8 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
7984 effectiveEnvMode,
8085 activeWorktreePath,
8186 onEnvModeChange,
87+ previousWorktreeLabel,
88+ onUsePreviousWorktree,
8289} : MobileRunContextSelectorProps ) {
8390 const activeEnvironment = useMemo (
8491 ( ) => availableEnvironments ?. find ( ( env ) => env . environmentId === environmentId ) ?? null ,
@@ -166,7 +173,13 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
166173 < MenuGroupLabel > Workspace</ MenuGroupLabel >
167174 < MenuRadioGroup
168175 value = { effectiveEnvMode }
169- onValueChange = { ( value ) => onEnvModeChange ( value as EnvMode ) }
176+ onValueChange = { ( value ) => {
177+ if ( value === "previous-worktree" ) {
178+ onUsePreviousWorktree ( ) ;
179+ return ;
180+ }
181+ onEnvModeChange ( value as EnvMode ) ;
182+ } }
170183 >
171184 < MenuRadioItem disabled = { envModeLocked } value = "local" >
172185 < span className = "flex min-w-0 items-center gap-1.5" >
@@ -186,6 +199,14 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
186199 < span className = "min-w-0 truncate" > { resolveEnvModeLabel ( "worktree" ) } </ span >
187200 </ span >
188201 </ MenuRadioItem >
202+ { previousWorktreeLabel ? (
203+ < MenuRadioItem disabled = { envModeLocked } value = "previous-worktree" >
204+ < span className = "flex min-w-0 items-center gap-1.5" >
205+ < HistoryIcon className = "size-3" />
206+ < span className = "min-w-0 truncate" > { previousWorktreeLabel } </ span >
207+ </ span >
208+ </ MenuRadioItem >
209+ ) : null }
189210 </ MenuRadioGroup >
190211 </ MenuGroup >
191212 </ MenuPopup >
@@ -217,6 +238,7 @@ export const BranchToolbar = memo(function BranchToolbar({
217238 const draftThread = useComposerDraftStore ( ( store ) =>
218239 draftId ? store . getDraftSession ( draftId ) : store . getDraftThreadByRef ( threadRef ) ,
219240 ) ;
241+ const setDraftThreadContext = useComposerDraftStore ( ( store ) => store . setDraftThreadContext ) ;
220242 const activeProjectRef = serverThread
221243 ? scopeProjectRef ( serverThread . environmentId , serverThread . projectId )
222244 : draftThread
@@ -234,6 +256,40 @@ export const BranchToolbar = memo(function BranchToolbar({
234256 } ) ;
235257 const envModeLocked = envLocked || ( serverThread !== null && activeWorktreePath !== null ) ;
236258
259+ // "Previous worktree" hops a draft into the most recently active worktree
260+ // of this project — the "keep going where I just was" follow-up flow. Only
261+ // drafts can hop; started server threads have their workspace pinned.
262+ const canUsePreviousWorktree = draftThread !== null && serverThread === null && ! envModeLocked ;
263+ const projectRefsForWorktreeLookup = useMemo (
264+ ( ) => ( canUsePreviousWorktree && activeProjectRef ? [ activeProjectRef ] : [ ] ) ,
265+ [ canUsePreviousWorktree , activeProjectRef ] ,
266+ ) ;
267+ const projectThreads = useThreadShellsForProjectRefs ( projectRefsForWorktreeLookup ) ;
268+ const previousWorktreeSeed = useMemo (
269+ ( ) =>
270+ canUsePreviousWorktree
271+ ? resolvePreviousWorktreeSeed ( {
272+ threads : projectThreads ,
273+ currentWorktreePath : activeWorktreePath ,
274+ } )
275+ : null ,
276+ [ activeWorktreePath , canUsePreviousWorktree , projectThreads ] ,
277+ ) ;
278+ const previousWorktreeLabel = previousWorktreeSeed
279+ ? resolvePreviousWorktreeLabel ( previousWorktreeSeed )
280+ : null ;
281+ const onUsePreviousWorktree = useCallback ( ( ) => {
282+ if ( ! previousWorktreeSeed || ! activeProjectRef ) return ;
283+ // Same shape the branch selector writes when picking a branch that
284+ // already lives in a worktree: point the draft at the existing tree.
285+ setDraftThreadContext ( draftId ?? threadRef , {
286+ branch : previousWorktreeSeed . branch ,
287+ worktreePath : previousWorktreeSeed . worktreePath ,
288+ envMode : "worktree" ,
289+ projectRef : activeProjectRef ,
290+ } ) ;
291+ } , [ activeProjectRef , draftId , previousWorktreeSeed , setDraftThreadContext , threadRef ] ) ;
292+
237293 const showEnvironmentPicker = Boolean (
238294 availableEnvironments && availableEnvironments . length > 1 && onEnvironmentChange ,
239295 ) ;
@@ -261,6 +317,8 @@ export const BranchToolbar = memo(function BranchToolbar({
261317 effectiveEnvMode = { effectiveEnvMode }
262318 activeWorktreePath = { activeWorktreePath }
263319 onEnvModeChange = { onEnvModeChange }
320+ previousWorktreeLabel = { previousWorktreeLabel }
321+ onUsePreviousWorktree = { onUsePreviousWorktree }
264322 />
265323 ) : (
266324 < div className = "flex min-w-0 shrink-0 items-center gap-1" >
@@ -280,6 +338,8 @@ export const BranchToolbar = memo(function BranchToolbar({
280338 effectiveEnvMode = { effectiveEnvMode }
281339 activeWorktreePath = { activeWorktreePath }
282340 onEnvModeChange = { onEnvModeChange }
341+ previousWorktreeLabel = { previousWorktreeLabel }
342+ onUsePreviousWorktree = { onUsePreviousWorktree }
283343 />
284344 </ div >
285345 ) }
0 commit comments