Lightweight coding agent that runs in your terminal
Rust
Surface realtime voice catalog failures in the TUI (#49073)
Eric Traut15c08beee2d9
diff --git a/codex-rs/tui/src/app/realtime_settings.rs b/codex-rs/tui/src/app/realtime_settings.rsindex d265d4b25c..ea1491fd9a 100644--- a/codex-rs/tui/src/app/realtime_settings.rs+++ b/codex-rs/tui/src/app/realtime_settings.rs@@ -32,8 +32,8 @@ impl App {pub(super) async fn realtime_voices(&self,app_server: &AppServerSession,- ) -> RealtimeVoicesList {- match app_server+ ) -> Result<RealtimeVoicesList> {+ let response = app_server.request_handle().request_typed::<ThreadRealtimeListVoicesResponse>(ClientRequest::ThreadRealtimeListVoices {@@ -41,11 +41,8 @@ impl App {params: ThreadRealtimeListVoicesParams {},},)- .await- {- Ok(response) => response.voices,- Err(_) => RealtimeVoicesList::builtin(),- }+ .await?;+ Ok(response.voices)}pub(super) async fn effective_realtime_voice(@@ -67,7 +64,14 @@ impl App {}pub(super) async fn open_realtime_settings(&mut self, app_server: &AppServerSession) {- let voices = self.realtime_voices(app_server).await;+ let voices = match self.realtime_voices(app_server).await {+ Ok(voices) => voices,+ Err(error) => {+ self.chat_widget+ .add_error_message(format!("Failed to list voices: {error}"));+ return;+ }+ };match self.effective_realtime_voice(app_server, &voices).await {Ok(voice) => self.chat_widget.open_realtime_settings(voice, voices),Err(error) => self@@ -91,7 +95,15 @@ impl App {.await{Ok(response) => {- let voices = self.realtime_voices(app_server).await;+ let voices = match self.realtime_voices(app_server).await {+ Ok(voices) => voices,+ Err(error) => {+ self.chat_widget.add_error_message(format!(+ "Voice preference was saved, but the effective voice could not be confirmed: {error}"+ ));+ return;+ }+ };let effective = crate::config_update::read_effective_config_if_supported(app_server.request_handle(), &self.chat_widget.config_ref().cwd,).await.and_then(|config| match config.as_ref() {diff --git a/codex-rs/tui/src/app/tests/realtime_requests.rs b/codex-rs/tui/src/app/tests/realtime_requests.rsindex af57f9a22b..16c81ceecf 100644--- a/codex-rs/tui/src/app/tests/realtime_requests.rs+++ b/codex-rs/tui/src/app/tests/realtime_requests.rs@@ -90,7 +90,6 @@ async fn remote_voice_start_routes_v3_offer_and_effective_preference() -> Result(HistoryCapabilities::ConfigReadUnsupported(-32601), None),(HistoryCapabilities::Current, Some("cove")),(HistoryCapabilities::VoiceCatalogCustom, Some("maple")),- (HistoryCapabilities::VoiceCatalogUnavailable, Some("cove")),(HistoryCapabilities::ConfigReadUnknownVoice, None),] {check_remote_voice_start(capabilities, expected_voice).await?;@@ -1888,14 +1887,14 @@ async fn remote_voice_picker_reads_server_preference() -> Result<()> {}#[tokio::test]-async fn remote_voice_picker_uses_server_catalog_and_falls_back_when_unavailable() -> Result<()> {+async fn remote_voice_catalog_success_and_failure() -> Result<()> {use super::session_lifecycle_requests::HistoryCapabilities;for (capabilities, expected_catalog) in [(HistoryCapabilities::VoiceCatalogCustom, true),(HistoryCapabilities::VoiceCatalogUnavailable, false),] {- let (mut app, _events, _ops) = make_test_app_with_channels().await;- let (server, requests, proxy) =+ let (mut app, mut events, _ops) = make_test_app_with_channels().await;+ let (mut server, requests, proxy) =super::session_lifecycle_requests::start_recording_app_server_with_realtime_speech(&app.config,capabilities,@@ -1906,13 +1905,14 @@ async fn remote_voice_picker_uses_server_catalog_and_falls_back_when_unavailablecodex_config::LoaderOverrides::default(),).await?;+ while events.try_recv().is_ok() {}app.open_realtime_settings(&server).await;let popup = crate::chatwidget::tests::helpers::render_bottom_popup(&app.chat_widget,/*width*/ 80,);assert_eq!(popup.contains("1. maple (current)"), expected_catalog);- assert_eq!(popup.contains(" 3. spruce"), !expected_catalog);+ assert!(!popup.contains(" 3. spruce"));if expected_catalog {insta::assert_snapshot!("remote_voice_picker_server_default", popup);}@@ -1920,6 +1920,76 @@ async fn remote_voice_picker_uses_server_catalog_and_falls_back_when_unavailablerecorded_params(&requests, "thread/realtime/listVoices").len(),1);+ if !expected_catalog {+ assert!(!app.chat_widget.has_active_view());+ for phase in ["picker", "save", "start"] {+ match phase {+ "save" => {+ let previous = (+ app.config.realtime.voice,+ app.chat_widget.config_ref().realtime.voice,+ );+ app.persist_realtime_voice(+ &server,+ codex_protocol::protocol::RealtimeVoice::Juniper,+ )+ .await;+ assert_eq!(+ (+ app.config.realtime.voice,+ app.chat_widget.config_ref().realtime.voice,+ ),+ previous,+ );+ let saved: toml::Value = toml::from_str(&std::fs::read_to_string(+ app.config.codex_home.join("config.toml"),+ )?)?;+ assert_eq!(saved["realtime"]["voice"].as_str(), Some("juniper"));+ }+ "start" => {+ let thread_id = ThreadId::new();+ app.chat_widget+ .handle_thread_session_quiet(test_thread_session(+ thread_id,+ app.config.cwd.to_path_buf(),+ ));+ app.active_thread_id = Some(thread_id);+ crate::chatwidget::activate_voice_for_thread(+ &mut app.chat_widget,+ thread_id,+ );+ assert!(app.chat_widget.may_receive_realtime_transcripts());+ let mut tui = crate::tui::test_support::make_test_tui()?;+ Box::pin(app.handle_event(+ &mut tui,+ &mut server,+ AppEvent::CodexOp(Op::RealtimeConversationStart {+ thread_id,+ offer_sdp: String::from("v=0\r\n").into(),+ }),+ ))+ .await?;+ assert!(!app.chat_widget.may_receive_realtime_transcripts());+ assert!(recorded_params(&requests, "thread/realtime/start").is_empty());+ }+ _ => {}+ }+ let messages = std::iter::from_fn(|| events.try_recv().ok())+ .filter_map(|event| match event {+ AppEvent::InsertHistoryCell(cell) => Some(+ cell.display_lines(/*width*/ 80)+ .into_iter()+ .map(|line| line.to_string())+ .collect::<Vec<_>>()+ .join("\n"),+ ),+ _ => None,+ })+ .collect::<Vec<_>>()+ .join("\n");+ insta::assert_snapshot!(format!("voice_catalog_failure_{phase}"), messages);+ }+ }server.shutdown().await?;proxy.await??;}diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_picker.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_picker.snapnew file mode 100644index 0000000000..c2f365187b--- /dev/null+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_picker.snap@@ -0,0 +1,5 @@+---+source: tui/src/app/tests/realtime_requests.rs+expression: messages+---+■ Failed to list voices: thread/realtime/listVoices failed: method not found (code -32601)diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_save.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_save.snapnew file mode 100644index 0000000000..05354441e0--- /dev/null+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_save.snap@@ -0,0 +1,5 @@+---+source: tui/src/app/tests/realtime_requests.rs+expression: messages+---+■ Voice preference was saved, but the effective voice could not be confirmed: thread/realtime/listVoices failed: method not found (code -32601)diff --git a/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_start.snap b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_start.snapnew file mode 100644index 0000000000..15c04a0717--- /dev/null+++ b/codex-rs/tui/src/app/tests/snapshots/codex_tui__app__tests__realtime_requests__voice_catalog_failure_start.snap@@ -0,0 +1,5 @@+---+source: tui/src/app/tests/realtime_requests.rs+expression: messages+---+■ Voice conversation failed: thread/realtime/listVoices failed: method not found (code -32601)diff --git a/codex-rs/tui/src/app/thread_routing.rs b/codex-rs/tui/src/app/thread_routing.rsindex a3501c3a1b..854a318e9e 100644--- a/codex-rs/tui/src/app/thread_routing.rs+++ b/codex-rs/tui/src/app/thread_routing.rs@@ -947,7 +947,7 @@ impl App {.config_ref().experimental_realtime_ws_model.clone();- let voices = self.realtime_voices(app_server).await;+ let voices = self.realtime_voices(app_server).await?;let voice = self.effective_realtime_voice(app_server, &voices).await?;app_server.thread_realtime_start(