From f41333434c369e2116ffec7df603288a263b9973 Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Fri, 29 May 2026 12:33:31 -0700
Subject: [PATCH] Remove test-only multi-agent flag resolution

---
 codex-rs/core/src/agent/control.rs       |  9 +--------
 codex-rs/core/src/agent/control_tests.rs | 15 +++++++++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs
index a89b837bf3..48781949fe 100644
--- a/codex-rs/core/src/agent/control.rs
+++ b/codex-rs/core/src/agent/control.rs
@@ -191,18 +191,11 @@ impl AgentControl {
         initial_operation: Op,
         session_source: Option<SessionSource>,
     ) -> CodexResult<ThreadId> {
-        let multi_agent_version = config
-            .features
-            .enabled(Feature::MultiAgentV2)
-            .then_some(MultiAgentVersion::V2);
         let spawned_agent = Box::pin(self.spawn_agent_internal(
             config,
             initial_operation,
             session_source,
-            SpawnAgentOptions {
-                multi_agent_version,
-                ..Default::default()
-            },
+            SpawnAgentOptions::default(),
         ))
         .await?;
         Ok(spawned_agent.thread_id)
diff --git a/codex-rs/core/src/agent/control_tests.rs b/codex-rs/core/src/agent/control_tests.rs
index 551598b4c4..a90cd30e29 100644
--- a/codex-rs/core/src/agent/control_tests.rs
+++ b/codex-rs/core/src/agent/control_tests.rs
@@ -1543,12 +1543,11 @@ async fn spawn_child_completion_notifies_parent_history() {
 async fn multi_agent_v2_completion_ignores_dead_direct_parent() {
     let harness = AgentControlHarness::new().await;
     let (root_thread_id, root_thread) = harness.start_thread().await;
-    let mut config = harness.config.clone();
-    let _ = config.features.enable(Feature::MultiAgentV2);
+    let config = harness.config.clone();
     let worker_path = AgentPath::root().join("worker_a").expect("worker path");
     let worker_thread_id = harness
         .control
-        .spawn_agent(
+        .spawn_agent_with_metadata(
             config.clone(),
             text_input("hello worker"),
             Some(SessionSource::SubAgent(SubAgentSource::ThreadSpawn {
@@ -1558,13 +1557,17 @@ async fn multi_agent_v2_completion_ignores_dead_direct_parent() {
                 agent_nickname: None,
                 agent_role: Some("explorer".to_string()),
             })),
+            SpawnAgentOptions {
+                multi_agent_version: Some(MultiAgentVersion::V2),
+                ..Default::default()
+            },
         )
         .await
         .expect("worker spawn should succeed");
     let tester_path = worker_path.join("tester").expect("tester path");
     let tester_thread_id = harness
         .control
-        .spawn_agent(
+        .spawn_agent_with_metadata(
             config,
             text_input("hello tester"),
             Some(SessionSource::SubAgent(SubAgentSource::ThreadSpawn {
@@ -1574,6 +1577,10 @@ async fn multi_agent_v2_completion_ignores_dead_direct_parent() {
                 agent_nickname: None,
                 agent_role: Some("explorer".to_string()),
             })),
+            SpawnAgentOptions {
+                multi_agent_version: Some(MultiAgentVersion::V2),
+                ..Default::default()
+            },
         )
         .await
         .expect("tester spawn should succeed");