@@ -58,6 +58,8 @@ import { type VcsRef } from "@t3tools/client-runtime/state/vcs";
5858
5959type WorkspaceMode = "local" | "worktree" ;
6060
61+ const EMPTY_BRANCH_REFS : ReadonlyArray < VcsRef > = [ ] ;
62+
6163function pendingTaskDraftKey ( messageId : string ) : string {
6264 return `pending-task:${ messageId } ` ;
6365}
@@ -348,7 +350,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
348350 const workspaceMode = selectedProjectDraft . workspaceSelection ?. mode ?? "local" ;
349351 const selectedBranchName = selectedProjectDraft . workspaceSelection ?. branch ?? null ;
350352 const selectedWorktreePath = selectedProjectDraft . workspaceSelection ?. worktreePath ?? null ;
351- const startFromOrigin = selectedProjectDraft . workspaceSelection ?. startFromOrigin ?? false ;
353+ // Keep the user's explicit choice separate from the resolved display value:
354+ // only the explicit flag is ever written back to the draft, so the resolved
355+ // value keeps tracking the server setting when the config loads late.
356+ const draftStartFromOrigin = selectedProjectDraft . workspaceSelection ?. startFromOrigin ;
357+ const startFromOrigin =
358+ draftStartFromOrigin ??
359+ selectedEnvironmentServerConfig ?. settings . newWorktreesStartFromOrigin ??
360+ true ;
352361 const runtimeMode = selectedProjectDraft . runtimeMode ?? DEFAULT_RUNTIME_MODE ;
353362 const interactionMode = selectedProjectDraft . interactionMode ?? DEFAULT_PROVIDER_INTERACTION_MODE ;
354363
@@ -368,6 +377,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
368377 const selectedModel =
369378 selectedProjectDraft . modelSelection ??
370379 selectedProject ?. defaultModelSelection ??
380+ modelOptions . find ( ( option ) => option . isDefault ) ?. selection ??
371381 modelOptions [ 0 ] ?. selection ??
372382 null ;
373383 const selectedModelKey = selectedModel
@@ -475,13 +485,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
475485 ) ;
476486 const branchState = useBranches ( branchTarget ) ;
477487 const branchesLoading = branchState . isPending ;
488+ const allBranchRefs = branchState . data ?. refs ?? EMPTY_BRANCH_REFS ;
478489 const availableBranches = useMemo (
479490 ( ) =>
480491 pipe (
481- branchState . data ?. refs ?? [ ] ,
492+ allBranchRefs ,
482493 Arr . filter ( ( branch ) => ! branch . isRemote ) ,
483494 ) ,
484- [ branchState . data ?. refs ] ,
495+ [ allBranchRefs ] ,
485496 ) ;
486497
487498 const filteredBranches = useMemo ( ( ) => {
@@ -543,11 +554,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
543554 mode,
544555 branch : selectedBranchName ,
545556 worktreePath : selectedWorktreePath ,
546- startFromOrigin,
557+ ... ( draftStartFromOrigin !== undefined ? { startFromOrigin : draftStartFromOrigin } : { } ) ,
547558 } ,
548559 } ) ;
549560 } ,
550- [ selectedBranchName , selectedProjectDraftKey , selectedWorktreePath , startFromOrigin ] ,
561+ [ draftStartFromOrigin , selectedBranchName , selectedProjectDraftKey , selectedWorktreePath ] ,
551562 ) ;
552563
553564 const selectBranch = useCallback (
@@ -560,11 +571,11 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
560571 mode : workspaceMode ,
561572 branch : branch . name ,
562573 worktreePath : normalizeSelectedWorktreePath ( selectedProject , branch ) ,
563- startFromOrigin,
574+ ... ( draftStartFromOrigin !== undefined ? { startFromOrigin : draftStartFromOrigin } : { } ) ,
564575 } ,
565576 } ) ;
566577 } ,
567- [ selectedProject , selectedProjectDraftKey , startFromOrigin , workspaceMode ] ,
578+ [ draftStartFromOrigin , selectedProject , selectedProjectDraftKey , workspaceMode ] ,
568579 ) ;
569580
570581 const setStartFromOrigin = useCallback (
@@ -597,14 +608,16 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
597608 if ( workspaceMode !== "worktree" || selectedBranchName !== null ) {
598609 return ;
599610 }
611+ // The default may only exist as origin/<default> (isRemote), which
612+ // availableBranches filters out — search the unfiltered refs for it.
600613 const preferredBranch =
614+ allBranchRefs . find ( ( branch ) => branch . isDefault ) ??
601615 availableBranches . find ( ( branch ) => branch . current ) ??
602- availableBranches . find ( ( branch ) => branch . isDefault ) ??
603616 null ;
604617 if ( preferredBranch ) {
605618 selectBranch ( preferredBranch ) ;
606619 }
607- } , [ availableBranches , selectBranch , selectedBranchName , workspaceMode ] ) ;
620+ } , [ allBranchRefs , availableBranches , selectBranch , selectedBranchName , workspaceMode ] ) ;
608621
609622 const setRuntimeMode = useCallback (
610623 ( value : RuntimeMode ) => {
@@ -696,7 +709,12 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
696709 workspaceMode : mode ,
697710 branch : workspaceSelection ?. branch ?? null ,
698711 worktreePath : mode === "worktree" ? null : ( workspaceSelection ?. worktreePath ?? null ) ,
699- ...( workspaceSelection ?. startFromOrigin ? { startFromOrigin : true } : { } ) ,
712+ // The draft only carries the flag when the user touched it; fall
713+ // back to the resolved default (server settings) so queued tasks
714+ // drain with the same origin mode the composer displayed.
715+ ...( ( workspaceSelection ?. startFromOrigin ?? startFromOrigin )
716+ ? { startFromOrigin : true }
717+ : { } ) ,
700718 } ,
701719 createdAt : metadata . createdAt ,
702720 } ;
@@ -707,6 +725,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
707725 selectedModel ,
708726 selectedProject ,
709727 selectedProjectDraftKey ,
728+ startFromOrigin ,
710729 ] ,
711730 ) ;
712731
0 commit comments