openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-31 19:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add AcceptWithOverrideCommand for approval decision

Browse Source
This commit is contained in:
Qiyao Qin
2026-03-14 16:22:35 -07:00
parent d692b74007
commit bccfefd43c
22 changed files with 272 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/app-server-protocol/schema/json/ApplyPatchApprovalResponse.json
+25
View File
@@ -33,6 +33,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User has approved this command and wants to execute a different argv vector instead of the original one-time request.",
"properties": {
"approved_override_command": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"approved_override_command"
],
"title": "ApprovedOverrideCommandReviewDecision",
"type": "object"
},
{
"additionalProperties": false,
"description": "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalParams.json
+25
View File
@@ -228,6 +228,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User approved the command, but wants to execute a different argv vector.",
"properties": {
"acceptWithOverrideCommand": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"acceptWithOverrideCommand"
],
"title": "AcceptWithOverrideCommandCommandExecutionApprovalDecision",
"type": "object"
},
{
"description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
"enum": [
codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalResponse.json
+25
View File
@@ -10,6 +10,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User approved the command, but wants to execute a different argv vector.",
"properties": {
"acceptWithOverrideCommand": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"acceptWithOverrideCommand"
],
"title": "AcceptWithOverrideCommandCommandExecutionApprovalDecision",
"type": "object"
},
{
"description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
"enum": [
codex-rs/app-server-protocol/schema/json/ExecCommandApprovalResponse.json
+25
View File
@@ -33,6 +33,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User has approved this command and wants to execute a different argv vector instead of the original one-time request.",
"properties": {
"approved_override_command": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"approved_override_command"
],
"title": "ApprovedOverrideCommandReviewDecision",
"type": "object"
},
{
"additionalProperties": false,
"description": "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
codex-rs/app-server-protocol/schema/json/ServerRequest.json
+25
View File
@@ -294,6 +294,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User approved the command, but wants to execute a different argv vector.",
"properties": {
"acceptWithOverrideCommand": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"acceptWithOverrideCommand"
],
"title": "AcceptWithOverrideCommandCommandExecutionApprovalDecision",
"type": "object"
},
{
"description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
"enum": [
codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json
+50
View File
@@ -1639,6 +1639,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User approved the command, but wants to execute a different argv vector.",
"properties": {
"acceptWithOverrideCommand": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"acceptWithOverrideCommand"
],
"title": "AcceptWithOverrideCommandCommandExecutionApprovalDecision",
"type": "object"
},
{
"description": "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
"enum": [
@@ -3392,6 +3417,31 @@
],
"type": "string"
},
{
"additionalProperties": false,
"description": "User has approved this command and wants to execute a different argv vector instead of the original one-time request.",
"properties": {
"approved_override_command": {
"properties": {
"command": {
"items": {
"type": "string"
},
"type": "array"
}
},
"required": [
"command"
],
"type": "object"
}
},
"required": [
"approved_override_command"
],
"title": "ApprovedOverrideCommandReviewDecision",
"type": "object"
},
{
"additionalProperties": false,
"description": "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
codex-rs/app-server-protocol/schema/typescript/ReviewDecision.ts
+1 -1
View File
@@ -7,4 +7,4 @@ import type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment";
/**
* User's decision in response to an ExecApprovalRequest.
*/
export type ReviewDecision = "approved" | { "approved_execpolicy_amendment": { proposed_execpolicy_amendment: ExecPolicyAmendment, } } | "approved_for_session" | { "network_policy_amendment": { network_policy_amendment: NetworkPolicyAmendment, } } | "denied" | "abort";
export type ReviewDecision = "approved" | { "approved_override_command": { command: Array<string>, } } | { "approved_execpolicy_amendment": { proposed_execpolicy_amendment: ExecPolicyAmendment, } } | "approved_for_session" | { "network_policy_amendment": { network_policy_amendment: NetworkPolicyAmendment, } } | "denied" | "abort";
codex-rs/app-server-protocol/schema/typescript/v2/CommandExecutionApprovalDecision.ts
+1 -1
View File
@@ -4,4 +4,4 @@
import type { ExecPolicyAmendment } from "./ExecPolicyAmendment";
import type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment";
export type CommandExecutionApprovalDecision = "accept" | "acceptForSession" | { "acceptWithExecpolicyAmendment": { execpolicy_amendment: ExecPolicyAmendment, } } | { "applyNetworkPolicyAmendment": { network_policy_amendment: NetworkPolicyAmendment, } } | "decline" | "cancel";
export type CommandExecutionApprovalDecision = "accept" | { "acceptWithOverrideCommand": { command: Array<string>, } } | "acceptForSession" | { "acceptWithExecpolicyAmendment": { execpolicy_amendment: ExecPolicyAmendment, } } | { "applyNetworkPolicyAmendment": { network_policy_amendment: NetworkPolicyAmendment, } } | "decline" | "cancel";
codex-rs/app-server-protocol/src/protocol/v2.rs
+26
View File
@@ -959,6 +959,8 @@ pub struct ConfigEdit {
pub enum CommandExecutionApprovalDecision {
/// User approved the command.
Accept,
/// User approved the command, but wants to execute a different argv vector.
AcceptWithOverrideCommand { command: Vec<String> },
/// User approved the command and future prompts in the same session-scoped
/// approval cache should run without prompting.
AcceptForSession,
@@ -981,6 +983,9 @@ impl From<CoreReviewDecision> for CommandExecutionApprovalDecision {
fn from(value: CoreReviewDecision) -> Self {
match value {
CoreReviewDecision::Approved => Self::Accept,
CoreReviewDecision::ApprovedOverrideCommand { command } => {
Self::AcceptWithOverrideCommand { command }
}
CoreReviewDecision::ApprovedExecpolicyAmendment {
proposed_execpolicy_amendment,
} => Self::AcceptWithExecpolicyAmendment {
@@ -6033,6 +6038,27 @@ mod tests {
);
}
#[test]
fn command_execution_request_approval_response_accepts_override_command() {
let response = serde_json::from_value::<CommandExecutionRequestApprovalResponse>(json!({
"decision": {
"acceptWithOverrideCommand": {
"command": ["echo", "hi"]
}
}
}))
.expect("override command response should deserialize");
assert_eq!(
response,
CommandExecutionRequestApprovalResponse {
decision: CommandExecutionApprovalDecision::AcceptWithOverrideCommand {
command: vec!["echo".to_string(), "hi".to_string()],
},
}
);
}
#[test]
fn permissions_request_approval_response_accepts_partial_macos_grants() {
let cases = vec![