mirror of
https://github.com/openai/codex.git
synced 2026-11-16 06:54:36 +00:00
Harden Guardian reviews after context compaction (#42852)
## Why Guardian reviews must not lose user authorization constraints or reuse an unreadable or incompatible parent checkpoint after compaction. ## What changed - Retain bounded excerpts of oversized root user messages across compaction, resume, and rollback, and recover excerpts from legacy Guardian history when available. - Require thread-owned Guardian review sessions and asynchronous scoring to reuse only non-empty checkpoints produced by a compatible review model. - Fail closed instead of reviewing without the required checkpoint when reuse is disabled, compatibility is unknown, or checkpoint content is unusable. ## Testing Expanded retained-context, review-session, asynchronous-scoring, and app-server coverage for oversized instructions, legacy recovery, model incompatibility, missing content, resume, rollback, and disabled checkpoint reuse. GitOrigin-RevId: f30d837197e0d838e656a632109f490c38208f5e
This commit is contained in:
1 parent
8e4b7d31de
commit
4636819a35
15 files changed
+598
-104
No files matched your search
@@ -73,6 +73,7 @@ const GUARDIAN_MAX_MESSAGE_TRANSCRIPT_TOKENS: usize = 20_000;
|
||||
const GUARDIAN_MAX_TOOL_TRANSCRIPT_TOKENS: usize = 10_000;
|
||||
const GUARDIAN_MAX_MESSAGE_ENTRY_TOKENS: usize = 5_000;
|
||||
const GUARDIAN_MAX_TOOL_ENTRY_TOKENS: usize = 1_000;
|
||||
pub(crate) const GUARDIAN_MAX_ROOT_MESSAGE_TOKENS: usize = 900;
|
||||
pub(crate) const GUARDIAN_MAX_NODE_REPL_TOOL_RESULT_TOKENS: usize = 6_000;
|
||||
pub(crate) const GUARDIAN_MAX_ACTION_BYTES: usize = 8_000;
|
||||
const GUARDIAN_MAX_ACTION_STRING_TOKENS: usize = 16_000;
|
||||
|
||||
@@ -962,6 +962,7 @@ pub(crate) fn spawn_approval_request_review(
|
||||
pub(super) struct GuardianReviewSessionConfig {
|
||||
pub(super) spawn_config: crate::config::Config,
|
||||
pub(super) node_repl_policy: GuardianNodeReplPolicy,
|
||||
pub(super) compaction_model_hash: Option<String>,
|
||||
model: String,
|
||||
reasoning_effort: Option<codex_protocol::openai_models::ReasoningEffort>,
|
||||
default_review_model_id: String,
|
||||
@@ -1063,6 +1064,7 @@ pub(super) async fn guardian_review_session_config(
|
||||
}
|
||||
Ok(GuardianReviewSessionConfig {
|
||||
spawn_config,
|
||||
compaction_model_hash: guardian_model_info.comp_hash.clone(),
|
||||
node_repl_policy: GuardianNodeReplPolicy::from_model_messages(
|
||||
guardian_model_info.model_messages.as_ref(),
|
||||
),
|
||||
@@ -1121,6 +1123,7 @@ async fn run_guardian_review_session_before_deadline(
|
||||
reasons,
|
||||
schema,
|
||||
model: session_config.model,
|
||||
compaction_model_hash: session_config.compaction_model_hash,
|
||||
reasoning_effort: session_config.reasoning_effort,
|
||||
guardian_default_review_model_id: session_config.default_review_model_id,
|
||||
guardian_catalog_contains_auto_review: session_config.catalog_contains_auto_review,
|
||||
|
||||
@@ -54,6 +54,7 @@ use crate::config::Permissions;
|
||||
use crate::context::ContextualUserFragment;
|
||||
use crate::context::GuardianFollowupReviewReminder;
|
||||
use crate::context::GuardianNodeReplPolicy;
|
||||
use crate::context_manager::ContextManager;
|
||||
use crate::environment_selection::TurnEnvironmentSnapshot;
|
||||
use crate::image_preparation::ImagePreparationMode;
|
||||
use crate::image_preparation::ImageResizeNoticeMode;
|
||||
@@ -113,6 +114,7 @@ pub(crate) struct GuardianReviewSessionParams {
|
||||
pub(crate) reasons: ApprovalRequestReasons,
|
||||
pub(crate) schema: Value,
|
||||
pub(crate) model: String,
|
||||
pub(crate) compaction_model_hash: Option<String>,
|
||||
pub(crate) reasoning_effort: Option<ReasoningEffortConfig>,
|
||||
pub(crate) guardian_default_review_model_id: String,
|
||||
pub(crate) guardian_catalog_contains_auto_review: bool,
|
||||
@@ -230,6 +232,9 @@ impl GuardianReviewSessionReuseKey {
|
||||
parent_history_version: if spawn_config
|
||||
.features
|
||||
.enabled(Feature::GuardianReuseParentCompaction)
|
||||
|| spawn_config
|
||||
.features
|
||||
.enabled(Feature::GuardianThreadContext)
|
||||
{
|
||||
parent_history_version
|
||||
} else {
|
||||
@@ -280,31 +285,62 @@ impl GuardianReviewSessionReuseKey {
|
||||
}
|
||||
}
|
||||
|
||||
fn encrypted_parent_compaction<'a, I>(items: I) -> Option<ResponseItem>
|
||||
where
|
||||
I: IntoIterator<Item = &'a ResponseItem>,
|
||||
I::IntoIter: DoubleEndedIterator,
|
||||
{
|
||||
let item = items.into_iter().rev().find(|item| {
|
||||
fn encrypted_parent_compaction(
|
||||
history: &ContextManager,
|
||||
features: &ManagedFeatures,
|
||||
reviewer_compaction_hash: Option<&str>,
|
||||
) -> anyhow::Result<Option<ResponseItem>> {
|
||||
let strict = features.enabled(Feature::GuardianThreadContext);
|
||||
if !strict && !features.enabled(Feature::GuardianReuseParentCompaction) {
|
||||
return Ok(None);
|
||||
}
|
||||
let Some(envelope) = history.annotated_items().iter().rev().find(|envelope| {
|
||||
matches!(
|
||||
item,
|
||||
envelope.item,
|
||||
ResponseItem::Compaction { .. } | ResponseItem::ContextCompaction { .. }
|
||||
)
|
||||
})?;
|
||||
}) else {
|
||||
return Ok(None);
|
||||
};
|
||||
|
||||
match item {
|
||||
let item = &envelope.item;
|
||||
let valid = match item {
|
||||
ResponseItem::Compaction {
|
||||
id: Some(_),
|
||||
encrypted_content,
|
||||
..
|
||||
} if !encrypted_content.is_empty() => Some(item.clone()),
|
||||
} if !encrypted_content.is_empty() => true,
|
||||
ResponseItem::ContextCompaction {
|
||||
id: Some(_),
|
||||
encrypted_content: Some(encrypted_content),
|
||||
..
|
||||
} if !encrypted_content.is_empty() => Some(item.clone()),
|
||||
_ => None,
|
||||
} if !encrypted_content.is_empty() => true,
|
||||
_ => false,
|
||||
};
|
||||
if !valid && !strict {
|
||||
return Ok(None);
|
||||
}
|
||||
anyhow::ensure!(
|
||||
valid,
|
||||
"parent compaction checkpoint is unusable for Guardian review"
|
||||
);
|
||||
if strict {
|
||||
// A resumed parent may now use a different model. Compare the actual
|
||||
// checkpoint producer with the selected reviewer, not the live parent model.
|
||||
let producer_hash = envelope
|
||||
.metadata
|
||||
.as_ref()
|
||||
.and_then(|metadata| metadata.compaction_model_hash.as_deref());
|
||||
anyhow::ensure!(
|
||||
producer_hash
|
||||
.zip(reviewer_compaction_hash)
|
||||
.is_some_and(|(producer, reviewer)| {
|
||||
!producer.is_empty() && producer == reviewer
|
||||
}),
|
||||
"parent compaction checkpoint is incompatible with the Guardian review model or its compatibility is unknown"
|
||||
);
|
||||
}
|
||||
Ok(Some(item.clone()))
|
||||
}
|
||||
|
||||
pub(crate) fn prompt_cache_key_override_for_review_session(
|
||||
@@ -446,11 +482,11 @@ impl GuardianReviewSessionManager {
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let parent_compaction = spawn_config
|
||||
.features
|
||||
.enabled(Feature::GuardianReuseParentCompaction)
|
||||
.then(|| encrypted_parent_compaction(parent_history.raw_items()))
|
||||
.flatten();
|
||||
let parent_compaction = encrypted_parent_compaction(
|
||||
&parent_history,
|
||||
&spawn_config.features,
|
||||
session_config.compaction_model_hash.as_deref(),
|
||||
)?;
|
||||
let parent_context = GuardianReviewContext::from(parent_turn);
|
||||
let mut reuse_key = GuardianReviewSessionReuseKey::from_spawn_config(
|
||||
&spawn_config,
|
||||
@@ -551,12 +587,19 @@ impl GuardianReviewSessionManager {
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let parent_compaction = params
|
||||
.spawn_config
|
||||
.features
|
||||
.enabled(Feature::GuardianReuseParentCompaction)
|
||||
.then(|| encrypted_parent_compaction(parent_history.raw_items()))
|
||||
.flatten();
|
||||
let parent_compaction = match encrypted_parent_compaction(
|
||||
&parent_history,
|
||||
¶ms.spawn_config.features,
|
||||
params.compaction_model_hash.as_deref(),
|
||||
) {
|
||||
Ok(checkpoint) => checkpoint,
|
||||
Err(error) => {
|
||||
return (
|
||||
GuardianReviewSessionOutcome::PromptBuildFailed(error),
|
||||
GuardianReviewAnalyticsResult::without_session(),
|
||||
);
|
||||
}
|
||||
};
|
||||
let mut next_reuse_key = GuardianReviewSessionReuseKey::from_spawn_config(
|
||||
¶ms.spawn_config,
|
||||
params.parent_session.user_instructions().await,
|
||||
@@ -581,7 +624,10 @@ impl GuardianReviewSessionManager {
|
||||
.await
|
||||
{
|
||||
Ok(mut state) => {
|
||||
if parent_compaction.is_none()
|
||||
if !params
|
||||
.parent_session
|
||||
.enabled(Feature::GuardianThreadContext)
|
||||
&& parent_compaction.is_none()
|
||||
&& let Some(trunk) = state.trunk.as_ref()
|
||||
{
|
||||
// Without a decryptable summary, the existing reviewer may
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
use super::*;
|
||||
use codex_history::CodexHarnessMetadata;
|
||||
use codex_history::ResponseItemEnvelope;
|
||||
use codex_protocol::openai_models::AutoReviewMessages;
|
||||
use codex_protocol::protocol::AgentStatus;
|
||||
use codex_protocol::protocol::ErrorEvent;
|
||||
@@ -115,6 +117,7 @@ async fn test_review_params() -> GuardianReviewSessionParams {
|
||||
reasons: ApprovalRequestReasons::default(),
|
||||
schema: super::super::prompt::guardian_output_schema(),
|
||||
model,
|
||||
compaction_model_hash: None,
|
||||
reasoning_effort,
|
||||
guardian_default_review_model_id: "codex-auto-review".to_string(),
|
||||
guardian_catalog_contains_auto_review: true,
|
||||
@@ -253,8 +256,18 @@ async fn guardian_review_session_config_change_invalidates_cached_session() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn encrypted_parent_compaction_requires_original_item_id() {
|
||||
#[test_case::test_case(true; "thread owned")]
|
||||
#[test_case::test_case(false; "legacy")]
|
||||
#[tokio::test]
|
||||
async fn encrypted_parent_compaction_requires_original_item_id(thread_context_enabled: bool) {
|
||||
let (session, _) = crate::session::tests::make_session_and_context().await;
|
||||
let mut features = session.get_config().await.features.clone();
|
||||
features
|
||||
.enable(Feature::GuardianReuseParentCompaction)
|
||||
.expect("legacy reuse");
|
||||
features
|
||||
.set_enabled(Feature::GuardianThreadContext, thread_context_enabled)
|
||||
.expect("context mode");
|
||||
let item = ResponseItem::Compaction {
|
||||
id: Some(codex_protocol::ResponseItemId::from_server(
|
||||
"cmp_guardian_parent_summary".to_string(),
|
||||
@@ -263,18 +276,36 @@ fn encrypted_parent_compaction_requires_original_item_id() {
|
||||
internal_chat_message_metadata_passthrough: None,
|
||||
};
|
||||
|
||||
let mut history = ContextManager::new();
|
||||
history.replace_annotated(vec![ResponseItemEnvelope {
|
||||
item: item.clone(),
|
||||
metadata: Some(CodexHarnessMetadata {
|
||||
compaction_model_hash: Some("compatible".to_owned()),
|
||||
..Default::default()
|
||||
}),
|
||||
}]);
|
||||
assert_eq!(
|
||||
encrypted_parent_compaction(std::slice::from_ref(&item)),
|
||||
encrypted_parent_compaction(&history, &features, Some("compatible"))
|
||||
.expect("valid checkpoint"),
|
||||
Some(item)
|
||||
);
|
||||
assert_eq!(
|
||||
encrypted_parent_compaction(&[ResponseItem::Compaction {
|
||||
// The latest unusable checkpoint must not fall back to the older valid one.
|
||||
let mut items = history.annotated_items().to_vec();
|
||||
items.push(
|
||||
ResponseItem::Compaction {
|
||||
id: None,
|
||||
encrypted_content: "encrypted guardian parent summary".to_string(),
|
||||
internal_chat_message_metadata_passthrough: None,
|
||||
}]),
|
||||
None
|
||||
}
|
||||
.into(),
|
||||
);
|
||||
history.replace_annotated(items);
|
||||
let result = encrypted_parent_compaction(&history, &features, Some("compatible"));
|
||||
if thread_context_enabled {
|
||||
assert!(result.is_err());
|
||||
} else {
|
||||
assert_eq!(result.expect("legacy omission"), None);
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
|
||||
Reference in new issue
Block a user