@@ -1601,28 +1601,45 @@ describe("composerDraftStore modelSelection", () => {
16011601 expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ) . toBe ( latest ) ;
16021602 } ) ;
16031603
1604- it ( "releases an accepted pick only while it is still the draft's latest choice" , ( ) => {
1605- const store = useComposerDraftStore . getState ( ) ;
1606- store . setModelSelection ( threadRef , modelSelection ( CODEX_DRIVER , "gpt-5.5" ) , {
1607- explicit : true ,
1608- } ) ;
1609- const first = draftFor ( threadId , TEST_ENVIRONMENT_ID ) ! . modelSelectionByProvider [
1610- CODEX_INSTANCE
1611- ] ! ;
1612- store . setModelSelection ( threadRef , modelSelection ( CODEX_DRIVER , "gpt-5.4" ) , {
1613- explicit : true ,
1614- } ) ;
1615- store . setModelSelection ( threadRef , modelSelection ( CODEX_DRIVER , "gpt-5.5" ) , {
1616- explicit : true ,
1617- } ) ;
1618- const latest = draftFor ( threadId , TEST_ENVIRONMENT_ID ) ! ;
1619-
1620- // An older acknowledgement of the same model is not the latest pick.
1621- store . releaseModelSelection ( threadRef , first ) ;
1622- expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ) . toBe ( latest ) ;
1623- store . releaseModelSelection ( threadRef , latest . modelSelectionByProvider [ CODEX_INSTANCE ] ! ) ;
1624- expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ) . toBeUndefined ( ) ;
1625- } ) ;
1604+ it . each ( [ "consecutive model" , "consecutive options" , "returning model" ] as const ) (
1605+ "releases only the latest accepted pick after %s picks" ,
1606+ ( kind ) => {
1607+ const store = useComposerDraftStore . getState ( ) ;
1608+ store . setPrompt ( threadRef , "keep this follow-up" ) ;
1609+ const select = ( ) => {
1610+ if ( kind === "consecutive options" ) {
1611+ store . setProviderModelOptions (
1612+ threadRef ,
1613+ CODEX_DRIVER ,
1614+ toSelections ( { reasoningEffort : "high" } ) ,
1615+ { instanceId : CODEX_INSTANCE , model : "gpt-5.5" } ,
1616+ ) ;
1617+ } else {
1618+ store . setModelSelection ( threadRef , modelSelection ( CODEX_DRIVER , "gpt-5.5" ) , {
1619+ explicit : true ,
1620+ } ) ;
1621+ }
1622+ } ;
1623+ select ( ) ;
1624+ const first = draftFor ( threadId , TEST_ENVIRONMENT_ID ) ! . modelSelectionByProvider [
1625+ CODEX_INSTANCE
1626+ ] ! ;
1627+ if ( kind === "returning model" ) {
1628+ store . setModelSelection ( threadRef , modelSelection ( CODEX_DRIVER , "gpt-5.4" ) , {
1629+ explicit : true ,
1630+ } ) ;
1631+ }
1632+ select ( ) ;
1633+ const latest = draftFor ( threadId , TEST_ENVIRONMENT_ID ) ! ;
1634+
1635+ store . releaseModelSelection ( threadRef , first ) ;
1636+ expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ) . toBe ( latest ) ;
1637+ store . releaseModelSelection ( threadRef , latest . modelSelectionByProvider [ CODEX_INSTANCE ] ! ) ;
1638+ expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ?. modelSelectionExplicit ) . toBeUndefined ( ) ;
1639+ expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ?. modelSelectionByProvider ) . toEqual ( { } ) ;
1640+ expect ( draftFor ( threadId , TEST_ENVIRONMENT_ID ) ?. prompt ) . toBe ( "keep this follow-up" ) ;
1641+ } ,
1642+ ) ;
16261643
16271644 it ( "releases an inactive thread pick only after its queued model becomes durable" , ( ) => {
16281645 const store = useComposerDraftStore . getState ( ) ;
0 commit comments