From fd6644fd82abc94ec3046195cd03c80850615e41 Mon Sep 17 00:00:00 2001
From: Abhinav Vedmala <abhinav@openai.com>
Date: Fri, 1 May 2026 23:57:56 -0700
Subject: [PATCH] Fix approval prompt lint callsites

---
 .../core/src/guardian/approval_request.rs     | 28 +++++++++++--------
 codex-rs/core/src/mcp_tool_call_tests.rs      | 16 +++++++++--
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/codex-rs/core/src/guardian/approval_request.rs b/codex-rs/core/src/guardian/approval_request.rs
index 391e240c9b..d3c37b7296 100644
--- a/codex-rs/core/src/guardian/approval_request.rs
+++ b/codex-rs/core/src/guardian/approval_request.rs
@@ -20,7 +20,6 @@ use codex_protocol::request_user_input::RequestUserInputAnswer;
 use codex_protocol::request_user_input::RequestUserInputQuestion;
 use codex_protocol::request_user_input::RequestUserInputQuestionOption;
 use codex_protocol::request_user_input::RequestUserInputResponse;
-use codex_shell_command::parse_command::shlex_join;
 use codex_utils_absolute_path::AbsolutePathBuf;
 use serde::Serialize;
 use serde_json::Value;
@@ -163,7 +162,10 @@ impl ApprovalRequest {
                 if argv.len() > 1 {
                     command.extend_from_slice(&argv[1..]);
                 }
-                Some(PermissionRequestPayload::bash(shlex_join(&command), None))
+                Some(PermissionRequestPayload::bash(
+                    codex_shell_command::parse_command::shlex_join(&command),
+                    /*description*/ None,
+                ))
             }
             Self::ApplyPatch { patch, .. } => Some(PermissionRequestPayload {
                 tool_name: HookToolName::apply_patch(),
@@ -1144,9 +1146,9 @@ mod tests {
                 "turn-1".to_string(),
                 Some("approval-1".to_string()),
                 Some("retry".to_string()),
-                None,
-                None,
-                None,
+                /*network_approval_context*/ None,
+                /*proposed_execpolicy_amendment*/ None,
+                /*proposed_network_policy_amendments*/ None,
                 Some(vec![ReviewDecision::Approved, ReviewDecision::Abort]),
                 /*fallback_cwd*/ None,
             )
@@ -1181,7 +1183,11 @@ mod tests {
         };
 
         let event = request
-            .apply_patch_approval_event("turn-1".to_string(), Some("needs write".to_string()), None)
+            .apply_patch_approval_event(
+                "turn-1".to_string(),
+                Some("needs write".to_string()),
+                /*grant_root*/ None,
+            )
             .expect("apply_patch approval event");
 
         assert_eq!(event.call_id, "call-1");
@@ -1248,12 +1254,12 @@ mod tests {
         let event = request
             .exec_approval_event(
                 "ignored-turn".to_string(),
-                None,
+                /*approval_id*/ None,
                 Some("need network".to_string()),
-                None,
-                None,
-                None,
-                None,
+                /*network_approval_context*/ None,
+                /*proposed_execpolicy_amendment*/ None,
+                /*proposed_network_policy_amendments*/ None,
+                /*available_decisions*/ None,
                 Some(test_path_buf("/tmp").abs()),
             )
             .expect("network exec approval event");
diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs
index 04418ca414..eb1457b6ea 100644
--- a/codex-rs/core/src/mcp_tool_call_tests.rs
+++ b/codex-rs/core/src/mcp_tool_call_tests.rs
@@ -682,7 +682,13 @@ fn codex_apps_tool_question_uses_fallback_app_label() {
 
 #[test]
 fn trusted_codex_apps_tool_question_offers_always_allow() {
-    let metadata = approval_metadata(Some("calendar"), Some("Calendar"), None, None, None);
+    let metadata = approval_metadata(
+        Some("calendar"),
+        Some("Calendar"),
+        /*connector_description*/ None,
+        /*tool_title*/ None,
+        /*tool_description*/ None,
+    );
     let question = approval_prompt_request(
         CODEX_APPS_MCP_SERVER_NAME,
         "run_action",
@@ -730,7 +736,13 @@ fn codex_apps_tool_question_without_elicitation_omits_always_allow() {
         tool_name: "run_action".to_string(),
     };
     let persistent_key = session_key.clone();
-    let metadata = approval_metadata(Some("calendar"), Some("Calendar"), None, None, None);
+    let metadata = approval_metadata(
+        Some("calendar"),
+        Some("Calendar"),
+        /*connector_description*/ None,
+        /*tool_title*/ None,
+        /*tool_description*/ None,
+    );
     let question = approval_prompt_request(
         CODEX_APPS_MCP_SERVER_NAME,
         "run_action",