Skip to content

Commit d0a086f

Browse files
committed
fix(codex): dedupe copied branch history
Codex Desktop branch sessions can copy earlier token_count history into a new JSONL file. The vector loader still included session_id in its dedupe key, so all-agent and other event-vector paths could count copied history again even though the streaming aggregator already used a path-independent event fingerprint. Sort Codex session files before loading so parent and branch fixtures are processed deterministically, and use timestamp/model/token fields as the event identity. Add a regression that verifies copied parent history is counted once while the branched session new cumulative delta is retained. Fixes #988
1 parent bf84d4b commit d0a086f

1 file changed

Lines changed: 80 additions & 2 deletions

File tree

  • rust/crates/ccusage/src/adapter/codex

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

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ pub(crate) fn load_codex_events_from_directory(
1818
) -> Result<Vec<CodexTokenUsageEvent>> {
1919
let mut files = Vec::new();
2020
collect_usage_files(sessions_dir, &mut files);
21+
files.sort_by_cached_key(|path| path.to_string_lossy().into_owned());
2122
let mut events = if single_thread {
2223
files
2324
.iter()
@@ -104,7 +105,6 @@ fn dedupe_codex_events(events: &mut Vec<CodexTokenUsageEvent>) {
104105
let mut seen = FxHashSet::default();
105106
events.retain(|event| {
106107
seen.insert((
107-
CompactString::new(&event.session_id),
108108
CompactString::new(&event.timestamp),
109109
event.model.as_deref().map(CompactString::new),
110110
event.input_tokens,
@@ -142,12 +142,90 @@ mod tests {
142142
}
143143

144144
#[test]
145-
fn keeps_matching_codex_usage_events_from_distinct_sessions() {
145+
fn dedupes_matching_codex_usage_events_from_distinct_sessions() {
146146
let mut events = vec![codex_event("session-a"), codex_event("session-b")];
147147

148148
dedupe_codex_events(&mut events);
149149

150+
assert_eq!(events.len(), 1);
151+
assert_eq!(events[0].session_id, "session-a");
152+
}
153+
154+
#[test]
155+
fn dedupes_copied_branch_history_across_session_files() {
156+
let dir = temp_dir("branch-history");
157+
let parent_history = [
158+
json!({
159+
"timestamp": "2026-05-12T08:00:00.000Z",
160+
"type": "turn_context",
161+
"payload": {
162+
"model": "gpt-5.2",
163+
},
164+
})
165+
.to_string(),
166+
json!({
167+
"timestamp": "2026-05-12T08:01:00.000Z",
168+
"type": "event_msg",
169+
"payload": {
170+
"type": "token_count",
171+
"info": {
172+
"total_token_usage": {
173+
"input_tokens": 1_000,
174+
"cached_input_tokens": 100,
175+
"output_tokens": 200,
176+
"reasoning_output_tokens": 20,
177+
"total_tokens": 1_200,
178+
},
179+
},
180+
},
181+
})
182+
.to_string(),
183+
]
184+
.join("\n");
185+
fs::write(dir.join("2026-05-12T08-00-00-parent.jsonl"), &parent_history).unwrap();
186+
fs::write(
187+
dir.join("2026-05-12T08-02-00-branch.jsonl"),
188+
[
189+
parent_history,
190+
json!({
191+
"timestamp": "2026-05-12T08:02:00.000Z",
192+
"type": "event_msg",
193+
"payload": {
194+
"type": "token_count",
195+
"info": {
196+
"total_token_usage": {
197+
"input_tokens": 1_600,
198+
"cached_input_tokens": 300,
199+
"output_tokens": 450,
200+
"reasoning_output_tokens": 40,
201+
"total_tokens": 2_050,
202+
},
203+
},
204+
},
205+
})
206+
.to_string(),
207+
]
208+
.join("\n"),
209+
)
210+
.unwrap();
211+
212+
let events = load_codex_events_from_directory(&dir, true).unwrap();
213+
150214
assert_eq!(events.len(), 2);
215+
assert_eq!(events[0].session_id, "2026-05-12T08-00-00-parent");
216+
assert_eq!(events[0].input_tokens, 1_000);
217+
assert_eq!(events[0].cached_input_tokens, 100);
218+
assert_eq!(events[0].output_tokens, 200);
219+
assert_eq!(events[0].reasoning_output_tokens, 20);
220+
assert_eq!(events[0].total_tokens, 1_200);
221+
assert_eq!(events[1].session_id, "2026-05-12T08-02-00-branch");
222+
assert_eq!(events[1].input_tokens, 600);
223+
assert_eq!(events[1].cached_input_tokens, 200);
224+
assert_eq!(events[1].output_tokens, 250);
225+
assert_eq!(events[1].reasoning_output_tokens, 20);
226+
assert_eq!(events[1].total_tokens, 850);
227+
228+
fs::remove_dir_all(dir).unwrap();
151229
}
152230

153231
fn temp_dir(name: &str) -> PathBuf {

0 commit comments

Comments
 (0)