From e5b9dc45d09be0f87d1149f370851e7ae5a3fb75 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Sat, 6 Jun 2026 17:03:53 -0700
Subject: [PATCH] codex: address PR review feedback (#26754)

---
 codex-rs/tui/src/app/side.rs | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/codex-rs/tui/src/app/side.rs b/codex-rs/tui/src/app/side.rs
index be1d2db1c5..4e0db7d0f9 100644
--- a/codex-rs/tui/src/app/side.rs
+++ b/codex-rs/tui/src/app/side.rs
@@ -564,8 +564,6 @@ impl App {
             /*inc*/ 1,
             &[("source", "slash_command")],
         );
-        self.refresh_in_memory_config_from_disk_best_effort("starting a side conversation")
-            .await;
 
         let request_id = Uuid::new_v4();
         self.pending_side_start = Some(PendingSideStart {
@@ -645,8 +643,35 @@ impl App {
                 );
                 // Known side threads take the selector's local replay path, so this does not wait
                 // for another app-server response on the TUI loop.
-                self.select_agent_thread(tui, app_server, child_thread_id)
-                    .await?;
+                if let Err(err) = self
+                    .select_agent_thread(tui, app_server, child_thread_id)
+                    .await
+                {
+                    let discarded = self.discard_side_thread(app_server, child_thread_id).await;
+                    if discarded
+                        && self.active_thread_id != Some(parent_thread_id)
+                        && let Err(restore_err) = self
+                            .select_agent_thread(tui, app_server, parent_thread_id)
+                            .await
+                    {
+                        tracing::warn!(
+                            "failed to restore parent thread after side switch failure: \
+                             {restore_err}"
+                        );
+                    } else if !discarded {
+                        self.keep_side_thread_visible_after_cleanup_failure(
+                            tui,
+                            app_server,
+                            child_thread_id,
+                        )
+                        .await;
+                    }
+                    self.restore_side_user_message(user_message.take());
+                    self.chat_widget.add_error_message(format!(
+                        "Failed to switch into side conversation {child_thread_id}: {err}"
+                    ));
+                    return Ok(());
+                }
                 if self.active_thread_id == Some(child_thread_id)
                     && let Some(user_message) = user_message.take()
                 {