mirror of
https://github.com/openai/codex.git
synced 2026-11-16 06:54:36 +00:00
## 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
95 lines
3.4 KiB
Rust
95 lines
3.4 KiB
Rust
//! Binds the existing synchronous reviewer to one approval action.
|
|
|
|
use codex_extension_api::ExtensionFuture;
|
|
use codex_extension_api::SynchronousApprovalReviewer;
|
|
use codex_protocol::protocol::ReviewDecision;
|
|
use std::sync::Arc;
|
|
|
|
use super::ApprovalRequestReasons;
|
|
use super::GuardianApprovalRequest;
|
|
use super::GuardianReviewContext;
|
|
use super::GuardianReviewOptions;
|
|
use super::approval_request::guardian_approval_request_to_json;
|
|
use super::review::run_synchronous_review;
|
|
use crate::session::session::Session;
|
|
|
|
/// Carries the original action even when the legacy synchronous renderer cannot handle its paths.
|
|
/// This lets the extension return AskUser before invoking that renderer.
|
|
#[derive(Clone)]
|
|
pub(crate) struct ReviewAction {
|
|
pub(crate) action: Result<serde_json::Value, String>,
|
|
pub(crate) category: codex_protocol::openai_models::GuardianScope,
|
|
pub(crate) request: Result<GuardianApprovalRequest, String>,
|
|
}
|
|
|
|
impl From<GuardianApprovalRequest> for ReviewAction {
|
|
fn from(request: GuardianApprovalRequest) -> Self {
|
|
Self {
|
|
action: guardian_approval_request_to_json(&request).map_err(|error| error.to_string()),
|
|
category: request.guardian_scope(),
|
|
request: Ok(request),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ReviewAction {
|
|
pub(crate) fn from_approval_action(
|
|
action: crate::tools::sandboxing::ApprovalAction,
|
|
exec_command_cwd_convention: Option<codex_utils_path_uri::PathConvention>,
|
|
) -> Self {
|
|
let category = action.guardian_scope();
|
|
let original = serde_json::to_value(&action).map_err(|error| error.to_string());
|
|
match action.into_guardian_request(exec_command_cwd_convention) {
|
|
Ok(request) => Self::from(request),
|
|
Err(error) => Self {
|
|
action: original,
|
|
category,
|
|
request: Err(error.to_string()),
|
|
},
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ReviewAction {
|
|
/// Preserve the checks previously made before entering Guardian from tool approvals.
|
|
pub(super) fn validate(
|
|
&self,
|
|
context: &GuardianReviewContext,
|
|
) -> Result<&GuardianApprovalRequest, ReviewDecision> {
|
|
let request = self.request.as_ref().map_err(|error| {
|
|
tracing::error!(%error, "failed to build automatic approval action");
|
|
ReviewDecision::denied("automatic approval review could not prepare the action")
|
|
})?;
|
|
if let GuardianApprovalRequest::WriteStdin { environment_id, .. } = request
|
|
&& !context
|
|
.environments()
|
|
.turn_environments()
|
|
.any(|environment| environment.selection.environment_id == *environment_id)
|
|
{
|
|
return Err(ReviewDecision::denied(
|
|
"automatic approval review cannot access the terminal's environment; select it before retrying",
|
|
));
|
|
}
|
|
Ok(request)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub(super) struct ReviewRuntime {
|
|
pub(super) session: Arc<Session>,
|
|
pub(super) context: GuardianReviewContext,
|
|
pub(super) review_id: String,
|
|
pub(super) request: ReviewAction,
|
|
pub(super) reasons: ApprovalRequestReasons,
|
|
pub(super) options: GuardianReviewOptions,
|
|
}
|
|
|
|
impl SynchronousApprovalReviewer for ReviewRuntime {
|
|
fn review(
|
|
&self,
|
|
reason: codex_protocol::approvals::GuardianReviewReason,
|
|
) -> ExtensionFuture<'_, ReviewDecision> {
|
|
Box::pin(run_synchronous_review(self.clone(), reason))
|
|
}
|
|
}
|