From a5ef02e56147c4c3da493655fd5e2c64db13210f Mon Sep 17 00:00:00 2001
From: jif <jif@openai.com>
Date: Tue, 27 Oct 2026 12:18:40 +0000
Subject: [PATCH] Add Guardian native multi-agent history feature flag (#57441)

## What changed

Register `guardian_native_multi_agent_history` as an under-development feature,
disabled by default, and expose it in the configuration schema.

GitOrigin-RevId: d434750c1aa0cc78b36d1d661a4df0def5426f02
---
 codex-rs/core/config.schema.json | 6 ++++++
 codex-rs/features/src/lib.rs     | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json
index 39cfb67299..ae31c7e87a 100644
--- a/codex-rs/core/config.schema.json
+++ b/codex-rs/core/config.schema.json
@@ -1059,6 +1059,9 @@
             "guardian_ext": {
               "type": "boolean"
             },
+            "guardian_native_multi_agent_history": {
+              "type": "boolean"
+            },
             "guardian_node_repl_transcript_images": {
               "type": "boolean"
             },
@@ -7701,6 +7704,9 @@
         "guardian_ext": {
           "type": "boolean"
         },
+        "guardian_native_multi_agent_history": {
+          "type": "boolean"
+        },
         "guardian_node_repl_transcript_images": {
           "type": "boolean"
         },
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index 0c8c1d6c81..9c85a417fe 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -405,6 +405,8 @@ pub enum Feature {
     GuardianReuseParentCompaction,
     /// Limit worker Guardian root evidence to preceding root communication windows.
     GuardianRootHandoffContext,
+    /// Preserve native MAv2 tool calls in synchronous Guardian history.
+    GuardianNativeMultiAgentHistory,
     /// Include completed node_repl or cua_repl Code Mode responses in Guardian reviews.
     GuardianEnhancedNodeReplTranscripts,
     /// Include completed node_repl or cua_repl Code Mode response images in Guardian reviews.
@@ -1993,6 +1995,12 @@ pub const FEATURES: &[FeatureSpec] = &[
         stage: Stage::UnderDevelopment,
         default_enabled: false,
     },
+    FeatureSpec {
+        id: Feature::GuardianNativeMultiAgentHistory,
+        key: "guardian_native_multi_agent_history",
+        stage: Stage::UnderDevelopment,
+        default_enabled: false,
+    },
     FeatureSpec {
         id: Feature::GuardianEnhancedNodeReplTranscripts,
         key: "guardian_enhanced_node_repl_transcripts",