Clarify TUI thread goal errors

Author: ericjuta

codex-rs/tui/src/app/thread_goal_actions.rs

@@ -11,6 +11,7 @@ use crate::goal_display::goal_usage_summary;
 use codex_app_server_protocol::ThreadGoal;
 use codex_app_server_protocol::ThreadGoalStatus;
 use codex_protocol::ThreadId;
+use color_eyre::Report;
 
 const EPHEMERAL_THREAD_GOAL_ERROR_MESSAGE: &str = concat!(
     "Goals need a saved session. This session is temporary.\n",
@@ -61,7 +62,11 @@ impl App {
         let response = match result {
             Ok(response) => response,
             Err(err) => {
-                tracing::warn!("failed to read thread goal after resume: {err}");
+                if is_ephemeral_thread_goal_error(&err) {
+                    tracing::debug!("skipping resume goal prompt for ephemeral thread: {err}");
+                } else {
+                    tracing::warn!("failed to read thread goal after resume: {err}");
+                }
                 return;
             }
         };
@@ -286,15 +291,17 @@ impl App {
     }
 }
 
-fn thread_goal_error_message(action: &str, err: &color_eyre::Report) -> String {
+fn thread_goal_error_message(action: &str, err: &Report) -> String {
     if is_ephemeral_thread_goal_error(err) {
-        EPHEMERAL_THREAD_GOAL_ERROR_MESSAGE.to_string()
-    } else {
-        format!("Failed to {action} thread goal: {err}")
+        return EPHEMERAL_THREAD_GOAL_ERROR_MESSAGE.to_string();
+    }
+    if err.to_string().contains("goals feature is disabled") {
+        return "Goals are not enabled for this session.".to_string();
     }
+    format!("Failed to {action} thread goal: {err}")
 }
 
-fn is_ephemeral_thread_goal_error(err: &color_eyre::Report) -> bool {
+fn is_ephemeral_thread_goal_error(err: &Report) -> bool {
     err.chain().any(|cause| {
         let message = cause.to_string();
         message.contains("ephemeral thread does not support goals")

codex-rs/tui/src/app_server_session.rs

@@ -139,6 +139,15 @@ fn is_thread_settings_update_unsupported(source: &JSONRPCErrorError) -> bool {
             && source.message.contains(THREAD_SETTINGS_UPDATE_METHOD))
 }
 
+fn thread_goal_request_error(context: &'static str, err: TypedRequestError) -> color_eyre::Report {
+    match err {
+        TypedRequestError::Server { source, .. } => {
+            color_eyre::eyre::eyre!("{}", source.message)
+        }
+        err => color_eyre::eyre::eyre!("{context}: {err}"),
+    }
+}
+
 /// Data collected during the TUI bootstrap phase that the main event loop
 /// needs to configure the UI, telemetry, and initial rate-limit prefetch.
 ///
@@ -798,7 +807,7 @@ impl AppServerSession {
                 },
             })
             .await
-            .wrap_err("thread/goal/get failed in TUI")
+            .map_err(|err| thread_goal_request_error("thread/goal/get failed in TUI", err))
     }
 
     pub(crate) async fn thread_goal_set(
@@ -820,7 +829,7 @@ impl AppServerSession {
                 },
             })
             .await
-            .wrap_err("thread/goal/set failed in TUI")
+            .map_err(|err| thread_goal_request_error("thread/goal/set failed in TUI", err))
     }
 
     pub(crate) async fn thread_goal_clear(
@@ -836,7 +845,7 @@ impl AppServerSession {
                 },
             })
             .await
-            .wrap_err("thread/goal/clear failed in TUI")
+            .map_err(|err| thread_goal_request_error("thread/goal/clear failed in TUI", err))
     }
 
     pub(crate) async fn logout_account(&mut self) -> Result<()> {
@@ -1740,6 +1749,36 @@ mod tests {
     use pretty_assertions::assert_eq;
     use tempfile::TempDir;
 
+    #[test]
+    fn thread_goal_request_error_surfaces_server_message() {
+        let error = TypedRequestError::Server {
+            method: "thread/goal/get".to_string(),
+            source: JSONRPCErrorError {
+                code: -32600,
+                message: "ephemeral thread does not support goals: thr_123".to_string(),
+                data: None,
+            },
+        };
+
+        assert_eq!(
+            thread_goal_request_error("thread/goal/get failed in TUI", error).to_string(),
+            "ephemeral thread does not support goals: thr_123"
+        );
+    }
+
+    #[test]
+    fn thread_goal_request_error_keeps_transport_context() {
+        let error = TypedRequestError::Transport {
+            method: "thread/goal/get".to_string(),
+            source: std::io::Error::new(std::io::ErrorKind::BrokenPipe, "broken pipe"),
+        };
+
+        assert_eq!(
+            thread_goal_request_error("thread/goal/get failed in TUI", error).to_string(),
+            "thread/goal/get failed in TUI: thread/goal/get transport error: broken pipe"
+        );
+    }
+
     async fn build_config(temp_dir: &TempDir) -> Config {
         ConfigBuilder::default()
             .codex_home(temp_dir.path().to_path_buf())