Skip to content

Commit 95ed95e

Browse files
MaxGheniscodexclaude
committed
fix(codex): scope event dedupe to sessions
Prepared with AI assistance (audit + implementation: gpt-5.6-sol; review: Claude Fable 5); reviewed and tested before filing. Co-Authored-By: gpt-5.6-sol <[email protected]> Co-Authored-By: Claude Fable 5 <[email protected]>
1 parent d31f1e0 commit 95ed95e

3 files changed

Lines changed: 193 additions & 39 deletions

File tree

‎rust/crates/ccusage/src/adapter/codex/aggregate.rs‎

Lines changed: 112 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ fn add_event_to_groups(
238238
let model = crate::model_aliases::resolve_model_name(model);
239239
let timestamp = parse_ts_timestamp(&event.timestamp)
240240
.ok_or_else(|| crate::cli_error(format!("Invalid Codex timestamp: {}", event.timestamp)))?;
241-
if !insert_event_key(event, timestamp, model.as_ref(), kind, seen) {
241+
if !insert_event_key(event, timestamp, model.as_ref(), seen) {
242242
return Ok(());
243243
}
244244
add_deduped_event_to_groups(
@@ -267,7 +267,7 @@ fn add_event_to_groups_local(
267267
.ok_or_else(|| crate::cli_error(format!("Invalid Codex timestamp: {}", event.timestamp)))?;
268268
if !aggregation
269269
.seen
270-
.insert(codex_event_key(event, timestamp, model.as_ref(), kind))
270+
.insert(codex_event_key(event, timestamp, model.as_ref()))
271271
{
272272
return Ok(());
273273
}
@@ -361,10 +361,9 @@ fn insert_event_key(
361361
event: &CodexTokenUsageEvent,
362362
timestamp: crate::TimestampMs,
363363
model: &str,
364-
kind: AgentReportKind,
365364
seen: &CodexDedupeShards,
366365
) -> bool {
367-
let key = codex_event_key(event, timestamp, model, kind);
366+
let key = codex_event_key(event, timestamp, model);
368367
let mut hasher = FxHasher::default();
369368
key.hash(&mut hasher);
370369
let shard_index = hasher.finish() as usize % seen.len();
@@ -375,16 +374,12 @@ fn codex_event_key(
375374
event: &CodexTokenUsageEvent,
376375
timestamp: crate::TimestampMs,
377376
model: &str,
378-
kind: AgentReportKind,
379377
) -> CodexEventKey {
380-
let (session_hash, session_len) = if kind == AgentReportKind::Session {
381-
(hash_text(&event.session_id), event.session_id.len())
382-
} else {
383-
(0, 0)
384-
};
378+
// The parser removes structurally proven fork replay. Equal usage from
379+
// distinct sessions remains independent in every report kind.
385380
(
386-
session_hash,
387-
session_len,
381+
hash_text(&event.session_id),
382+
event.session_id.len(),
388383
timestamp,
389384
hash_text(model),
390385
model.len(),
@@ -497,8 +492,8 @@ mod tests {
497492
};
498493

499494
#[test]
500-
fn dedupes_copied_token_usage_across_session_files() {
501-
let usage_line = json!({
495+
fn counts_copied_parent_history_once() {
496+
let parent_usage = json!({
502497
"timestamp": "2026-05-29T08:01:00.000Z",
503498
"type": "event_msg",
504499
"payload": {
@@ -516,9 +511,80 @@ mod tests {
516511
},
517512
})
518513
.to_string();
514+
let fork_usage = json!({
515+
"timestamp": "2026-05-29T08:04:00.000Z",
516+
"type": "event_msg",
517+
"payload": {
518+
"type": "token_count",
519+
"info": {
520+
"model": "gpt-5.2",
521+
"last_token_usage": {
522+
"input_tokens": 100,
523+
"cached_input_tokens": 10,
524+
"output_tokens": 20,
525+
"reasoning_output_tokens": 2,
526+
"total_tokens": 120,
527+
},
528+
"total_token_usage": {
529+
"input_tokens": 1_100,
530+
"cached_input_tokens": 110,
531+
"output_tokens": 220,
532+
"reasoning_output_tokens": 22,
533+
"total_tokens": 1_320,
534+
},
535+
},
536+
},
537+
})
538+
.to_string();
519539
let fixture = fs_fixture!({
520-
"sessions/root.jsonl": &usage_line,
521-
"sessions/goal.jsonl": &usage_line,
540+
"sessions/parent.jsonl": [
541+
json!({
542+
"timestamp": "2026-05-29T08:00:00.000Z",
543+
"type": "session_meta",
544+
"payload": {"id": "parent"},
545+
})
546+
.to_string(),
547+
parent_usage.clone(),
548+
]
549+
.join("\n"),
550+
"sessions/fork.jsonl": [
551+
json!({
552+
"timestamp": "2026-05-29T08:03:00.000Z",
553+
"type": "session_meta",
554+
"payload": {
555+
"id": "fork",
556+
"forked_from_id": "parent",
557+
},
558+
})
559+
.to_string(),
560+
json!({
561+
"timestamp": "2026-05-29T08:00:00.000Z",
562+
"type": "session_meta",
563+
"payload": {"id": "parent"},
564+
})
565+
.to_string(),
566+
json!({
567+
"timestamp": "2026-05-29T08:03:00.000Z",
568+
"type": "event_msg",
569+
"payload": {
570+
"type": "task_started",
571+
"started_at": 1_780_041_660_u64,
572+
},
573+
})
574+
.to_string(),
575+
parent_usage.clone(),
576+
json!({
577+
"timestamp": "2026-05-29T08:03:00.000Z",
578+
"type": "event_msg",
579+
"payload": {
580+
"type": "task_started",
581+
"started_at": 1_780_041_780_u64,
582+
},
583+
})
584+
.to_string(),
585+
fork_usage,
586+
]
587+
.join("\n"),
522588
});
523589
for single_thread in [true, false] {
524590
let shared = SharedArgs {
@@ -536,11 +602,11 @@ mod tests {
536602

537603
assert_eq!(groups.len(), 1);
538604
let group = groups.get("2026-05-29").unwrap();
539-
assert_eq!(group.input_tokens, 1_000);
540-
assert_eq!(group.cached_input_tokens, 100);
541-
assert_eq!(group.output_tokens, 200);
542-
assert_eq!(group.reasoning_output_tokens, 20);
543-
assert_eq!(group.total_tokens, 1_200);
605+
assert_eq!(group.input_tokens, 1_100);
606+
assert_eq!(group.cached_input_tokens, 110);
607+
assert_eq!(group.output_tokens, 220);
608+
assert_eq!(group.reasoning_output_tokens, 22);
609+
assert_eq!(group.total_tokens, 1_320);
544610
}
545611
}
546612

@@ -592,7 +658,7 @@ mod tests {
592658
}
593659

594660
#[test]
595-
fn dedupes_copied_token_usage_after_model_alias_resolution() {
661+
fn keeps_matching_usage_from_distinct_sessions_after_model_alias_resolution() {
596662
let _aliases = set_model_aliases_for_tests([("private-alpha", "gpt-5.2")]);
597663
let private_usage_line = json!({
598664
"timestamp": "2026-05-29T08:01:00.000Z",
@@ -649,14 +715,14 @@ mod tests {
649715
.unwrap();
650716

651717
let group = groups.get("2026-05-29").unwrap();
652-
assert_eq!(group.input_tokens, 1_000);
718+
assert_eq!(group.input_tokens, 2_000);
653719
assert_eq!(group.models.len(), 1);
654-
assert_eq!(group.models["gpt-5.2"].input_tokens, 1_000);
720+
assert_eq!(group.models["gpt-5.2"].input_tokens, 2_000);
655721
}
656722
}
657723

658724
#[test]
659-
fn keeps_matching_token_usage_in_distinct_session_groups() {
725+
fn daily_and_session_reports_reconcile_for_matching_independent_sessions() {
660726
let usage_line = json!({
661727
"timestamp": "2026-05-29T08:01:00.000Z",
662728
"type": "event_msg",
@@ -686,16 +752,33 @@ mod tests {
686752
..SharedArgs::default()
687753
};
688754

689-
let groups = load_groups_from_directory(
755+
let daily_groups = load_groups_from_directory(
756+
&fixture.path("sessions"),
757+
&shared,
758+
AgentReportKind::Daily,
759+
)
760+
.unwrap();
761+
let session_groups = load_groups_from_directory(
690762
&fixture.path("sessions"),
691763
&shared,
692764
AgentReportKind::Session,
693765
)
694766
.unwrap();
695767

696-
assert_eq!(groups.len(), 2);
697-
assert_eq!(groups["root"].input_tokens, 1_000);
698-
assert_eq!(groups["goal"].input_tokens, 1_000);
768+
let daily = &daily_groups["2026-05-29"];
769+
assert_eq!(daily.input_tokens, 2_000);
770+
assert_eq!(daily.cached_input_tokens, 200);
771+
assert_eq!(daily.output_tokens, 400);
772+
assert_eq!(daily.reasoning_output_tokens, 40);
773+
assert_eq!(daily.total_tokens, 2_400);
774+
assert_eq!(session_groups.len(), 2);
775+
assert_eq!(
776+
session_groups
777+
.values()
778+
.map(|group| group.total_tokens)
779+
.sum::<u64>(),
780+
daily.total_tokens
781+
);
699782
}
700783
}
701784

‎rust/crates/ccusage/src/adapter/codex/loader.rs‎

Lines changed: 76 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,10 @@ fn read_codex_session_file(sessions_dir: &Path, path: &Path) -> Vec<CodexTokenUs
125125
fn dedupe_codex_events(events: &mut Vec<CodexTokenUsageEvent>) {
126126
let mut seen = FxHashSet::default();
127127
events.retain(|event| {
128+
// Fork replay is removed structurally while parsing, so value-based
129+
// dedupe only applies within the same session.
128130
seen.insert((
131+
CompactString::new(&event.session_id),
129132
CompactString::new(&event.timestamp),
130133
event.model.as_deref().map(CompactString::new),
131134
event.input_tokens,
@@ -161,18 +164,27 @@ mod tests {
161164
}
162165

163166
#[test]
164-
fn dedupes_matching_codex_usage_events_from_distinct_sessions() {
167+
fn keeps_matching_codex_usage_events_from_distinct_sessions() {
165168
let mut events = vec![codex_event("session-a"), codex_event("session-b")];
166169

167170
dedupe_codex_events(&mut events);
168171

169-
assert_eq!(events.len(), 1);
172+
assert_eq!(events.len(), 2);
170173
assert_eq!(events[0].session_id, "session-a");
174+
assert_eq!(events[1].session_id, "session-b");
171175
}
172176

173177
#[test]
174-
fn dedupes_copied_branch_history_across_session_files() {
178+
fn counts_copied_parent_history_once_across_session_files() {
175179
let parent_history = [
180+
json!({
181+
"timestamp": "2026-05-12T08:00:00.000Z",
182+
"type": "session_meta",
183+
"payload": {
184+
"id": "parent",
185+
},
186+
})
187+
.to_string(),
176188
json!({
177189
"timestamp": "2026-05-12T08:00:00.000Z",
178190
"type": "turn_context",
@@ -201,8 +213,67 @@ mod tests {
201213
]
202214
.join("\n");
203215
let branch_history = [
204-
parent_history.as_str(),
205-
&json!({
216+
json!({
217+
"timestamp": "2026-05-12T08:02:00.000Z",
218+
"type": "session_meta",
219+
"payload": {
220+
"id": "branch",
221+
"forked_from_id": "parent",
222+
},
223+
})
224+
.to_string(),
225+
json!({
226+
"timestamp": "2026-05-12T08:00:00.000Z",
227+
"type": "session_meta",
228+
"payload": {
229+
"id": "parent",
230+
},
231+
})
232+
.to_string(),
233+
json!({
234+
"timestamp": "2026-05-12T08:02:00.000Z",
235+
"type": "event_msg",
236+
"payload": {
237+
"type": "task_started",
238+
"started_at": 1_778_572_800_u64,
239+
},
240+
})
241+
.to_string(),
242+
json!({
243+
"timestamp": "2026-05-12T08:00:00.000Z",
244+
"type": "turn_context",
245+
"payload": {
246+
"model": "gpt-5.2",
247+
},
248+
})
249+
.to_string(),
250+
json!({
251+
"timestamp": "2026-05-12T08:01:00.000Z",
252+
"type": "event_msg",
253+
"payload": {
254+
"type": "token_count",
255+
"info": {
256+
"total_token_usage": {
257+
"input_tokens": 1_000,
258+
"cached_input_tokens": 100,
259+
"output_tokens": 200,
260+
"reasoning_output_tokens": 20,
261+
"total_tokens": 1_200,
262+
},
263+
},
264+
},
265+
})
266+
.to_string(),
267+
json!({
268+
"timestamp": "2026-05-12T08:02:00.000Z",
269+
"type": "event_msg",
270+
"payload": {
271+
"type": "task_started",
272+
"started_at": 1_778_572_920_u64,
273+
},
274+
})
275+
.to_string(),
276+
json!({
206277
"timestamp": "2026-05-12T08:02:00.000Z",
207278
"type": "event_msg",
208279
"payload": {

‎rust/crates/ccusage/src/adapter/codex/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mod tests {
9696
}
9797

9898
#[test]
99-
fn dedupes_matching_grouped_codex_usage_events_from_distinct_sessions() {
99+
fn keeps_matching_grouped_codex_usage_events_from_distinct_sessions() {
100100
let usage_line = r#"{"timestamp":"2026-01-02T00:00:00.000Z","type":"event_msg","payload":{"type":"token_count","info":{"model":"gpt-5","last_token_usage":{"input_tokens":100,"cached_input_tokens":10,"output_tokens":50,"reasoning_output_tokens":0,"total_tokens":150}}}}"#;
101101
let fixture = fs_fixture!({
102102
"sessions/session-a.jsonl": usage_line,
@@ -113,10 +113,10 @@ mod tests {
113113

114114
assert_eq!(groups.len(), 1);
115115
let group = groups.get("2026-01-02").unwrap();
116-
assert_eq!(group.input_tokens, 100);
117-
assert_eq!(group.cached_input_tokens, 10);
118-
assert_eq!(group.output_tokens, 50);
119-
assert_eq!(group.total_tokens, 150);
116+
assert_eq!(group.input_tokens, 200);
117+
assert_eq!(group.cached_input_tokens, 20);
118+
assert_eq!(group.output_tokens, 100);
119+
assert_eq!(group.total_tokens, 300);
120120
}
121121

122122
#[test]

0 commit comments

Comments
 (0)