@@ -89,7 +89,7 @@ function App({
8989 forkSessionId,
9090 onRestart,
9191} : AppProps ) : React . ReactElement {
92- const { exit } = useApp ( ) ;
92+ const { exit, waitUntilRenderFlush } = useApp ( ) ;
9393 const { stdout, write } = useStdout ( ) ;
9494 const terminalTitle = useMemo ( ( ) => createTerminalTitle ( stdout ) , [ stdout ] ) ;
9595 const { columns, rows } = useWindowSize ( ) ;
@@ -131,6 +131,7 @@ function App({
131131 } | null > ( null ) ;
132132 const [ dismissedQuestionIds , setDismissedQuestionIds ] = useState < Set < string > > ( ( ) => new Set ( ) ) ;
133133 const [ isExiting , setIsExiting ] = useState ( false ) ;
134+ const [ exitSummary , setExitSummary ] = useState < { showCommand : boolean ; showSummary : boolean } | null > ( null ) ;
134135 const exitingRef = useRef ( false ) ;
135136 const [ showWelcome , setShowWelcome ] = useState ( true ) ;
136137 const [ welcomeNonce , setWelcomeNonce ] = useState ( 0 ) ;
@@ -438,44 +439,52 @@ function App({
438439 } finally {
439440 clearTimeout ( timer ) ;
440441 }
441- setTimeout ( ( ) => {
442- try {
443- const activeSessionId = sessionManager . getActiveSessionId ( ) ;
444- const session = activeSessionId ? sessionManager . getSession ( activeSessionId ) : null ;
445- const resumeHint = buildResumeHintText ( activeSessionId ?? undefined ) ;
446- const rateLimitHint = buildPluginRateLimitHintText ( session ) ;
442+ setExitSummary ( { showCommand, showSummary } ) ;
443+ } ,
444+ [ sessionManager ]
445+ ) ;
446+
447+ useEffect ( ( ) => {
448+ if ( ! exitSummary ) return ;
449+ const { showCommand, showSummary } = exitSummary ;
450+ void ( async ( ) => {
451+ try {
452+ // Remove the transient notice before writing permanent output outside Ink.
453+ await waitUntilRenderFlush ( ) ;
454+ const activeSessionId = sessionManager . getActiveSessionId ( ) ;
455+ const session = activeSessionId ? sessionManager . getSession ( activeSessionId ) : null ;
456+ const resumeHint = buildResumeHintText ( activeSessionId ?? undefined ) ;
457+ const rateLimitHint = buildPluginRateLimitHintText ( session ) ;
447458
459+ writeStdoutLine ( "\n" ) ;
460+ if ( showCommand ) {
461+ writeStdoutLine ( chalk . rgb ( 34 , 154 , 195 ) ( " > /exit " ) ) ;
448462 writeStdoutLine ( "\n" ) ;
449- if ( showCommand ) {
450- writeStdoutLine ( chalk . rgb ( 34 , 154 , 195 ) ( " > /exit " ) ) ;
451- writeStdoutLine ( "\n" ) ;
452- }
453- if ( showSummary ) {
454- const summary = buildExitSummaryText ( { session, sessionId : activeSessionId ?? undefined } ) ;
455- writeStdoutLine ( summary ) ;
456- writeStdoutLine ( "\n" ) ;
457- }
458- if ( resumeHint ) {
459- writeStdoutLine ( resumeHint ) ;
460- if ( rateLimitHint ) {
461- writeStdoutLine ( rateLimitHint ) ;
462- }
463- writeStdoutLine ( "\n" ) ;
464- }
465- } catch {
466- // Printing the summary is best effort during shutdown.
467463 }
468- try {
469- sessionManager . dispose ( ) ;
470- } catch {
471- // Remaining handles are closed when the CLI process exits.
472- } finally {
473- exit ( ) ;
464+ if ( showSummary ) {
465+ const summary = buildExitSummaryText ( { session, sessionId : activeSessionId ?? undefined } ) ;
466+ writeStdoutLine ( summary ) ;
467+ writeStdoutLine ( "\n" ) ;
474468 }
475- } , 0 ) ;
476- } ,
477- [ exit , sessionManager ]
478- ) ;
469+ if ( resumeHint ) {
470+ writeStdoutLine ( resumeHint ) ;
471+ if ( rateLimitHint ) {
472+ writeStdoutLine ( rateLimitHint ) ;
473+ }
474+ writeStdoutLine ( "\n" ) ;
475+ }
476+ } catch {
477+ // Printing the summary is best effort during shutdown.
478+ }
479+ try {
480+ sessionManager . dispose ( ) ;
481+ } catch {
482+ // Remaining handles are closed when the CLI process exits.
483+ } finally {
484+ exit ( ) ;
485+ }
486+ } ) ( ) ;
487+ } , [ exitSummary , exit , sessionManager , waitUntilRenderFlush ] ) ;
479488
480489 const handlePrompt = useCallback (
481490 async ( submission : PromptSubmission ) => {
@@ -1364,7 +1373,9 @@ function App({
13641373 </ Box >
13651374 ) : null }
13661375 { isExiting ? (
1367- < Text dimColor > Exiting…</ Text >
1376+ exitSummary ? null : (
1377+ < Text dimColor > Exiting…</ Text >
1378+ )
13681379 ) : showProcessStdout ? (
13691380 < ProcessStdoutView
13701381 key = { activeSessionId }
0 commit comments