Print TUI session info on fatal exits

codex-rs/cli/src/main.rs

@@ -39,6 +39,7 @@ use codex_utils_cli::SharedCliOptions;
 use codex_utils_cli::resume_hint;
 use owo_colors::OwoColorize;
 use std::io::IsTerminal;
+use std::io::Write;
 use std::path::PathBuf;
 use supports_color::Stream;
 
@@ -710,19 +711,23 @@ fn format_exit_messages(exit_info: AppExitInfo, color_enabled: bool) -> Vec<Stri
 
 /// Handle the app exit and print the results. Optionally run the update action.
 fn handle_app_exit(exit_info: AppExitInfo) -> anyhow::Result<()> {
-    match exit_info.exit_reason {
+    let is_fatal = match &exit_info.exit_reason {
         ExitReason::Fatal(message) => {
             eprintln!("ERROR: {message}");
-            std::process::exit(1);
+            true
         }
-        ExitReason::UserRequested => { /* normal exit */ }
-    }
+        ExitReason::UserRequested => false,
+    };
 
     let update_action = exit_info.update_action;
     let color_enabled = supports_color::on(Stream::Stdout).is_some();
     for line in format_exit_messages(exit_info, color_enabled) {
         println!("{line}");
     }
+    if is_fatal {
+        std::io::stdout().flush()?;
+        std::process::exit(1);
+    }
     if let Some(action) = update_action {
         run_update_action(action)?;
     }
@@ -3001,6 +3006,24 @@ mod tests {
         assert!(lines.is_empty());
     }
 
+    #[test]
+    fn format_exit_messages_includes_resume_hint_for_fatal_exit() {
+        let mut exit_info = sample_exit_info(
+            Some("123e4567-e89b-12d3-a456-426614174000"),
+            /*thread_name*/ None,
+        );
+        exit_info.exit_reason = ExitReason::Fatal("boom".to_string());
+        let lines = format_exit_messages(exit_info, /*color_enabled*/ false);
+        assert_eq!(
+            lines,
+            vec![
+                "Token usage: total=2 input=0 output=2".to_string(),
+                "To continue this session, run codex resume 123e4567-e89b-12d3-a456-426614174000"
+                    .to_string(),
+            ]
+        );
+    }
+
     #[test]
     fn format_exit_messages_includes_resume_hint_without_color() {
         let exit_info = sample_exit_info(

codex-rs/tui/src/main.rs

@@ -8,6 +8,7 @@ use codex_tui::ExitReason;
 use codex_tui::run_main;
 use codex_utils_cli::CliConfigOverrides;
 use codex_utils_cli::resume_hint;
+use std::io::Write;
 use supports_color::Stream;
 
 fn format_exit_messages(exit_info: AppExitInfo, color_enabled: bool) -> Vec<String> {
@@ -59,18 +60,22 @@ fn main() -> anyhow::Result<()> {
             /*explicit_remote_endpoint*/ None,
         )
         .await?;
-        match exit_info.exit_reason {
+        let is_fatal = match &exit_info.exit_reason {
             ExitReason::Fatal(message) => {
                 eprintln!("ERROR: {message}");
-                std::process::exit(1);
+                true
             }
-            ExitReason::UserRequested => {}
-        }
+            ExitReason::UserRequested => false,
+        };
 
         let color_enabled = supports_color::on(Stream::Stdout).is_some();
         for line in format_exit_messages(exit_info, color_enabled) {
             println!("{line}");
         }
+        if is_fatal {
+            std::io::stdout().flush()?;
+            std::process::exit(1);
+        }
         Ok(())
     })
 }