From 31d338a1ea89cd65a48d8ac07f50bb3917009806 Mon Sep 17 00:00:00 2001
From: jif <jif@openai.com>
Date: Fri, 28 Aug 2026 11:05:43 +0000
Subject: [PATCH] Isolate required-model Guardian approval coverage (#41322)

## What changed

Update the Guardian v2 required-model-switch test to continue the thread with
empty input. This keeps authorization unchanged, so the test specifically
verifies that the required-model check prevents reuse of a cached approval for
the sandboxed command.

Continue asserting that a Guardian review starts and that the command skips a
second classification.

GitOrigin-RevId: 5ce914cb6e66f0527d9ec154331cc356104bfb72
---
 .../app-server/tests/suite/v2/guardian_v2.rs  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs
index b6b93d4ff8..3c8b5d4eb5 100644
--- a/codex-rs/app-server/tests/suite/v2/guardian_v2.rs
+++ b/codex-rs/app-server/tests/suite/v2/guardian_v2.rs
@@ -1191,24 +1191,17 @@ async fn guardian_v2_routes_scoped_tool_approvals(
     if matches!(lifecycle, ThreadLifecycle::RequiredModelSwitch) {
         // Both MCP actions have low scores; the sandboxed exec must still receive full review.
         timeout(TIMEOUT, responses_state.classification_completed.notified()).await?;
+        // Continue without new user input so authorization changes cannot invalidate the score.
+        // Only the required-model check should prevent cached approval of the sandboxed command.
         let request_id = app_server
             .send_turn_start_request(TurnStartParams {
                 thread_id: thread_id.clone(),
                 model: Some(REQUIRED_MODEL.to_owned()),
-                input: vec![UserInput::Text {
-                    text: "Run the requested command.".to_owned(),
-                    text_elements: Vec::new(),
-                }],
+                input: Vec::new(),
                 ..Default::default()
             })
             .await?;
         let _: TurnStartResponse = timeout(TIMEOUT, app_server.read_response(request_id)).await??;
-        let review_started: ItemGuardianApprovalReviewStartedNotification = timeout(
-            TIMEOUT,
-            app_server.read_notification("item/autoApprovalReview/started"),
-        )
-        .await??;
-        assert_eq!(review_started.thread_id, thread_id);
         let completed: TurnCompletedNotification =
             timeout(TIMEOUT, app_server.read_notification("turn/completed")).await??;
         assert_eq!(completed.thread_id, thread_id);
@@ -1216,6 +1209,12 @@ async fn guardian_v2_routes_scoped_tool_approvals(
             responses_state.guardian_reviews.load(Ordering::SeqCst),
             expected_guardian_reviews + 1,
         );
+        let review_started: ItemGuardianApprovalReviewStartedNotification = timeout(
+            TIMEOUT,
+            app_server.read_notification("item/autoApprovalReview/started"),
+        )
+        .await??;
+        assert_eq!(review_started.thread_id, thread_id);
         assert_eq!(
             responses_state
                 .luna_requests