mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
Move Guardian reviewer configuration into the extension (#45729)
## What changed Move concrete reviewer settings into `guardian-v2` and replace `ReviewerConfigOverrides` with a `ReviewerConfig` callback stored in thread extension data. Apply the callback to each captured parent configuration before preparing context and checking session reuse. Keep model selection, policy prompt construction, and live network state in the core adapter. Preserve the existing read-only reviewer settings and share `reviewer_permission_profile` with inherited environment configuration. ## Testing Update existing Guardian configuration, session reuse, and prewarming tests to use the extension's actual configuration builder, including compiling the shared source in core's test host. GitOrigin-RevId: dfa1dae9f8d4469f2e4f6e64ab842cc662970898
This commit is contained in:
@@ -167,8 +167,13 @@ pub(super) async fn guardian_review_session_config(
|
||||
.await,
|
||||
)
|
||||
};
|
||||
let reviewer_config = session
|
||||
.services
|
||||
.thread_extension_data
|
||||
.get::<codex_guardian_reviewer::ReviewerConfig<crate::config::Config>>()
|
||||
.ok_or_else(|| anyhow::anyhow!("Guardian reviewer configuration is not installed"))?;
|
||||
let mut spawn_config = build_guardian_review_session_config(
|
||||
turn.config.as_ref(),
|
||||
(reviewer_config.0)(turn.config.as_ref())?,
|
||||
live_network_config,
|
||||
review_model.model.as_str(),
|
||||
review_model.reasoning_effort.clone(),
|
||||
|
||||
@@ -33,7 +33,8 @@ async fn run_review_preserves_evidence_during_parent_compaction() {
|
||||
.await;
|
||||
let mut params = test_review_params().await;
|
||||
params.spawn_config = build_guardian_review_session_config(
|
||||
turn.config.as_ref(),
|
||||
crate::guardian::test_host::build_reviewer_config(turn.config.as_ref())
|
||||
.expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
¶ms.review_model.model,
|
||||
params.review_model.reasoning_effort.clone(),
|
||||
@@ -207,7 +208,8 @@ async fn test_review_params() -> GuardianReviewSessionParams {
|
||||
#[allow(deprecated)]
|
||||
let cwd = turn.cwd.clone();
|
||||
let spawn_config = build_guardian_review_session_config(
|
||||
turn.config.as_ref(),
|
||||
crate::guardian::test_host::build_reviewer_config(turn.config.as_ref())
|
||||
.expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
model.as_str(),
|
||||
reasoning_effort.clone(),
|
||||
@@ -307,7 +309,7 @@ async fn spawned_guardian_reuse_key_matches_inherited_instructions() {
|
||||
async fn guardian_review_session_config_change_invalidates_cached_session() {
|
||||
let parent_config = crate::config::test_config().await;
|
||||
let cached_spawn_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -327,7 +329,8 @@ async fn guardian_review_session_config_change_invalidates_cached_session() {
|
||||
changed_parent_config.model_provider.base_url =
|
||||
Some("https://guardian.example.invalid/v1".to_string());
|
||||
let next_spawn_config = build_guardian_review_session_config(
|
||||
&changed_parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&changed_parent_config)
|
||||
.expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -517,7 +520,7 @@ async fn guardian_prompt_cache_key_is_scoped_to_parent_thread() {
|
||||
async fn guardian_review_session_compact_scope_change_invalidates_cached_session() {
|
||||
let parent_config = crate::config::test_config().await;
|
||||
let cached_spawn_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -537,7 +540,8 @@ async fn guardian_review_session_compact_scope_change_invalidates_cached_session
|
||||
changed_parent_config.model_auto_compact_token_limit_scope =
|
||||
AutoCompactTokenLimitScope::BodyAfterPrefix;
|
||||
let next_spawn_config = build_guardian_review_session_config(
|
||||
&changed_parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&changed_parent_config)
|
||||
.expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -565,7 +569,7 @@ async fn guardian_review_session_config_disables_hooks() {
|
||||
.expect("enable hooks on parent config");
|
||||
|
||||
let guardian_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -584,7 +588,7 @@ async fn guardian_review_session_config_disables_skill_instructions() {
|
||||
parent_config.include_skill_instructions = true;
|
||||
|
||||
let guardian_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -627,7 +631,7 @@ async fn guardian_review_session_config_prefers_configured_policy_and_template()
|
||||
};
|
||||
|
||||
let guardian_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -671,7 +675,7 @@ async fn guardian_review_session_config_preserves_explicit_empty_catalog_policy(
|
||||
};
|
||||
|
||||
let guardian_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -723,7 +727,7 @@ async fn guardian_review_session_config_preserves_explicit_empty_catalog_templat
|
||||
};
|
||||
|
||||
let guardian_config = build_guardian_review_session_config(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -1160,6 +1164,11 @@ async fn prewarm_test_session(
|
||||
Box::pin(async move { Ok(session.lock().await.take().expect("one fixture spawn")) })
|
||||
},
|
||||
);
|
||||
params.parent_session.services.thread_extension_data.insert(
|
||||
codex_guardian_reviewer::ReviewerConfig::<Config>(
|
||||
crate::guardian::test_host::build_reviewer_config,
|
||||
),
|
||||
);
|
||||
let context = setup::prepare_prewarm(
|
||||
Arc::clone(¶ms.parent_session),
|
||||
Arc::clone(params.parent_context.turn()),
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
//! Applies extension-owned reviewer settings to host configuration and builds context.
|
||||
//! Managed constraints, live network rules and policy prompt construction stay in the host.
|
||||
|
||||
use std::collections::HashMap;
|
||||
//! Adds model, policy context and live network state to the extension's reviewer configuration.
|
||||
//! Both prewarming and reviews finish this setup before context preparation and reuse checks.
|
||||
|
||||
use codex_protocol::models::BaseInstructionsProvenance;
|
||||
use codex_protocol::openai_models::ModelMessages;
|
||||
use tracing::warn;
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::config::Constrained;
|
||||
use crate::config::NetworkProxySpec;
|
||||
use crate::config::TokenBudgetConfig;
|
||||
|
||||
use super::prompt::BUNDLED_GUARDIAN_POLICY_TEMPLATE;
|
||||
use super::prompt::guardian_policy_prompt_with_config_and_template;
|
||||
|
||||
/// Builds the existing read-only reviewer configuration with its policy and live network rules.
|
||||
/// Adds the captured model, policy prompt and live network rules before reuse selection.
|
||||
pub fn build_guardian_review_session_config(
|
||||
parent_config: &Config,
|
||||
mut guardian_config: Config,
|
||||
live_network_config: Option<codex_network_proxy::NetworkProxyConfig>,
|
||||
active_model: &str,
|
||||
reasoning_effort: Option<codex_protocol::openai_models::ReasoningEffort>,
|
||||
@@ -25,29 +20,13 @@ pub fn build_guardian_review_session_config(
|
||||
personality: Option<codex_protocol::config_types::Personality>,
|
||||
model_messages: Option<&ModelMessages>,
|
||||
) -> anyhow::Result<Config> {
|
||||
let mut guardian_config = parent_config.clone();
|
||||
let overrides = codex_guardian_reviewer::reviewer_config_overrides(
|
||||
parent_config.permissions.permission_profile(),
|
||||
active_model,
|
||||
reasoning_effort,
|
||||
);
|
||||
guardian_config.model = Some(overrides.model);
|
||||
guardian_config.model_reasoning_effort = overrides.reasoning_effort;
|
||||
guardian_config.model = Some(active_model.to_owned());
|
||||
guardian_config.model_reasoning_effort = reasoning_effort;
|
||||
guardian_config.model_reasoning_summary = Some(reasoning_summary);
|
||||
guardian_config.personality = personality;
|
||||
guardian_config.model_provider.request_max_retries = Some(overrides.request_max_retries);
|
||||
guardian_config.model_provider.stream_max_retries = Some(overrides.stream_max_retries);
|
||||
guardian_config.include_skill_instructions = overrides.include_skill_instructions;
|
||||
guardian_config.memories.use_memories = overrides.use_memories;
|
||||
guardian_config.memories.dedicated_tools = overrides.dedicated_memory_tools;
|
||||
if !overrides.inherit_token_budget {
|
||||
// An explicit disabled config prevents model defaults from reactivating it.
|
||||
guardian_config.token_budget_startup_config = None;
|
||||
guardian_config.token_budget = Some(TokenBudgetConfig::default());
|
||||
}
|
||||
let catalog_auto_review = model_messages.and_then(|messages| messages.auto_review.as_ref());
|
||||
let tenant_policy_config = parent_config.resolve_guardian_policy(model_messages);
|
||||
let policy_template = parent_config
|
||||
let tenant_policy_config = guardian_config.resolve_guardian_policy(model_messages);
|
||||
let policy_template = guardian_config
|
||||
.guardian_policy_template
|
||||
.as_deref()
|
||||
.or_else(|| catalog_auto_review.and_then(|messages| messages.policy_template.as_deref()))
|
||||
@@ -57,25 +36,6 @@ pub fn build_guardian_review_session_config(
|
||||
policy_template,
|
||||
));
|
||||
guardian_config.base_instructions_provenance = Some(BaseInstructionsProvenance::Custom);
|
||||
guardian_config.notify = overrides.notify;
|
||||
guardian_config.developer_instructions = overrides.developer_instructions;
|
||||
guardian_config.permissions.approval_policy =
|
||||
Constrained::allow_only(overrides.approval_policy);
|
||||
guardian_config
|
||||
.permissions
|
||||
.set_permission_profile(overrides.permission_profile)
|
||||
.map_err(|err| {
|
||||
anyhow::anyhow!("guardian review session could not set permission profile: {err}")
|
||||
})?;
|
||||
guardian_config.include_apps_instructions = overrides.include_apps_instructions;
|
||||
if !overrides.inherit_mcp_servers {
|
||||
guardian_config
|
||||
.mcp_servers
|
||||
.set(HashMap::new())
|
||||
.map_err(|err| {
|
||||
anyhow::anyhow!("guardian review session could not clear MCP servers: {err}")
|
||||
})?;
|
||||
}
|
||||
if let Some(live_network_config) = live_network_config
|
||||
&& guardian_config.permissions.network.is_some()
|
||||
{
|
||||
@@ -91,19 +51,5 @@ pub fn build_guardian_review_session_config(
|
||||
guardian_config.permissions.permission_profile(),
|
||||
)?);
|
||||
}
|
||||
for feature in overrides.disabled_features {
|
||||
guardian_config.features.disable(feature).map_err(|err| {
|
||||
anyhow::anyhow!(
|
||||
"guardian review session could not disable `features.{}`: {err}",
|
||||
feature.key()
|
||||
)
|
||||
})?;
|
||||
if guardian_config.features.enabled(feature) {
|
||||
warn!(
|
||||
"guardian review session could not disable `features.{}`; continuing with the feature enabled",
|
||||
feature.key()
|
||||
);
|
||||
}
|
||||
}
|
||||
Ok(guardian_config)
|
||||
}
|
||||
|
||||
@@ -5,7 +5,6 @@ use std::sync::Arc;
|
||||
|
||||
use codex_extension_api::SessionIsolation;
|
||||
use codex_home::CodexHomeUserInstructionsProvider;
|
||||
use codex_protocol::protocol::AskForApproval;
|
||||
use codex_protocol::protocol::InternalSessionSource;
|
||||
use codex_protocol::protocol::SessionSource;
|
||||
use codex_protocol::protocol::ThreadSource;
|
||||
@@ -13,9 +12,19 @@ use codex_protocol::protocol::ThreadSource;
|
||||
use super::GuardianReviewSessionManager;
|
||||
use crate::config::Config;
|
||||
use crate::config::Constrained;
|
||||
use crate::config::TokenBudgetConfig;
|
||||
use crate::session::session::Session;
|
||||
|
||||
// Compile the extension's actual setup with this test crate's Config type, rather
|
||||
// than keeping a second settings implementation in the context-adapter test host.
|
||||
#[path = "../../../ext/guardian-v2/src/sync_reviewer/reviewer_config.rs"]
|
||||
mod reviewer_config;
|
||||
pub(super) use reviewer_config::build_reviewer_config;
|
||||
|
||||
pub(crate) fn install(session: &Session, config: &Config) {
|
||||
session.services.thread_extension_data.insert(
|
||||
codex_guardian_reviewer::ReviewerConfig::<Config>(build_reviewer_config),
|
||||
);
|
||||
let manager = Arc::new(crate::ThreadManager::new(
|
||||
config,
|
||||
Arc::clone(&session.services.auth_manager),
|
||||
@@ -56,8 +65,6 @@ pub(crate) fn install(session: &Session, config: &Config) {
|
||||
) {
|
||||
options.config.ephemeral = true;
|
||||
}
|
||||
options.config.permissions.approval_policy =
|
||||
Constrained::allow_only(AskForApproval::Never);
|
||||
options.session_source =
|
||||
Some(SessionSource::Internal(InternalSessionSource::Guardian));
|
||||
options.thread_source = Some(ThreadSource::GuardianReview);
|
||||
|
||||
@@ -3746,7 +3746,7 @@ async fn guardian_review_session_config_preserves_parent_network_proxy() {
|
||||
parent_config.permissions.network = Some(network.clone());
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"parent-active-model",
|
||||
Some(codex_protocol::openai_models::ReasoningEffort::Low),
|
||||
@@ -3847,7 +3847,7 @@ async fn guardian_review_session_config_clears_parent_developer_instructions() {
|
||||
Some("parent or managed config should not replace guardian policy".to_string());
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -3876,7 +3876,7 @@ async fn guardian_review_session_config_clears_legacy_notify() {
|
||||
]);
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -3913,7 +3913,7 @@ async fn guardian_review_session_config_uses_live_network_proxy_state() {
|
||||
live_network.set_allowed_domains(vec!["github.com".to_string()]);
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
Some(live_network.clone()),
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -3962,7 +3962,7 @@ async fn guardian_review_session_config_disables_mcp_apps_plugins_memories_and_g
|
||||
parent_config.memories.dedicated_tools = true;
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -3996,7 +3996,7 @@ async fn guardian_review_session_config_allows_pinned_disabled_feature() {
|
||||
.expect("managed features");
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -4017,7 +4017,7 @@ async fn guardian_review_session_config_uses_parent_active_model_instead_of_hard
|
||||
parent_config.model = Some("configured-model".to_string());
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -4038,7 +4038,7 @@ async fn guardian_review_session_config_keeps_bedrock_provider_for_bedrock_gpt_5
|
||||
ModelProviderInfo::create_amazon_bedrock_provider(/*aws*/ None);
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
AMAZON_BEDROCK_GPT_5_4_MODEL_ID,
|
||||
Some(ReasoningEffort::Low),
|
||||
@@ -4095,7 +4095,7 @@ async fn guardian_review_session_config_uses_requirements_guardian_policy_config
|
||||
.expect("load config");
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
@@ -4137,7 +4137,7 @@ async fn guardian_review_session_config_uses_default_guardian_policy_without_req
|
||||
.expect("load config");
|
||||
|
||||
let guardian_config = build_guardian_review_session_config_for_test(
|
||||
&parent_config,
|
||||
crate::guardian::test_host::build_reviewer_config(&parent_config).expect("reviewer config"),
|
||||
/*live_network_config*/ None,
|
||||
"active-model",
|
||||
/*reasoning_effort*/ None,
|
||||
|
||||
Reference in New Issue
Block a user