From cc41d1501c293e3aff6741059725e69be4d0685c Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Fri, 29 May 2026 13:23:41 -0700
Subject: [PATCH] Fix merge integration compile errors

---
 codex-rs/core/src/session/mod.rs    | 2 +-
 codex-rs/core/src/tasks/mod.rs      | 1 +
 codex-rs/core/src/thread_manager.rs | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs
index 519c660ce5..6b1992b356 100644
--- a/codex-rs/core/src/session/mod.rs
+++ b/codex-rs/core/src/session/mod.rs
@@ -514,7 +514,6 @@ impl Codex {
             )
         };
 
-        let config = Arc::new(config);
         let refresh_strategy = if session_source.is_non_root_agent() {
             codex_models_manager::manager::RefreshStrategy::Offline
         } else {
@@ -557,6 +556,7 @@ impl Codex {
             let _ = config.features.disable(Feature::SpawnCsv);
             let _ = config.features.disable(Feature::Collab);
         }
+        let config = Arc::new(config);
         let base_instructions = config
             .base_instructions
             .clone()
diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs
index b14eacd50a..7a71002ed1 100644
--- a/codex-rs/core/src/tasks/mod.rs
+++ b/codex-rs/core/src/tasks/mod.rs
@@ -34,6 +34,7 @@ use crate::state::ActiveTurn;
 use crate::state::RunningTask;
 use crate::state::TaskKind;
 use codex_analytics::TurnTokenUsageFact;
+use codex_features::Feature;
 use codex_login::AuthManager;
 use codex_models_manager::manager::SharedModelsManager;
 use codex_otel::SessionTelemetry;
diff --git a/codex-rs/core/src/thread_manager.rs b/codex-rs/core/src/thread_manager.rs
index 75be4de508..f3917997d1 100644
--- a/codex-rs/core/src/thread_manager.rs
+++ b/codex-rs/core/src/thread_manager.rs
@@ -691,6 +691,7 @@ impl ThreadManager {
             auth_manager,
             self.agent_control(),
             session_source,
+            /*parent_multi_agent_version*/ None,
             /*forked_from_thread_id*/ None,
             thread_source,
             Vec::new(),
@@ -752,6 +753,7 @@ impl ThreadManager {
             auth_manager,
             self.agent_control(),
             session_source,
+            /*parent_multi_agent_version*/ None,
             /*forked_from_thread_id*/ None,
             thread_source,
             Vec::new(),