From a0d4c01ad129d37e7b54b0886dba89b024160905 Mon Sep 17 00:00:00 2001 From: Charles Cunningham Date: Sun, 22 Feb 2026 22:53:34 -0800 Subject: [PATCH] Inline baseline reference helper --- codex-rs/core/src/context_manager/history.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/codex-rs/core/src/context_manager/history.rs b/codex-rs/core/src/context_manager/history.rs index 8f00263902..6e8bea1821 100644 --- a/codex-rs/core/src/context_manager/history.rs +++ b/codex-rs/core/src/context_manager/history.rs @@ -128,8 +128,11 @@ impl ContextManager { let frames_to_pop = usize::try_from(num_turns).unwrap_or(usize::MAX); let new_len = self.user_turn_baselines.len().saturating_sub(frames_to_pop); self.user_turn_baselines.truncate(new_len); - self.reference_context_item = - self.effective_reference_context_item_from_user_turn_baselines(); + self.reference_context_item = self + .user_turn_baselines + .last() + .filter(|frame| !frame.invalidated_by_following_compaction) + .map(|frame| frame.turn_context_item.clone()); } pub(crate) fn sync_reference_context_after_history_replacement( @@ -161,15 +164,6 @@ impl ContextManager { .map(|frame| frame.turn_context_item.model.clone()) } - pub(crate) fn effective_reference_context_item_from_user_turn_baselines( - &self, - ) -> Option { - self.user_turn_baselines - .last() - .filter(|frame| !frame.invalidated_by_following_compaction) - .map(|frame| frame.turn_context_item.clone()) - } - pub(crate) fn set_token_usage_full(&mut self, context_window: i64) { match &mut self.token_info { Some(info) => info.fill_to_context_window(context_window),