mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Ignore PreToolUse allow decisions
This commit is contained in:
@@ -1171,7 +1171,7 @@ async fn maybe_request_mcp_tool_approval(
|
||||
);
|
||||
let pre_tool_use_reason = match &pre_tool_use_permission_decision {
|
||||
Some(PreToolUsePermissionDecision::Ask { reason }) => reason.as_deref(),
|
||||
Some(PreToolUsePermissionDecision::Allow { .. }) | None => None,
|
||||
None => None,
|
||||
};
|
||||
let prompt_reason = monitor_reason.as_deref().or(pre_tool_use_reason);
|
||||
question.question = mcp_tool_approval_question_text(question.question, prompt_reason);
|
||||
|
||||
@@ -2070,75 +2070,6 @@ async fn permission_request_hook_allows_mcp_tool_call() {
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn pre_tool_use_allow_does_not_skip_mcp_permission_request_hook() {
|
||||
let (mut session, turn_context) = make_session_and_context().await;
|
||||
let log_path = install_mcp_permission_request_hook(
|
||||
&mut session,
|
||||
&turn_context,
|
||||
"mcp__memory__.*",
|
||||
&serde_json::json!({
|
||||
"hookSpecificOutput": {
|
||||
"hookEventName": "PermissionRequest",
|
||||
"decision": {
|
||||
"behavior": "deny",
|
||||
"message": "denied by permission request hook"
|
||||
}
|
||||
}
|
||||
}),
|
||||
);
|
||||
turn_context.record_pre_tool_use_permission_decision(
|
||||
"call-mcp-pretool-allow".to_string(),
|
||||
PreToolUsePermissionDecision::Allow {
|
||||
reason: Some("approved by pre tool use hook".to_string()),
|
||||
},
|
||||
);
|
||||
let session = Arc::new(session);
|
||||
let turn_context = Arc::new(turn_context);
|
||||
let invocation = McpInvocation {
|
||||
server: "memory".to_string(),
|
||||
tool: "create_entities".to_string(),
|
||||
arguments: Some(serde_json::json!({ "entities": [] })),
|
||||
};
|
||||
let metadata = McpToolApprovalMetadata {
|
||||
annotations: Some(annotations(
|
||||
Some(false),
|
||||
Some(true),
|
||||
/*open_world*/ None,
|
||||
)),
|
||||
connector_id: None,
|
||||
connector_name: None,
|
||||
connector_description: None,
|
||||
tool_title: Some("Create entities".to_string()),
|
||||
tool_description: None,
|
||||
mcp_app_resource_uri: None,
|
||||
codex_apps_meta: None,
|
||||
openai_file_input_params: None,
|
||||
};
|
||||
|
||||
let decision = maybe_request_mcp_tool_approval(
|
||||
&session,
|
||||
&turn_context,
|
||||
"call-mcp-pretool-allow",
|
||||
&invocation,
|
||||
"mcp__memory__create_entities",
|
||||
Some(&metadata),
|
||||
AppToolApproval::Auto,
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_eq!(
|
||||
decision,
|
||||
Some(McpToolApprovalDecision::Decline {
|
||||
message: Some("denied by permission request hook".to_string()),
|
||||
})
|
||||
);
|
||||
assert!(
|
||||
log_path.exists(),
|
||||
"pre tool use allow should not skip PermissionRequest hooks"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn permission_request_hook_uses_hook_tool_name_without_metadata() {
|
||||
let (mut session, turn_context) = make_session_and_context().await;
|
||||
|
||||
@@ -544,9 +544,7 @@ impl NetworkApprovalService {
|
||||
Some(PreToolUsePermissionDecision::Ask { reason }) => {
|
||||
reason.clone().or(Some(prompt_reason))
|
||||
}
|
||||
Some(PreToolUsePermissionDecision::Allow { .. }) | None => {
|
||||
Some(prompt_reason)
|
||||
}
|
||||
None => Some(prompt_reason),
|
||||
},
|
||||
Some(network_approval_context.clone()),
|
||||
/*proposed_execpolicy_amendment*/ None,
|
||||
|
||||
@@ -148,7 +148,7 @@ impl ToolOrchestrator {
|
||||
);
|
||||
let pre_tool_use_reason = match &pre_tool_use_permission_decision {
|
||||
Some(PreToolUsePermissionDecision::Ask { reason }) => reason.clone(),
|
||||
Some(PreToolUsePermissionDecision::Allow { .. }) | None => None,
|
||||
None => None,
|
||||
};
|
||||
let use_guardian = (routes_approval_to_guardian(turn_ctx) || strict_auto_review)
|
||||
&& !pre_tool_use_asks_user;
|
||||
|
||||
@@ -483,7 +483,7 @@ impl CoreShellActionProvider {
|
||||
workdir.clone(),
|
||||
match pre_tool_use_permission_decision {
|
||||
Some(PreToolUsePermissionDecision::Ask { reason }) => reason,
|
||||
Some(PreToolUsePermissionDecision::Allow { .. }) | None => None,
|
||||
None => None,
|
||||
},
|
||||
/*network_approval_context*/ None,
|
||||
/*proposed_execpolicy_amendment*/ None,
|
||||
|
||||
Reference in New Issue
Block a user