clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 06:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve legacy no-id turn baselines across rollback

Browse Source
This commit is contained in:
Charles Cunningham
2026-02-21 22:49:52 -08:00
parent 429551dad2
commit 60e7e634bb
2 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
codex-rs/core/src/codex.rs
View File

@@ -6678,6 +6678,88 @@ mod tests {
);
}
#[tokio::test]
async fn record_initial_history_resumed_rollback_with_missing_turn_context_ids_keeps_distinct_baselines()
{
let (session, turn_context) = make_session_and_context().await;
let first_turn_id = "turn-1".to_string();
let second_turn_id = "turn-2".to_string();
let mut first_context_item = turn_context.to_turn_context_item();
first_context_item.turn_id = None;
first_context_item.model = "model-a".to_string();
let mut second_context_item = turn_context.to_turn_context_item();
second_context_item.turn_id = None;
second_context_item.model = "model-b".to_string();
let rollout_items = vec![
RolloutItem::EventMsg(EventMsg::TurnStarted(
codex_protocol::protocol::TurnStartedEvent {
turn_id: first_turn_id.clone(),
model_context_window: Some(128_000),
collaboration_mode_kind: ModeKind::Default,
},
)),
RolloutItem::EventMsg(EventMsg::UserMessage(
codex_protocol::protocol::UserMessageEvent {
message: "first".to_string(),
images: None,
local_images: Vec::new(),
text_elements: Vec::new(),
},
)),
RolloutItem::TurnContext(first_context_item.clone()),
RolloutItem::EventMsg(EventMsg::TurnComplete(
codex_protocol::protocol::TurnCompleteEvent {
turn_id: first_turn_id,
last_agent_message: None,
},
)),
RolloutItem::EventMsg(EventMsg::TurnStarted(
codex_protocol::protocol::TurnStartedEvent {
turn_id: second_turn_id.clone(),
model_context_window: Some(128_000),
collaboration_mode_kind: ModeKind::Default,
},
)),
RolloutItem::EventMsg(EventMsg::UserMessage(
codex_protocol::protocol::UserMessageEvent {
message: "second".to_string(),
images: None,
local_images: Vec::new(),
text_elements: Vec::new(),
},
)),
RolloutItem::TurnContext(second_context_item),
RolloutItem::EventMsg(EventMsg::TurnComplete(
codex_protocol::protocol::TurnCompleteEvent {
turn_id: second_turn_id,
last_agent_message: None,
},
)),
RolloutItem::EventMsg(EventMsg::ThreadRolledBack(
codex_protocol::protocol::ThreadRolledBackEvent { num_turns: 1 },
)),
];
session
.record_initial_history(InitialHistory::Resumed(ResumedHistory {
conversation_id: ThreadId::default(),
history: rollout_items,
rollout_path: PathBuf::from("/tmp/resume.jsonl"),
}))
.await;
assert_eq!(session.previous_model().await, Some("model-a".to_string()));
assert_eq!(
serde_json::to_value(session.reference_context_item().await)
.expect("serialize seeded reference context item"),
serde_json::to_value(Some(first_context_item))
.expect("serialize expected reference context item")
);
}
#[tokio::test]
async fn record_initial_history_resumed_rollback_skips_only_user_turns() {
let (session, turn_context) = make_session_and_context().await;

6
codex-rs/core/src/context_manager/history.rs
View File

@@ -100,7 +100,11 @@ impl ContextManager {
pub(crate) fn record_regular_turn_baseline(&mut self, item: TurnContextItem) {
if let Some(top) = self.user_turn_baselines.last_mut()
&& top.turn_context_item.turn_id == item.turn_id
&& let (Some(top_turn_id), Some(item_turn_id)) = (
top.turn_context_item.turn_id.as_deref(),
item.turn_id.as_deref(),
)
&& top_turn_id == item_turn_id
{
top.turn_context_item = item.clone();
top.invalidated_by_following_compaction = false;