Skip to content

Commit 88ee6e1

Browse files
committed
fix(codex): dedupe copied rollout token events
Align the streaming Codex group aggregation dedupe key with the event loader so copied token_count rows from goal or rollout session files are counted once instead of once per session file. This prevents daily and monthly table reports from double-counting copied Codex history while preserving the same token tuple based duplicate detection already used by JSON/all-agent loading paths.
1 parent 22e5944 commit 88ee6e1

2 files changed

Lines changed: 48 additions & 19 deletions

File tree

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

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,7 @@ use crate::{
1818

1919
use super::{parser, paths};
2020

21-
type CodexEventKey = (
22-
u64,
23-
usize,
24-
crate::TimestampMs,
25-
u64,
26-
usize,
27-
u64,
28-
u64,
29-
u64,
30-
u64,
31-
u64,
32-
);
21+
type CodexEventKey = (crate::TimestampMs, u64, usize, u64, u64, u64, u64, u64);
3322
type CodexDedupeShards = [Mutex<FxHashSet<CodexEventKey>>];
3423

3524
struct CodexAggregation {
@@ -356,8 +345,6 @@ fn codex_event_key(
356345
model: &str,
357346
) -> CodexEventKey {
358347
(
359-
hash_text(&event.session_id),
360-
event.session_id.len(),
361348
timestamp,
362349
hash_text(model),
363350
model.len(),
@@ -463,6 +450,48 @@ mod tests {
463450

464451
use crate::adapter::codex::paths::CodexUsageSource;
465452

453+
#[test]
454+
fn dedupes_copied_token_usage_across_session_files() {
455+
let usage_line = json!({
456+
"timestamp": "2026-05-29T08:01:00.000Z",
457+
"type": "event_msg",
458+
"payload": {
459+
"type": "token_count",
460+
"info": {
461+
"model": "gpt-5.2",
462+
"last_token_usage": {
463+
"input_tokens": 1_000,
464+
"cached_input_tokens": 100,
465+
"output_tokens": 200,
466+
"reasoning_output_tokens": 20,
467+
"total_tokens": 1_200,
468+
},
469+
},
470+
},
471+
})
472+
.to_string();
473+
let fixture = fs_fixture!({
474+
"sessions/root.jsonl": &usage_line,
475+
"sessions/goal.jsonl": &usage_line,
476+
});
477+
let shared = SharedArgs {
478+
timezone: Some("UTC".to_string()),
479+
..SharedArgs::default()
480+
};
481+
482+
let groups =
483+
load_groups_from_directory(&fixture.path("sessions"), &shared, AgentReportKind::Daily)
484+
.unwrap();
485+
486+
assert_eq!(groups.len(), 1);
487+
let group = groups.get("2026-05-29").unwrap();
488+
assert_eq!(group.input_tokens, 1_000);
489+
assert_eq!(group.cached_input_tokens, 100);
490+
assert_eq!(group.output_tokens, 200);
491+
assert_eq!(group.reasoning_output_tokens, 20);
492+
assert_eq!(group.total_tokens, 1_200);
493+
}
494+
466495
#[test]
467496
fn aggregates_active_copy_when_archived_file_has_same_relative_path() {
468497
let active_usage = [

‎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 keeps_matching_grouped_codex_usage_events_from_distinct_sessions() {
99+
fn dedupes_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, 200);
117-
assert_eq!(group.cached_input_tokens, 20);
118-
assert_eq!(group.output_tokens, 100);
119-
assert_eq!(group.total_tokens, 300);
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);
120120
}
121121

122122
#[test]

0 commit comments

Comments
 (0)