Add AcceptWithOverrideCommand for approval decision

This commit is contained in:
Qiyao Qin
2026-03-13 00:19:41 -07:00
parent 76d8d174b1
commit 671cc4644b
22 changed files with 272 additions and 9 deletions
+1
View File
@@ -679,6 +679,7 @@ fn build_guardian_mcp_tool_review_request(
fn mcp_tool_approval_decision_from_guardian(decision: ReviewDecision) -> McpToolApprovalDecision {
match decision {
ReviewDecision::Approved
| ReviewDecision::ApprovedOverrideCommand { .. }
| ReviewDecision::ApprovedExecpolicyAmendment { .. }
| ReviewDecision::NetworkPolicyAmendment { .. } => McpToolApprovalDecision::Accept,
ReviewDecision::ApprovedForSession => McpToolApprovalDecision::AcceptForSession,
@@ -215,6 +215,7 @@ impl ToolHandler for ApplyPatchHandler {
turn: turn.clone(),
call_id: call_id.clone(),
tool_name: tool_name.to_string(),
command_override: None,
};
let out = orchestrator
.run(
@@ -319,6 +320,7 @@ pub(crate) async fn intercept_apply_patch(
turn: turn.clone(),
call_id: call_id.to_string(),
tool_name: tool_name.to_string(),
command_override: None,
};
let out = orchestrator
.run(
@@ -459,6 +459,7 @@ impl ShellHandler {
turn: turn.clone(),
call_id: call_id.clone(),
tool_name,
command_override: None,
};
let out = orchestrator
.run(
+3 -1
View File
@@ -375,7 +375,9 @@ impl NetworkApprovalService {
let mut cache_session_deny = false;
let resolved = match approval_decision {
ReviewDecision::Approved | ReviewDecision::ApprovedExecpolicyAmendment { .. } => {
ReviewDecision::Approved
| ReviewDecision::ApprovedOverrideCommand { .. }
| ReviewDecision::ApprovedExecpolicyAmendment { .. } => {
PendingApprovalDecision::AllowOnce
}
ReviewDecision::ApprovedForSession => PendingApprovalDecision::AllowForSession,
+15
View File
@@ -52,6 +52,7 @@ impl ToolOrchestrator {
req: &Rq,
tool_ctx: &ToolCtx,
attempt: &SandboxAttempt<'_>,
command_override: Option<Vec<String>>,
has_managed_network_requirements: bool,
) -> (Result<Out, ToolError>, Option<DeferredNetworkApproval>)
where
@@ -71,6 +72,7 @@ impl ToolOrchestrator {
turn: tool_ctx.turn.clone(),
call_id: tool_ctx.call_id.clone(),
tool_name: tool_ctx.tool_name.clone(),
command_override,
};
let run_result = tool.run(req, attempt, &attempt_tool_ctx).await;
@@ -114,6 +116,7 @@ impl ToolOrchestrator {
let otel_ci = &tool_ctx.call_id;
let otel_user = ToolDecisionSource::User;
let otel_cfg = ToolDecisionSource::Config;
let mut command_override: Option<Vec<String>> = None;
// 1) Approval
let mut already_approved = false;
@@ -135,10 +138,14 @@ impl ToolOrchestrator {
call_id: &tool_ctx.call_id,
retry_reason: reason,
network_approval_context: None,
command_override: None,
};
let decision = tool.start_approval_async(req, approval_ctx).await;
otel.tool_decision(otel_tn, otel_ci, &decision, otel_user.clone());
if let Some(command) = decision.override_command() {
command_override = Some(command.to_vec());
}
match decision {
ReviewDecision::Denied | ReviewDecision::Abort => {
@@ -150,6 +157,7 @@ impl ToolOrchestrator {
return Err(ToolError::Rejected(reason));
}
ReviewDecision::Approved
| ReviewDecision::ApprovedOverrideCommand { .. }
| ReviewDecision::ApprovedExecpolicyAmendment { .. }
| ReviewDecision::ApprovedForSession => {}
ReviewDecision::NetworkPolicyAmendment {
@@ -204,6 +212,7 @@ impl ToolOrchestrator {
req,
tool_ctx,
&initial_attempt,
command_override.clone(),
has_managed_network_requirements,
)
.await;
@@ -280,10 +289,14 @@ impl ToolOrchestrator {
call_id: &tool_ctx.call_id,
retry_reason: Some(retry_reason),
network_approval_context: network_approval_context.clone(),
command_override: command_override.clone(),
};
let decision = tool.start_approval_async(req, approval_ctx).await;
otel.tool_decision(otel_tn, otel_ci, &decision, otel_user);
if let Some(command) = decision.override_command() {
command_override = Some(command.to_vec());
}
match decision {
ReviewDecision::Denied | ReviewDecision::Abort => {
@@ -295,6 +308,7 @@ impl ToolOrchestrator {
return Err(ToolError::Rejected(reason));
}
ReviewDecision::Approved
| ReviewDecision::ApprovedOverrideCommand { .. }
| ReviewDecision::ApprovedExecpolicyAmendment { .. }
| ReviewDecision::ApprovedForSession => {}
ReviewDecision::NetworkPolicyAmendment {
@@ -327,6 +341,7 @@ impl ToolOrchestrator {
req,
tool_ctx,
&escalated_attempt,
command_override,
has_managed_network_requirements,
)
.await;
+6 -2
View File
@@ -144,7 +144,10 @@ impl Approvable<ShellRequest> for ShellRuntime {
ctx: ApprovalCtx<'a>,
) -> BoxFuture<'a, ReviewDecision> {
let keys = self.approval_keys(req);
let command = req.command.clone();
let command = ctx
.command_override
.clone()
.unwrap_or_else(|| req.command.clone());
let cwd = req.cwd.clone();
let retry_reason = ctx.retry_reason.clone();
let reason = retry_reason.clone().or_else(|| req.justification.clone());
@@ -220,8 +223,9 @@ impl ToolRuntime<ShellRequest, ExecToolCallOutput> for ShellRuntime {
ctx: &ToolCtx,
) -> Result<ExecToolCallOutput, ToolError> {
let session_shell = ctx.session.user_shell();
let base_command = ctx.command_override.as_ref().unwrap_or(&req.command);
let command = maybe_wrap_shell_lc_with_snapshot(
&req.command,
base_command,
session_shell.as_ref(),
&req.cwd,
&req.explicit_env_overrides,
@@ -566,6 +566,12 @@ impl CoreShellActionProvider {
EscalationDecision::run()
}
}
ReviewDecision::ApprovedOverrideCommand { .. } => {
EscalationDecision::deny(Some(
"command override is not supported for execve approvals"
.to_string(),
))
}
ReviewDecision::ApprovedForSession => {
// Currently, we only add session approvals for
// skill scripts because we are storing only the
@@ -112,7 +112,10 @@ impl Approvable<UnifiedExecRequest> for UnifiedExecRuntime<'_> {
let session = ctx.session;
let turn = ctx.turn;
let call_id = ctx.call_id.to_string();
let command = req.command.clone();
let command = ctx
.command_override
.clone()
.unwrap_or_else(|| req.command.clone());
let cwd = req.cwd.clone();
let retry_reason = ctx.retry_reason.clone();
let reason = retry_reason.clone().or_else(|| req.justification.clone());
@@ -188,7 +191,7 @@ impl<'a> ToolRuntime<UnifiedExecRequest, UnifiedExecProcess> for UnifiedExecRunt
attempt: &SandboxAttempt<'_>,
ctx: &ToolCtx,
) -> Result<UnifiedExecProcess, ToolError> {
let base_command = &req.command;
let base_command = ctx.command_override.as_ref().unwrap_or(&req.command);
let session_shell = ctx.session.user_shell();
let command = maybe_wrap_shell_lc_with_snapshot(
base_command,
+2
View File
@@ -118,6 +118,7 @@ pub(crate) struct ApprovalCtx<'a> {
pub call_id: &'a str,
pub retry_reason: Option<String>,
pub network_approval_context: Option<NetworkApprovalContext>,
pub command_override: Option<Vec<String>>,
}
// Specifies what tool orchestrator should do with a given tool call.
@@ -301,6 +302,7 @@ pub(crate) struct ToolCtx {
pub turn: Arc<TurnContext>,
pub call_id: String,
pub tool_name: String,
pub command_override: Option<Vec<String>>,
}
#[derive(Debug)]
@@ -613,6 +613,7 @@ impl UnifiedExecProcessManager {
turn: context.turn.clone(),
call_id: context.call_id.clone(),
tool_name: "exec_command".to_string(),
command_override: None,
};
orchestrator
.run(