mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
## Why Startup configuration warnings can reflect settings from when the background server started, even after those settings have been fixed. A restart lets users refresh the server without leaving the TUI. ## What changed - Add a confirmed restart action to `/daemon`, warning that active or queued work in other chats may be interrupted. Reconnect automatically and let an in-progress restart finish if the TUI exits. - Verify that Codex manages a local server before enabling restart, including servers discovered with auto-start disabled and those started by `codex agents`. - Show a restart hint on the first startup configuration warning for managed servers, preserving the original diagnostic for copying and dismissal. - Repaint the full surface of centered dialogs to restore background colors over cached blank cells. ## Testing Add CLI integration coverage for agents startup and restarting a discovered daemon with auto-start disabled. Extend TUI tests for confirmation, cancellation, unmanaged servers, warning hints and dismissal, and dialog background rendering. GitOrigin-RevId: 8e4319fab84f13bf6e7335deb93364fccaff14a7
324 lines
13 KiB
Rust
324 lines
13 KiB
Rust
use super::*;
|
|
use crate::app::test_support::make_test_app;
|
|
use crate::chatwidget::tests::helpers::render_bottom_popup;
|
|
use crate::chatwidget::tests::make_chatwidget_manual_with_sender;
|
|
use crate::status::remote_connection::RemoteConnectionStatus;
|
|
use crossterm::event::KeyCode;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[tokio::test]
|
|
async fn daemon_version_notice_preserves_manual_update_guidance() {
|
|
let mut app = make_test_app().await;
|
|
app.app_server_target = AppServerTarget::LocalDaemon {
|
|
allow_embedded_fallback: true,
|
|
endpoint: crate::RemoteAppServerEndpoint::UnixSocket {
|
|
socket_path: AbsolutePathBuf::relative_to_current_dir("codex.sock").unwrap(),
|
|
},
|
|
};
|
|
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
|
|
app.chat_widget.show_bottom_pane_view(Box::new(view));
|
|
let mut notices = Vec::new();
|
|
for (client, server, comparison) in [
|
|
("0.155.0-alpha.23", "0.155.0-alpha.22", "older than"),
|
|
("0.155.0-alpha.23", "0.156.0", "different from"),
|
|
("0.0.0", "0.156.0", "different from"),
|
|
] {
|
|
app.local_settings.tui.show_server_version_notice = true;
|
|
assert_eq!(
|
|
app.initialize_server_version_notice(client, Some(server)),
|
|
Some(format!(
|
|
"A background Codex service is running v{server}, {comparison} your Codex CLI v{client}."
|
|
))
|
|
);
|
|
let overview = render_bottom_popup(&app.chat_widget, /*width*/ 100);
|
|
notices.push(
|
|
overview
|
|
.lines()
|
|
.find(|line| line.contains("Service v"))
|
|
.unwrap()
|
|
.trim()
|
|
.to_string(),
|
|
);
|
|
assert_eq!(app.pending_update_action, None);
|
|
|
|
app.local_settings.tui.show_server_version_notice = false;
|
|
assert_eq!(
|
|
app.initialize_server_version_notice(client, Some(server)),
|
|
None
|
|
);
|
|
assert_eq!(
|
|
app.agents_overview
|
|
.view_state
|
|
.lock()
|
|
.unwrap()
|
|
.server_version_notice,
|
|
None
|
|
);
|
|
}
|
|
insta::assert_snapshot!(notices.join("\n"), @"
|
|
Service v0.155.0-alpha.22 < Codex CLI v0.155.0-alpha.23 · /daemon
|
|
Service v0.156.0 ≠ Codex CLI v0.155.0-alpha.23 · /daemon
|
|
Service v0.156.0 ≠ Codex CLI v0.0.0 · /daemon
|
|
");
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn daemon_menu_is_read_only_and_confirmation_can_cancel_or_handoff() {
|
|
let mut app = make_test_app().await;
|
|
let (chat, _, mut rx, _) = make_chatwidget_manual_with_sender().await;
|
|
app.chat_widget = chat;
|
|
let package = tempfile::tempdir().unwrap();
|
|
std::fs::create_dir(package.path().join("bin")).unwrap();
|
|
std::fs::write(package.path().join("bin/codex"), "CLI").unwrap();
|
|
std::fs::write(package.path().join("codex-package.json"), "{}").unwrap();
|
|
app.daemon_cli_executable =
|
|
Some(AbsolutePathBuf::from_absolute_path(package.path().join("bin/codex")).unwrap());
|
|
app.app_server_target = AppServerTarget::LocalDaemon {
|
|
allow_embedded_fallback: true,
|
|
endpoint: crate::RemoteAppServerEndpoint::UnixSocket {
|
|
socket_path: AbsolutePathBuf::relative_to_current_dir("codex.sock").unwrap(),
|
|
},
|
|
};
|
|
app.chat_widget.remote_connection = Some(RemoteConnectionStatus {
|
|
address: "local".into(),
|
|
version: "v0.153.0".into(),
|
|
is_local_daemon: true,
|
|
is_managed_daemon: true,
|
|
});
|
|
app.initialize_server_version_notice("0.154.0", Some("0.153.0"));
|
|
let view = app.agents_overview_view(Vec::new(), /*selected_thread_id*/ None);
|
|
app.chat_widget.show_bottom_pane_view(Box::new(view));
|
|
let overview = render_bottom_popup(&app.chat_widget, /*width*/ 80);
|
|
insta::assert_snapshot!(overview.lines().find(|line| line.contains("Service v")).unwrap().trim(), @"Service v0.153.0 < Codex CLI v0.154.0 · /daemon");
|
|
let executable = app.daemon_cli_executable.clone();
|
|
for (width, source, snapshot) in [
|
|
(
|
|
80,
|
|
DaemonUpdateSource::PublicStable,
|
|
"daemon_stable_confirmation",
|
|
),
|
|
(100, DaemonUpdateSource::ThisCli, "daemon_cli_confirmation"),
|
|
] {
|
|
app.daemon_cli_executable = executable.clone();
|
|
app.open_daemon_menu();
|
|
if source == DaemonUpdateSource::PublicStable {
|
|
insta::assert_snapshot!(
|
|
"daemon_menu",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
} else {
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
}
|
|
assert!(rx.try_recv().is_err());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(
|
|
matches!(rx.try_recv().unwrap(), AppEvent::ConfirmDaemonUpdate(selected) if selected == source)
|
|
);
|
|
app.daemon_cli_executable = Some(
|
|
AbsolutePathBuf::from_absolute_path(if cfg!(windows) {
|
|
r"C:\cli-build\bin\codex"
|
|
} else {
|
|
"/x/cli-build/bin/codex"
|
|
})
|
|
.unwrap(),
|
|
);
|
|
app.confirm_daemon_update(source);
|
|
insta::assert_snapshot!(
|
|
snapshot,
|
|
render_bottom_popup(&app.chat_widget, width)
|
|
.replace(r"C:\cli-build\bin\codex", "/x/cli-build/bin/codex")
|
|
);
|
|
// The default choice cancels without emitting an update or exiting.
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(rx.try_recv().is_err());
|
|
assert_eq!(app.pending_update_action, None);
|
|
app.confirm_daemon_update(source);
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(
|
|
matches!(rx.try_recv().unwrap(), AppEvent::RunDaemonUpdate(selected) if selected == source)
|
|
);
|
|
}
|
|
|
|
app.daemon_cli_executable = executable.clone();
|
|
app.open_daemon_menu();
|
|
let mut terminal = crate::custom_terminal::Terminal::with_options(
|
|
crate::test_backend::VT100Backend::new(/*width*/ 120, /*height*/ 30),
|
|
)
|
|
.unwrap();
|
|
let area = Rect::new(0, 0, 120, 30);
|
|
terminal.set_viewport_area(area);
|
|
crate::terminal_palette::with_test_default_colors(
|
|
crate::terminal_probe::DefaultColors {
|
|
fg: (229, 229, 229),
|
|
bg: (30, 40, 56),
|
|
},
|
|
|| {
|
|
terminal
|
|
.draw(|frame| app.chat_widget.render(area, frame.buffer_mut()))
|
|
.unwrap()
|
|
},
|
|
);
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(matches!(
|
|
rx.try_recv().unwrap(),
|
|
AppEvent::ConfirmDaemonRestart
|
|
));
|
|
app.confirm_daemon_restart();
|
|
insta::assert_snapshot!(
|
|
"daemon_restart_confirmation",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
crate::terminal_palette::with_test_default_colors(
|
|
crate::terminal_probe::DefaultColors {
|
|
fg: (229, 229, 229),
|
|
bg: (30, 40, 56),
|
|
},
|
|
|| {
|
|
// Simulate a terminal that erased the menu's blank tails with its default
|
|
// background rather than the cached panel color.
|
|
use std::io::Write;
|
|
for y in 0..area.height {
|
|
write!(terminal.backend_mut(), "\x1b[{};25H\x1b[0m\x1b[K", y + 1).unwrap();
|
|
}
|
|
terminal
|
|
.draw(|frame| app.chat_widget.render(area, frame.buffer_mut()))
|
|
.unwrap();
|
|
let expected = crate::custom_terminal::test_support::last_rendered_buffer(&terminal);
|
|
let screen = terminal.backend().vt100().screen();
|
|
for y in 0..area.height {
|
|
for x in 24..96 {
|
|
let expected_bg = match expected[(x, y)].bg {
|
|
ratatui::style::Color::Rgb(r, g, b) => vt100::Color::Rgb(r, g, b),
|
|
ratatui::style::Color::Reset => vt100::Color::Default,
|
|
_ => continue,
|
|
};
|
|
assert_eq!(
|
|
screen.cell(y, x).unwrap().bgcolor(),
|
|
expected_bg,
|
|
"at {x}, {y}: {:?}",
|
|
expected[(x, y)]
|
|
);
|
|
}
|
|
}
|
|
},
|
|
);
|
|
// Cancel is the default; a confirmed restart stays in the TUI.
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(rx.try_recv().is_err());
|
|
app.confirm_daemon_restart();
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(matches!(rx.try_recv().unwrap(), AppEvent::RunDaemonRestart));
|
|
|
|
// A local socket alone does not mean Codex can restart its owner.
|
|
app.chat_widget
|
|
.remote_connection
|
|
.as_mut()
|
|
.unwrap()
|
|
.is_managed_daemon = false;
|
|
app.open_daemon_menu();
|
|
insta::assert_snapshot!(
|
|
"daemon_unmanaged",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(matches!(
|
|
rx.try_recv().unwrap(),
|
|
AppEvent::ConfirmDaemonUpdate(_)
|
|
));
|
|
app.confirm_daemon_restart();
|
|
assert!(rx.try_recv().is_err());
|
|
|
|
// Maintenance remains available when startup selects the embedded server.
|
|
app.app_server_target = AppServerTarget::Embedded;
|
|
app.chat_widget.remote_connection = None;
|
|
app.daemon_cli_executable = executable;
|
|
for source in [
|
|
DaemonUpdateSource::PublicStable,
|
|
DaemonUpdateSource::ThisCli,
|
|
] {
|
|
app.open_daemon_menu();
|
|
if source == DaemonUpdateSource::PublicStable {
|
|
insta::assert_snapshot!(
|
|
"daemon_disconnected",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
} else {
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
}
|
|
assert!(rx.try_recv().is_err());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(
|
|
matches!(rx.try_recv().unwrap(), AppEvent::ConfirmDaemonUpdate(selected) if selected == source)
|
|
);
|
|
app.confirm_daemon_update(source);
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(rx.try_recv().is_err());
|
|
assert_eq!(app.pending_update_action, None);
|
|
app.confirm_daemon_update(source);
|
|
app.chat_widget.handle_key_event(KeyCode::Down.into());
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(
|
|
matches!(rx.try_recv().unwrap(), AppEvent::RunDaemonUpdate(selected) if selected == source)
|
|
);
|
|
}
|
|
|
|
std::fs::remove_file(package.path().join("codex-package.json")).unwrap();
|
|
// The full CLI can have any filename; capability comes from its entry point.
|
|
app.daemon_cli_executable =
|
|
Some(AbsolutePathBuf::from_absolute_path(package.path().join("bin/codex-tui")).unwrap());
|
|
app.open_daemon_menu();
|
|
insta::assert_snapshot!(
|
|
"daemon_unpackaged_cli",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(matches!(
|
|
rx.try_recv().unwrap(),
|
|
AppEvent::ConfirmDaemonUpdate(DaemonUpdateSource::PublicStable)
|
|
));
|
|
|
|
app.daemon_cli_executable = None;
|
|
app.open_daemon_menu();
|
|
insta::assert_snapshot!(
|
|
"daemon_no_cli_handoff",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(rx.try_recv().is_err());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn unavailable_daemon_menu_offers_guidance_without_update_actions() {
|
|
let mut app = make_test_app().await;
|
|
app.daemon_cli_executable =
|
|
Some(AbsolutePathBuf::from_absolute_path(std::env::current_exe().unwrap()).unwrap());
|
|
let (chat, _, mut rx, _) = make_chatwidget_manual_with_sender().await;
|
|
app.chat_widget = chat;
|
|
app.app_server_target = AppServerTarget::Remote {
|
|
endpoint: crate::RemoteAppServerEndpoint::WebSocket {
|
|
websocket_url: "ws://example.test:1234".into(),
|
|
auth_token: None,
|
|
},
|
|
};
|
|
app.chat_widget.remote_connection = Some(RemoteConnectionStatus {
|
|
address: "ws://example.test:1234".into(),
|
|
version: "v0.153.0".into(),
|
|
is_local_daemon: false,
|
|
is_managed_daemon: false,
|
|
});
|
|
app.open_daemon_menu();
|
|
insta::assert_snapshot!(
|
|
"daemon_remote_guidance",
|
|
render_bottom_popup(&app.chat_widget, /*width*/ 80)
|
|
);
|
|
app.chat_widget.handle_key_event(KeyCode::Enter.into());
|
|
assert!(rx.try_recv().is_err());
|
|
assert_eq!(app.pending_update_action, None);
|
|
}
|