@@ -1382,6 +1382,13 @@ describe("composerDraftStore draft promotion", () => {
13821382 backgroundSubmissionPending : false ,
13831383 } ) ,
13841384 ) . toBeNull ( ) ;
1385+ expect (
1386+ resolveDraftPromotionNavigationTarget ( {
1387+ serverThreadRef : threadRef ,
1388+ serverThread : { latestRun : null , latestUserMessageAt : null } ,
1389+ backgroundSubmissionPending : false ,
1390+ } ) ,
1391+ ) . toBeNull ( ) ;
13851392 const persisted = { latestRun : preparingRun , latestUserMessageAt : "2026-03-29T00:00:00.000Z" } ;
13861393 expect (
13871394 resolveDraftPromotionNavigationTarget ( {
@@ -1430,16 +1437,35 @@ describe("composerDraftStore draft promotion", () => {
14301437 useComposerDraftStore . setState ( { promotedDraftRedirects : { [ draftId ] : threadRef } } ) ;
14311438 const store = useComposerDraftStore . getState ( ) ;
14321439
1433- store . retainPromotedDraftRedirectsForRoute ( { kind : "draft" , draftId } ) ;
1434- store . retainPromotedDraftRedirectsForRoute ( { kind : "server" , threadRef } ) ;
1440+ store . retainPromotedDraftRedirectsForRoute ( {
1441+ modalPage : false ,
1442+ target : { kind : "draft" , draftId } ,
1443+ } ) ;
1444+ store . retainPromotedDraftRedirectsForRoute ( {
1445+ modalPage : false ,
1446+ target : { kind : "server" , threadRef } ,
1447+ } ) ;
14351448 expect ( useComposerDraftStore . getState ( ) . getPromotedDraftIdByRef ( threadRef ) ) . toBe ( draftId ) ;
14361449
1437- store . retainPromotedDraftRedirectsForRoute ( { kind : "server" , threadRef : otherRef } ) ;
1450+ store . retainPromotedDraftRedirectsForRoute ( {
1451+ modalPage : false ,
1452+ target : { kind : "server" , threadRef : otherRef } ,
1453+ } ) ;
14381454 expect ( useComposerDraftStore . getState ( ) . promotedDraftRedirects ) . toEqual ( { } ) ;
14391455 // A later visit renders the shared unkeyed ChatView.
14401456 expect ( useComposerDraftStore . getState ( ) . getPromotedDraftIdByRef ( threadRef ) ) . toBeNull ( ) ;
14411457 } ) ;
14421458
1459+ it ( "keeps a promotion redirect while Settings or Usage is open over its draft" , ( ) => {
1460+ useComposerDraftStore . setState ( { promotedDraftRedirects : { [ draftId ] : threadRef } } ) ;
1461+ const store = useComposerDraftStore . getState ( ) ;
1462+
1463+ // Each settings section is its own route with no thread target; closing returns to the draft.
1464+ store . retainPromotedDraftRedirectsForRoute ( { modalPage : true , target : null } ) ;
1465+ store . retainPromotedDraftRedirectsForRoute ( { modalPage : true , target : null } ) ;
1466+ expect ( useComposerDraftStore . getState ( ) . getPromotedDraftRedirect ( draftId ) ) . toEqual ( threadRef ) ;
1467+ } ) ;
1468+
14431469 it ( "holds a background submission on its draft until the send settles" , async ( ) => {
14441470 const h = draftPromotionHarness ( ) ;
14451471 const store = useComposerDraftStore . getState ( ) ;
0 commit comments