clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-16 17:23:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline compact merge item matcher

Browse Source
This commit is contained in:
Charles Cunningham
2026-02-18 00:27:44 -08:00
parent 25c22dcefc
commit 3759abaf15
1 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
codex-rs/core/src/compact_remote.rs
View File

@@ -229,43 +229,38 @@ fn remove_incoming_echoes_from_compacted_history(
incoming_history_items: &[ResponseItem],
) {
for incoming_item in incoming_history_items {
if let Some(index) = new_history.iter().rposition(|candidate| {
response_items_match_for_compaction_merge(candidate, incoming_item)
}) {
if let Some(index) =
new_history
.iter()
.rposition(|candidate| match (candidate, incoming_item) {
(
ResponseItem::Message {
role: candidate_role,
content: candidate_content,
..
},
ResponseItem::Message {
role: incoming_role,
content: incoming_content,
..
},
) => candidate_role == incoming_role && candidate_content == incoming_content,
(
ResponseItem::Compaction {
encrypted_content: candidate_content,
},
ResponseItem::Compaction {
encrypted_content: incoming_content,
},
) => candidate_content == incoming_content,
_ => candidate == incoming_item,
})
{
new_history.remove(index);
}
}
}
fn response_items_match_for_compaction_merge(
candidate: &ResponseItem,
incoming_item: &ResponseItem,
) -> bool {
match (candidate, incoming_item) {
(
ResponseItem::Message {
role: candidate_role,
content: candidate_content,
..
},
ResponseItem::Message {
role: incoming_role,
content: incoming_content,
..
},
) => candidate_role == incoming_role && candidate_content == incoming_content,
(
ResponseItem::Compaction {
encrypted_content: candidate_content,
},
ResponseItem::Compaction {
encrypted_content: incoming_content,
},
) => candidate_content == incoming_content,
_ => candidate == incoming_item,
}
}
fn log_remote_compact_failure(
turn_context: &TurnContext,
auto_compact_callsite: AutoCompactCallsite,