mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
feat: add remote compaction v2 Responses client path (#20773)
## Why This adds the `remote_compaction_v2` client path so remote compaction can run through the normal Responses stream and install a `context_compaction` item that trigger a compaction. The goal is to migrate some of the compaction logic on the client side We keeps the v2 transport behind a feature flag while letting follow-up requests reuse the compacted context instead of falling back to the legacy compaction item shape. ## What changed - add `ResponseItem::ContextCompaction` and refresh the generated app-server / schema / TypeScript fixtures that expose response items on the wire - add `core/src/compact_remote_v2.rs` to send compaction through the standard streamed Responses client, require exactly one `context_compaction` output item, and install that item into compacted history - route manual compact and auto-compaction through the v2 path when `remote_compaction_v2` is enabled, while keeping the existing remote compaction path as the fallback - preserve the new item type across history retention, follow-up request construction, telemetry, rollout persistence, and rollout-trace normalization - add targeted coverage for the feature flag, `context_compaction` serialization, rollout-trace normalization, and remote-compaction follow-up behavior ## Verification - added protocol tests for `context_compaction` serialization/deserialization in `protocol/src/models.rs` - added rollout-trace coverage for `context_compaction` normalization in `rollout-trace/src/reducer/conversation_tests.rs` - added remote compaction integration coverage for v2 follow-up reuse and mixed compaction output streams in `core/tests/suite/compact_remote.rs` --------- Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
1 parent
d013155f40
commit
d927f61208
27 files changed
+991
-43
No files matched your search
@@ -121,13 +121,15 @@ fn normalize_model_item(
|
||||
.and_then(Value::as_str)
|
||||
.map(ToString::to_string),
|
||||
}),
|
||||
"compaction" | "compaction_summary" => Ok(NormalizedConversationItem {
|
||||
role: ConversationRole::Assistant,
|
||||
channel: Some(ConversationChannel::Summary),
|
||||
kind: ConversationItemKind::Message,
|
||||
body: compaction_body(item, raw_payload)?,
|
||||
call_id: None,
|
||||
}),
|
||||
"compaction" | "compaction_summary" | "context_compaction" => {
|
||||
Ok(NormalizedConversationItem {
|
||||
role: ConversationRole::Assistant,
|
||||
channel: Some(ConversationChannel::Summary),
|
||||
kind: ConversationItemKind::Message,
|
||||
body: compaction_body(item, raw_payload)?,
|
||||
call_id: None,
|
||||
})
|
||||
}
|
||||
_ => bail!(
|
||||
"unsupported model item type {item_type} in payload {}",
|
||||
raw_payload.raw_payload_id
|
||||
|
||||
@@ -786,6 +786,75 @@ fn compaction_boundary_repeats_prefix_and_reuses_replacement_items() -> anyhow::
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn context_compaction_boundary_repeats_prefix_and_reuses_replacement_items() -> anyhow::Result<()> {
|
||||
let temp = TempDir::new()?;
|
||||
let writer = create_started_writer(&temp)?;
|
||||
start_turn(&writer, "turn-1")?;
|
||||
|
||||
let developer = message("developer", "follow repo rules");
|
||||
let user = message("user", "count files");
|
||||
let request = writer.write_json_payload(
|
||||
RawPayloadKind::InferenceRequest,
|
||||
&json!({
|
||||
"input": [developer, user]
|
||||
}),
|
||||
)?;
|
||||
append_inference_start(&writer, "inference-1", "turn-1", request)?;
|
||||
|
||||
let summary = message("user", "summary from compacted history");
|
||||
let compaction_summary = json!({
|
||||
"type": "context_compaction",
|
||||
"encrypted_content": "encrypted-summary",
|
||||
});
|
||||
let checkpoint = writer.write_json_payload(
|
||||
RawPayloadKind::CompactionCheckpoint,
|
||||
&json!({
|
||||
"input_history": [developer, user],
|
||||
"replacement_history": [user, summary, compaction_summary]
|
||||
}),
|
||||
)?;
|
||||
writer.append_with_context(
|
||||
trace_context("turn-1"),
|
||||
RawTraceEventPayload::CompactionInstalled {
|
||||
compaction_id: "compaction-1".to_string(),
|
||||
checkpoint_payload: checkpoint,
|
||||
},
|
||||
)?;
|
||||
|
||||
start_turn(&writer, "turn-2")?;
|
||||
let post_compaction_request = writer.write_json_payload(
|
||||
RawPayloadKind::InferenceRequest,
|
||||
&json!({
|
||||
"input": [developer, user, summary, compaction_summary]
|
||||
}),
|
||||
)?;
|
||||
append_inference_start(&writer, "inference-2", "turn-2", post_compaction_request)?;
|
||||
|
||||
let rollout = replay_bundle(temp.path())?;
|
||||
let compaction = &rollout.compactions["compaction-1"];
|
||||
|
||||
assert_eq!(
|
||||
rollout.conversation_items[&compaction.replacement_item_ids[2]].channel,
|
||||
Some(ConversationChannel::Summary),
|
||||
);
|
||||
assert_eq!(
|
||||
rollout.conversation_items[&compaction.replacement_item_ids[2]].kind,
|
||||
ConversationItemKind::Message,
|
||||
);
|
||||
assert_eq!(
|
||||
rollout.conversation_items[&compaction.replacement_item_ids[2]]
|
||||
.body
|
||||
.parts,
|
||||
vec![ConversationPart::Encoded {
|
||||
label: "encrypted_content".to_string(),
|
||||
value: "encrypted-summary".to_string(),
|
||||
}],
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tool_call_links_model_call_and_followup_output_items() -> anyhow::Result<()> {
|
||||
let temp = TempDir::new()?;
|
||||
|
||||
Reference in new issue
Block a user