From 3abb77151d91a8ee59472268d2b5c6a08cc38f27 Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Fri, 29 May 2026 12:30:50 -0700
Subject: [PATCH] Reuse spawn options for fork runtime version

---
 codex-rs/core/src/agent/control.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs
index 62cd2d2ee1..a89b837bf3 100644
--- a/codex-rs/core/src/agent/control.rs
+++ b/codex-rs/core/src/agent/control.rs
@@ -266,7 +266,6 @@ impl AgentControl {
                     &state,
                     config,
                     session_source,
-                    multi_agent_version,
                     &options,
                     inherited_shell_snapshot,
                     inherited_exec_policy,
@@ -377,11 +376,11 @@ impl AgentControl {
         state: &Arc<ThreadManagerState>,
         config: crate::config::Config,
         session_source: SessionSource,
-        multi_agent_version: Option<MultiAgentVersion>,
         options: &SpawnAgentOptions,
         inherited_shell_snapshot: Option<Arc<ShellSnapshot>>,
         inherited_exec_policy: Option<Arc<crate::exec_policy::ExecPolicyManager>>,
     ) -> CodexResult<crate::thread_manager::NewThread> {
+        let multi_agent_version = options.multi_agent_version;
         if options.fork_parent_spawn_call_id.is_none() {
             return Err(CodexErr::Fatal(
                 "spawn_agent fork requires a parent spawn call id".to_string(),