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

Trim rollback baselines without user messages

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

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

@@ -7126,6 +7126,57 @@ mod tests {
);
}
#[tokio::test]
async fn thread_rollback_trims_baselines_when_history_has_no_user_messages() {
let (sess, tc, rx) = make_session_and_context_with_rx().await;
let assistant_only_history = vec![ResponseItem::Message {
id: None,
role: "assistant".to_string(),
content: vec![ContentItem::OutputText {
text: "compacted summary".to_string(),
}],
end_turn: None,
phase: None,
}];
sess.record_into_history(&assistant_only_history, tc.as_ref())
.await;
let mut turn_1_context = tc.to_turn_context_item();
turn_1_context.turn_id = Some("turn-1".to_string());
turn_1_context.model = "model-a".to_string();
let mut turn_2_context = tc.to_turn_context_item();
turn_2_context.turn_id = Some("turn-2".to_string());
turn_2_context.model = "model-b".to_string();
sess.set_previous_model(Some("model-b".to_string())).await;
{
let mut state = sess.state.lock().await;
state.set_user_turn_baselines(vec![
UserTurnBaselineFrame {
turn_context_item: turn_1_context.clone(),
invalidated_by_following_compaction: false,
},
UserTurnBaselineFrame {
turn_context_item: turn_2_context,
invalidated_by_following_compaction: false,
},
]);
}
handlers::thread_rollback(&sess, "sub-1".to_string(), 1).await;
let rollback_event = wait_for_thread_rolled_back(&rx).await;
assert_eq!(rollback_event.num_turns, 1);
assert_eq!(sess.previous_model().await, Some("model-a".to_string()));
assert_eq!(
serde_json::to_value(sess.reference_context_item().await)
.expect("serialize post-rollback reference context item"),
serde_json::to_value(Some(turn_1_context))
.expect("serialize expected post-rollback reference context item")
);
}
#[tokio::test]
async fn thread_rollback_clears_history_when_num_turns_exceeds_existing_turns() {
let (sess, tc, rx) = make_session_and_context_with_rx().await;

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

@@ -313,6 +313,7 @@ impl ContextManager {
let user_positions = user_message_positions(&snapshot);
let Some(&first_user_idx) = user_positions.first() else {
self.replace(snapshot);
self.truncate_user_turn_baselines_from_end(num_turns);
return;
};