Skip to content

Commit 8f4df2a

Browse files
committed
fix(codex): preserve valid pending usage across invalid records
Keep the latest valid response ID when an invalid or already-accounted record is ignored. Clearing it before validation prevented cumulative snapshots from consuming the pending compaction usage and counted it twice. Add exact-total regressions for missing IDs, timestamps, empty usage, and duplicate completed responses. This addresses Pullfrog's review on #1821.
1 parent dbac9e6 commit 8f4df2a

2 files changed

Lines changed: 30 additions & 1 deletion

File tree

‎rust/adapters/codex/src/compaction_tests.rs‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,36 @@ fn local_compaction_usage_already_in_cumulative_counts_is_not_added_again() {
310310
}
311311
}
312312

313+
#[test]
314+
fn invalid_or_completed_records_do_not_hide_pending_compaction_usage() {
315+
let old_record = r#"{"timestamp":"2026-09-01T00:00:01Z","type":"token_usage_record","payload":{"response_id":"old-response","usage":{"input_tokens":100,"output_tokens":20}}}"#;
316+
for gap in [
317+
r#"{"type":"token_usage_record","payload":{"response_id":" "}}"#,
318+
r#"{"type":"token_usage_record","payload":{"response_id":"invalid-response","usage":{"input_tokens":1}}}"#,
319+
r#"{"timestamp":"2026-09-01T00:00:04Z","type":"token_usage_record","payload":{"response_id":"empty-usage","usage":{}}}"#,
320+
old_record,
321+
] {
322+
let fixture = fs_fixture!({
323+
"session.jsonl": [
324+
r#"{"type":"turn_context","payload":{"model":"gpt-5"}}"#,
325+
old_record,
326+
r#"{"timestamp":"2026-09-01T00:00:02Z","type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"input_tokens":100,"output_tokens":20}}}}"#,
327+
r#"{"type":"compacted","payload":{"compaction_response_id":"old-response"}}"#,
328+
r#"{"timestamp":"2026-09-01T00:00:03Z","type":"token_usage_record","payload":{"response_id":"new-response","usage":{"input_tokens":300,"output_tokens":30}}}"#,
329+
gap,
330+
r#"{"timestamp":"2026-09-01T00:00:05Z","type":"event_msg","payload":{"type":"token_count","info":{"total_token_usage":{"input_tokens":400,"output_tokens":50}}}}"#,
331+
r#"{"type":"compacted","payload":{"compaction_response_id":"new-response"}}"#,
332+
].join("\n"),
333+
});
334+
let events = load_codex_events_from_directory(fixture.root(), true).unwrap();
335+
assert_eq!(
336+
events.iter().map(|event| event.total_tokens).sum::<u64>(),
337+
450
338+
);
339+
assert!(events.iter().all(|event| event.response_id.is_none()));
340+
}
341+
}
342+
313343
#[test]
314344
fn thread_totals_identify_already_counted_compaction_without_an_earlier_snapshot() {
315345
let fixture = fs_fixture!({

‎rust/adapters/codex/src/parser.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@ fn visit_codex_session_entry(
361361
return Ok(());
362362
}
363363
if entry_type == Some("token_usage_record") {
364-
compaction_usage.latest_usage_response_id = None;
365364
let Some(payload) = value.payload.as_ref() else {
366365
return Ok(());
367366
};

0 commit comments

Comments
 (0)