Lightweight coding agent that runs in your terminal
Rust
Fix retained context handling for typed section content (#51642)
jifa5130128697b
diff --git a/codex-rs/guardian-context/src/retained_instructions.rs b/codex-rs/guardian-context/src/retained_instructions.rsindex 569cbb3ca1..abf3f4d6f7 100644--- a/codex-rs/guardian-context/src/retained_instructions.rs+++ b/codex-rs/guardian-context/src/retained_instructions.rs@@ -216,7 +216,7 @@ impl ComposedContext {let (assistant, instructions): (Vec<_>, Vec<_>) =std::mem::take(items).into_iter().partition(|item| {item.retention == Retention::Optional(BudgetPriority::Commentary)- || matches!(&item.content, ContentItem::InputText { text }+ || matches!(&item.content, SectionContent::Other(ContentItem::InputText { text })if text.strip_suffix('\n') == Some(assistant_omission.as_str()))});let mut prefix = self.sections.remove(index);@@ -228,16 +228,12 @@ impl ComposedContext {SectionOutput {id: "retained_assistant_context",delivery: SectionDelivery::UserContent(- std::iter::once(Budgeted::required(ContentItem::InputText {- text: assistant_start.to_owned(),- }))- .chain(assistant)- .chain(std::iter::once(Budgeted::required(- ContentItem::InputText {- text: assistant_end.to_owned(),- },- )))- .collect(),+ std::iter::once(Budgeted::required(assistant_start.to_owned().into()))+ .chain(assistant)+ .chain(std::iter::once(Budgeted::required(+ assistant_end.to_owned().into(),+ )))+ .collect(),),},);@@ -284,7 +280,7 @@ impl ComposedContext {self.sections.retain_mut(|section| {if section.id == "retained_assistant_context" {return !matches!(§ion.delivery, SectionDelivery::UserContent(items)- if items.iter().all(|item| matches!(&item.content, ContentItem::InputText { text }+ if items.iter().all(|item| matches!(&item.content, SectionContent::Other(ContentItem::InputText { text })if text == assistant_start || text == assistant_end)));}if section.id != "retained_user_instructions" {diff --git a/codex-rs/guardian-context/tests/cache_prefix.rs b/codex-rs/guardian-context/tests/cache_prefix.rsindex 1fe87c839f..ec81fd32f7 100644--- a/codex-rs/guardian-context/tests/cache_prefix.rs+++ b/codex-rs/guardian-context/tests/cache_prefix.rs@@ -197,7 +197,14 @@ fn changing_retained_context_and_attestations_preserves_history_before_the_curre#[test]fn snapshot_split_preserves_evidence_and_prefix_when_assistants_and_reviews_change() {- for message_id in [None, Some("instruction".to_owned())] {+ for (format, message_id) in [TranscriptFormat::Line, TranscriptFormat::Json]+ .into_iter()+ .flat_map(|format| {+ [None, Some("instruction".to_owned())]+ .into_iter()+ .map(move |message_id| (format, message_id))+ })+ {let has_source_id = message_id.is_some();let mut retained = RetainedContext::default();retained.record_user_message(@@ -215,7 +222,8 @@ fn snapshot_split_preserves_evidence_and_prefix_when_assistants_and_reviews_chanitems: vec![user_message(vec!["Current workspace evidence.".to_owned()])],retained: Some(retained),};- let profile = ContextProfile::asynchronous();+ let mut profile = ContextProfile::asynchronous();+ profile.transcript_format = format;let mut prefix = None;// Append, replace and remove reviews while assistant evidence grows.for generation in 0..4 {@@ -261,7 +269,7 @@ fn snapshot_split_preserves_evidence_and_prefix_when_assistants_and_reviews_channode_repl: None,}).unwrap();- let transcript = profile.render_transcript(+ let transcript = profile.prepare_transcript(collected.transcript_entries(),/*entry_number_offset*/ 0,);