From a0a30c40e8dbcc44af52e2df64dcce64368d4422 Mon Sep 17 00:00:00 2001 From: Vivian Fang Date: Fri, 20 Nov 2026 02:31:53 +0000 Subject: [PATCH] Add thread and child retention policies for injected items (#62654) ## Why The `always` policy ties retention across context windows to inheritance by spawned agents. Callers need to control those behaviors independently. ## What changed - `alwaysInThread` carries items across context windows in the current thread and excludes them from spawned agents, including full-history forks. - `alwaysInChildren` passes items still in the parent's context to spawned agents and leaves each thread's context-window retention to the usual rules. - `always` continues to apply in both scopes, including for items saved by older versions. Retained tool calls and outputs must be adjacent, with the call first and the same retention policy on both items. ## Testing Extend integration coverage for retention across remote compaction, inheritance by spawned agents, and injection through the app server. GitOrigin-RevId: aafede69cfbe149aa52292e6029d248d4bdf6401 --- .../app-server-exports-stable.json.zst | Bin 173044 -> 173101 bytes .../tests/suite/v2/thread_inject_items.rs | 6 ++-- codex-rs/core/src/agent/history.rs | 12 +++++-- codex-rs/core/src/codex_thread.rs | 13 ++++--- codex-rs/core/src/compact.rs | 1 + codex-rs/core/src/compact_remote_history.rs | 9 +++-- codex-rs/core/src/compact_remote_v2.rs | 31 ++++++++++++----- codex-rs/core/src/session/mod.rs | 8 ++--- .../tests/suite/scenarios_compaction_tests.rs | 20 +++++++++-- .../suite/step_settings/agent_spawn_tests.rs | 20 +++++++++++ codex-rs/history/src/lib.rs | 32 ++++++++++++++---- codex-rs/protocol/src/turn_input.rs | 5 +++ 12 files changed, 120 insertions(+), 37 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 4617198971786a82bfb9be5f2589a59b7b1a5a56..e678ee3f35d1d3d9b3ccbca1b3de977c7d968d02 100644 GIT binary patch delta 24155 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 delta 24106 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 = retained_client_items( history.annotated_items(), &history.file_audio_durations, - ResponseItemEnvelope::is_always_retained, + |item| item.child_retention() == Some(true), + /*window_features*/ None, ) .into_values() .collect(); @@ -221,6 +226,7 @@ impl LocalAgentRuntime { // Keep item metadata needed for retention and replay. Checkpoints belong to the child. item.metadata = Some(CodexHarnessMetadata { retain_across_windows: parent_metadata.retain_across_windows, + retain_in_children: parent_metadata.retain_in_children, retained_source: parent_metadata.retained_source, history_truncation_token_limit: parent_metadata.history_truncation_token_limit, image_replay_sources: parent_metadata.image_replay_sources, @@ -234,7 +240,7 @@ impl LocalAgentRuntime { fn keep_forked_rollout_item(item: &RolloutItem, preserve_context_baselines: bool) -> bool { match item { - RolloutItem::ResponseItem(envelope) if envelope.is_always_retained() => true, + RolloutItem::ResponseItem(envelope) if envelope.child_retention() == Some(true) => true, RolloutItem::ResponseItem(envelope) => match &envelope.item { ResponseItem::Message { role, phase, .. } => match role.as_str() { "system" | "developer" | "user" => true, diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs index f53e7cb5e7..0ac99f599c 100644 --- a/codex-rs/core/src/codex_thread.rs +++ b/codex-rs/core/src/codex_thread.rs @@ -1283,22 +1283,27 @@ impl CodexThread { )); } let items: Vec = items.into_iter().map(Into::into).collect(); + for item in &items { + validate_injected_response_item(&item.item)?; + } let mut indexed_items = items.iter().enumerate(); while let Some((index, item)) = indexed_items.next() { - validate_injected_response_item(&item.item)?; - if item.retention != ItemRetention::Always { + if matches!( + item.retention, + ItemRetention::Unspecified | ItemRetention::Default + ) { continue; } let needs_call = crate::tools::output_call_id(&item.item).is_some() && !matches!(&item.item, ResponseItem::ToolSearchOutput { execution, .. } if execution == "server"); if (crate::tools::input_call_id(&item.item).is_some() || needs_call) && !indexed_items.next().is_some_and(|(_, output)| { - output.retention == ItemRetention::Always + output.retention == item.retention && crate::tools::is_matching_tool_output(&item.item, &output.item) }) { return Err(CodexErr::InvalidRequest(format!( - "items[{index}]: retained tool calls and outputs must be adjacent in the same request, call first, with both marked always" + "items[{index}]: retained tool calls and outputs must be adjacent in the same request, call first, with the same retention policy" ))); } } diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rs index 497a8f5fa0..9d00c4ec19 100644 --- a/codex-rs/core/src/compact.rs +++ b/codex-rs/core/src/compact.rs @@ -754,6 +754,7 @@ fn build_compacted_history_with_limit( items, audio_durations, ResponseItemEnvelope::is_always_retained, + /*window_features*/ None, ); if max_tokens > 0 { let mut remaining = max_tokens; diff --git a/codex-rs/core/src/compact_remote_history.rs b/codex-rs/core/src/compact_remote_history.rs index 25321d6464..87ae231bf7 100644 --- a/codex-rs/core/src/compact_remote_history.rs +++ b/codex-rs/core/src/compact_remote_history.rs @@ -53,6 +53,7 @@ impl HistoryItemGroup<'_> { pub(crate) fn newest_history_item_groups( mut items: &[ResponseItemEnvelope], + is_pinned: fn(&ResponseItemEnvelope) -> bool, ) -> impl Iterator> { std::iter::from_fn(move || { let (last, preceding) = items.split_last()?; @@ -64,8 +65,8 @@ pub(crate) fn newest_history_item_groups( // Injection requires explicitly retained exchanges to be adjacent in the request. let (tool_call, rest) = match rest.split_last() { Some((call, rest)) - if source.is_always_retained() - && call.is_always_retained() + if is_pinned(source) + && is_pinned(call) && is_matching_tool_output(&call.item, &source.item) => { (Some(call), rest) @@ -133,7 +134,9 @@ pub(crate) fn trim_function_call_history_to_fit_context_window( } let mut rewritten_items = Vec::new(); let mut retained_len = original_items.len(); - for group in newest_history_item_groups(original_items) { + for group in + newest_history_item_groups(original_items, ResponseItemEnvelope::is_always_retained) + { if i64::try_from(estimated_tokens).unwrap_or(i64::MAX) <= context_window { break; } diff --git a/codex-rs/core/src/compact_remote_v2.rs b/codex-rs/core/src/compact_remote_v2.rs index 7e1cd45d80..01edab2141 100644 --- a/codex-rs/core/src/compact_remote_v2.rs +++ b/codex-rs/core/src/compact_remote_v2.rs @@ -579,6 +579,7 @@ fn build_v2_compacted_history( is_retained_for_remote_compaction_v2(item, features) || pending_sequence.is_some_and(|first| is_retained_pending_mail(item, first)) }, + ResponseItemEnvelope::is_always_retained, RETAINED_MESSAGE_TOKEN_BUDGET, image_budget, audio_durations, @@ -601,14 +602,20 @@ fn build_v2_compacted_history( (retained, retained_image_count) } +/// Select pins for the destination, plus configured client items on a window reset. pub(crate) fn retained_client_items( items: &[ResponseItemEnvelope], audio_durations: &FileAudioDurations, - should_retain: impl Fn(&ResponseItemEnvelope) -> bool, + is_pinned: fn(&ResponseItemEnvelope) -> bool, + window_features: Option<&Features>, ) -> BTreeMap { select_retained_items( items, - should_retain, + |item| { + is_pinned(item) + || window_features.is_some_and(|features| should_retain_client_item(item, features)) + }, + is_pinned, RETAINED_MESSAGE_TOKEN_BUDGET, RetainedImageBudget::Disabled, audio_durations, @@ -716,22 +723,30 @@ fn truncate_retained_messages( image_budget: RetainedImageBudget, audio_durations: &FileAudioDurations, ) -> Vec { - select_retained_items(&items, |_| true, max_tokens, image_budget, audio_durations) - .into_values() - .collect() + select_retained_items( + &items, + |_| true, + ResponseItemEnvelope::is_always_retained, + max_tokens, + image_budget, + audio_durations, + ) + .into_values() + .collect() } /// Select newest first, then return the items at their original positions. fn select_retained_items( items: &[ResponseItemEnvelope], should_retain: impl Fn(&ResponseItemEnvelope) -> bool, + is_pinned: fn(&ResponseItemEnvelope) -> bool, max_tokens: usize, image_budget: RetainedImageBudget, audio_durations: &FileAudioDurations, ) -> BTreeMap { let mut remaining = max_tokens; let mut selected = BTreeMap::new(); - for group in newest_history_item_groups(items) { + for group in newest_history_item_groups(items, is_pinned) { if remaining == 0 { break; } @@ -740,7 +755,7 @@ fn select_retained_items( } let charge_full_item = - group.source.is_always_retained() || is_client_authored_developer_message(group.source); + is_pinned(group.source) || is_client_authored_developer_message(group.source); let image_budget = if charge_full_item { RetainedImageBudget::Disabled } else { @@ -784,7 +799,7 @@ fn select_retained_items( remaining = remaining.saturating_sub(token_count); group.source.clone() } else if is_retained_tool_output(group.source) - || (group.source.is_always_retained() + || (is_pinned(group.source) && !matches!(group.source.item, ResponseItem::Message { .. })) { // Structured items such as tool results must stay whole. diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index bb8f48c0d1..42763474fc 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -5615,12 +5615,8 @@ impl Session { let retained_client_items = crate::compact_remote_v2::retained_client_items( history.annotated_items(), &history.file_audio_durations, - |item| { - crate::compact_remote_v2::should_retain_client_item( - item, - &turn_context.config.features, - ) - }, + ResponseItemEnvelope::is_always_retained, + Some(&turn_context.config.features), ); // Resolve the roster before allocating a new context window. let rendered = world_state.render_full_with_host_roster().await; diff --git a/codex-rs/core/tests/suite/scenarios_compaction_tests.rs b/codex-rs/core/tests/suite/scenarios_compaction_tests.rs index 61ffaf7104..5e13972b03 100644 --- a/codex-rs/core/tests/suite/scenarios_compaction_tests.rs +++ b/codex-rs/core/tests/suite/scenarios_compaction_tests.rs @@ -225,8 +225,11 @@ async fn interrupt_during_remote_compaction_preserves_summary_on_resume() -> Res Ok(()) } +#[test_case::test_case("always"; "shared")] +#[test_case::test_case("alwaysInThread"; "thread only")] +#[test_case::test_case("alwaysInChildren"; "children only")] #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn remote_slash_compact_preserves_context_across_windows() -> Result<()> { +async fn remote_slash_compact_preserves_context_across_windows(retention: &str) -> Result<()> { skip_if_no_network!(Ok(())); let server = start_mock_server().await; @@ -275,11 +278,11 @@ async fn remote_slash_compact_preserves_context_across_windows() -> Result<()> { }); let call: InjectedResponseItem = serde_json::from_value(json!({ "item": {"type": "function_call", "call_id": "release-check", "name": "check_release", "arguments": "{}"}, - "retention": "always" + "retention": retention }))?; let result: InjectedResponseItem = serde_json::from_value(json!({ "item": {"type": "function_call_output", "call_id": "release-check", "output": "The release candidate passed."}, - "retention": "always" + "retention": retention }))?; test.codex .inject_response_items_with_retention(vec![ @@ -325,6 +328,17 @@ async fn remote_slash_compact_preserves_context_across_windows() -> Result<()> { json!([mail]), ); + assert!( + requests[1] + .function_call_output_text("release-check") + .is_some() + ); + if retention == "alwaysInChildren" { + for request in &requests[2..] { + assert!(request.function_call_output_text("release-check").is_none()); + } + return Ok(()); + } insta::assert_snapshot!( "remote_slash_compact", context_snapshot::format_context_snapshot( diff --git a/codex-rs/core/tests/suite/step_settings/agent_spawn_tests.rs b/codex-rs/core/tests/suite/step_settings/agent_spawn_tests.rs index 899d49f06c..789363f555 100644 --- a/codex-rs/core/tests/suite/step_settings/agent_spawn_tests.rs +++ b/codex-rs/core/tests/suite/step_settings/agent_spawn_tests.rs @@ -5,6 +5,7 @@ use codex_exec_server::CreateDirectoryOptions; use codex_protocol::protocol::EnvironmentConfigState; use codex_protocol::protocol::TurnEnvironmentRequests; use codex_protocol::protocol::TurnEnvironmentSelection; +use codex_protocol::turn_input::InjectedResponseItem; use core_test_support::submit_thread_settings; use core_test_support::test_codex::environment_config_for_selection; use pretty_assertions::assert_eq; @@ -196,6 +197,18 @@ async fn spawn_inherits_captured_settings_after_a_turn_update( .await?; configured[0].config = EnvironmentConfigState::Ready(config); } + let instruction = |text: &str, retention: &str| { + serde_json::from_value::(json!({ + "item": {"type": "message", "role": "developer", "content": [{"type": "input_text", "text": text}]}, + "retention": retention, + })) + }; + test.codex + .inject_response_items_with_retention(vec![ + instruction("Send progress updates.", "alwaysInThread")?, + instruction("Read the worker log.", "alwaysInChildren")?, + ]) + .await?; answer_paused_turn(&test.codex, &request.turn_id).await?; let child_thread_id = tokio::time::timeout( @@ -215,6 +228,13 @@ async fn spawn_inherits_captured_settings_after_a_turn_update( .iter() .find(|request| request.header("thread-id") == Some(child_thread_id.to_string())) .expect("child should make a model request"); + assert!( + requests + .iter() + .any(|request| request.body_contains_text("Send progress updates.")) + ); + assert!(!child_request.body_contains_text("Send progress updates.")); + assert!(child_request.body_contains_text("Read the worker log.")); assert_eq!( request_settings(child_request), json!({ diff --git a/codex-rs/history/src/lib.rs b/codex-rs/history/src/lib.rs index 30f69a11a3..941315b32e 100644 --- a/codex-rs/history/src/lib.rs +++ b/codex-rs/history/src/lib.rs @@ -144,6 +144,11 @@ pub struct CodexHarnessMetadata { #[serde(default, skip_serializing_if = "Option::is_none")] pub retain_across_windows: Option, + /// Override inheritance by spawned agents, including full-history forks. + /// Older rollouts pin items in both scopes when `retain_across_windows` is true. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub retain_in_children: Option, + /// The originating history budget, including any tool-specific allowance. /// Measured in tokens and reused when replaying persisted history. #[serde( @@ -337,13 +342,22 @@ impl ResponseItemEnvelope { }) } - /// Whether the client requested that this item survive context-window changes and forks. + /// Whether the client requested that this item survive context-window changes. pub fn is_always_retained(&self) -> bool { self.metadata .as_ref() .is_some_and(|metadata| metadata.retain_across_windows == Some(true)) } + /// Explicitly include or exclude the item when spawning an agent. With no override, + /// a full fork applies its ordinary history rules and a fresh child skips the item. + pub fn child_retention(&self) -> Option { + let metadata = self.metadata.as_ref()?; + metadata + .retain_in_children + .or_else(|| metadata.retain_across_windows.filter(|retain| *retain)) + } + /// Wraps a raw Responses API item for persisted history. pub fn new(item: ResponseItem) -> Self { Self { @@ -367,12 +381,16 @@ impl From for ResponseItemEnvelope { impl From for ResponseItemEnvelope { fn from(injected: InjectedResponseItem) -> Self { let mut envelope = Self::new(injected.item); - if injected.retention != ItemRetention::Unspecified { - envelope - .metadata - .get_or_insert_default() - .retain_across_windows = Some(injected.retention == ItemRetention::Always); - } + let (across_windows, in_children) = match injected.retention { + ItemRetention::Unspecified => return envelope, + ItemRetention::Default => (false, None), + ItemRetention::Always => (true, None), + ItemRetention::AlwaysInThread => (true, Some(false)), + ItemRetention::AlwaysInChildren => (false, Some(true)), + }; + let metadata = envelope.metadata.get_or_insert_default(); + metadata.retain_across_windows = Some(across_windows); + metadata.retain_in_children = in_children; envelope } } diff --git a/codex-rs/protocol/src/turn_input.rs b/codex-rs/protocol/src/turn_input.rs index cc8759586f..fd58d0eedd 100644 --- a/codex-rs/protocol/src/turn_input.rs +++ b/codex-rs/protocol/src/turn_input.rs @@ -91,6 +91,11 @@ pub enum ItemRetention { Default, /// Carry the item into later context windows and newly spawned children. Always, + /// Carry the item into later windows of this thread and exclude it from spawned agents. + AlwaysInThread, + /// Carry the item into spawned agents while it is in the parent's context. + /// Each thread applies ordinary retention when its own context window changes. + AlwaysInChildren, } impl From for InjectedResponseItem {