mirror of
https://github.com/openai/codex.git
synced 2026-11-16 06:54:36 +00:00
Use issuing step settings for approval decisions (#40821)
## Why Tool actions and approval retries can outlive the step that issued them. If approval handling reads newer turn settings, a delayed action can use the wrong approval policy or reviewer. ## What changed - Capture the approval policy and reviewer in `GuardianReviewContext` from the issuing step. - Use step settings for command, patch, permission, sandbox-retry, and remote-network approval decisions. - Use the active task's published settings for background network approvals and long-lived Unix shell interception. - Preserve explicit MCP reviewer overrides. ## Testing Added regression coverage for permission requests, same-turn network policy changes, delayed commands after a new turn starts, sandbox retries, patch policy selection, and MCP reviewer overrides. GitOrigin-RevId: b7e84a2e1e79a71502272b15b5ef5b0e5643f8b0
This commit is contained in:
1 parent
21c58c90f2
commit
a26f1806a4
16 files changed
+671
-60
No files matched your search
@@ -20,12 +20,18 @@ mod review_session;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use codex_protocol::config_types::ApprovalsReviewer;
|
||||
use codex_protocol::config_types::ReasoningSummary;
|
||||
use codex_protocol::openai_models::ModelInfo;
|
||||
use codex_protocol::openai_models::ReasoningEffort;
|
||||
use codex_protocol::protocol::AskForApproval;
|
||||
use codex_protocol::protocol::GuardianAssessmentOutcome;
|
||||
use serde::Deserialize;
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::environment_selection::TurnEnvironmentSnapshot;
|
||||
use crate::session::step_context::StepContext;
|
||||
use crate::session::step_settings::ResolvedStepSettings;
|
||||
use crate::session::turn_context::TurnContext;
|
||||
use crate::tools::sandboxing::ApprovalRequestReasons;
|
||||
|
||||
@@ -69,18 +75,44 @@ const GUARDIAN_MAX_ACTION_STRING_TOKENS: usize = 16_000;
|
||||
const GUARDIAN_RECENT_ENTRY_LIMIT: usize = 40;
|
||||
const TRUNCATION_TAG: &str = "truncated";
|
||||
|
||||
/// Built from the originating StepContext when available.
|
||||
/// There are currently two exceptions-- turn-only callers (background network approvals, reviewer
|
||||
/// prewarming, etc.) and interactive Unix shells that can outlive the step that started them.
|
||||
/// Captures review inputs from the issuing step without retaining its MCP bindings or tool router.
|
||||
/// Background network approvals and Unix interception use the active task's resolved settings.
|
||||
/// Startup reviewer prewarming intentionally uses turn-only inputs because it has no issuing step.
|
||||
///
|
||||
/// MCP elicitation reviews still use turn-only inputs.
|
||||
/// TODO(sayan): See if we can find a way to model those as StepContext as well without holding
|
||||
/// step-scoped things past their lifetime (like MCP bindings)
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct GuardianReviewContext {
|
||||
turn: Arc<TurnContext>,
|
||||
environments: TurnEnvironmentSnapshot,
|
||||
// Model and reasoning inputs are carried for the follow-up Guardian and V2 migrations.
|
||||
#[expect(dead_code)]
|
||||
pub(crate) model_info: Arc<ModelInfo>,
|
||||
#[expect(dead_code)]
|
||||
pub(crate) reasoning_effort: Option<ReasoningEffort>,
|
||||
#[expect(dead_code)]
|
||||
pub(crate) reasoning_summary: ReasoningSummary,
|
||||
pub(crate) approval_policy: AskForApproval,
|
||||
pub(crate) approvals_reviewer: ApprovalsReviewer,
|
||||
}
|
||||
|
||||
impl GuardianReviewContext {
|
||||
pub(crate) fn from_resolved_settings(
|
||||
turn: Arc<TurnContext>,
|
||||
settings: &ResolvedStepSettings,
|
||||
) -> Self {
|
||||
Self {
|
||||
environments: turn.environments.clone(),
|
||||
model_info: Arc::clone(&settings.model_info),
|
||||
reasoning_effort: settings.reasoning_effort().cloned(),
|
||||
reasoning_summary: settings.reasoning_summary,
|
||||
approval_policy: settings.approval_policy(),
|
||||
approvals_reviewer: settings.approvals_reviewer(),
|
||||
turn,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn turn(&self) -> &Arc<TurnContext> {
|
||||
&self.turn
|
||||
}
|
||||
@@ -95,6 +127,11 @@ impl From<&Arc<StepContext>> for GuardianReviewContext {
|
||||
Self {
|
||||
turn: Arc::clone(&step.turn),
|
||||
environments: step.environments.clone(),
|
||||
model_info: Arc::clone(&step.settings.model_info),
|
||||
reasoning_effort: step.settings.reasoning_effort().cloned(),
|
||||
reasoning_summary: step.settings.reasoning_summary,
|
||||
approval_policy: step.settings.approval_policy(),
|
||||
approvals_reviewer: step.settings.approvals_reviewer(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -103,6 +140,11 @@ impl From<Arc<TurnContext>> for GuardianReviewContext {
|
||||
fn from(turn: Arc<TurnContext>) -> Self {
|
||||
Self {
|
||||
environments: turn.environments.clone(),
|
||||
model_info: Arc::clone(turn.model_info()),
|
||||
reasoning_effort: turn.reasoning_effort().cloned(),
|
||||
reasoning_summary: turn.reasoning_summary(),
|
||||
approval_policy: turn.approval_policy(),
|
||||
approvals_reviewer: turn.config.approvals_reviewer,
|
||||
turn,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user