diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 1a274985e8..449774bf27 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -4954,9 +4954,9 @@ dependencies = [ [[package]] name = "rmcp" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e35d31f89beb59c83bc31363426da25b323ce0c2e5b53c7bf29867d16ee7898" +checksum = "1fdad1258f7259fdc0f2dfc266939c82c3b5d1fd72bcde274d600cdc27e60243" dependencies = [ "base64", "bytes", @@ -4988,9 +4988,9 @@ dependencies = [ [[package]] name = "rmcp-macros" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88518b38110c439a03f0f4eee40e5105d648a530711cb87f98991e3f324a664" +checksum = "ede0589a208cc7ce81d1be68aa7e74b917fcd03c81528408bab0457e187dcd9b" dependencies = [ "darling 0.21.3", "proc-macro2", diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index d72c527bc2..c6e75dca61 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -153,7 +153,7 @@ ratatui = "0.29.0" ratatui-macros = "0.6.0" regex-lite = "0.1.7" reqwest = "0.12" -rmcp = { version = "0.8.2", default-features = false } +rmcp = { version = "0.8.3", default-features = false } schemars = "0.8.22" seccompiler = "0.5.0" sentry = "0.34.0" diff --git a/codex-rs/tui/src/key_hint.rs b/codex-rs/tui/src/key_hint.rs index b79c2a2703..795d1545f8 100644 --- a/codex-rs/tui/src/key_hint.rs +++ b/codex-rs/tui/src/key_hint.rs @@ -6,6 +6,9 @@ use ratatui::style::Style; use ratatui::style::Stylize; use ratatui::text::Span; +#[cfg(target_os = "macos")] +const ALT_PREFIX: &str = "⌥ + "; +#[cfg(not(target_os = "macos"))] const ALT_PREFIX: &str = "alt + "; const CTRL_PREFIX: &str = "ctrl + "; const SHIFT_PREFIX: &str = "shift + "; diff --git a/codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap b/codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap new file mode 100644 index 0000000000..5974455c89 --- /dev/null +++ b/codex-rs/tui/src/snapshots/codex_tui__status_indicator_widget__tests__renders_with_queued_messages@macos.snap @@ -0,0 +1,13 @@ +--- +source: tui/src/status_indicator_widget.rs +assertion_line: 289 +expression: terminal.backend() +--- +"• Working (0s • esc to interrupt) " +" " +" ↳ first " +" ↳ second " +" ⌥ + ↑ edit " +" " +" " +" " diff --git a/codex-rs/tui/src/status_indicator_widget.rs b/codex-rs/tui/src/status_indicator_widget.rs index 4bcc5cf267..81efde71f2 100644 --- a/codex-rs/tui/src/status_indicator_widget.rs +++ b/codex-rs/tui/src/status_indicator_widget.rs @@ -284,6 +284,11 @@ mod tests { terminal .draw(|f| w.render_ref(f.area(), f.buffer_mut())) .expect("draw"); + #[cfg(target_os = "macos")] + insta::with_settings!({ snapshot_suffix => "macos" }, { + insta::assert_snapshot!(terminal.backend()); + }); + #[cfg(not(target_os = "macos"))] insta::assert_snapshot!(terminal.backend()); }