1+ import { useAtomValue } from "@effect/atom-react" ;
2+ import { Atom } from "effect/reactivity" ;
13import React , { useCallback , useEffect , useMemo , useRef , useState } from "react" ;
24import { Alert } from "react-native" ;
35
@@ -241,6 +243,7 @@ type NewTaskFlowContextValue = {
241243 readonly removeAttachment : ( imageId : string ) => void ;
242244 readonly clearAttachments : ( ) => void ;
243245 readonly setSubmitting : ( value : boolean ) => void ;
246+ readonly setSubmittedModelSelection : ( value : ModelSelection ) => void ;
244247 readonly setBranchQuery : ( value : string ) => void ;
245248 readonly loadBranches : ( ) => void ;
246249 readonly loadMoreBranches : ( ) => void ;
@@ -290,6 +293,13 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
290293 // chosen; each New Task entry mints its own, so a project can hold several.
291294 const [ activeDraftKey , setActiveDraftKey ] = useState < string | null > ( null ) ;
292295 const [ submitting , setSubmitting ] = useState ( false ) ;
296+ // Share the draft's synchronous store so cleanup cannot render ahead of this snapshot.
297+ const [ submittedModelSelectionAtom ] = useState ( ( ) => Atom . make < ModelSelection | null > ( null ) ) ;
298+ const submittedModelSelection = useAtomValue ( submittedModelSelectionAtom ) ;
299+ const setSubmittedModelSelection = useCallback (
300+ ( value : ModelSelection | null ) => appAtomRegistry . set ( submittedModelSelectionAtom , value ) ,
301+ [ submittedModelSelectionAtom ] ,
302+ ) ;
293303 const [ branchQuery , setBranchQuery ] = useState ( "" ) ;
294304 const [ expandedProvider , setExpandedProvider ] = useState < string | null > ( null ) ;
295305 const [ editingPendingTask , setEditingPendingTask ] = useState < QueuedThreadMessage | null > ( null ) ;
@@ -306,6 +316,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
306316 setSelectedProjectKey ( null ) ;
307317 setActiveDraftKey ( null ) ;
308318 setSubmitting ( false ) ;
319+ setSubmittedModelSelection ( null ) ;
309320 setBranchQuery ( "" ) ;
310321 setExpandedProvider ( null ) ;
311322 pendingLocalBranchSyncDraftKeysRef . current . clear ( ) ;
@@ -318,7 +329,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
318329 }
319330 releaseEditingQueuedMessage ( editing . messageId ) ;
320331 }
321- } , [ ] ) ;
332+ } , [ setSubmittedModelSelection ] ) ;
322333
323334 const projectsForEnvironment = useMemo (
324335 ( ) =>
@@ -559,10 +570,14 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
559570 ( ) =>
560571 buildModelOptions (
561572 selectedEnvironmentServerConfig ,
562- draftModelSelection ?? projectDefaultModelSelection ?? stickyModelSelection ,
573+ submittedModelSelection ??
574+ draftModelSelection ??
575+ projectDefaultModelSelection ??
576+ stickyModelSelection ,
563577 ) ,
564578 [
565579 selectedEnvironmentServerConfig ,
580+ submittedModelSelection ,
566581 draftModelSelection ,
567582 projectDefaultModelSelection ,
568583 stickyModelSelection ,
@@ -572,6 +587,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
572587 // An unsent draft keeps its explicit pick. Fresh drafts resolve the project
573588 // default before the last manual app-wide selection and provider default.
574589 const selectedModel = resolveNewTaskModelSelection ( {
590+ // Draft cleanup happens before the sheet finishes leaving. Keep showing
591+ // the model that was sent until this sheet and its provider unmount.
592+ submittedSelection : submittedModelSelection ,
575593 draftSelection : draftModelSelection ,
576594 projectDefaultSelection : projectDefaultModelSelection ,
577595 stickySelection : stickyModelSelection ,
@@ -1320,6 +1338,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
13201338 removeAttachment,
13211339 clearAttachments,
13221340 setSubmitting,
1341+ setSubmittedModelSelection,
13231342 setBranchQuery,
13241343 loadBranches,
13251344 loadMoreBranches,
@@ -1378,6 +1397,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
13781397 setPrompt ,
13791398 setRuntimeMode ,
13801399 setSelectedModelKey ,
1400+ setSubmittedModelSelection ,
13811401 setStartFromOrigin ,
13821402 setWorkspaceMode ,
13831403 startFromOrigin ,
0 commit comments