From 0cf3d21862d7e0eedf5b113934e203254e7f5f1a Mon Sep 17 00:00:00 2001 From: Simon Klee Date: Fri, 6 Nov 2026 03:05:07 +0100 Subject: [PATCH] fix(cli-rs): show declared mini errors without their tag --- packages/cli-rs/crates/mini/src/prompt/api.rs | 19 ++++++++++++++++++- packages/cli-rs/crates/mini/src/replay.rs | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/packages/cli-rs/crates/mini/src/prompt/api.rs b/packages/cli-rs/crates/mini/src/prompt/api.rs index a58ee94b5ed..45eca01205a 100644 --- a/packages/cli-rs/crates/mini/src/prompt/api.rs +++ b/packages/cli-rs/crates/mini/src/prompt/api.rs @@ -16,7 +16,7 @@ use super::complete::{Agent, Catalog, Command, Reference}; use super::parts::{Delivery, RunPrompt}; fn error(error: Error) -> String { - error.to_string() + error.tui_message() } fn location(directory: &str) -> Option { @@ -207,3 +207,20 @@ pub async fn select(client: &Client, session: &str, agent: Option<&str>, model: call.json(&json!({ "model": model })).map_err(error)?; client.empty(call).await.map_err(error) } + +#[cfg(test)] +mod tests { + use super::*; + use opencode_api::memory::{Memory, Route}; + use std::sync::Arc; + + /// A declared error shows its message without its tag, as the TS footer's `formatUnknownError` does. + #[tokio::test] + async fn a_declared_error_shows_its_message() { + let body = json!({ "_tag": "InvalidRequestError", "message": "Unknown agent: nope" }); + let memory = Memory::new(vec![Route::json("POST", "/api/session/ses_1/agent", 400, &body)]); + let client = Client::with_transport("http://test", Arc::new(memory)).unwrap(); + let result = select(&client, "ses_1", Some("nope"), None).await; + assert_eq!(result, Err("Unknown agent: nope".to_owned())); + } +} diff --git a/packages/cli-rs/crates/mini/src/replay.rs b/packages/cli-rs/crates/mini/src/replay.rs index ff3fce850f9..1c468557664 100644 --- a/packages/cli-rs/crates/mini/src/replay.rs +++ b/packages/cli-rs/crates/mini/src/replay.rs @@ -1441,7 +1441,7 @@ pub async fn default_model(client: &Client, directory: &str) -> Option<(String, /// `experimental.session.wait`: returns once the session is idle. pub async fn wait(client: &Client, session: &str) -> Result<(), String> { let input = ExperimentalSessionWaitInput { session_id: SessionID(session.to_owned()) }; - client.experimental_session_wait(&input).await.map_err(|error| error.to_string()) + client.experimental_session_wait(&input).await.map_err(|error| error.tui_message()) } /// `session.interrupt`, for mini's two-press gesture (`resume: true`) and run's shutdown.