Skip to content

Commit 9735367

Browse files
swastik-oaicopyberry
authored andcommitted
Return an assessment for explicit Guardian reviews (#62846)
## Why An explicit `thread/guardianReview` request could return a null assessment when live execution would skip approval, leaving callers without a verdict on the recorded action. ## What changed Require `assessment` on every successful `thread/guardianReview` response. Review eligible recorded calls even when a command is allowlisted, an MCP tool is configured for automatic approval or has a remembered approval, or the policy disables permission requests. The review runs without executing the call or granting permissions. Include the MCP server's owning environment permissions in the review context, matching live review. ## Testing Cover allowlisted commands, permission requests with prompting disabled, and automatically approved MCP tools. Compare live and recorded MCP review input for a server whose owning environment has denied paths. GitOrigin-RevId: 54689dc043d77f940e10d29842308340f6937980
1 parent 2b51119 commit 9735367

15 files changed

Lines changed: 192 additions & 303 deletions

File tree

Binary file not shown.

‎codex-rs/app-server-protocol/src/protocol/v2/thread.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,8 +1863,7 @@ pub struct ThreadGuardianReviewParams {
18631863
#[ts(export_to = "v2/")]
18641864
pub struct ThreadGuardianReviewResponse {
18651865
pub call_id: String,
1866-
/// Null when current policy or a remembered approval skips review.
1867-
pub assessment: Option<ThreadGuardianAssessment>,
1866+
pub assessment: ThreadGuardianAssessment,
18681867
}
18691868

18701869
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, JsonSchema, TS)]

‎codex-rs/app-server/src/request_processors/turn_processor.rs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,12 @@ impl TurnRequestProcessor {
227227
Ok(Some(
228228
ThreadGuardianReviewResponse {
229229
call_id: result.call_id,
230-
assessment: result
231-
.assessment
232-
.map(|assessment| ThreadGuardianAssessment {
233-
outcome: assessment.outcome,
234-
risk_level: assessment.risk_level.into(),
235-
user_authorization: assessment.user_authorization.into(),
236-
rationale: assessment.rationale,
237-
}),
230+
assessment: ThreadGuardianAssessment {
231+
outcome: result.assessment.outcome,
232+
risk_level: result.assessment.risk_level.into(),
233+
user_authorization: result.assessment.user_authorization.into(),
234+
rationale: result.assessment.rationale,
235+
},
238236
}
239237
.into(),
240238
))

‎codex-rs/app-server/tests/suite/v2/guardian_sync_session_tests.rs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,9 @@ async fn inline_review_delegate_runs_strict_guardian_assessment() -> Result<()>
783783
}
784784

