1+ import { useAtomSet , useAtomValue } from "@effect/atom-react" ;
2+ import { AsyncResult } from "effect/unstable/reactivity" ;
3+ import { mobilePreferencesAtom , updateMobilePreferencesAtom } from "../../state/preferences" ;
14import React , { useCallback , useEffect , useMemo , useRef , useState } from "react" ;
25
36import type {
@@ -147,6 +150,7 @@ type NewTaskFlowContextValue = {
147150 readonly selectedModelKey : string | null ;
148151 readonly workspaceMode : WorkspaceMode ;
149152 readonly selectedBranchName : string | null ;
153+ readonly lastWorktreeBaseBranch : string | null ;
150154 readonly selectedWorktreePath : string | null ;
151155 readonly startFromOrigin : boolean ;
152156 readonly draftKey : string | null ;
@@ -464,6 +468,21 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
464468 const workspaceMode = selectedProjectDraft . workspaceSelection ?. mode ?? defaultWorkspaceMode ;
465469 const selectedBranchName = selectedProjectDraft . workspaceSelection ?. branch ?? null ;
466470 const selectedWorktreePath = selectedProjectDraft . workspaceSelection ?. worktreePath ?? null ;
471+ const preferencesResult = useAtomValue ( mobilePreferencesAtom ) ;
472+ const preferencesLoaded = AsyncResult . isSuccess ( preferencesResult ) ;
473+ const savePreferences = useAtomSet ( updateMobilePreferencesAtom ) ;
474+ const lastWorktreeBaseBranch =
475+ preferencesLoaded && selectedProject
476+ ? ( preferencesResult . value . lastWorktreeBaseBranchByProject ?. [
477+ scopedProjectKey ( selectedProject . environmentId , selectedProject . id )
478+ ] ?? null )
479+ : null ;
480+ const configuredBaseRef = selectedEnvironmentServerConfig
481+ ? projectSettings . settings . defaultWorktreeBaseRef
482+ : undefined ;
483+ const rememberedBranch =
484+ configuredBaseRef && typeof configuredBaseRef === "object" ? lastWorktreeBaseBranch : null ;
485+
467486 // Keep the user's explicit choice separate from the resolved display value:
468487 // only the explicit flag is ever written back to the draft, so the resolved
469488 // value keeps tracking the server setting when the config loads late.
@@ -650,6 +669,50 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
650669 const hasMoreBranches =
651670 branchState . data ?. nextCursor !== null && branchState . data ?. nextCursor !== undefined ;
652671 const allBranchRefs = branchState . refs ;
672+ const needsWorktreeBase =
673+ workspaceMode === "worktree" && selectedBranchName === null && selectedWorktreePath === null ;
674+ const baseBranchesQuery = useEnvironmentQuery (
675+ needsWorktreeBase && selectedProject ?. workspaceRoot
676+ ? vcsEnvironment . listRefs ( {
677+ environmentId : selectedProject . environmentId ,
678+ input : { cwd : selectedProject . workspaceRoot , limit : 100 } ,
679+ } )
680+ : null ,
681+ ) ;
682+ const rememberedBranchState = usePaginatedBranches ( {
683+ environmentId : selectedProject ?. environmentId ?? null ,
684+ cwd : needsWorktreeBase && rememberedBranch ? selectedProject ?. workspaceRoot || null : null ,
685+ query : rememberedBranch ?. slice ( 0 , 256 ) ?? null ,
686+ includeMatchingRemoteRefs : true ,
687+ } ) ;
688+ const rememberedRef = rememberedBranchState . refs . find ( ( ref ) => ref . name === rememberedBranch ) ;
689+ const hasMoreRememberedRefs = rememberedBranchState . data ?. nextCursor != null ;
690+ const loadMoreRememberedRefs = rememberedBranchState . loadNext ;
691+ useEffect ( ( ) => {
692+ if (
693+ needsWorktreeBase &&
694+ rememberedBranch &&
695+ ! rememberedRef &&
696+ hasMoreRememberedRefs &&
697+ ! rememberedBranchState . isPending &&
698+ ! rememberedBranchState . error
699+ )
700+ loadMoreRememberedRefs ( ) ;
701+ } , [
702+ needsWorktreeBase ,
703+ rememberedBranch ,
704+ rememberedRef ,
705+ hasMoreRememberedRefs ,
706+ rememberedBranchState . isPending ,
707+ rememberedBranchState . error ,
708+ loadMoreRememberedRefs ,
709+ ] ) ;
710+ const rememberedBranchPending =
711+ rememberedBranch !== null &&
712+ ! rememberedRef &&
713+ ! rememberedBranchState . error &&
714+ ( rememberedBranchState . data === null || hasMoreRememberedRefs ) ;
715+
653716 const availableBranches = useMemo (
654717 ( ) =>
655718 pipe (
@@ -819,6 +882,16 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
819882 if ( ! selectedProject || ! selectedProjectDraftKey ) {
820883 return ;
821884 }
885+ if ( workspaceMode === "worktree" ) {
886+ savePreferences ( {
887+ transform : ( current ) => ( {
888+ lastWorktreeBaseBranchByProject : {
889+ ...current . lastWorktreeBaseBranchByProject ,
890+ [ scopedProjectKey ( selectedProject . environmentId , selectedProject . id ) ] : branch . name ,
891+ } ,
892+ } ) ,
893+ } ) ;
894+ }
822895 pendingLocalBranchSyncDraftKeysRef . current . delete ( selectedProjectDraftKey ) ;
823896 updateComposerDraftSettings ( selectedProjectDraftKey , {
824897 workspaceSelection : {
@@ -833,7 +906,13 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
833906 } ,
834907 } ) ;
835908 } ,
836- [ draftStartFromOrigin , selectedProject , selectedProjectDraftKey , workspaceMode ] ,
909+ [
910+ draftStartFromOrigin ,
911+ selectedProject ,
912+ selectedProjectDraftKey ,
913+ workspaceMode ,
914+ savePreferences ,
915+ ] ,
837916 ) ;
838917
839918 const setStartFromOrigin = useCallback (
@@ -867,6 +946,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
867946 if (
868947 ! selectedProjectDraftKey ||
869948 ! defaultWorkspaceModeSettled ||
949+ ! preferencesLoaded ||
950+ baseBranchesQuery . data === null ||
951+ rememberedBranchPending ||
870952 workspaceMode !== "worktree" ||
871953 selectedBranchName !== null
872954 ) {
@@ -882,11 +964,10 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
882964 // The default may only exist as origin/<default> (isRemote), which
883965 // availableBranches filters out — search the unfiltered refs for it.
884966 const preferredBranch = resolveDefaultWorktreeBaseRef ( {
885- configuredRef : selectedEnvironmentServerConfig
886- ? projectSettings . settings . defaultWorktreeBaseRef
887- : undefined ,
888- refs : allBranchRefs ,
889- currentBranch : availableBranches . find ( ( branch ) => branch . current ) ?. name ?? null ,
967+ configuredRef : configuredBaseRef ,
968+ rememberedRef : rememberedRef ?. name ?? null ,
969+ refs : baseBranchesQuery . data . refs ,
970+ currentBranch : baseBranchesQuery . data . refs . find ( ( branch ) => branch . current ) ?. name ?? null ,
890971 } ) ;
891972 if ( preferredBranch ) {
892973 updateComposerDraftSettings ( selectedProjectDraftKey , {
@@ -899,13 +980,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
899980 } ) ;
900981 }
901982 } , [
902- allBranchRefs ,
903- availableBranches ,
983+ baseBranchesQuery . data ,
984+ preferencesLoaded ,
985+ rememberedBranchPending ,
986+ rememberedRef ,
987+ configuredBaseRef ,
904988 defaultWorkspaceModeSettled ,
905989 draftStartFromOrigin ,
906- projectSettings . settings . defaultWorktreeBaseRef ,
907990 selectedBranchName ,
908- selectedEnvironmentServerConfig ,
909991 selectedProjectDraftKey ,
910992 workspaceMode ,
911993 ] ) ;
@@ -1167,6 +1249,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
11671249 selectedModelKey,
11681250 workspaceMode,
11691251 selectedBranchName,
1252+ lastWorktreeBaseBranch,
11701253 selectedWorktreePath,
11711254 startFromOrigin,
11721255 draftKey : selectedProjectDraftKey ,
@@ -1247,6 +1330,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
12471330 reset ,
12481331 runtimeMode ,
12491332 selectedBranchName ,
1333+ lastWorktreeBaseBranch ,
12501334 hasMoreBranches ,
12511335 selectedEnvironmentId ,
12521336 selectedModel ,
0 commit comments