From 7fcb825b46433c4417c8ebdc5b5d0d08a4dc682e Mon Sep 17 00:00:00 2001 From: ioanbudea-OAI Date: Fri, 20 Nov 2026 19:46:12 +0000 Subject: [PATCH] Persist Guardian retention limits in thread settings (#62827) ## What changed At session startup, derive `assistant_record_bytes` from the Sync Elastic per-entry token limit for retained user instructions. Use the default section limit when the configuration omits that section. Store the resolved byte limit in the optional `guardian_retention` field of `ThreadSettingsSnapshot` and update the app-server schema. Fixed-mode snapshots omit the field, and older snapshots can still be read. GitOrigin-RevId: a8de88c5bd0e35c4a114577e70fb0c858acb13c9 --- .../app-server-exports-stable.json.zst | Bin 172764 -> 172849 bytes .../persisted_resume_settings_tests.rs | 1 + codex-rs/core/src/agent/control_tests.rs | 1 + codex-rs/core/src/config/mod.rs | 16 +++ codex-rs/core/src/session/mod.rs | 1 + codex-rs/core/src/session/session.rs | 4 + codex-rs/core/src/session/tests.rs | 131 +----------------- codex-rs/guardian-context/src/budget.rs | 3 +- codex-rs/protocol/src/protocol.rs | 12 ++ codex-rs/state/src/extract.rs | 1 + .../thread-store/src/thread_metadata_sync.rs | 1 + 11 files changed, 46 insertions(+), 125 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 b9e8b1c9014fbc6d93a4c1df63ffe725adaf7936..eaab9e700cf1e88327bf9f60e4bf8588ab856059 100644 GIT binary patch delta 11662 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 Ym(IJok@-+LRG5`@qk-A(4e9EN3%ox&kN^Mx delta 11598 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 MAC14}ZAjPLV1S!9CIA2c diff --git a/codex-rs/app-server/src/request_processors/persisted_resume_settings_tests.rs b/codex-rs/app-server/src/request_processors/persisted_resume_settings_tests.rs index ad7b10819e..75375570a6 100644 --- a/codex-rs/app-server/src/request_processors/persisted_resume_settings_tests.rs +++ b/codex-rs/app-server/src/request_processors/persisted_resume_settings_tests.rs @@ -34,6 +34,7 @@ fn settings_item( thread_id, thread_settings: ThreadSettingsSnapshot { disabled_plugin_ids: Vec::new(), + guardian_retention: None, model: "gpt-5".to_string(), model_provider_id: "openai".to_string(), service_tier: None, diff --git a/codex-rs/core/src/agent/control_tests.rs b/codex-rs/core/src/agent/control_tests.rs index 8b37647f3c..8b41481aa0 100644 --- a/codex-rs/core/src/agent/control_tests.rs +++ b/codex-rs/core/src/agent/control_tests.rs @@ -2444,6 +2444,7 @@ async fn spawn_agent_fork_from_paginated_parent_uses_model_context_prefix( thread_id: Some(parent_thread_id), thread_settings: ThreadSettingsSnapshot { disabled_plugin_ids: Vec::new(), + guardian_retention: None, model: "parent-only-model".to_string(), model_provider_id: "parent-only-provider".to_string(), service_tier: None, diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index bce1052ecc..5cd52dcce7 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -1758,6 +1758,22 @@ impl Config { } } + /// Resolves recorder limits from the Sync Elastic retained-instruction entry budget. + pub(crate) fn guardian_retention_policy( + &self, + ) -> Option { + let entry_tokens = self + .guardian_sync_elastic_budget + .as_ref()? + .section_limits(codex_guardian_context::ElasticSection::RetainedUserInstructions) + .max_section_entry_tokens(); + Some(codex_protocol::protocol::GuardianRetentionPolicy { + assistant_record_bytes: Some(codex_utils_output_truncation::approx_bytes_for_tokens( + entry_tokens, + )), + }) + } + pub fn sqlite_config(&self) -> &codex_state::SqliteConfig { &self.sqlite } diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 1da567fc6d..f4c49f445f 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -1088,6 +1088,7 @@ impl Session { codex_home: config.codex_home.clone(), thread_name: None, disabled_plugin_ids, + guardian_retention: config.guardian_retention_policy(), original_config_do_not_use: Arc::clone(&config), metrics_service_name, app_server_client_name: None, diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index 5d564252d2..d1d3fa8a17 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -42,6 +42,7 @@ use codex_protocol::mcp::ClientMcpExtensions; use codex_protocol::models::ProfileWorkspaceRoot; use codex_protocol::openai_models::CatalogModel; use codex_protocol::protocol::EnvironmentConfig; +use codex_protocol::protocol::GuardianRetentionPolicy; use codex_protocol::protocol::HookCompletedEvent; use codex_protocol::protocol::MultiAgentVersion; use codex_protocol::protocol::ThreadHistoryMode; @@ -165,6 +166,8 @@ pub(crate) struct SessionConfiguration { pub(super) thread_name: Option, /// Thread-owned plugin selection inherited by future turns. pub(super) disabled_plugin_ids: Vec, + /// Recorder policy resolved at startup and shared with persisted settings. + pub(super) guardian_retention: Option, // TODO(pakrym): Remove config from here pub(super) original_config_do_not_use: Arc, @@ -347,6 +350,7 @@ impl SessionConfiguration { personality: self.step_settings.personality, collaboration_mode: self.step_settings.collaboration_mode.clone(), disabled_plugin_ids: self.disabled_plugin_ids.clone(), + guardian_retention: self.guardian_retention, } } diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs index 072e1626cc..123b0b0ceb 100644 --- a/codex-rs/core/src/session/tests.rs +++ b/codex-rs/core/src/session/tests.rs @@ -4343,68 +4343,7 @@ async fn record_initial_history_forked_hydrates_previous_turn_settings() { #[tokio::test] async fn set_rate_limits_retains_previous_credits() { - let codex_home = tempfile::tempdir().expect("create temp dir"); - let config = build_test_config(codex_home.path()).await; - let config = Arc::new(config); - let model = get_model_offline_for_tests(config.model.as_deref()); - let model_info = - construct_model_info_offline_for_tests(model.as_str(), &config.to_models_manager_config()); - let reasoning_effort = config.model_reasoning_effort.clone(); - let collaboration_mode = CollaborationMode { - mode: ModeKind::Default, - settings: Settings { - model, - reasoning_effort, - developer_instructions: None, - }, - }; - let session_configuration = SessionConfiguration { - turn_extension_init: Default::default(), - provider: create_model_provider(config.model_provider.clone(), /*auth_manager*/ None), - environments: Vec::new(), - step_settings: Arc::new(StepSettings { - request_country: RequestCountry::default(), - collaboration_mode, - reasoning_summary: config.model_reasoning_summary, - service_tier: None, - personality: config.personality, - approval_policy: config.permissions.approval_policy.clone(), - approvals_reviewer: config.approvals_reviewer, - }), - model_info_overrides: config.to_models_manager_config().into(), - developer_instructions: config.developer_instructions.clone(), - base_instructions: config - .base_instructions - .clone() - .unwrap_or_else(|| render_model_instructions(&model_info)), - permission_profile_state: config.permissions.permission_profile_state().clone(), - allow_login_shell: config.permissions.allow_login_shell, - shell_environment_policy: config.permissions.shell_environment_policy.clone(), - windows_sandbox_level: WindowsSandboxLevel::from_config(&config), - windows_sandbox_type: config.permissions.windows_sandbox_type, - use_legacy_landlock: config.features.use_legacy_landlock(), - legacy_fallback_cwd: config.cwd.clone(), - runtime_workspace_roots: config.workspace_roots.clone(), - codex_home: config.codex_home.clone(), - thread_name: None, - disabled_plugin_ids: Vec::new(), - original_config_do_not_use: Arc::clone(&config), - metrics_service_name: None, - app_server_client_name: None, - app_server_client_version: None, - trusted_guardian_reviewer: false, - session_source: SessionSource::Exec, - root_capabilities_restricted: false, - history_mode: Default::default(), - forked_from_thread_id: None, - parent_thread_id: None, - thread_source: None, - originator: "test_originator".to_string(), - dynamic_tools: Arc::default(), - user_shell_override: None, - }; - - let mut state = SessionState::new(session_configuration); + let mut state = SessionState::new(make_session_configuration_for_tests().await); let initial = RateLimitSnapshot { limit_id: None, limit_name: None, @@ -4468,68 +4407,7 @@ async fn set_rate_limits_retains_previous_credits() { #[tokio::test] async fn set_rate_limits_updates_plan_type_when_present() { - let codex_home = tempfile::tempdir().expect("create temp dir"); - let config = build_test_config(codex_home.path()).await; - let config = Arc::new(config); - let model = get_model_offline_for_tests(config.model.as_deref()); - let model_info = - construct_model_info_offline_for_tests(model.as_str(), &config.to_models_manager_config()); - let reasoning_effort = config.model_reasoning_effort.clone(); - let collaboration_mode = CollaborationMode { - mode: ModeKind::Default, - settings: Settings { - model, - reasoning_effort, - developer_instructions: None, - }, - }; - let session_configuration = SessionConfiguration { - turn_extension_init: Default::default(), - provider: create_model_provider(config.model_provider.clone(), /*auth_manager*/ None), - environments: Vec::new(), - step_settings: Arc::new(StepSettings { - request_country: RequestCountry::default(), - collaboration_mode, - reasoning_summary: config.model_reasoning_summary, - service_tier: None, - personality: config.personality, - approval_policy: config.permissions.approval_policy.clone(), - approvals_reviewer: config.approvals_reviewer, - }), - model_info_overrides: config.to_models_manager_config().into(), - developer_instructions: config.developer_instructions.clone(), - base_instructions: config - .base_instructions - .clone() - .unwrap_or_else(|| render_model_instructions(&model_info)), - permission_profile_state: config.permissions.permission_profile_state().clone(), - allow_login_shell: config.permissions.allow_login_shell, - shell_environment_policy: config.permissions.shell_environment_policy.clone(), - windows_sandbox_level: WindowsSandboxLevel::from_config(&config), - windows_sandbox_type: config.permissions.windows_sandbox_type, - use_legacy_landlock: config.features.use_legacy_landlock(), - legacy_fallback_cwd: config.cwd.clone(), - runtime_workspace_roots: config.workspace_roots.clone(), - codex_home: config.codex_home.clone(), - thread_name: None, - disabled_plugin_ids: Vec::new(), - original_config_do_not_use: Arc::clone(&config), - metrics_service_name: None, - app_server_client_name: None, - app_server_client_version: None, - trusted_guardian_reviewer: false, - session_source: SessionSource::Exec, - root_capabilities_restricted: false, - history_mode: Default::default(), - forked_from_thread_id: None, - parent_thread_id: None, - thread_source: None, - originator: "test_originator".to_string(), - dynamic_tools: Arc::default(), - user_shell_override: None, - }; - - let mut state = SessionState::new(session_configuration); + let mut state = SessionState::new(make_session_configuration_for_tests().await); let initial = RateLimitSnapshot { limit_id: None, limit_name: None, @@ -5141,6 +5019,7 @@ pub(crate) async fn make_session_configuration_for_tests() -> SessionConfigurati codex_home: config.codex_home.clone(), thread_name: None, disabled_plugin_ids: Vec::new(), + guardian_retention: config.guardian_retention_policy(), original_config_do_not_use: Arc::clone(&config), metrics_service_name: None, app_server_client_name: None, @@ -6727,6 +6606,7 @@ pub(crate) async fn make_session_and_context() -> (Session, TurnContext) { codex_home: config.codex_home.clone(), thread_name: None, disabled_plugin_ids: Vec::new(), + guardian_retention: config.guardian_retention_policy(), original_config_do_not_use: Arc::clone(&config), metrics_service_name: None, app_server_client_name: None, @@ -7076,6 +6956,7 @@ async fn make_session_with_config_and_rx( codex_home: config.codex_home.clone(), thread_name: None, disabled_plugin_ids: Vec::new(), + guardian_retention: config.guardian_retention_policy(), original_config_do_not_use: Arc::clone(&config), metrics_service_name: None, app_server_client_name: None, @@ -7216,6 +7097,7 @@ async fn make_session_with_history_source_and_agent_control_and_rx( codex_home: config.codex_home.clone(), thread_name: None, disabled_plugin_ids: Vec::new(), + guardian_retention: config.guardian_retention_policy(), original_config_do_not_use: Arc::clone(&config), metrics_service_name: None, app_server_client_name: None, @@ -9089,6 +8971,7 @@ where codex_home: config.codex_home.clone(), thread_name: None, disabled_plugin_ids: Vec::new(), + guardian_retention: config.guardian_retention_policy(), original_config_do_not_use: Arc::clone(&config), metrics_service_name: None, app_server_client_name: None, diff --git a/codex-rs/guardian-context/src/budget.rs b/codex-rs/guardian-context/src/budget.rs index f21ed75fb0..73f87a0427 100644 --- a/codex-rs/guardian-context/src/budget.rs +++ b/codex-rs/guardian-context/src/budget.rs @@ -199,7 +199,8 @@ impl ElasticBudgetConfig { Ok(()) } - pub(crate) fn section_limits(&self, section: ElasticSection) -> ElasticSectionLimits { + /// Returns the configured limits or the default for an omitted section. + pub fn section_limits(&self, section: ElasticSection) -> ElasticSectionLimits { self.sections.get(§ion).copied().unwrap_or_else(|| { let entries = crate::ContextProfile::synchronous().transcript.entry_limits; let tokens = match section { diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index b177454ceb..28c1d43924 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -2598,6 +2598,18 @@ pub struct ThreadSettingsSnapshot { /// Thread-owned plugin selection, retained even when a plugin is unavailable. #[serde(default)] pub disabled_plugin_ids: Vec, + /// Effective Guardian recorder policy. Absent for Fixed and old snapshots. + #[serde(default, skip_serializing_if = "Option::is_none")] + #[ts(optional)] + pub guardian_retention: Option, +} + +/// Resolved limits for Guardian's retained evidence, in storage bytes. +#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, JsonSchema, TS)] +pub struct GuardianRetentionPolicy { + #[serde(skip_serializing_if = "Option::is_none")] + #[ts(optional)] + pub assistant_record_bytes: Option, } #[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq, Eq, JsonSchema, TS)] diff --git a/codex-rs/state/src/extract.rs b/codex-rs/state/src/extract.rs index ba7348ce24..50dece923f 100644 --- a/codex-rs/state/src/extract.rs +++ b/codex-rs/state/src/extract.rs @@ -735,6 +735,7 @@ mod tests { thread_id: None, thread_settings: ThreadSettingsSnapshot { disabled_plugin_ids: Vec::new(), + guardian_retention: None, model: "gpt-5.2-codex".to_string(), model_provider_id: "updated-provider".to_string(), service_tier: None, diff --git a/codex-rs/thread-store/src/thread_metadata_sync.rs b/codex-rs/thread-store/src/thread_metadata_sync.rs index 769c9c91c7..3784b962a0 100644 --- a/codex-rs/thread-store/src/thread_metadata_sync.rs +++ b/codex-rs/thread-store/src/thread_metadata_sync.rs @@ -750,6 +750,7 @@ mod tests { thread_id: None, thread_settings: ThreadSettingsSnapshot { disabled_plugin_ids: Vec::new(), + guardian_retention: None, model: "gpt-5.2-codex".to_string(), model_provider_id: "updated-provider".to_string(), service_tier: None,