mirror of
https://github.com/openai/codex.git
synced 2026-11-16 06:54:36 +00:00
Remove legacy Guardian approval review paths (#43462)
## What changed - Remove the `fast_decision` and `full_review` extension hooks and `ApprovalAssessment`, leaving `ApprovalReviewContributor::decide` as the approval decision interface. - Remove the duplicate Guardian V2 fast-approval implementation and `StrictReviewReason` state. - Require an explicit `GuardianReviewReason` for synchronous reviews. ## Testing Migrate Guardian reviewer tests to the production `decide_approval` path and cached-score tests to the registry's decision interface. GitOrigin-RevId: 1f9092c0ff5bb1eed0c63fa557fb3807e2e71564
This commit is contained in:
1 parent
8260619cb6
commit
db0568dbbb
14 files changed
+342
-968
No files matched your search
@@ -46,10 +46,6 @@ pub(crate) use review::is_basic_session_source;
|
||||
pub(crate) use review::new_guardian_review_id;
|
||||
#[cfg(test)]
|
||||
pub(crate) use review::record_guardian_denial_for_test;
|
||||
#[cfg(test)]
|
||||
pub(crate) use review::review_approval_request;
|
||||
#[cfg(test)]
|
||||
pub(crate) use review::review_approval_request_with_cancel;
|
||||
pub(crate) use review::routes_approval_policy_to_guardian;
|
||||
pub(crate) use review::routes_approval_to_guardian;
|
||||
pub(crate) use review_session::GuardianReviewSessionManager;
|
||||
|
||||
@@ -6,13 +6,7 @@ use codex_analytics::GuardianReviewFailureReason;
|
||||
use codex_analytics::GuardianReviewTerminalStatus;
|
||||
use codex_analytics::GuardianReviewTrackContext;
|
||||
use codex_analytics::GuardianReviewedAction;
|
||||
#[cfg(test)]
|
||||
use codex_analytics::GuardianV2Event;
|
||||
#[cfg(test)]
|
||||
use codex_analytics::GuardianV2EventKind;
|
||||
use codex_core_plugins::PluginCommandAttribution;
|
||||
#[cfg(test)]
|
||||
use codex_extension_api::GuardianV2Enabled;
|
||||
use codex_extension_api::ThreadIdleCause;
|
||||
use codex_features::Feature;
|
||||
use codex_protocol::config_types::ApprovalsReviewer;
|
||||
@@ -32,8 +26,6 @@ use codex_protocol::protocol::SessionSource;
|
||||
use codex_protocol::protocol::SubAgentSource;
|
||||
use codex_protocol::protocol::TurnAbortReason;
|
||||
use codex_protocol::protocol::WarningEvent;
|
||||
#[cfg(test)]
|
||||
use futures::future::BoxFuture;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
use tokio::time::Instant;
|
||||
@@ -57,8 +49,6 @@ use super::GuardianAssessmentOutcome;
|
||||
use super::GuardianRejectionCircuitBreakerAction;
|
||||
use super::GuardianRejectionCircuitBreakerPolicy;
|
||||
use super::GuardianReviewContext;
|
||||
#[cfg(test)]
|
||||
use super::approval_request::format_guardian_action_compact;
|
||||
use super::approval_request::format_guardian_action_pretty;
|
||||
use super::approval_request::guardian_assessment_action;
|
||||
use super::approval_request::guardian_request_target_item_id;
|
||||
@@ -342,112 +332,10 @@ pub(crate) async fn record_guardian_denial_for_test(
|
||||
record_guardian_denial(session, turn, turn_id).await;
|
||||
}
|
||||
|
||||
/// Runs Guardian unless Full Access or an installed extension resolves the review.
|
||||
/// Guardian timeouts, review-session failures, and parse failures all block
|
||||
/// execution, with timeouts surfaced separately from explicit denials.
|
||||
#[cfg(test)]
|
||||
async fn run_guardian_review(
|
||||
session: Arc<Session>,
|
||||
context: GuardianReviewContext,
|
||||
review_id: String,
|
||||
request: GuardianApprovalRequest,
|
||||
reasons: ApprovalRequestReasons,
|
||||
options: GuardianReviewOptions,
|
||||
) -> ReviewDecision {
|
||||
let turn = Arc::clone(context.turn());
|
||||
if context.environments().has_full_access(
|
||||
context.approval_policy,
|
||||
&turn.config.permissions.effective_permission_profile(),
|
||||
) {
|
||||
return if options
|
||||
.external_cancel
|
||||
.as_ref()
|
||||
.is_some_and(CancellationToken::is_cancelled)
|
||||
{
|
||||
ReviewDecision::Abort
|
||||
} else {
|
||||
ReviewDecision::Approved
|
||||
};
|
||||
}
|
||||
let requires_synchronous_review = options.require_synchronous_review
|
||||
|| reasons.retry.is_some()
|
||||
|| matches!(
|
||||
&request,
|
||||
GuardianApprovalRequest::ExecCommand {
|
||||
sandbox_permissions,
|
||||
..
|
||||
} if sandbox_permissions.requires_escalated_permissions()
|
||||
);
|
||||
// Guardian V2 may satisfy ordinary reviews, including required-model reviews, but broader
|
||||
// permission requests, retries, and elicitations requiring synchronous review must not use
|
||||
// extension fast approval.
|
||||
if (!turn
|
||||
.config
|
||||
.config_layer_stack
|
||||
.requirements()
|
||||
.auto_review_required_for_model(&turn.model_info().slug)
|
||||
|| turn.config.features.enabled(Feature::GuardianV2))
|
||||
&& !requires_synchronous_review
|
||||
&& options
|
||||
.external_cancel
|
||||
.as_ref()
|
||||
.is_none_or(|cancel| !cancel.is_cancelled())
|
||||
&& let Ok(action) = format_guardian_action_compact(&request)
|
||||
&& let Some(decision) = session
|
||||
.services
|
||||
.extensions
|
||||
.fast_approval_decision(
|
||||
&session.services.session_extension_data,
|
||||
&session.services.thread_extension_data,
|
||||
&action,
|
||||
Some(crate::session::extension_metrics::from_session_telemetry(
|
||||
turn.session_telemetry.clone(),
|
||||
)),
|
||||
)
|
||||
.await
|
||||
{
|
||||
if decision == ReviewDecision::Approved {
|
||||
if session
|
||||
.services
|
||||
.thread_extension_data
|
||||
.get::<GuardianV2Enabled>()
|
||||
.is_some()
|
||||
{
|
||||
session
|
||||
.services
|
||||
.analytics_events_client
|
||||
.track_guardian_v2_event(GuardianV2Event {
|
||||
thread_id: session.thread_id.to_string(),
|
||||
turn_id: guardian_request_turn_id(&request, &turn.sub_id).to_owned(),
|
||||
item_id: guardian_request_target_item_id(&request).map(str::to_owned),
|
||||
model: Some(turn.model_info().slug.clone()),
|
||||
occurred_at_ms: codex_analytics::now_unix_millis(),
|
||||
kind: GuardianV2EventKind::FastDecision {
|
||||
decision: "approved",
|
||||
},
|
||||
});
|
||||
}
|
||||
record_guardian_non_denial(&session, guardian_request_turn_id(&request, &turn.sub_id))
|
||||
.await;
|
||||
}
|
||||
return decision;
|
||||
}
|
||||
|
||||
let runtime = super::runtime::ReviewRuntime {
|
||||
session,
|
||||
context,
|
||||
review_id,
|
||||
request: request.into(),
|
||||
reasons,
|
||||
options,
|
||||
};
|
||||
run_synchronous_review(runtime, /*review_reason*/ None).await
|
||||
}
|
||||
|
||||
/// Runs the existing synchronous reviewer without choosing policy or reusing a score.
|
||||
pub(super) async fn run_synchronous_review(
|
||||
runtime: super::runtime::ReviewRuntime,
|
||||
review_reason: Option<codex_protocol::approvals::GuardianReviewReason>,
|
||||
review_reason: codex_protocol::approvals::GuardianReviewReason,
|
||||
) -> ReviewDecision {
|
||||
let super::runtime::ReviewRuntime {
|
||||
session,
|
||||
@@ -524,7 +412,7 @@ pub(super) async fn run_synchronous_review(
|
||||
.send_event(
|
||||
turn.as_ref(),
|
||||
EventMsg::GuardianAssessment(GuardianAssessmentEvent {
|
||||
review_reason,
|
||||
review_reason: Some(review_reason),
|
||||
id: review_id.clone(),
|
||||
target_item_id: target_item_id.clone(),
|
||||
plugin_id: plugin_id.clone(),
|
||||
@@ -564,7 +452,7 @@ pub(super) async fn run_synchronous_review(
|
||||
.send_event(
|
||||
turn.as_ref(),
|
||||
EventMsg::GuardianAssessment(GuardianAssessmentEvent {
|
||||
review_reason,
|
||||
review_reason: Some(review_reason),
|
||||
id: review_id,
|
||||
target_item_id,
|
||||
plugin_id: plugin_id.clone(),
|
||||
@@ -711,7 +599,7 @@ pub(super) async fn run_synchronous_review(
|
||||
.send_event(
|
||||
turn.as_ref(),
|
||||
EventMsg::GuardianAssessment(GuardianAssessmentEvent {
|
||||
review_reason,
|
||||
review_reason: Some(review_reason),
|
||||
id: review_id,
|
||||
target_item_id,
|
||||
plugin_id: plugin_id.clone(),
|
||||
@@ -749,7 +637,7 @@ pub(super) async fn run_synchronous_review(
|
||||
.send_event(
|
||||
turn.as_ref(),
|
||||
EventMsg::GuardianAssessment(GuardianAssessmentEvent {
|
||||
review_reason,
|
||||
review_reason: Some(review_reason),
|
||||
id: review_id,
|
||||
target_item_id,
|
||||
plugin_id: plugin_id.clone(),
|
||||
@@ -835,7 +723,7 @@ pub(super) async fn run_synchronous_review(
|
||||
GuardianAssessmentStatus::Denied
|
||||
};
|
||||
let assessment_event = GuardianAssessmentEvent {
|
||||
review_reason,
|
||||
review_reason: Some(review_reason),
|
||||
id: review_id,
|
||||
target_item_id,
|
||||
plugin_id: plugin_id.clone(),
|
||||
@@ -906,56 +794,6 @@ pub(crate) struct GuardianReviewOptions {
|
||||
pub(crate) require_synchronous_review: bool,
|
||||
}
|
||||
|
||||
/// Public entrypoint for approval requests that should be reviewed by guardian.
|
||||
#[cfg(test)]
|
||||
pub(crate) async fn review_approval_request(
|
||||
session: &Arc<Session>,
|
||||
context: impl Into<GuardianReviewContext>,
|
||||
review_id: String,
|
||||
request: GuardianApprovalRequest,
|
||||
reasons: ApprovalRequestReasons,
|
||||
) -> ReviewDecision {
|
||||
// Erase the delegated future to bound its async state and the tool handlers' Send checks.
|
||||
let review: BoxFuture<'_, ReviewDecision> = Box::pin(run_guardian_review(
|
||||
Arc::clone(session),
|
||||
context.into(),
|
||||
review_id,
|
||||
request,
|
||||
reasons,
|
||||
GuardianReviewOptions {
|
||||
require_guardian: false,
|
||||
plugin_attribution_override: None,
|
||||
approval_request_source: GuardianApprovalRequestSource::MainTurn,
|
||||
external_cancel: None,
|
||||
require_synchronous_review: false,
|
||||
},
|
||||
));
|
||||
review.await
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) async fn review_approval_request_with_cancel(
|
||||
session: &Arc<Session>,
|
||||
context: impl Into<GuardianReviewContext>,
|
||||
review_id: String,
|
||||
request: GuardianApprovalRequest,
|
||||
retry_reason: Option<String>,
|
||||
options: GuardianReviewOptions,
|
||||
) -> ReviewDecision {
|
||||
run_guardian_review(
|
||||
Arc::clone(session),
|
||||
context.into(),
|
||||
review_id,
|
||||
request,
|
||||
ApprovalRequestReasons {
|
||||
approval: None,
|
||||
retry: retry_reason,
|
||||
},
|
||||
options,
|
||||
)
|
||||
.await
|
||||
}
|
||||
|
||||
pub(super) struct GuardianReviewSessionConfig {
|
||||
pub(super) spawn_config: crate::config::Config,
|
||||
pub(super) node_repl_policy: GuardianNodeReplPolicy,
|
||||
|
||||
@@ -89,6 +89,6 @@ impl SynchronousApprovalReviewer for ReviewRuntime {
|
||||
&self,
|
||||
reason: codex_protocol::approvals::GuardianReviewReason,
|
||||
) -> ExtensionFuture<'_, ReviewDecision> {
|
||||
Box::pin(run_synchronous_review(self.clone(), Some(reason)))
|
||||
Box::pin(run_synchronous_review(self.clone(), reason))
|
||||
}
|
||||
}
|
||||
@@ -1688,8 +1688,8 @@ async fn cancelled_guardian_review_emits_terminal_abort_without_warning() {
|
||||
let cancel_token = CancellationToken::new();
|
||||
cancel_token.cancel();
|
||||
|
||||
let decision = review_approval_request_with_cancel(
|
||||
&session,
|
||||
let decision = super::decide_approval(
|
||||
Arc::clone(&session),
|
||||
&turn,
|
||||
"review-cancelled-guardian".to_string(),
|
||||
GuardianApprovalRequest::ApplyPatch {
|
||||
@@ -1699,9 +1699,12 @@ async fn cancelled_guardian_review_emits_terminal_abort_without_warning() {
|
||||
patch: "*** Begin Patch\n*** Update File: guardian.txt\n@@\n+hello\n*** End Patch"
|
||||
.to_string(),
|
||||
},
|
||||
/*retry_reason*/ None,
|
||||
ApprovalRequestReasons {
|
||||
approval: None,
|
||||
retry: None,
|
||||
},
|
||||
GuardianReviewOptions {
|
||||
require_guardian: false,
|
||||
require_guardian: true,
|
||||
plugin_attribution_override: None,
|
||||
approval_request_source: GuardianApprovalRequestSource::MainTurn,
|
||||
external_cancel: Some(cancel_token),
|
||||
@@ -1710,7 +1713,7 @@ async fn cancelled_guardian_review_emits_terminal_abort_without_warning() {
|
||||
)
|
||||
.await;
|
||||
|
||||
assert_eq!(decision, ReviewDecision::Abort);
|
||||
assert_eq!(decision, Some(ReviewDecision::Abort));
|
||||
|
||||
let mut guardian_statuses = Vec::new();
|
||||
let mut warnings = Vec::new();
|
||||
@@ -3399,14 +3402,12 @@ async fn escalated_retry_bypasses_extension_approval_and_runs_guardian() -> anyh
|
||||
struct AutoApprovingReviewContributor;
|
||||
|
||||
impl codex_extension_api::ApprovalReviewContributor for AutoApprovingReviewContributor {
|
||||
fn fast_decision<'a>(
|
||||
fn decide<'a>(
|
||||
&'a self,
|
||||
_session_store: &'a codex_extension_api::ExtensionData,
|
||||
_thread_store: &'a codex_extension_api::ExtensionData,
|
||||
_prompt: &'a str,
|
||||
_extension_metrics: Option<Arc<dyn codex_extension_api::ExtensionMetrics>>,
|
||||
) -> codex_extension_api::ExtensionFuture<'a, Option<ReviewDecision>> {
|
||||
Box::pin(async move { Some(ReviewDecision::Approved) })
|
||||
_input: &'a codex_extension_api::ApprovalDecisionInput<'_>,
|
||||
) -> codex_extension_api::ExtensionFuture<'a, Option<codex_extension_api::ApprovalDecision>>
|
||||
{
|
||||
Box::pin(async { Some(codex_extension_api::ApprovalDecision::Allow) })
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4188,3 +4189,29 @@ async fn guardian_review_session_config_uses_default_guardian_policy_without_req
|
||||
))
|
||||
);
|
||||
}
|
||||
|
||||
// Keep the existing reviewer tests on the production decision path.
|
||||
async fn review_approval_request(
|
||||
session: &Arc<Session>,
|
||||
context: impl Into<GuardianReviewContext>,
|
||||
review_id: String,
|
||||
request: GuardianApprovalRequest,
|
||||
reasons: ApprovalRequestReasons,
|
||||
) -> ReviewDecision {
|
||||
super::decide_approval(
|
||||
Arc::clone(session),
|
||||
context,
|
||||
review_id,
|
||||
request,
|
||||
reasons,
|
||||
GuardianReviewOptions {
|
||||
require_guardian: true,
|
||||
plugin_attribution_override: None,
|
||||
approval_request_source: GuardianApprovalRequestSource::MainTurn,
|
||||
external_cancel: None,
|
||||
require_synchronous_review: false,
|
||||
},
|
||||
)
|
||||
.await
|
||||
.expect("Guardian should handle the request")
|
||||
}
|
||||
Reference in new issue
Block a user