Centralize Guardian context mode and checkpoint policy (#43458)

## What changed

Resolve `GuardianContextMode` once at session construction and share it across history retention, replay, evidence capture, compaction, and review consumers.

Extract synchronous reviewer context policy and consolidate Guardian V2 parent checkpoint selection so sampling and fast approval use the same eligibility checks. Preserve legacy checkpoint omission and strict compatibility requirements for thread-owned context.

## Testing

Adapt existing review and history tests to the explicit context mode. Move checkpoint tests alongside the extracted selector, retaining coverage for latest-item identity, unusable checkpoints, and complete-item size limits.

GitOrigin-RevId: c73fb6fea556921acfffe758a5f709d7494019dd
This commit is contained in:
felixxia-oai
2026-09-07 12:53:57 +00:00
committed by copyberry
parent f3f53ee949
commit 8260619cb6
26 changed files with 599 additions and 482 deletions
+10 -10
View File
@@ -6,6 +6,7 @@ use crate::config::PermissionProfileSnapshot;
use crate::context::ContextualUserFragment;
use crate::context::CurrentTimeReminder;
use crate::context::DeveloperInstructions;
use crate::context::GuardianContextMode;
use crate::context::ManagedDeveloperInstructions;
use crate::context::MultiAgentModeInstructions;
use crate::context::MultiAgentRoleInstructions;
@@ -15,7 +16,6 @@ use crate::tools::handlers::multi_agents_common::build_agent_resume_config;
use codex_context_fragments::set_annotated_content;
use codex_context_fragments::to_annotated_content;
use codex_extension_api::ExtensionDataInit;
use codex_features::Feature;
use codex_history::ResponseItemEnvelope;
use codex_protocol::intersect_effective_permission_profiles;
use codex_protocol::protocol::EnvironmentConfigState;
@@ -109,7 +109,7 @@ fn keep_forked_rollout_item(item: &RolloutItem, preserve_reference_context_item:
fn retain_forked_developer_message(
item: &mut ResponseItem,
usage_hint_texts: &[String],
features: &crate::config::ManagedFeatures,
context_mode: GuardianContextMode,
) -> bool {
if !matches!(item, ResponseItem::Message { role, .. } if role == "developer") {
return true;
@@ -119,7 +119,7 @@ fn retain_forked_developer_message(
return false;
};
content.retain(|content_item| {
if features.enabled(Feature::GuardianThreadContext)
if context_mode == GuardianContextMode::ThreadOwned
&& content_item.kind().0 == "guardian.approved_action"
{
return false;
@@ -129,7 +129,7 @@ fn retain_forked_developer_message(
};
!(MultiAgentRoleInstructions::matches_text(text)
|| (features.enabled(Feature::GuardianThreadContext)
|| (context_mode == GuardianContextMode::ThreadOwned
&& text.starts_with(
crate::guardian::AUTO_REVIEW_DENIED_ACTION_APPROVAL_DEVELOPER_PREFIX,
))
@@ -929,12 +929,13 @@ impl AgentControl {
break;
}
}
let context_mode = GuardianContextMode::from_features(&config.features);
let mut replaced_parent_developer_instructions = false;
// Scrub inherited hints and replace only the parent's developer-instruction fragment.
// Compaction stores response items separately, so sanitize both top-level messages and
// compacted replacement histories with the same policy.
let retain_forked_item = |envelope: &mut ResponseItemEnvelope, replaced: &mut bool| {
if config.features.enabled(Feature::GuardianThreadContext)
if context_mode == GuardianContextMode::ThreadOwned
&& multi_agent_version == MultiAgentVersion::V2
&& matches!(&envelope.item, ResponseItem::Message { role, .. } if role == "user")
{
@@ -952,7 +953,7 @@ impl AgentControl {
if !retain_forked_developer_message(
response_item,
&multi_agent_v2_usage_hint_texts_to_filter,
&config.features,
context_mode,
) {
return false;
}
@@ -1031,10 +1032,9 @@ impl AgentControl {
compacted.guardian_history = None;
// Only V2 fetches root authorization live. Its local scope starts known-empty;
// V1 must remain incomplete when inherited authorization has been stripped.
compacted.retained_context =
(config.features.enabled(Feature::GuardianThreadContext)
&& multi_agent_version == MultiAgentVersion::V2)
.then(codex_history::RetainedContext::default);
compacted.retained_context = (context_mode == GuardianContextMode::ThreadOwned
&& multi_agent_version == MultiAgentVersion::V2)
.then(codex_history::RetainedContext::default);
if let Some(replacement_history) = compacted.replacement_history.as_mut() {
// Matches before this checkpoint cannot survive its replacement history.
replaced_parent_developer_instructions = false;
@@ -8,6 +8,7 @@ use super::AgentControl;
use crate::codex_thread::GuardianRootMessage;
use crate::codex_thread::GuardianRootSnapshot;
use crate::compact::is_summary_message;
use crate::context::GuardianContextMode;
use crate::context::GuardianReviewEvidence;
use crate::context::is_contextual_user_fragment;
use crate::event_mapping::parse_turn_item;
@@ -48,7 +49,9 @@ impl AgentControl {
.thread_extension_data
.get_or_init(GuardianReviewEvidence::default);
let mut latest_user_turn_id = None;
let (messages, authorization_version) = if root_evidence.uses_thread_owned_context() {
let (messages, authorization_version) = if root_evidence.context_mode()
== GuardianContextMode::ThreadOwned
{
let mut missing_root_instructions = false;
let mut messages = history
.retained_context()