From ca4d532b2a5803159bfa8c8f56213948e068b62f Mon Sep 17 00:00:00 2001
From: Dylan Hurd <dylan.hurd@openai.com>
Date: Wed, 12 Aug 2026 00:38:08 +0000
Subject: [PATCH] Test Guardian context for code mode commands (#38094)

## What changed

Add integration coverage verifying that Guardian receives both the user prompt
and the outer code mode `exec` source when reviewing a nested escalated
`exec_command` call.

GitOrigin-RevId: e78e9d4d69e7ebccc935c548565a07600659f65a
---
 codex-rs/core/tests/suite/guardian_review.rs | 56 ++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/codex-rs/core/tests/suite/guardian_review.rs b/codex-rs/core/tests/suite/guardian_review.rs
index 4f83ced6026f..e835cbd35f73 100644
--- a/codex-rs/core/tests/suite/guardian_review.rs
+++ b/codex-rs/core/tests/suite/guardian_review.rs
@@ -29,6 +29,7 @@ use codex_protocol::user_input::UserInput;
 use core_test_support::fs_wait;
 use core_test_support::responses::ev_assistant_message;
 use core_test_support::responses::ev_completed;
+use core_test_support::responses::ev_custom_tool_call;
 use core_test_support::responses::ev_function_call;
 use core_test_support::responses::ev_response_created;
 use core_test_support::responses::mount_response_once_match;
@@ -478,6 +479,61 @@ async fn guardian_session_is_reused_for_consecutive_tool_reviews_without_prewarm
     Ok(())
 }
 
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn guardian_review_of_code_mode_exec_command_includes_outer_source() -> Result<()> {
+    skip_if_no_network!(Ok(()));
+    skip_if_sandbox!(Ok(()));
+    skip_if_wine_exec!(
+        Ok(()),
+        "Guardian approval actions require host-native paths"
+    );
+
+    let server = start_mock_server().await;
+    let mut builder = test_codex()
+        .with_model("test-gpt-5.1-codex")
+        .with_config(|config| {
+            config.permissions.approval_policy = Constrained::allow_any(AskForApproval::OnRequest);
+            config.approvals_reviewer = ApprovalsReviewer::AutoReview;
+            let _ = config.features.enable(Feature::CodeMode);
+        });
+    let test = builder.build_with_auto_env(&server).await?;
+
+    let code = r#"const outerContext = "guardian-code-mode-outer-context";
+await tools.exec_command({cmd: "true", sandbox_permissions: "require_escalated", justification: "test"});"#;
+    let responses = mount_sse_sequence(
+        &server,
+        vec![
+            sse(vec![
+                ev_custom_tool_call("code-mode-call", "exec", code),
+                ev_completed("resp-parent"),
+            ]),
+            sse(vec![
+                ev_assistant_message("guardian", r#"{"outcome":"allow"}"#),
+                ev_completed("resp-guardian"),
+            ]),
+            sse(vec![ev_completed("resp-done")]),
+        ],
+    )
+    .await;
+
+    let prompt = "run a nested command that requires Guardian review";
+    test.submit_text_turn(prompt).await?;
+
+    let transcript = responses.requests()[1].message_input_texts("user")[2..6].concat();
+    assert_eq!(
+        transcript,
+        format!(
+            ">>> TRANSCRIPT START\n\
+             [1] user: {prompt}\n\
+             \n\
+             [2] tool exec call: {code}\n\
+             >>> TRANSCRIPT END\n"
+        )
+    );
+
+    Ok(())
+}
+
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn interrupted_guardian_tool_review_aborts_without_executing_the_command() -> Result<()> {
     skip_if_no_network!(Ok(()));