From 7200d7fca301deaff3792a666f1cad9172806be8 Mon Sep 17 00:00:00 2001 From: kevin zhao Date: Mon, 1 Dec 2025 19:29:52 -0500 Subject: [PATCH] cleanup forbidden messaging --- codex-rs/core/src/exec_policy.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/codex-rs/core/src/exec_policy.rs b/codex-rs/core/src/exec_policy.rs index af28f183da..c4c750e6b6 100644 --- a/codex-rs/core/src/exec_policy.rs +++ b/codex-rs/core/src/exec_policy.rs @@ -25,6 +25,7 @@ use crate::sandboxing::SandboxPermissions; use crate::tools::sandboxing::ApprovalRequirement; const FORBIDDEN_REASON: &str = "execpolicy forbids this command"; +const PROMPT_CONFLICT_REASON: &str = "execpolicy requires approval for this command, but AskForApproval is set to Never"; const PROMPT_REASON: &str = "execpolicy requires approval for this command"; const POLICY_DIR_NAME: &str = "policy"; const POLICY_EXTENSION: &str = "codexpolicy"; @@ -189,7 +190,7 @@ pub(crate) async fn create_approval_requirement_for_command( let prompt_reason = prompt_reason_for(&evaluation); if matches!(approval_policy, AskForApproval::Never) { ApprovalRequirement::Forbidden { - reason: prompt_reason.unwrap_or_else(|| PROMPT_REASON.to_string()), + reason: PROMPT_CONFLICT_REASON.to_string(), } } else { ApprovalRequirement::NeedsApproval {