diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index e90ae94185..0052f54068 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -2383,6 +2383,10 @@ impl Session { if let Some(replacement) = &compacted.replacement_history { history.replace(replacement.clone()); } else { + // TODO(ccunningham): When we have TurnContextItem-based legacy reconstruction, + // build historical turn context from those items and inject it at the correct + // point in compacted history instead of prepending the current initial context. + // This matters for legacy rollouts with replacement_history=None. let user_messages = collect_user_messages(history.raw_items()); let mut rebuilt = self.build_initial_context(turn_context).await; rebuilt.extend(compact::build_compacted_history(