clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-02 10:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: scope default command approvals to session

Browse Source 
Co-authored-by: Codex noreply@openai.com
This commit is contained in:
viyatb-oai
2026-04-15 14:24:50 -07:00
parent e70ccdeaf7
commit 88aa4c3ecb
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
codex-rs/protocol/src/approvals.rs
View File

@@ -222,7 +222,8 @@ pub struct ExecApprovalRequestEvent {
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub network_approval_context: Option<NetworkApprovalContext>,
/// Proposed execpolicy amendment that can be applied to allow future runs.
/// Proposed execpolicy amendment that clients may present as an explicit
/// persistent approval option.
#[serde(default, skip_serializing_if = "Option::is_none")]
#[ts(optional)]
pub proposed_execpolicy_amendment: Option<ExecPolicyAmendment>,
@@ -290,14 +291,15 @@ impl ExecApprovalRequestEvent {
return vec![ReviewDecision::Approved, ReviewDecision::Abort];
}
let mut decisions = vec![ReviewDecision::Approved];
if let Some(prefix) = proposed_execpolicy_amendment {
decisions.push(ReviewDecision::ApprovedExecpolicyAmendment {
proposed_execpolicy_amendment: prefix.clone(),
});
if proposed_execpolicy_amendment.is_some() {
return vec![
ReviewDecision::Approved,
ReviewDecision::ApprovedForSession,
ReviewDecision::Abort,
];
}
decisions.push(ReviewDecision::Abort);
decisions
vec![ReviewDecision::Approved, ReviewDecision::Abort]
}
}
@@ -394,6 +396,26 @@ mod tests {
);
}
#[test]
fn default_command_decisions_scope_prefix_suggestions_to_session() {
let prefix = ExecPolicyAmendment::new(vec!["cargo".to_string(), "test".to_string()]);
let decisions = ExecApprovalRequestEvent::default_available_decisions(
/*network_approval_context*/ None,
Some(&prefix),
/*proposed_network_policy_amendments*/ None,
/*additional_permissions*/ None,
);
assert_eq!(
decisions,
vec![
ReviewDecision::Approved,
ReviewDecision::ApprovedForSession,
ReviewDecision::Abort,
]
);
}
#[cfg(unix)]
#[test]
fn guardian_assessment_action_round_trips_execve_shape() {