@@ -33,6 +33,7 @@ import {
3333 buildModelOptions ,
3434 groupByProvider ,
3535 resolveDefaultableModelSelection ,
36+ resolveNewTaskModelSelection ,
3637 resolveSelectableModelSelection ,
3738} from "../../lib/modelOptions" ;
3839import { scopedProjectKey } from "../../lib/scopedEntities" ;
@@ -48,8 +49,10 @@ import {
4849 removeComposerDraftAttachment ,
4950 replaceComposerDraftAttachments ,
5051 setComposerDraftText ,
52+ setStickyComposerModelSelection ,
5153 updateComposerDraftSettings ,
5254 useComposerDraft ,
55+ useStickyComposerModelSelection ,
5356} from "../../state/use-composer-drafts" ;
5457import { useDebouncedValue , usePaginatedBranches } from "../../state/queries" ;
5558import { vcsEnvironment } from "../../state/vcs" ;
@@ -418,21 +421,33 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
418421 selectedEnvironmentServerConfig ,
419422 selectedProject ?. defaultModelSelection ?? null ,
420423 ) ;
424+ const storedStickyModelSelection = useStickyComposerModelSelection ( ) ;
425+ const stickyModelSelection = resolveDefaultableModelSelection (
426+ selectedEnvironmentServerConfig ,
427+ storedStickyModelSelection ,
428+ ) ;
421429 const modelOptions = useMemo (
422430 ( ) =>
423431 buildModelOptions (
424432 selectedEnvironmentServerConfig ,
425- draftModelSelection ?? projectDefaultModelSelection ,
433+ draftModelSelection ?? projectDefaultModelSelection ?? stickyModelSelection ,
426434 ) ,
427- [ selectedEnvironmentServerConfig , draftModelSelection , projectDefaultModelSelection ] ,
435+ [
436+ selectedEnvironmentServerConfig ,
437+ draftModelSelection ,
438+ projectDefaultModelSelection ,
439+ stickyModelSelection ,
440+ ] ,
428441 ) ;
429442
430- const selectedModel =
431- draftModelSelection ??
432- projectDefaultModelSelection ??
433- modelOptions . find ( ( option ) => option . isDefault ) ?. selection ??
434- modelOptions [ 0 ] ?. selection ??
435- null ;
443+ // An unsent draft keeps its explicit pick. Fresh drafts resolve the project
444+ // default before the last manual app-wide selection and provider default.
445+ const selectedModel = resolveNewTaskModelSelection ( {
446+ draftSelection : draftModelSelection ,
447+ projectDefaultSelection : projectDefaultModelSelection ,
448+ stickySelection : stickyModelSelection ,
449+ modelOptions,
450+ } ) ;
436451 const selectedModelKey = selectedModel
437452 ? `${ selectedModel . instanceId } :${ selectedModel . model } `
438453 : null ;
@@ -462,9 +477,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
462477 if ( ! option ) {
463478 return ;
464479 }
465- updateComposerDraftSettings ( selectedProjectDraftKey , {
466- modelSelection : options ? { ... option . selection , options } : option . selection ,
467- } ) ;
480+ const selection = options ? { ... option . selection , options } : option . selection ;
481+ updateComposerDraftSettings ( selectedProjectDraftKey , { modelSelection : selection } ) ;
482+ setStickyComposerModelSelection ( selection ) ;
468483 } ,
469484 [ modelOptions , selectedProjectDraftKey ] ,
470485 ) ;
@@ -482,6 +497,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
482497 updateComposerDraftSettings ( selectedProjectDraftKey , {
483498 modelSelection : nextSelection ,
484499 } ) ;
500+ setStickyComposerModelSelection ( nextSelection ) ;
485501 } ,
486502 [ selectedModel , selectedProjectDraftKey ] ,
487503 ) ;
0 commit comments