From 7737b55c635da10dd0998be1d48fd3d3409fbb0f Mon Sep 17 00:00:00 2001
From: Ahmed Ibrahim <aibrahim@openai.com>
Date: Mon, 1 Jun 2026 14:45:00 -0700
Subject: [PATCH] codex: preserve disabled delegate runtime lock

---
 codex-rs/core/src/session/mod.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs
index ba31bf79eb..2c81890dc9 100644
--- a/codex-rs/core/src/session/mod.rs
+++ b/codex-rs/core/src/session/mod.rs
@@ -431,6 +431,10 @@ fn resolve_multi_agent_version(
     model_info: &ModelInfo,
     config: &Config,
 ) -> Option<MultiAgentVersion> {
+    if inherited_multi_agent_version == Some(MultiAgentVersion::Disabled) {
+        return inherited_multi_agent_version;
+    }
+
     conversation_history
         .get_multi_agent_version()
         .or(inherited_multi_agent_version)