mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
fix: retry rejected previous-model compaction with selected model (#30319)
## Why Pre-sampling compaction intentionally uses the previous turn's model when the compaction compatibility hash changes or when switching to a model with a smaller context window. This keeps compaction aligned with the settings that produced the history, but it can block the next turn when a resumed ChatGPT thread still references a model slug that has since been retired. The Codex backend rejects that compaction request before the user's currently selected model gets a chance to sample. This PR lets those threads recover without changing previous-model compaction behavior for API-key authentication or custom providers. It is stacked on #31316, which is a behavior-preserving extraction of the individual remote compaction attempts; this PR contains the fallback behavior. ## What changed - For automatic previous-model compaction, capture the selected model's request context when using ChatGPT authentication with the OpenAI provider and the selected model differs from the previous model. - If the previous-model attempt returns an `InvalidRequest`, retry compaction once with the selected model for both `/responses/compact` and Responses Compaction V2. - Complete history processing, lifecycle events, and token accounting with the context of the model that successfully compacted the thread. - If the fallback also fails, return the original previous-model error so the retry does not change the user-visible failure. - Record fallback attempts with reason, implementation, and outcome telemetry. - Leave API-key authentication, custom providers, same-model turns, and non-`InvalidRequest` failures on their existing paths. ## Testing - `just test -p codex-core -E 'test(pre_sampling_compact) | test(model_unavailable_error)'` (10 tests) - Added integration coverage for a resumed thread whose model was renamed, a model downshift using Responses Compaction V2, and API-key authentication with a custom provider.
This commit is contained in:
1 parent
6b4882528e
commit
172ab264bd
9 files changed
+797
-63
No files matched your search
@@ -164,6 +164,40 @@ fn disabled_thread_context_accepts_trace_calls_without_writing() -> anyhow::Resu
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn compaction_contexts_share_identity_across_models() -> anyhow::Result<()> {
|
||||
let temp = TempDir::new()?;
|
||||
let thread_id = ThreadId::new();
|
||||
let thread_trace =
|
||||
ThreadTraceContext::start_root_in_root_for_test(temp.path(), minimal_metadata(thread_id))?;
|
||||
thread_trace.record_codex_turn_started("turn-1");
|
||||
|
||||
for model in ["gpt-previous", "gpt-selected"] {
|
||||
let compaction_trace =
|
||||
thread_trace.compaction_trace_context("turn-1", "compaction-1", model, "test-provider");
|
||||
compaction_trace
|
||||
.start_attempt(&serde_json::json!({ "model": model }))
|
||||
.record_failed("test failure");
|
||||
}
|
||||
|
||||
let replayed = replay_bundle(&single_bundle_dir(temp.path())?)?;
|
||||
let mut attempts = replayed
|
||||
.compaction_requests
|
||||
.values()
|
||||
.map(|attempt| (attempt.model.clone(), attempt.compaction_id.clone()))
|
||||
.collect::<Vec<_>>();
|
||||
attempts.sort();
|
||||
assert_eq!(
|
||||
attempts,
|
||||
vec![
|
||||
("gpt-previous".to_string(), "compaction-1".to_string()),
|
||||
("gpt-selected".to_string(), "compaction-1".to_string()),
|
||||
]
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn protocol_wrapper_records_selected_events_as_raw_payloads() -> anyhow::Result<()> {
|
||||
let temp = TempDir::new()?;
|
||||
|
||||
Reference in new issue
Block a user