Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Display reconnect commands on a separate line (#48350)

Eric Traut09a3d2108f23
diff --git a/codex-rs/cli/src/main.rs b/codex-rs/cli/src/main.rs
index 4d7984d57b..bdd7771b3a 100644
--- a/codex-rs/cli/src/main.rs
+++ b/codex-rs/cli/src/main.rs
@@ -3724,7 +3724,8 @@ mod tests {
exit_info.format_exit_messages(/*color_enabled*/ false),
vec![
"Disconnected from this task. Any running work continues.",
- "Reconnect: codex --remote wss://example.com:443/ --remote-auth-token-env CODEX_REMOTE_TOKEN resume 123e4567-e89b-12d3-a456-426614174000",
+ "To reconnect, run:",
+ " codex --remote wss://example.com:443/ --remote-auth-token-env CODEX_REMOTE_TOKEN resume 123e4567-e89b-12d3-a456-426614174000",
"Stop the current turn: run codex --remote wss://example.com:443/ --remote-auth-token-env CODEX_REMOTE_TOKEN agents, select this task, and press ctrl + x.",
"Token usage so far: total=2 input=0 output=2",
]
diff --git a/codex-rs/tui/src/app/exit_summary.rs b/codex-rs/tui/src/app/exit_summary.rs
index 39b023805b..f9932ced06 100644
--- a/codex-rs/tui/src/app/exit_summary.rs
+++ b/codex-rs/tui/src/app/exit_summary.rs
@@ -104,8 +104,9 @@ impl AppExitInfo {
lines.push(message.to_string());
let mut resume_command = disconnect.command.clone();
resume_command.extend(["resume".to_string(), thread_id.to_string()]);
+ lines.push("To reconnect, run:".to_string());
lines.push(format!(
- "Reconnect: {}",
+ " {}",
color_command(escape_command(&resume_command)),
));
if !turn_interrupted {
diff --git a/codex-rs/tui/src/app/tests/background_exit_tests.rs b/codex-rs/tui/src/app/tests/background_exit_tests.rs
index fcc507d8d0..3d2c8066de 100644
--- a/codex-rs/tui/src/app/tests/background_exit_tests.rs
+++ b/codex-rs/tui/src/app/tests/background_exit_tests.rs
@@ -225,7 +225,7 @@ async fn remote_disconnect_exit_summary_does_not_require_a_local_rollout_or_prin
));
let exit_info = app.exit_info(ExitReason::Fatal("connection lost".to_string()));
let lines = exit_info.format_exit_messages(/*color_enabled*/ false);
- let command = shlex::split(lines[1].strip_prefix("Reconnect: ").unwrap()).unwrap();
+ let command = shlex::split(&lines[2]).unwrap();
assert_eq!(
crate::resolve_remote_addr(&command[2]).unwrap(),
crate::RemoteAppServerEndpoint::WebSocket {
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__daemon_disconnect_exit.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__daemon_disconnect_exit.snap
index 720042aed7..e9685def66 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__daemon_disconnect_exit.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__daemon_disconnect_exit.snap
@@ -3,6 +3,7 @@ source: tui/src/app/tests/background_exit_tests.rs
expression: output
---
Disconnected from this task. Any running work continues.
-Reconnect: codex resume THREAD_ID
+To reconnect, run:
+ codex resume THREAD_ID
Stop the current turn: run codex agents, select this task, and press f10.
Token usage so far: total=12 input=10 output=2
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__interrupted_disconnect_exit.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__interrupted_disconnect_exit.snap
index 7ee7009841..39ad415e47 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__interrupted_disconnect_exit.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__interrupted_disconnect_exit.snap
@@ -3,4 +3,5 @@ source: tui/src/app/tests/background_exit_tests.rs
expression: output
---
Disconnected from this task. The current turn was stopped.
-Reconnect: codex resume THREAD_ID
+To reconnect, run:
+ codex resume THREAD_ID
diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__remote_disconnect_exit.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__remote_disconnect_exit.snap
index b3ae684ab6..7b41e0433a 100644
--- a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__remote_disconnect_exit.snap
+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__background_exit_tests__remote_disconnect_exit.snap
@@ -3,5 +3,6 @@ source: tui/src/app/tests/background_exit_tests.rs
expression: "lines.join(\"\\n\")"
---
Disconnected from this task. Work may still be running.
-Reconnect: codex --remote wss://example.com:443/ resume 123e4567-e89b-12d3-a456-426614174000
+To reconnect, run:
+ codex --remote wss://example.com:443/ resume 123e4567-e89b-12d3-a456-426614174000
Stop the current turn: run codex --remote wss://example.com:443/ agents, select this task, and press x.