785785
#[tokio::test]
786-
async fn guardian_review_reuses_private_recorded_call_history_per_parent() -> Result<()> {
787-
let rationale = "Guardian approved the recorded file write.";
786+
async fn guardian_review_assesses_allowlisted_calls_and_reuses_private_history_per_parent()
787+
-> Result<()> {
788+
let rationale = "Guardian approved the recorded listing.";
788789
let verdict = assistant_response(
789790
&json!({
790791
"outcome": "allow",
@@ -798,6 +799,12 @@ async fn guardian_review_reuses_private_recorded_call_history_per_parent() -> Re
798799
let requests = responses::mount_sse_sequence(&server, vec![verdict; 3]).await;
799800
let codex_home = TempDir::new()?;
800801
sync_config(&server.uri()).write(codex_home.path())?;
802+
let rules = codex_home.path().join("rules");
803+
std::fs::create_dir_all(&rules)?;
804+
std::fs::write(
805+
rules.join("default.rules"),
806+
r#"prefix_rule(pattern=["git", "ls-files"], decision="allow")"#,
807+
)?;
801808
let mut app = TestAppServer::builder()
802809
.with_codex_home(codex_home.path())
803810
.build_initialized()
@@ -816,7 +823,7 @@ async fn guardian_review_reuses_private_recorded_call_history_per_parent() -> Re
816823
json!({
817824
"type": "message",
818825
"role": "user",
819-
"content": [{"type": "input_text", "text": "Create the requested file."}],
826+
"content": [{"type": "input_text", "text": "List tracked files."}],
820827
})
821828
};
822829
let items = vec![
@@ -825,7 +832,7 @@ async fn guardian_review_reuses_private_recorded_call_history_per_parent() -> Re
825832
"type": "function_call",
826833
"name": "exec_command",
827834
"call_id": call_id,
828-
"arguments": r#"{"cmd":"echo reviewed > guardian-direct.txt","sandbox_permissions":"require_escalated","justification":"Create the requested file."}"#,
835+
"arguments": r#"{"cmd":"git ls-files"}"#,
829836
}),
830837
];
831838
let _: ThreadInjectItemsResponse = app

‎codex-rs/app-server/tests/suite/v2/thread_inject_items.rs‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -824,43 +824,3 @@ async fn turn_tool_output_retention_preserves_sender_metadata() -> Result<()> {
824824
);
825825
Ok(())
826826
}
827-
828-
#[tokio::test]
829-
async fn guardian_review_returns_the_injected_call_id_when_policy_skips_review() -> Result<()> {
830-
let server = responses::start_mock_server().await;
831-
let codex_home = TempDir::new()?;
832-
MockResponsesConfig::new(&server.uri()).write(codex_home.path())?;
833-
let rules = codex_home.path().join("rules");
834-
std::fs::create_dir_all(&rules)?;
835-
std::fs::write(
836-
rules.join("default.rules"),
837-
r#"prefix_rule(pattern=["git", "init", "guardian-skipped"], decision="allow")"#,
838-
)?;
839-
let mut app = TestAppServer::builder()
840-
.with_codex_home(codex_home.path())
841-
.build_initialized()
842-
.await?;
843-
let start = app
844-
.send_thread_start_request_with_auto_env(ThreadStartParams::default())
845-
.await?;
846-
let ThreadStartResponse { thread, .. } = app.read_response(start).await?;
847-
let inject = app
848-
.send_thread_inject_items_request(ThreadInjectItemsParams {
849-
thread_id: thread.id.clone(),
850-
items: vec![json!({
851-
"type": "function_call", "name": "exec_command", "call_id": "recorded",
852-
"arguments": r#"{"cmd":"git init guardian-skipped"}"#,
853-
})],
854-
})
855-
.await?;
856-
let _: ThreadInjectItemsResponse = app.read_response(inject).await?;
857-
let review = app
858-
.send_raw_request(
859-
"thread/guardianReview",
860-
Some(json!({"threadId": thread.id})),
861-
)
862-
.await?;
863-
let response: Value = app.read_response(review).await?;
864-
assert_eq!(response, json!({"callId":"recorded", "assessment":null}));
865-
Ok(())
866-
}

‎codex-rs/core/src/guardian/recorded_tool_call.rs‎

Lines changed: 24 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use codex_guardian_reviewer::ReviewDeadline;
99
use codex_protocol::error::CodexErr;
1010
use codex_protocol::error::Result;
1111
use codex_protocol::models::ResponseItem;
12-
use codex_protocol::protocol::AskForApproval;
1312
use codex_tools::FunctionCallError;
1413
use codex_tools::ToolName;
1514
use tokio_util::sync::CancellationToken;
@@ -144,19 +143,15 @@ pub(crate) async fn review_tool_call(
144143
PreToolUseError::Cancelled(_) => CodexErr::TurnAborted,
145144
})?;
146145
let step = &invocation.step_context;
147-
let (requirement, action) = if let Some(tool_info) = advertised_mcp_tool {
148-
let prepared = mcp_tool_call::recorded::prepare_approval_action(&invocation, tool_info)
146+
let context = GuardianReviewContext::from(step);
147+
let (approval, request) = if let Some(tool_info) = advertised_mcp_tool {
148+
let request = mcp_tool_call::recorded::prepare_review_request(&invocation, tool_info)
149149
.await
150150
.map_err(tool_error)?;
151-
let Some(action) = prepared else {
152-
return Ok(GuardianReviewResult {
153-
call_id: invocation.call_id,
154-
assessment: None,
155-
});
156-
};
157-
(None, action)
151+
(None, request)
158152
} else {
159-
match (invocation.tool_name.name.as_str(), &invocation.payload) {
153+
let name = invocation.tool_name.name.as_str();
154+
let (requirement, action) = match (name, &invocation.payload) {
160155
("exec_command", ToolPayload::Function { arguments }) => {
161156
let args: ToolEnvironmentArgs =
162157
parse_arguments(arguments).map_err(tool_error)?;
@@ -208,25 +203,6 @@ pub(crate) async fn review_tool_call(
208203
.map_err(tool_error)?;
209204
let prepared = PreparedPermissionRequest::parse(arguments, environment)
210205
.map_err(tool_error)?;
211-
match step.settings.approval_policy() {
212-
AskForApproval::Never => {
213-
return Ok(GuardianReviewResult {
214-
call_id: invocation.call_id,
215-
assessment: None,
216-
});
217-
}
218-
AskForApproval::Granular(policy)
219-
if !policy.allows_request_permissions() =>
220-
{
221-
return Ok(GuardianReviewResult {
222-
call_id: invocation.call_id,
223-
assessment: None,
224-
});
225-
}
226-
AskForApproval::OnRequest
227-
| AskForApproval::UnlessTrusted
228-
| AskForApproval::Granular(_) => {}
229-
}
230206
let action = prepared.approval_action(&invocation.call_id, &step.turn.sub_id);
231207
(None, action)
232208
}
@@ -235,30 +211,24 @@ pub(crate) async fn review_tool_call(
235211
"unsupported tool or payload for direct review".into(),
236212
));
237213
}
238-
}
239-
};
240-
let approval = match &requirement {
241-
None => None,
242-
Some(ExecApprovalRequirement::Skip { .. }) => {
243-
return Ok(GuardianReviewResult {
244-
call_id: invocation.call_id,
245-
assessment: None,
246-
});
247-
}
248-
Some(ExecApprovalRequirement::NeedsApproval { reason, .. }) => reason.clone(),
249-
Some(ExecApprovalRequirement::NeedsHumanApproval { .. }) => {
250-
return Err(CodexErr::InvalidRequest(
251-
"Managed command policy requires human approval.".into(),
252-
));
253-
}
254-
Some(ExecApprovalRequirement::Forbidden { reason }) => {
255-
return Err(CodexErr::InvalidRequest(reason.clone()));
256-
}
214+
};
215+
let approval = match &requirement {
216+
None | Some(ExecApprovalRequirement::Skip { .. }) => None,
217+
Some(ExecApprovalRequirement::NeedsApproval { reason, .. }) => reason.clone(),
218+
Some(ExecApprovalRequirement::NeedsHumanApproval { .. }) => {
219+
return Err(CodexErr::InvalidRequest(
220+
"Managed command policy requires human approval.".into(),
221+
));
222+
}
223+
Some(ExecApprovalRequirement::Forbidden { reason }) => {
224+
return Err(CodexErr::InvalidRequest(reason.clone()));
225+
}
226+
};
227+
let request = from_approval_action(action, &context)
228+
.request
229+
.map_err(CodexErr::InvalidRequest)?;
230+
(approval, request)
257231
};
258-
let context = GuardianReviewContext::from(step);
259-
let request = from_approval_action(action, &context)
260-
.request
261-
.map_err(CodexErr::InvalidRequest)?;
262232
let input = ReviewInput {
263233
session: Arc::clone(session),
264234
context,
@@ -279,7 +249,7 @@ pub(crate) async fn review_tool_call(
279249
})?;
280250
Ok(GuardianReviewResult {
281251
call_id: invocation.call_id,
282-
assessment: Some(assessment),
252+
assessment,
283253
})
284254
};
285255
tokio::select! {

‎codex-rs/core/src/guardian_review.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ pub enum ReviewRetrieval {
1818
#[derive(Debug, PartialEq, Eq)]
1919
pub struct GuardianReviewResult {
2020
pub call_id: String,
21-
/// Absent when current policy or a remembered approval skips review.
22-
pub assessment: Option<codex_guardian_reviewer::GuardianAssessment>,
21+
pub assessment: codex_guardian_reviewer::GuardianAssessment,
2322
}
2423

2524
/// Scope backend reviewer attribution to the provider-selected Guardian model.

‎codex-rs/core/src/mcp_tool_call.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2086,6 +2086,7 @@ pub(crate) fn build_guardian_mcp_tool_review_request(
20862086
call_id: &str,
20872087
invocation: &McpInvocation,
20882088
metadata: Option<&McpToolApprovalMetadata>,
2089+
prompt_permissions: Option<(String, Arc<FileSystemSandboxContext>)>,
20892090
) -> GuardianApprovalRequest {
20902091
GuardianApprovalRequest::McpToolCall {
20912092
id: call_id.to_string(),
@@ -2107,7 +2108,7 @@ pub(crate) fn build_guardian_mcp_tool_review_request(
21072108
open_world_hint: annotations.open_world_hint,
21082109
read_only_hint: annotations.read_only_hint,
21092110
}),
2110-
prompt_permissions: None,
2111+
prompt_permissions,
21112112
}
21122113
}
21132114

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
1-
//! Prepares MCP approval actions using current bindings without dispatching or remembering approval.
1+
//! Prepares Guardian review requests using current bindings without dispatching or remembering approval.
22
33
use codex_mcp::ToolInfo;
44
use codex_protocol::protocol::McpInvocation;
55
use codex_tools::FunctionCallError;
66

7-
use super::McpToolApprovalRequirement;
7+
use super::build_guardian_mcp_tool_review_request;
8+
use super::capture_environment_permissions;
89
use super::mcp_tool_approval_policy;
910
use super::mcp_tool_metadata;
1011
use super::parse_mcp_tool_arguments;
11-
use super::prepare_mcp_tool_approval;
12+
use crate::guardian::GuardianApprovalRequest;
1213
use crate::tools::context::ToolInvocation;
1314
use crate::tools::context::ToolPayload;
14-
use crate::tools::handlers::McpHandler;
15-
use crate::tools::sandboxing::ApprovalAction;
1615

17-
pub(crate) async fn prepare_approval_action(
16+
pub(crate) async fn prepare_review_request(
1817
invocation: &ToolInvocation,
1918
advertised_tool: &ToolInfo,
20-
) -> Result<Option<ApprovalAction>, FunctionCallError> {
19+
) -> Result<GuardianApprovalRequest, FunctionCallError> {
2120
let ToolPayload::Function { arguments } = &invocation.payload else {
2221
return Err(FunctionCallError::RespondToModel(
2322
"mcp handler received unsupported payload".into(),
@@ -45,32 +44,15 @@ pub(crate) async fn prepare_approval_action(
4544
mcp_invocation.arguments.as_ref(),
4645
)
4746
.map_err(|error| FunctionCallError::RespondToModel(error.to_string()))?;
48-
let policy = mcp_tool_approval_policy(&call, &metadata).ok_or_else(|| {
49-
FunctionCallError::RespondToModel("MCP tool call blocked by app configuration".into())
50-
})?;
51-
let requested_reviewer = invocation
52-
.session
53-
.mcp_requested_reviewer(&invocation.step_context.settings)
54-
.await;
55-
match prepare_mcp_tool_approval(
56-
&invocation.session,
57-
&invocation.step_context,
47+
if mcp_tool_approval_policy(&call, &metadata).is_none() {
48+
return Err(FunctionCallError::RespondToModel(
49+
"MCP tool call blocked by app configuration".into(),
50+
));
51+
}
52+
Ok(build_guardian_mcp_tool_review_request(
5853
&invocation.call_id,
5954
&mcp_invocation,
60-
&McpHandler::hook_tool_name_for(advertised_tool),
61-
&metadata,
62-
call.config(),
63-
call.permission_source(),
64-
call.server_environment_id(),
65-
call.server_key(),
66-
policy,
67-
requested_reviewer,
68-
)
69-
.await
70-
{
71-
McpToolApprovalRequirement::NotRequired | McpToolApprovalRequirement::Remembered => {
72-
Ok(None)
73-
}
74-
McpToolApprovalRequirement::Required { action, .. } => Ok(Some(*action)),
75-
}
55+
Some(&metadata),
56+
capture_environment_permissions(call.permission_source()),
57+
))
7658
}

‎codex-rs/core/src/mcp_tool_call_tests.rs‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,7 +2322,12 @@ fn guardian_mcp_review_request_includes_invocation_metadata() {
23222322
Some("Open a page"),
23232323
);
23242324
metadata.connected_account_email = Some("owner@example.com".to_string());
2325-
let request = build_guardian_mcp_tool_review_request("call-1", &invocation, Some(&metadata));
2325+
let request = build_guardian_mcp_tool_review_request(
2326+
"call-1",
2327+
&invocation,
2328+
Some(&metadata),
2329+
/*prompt_permissions*/ None,
2330+
);
23262331

23272332
assert_eq!(
23282333
request,
@@ -2369,7 +2374,12 @@ fn guardian_mcp_review_request_includes_annotations_when_present() {
23692374
openai_file_input_optional_fields: None,
23702375
};
23712376

2372-
let request = build_guardian_mcp_tool_review_request("call-1", &invocation, Some(&metadata));
2377+
let request = build_guardian_mcp_tool_review_request(
2378+
"call-1",
2379+
&invocation,
2380+
Some(&metadata),
2381+
/*prompt_permissions*/ None,
2382+
);
23732383

23742384
assert_eq!(
23752385
request,
@@ -2409,7 +2419,12 @@ fn guardian_mcp_review_request_ignores_untrusted_connected_account_email() {
24092419
);
24102420
metadata.connected_account_email = Some("spoofed@example.com".to_string());
24112421

2412-
let request = build_guardian_mcp_tool_review_request("call-1", &invocation, Some(&metadata));
2422+
let request = build_guardian_mcp_tool_review_request(
2423+
"call-1",
2424+
&invocation,
2425+
Some(&metadata),
2426+
/*prompt_permissions*/ None,
2427+
);
24132428

24142429
assert_eq!(
24152430
request,

0 commit comments

Comments
 (0)