From ab7a93771efc8a15421106f6ec9a33121d216c05 Mon Sep 17 00:00:00 2001 From: ioanbudea-OAI Date: Fri, 20 Nov 2026 19:46:12 +0000 Subject: [PATCH] Honor Guardian retention settings for assistant messages (#62828) ## Why The fixed retention window can discard assistant messages before elastic Guardian reviews can use them as context for a user's reply. ## What changed Apply the thread's Guardian retention policy when recording assistant messages, including confirmed messages sent through the user messaging tool. Keep full text within the configured record limit and the overall assistant history byte budget. Preserve an incomplete marker when a confirmed delivery exceeds the record limit. Recover the thread's retention settings from saved history and compaction checkpoints. Fixed-budget reviews continue to use the fixed retention window. ## Testing Add coverage for record limits during capture and restore, thread-owned settings recovery, and replay of oversized confirmed deliveries. GitOrigin-RevId: e828f06824ce6712910a9cc5ef42a438d1ddf27e --- .../app-server-exports-stable.json.zst | Bin 172849 -> 172933 bytes .../core/src/agent/control/sender_context.rs | 4 +- .../src/agent/control/user_authorization.rs | 17 +- codex-rs/core/src/context_manager/history.rs | 33 +++- .../core/src/context_manager/history_tests.rs | 87 +++++++++ .../history_user_authorization.rs | 87 ++++++--- codex-rs/core/src/guardian/prompt.rs | 13 +- codex-rs/core/src/session/file_audio_tests.rs | 4 +- .../src/session/guardian_checkpoint_tests.rs | 2 + codex-rs/core/src/session/retained_context.rs | 14 +- .../src/session/rollout_reconstruction.rs | 11 ++ .../session/rollout_reconstruction_tests.rs | 1 + codex-rs/core/src/session/session.rs | 4 + codex-rs/core/src/session/tests.rs | 2 + codex-rs/core/src/tools/registry.rs | 6 +- codex-rs/core/src/tools/user_messaging.rs | 26 ++- .../core/src/tools/user_messaging_tests.rs | 33 +++- codex-rs/core/tests/suite/guardian_history.rs | 15 ++ .../scenarios_guardian_sender_context.rs | 15 +- .../src/async_scorer/classification.rs | 21 ++- .../src/async_scorer/observation.rs | 6 - .../src/async_scorer/transcript.rs | 13 +- .../src/async_scorer/transcript_tests.rs | 8 + codex-rs/guardian-context/src/budget.rs | 2 +- .../guardian-context/src/preparation/mod.rs | 12 ++ .../guardian-context/src/preparation/root.rs | 7 +- .../src/retained_instructions.rs | 1 - codex-rs/history/src/lib.rs | 15 ++ .../src/retained_assistant_messages.rs | 12 +- codex-rs/history/src/retained_context.rs | 178 +++++++++++++++--- .../history/src/retained_context_tests.rs | 62 ++++++ codex-rs/history/src/tests.rs | 14 +- .../local/rollout_migration/rollback_plan.rs | 5 + 33 files changed, 608 insertions(+), 122 deletions(-) diff --git a/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst b/codex-rs/app-server-protocol/schema/precomputed/app-server-exports-stable.json.zst index eaab9e700cf1e88327bf9f60e4bf8588ab856059..bb00284b28e308167cb06622beb305aa3d2444b4 100644 GIT binary patch delta 24259 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�Gz>E;Ua(`EqMLdApi|DqXII&43BG}6VN_n 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 diff --git a/codex-rs/core/src/agent/control/sender_context.rs b/codex-rs/core/src/agent/control/sender_context.rs index 3ed658abf8..5ebfb21621 100644 --- a/codex-rs/core/src/agent/control/sender_context.rs +++ b/codex-rs/core/src/agent/control/sender_context.rs @@ -126,10 +126,12 @@ impl LocalAgentRuntime { ) .ok()?; } + let retention = + codex_history::MessageRetention::saved(&history, source_thread_id); let context = ContextManager::reconstruct_rollout( &history, history_mode, - ContextManager::new, + |ids| ContextManager::new(ids, retention), // Tool bodies are not sender authorization evidence. TruncationPolicy::Bytes(0), ) diff --git a/codex-rs/core/src/agent/control/user_authorization.rs b/codex-rs/core/src/agent/control/user_authorization.rs index 13d2c3d244..aa084ca12b 100644 --- a/codex-rs/core/src/agent/control/user_authorization.rs +++ b/codex-rs/core/src/agent/control/user_authorization.rs @@ -54,6 +54,7 @@ impl RootConversationSource for CapturedRootConversation { let root_history = &self.history; // Join calls to host-confirmed outputs in this snapshot. Older outputs without // captured text cannot establish what was sent, including after a hook rewrite. + let mut missing_delivered_context = false; let delivered_candidates = root_history .annotated_items() .iter() @@ -66,17 +67,14 @@ impl RootConversationSource for CapturedRootConversation { else { return None; }; - let text = envelope - .metadata - .as_ref()? - .delivered_assistant_message - .as_deref()?; - Some(RootDeliveredMessage { call_id, text }) + let (text, incomplete) = envelope.metadata.as_ref()?.confirmed_delivery()?; + missing_delivered_context |= incomplete; + (!incomplete).then_some(RootDeliveredMessage { call_id, text }) }) .collect::>(); - let retained_context = root_history.retained_context(); + let retained_context = budgeting.retained_assistant_view(root_history.retained_context()); let reconciled = ReconciledRetainedContext::new( - Some(retained_context), + Some(&retained_context), root_history .annotated_items() .iter() @@ -242,7 +240,8 @@ impl RootConversationSource for CapturedRootConversation { handoff_boundaries: self.handoff_boundaries.clone(), latest_user_turn_id: reconciled.latest_user_turn_id.clone(), missing_root_instructions: original_missing_root_instructions, - missing_assistant_context: retained_context.has_omitted_assistant_messages(), + missing_assistant_context: missing_delivered_context + || retained_context.has_omitted_assistant_messages(), missing_verified_answers: !retained_context.verified_answers_complete(), }; codex_guardian_context::prepare_root_context( diff --git a/codex-rs/core/src/context_manager/history.rs b/codex-rs/core/src/context_manager/history.rs index 01d72d0166..81796e51a2 100644 --- a/codex-rs/core/src/context_manager/history.rs +++ b/codex-rs/core/src/context_manager/history.rs @@ -44,6 +44,7 @@ use codex_guardian_context::SectionHistory; use codex_guardian_context::TranscriptHistory; use codex_history::CodexHarnessMetadata; use codex_history::GuardianHistoryCheckpoint; +use codex_history::MessageRetention; use codex_history::ResponseItemEnvelope; use codex_history::RetainedContext; use codex_history::RetainedContextEntry; @@ -312,7 +313,10 @@ impl SharedConversationHistory { #[cfg(test)] impl Default for ContextManager { fn default() -> Self { - Self::new(codex_thread_context_ids_test_support::thread_context_ids()) + Self::new( + codex_thread_context_ids_test_support::thread_context_ids(), + /*retention*/ None, + ) } } @@ -321,7 +325,7 @@ impl ContextManager { &self.context_ids } - pub(crate) fn new(context_ids: ThreadContextIds) -> Self { + pub(crate) fn new(context_ids: ThreadContextIds, retention: Option) -> Self { Self { context_ids, sampling: Default::default(), @@ -329,7 +333,7 @@ impl ContextManager { items: Arc::new(Vec::new()), review_history: None, review_budgeting: ContextBudgeting::Fixed, - retained_context: Arc::default(), + retained_context: Arc::new(RetainedContext::new(retention)), rejected_audio_file_ids: Arc::default(), file_audio_durations: Arc::default(), guardian_review_mode: GuardianContextMode::ThreadOwned, @@ -371,6 +375,7 @@ impl ContextManager { reuse_parent_compaction: bool, budgeting: ContextBudgeting, context_ids: ThreadContextIds, + retention: Option, ) -> Self { let independent = !reuse_parent_compaction; Self { @@ -385,7 +390,7 @@ impl ContextManager { review_budgeting: budgeting, review_history: independent .then(|| TranscriptHistory::new(/*generation*/ 0, budgeting)), - ..Self::new(context_ids) + ..Self::new(context_ids, retention) } } @@ -478,6 +483,12 @@ impl ContextManager { }) .collect::>() .join("\n"); + if source_role == "assistant" + && message.complete + && text == message.text + { + return true; + } guardian_truncate_text(&text, GUARDIAN_MAX_ROOT_MESSAGE_TOKENS).0 == message.text }) @@ -637,6 +648,18 @@ impl ContextManager { ) { for envelope in items { self.sampling.record(envelope); + if self + .retained_context + .elastic_assistant_record_bytes() + .is_some() + && let Some((message, _)) = + self.retained_direct_delivery(&envelope.item, envelope.metadata.as_ref()) + && !message.complete + { + let metadata = envelope.metadata.get_or_insert_default(); + metadata.delivered_assistant_message = None; + metadata.delivered_assistant_message_incomplete = true; + } if let Some(source) = self.record_item_with_metadata(&envelope.item, envelope.metadata.as_ref(), policy) { @@ -940,7 +963,7 @@ impl ContextManager { self.restored_through_sequence = self .restored_through_sequence .min(self.sampling.last_sequence); - self.retained_context = Arc::default(); + self.retained_context = Arc::new(self.retained_context.empty_with_same_limits()); self.user_message_revision = self.user_message_revision.saturating_add(1); if let Some(review_history) = &mut self.review_history { review_history.reset( diff --git a/codex-rs/core/src/context_manager/history_tests.rs b/codex-rs/core/src/context_manager/history_tests.rs index aaab16c1ed..ccc4dcd750 100644 --- a/codex-rs/core/src/context_manager/history_tests.rs +++ b/codex-rs/core/src/context_manager/history_tests.rs @@ -162,6 +162,7 @@ fn root_history() -> ContextManager { /*reuse_parent_compaction*/ true, codex_guardian_context::ContextBudgeting::Fixed, thread_context_ids(), + /*retention*/ None, ) } @@ -596,6 +597,7 @@ fn guardian_checkpoint_applies_additional_context_policy_after_resume(include: b features.enabled(Feature::GuardianReuseParentCompaction), codex_guardian_context::ContextBudgeting::Fixed, thread_context_ids(), + /*retention*/ None, ); let additional_context: ResponseItem = crate::context::AdditionalContextToolOutput::new( "browser_info", @@ -640,6 +642,7 @@ fn guardian_checkpoint_applies_additional_context_policy_after_resume(include: b features.enabled(Feature::GuardianReuseParentCompaction), codex_guardian_context::ContextBudgeting::Fixed, thread_context_ids(), + /*retention*/ None, ); resumed.replace_annotated(compacted); resumed.restore_review_context( @@ -2205,6 +2208,90 @@ fn session_end_input_does_not_consume_a_rollback_turn() { } } +#[test] +fn oversized_direct_delivery_retains_its_incomplete_marker_across_replay() { + let call_id = "question"; + let mut call: ResponseItem = serde_json::from_value(serde_json::json!({ + "type": "function_call", "call_id": call_id, + "namespace": "mcp__codex_apps", "name": "user_messaging_send_message", + "arguments": "{}", + })) + .unwrap(); + call.set_id(Some(ResponseItemId::with_suffix("call", "question"))); + call.set_turn_id_if_missing("turn"); + const RECORD_BYTES: usize = 512; + let original = "x".repeat(RECORD_BYTES); + let expected = codex_history::RetainedUserMessage { + turn_id: "turn".to_owned(), + message_id: call.id().map(|id| id.as_str().to_owned()), + text: String::new(), + complete: false, + origin: codex_history::UserInputOrigin::User, + phase: None, + }; + let retention = Some(MessageRetention { + thread_id: codex_protocol::ThreadId::new(), + policy: serde_json::from_value(serde_json::json!({"assistant_record_bytes": RECORD_BYTES})) + .unwrap(), + }); + let new_history = || ContextManager::new(thread_context_ids(), retention); + let mut live = new_history(); + let mut items = [ + ResponseItemEnvelope { + item: call, + metadata: Some(CodexHarnessMetadata { + user_input_order: Some(0), + ..Default::default() + }), + }, + ResponseItemEnvelope { + item: serde_json::from_value(serde_json::json!({ + "type": "function_call_output", "call_id": call_id, "output": "Sent.", + })) + .unwrap(), + metadata: Some(CodexHarnessMetadata { + delivered_assistant_message: Some(original), + ..Default::default() + }), + }, + ]; + const TEST_HISTORY_TOKENS: usize = 10_000; + live.record_annotated_items(&mut items, TruncationPolicy::Tokens(TEST_HISTORY_TOKENS)); + let saved = serde_json::to_vec(&items.map(codex_history::RolloutItem::ResponseItem)).unwrap(); + let mut replayed = new_history(); + let replay_items = serde_json::from_slice::>(&saved) + .unwrap() + .into_iter() + .map(|item| match item { + codex_history::RolloutItem::ResponseItem(envelope) => envelope, + _ => panic!("expected a saved response item"), + }) + .collect(); + replayed.replace_annotated(replay_items); + replayed.restore_retained_context(/*checkpoint*/ None); + for history in [live, replayed] { + let metadata = history.annotated_items()[1].metadata.as_ref().unwrap(); + assert_eq!( + ( + metadata.delivered_assistant_message.as_deref(), + metadata.delivered_assistant_message_incomplete + ), + (None, true) + ); + assert!(history.retained_context().has_omitted_assistant_messages()); + let mut entries = history.retained_context().ordered_entries(); + let Some((order, codex_history::RetainedContextEntry::AssistantMessage(message))) = + entries.next() + else { + panic!("missing confirmed delivery"); + }; + assert_eq!( + (order, message), + (codex_history::RetainedContextOrder::Local(0), &expected) + ); + } +} + #[test] fn rollback_removes_assistant_sources_recorded_ahead_of_queued_input() { let mut history = root_history(); diff --git a/codex-rs/core/src/context_manager/history_user_authorization.rs b/codex-rs/core/src/context_manager/history_user_authorization.rs index 40d18c3ba2..91406ee4e7 100644 --- a/codex-rs/core/src/context_manager/history_user_authorization.rs +++ b/codex-rs/core/src/context_manager/history_user_authorization.rs @@ -20,6 +20,7 @@ use codex_history::RetainedUserMessage; use codex_protocol::items::TurnItem; use codex_protocol::models::ContentItem; use codex_protocol::models::ResponseItem; +use codex_utils_string::serialized_json_bytes; /// Checkpoint items may have been shortened while preserving their original metadata. pub(super) enum RetainedMessageSource { @@ -83,7 +84,8 @@ impl ContextManager { envelope .metadata .as_ref() - .is_some_and(|metadata| metadata.delivered_assistant_message.is_some()) + .and_then(CodexHarnessMetadata::confirmed_delivery) + .is_some() }) { let _ = self.record_retained_message( &envelope.item, @@ -112,38 +114,55 @@ impl ContextManager { } } + pub(super) fn retained_direct_delivery( + &self, + item: &ResponseItem, + metadata: Option<&CodexHarnessMetadata>, + ) -> Option<(RetainedUserMessage, RetainedInputSource)> { + let ResponseItem::FunctionCallOutput { + call_id: Some(call_id), + .. + } = item + else { + return None; + }; + let (text, incomplete) = metadata?.confirmed_delivery()?; + let call = self.items.iter().rev().find(|envelope| { + matches!(&envelope.item, ResponseItem::FunctionCall { call_id: id, .. } if id == call_id) + })?; + let source = RetainedInputSource::from(call.metadata.as_ref()); + if source == RetainedInputSource::Inherited && !self.retain_inherited_user_messages { + return None; + } + // The host captured the confirmed text before post-tool hooks. Use the + // original call's position even when its output is delayed or aborted. + let mut message = RetainedUserMessage { + phase: None, + origin: codex_history::UserInputOrigin::User, + turn_id: call.item.turn_id().unwrap_or_default().to_owned(), + message_id: call.item.id().map(|id| id.as_str().to_owned()), + text: text.to_owned(), + complete: !incomplete, + }; + if message.complete + && let Some(limit) = self.retained_context.elastic_assistant_record_bytes() + && !serialized_json_bytes(&message).is_ok_and(|bytes| bytes <= limit) + { + message.text = String::new(); + message.complete = false; + } + Some((message, source)) + } + pub(super) fn record_retained_message( &mut self, item: &ResponseItem, metadata: Option<&CodexHarnessMetadata>, source: RetainedMessageSource, ) -> Option { - if let Some(text) = - metadata.and_then(|metadata| metadata.delivered_assistant_message.as_ref()) - && let ResponseItem::FunctionCallOutput { - call_id: Some(call_id), - .. - } = item - { - let call = self.items.iter().rev().find(|envelope| { - matches!(&envelope.item, ResponseItem::FunctionCall { call_id: id, .. } if id == call_id) - })?; - let source = RetainedInputSource::from(call.metadata.as_ref()); - if source == RetainedInputSource::Inherited && !self.retain_inherited_user_messages { - return None; - } - // The host captured this bounded text before post-tool hooks. The output - // may be rejected, aborted, or truncated; retain the confirmed text at - // the original call's position, not at its later completion position. + if let Some((message, source)) = self.retained_direct_delivery(item, metadata) { Arc::make_mut(&mut self.retained_context).record_assistant_message( - RetainedUserMessage { - phase: None, - origin: codex_history::UserInputOrigin::User, - turn_id: call.item.turn_id().unwrap_or_default().to_owned(), - message_id: call.item.id().map(|id| id.as_str().to_owned()), - text: text.clone(), - complete: true, - }, + message, source, &self.context_ids, ); @@ -181,6 +200,8 @@ impl ContextManager { complete &= metadata .and_then(|metadata| metadata.retained_source.as_ref()) .is_none_or(|source| source.complete); + let retain_assistant_original = + is_assistant && self.retained_context.retains_original_assistant_messages(); let text = content .iter() .filter_map(|content| match content { @@ -194,11 +215,15 @@ impl ContextManager { }) .collect::>() .join("\n"); - // Keep the same bounded text that child reviewers receive before - // compaction, instead of letting storage discard a large source. - // Local instruction sections still omit incomplete originals whole. - let (text, truncated) = guardian_truncate_text(&text, GUARDIAN_MAX_ROOT_MESSAGE_TOKENS); - complete &= !truncated; + let text = if retain_assistant_original { + // The recorder applies the configured byte limit to the source text. + text + } else { + let (text, truncated) = + guardian_truncate_text(&text, GUARDIAN_MAX_ROOT_MESSAGE_TOKENS); + complete &= !truncated; + text + }; let message = RetainedUserMessage { phase: phase.clone(), origin: codex_history::UserInputOrigin::from_message(item), diff --git a/codex-rs/core/src/guardian/prompt.rs b/codex-rs/core/src/guardian/prompt.rs index ef82a5126f..5735a6bd81 100644 --- a/codex-rs/core/src/guardian/prompt.rs +++ b/codex-rs/core/src/guardian/prompt.rs @@ -111,8 +111,15 @@ pub(super) async fn collect_guardian_prompt_items_with_parent_turn( .get_guardian_package(session.thread_id) .await .and_then(|snapshot| snapshot.request_candidates); - let trusted_user_inputs = history + let budgeting = parent_context.map_or_else( + || config.guardian_context_budgeting(), + |context| context.turn().config.guardian_context_budgeting(), + ); + let retained_context = history .retained_context() + .map(|context| budgeting.retained_assistant_view(context)); + let trusted_user_inputs = retained_context + .as_deref() .map(codex_guardian_context::collect_verified_answer_candidates) .unwrap_or_default(); let planned_action = codex_guardian_reviewer::build_guardian_planned_action( @@ -162,6 +169,7 @@ pub(super) async fn collect_guardian_prompt_items_with_parent_turn( target: profile.target, history: &GuardianReviewHistory { history, + retained_context: retained_context.as_deref(), use_parent_checkpoint, }, transcript: &profile.transcript, @@ -211,12 +219,13 @@ pub(super) fn collect_guardian_context( struct GuardianReviewHistory<'a> { history: &'a dyn ConversationHistorySnapshot, + retained_context: Option<&'a codex_history::RetainedContext>, use_parent_checkpoint: bool, } impl SectionHistory for GuardianReviewHistory<'_> { fn retained_context(&self) -> Option<&codex_history::RetainedContext> { - self.history.retained_context() + self.retained_context } fn items(&self) -> Box + Send + '_> { diff --git a/codex-rs/core/src/session/file_audio_tests.rs b/codex-rs/core/src/session/file_audio_tests.rs index 2b56861961..2092b7687c 100644 --- a/codex-rs/core/src/session/file_audio_tests.rs +++ b/codex-rs/core/src/session/file_audio_tests.rs @@ -12,7 +12,7 @@ use pretty_assertions::assert_eq; #[test] fn history_sums_measured_and_unknown_file_audio() { - let mut history = ContextManager::new(thread_context_ids()); + let mut history = ContextManager::new(thread_context_ids(), /*retention*/ None); let item = ResponseInputItem::Message { role: "user".to_string(), content: ["short", "unknown"] @@ -119,7 +119,7 @@ async fn producer_bounded_audio_keeps_the_same_parts_as_inline_history() { ) .unwrap(); codex_utils_audio::prepare_response_items(std::slice::from_mut(&mut inline)); - let mut history = ContextManager::new(thread_context_ids()); + let mut history = ContextManager::new(thread_context_ids(), /*retention*/ None); history.record_items([&inline], policy); let expected = serde_json::to_value(history.raw_items().last().unwrap()).unwrap()["output"].take(); diff --git a/codex-rs/core/src/session/guardian_checkpoint_tests.rs b/codex-rs/core/src/session/guardian_checkpoint_tests.rs index ac0243bb40..799fc1f7f6 100644 --- a/codex-rs/core/src/session/guardian_checkpoint_tests.rs +++ b/codex-rs/core/src/session/guardian_checkpoint_tests.rs @@ -41,6 +41,7 @@ async fn guardian_checkpoint_preserves_live_context_without_storage( /*reuse_parent_compaction*/ true, codex_guardian_context::ContextBudgeting::Fixed, thread_context_ids(), + /*retention*/ None, ); state .history @@ -115,6 +116,7 @@ async fn guardian_checkpoint_preserves_live_context_without_storage( /*reuse_parent_compaction*/ true, codex_guardian_context::ContextBudgeting::Fixed, thread_context_ids(), + /*retention*/ None, ); fork.record_initial_history(InitialHistory::Forked(items)) .await; diff --git a/codex-rs/core/src/session/retained_context.rs b/codex-rs/core/src/session/retained_context.rs index eb344f50e6..f233f9a68f 100644 --- a/codex-rs/core/src/session/retained_context.rs +++ b/codex-rs/core/src/session/retained_context.rs @@ -196,7 +196,7 @@ impl Session { /// Starts recording confirmed delivery synchronously while the tool's admission is held. pub(crate) fn record_delivered_assistant_message( self: &Arc, - message: RetainedUserMessage, + mut message: RetainedUserMessage, ) -> (JoinHandle<()>, watch::Receiver<()>) { let session = Arc::clone(self); let persistence_session = Arc::clone(self); @@ -208,6 +208,18 @@ impl Session { .await .unwrap_or_else(|_| unreachable!("communication boundary remains open")); let mut state = session.state.lock().await; + if !state + .history + .retained_context() + .retains_original_assistant_messages() + { + let (text, truncated) = crate::guardian::guardian_truncate_text( + &message.text, + crate::guardian::GUARDIAN_MAX_ROOT_MESSAGE_TOKENS, + ); + message.text = text; + message.complete &= !truncated; + } let mut event = RetainedContextEvent::DeliveredAssistantMessage { message, retained_source: None, diff --git a/codex-rs/core/src/session/rollout_reconstruction.rs b/codex-rs/core/src/session/rollout_reconstruction.rs index bf282d1d23..b6e131fb7e 100644 --- a/codex-rs/core/src/session/rollout_reconstruction.rs +++ b/codex-rs/core/src/session/rollout_reconstruction.rs @@ -193,6 +193,16 @@ impl Session { turn_context: &TurnContext, rollout_items: &[RolloutItem], ) -> RolloutReconstruction { + let policy = self + .state + .lock() + .await + .session_configuration + .guardian_retention; + let retention = policy.map(|policy| codex_history::MessageRetention { + thread_id: self.thread_id(), + policy, + }); ContextManager::reconstruct_rollout( rollout_items, turn_context.history_mode, @@ -203,6 +213,7 @@ impl Session { turn_context.config.guardian_reuses_parent_compaction(), turn_context.config.guardian_context_budgeting(), ids, + retention, ) }, turn_context.model_info().truncation_policy.into(), diff --git a/codex-rs/core/src/session/rollout_reconstruction_tests.rs b/codex-rs/core/src/session/rollout_reconstruction_tests.rs index a8aaa7b520..cea3dfdc85 100644 --- a/codex-rs/core/src/session/rollout_reconstruction_tests.rs +++ b/codex-rs/core/src/session/rollout_reconstruction_tests.rs @@ -132,6 +132,7 @@ async fn sender_context_follows_its_delivery_through_checkpoint_and_rollback() { /*reuse_parent_compaction*/ true, codex_guardian_context::ContextBudgeting::Fixed, thread_context_ids(), + /*retention*/ None, ); let mut items = Vec::new(); let mut snapshots = Vec::new(); diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index d1d3fa8a17..ed2c80da86 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -1298,6 +1298,9 @@ impl Session { error!("failed to initialize thread persistence: {e:#}"); e })?; + let retention = session_configuration + .guardian_retention + .map(|policy| codex_history::MessageRetention { thread_id, policy }); // Keep the large initialization future out of callers' stack frames. let session_result: anyhow::Result> = Box::pin(async { if let InitialHistory::Resumed(resumed) = &mut initial_history { @@ -1618,6 +1621,7 @@ impl Session { config.guardian_reuses_parent_compaction(), config.guardian_context_budgeting(), context_ids.clone(), + retention, ), ); if matches!(initial_history, InitialHistory::Resumed(_)) { diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 123b0b0ceb..1bc4dfe910 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -6636,6 +6636,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) { config.guardian_reuses_parent_compaction(), config.guardian_context_budgeting(), context_ids.clone(), + /*retention*/ None, ); let (environment_manager, resolved_environments) = resolved_environments_for_configuration(&session_configuration, &default_environments) @@ -9001,6 +9002,7 @@ where config.guardian_reuses_parent_compaction(), config.guardian_context_budgeting(), context_ids.clone(), + /*retention*/ None, ); let (environment_manager, resolved_turn_environments) = resolved_environments_for_configuration(&session_configuration, &default_environments) diff --git a/codex-rs/core/src/tools/registry.rs b/codex-rs/core/src/tools/registry.rs index 803a9ee8dc..a491c37e8d 100644 --- a/codex-rs/core/src/tools/registry.rs +++ b/codex-rs/core/src/tools/registry.rs @@ -1201,7 +1201,11 @@ async fn handle_any_tool( result: output, post_tool_use_payload, }; - super::user_messaging::capture_delivery(&result, call_state); + super::user_messaging::capture_delivery( + &result, + call_state, + invocation.turn.config.guardian_context_budgeting(), + ); if result.result.contains_external_context() && invocation.turn.config.memories.disable_on_external_context { diff --git a/codex-rs/core/src/tools/user_messaging.rs b/codex-rs/core/src/tools/user_messaging.rs index 3d748b6abe..a11d6eb085 100644 --- a/codex-rs/core/src/tools/user_messaging.rs +++ b/codex-rs/core/src/tools/user_messaging.rs @@ -8,6 +8,7 @@ use crate::session::session::Session; use crate::tools::context::ToolCallSource; use crate::tools::context::ToolCallState; use crate::tools::registry::AnyToolResult; +use codex_guardian_context::ContextBudgeting; use codex_history::RetainedUserMessage; use codex_mcp::PreparedMcpCall; use codex_protocol::mcp::CallToolResult; @@ -33,11 +34,15 @@ pub(super) fn admit_code_mode_send( } /// Captures confirmed delivery before any further await, including post-tool hooks. -pub(super) fn capture_delivery(result: &AnyToolResult, call_state: Option<&ToolCallState>) { +pub(super) fn capture_delivery( + result: &AnyToolResult, + call_state: Option<&ToolCallState>, + budgeting: ContextBudgeting, +) { if let Some(call_state) = call_state - && let Some(text) = result.delivered_assistant_message() + && let Some(delivery) = result.delivered_assistant_message(budgeting) { - let _ = call_state.delivered_assistant_message.set(text); + let _ = call_state.delivered_assistant_message.set(delivery); } } @@ -70,20 +75,19 @@ pub(crate) fn record_confirmed_code_mode_send( if text.trim().is_empty() { return; } - let (text, truncated) = guardian_truncate_text(text, GUARDIAN_MAX_ROOT_MESSAGE_TOKENS); let message = RetainedUserMessage { origin: codex_history::UserInputOrigin::User, turn_id: turn_id.to_owned(), message_id: Some(call_id.to_owned()), - text, - complete: !truncated, + text: text.to_owned(), + complete: true, phase: None, }; let _ = session.record_delivered_assistant_message(message); } impl AnyToolResult { - fn delivered_assistant_message(&self) -> Option { + fn delivered_assistant_message(&self, budgeting: ContextBudgeting) -> Option { if !self.result.success_for_logging() { return None; } @@ -103,7 +107,13 @@ impl AnyToolResult { if text.trim().is_empty() { return None; } - Some(guardian_truncate_text(text, GUARDIAN_MAX_ROOT_MESSAGE_TOKENS).0) + Some(match budgeting { + ContextBudgeting::Fixed => { + guardian_truncate_text(text, GUARDIAN_MAX_ROOT_MESSAGE_TOKENS).0 + } + // History can account for the complete record once it has the call's IDs. + ContextBudgeting::Elastic => text.to_owned(), + }) } } diff --git a/codex-rs/core/src/tools/user_messaging_tests.rs b/codex-rs/core/src/tools/user_messaging_tests.rs index 70b927d329..3e935f0840 100644 --- a/codex-rs/core/src/tools/user_messaging_tests.rs +++ b/codex-rs/core/src/tools/user_messaging_tests.rs @@ -5,6 +5,7 @@ use crate::tools::hook_names::HookToolName; use crate::tools::registry::AnyToolResult; use crate::tools::registry::PostToolUsePayload; use crate::tools::user_messaging::capture_delivery; +use codex_guardian_context::ContextBudgeting; use pretty_assertions::assert_eq; use serde_json::Value; use serde_json::json; @@ -16,24 +17,40 @@ use test_case::test_case; #[test_case("mcp__codex_apps__user_messaging__send_message", json!({"text": " "}), true; "empty_text")] fn undelivered_or_unrelated_messages_have_no_evidence(name: &str, input: Value, success: bool) { let state = ToolCallState::default(); - capture_delivery(&messaging_result(name, input, success), Some(&state)); + capture_delivery( + &messaging_result(name, input, success), + Some(&state), + ContextBudgeting::Fixed, + ); assert_eq!(state.delivered_assistant_message.get(), None); } -#[test] -fn capture_keeps_the_first_confirmed_rewritten_message() { +const LONG_MESSAGE_BYTES: usize = 4_000; + +#[test_case(ContextBudgeting::Fixed; "fixed")] +#[test_case(ContextBudgeting::Elastic; "elastic")] +fn capture_keeps_the_first_confirmed_rewritten_message(budgeting: ContextBudgeting) { let state = ToolCallState::default(); let name = "mcp__codex_apps__user_message__send_message"; - for text in ["Staging only?", "Replace the question?"] { + let rewritten = "x".repeat(LONG_MESSAGE_BYTES); + for text in [rewritten.as_str(), "Replace the question?"] { capture_delivery( &messaging_result(name, json!({"text": text}), /*success*/ true), Some(&state), + budgeting, ); } - assert_eq!( - state.delivered_assistant_message.get().map(String::as_str), - Some("Staging only?") - ); + let expected = match budgeting { + ContextBudgeting::Fixed => { + crate::guardian::guardian_truncate_text( + &rewritten, + crate::guardian::GUARDIAN_MAX_ROOT_MESSAGE_TOKENS, + ) + .0 + } + ContextBudgeting::Elastic => rewritten, + }; + assert_eq!(state.delivered_assistant_message.get(), Some(&expected)); } fn messaging_result(name: &str, input: Value, success: bool) -> AnyToolResult { diff --git a/codex-rs/core/tests/suite/guardian_history.rs b/codex-rs/core/tests/suite/guardian_history.rs index 1f724d1ccc..1266434456 100644 --- a/codex-rs/core/tests/suite/guardian_history.rs +++ b/codex-rs/core/tests/suite/guardian_history.rs @@ -1,5 +1,6 @@ //! Exercises retained review history through compaction, resume, fork, and eviction. +use anyhow::Context; use anyhow::Result; use base64::Engine; use base64::engine::general_purpose::STANDARD as BASE64_STANDARD; @@ -755,8 +756,10 @@ async fn guardian_storage_policy_applies_before_capture_and_resume( budgeting: codex_guardian_context::ContextBudgeting, ) -> Result<()> { use codex_guardian_context as guardian_context; + use codex_history::RetainedContextEntry::AssistantMessage; const HISTORY_ENTRIES: usize = 140; const FIXED_ENTRY_LIMIT: usize = 128; + const FIXED_ASSISTANT_LIMIT: usize = 8; const ENTRY_TOKENS: usize = 900; skip_if_no_network!(Ok(())); let server = start_mock_server().await; @@ -813,6 +816,18 @@ async fn guardian_storage_policy_applies_before_capture_and_resume( guardian_context::ContextBudgeting::Elastic => originals.as_slice(), }; assert_eq!(retained, expected); + let assistant_count = history + .retained_context() + .context("retained context")? + .ordered_entries() + .filter(|(_, entry)| matches!(entry, AssistantMessage(_))) + .count(); + let expected_count = if budgeting == guardian_context::ContextBudgeting::Elastic { + HISTORY_ENTRIES + } else { + FIXED_ASSISTANT_LIMIT + }; + assert_eq!(assistant_count, expected_count); } test.codex.shutdown_and_wait().await?; Ok(()) diff --git a/codex-rs/core/tests/suite/scenarios_guardian_sender_context.rs b/codex-rs/core/tests/suite/scenarios_guardian_sender_context.rs index c6e0a31a78..e051f3d1e0 100644 --- a/codex-rs/core/tests/suite/scenarios_guardian_sender_context.rs +++ b/codex-rs/core/tests/suite/scenarios_guardian_sender_context.rs @@ -40,7 +40,11 @@ async fn cross_host_sender_context(history_mode: ThreadHistoryMode) -> Result<() .with_thread_store(store.clone()) .with_history_mode(history_mode) .with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()) - .with_config(super::configure_scenario_catalog) + .with_config(|config| { + super::configure_scenario_catalog(config); + config.guardian_sync_elastic_budget = + Some(core_test_support::guardian::elastic_budget_config()); + }) .build_with_auto_env(&server) .await?; // Separate managers share durable storage, as cloud workers do. Neither loads the other. @@ -98,6 +102,15 @@ async fn cross_host_sender_context(history_mode: ThreadHistoryMode) -> Result<() ThreadRolledBackEvent { num_turns: 1 }, ))]) .await?; + const FIXED_ASSISTANT_LIMIT: usize = 8; + let later = (0..FIXED_ASSISTANT_LIMIT) + .map(|index| { + serde_json::from_value( + ev_assistant_message(&format!("later-{index}"), "Waiting.")["item"].clone(), + ) + }) + .collect::, _>>()?; + sender.codex.inject_response_items(later).await?; sender.codex.flush_rollout().await?; let expected = [ diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/classification.rs b/codex-rs/ext/guardian-v2/src/async_scorer/classification.rs index 0a946019f0..af6e66fbc3 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/classification.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/classification.rs @@ -26,6 +26,7 @@ use codex_extension_api::ExtensionMetrics; use codex_extension_api::ExtensionWarning; use codex_extension_api::McpToolContext; use codex_extension_api::ResponseItem; +use codex_guardian_context::ContextBudgeting; use codex_guardian_context::ContextTarget; use codex_guardian_context::PlannedAction; use codex_guardian_context::PlannedActionKind; @@ -84,7 +85,6 @@ pub(super) struct Classification { pub(super) mcp_tool: Option, pub(super) planned_action: String, pub(super) sync_reviews: Vec>, - pub(super) trusted_user_inputs: Vec, pub(super) authorization_version: GuardianAuthorizationVersion, pub(super) history: Arc, pub(super) local_trusted_skill_paths: Vec, @@ -141,7 +141,6 @@ impl Classification { mcp_tool, planned_action, sync_reviews, - trusted_user_inputs, authorization_version, history, local_trusted_skill_paths, @@ -251,6 +250,18 @@ impl Classification { .collect::>(); let transcript = PreviousReviews::try_from_fragments(review_fragments).and_then(|reviews| { + let budgeting = if guardian_config.transcript.elastic.is_some() { + ContextBudgeting::Elastic + } else { + ContextBudgeting::Fixed + }; + let retained = history + .retained_context() + .map(|context| budgeting.retained_assistant_view(context)); + let answers = retained + .as_deref() + .map(codex_guardian_context::collect_verified_answer_candidates) + .unwrap_or_default(); let context_input = ContextInput { target: ContextTarget::Async, history: history.as_ref(), @@ -261,7 +272,7 @@ impl Classification { root_conversation_candidates: root_snapshot .as_ref() .and_then(|snapshot| snapshot.request_candidates.as_ref()), - trusted_user_answers: &trusted_user_inputs, + trusted_user_answers: &answers, planned_action: Some(&action_section), permissions: Some(&score_authorization.permissions), previous_reviews: Some(&reviews), @@ -269,7 +280,9 @@ impl Classification { trusted_skill_paths: &trusted_skill_paths, node_repl_images: Some(&node_repl_images), }; - guardian_config.transcript.collect_context(context_input) + guardian_config + .transcript + .collect_with_retained(context_input, retained.as_deref()) }); let evidence = match transcript { Ok(transcript) => transcript, diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/observation.rs b/codex-rs/ext/guardian-v2/src/async_scorer/observation.rs index e8b2e11a00..e18dd986ee 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/observation.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/observation.rs @@ -446,11 +446,6 @@ impl GuardianV2Extension { let sync_reviews = guardian_evidence.snapshot(); let authorization_version = guardian_evidence.authorization_version(input.conversation_history.as_ref()); - let trusted_user_inputs = input - .conversation_history - .retained_context() - .map(codex_guardian_context::collect_verified_answer_candidates) - .unwrap_or_default(); let history = Arc::clone(&input.conversation_history); let local_trusted_skill_paths = guardian_evidence.trusted_skill_paths(input.turn_id); let node_repl_images = if guardian_config.transcript.include_images { @@ -514,7 +509,6 @@ impl GuardianV2Extension { mcp_tool, planned_action, sync_reviews, - trusted_user_inputs, authorization_version, history, local_trusted_skill_paths, diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/transcript.rs b/codex-rs/ext/guardian-v2/src/async_scorer/transcript.rs index f86cd8122b..ee1cbeb400 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/transcript.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/transcript.rs @@ -26,6 +26,7 @@ use codex_guardian_context::TranscriptSelection; use codex_guardian_context::TrustedTool; use codex_guardian_context::default_registry; use codex_guardian_context::prepare_async_context; +use codex_history::RetainedContext; const DEFAULT_PROFILE: &ContextProfile = &ContextProfile::asynchronous(); pub(crate) const MAX_MESSAGE_ENTRY_TOKENS: usize = @@ -83,9 +84,10 @@ impl Default for TranscriptConfig { } impl TranscriptConfig { - pub(super) fn collect_context( + pub(super) fn collect_with_retained( &self, input: ContextInput<'_>, + retained_context: Option<&RetainedContext>, ) -> Result { let ContextInput { target, @@ -101,7 +103,7 @@ impl TranscriptConfig { node_repl_images, } = input; let history_version = history.review_history_version(); - let history = SnapshotHistory(history); + let history = SnapshotHistory(history, retained_context); let profile = ContextProfile { target: ContextTarget::Async, transcript_format: self.format, @@ -198,11 +200,14 @@ impl CollectedTranscript { } } -struct SnapshotHistory<'a>(&'a dyn ConversationHistorySnapshot); +struct SnapshotHistory<'a>( + &'a dyn ConversationHistorySnapshot, + Option<&'a RetainedContext>, +); impl SectionHistory for SnapshotHistory<'_> { fn retained_context(&self) -> Option<&codex_history::RetainedContext> { - self.0.retained_context() + self.1 } fn items(&self) -> Box + Send + '_> { diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs index 8e5a242f2d..81be5cde50 100644 --- a/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs +++ b/codex-rs/ext/guardian-v2/src/async_scorer/transcript_tests.rs @@ -29,6 +29,14 @@ use super::TranscriptSource; // Existing rendering tests exercise the same fresh-conversation preparation and // delivery filtering as the classifier, without retaining the snapshot formatter. impl super::TranscriptConfig { + pub(in crate::async_scorer) fn collect_context( + &self, + input: ContextInput<'_>, + ) -> Result { + let retained = input.history.retained_context(); + self.collect_with_retained(input, retained) + } + fn build_context( &self, input: ContextInput<'_>, diff --git a/codex-rs/guardian-context/src/budget.rs b/codex-rs/guardian-context/src/budget.rs index 73f87a0427..9a6c6df80f 100644 --- a/codex-rs/guardian-context/src/budget.rs +++ b/codex-rs/guardian-context/src/budget.rs @@ -231,7 +231,7 @@ impl ElasticBudgetConfig { /// complete selected duplicates. Only the headroom between each minimum and /// maximum is scaled to the remaining budget. /// Actual request admission still accounts for history, framing and exact actions. -/// These settings do not change storage bounds or activate elastic allocation. +/// The shared recorder also uses the retained-instructions entry limit. #[derive(Clone, Copy, Debug, Eq, PartialEq, serde::Serialize)] pub struct ElasticSectionLimits { min_total_section_tokens: usize, diff --git a/codex-rs/guardian-context/src/preparation/mod.rs b/codex-rs/guardian-context/src/preparation/mod.rs index ec54ee26d2..87714db1df 100644 --- a/codex-rs/guardian-context/src/preparation/mod.rs +++ b/codex-rs/guardian-context/src/preparation/mod.rs @@ -24,6 +24,7 @@ use crate::composition::FixedImageBudget; use crate::retained_instructions::RetainedInstructionKind; use crate::retained_instructions::USER_OMISSION; use codex_history::ResponseItemEnvelope; +use codex_history::RetainedContext; use codex_protocol::models::ImageDetail; use codex_protocol::models::ImageReference; use codex_protocol::models::ResponseItem; @@ -46,6 +47,17 @@ pub enum ContextBudgeting { Elastic, } +impl ContextBudgeting { + /// Use the retained assistant window for this reviewer. + pub fn retained_assistant_view(self, context: &RetainedContext) -> Cow<'_, RetainedContext> { + if self == Self::Fixed { + context.fixed_assistant_view() + } else { + Cow::Borrowed(context) + } + } +} + #[cfg(test)] #[path = "source_tests.rs"] mod source_tests; diff --git a/codex-rs/guardian-context/src/preparation/root.rs b/codex-rs/guardian-context/src/preparation/root.rs index 6f0f441ab0..45cdeb501d 100644 --- a/codex-rs/guardian-context/src/preparation/root.rs +++ b/codex-rs/guardian-context/src/preparation/root.rs @@ -224,7 +224,12 @@ fn prepare_root_assistant_messages( let text = retained .and_then(|retained| root_retained_assistant(retained.message, budgeting)) .unwrap_or_else(|| match budgeting { - ContextBudgeting::Fixed => crate::truncate_text(&text, MAX_ROOT_MESSAGE_TOKENS), + ContextBudgeting::Fixed => { + let bounded = crate::truncate_text(&text, MAX_ROOT_MESSAGE_TOKENS); + missing_assistant_context |= + retained.is_some() && bounded.len() < text.len(); + bounded + } ContextBudgeting::Elastic => text, }); let message = if order.is_some() { diff --git a/codex-rs/guardian-context/src/retained_instructions.rs b/codex-rs/guardian-context/src/retained_instructions.rs index c3631504d7..ce2e4e69e0 100644 --- a/codex-rs/guardian-context/src/retained_instructions.rs +++ b/codex-rs/guardian-context/src/retained_instructions.rs @@ -346,7 +346,6 @@ impl ComposedContext { let SectionDelivery::UserContent(items) = &mut section.delivery else { continue; }; - // At most sixteen retained originals are checked; no history-sized index is needed. items.retain(|item| { let keep = item.source.as_ref().is_none_or(|source| { !delivered_sources.clone().any(|delivered| { diff --git a/codex-rs/history/src/lib.rs b/codex-rs/history/src/lib.rs index 559fd7a599..b5ea2ea258 100644 --- a/codex-rs/history/src/lib.rs +++ b/codex-rs/history/src/lib.rs @@ -158,6 +158,10 @@ pub struct CodexHarnessMetadata { #[serde(default, skip_serializing_if = "Option::is_none")] pub delivered_assistant_message: Option, + /// A confirmed delivery whose full text was unavailable within the retention limit. + #[serde(default, skip_serializing_if = "std::ops::Not::not")] + pub delivered_assistant_message_incomplete: bool, + /// Whether a response configuration update was created by the Codex harness itself. #[serde(default, skip_serializing_if = "std::ops::Not::not")] pub harness_authored_configuration: bool, @@ -225,6 +229,16 @@ impl std::fmt::Debug for ImageReplaySource { } impl CodexHarnessMetadata { + /// The captured delivery text and whether it is incomplete. + pub fn confirmed_delivery(&self) -> Option<(&str, bool)> { + if self.delivered_assistant_message_incomplete { + return Some(("", true)); + } + self.delivered_assistant_message + .as_deref() + .map(|text| (text, text.is_empty())) + } + /// Shortened messages no longer prove complete instruction or review delivery. pub fn mark_retained_sources_incomplete(&mut self) { self.guardian_review_ids.clear(); @@ -526,6 +540,7 @@ pub use sender_user_messages::SenderUserMessages; pub use reconciled_retained_context::ReconciledRetainedContext; pub use retained_context::AcceptedFileAudio; +pub use retained_context::MessageRetention; pub use retained_context::RetainedContext; pub use retained_context::RetainedContextEntry; pub use retained_context::RetainedContextEvent; diff --git a/codex-rs/history/src/retained_assistant_messages.rs b/codex-rs/history/src/retained_assistant_messages.rs index 91bd1cd7b7..c175d6b444 100644 --- a/codex-rs/history/src/retained_assistant_messages.rs +++ b/codex-rs/history/src/retained_assistant_messages.rs @@ -8,7 +8,6 @@ use super::RetainedInputSource; use super::RetainedSource; use super::RetainedSourceRole; use super::RetainedUserMessage; -use super::bound_family; use codex_thread_context_ids::ThreadContextIds; impl RetainedContext { @@ -37,10 +36,11 @@ impl RetainedContext { /// Returns the captured source for the original envelope, independently of buffer eviction. pub fn record_assistant_message( &mut self, - message: RetainedUserMessage, + mut message: RetainedUserMessage, source: RetainedInputSource, context_ids: &ThreadContextIds, ) -> Option { + message.bound(self.assistant_record_bytes()); self.record_assistant_message_with_revision( message, source, @@ -51,7 +51,7 @@ impl RetainedContext { pub(super) fn record_assistant_message_with_revision( &mut self, - mut message: RetainedUserMessage, + message: RetainedUserMessage, source: RetainedInputSource, context_ids: &ThreadContextIds, revision: Option<&codex_protocol::ResponseItemId>, @@ -61,7 +61,6 @@ impl RetainedContext { // ordering alone does not establish an omission from reviewer context. return None; } - message.bound(); let empty = message.complete && message.text.is_empty(); let inherited = source == RetainedInputSource::Inherited; // A confirmed delivery is a distinct rollout fact even when the bounded live @@ -100,10 +99,7 @@ impl RetainedContext { }; let source = entry.source(RetainedSourceRole::Assistant); self.assistant_messages.push_back(entry); - bound_family( - &mut self.assistant_messages, - &mut self.assistant_messages_incomplete, - ); + self.bound_assistant_family(); source } } diff --git a/codex-rs/history/src/retained_context.rs b/codex-rs/history/src/retained_context.rs index c75f20edc7..c74a70b26c 100644 --- a/codex-rs/history/src/retained_context.rs +++ b/codex-rs/history/src/retained_context.rs @@ -11,7 +11,11 @@ pub use source::RetainedSource; pub use source::RetainedSourceId; pub use source::RetainedSourceRole; +use codex_protocol::ThreadId; +use codex_protocol::protocol::EventMsg; +use codex_protocol::protocol::GuardianRetentionPolicy; use codex_thread_context_ids::ThreadContextIds; +use std::borrow::Cow; use std::collections::BTreeSet; use std::collections::VecDeque; use std::sync::Arc; @@ -22,6 +26,7 @@ use serde::Serialize; use crate::CodexHarnessMetadata; use crate::ResponseItemEnvelope; +use crate::RolloutItem; use crate::SenderUserMessages; const MAX_FAMILY_RECORDS: usize = 8; @@ -185,6 +190,39 @@ pub enum RetainedContextEvent { }, } +/// The recorder policy owned by the thread that produced this history. +#[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize, JsonSchema)] +pub struct MessageRetention { + pub thread_id: ThreadId, + #[serde(flatten)] + pub policy: GuardianRetentionPolicy, +} + +impl MessageRetention { + /// Recover the latest owned settings even when replay begins at a compaction. + pub fn saved(items: &[RolloutItem], thread_id: ThreadId) -> Option { + items.iter().rev().find_map(|item| match item { + RolloutItem::EventMsg(EventMsg::ThreadSettingsApplied(event)) + if event.thread_id == Some(thread_id) => + { + Some( + event + .thread_settings + .guardian_retention + .map(|policy| Self { thread_id, policy }), + ) + } + RolloutItem::Compacted(item) => item + .retained_context + .as_ref()? + .message_retention + .filter(|retention| retention.thread_id == thread_id) + .map(Some), + _ => None, + })? + } +} + /// Bounded snapshot of retained families, persisted with the parent compaction checkpoint. /// Facts live until their instruction boundary is rolled back; compaction does not expire them. #[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize, JsonSchema)] @@ -203,6 +241,8 @@ pub struct RetainedContext { /// Assistant context has a separate budget so it cannot evict user restrictions. #[serde(default)] assistant_messages: VecDeque>, + #[serde(default, skip_serializing_if = "Option::is_none")] + message_retention: Option, /// Observed assistant storage omissions; absent legacy metadata is not evidence of loss. #[serde(default)] assistant_messages_incomplete: bool, @@ -218,21 +258,48 @@ fn missing_message_history() -> bool { } fn bound_family(items: &mut VecDeque>, incomplete: &mut bool) { + bound_family_with_limit(items, incomplete, MAX_FAMILY_RECORDS); +} + +fn bound_family_with_limit( + items: &mut VecDeque>, + incomplete: &mut bool, + max_records: usize, +) { // Queued instructions can be recorded after later-accepted answers. Evict by // acceptance order, not by the order in which persistence happened to finish. items.make_contiguous().sort_by_key(Ordered::key); - while items.len() > MAX_FAMILY_RECORDS - || serde_json::to_vec(items).map_or(true, |bytes| bytes.len() > MAX_FAMILY_BYTES) - { - items.pop_front(); - *incomplete = true; + let count_evicted = items.len().saturating_sub(max_records); + *incomplete |= count_evicted != 0; + items.drain(..count_evicted); + if serde_json::to_vec(items).is_ok_and(|bytes| bytes.len() <= MAX_FAMILY_BYTES) { + return; } + // Count the newest fitting suffix once. Each element uses a separator or + // closing bracket in addition to its JSON bytes, after the opening bracket. + let mut bytes = 1; + let mut keep = 0; + for item in items.iter().rev() { + let Ok(encoded) = serde_json::to_vec(item) else { + break; + }; + bytes += encoded.len() + 1; + if bytes > MAX_FAMILY_BYTES { + break; + } + keep += 1; + } + let evicted = items.len() - keep; + *incomplete |= evicted != 0; + items.drain(..evicted); } impl RetainedUserMessage { - fn bound(&mut self) { - if serde_json::to_vec(self).map_or(true, |bytes| bytes.len() > MAX_RECORD_BYTES) { - self.text.clear(); + fn bound(&mut self, max_record_bytes: usize) { + if self.text.len() > max_record_bytes + || serde_json::to_vec(self).map_or(true, |bytes| bytes.len() > max_record_bytes) + { + self.text = String::new(); self.complete = false; self.turn_id .truncate(self.turn_id.floor_char_boundary(1_024)); @@ -245,7 +312,7 @@ impl RetainedUserMessage { impl RetainedContextEvent { /// Bounds a persisted event before it enters the rollout or the live snapshot. - pub fn bound(&mut self) { + fn bound(&mut self, assistant_record_bytes: usize) { match self { Self::VerifiedAnswer { answer, .. } => { if serde_json::to_vec(answer).map_or(true, |bytes| bytes.len() > MAX_RECORD_BYTES) { @@ -259,7 +326,9 @@ impl RetainedContextEvent { .truncate(answer.call_id.floor_char_boundary(1_024)); } } - Self::DeliveredAssistantMessage { message, .. } => message.bound(), + Self::DeliveredAssistantMessage { message, .. } => { + message.bound(assistant_record_bytes) + } // An oversized audio record is omitted in record(); IDs must never be truncated. Self::AcceptedFileAudio { .. } => {} } @@ -267,6 +336,62 @@ impl RetainedContextEvent { } impl RetainedContext { + /// Initializes a recorder for the policy owning this history. + pub fn new(message_retention: Option) -> Self { + Self { + message_retention, + ..Self::default() + } + } + + /// Whether the recorder admits whole assistant messages using an Elastic entry limit. + pub fn retains_original_assistant_messages(&self) -> bool { + self.message_retention.is_some() + } + + /// The configured Elastic per-record limit, if supplied by the session. + pub fn elastic_assistant_record_bytes(&self) -> Option { + self.message_retention + .and_then(|retention| retention.policy.assistant_record_bytes) + } + + fn assistant_record_bytes(&self) -> usize { + self.elastic_assistant_record_bytes() + .unwrap_or(MAX_RECORD_BYTES) + } + + /// Clears retained evidence while keeping the recording policy. + pub fn empty_with_same_limits(&self) -> Self { + Self::new(self.message_retention) + } + + fn bound_assistant_family(&mut self) { + let max_records = self + .message_retention + .map_or(MAX_FAMILY_RECORDS, |_| usize::MAX); + bound_family_with_limit( + &mut self.assistant_messages, + &mut self.assistant_messages_incomplete, + max_records, + ); + } + + /// Projects the assistant family for consumers using the Fixed retention window. + pub fn fixed_assistant_view(&self) -> Cow<'_, Self> { + if self.assistant_messages.len() <= MAX_FAMILY_RECORDS + && self.assistant_record_bytes() <= MAX_RECORD_BYTES + { + return Cow::Borrowed(self); + } + let mut view = self.clone(); + view.message_retention = None; + for entry in &mut view.assistant_messages { + entry.value.bound(MAX_RECORD_BYTES); + } + view.bound_assistant_family(); + Cow::Owned(view) + } + pub fn accepted_file_audio(&self, model: &str, provider: &str) -> Option<&AcceptedFileAudio> { self.accepted_file_audio .as_deref() @@ -392,7 +517,7 @@ impl RetainedContext { source: RetainedInputSource, context_ids: &ThreadContextIds, ) -> Option { - message.bound(); + message.bound(MAX_RECORD_BYTES); let inherited = source == RetainedInputSource::Inherited; // An unchanged invocation is not a new instruction. Keep the original // acceptance order; compare only the latest version of this automation, @@ -468,7 +593,7 @@ impl RetainedContext { && let Some(text) = message.message_id.as_deref().and_then(&mut excerpt_for_id) { message.text = text; - message.bound(); + message.bound(MAX_RECORD_BYTES); } } bound_family(&mut self.user_messages, &mut self.user_messages_incomplete); @@ -485,7 +610,7 @@ impl RetainedContext { event: &mut RetainedContextEvent, context_ids: &ThreadContextIds, ) -> bool { - event.bound(); + event.bound(self.assistant_record_bytes()); match event { RetainedContextEvent::AcceptedFileAudio { evidence } => { if !evidence.fits_record_budget() @@ -528,10 +653,7 @@ impl RetainedContext { retained_source, } => { if let Some(existing) = self.assistant_messages.iter().find(|entry| { - message.message_id.is_some() - && entry.value.message_id == message.message_id - && entry.value == *message - && !entry.inherited + message.message_id.is_some() && entry.value == *message && !entry.inherited }) { *retained_source = existing.source(RetainedSourceRole::Assistant); return false; @@ -564,10 +686,13 @@ impl RetainedContext { /// A missing checkpoint cannot establish complete historical user instructions. /// Surviving local input metadata also advances the counter when its retained record is missing. pub fn restore(&mut self, checkpoint: Option<&Self>, surviving_items: &[ResponseItemEnvelope]) { + let message_retention = self.message_retention; *self = checkpoint.cloned().unwrap_or_else(|| Self { user_messages_incomplete: true, ..Self::default() }); + self.message_retention = message_retention; + let assistant_record_bytes = self.assistant_record_bytes(); self.accepted_file_audio .take_if(|evidence| !evidence.fits_record_budget()); for entry in &mut self.verified_answers { @@ -575,19 +700,23 @@ impl RetainedContext { answer: entry.value.clone(), acceptance_order: Some(entry.order), }; - event.bound(); + event.bound(assistant_record_bytes); let RetainedContextEvent::VerifiedAnswer { answer, .. } = event else { unreachable!("verified answer constructed above"); }; entry.value = answer; self.next_order = self.next_order.max(entry.order.saturating_add(1)); } - for entry in self + let user = self .user_messages .iter_mut() - .chain(&mut self.assistant_messages) - { - entry.value.bound(); + .map(|entry| (entry, MAX_RECORD_BYTES)); + let assistant = self + .assistant_messages + .iter_mut() + .map(|entry| (entry, assistant_record_bytes)); + for (entry, max_record_bytes) in user.chain(assistant) { + entry.value.bound(max_record_bytes); // Also repair checkpoints written before adoption recorded the answer gap. self.verified_answers_incomplete |= entry.inherited; if !entry.inherited { @@ -618,10 +747,7 @@ impl RetainedContext { &mut self.verified_answers_incomplete, ); bound_family(&mut self.user_messages, &mut self.user_messages_incomplete); - bound_family( - &mut self.assistant_messages, - &mut self.assistant_messages_incomplete, - ); + self.bound_assistant_family(); } /// Keeps legacy answers whose source calls survive when no retained instruction boundary exists. diff --git a/codex-rs/history/src/retained_context_tests.rs b/codex-rs/history/src/retained_context_tests.rs index c66da70194..a4f4b226d2 100644 --- a/codex-rs/history/src/retained_context_tests.rs +++ b/codex-rs/history/src/retained_context_tests.rs @@ -123,6 +123,68 @@ fn retained_evidence_preserves_order_through_recovery_checkpoint_and_rollback() ); } +#[test] +fn assistant_record_limit_applies_on_capture_and_restore() { + const LARGE_RECORD_BYTES: usize = 24_000; + let context_ids = thread_context_ids(); + let thread_id = ThreadId::new(); + let recorder = |assistant_record_bytes| { + RetainedContext::new(Some(MessageRetention { + thread_id, + policy: GuardianRetentionPolicy { + assistant_record_bytes, + }, + })) + }; + let mut elastic = recorder(Some(LARGE_RECORD_BYTES)); + let text = "x".repeat(MAX_RECORD_BYTES); + for index in 0..=MAX_FAMILY_BYTES / text.len() { + let order = elastic.reserve_order(); + elastic.record_assistant_message( + RetainedUserMessage { + turn_id: "turn-1".to_owned(), + message_id: Some(index.to_string()), + text: text.clone(), + complete: true, + origin: crate::UserInputOrigin::User, + phase: None, + }, + RetainedInputSource::Local(Some(order)), + &context_ids, + ); + } + assert_eq!(elastic.assistant_messages[0].value.text, text); + assert!(elastic.has_omitted_assistant_messages()); + + let order = elastic.reserve_order(); + let mut delivery = delivered_message("long-send", &text, order); + assert!(elastic.record_and_capture(&mut delivery, &context_ids)); + let RetainedContextEvent::DeliveredAssistantMessage { message, .. } = delivery else { + unreachable!("recording preserves the event variant"); + }; + assert_eq!((message.text, message.complete), (text, true)); + + let checkpoint = serde_json::from_value(serde_json::json!({ + "type": "compacted", "payload": {"message": "", "retained_context": &elastic} + })) + .unwrap(); + let saved = MessageRetention::saved(&[checkpoint], thread_id); + assert_eq!(saved, elastic.message_retention); + let mut restored = recorder(/*assistant_record_bytes*/ None); + restored.restore(Some(&elastic), &[]); + assert_eq!( + restored.assistant_messages, + elastic.fixed_assistant_view().assistant_messages + ); + let omitted = &restored.assistant_messages[0].value; + assert_eq!((omitted.complete, omitted.text.capacity()), (false, 0)); + let mut restored = recorder(Some(1)); + let order = restored.reserve_order(); + let delivery = delivered_message("confirmed", "Deploy?", order); + assert!(restored.record(&delivery, &context_ids)); + assert!(!restored.record(&delivery, &context_ids)); +} + #[test] fn retained_families_enforce_storage_limits_without_changing_snapshots() { let mut context = RetainedContext::default(); diff --git a/codex-rs/history/src/tests.rs b/codex-rs/history/src/tests.rs index 82e53a0900..94f48b991a 100644 --- a/codex-rs/history/src/tests.rs +++ b/codex-rs/history/src/tests.rs @@ -129,10 +129,15 @@ fn thread_settings_snapshot(disabled_plugin_ids: Vec) -> Result Result<()> { +fn latest_thread_settings_preserve_owned_updates_and_clears() -> Result<()> { let thread_id = ThreadId::new(); let ancestor_id = ThreadId::new(); - let selected = thread_settings_snapshot(vec!["example@marketplace".to_string()])?; + let mut selected = thread_settings_snapshot(vec!["example@marketplace".to_string()])?; + const RECORD_BYTES: usize = 4_096; + let policy = codex_protocol::protocol::GuardianRetentionPolicy { + assistant_record_bytes: Some(RECORD_BYTES), + }; + selected.guardian_retention = Some(policy); let cleared = thread_settings_snapshot(Vec::new())?; let item = |thread_id, thread_settings| { RolloutItem::EventMsg(EventMsg::ThreadSettingsApplied( @@ -154,6 +159,10 @@ fn latest_disabled_plugin_ids_preserves_owned_updates_and_clears() -> Result<()> latest_disabled_plugin_ids(&history, thread_id), Some(selected.disabled_plugin_ids.as_slice()) ); + assert_eq!( + MessageRetention::saved(&history, thread_id), + Some(MessageRetention { thread_id, policy }) + ); history.push(item(Some(thread_id), cleared.clone())); history.extend(foreign_items); @@ -164,6 +173,7 @@ fn latest_disabled_plugin_ids_preserves_owned_updates_and_clears() -> Result<()> latest_disabled_plugin_ids(&history, thread_id), Some(cleared.disabled_plugin_ids.as_slice()) ); + assert_eq!(MessageRetention::saved(&history, thread_id), None); Ok(()) } diff --git a/codex-rs/thread-store/src/local/rollout_migration/rollback_plan.rs b/codex-rs/thread-store/src/local/rollout_migration/rollback_plan.rs index 81d62f47c3..8c3b3a2661 100644 --- a/codex-rs/thread-store/src/local/rollout_migration/rollback_plan.rs +++ b/codex-rs/thread-store/src/local/rollout_migration/rollback_plan.rs @@ -164,6 +164,11 @@ impl RollbackPlanner { RolloutItem::DynamicToolsUpdated { .. } | RolloutItem::SessionMeta(_) => { self.record_boundaries[index] = None } + RolloutItem::EventMsg(EventMsg::ThreadSettingsApplied(event)) + if event.thread_id.is_some() => + { + self.record_boundaries[index] = None; + } RolloutItem::ResponseItem(response) => { if matches!(&response.item, ResponseItem::Message { role, .. } if role == "assistant") || matches!(&response.item, ResponseItem::FunctionCall { .. })