From 6cdec2bdd3d0412af192d4c5ebc3133cffe65539 Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Fri, 8 May 2026 21:28:54 -0700
Subject: [PATCH] Keep local primary in remote routing tests

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/core/src/session/mcp.rs             | 7 -------
 codex-rs/core/src/session_startup_prewarm.rs | 5 -----
 codex-rs/core/tests/suite/remote_env.rs      | 2 +-
 codex-rs/core/tests/suite/view_image.rs      | 2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/codex-rs/core/src/session/mcp.rs b/codex-rs/core/src/session/mcp.rs
index 6604af7daa..37239ab015 100644
--- a/codex-rs/core/src/session/mcp.rs
+++ b/codex-rs/core/src/session/mcp.rs
@@ -346,13 +346,6 @@ impl Session {
             *guard = cancel_token;
         }
 
-        if let Some(startup_prewarm) = self.take_session_startup_prewarm().await {
-            // The prewarm was built with the stale manager and can hold a read
-            // lock while resolving tools. Abort it before swapping managers so
-            // an MCP refresh cannot block turn startup behind stale work.
-            startup_prewarm.abort_and_wait().await;
-        }
-
         let mut old_manager = {
             let mut manager = self.services.mcp_connection_manager.write().await;
             std::mem::replace(&mut *manager, refreshed_manager)
diff --git a/codex-rs/core/src/session_startup_prewarm.rs b/codex-rs/core/src/session_startup_prewarm.rs
index 0e6e0644e3..93d14ff7d6 100644
--- a/codex-rs/core/src/session_startup_prewarm.rs
+++ b/codex-rs/core/src/session_startup_prewarm.rs
@@ -47,11 +47,6 @@ impl SessionStartupPrewarmHandle {
         }
     }
 
-    pub(crate) async fn abort_and_wait(self) {
-        self.task.abort();
-        let _ = self.task.await;
-    }
-
     async fn resolve(
         self,
         session_telemetry: &SessionTelemetry,
diff --git a/codex-rs/core/tests/suite/remote_env.rs b/codex-rs/core/tests/suite/remote_env.rs
index 35d50af278..8c990fef14 100644
--- a/codex-rs/core/tests/suite/remote_env.rs
+++ b/codex-rs/core/tests/suite/remote_env.rs
@@ -234,7 +234,7 @@ async fn exec_command_routes_to_selected_remote_environment() -> Result<()> {
             "yield_time_ms": 1_000,
             "environment_id": REMOTE_ENVIRONMENT_ID,
         }),
-        Some(vec![remote_selection, local_selection]),
+        Some(vec![local_selection, remote_selection]),
     )
     .await?;
     assert!(
diff --git a/codex-rs/core/tests/suite/view_image.rs b/codex-rs/core/tests/suite/view_image.rs
index b23fc6cbdb..82565e857b 100644
--- a/codex-rs/core/tests/suite/view_image.rs
+++ b/codex-rs/core/tests/suite/view_image.rs
@@ -538,7 +538,7 @@ async fn view_image_routes_to_selected_remote_environment() -> anyhow::Result<()
 
     test.submit_turn_with_environments(
         "route view image",
-        Some(vec![remote_selection, local_selection]),
+        Some(vec![local_selection, remote_selection]),
     )
     .await?;