mirror of
https://github.com/openai/codex.git
synced 2026-11-18 23:02:23 +00:00
Show reconnect guidance when disconnecting from tasks (#40629)
## Why Exiting a TUI connected to a persistent app server can leave work running, so the existing session-exit summary does not explain how to reconnect or stop the active turn. ## What changed - Distinguish disconnects, interrupted turns, and removed threads when building exit summaries. - For daemon and remote sessions, report whether work may still be running and print commands to reconnect or stop the current turn. - Sanitize remote WebSocket addresses in displayed commands and preserve the configured remote authentication environment-variable option. - Keep the existing token-usage and resume summary for embedded sessions. ## Testing Add coverage for daemon, remote, interrupted, embedded, archived, and deleted session exits, including credential sanitization. GitOrigin-RevId: 9cbbf9c7dd36423a5ed99909a2b4cb32e3e87712
This commit is contained in:
1 parent
0cdb1f1c83
commit
a63cb33e8d
16 files changed
+408
-96
No files matched your search
@@ -638,7 +638,7 @@ impl App {
|
||||
self.chat_widget.on_commit_tick();
|
||||
}
|
||||
AppEvent::Exit(mode) => {
|
||||
if mode == ExitMode::ShutdownFirst {
|
||||
if matches!(mode, ExitMode::ShutdownFirst | ExitMode::ShutdownAfterInterrupt) {
|
||||
self.show_shutdown_feedback(tui)?;
|
||||
}
|
||||
return Ok(self.handle_exit_mode(app_server, mode).await);
|
||||
@@ -689,7 +689,7 @@ impl App {
|
||||
match app_server.turn_interrupt(thread_id, turn_id).await {
|
||||
Ok(()) => {
|
||||
self.app_event_tx
|
||||
.send(AppEvent::Exit(ExitMode::ShutdownFirst));
|
||||
.send(AppEvent::Exit(ExitMode::ShutdownAfterInterrupt));
|
||||
}
|
||||
Err(error) => {
|
||||
self.chat_widget
|
||||
@@ -3062,7 +3062,7 @@ impl App {
|
||||
}
|
||||
}
|
||||
match mode {
|
||||
ExitMode::ShutdownFirst => {
|
||||
ExitMode::ShutdownFirst | ExitMode::ShutdownAfterInterrupt => {
|
||||
// Mark the thread we are explicitly shutting down for exit so
|
||||
// its shutdown completion does not trigger agent failover.
|
||||
self.pending_shutdown_exit_thread_id =
|
||||
@@ -3084,7 +3084,11 @@ impl App {
|
||||
}
|
||||
}
|
||||
self.pending_shutdown_exit_thread_id = None;
|
||||
AppRunControl::Exit(ExitReason::UserRequested)
|
||||
AppRunControl::Exit(if mode == ExitMode::ShutdownAfterInterrupt {
|
||||
ExitReason::TurnInterrupted
|
||||
} else {
|
||||
ExitReason::UserRequested
|
||||
})
|
||||
}
|
||||
ExitMode::Immediate => {
|
||||
self.pending_shutdown_exit_thread_id = None;
|
||||
@@ -3111,7 +3115,7 @@ impl App {
|
||||
}
|
||||
|
||||
match app_server.thread_archive(thread_id).await {
|
||||
Ok(()) => AppRunControl::Exit(ExitReason::UserRequested),
|
||||
Ok(()) => AppRunControl::Exit(ExitReason::ThreadRemoved),
|
||||
Err(err) => {
|
||||
self.chat_widget
|
||||
.add_error_message(format!("Failed to archive current thread: {err}"));
|
||||
@@ -3138,7 +3142,7 @@ impl App {
|
||||
}
|
||||
|
||||
match app_server.thread_delete(thread_id).await {
|
||||
Ok(()) => AppRunControl::Exit(ExitReason::UserRequested),
|
||||
Ok(()) => AppRunControl::Exit(ExitReason::ThreadRemoved),
|
||||
Err(err) => {
|
||||
self.chat_widget
|
||||
.add_error_message(format!("Failed to delete current thread: {err}"));
|
||||
|
||||
Reference in new issue
Block a user