agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle model-switch base instructions after compaction (#11659)

Browse Source 
Strip trailing <model_switch> during model-switch compaction request,
and append <model_switch> after model switch compaction
This commit is contained in:
Charley Cunningham
2026-02-13 19:02:53 -08:00
committed by GitHub
Unverified
parent 8156c57234
commit 67e577da53
4 changed files with 174 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/compact_remote.rs
+10
View File
@@ -3,6 +3,7 @@ use std::sync::Arc;
use crate::Prompt;
use crate::codex::Session;
use crate::codex::TurnContext;
use crate::compact::extract_trailing_model_switch_update_for_compaction_request;
use crate::context_manager::ContextManager;
use crate::context_manager::TotalTokenUsageBreakdown;
use crate::context_manager::estimate_response_item_model_visible_bytes;
@@ -65,6 +66,10 @@ async fn run_remote_compact_task_inner_impl(
sess.emit_turn_item_started(turn_context, &compaction_item)
.await;
let mut history = sess.clone_history().await;
// Keep compaction prompts in-distribution: if a model-switch update was injected at the
// tail of history (between turns), exclude it from the compaction request payload.
let stripped_model_switch_item =
extract_trailing_model_switch_update_for_compaction_request(&mut history);
let base_instructions = sess.get_base_instructions().await;
let deleted_items = trim_function_call_history_to_fit_context_window(
&mut history,
@@ -120,6 +125,11 @@ async fn run_remote_compact_task_inner_impl(
new_history = sess
.process_compacted_history(turn_context, new_history)
.await;
// Reattach the stripped model-switch update only after successful compaction so the model
// still sees the switch instructions on the next real sampling request.
if let Some(model_switch_item) = stripped_model_switch_item {
new_history.push(model_switch_item);
}
if !ghost_snapshots.is_empty() {
new_history.extend(ghost_snapshots);