From 9696c3a8aa9e0c985867d8a1f2126316acf16597 Mon Sep 17 00:00:00 2001 From: Rohit Arunachalam Date: Tue, 14 Apr 2026 01:43:36 -0700 Subject: [PATCH] Narrow prefix compaction suffix cleanup --- codex-rs/core/src/compact.rs | 19 +++++++++---- codex-rs/core/src/compact_tests.rs | 43 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/codex-rs/core/src/compact.rs b/codex-rs/core/src/compact.rs index 4afcaa235a..52731471f8 100644 --- a/codex-rs/core/src/compact.rs +++ b/codex-rs/core/src/compact.rs @@ -503,16 +503,25 @@ fn is_injected_context_item(item: &ResponseItem) -> bool { crate::event_mapping::is_contextual_dev_message_content(content) } ResponseItem::Message { role, content, .. } if role == "user" => { - crate::event_mapping::is_contextual_user_message_content(content) - && !matches!( - crate::event_mapping::parse_turn_item(item), - Some(TurnItem::HookPrompt(_)) - ) + is_regenerable_contextual_user_message(content) } _ => false, } } +fn is_regenerable_contextual_user_message(content: &[ContentItem]) -> bool { + !content.is_empty() && content.iter().all(is_regenerable_contextual_user_fragment) +} + +fn is_regenerable_contextual_user_fragment(content_item: &ContentItem) -> bool { + let ContentItem::InputText { text } = content_item else { + return false; + }; + + codex_instructions::AGENTS_MD_FRAGMENT.matches_text(text) + || crate::contextual_user_message::ENVIRONMENT_CONTEXT_FRAGMENT.matches_text(text) +} + pub(crate) fn build_compacted_history( initial_context: Vec, user_messages: &[String], diff --git a/codex-rs/core/src/compact_tests.rs b/codex-rs/core/src/compact_tests.rs index 541f67eb7b..15737d976e 100644 --- a/codex-rs/core/src/compact_tests.rs +++ b/codex-rs/core/src/compact_tests.rs @@ -179,6 +179,14 @@ fn strip_injected_context_from_retained_suffix_preserves_live_history() { end_turn: None, phase: None, }; + let user_instructions = input_message( + "user", + r#"# AGENTS.md instructions for /repo + + +Use cargo test. +"#, + ); let contextual_user = input_message( "user", r#" @@ -186,6 +194,32 @@ fn strip_injected_context_from_retained_suffix_preserves_live_history() { zsh "#, ); + let skill_payload = input_message( + "user", + r#" +fix-ci +/skills/fix-ci/SKILL.md +Debug the failing check. +"#, + ); + let user_shell_command = input_message( + "user", + r#" + +echo hi + + +Exit code: 0 +Output: +hi + +"#, + ); + let subagent_notification = input_message( + "user", + r#"{"agent_path":"agent-1","status":"completed"}"#, + ); + let turn_aborted = input_message("user", "interrupted"); let real_user = input_message("user", "please continue"); let assistant = ResponseItem::Message { id: None, @@ -216,7 +250,12 @@ fn strip_injected_context_from_retained_suffix_preserves_live_history() { let cleaned = strip_injected_context_from_retained_suffix(vec![ contextual_developer, mixed_developer, + user_instructions, contextual_user, + skill_payload.clone(), + user_shell_command.clone(), + subagent_notification.clone(), + turn_aborted.clone(), real_user.clone(), assistant.clone(), function_call.clone(), @@ -227,6 +266,10 @@ fn strip_injected_context_from_retained_suffix_preserves_live_history() { assert_eq!( cleaned, vec![ + skill_payload, + user_shell_command, + subagent_notification, + turn_aborted, real_user, assistant, function_call,