openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-30 19:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set rollback reference baseline at resume/fork callsites

Browse Source
This commit is contained in:
Charles Cunningham
2026-02-22 21:36:38 -08:00
parent 60e7e634bb
commit 9a937330fa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/codex.rs
+7
View File
@@ -1622,10 +1622,16 @@ impl Session {
.reconstruct_history_from_rollout(&turn_context, &rollout_items)
.await;
let previous_model = reconstructed.previous_model.clone();
let reference_context_item = reconstructed
.user_turn_baselines
.last()
.filter(|frame| !frame.invalidated_by_following_compaction)
.map(|frame| frame.turn_context_item.clone());
let curr = turn_context.model_info.slug.as_str();
{
let mut state = self.state.lock().await;
state.set_user_turn_baselines(reconstructed.user_turn_baselines.clone());
state.set_reference_context_item(reference_context_item);
state.set_previous_model(previous_model.clone());
}
@@ -1673,6 +1679,7 @@ impl Session {
{
let mut state = self.state.lock().await;
state.set_user_turn_baselines(reconstructed.user_turn_baselines.clone());
state.set_reference_context_item(None);
state.set_previous_model(reconstructed.previous_model.clone());
}
codex-rs/core/src/context_manager/history.rs
-2
View File
@@ -86,8 +86,6 @@ impl ContextManager {
pub(crate) fn set_user_turn_baselines(&mut self, baselines: Vec<UserTurnBaselineFrame>) {
self.user_turn_baselines = baselines;
self.reference_context_item =
self.effective_reference_context_item_from_user_turn_baselines();
}
pub(crate) fn user_turn_baselines(&self) -> Vec<UserTurnBaselineFrame> {