Skip to content

Commit 0861e7f

Browse files
fix(claude): count requestless resp_ content blocks once (ccusage#1935)
Requestless Claude Code lines whose message.id is an OpenAI Responses API resp_ ID were counted once per content block, doubling usage. is_anthropic_message_id now accepts resp_ as well as msg_, so those lines collapse by session across content-block timestamps. Closes ccusage#1934 Co-authored-by: StartupBros <[email protected]>
1 parent 3d3ca0b commit 0861e7f

4 files changed

Lines changed: 94 additions & 2 deletions

File tree

‎rust/adapters/claude/src/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Sidechain entries:
3636
- When `requestId` is missing, both loaders deduplicate by message ID, effective
3737
session ID, and timestamp. Repeated writes at the same timestamp still
3838
collapse; distinct timestamps stay separate, except that real Anthropic
39-
message IDs (`msg_` prefix) collapse across timestamps because Claude Code
39+
message IDs (`msg_` prefix) and OpenAI `resp_` IDs collapse across timestamps because Claude Code
4040
writes one line per content block for a single response. Both keep gateway
4141
responses that reuse a message ID in different sessions separate.
4242
- When `requestId` is present, both loaders deduplicate matching message and

‎rust/adapters/claude/src/daily.rs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -937,6 +937,43 @@ mod tests {
937937
assert_eq!(deduped[0].usage.output_tokens, 25);
938938
}
939939

940+
#[test]
941+
fn dedupes_response_message_id_from_same_session_at_distinct_timestamps() {
942+
let mut deduped_indexes = Default::default();
943+
let mut deduped = Vec::new();
944+
945+
let mut first = daily_loaded_entry_at(
946+
DailyEntryFixture {
947+
message_id: "resp_0123456789abcdef",
948+
request_id: "unused",
949+
is_sidechain: false,
950+
cache_read_tokens: 0,
951+
output_tokens: 25,
952+
},
953+
"session-a",
954+
TimestampMs::from_millis(1_774_000_000_000),
955+
);
956+
first.request_id = None;
957+
push_deduped_daily_entry(first, &mut deduped_indexes, &mut deduped);
958+
959+
let mut second = daily_loaded_entry_at(
960+
DailyEntryFixture {
961+
message_id: "resp_0123456789abcdef",
962+
request_id: "unused",
963+
is_sidechain: false,
964+
cache_read_tokens: 0,
965+
output_tokens: 25,
966+
},
967+
"session-a",
968+
TimestampMs::from_millis(1_774_000_000_500),
969+
);
970+
second.request_id = None;
971+
push_deduped_daily_entry(second, &mut deduped_indexes, &mut deduped);
972+
973+
assert_eq!(deduped.len(), 1);
974+
assert_eq!(deduped[0].usage.output_tokens, 25);
975+
}
976+
940977
#[test]
941978
fn keeps_daily_sidechain_replay_from_distinct_session() {
942979
let mut deduped_indexes = Default::default();

‎rust/adapters/claude/src/lib.rs‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,9 @@ fn usage_dedupe_hash(
370370
///
371371
/// The prefix is a heuristic: only a request ID proves two lines belong to one response, so a
372372
/// gateway that reused a `msg_`-shaped placeholder would collapse to one entry per session.
373+
/// OpenAI Responses API `resp_` IDs are treated the same way.
373374
pub(crate) fn is_anthropic_message_id(message_id: &str) -> bool {
374-
message_id.starts_with("msg_")
375+
message_id.starts_with("msg_") || message_id.starts_with("resp_")
375376
}
376377

377378
fn sidechain_replay_dedupe_hash(message_id: &str, session_id: &str) -> u64 {
@@ -1282,6 +1283,32 @@ mod tests {
12821283
assert_eq!(deduped[0].data.message.usage.output_tokens, 25);
12831284
}
12841285

1286+
#[test]
1287+
fn dedupes_response_message_id_from_same_session_at_distinct_timestamps() {
1288+
let fixture = fs_fixture!({
1289+
"projects/project-a/session-a/chat.jsonl": [
1290+
r#"{"timestamp":"2026-05-22T02:34:40.000Z","message":{"id":"resp_0123456789abcdef","model":"gpt-5.5","usage":{"input_tokens":100,"output_tokens":25}}}"#,
1291+
r#"{"timestamp":"2026-05-22T02:34:40.500Z","message":{"id":"resp_0123456789abcdef","model":"gpt-5.5","usage":{"input_tokens":100,"output_tokens":25}}}"#,
1292+
]
1293+
.join("\n"),
1294+
});
1295+
let mut deduped_indexes = Default::default();
1296+
let mut deduped = Vec::new();
1297+
1298+
let loaded = read_usage_file(
1299+
&fixture.path("projects/project-a/session-a/chat.jsonl"),
1300+
None,
1301+
CostMode::Display,
1302+
None,
1303+
);
1304+
for entry in loaded.entries {
1305+
push_deduped_entry(entry, &mut deduped_indexes, &mut deduped);
1306+
}
1307+
1308+
assert_eq!(deduped.len(), 1);
1309+
assert_eq!(deduped[0].data.message.usage.output_tokens, 25);
1310+
}
1311+
12851312
#[test]
12861313
fn dedupes_repeated_requestless_writes_at_the_same_timestamp() {
12871314
let fixture = fs_fixture!({

‎rust/crates/ccusage/tests/claude_cli.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,34 @@ fn requestless_anthropic_message_id_content_blocks_are_counted_once_in_every_rep
714714
}
715715
}
716716

717+
#[test]
718+
fn requestless_response_message_id_content_blocks_are_counted_once_in_every_report() {
719+
let fixture = Fixture::new();
720+
let lines = [
721+
requestless_line(
722+
"2026-09-11T12:00:00.000Z",
723+
"session-a",
724+
"resp_0123456789abcdef",
725+
100,
726+
0,
727+
false,
728+
),
729+
requestless_line(
730+
"2026-09-11T12:00:00.500Z",
731+
"session-a",
732+
"resp_0123456789abcdef",
733+
100,
734+
0,
735+
false,
736+
),
737+
];
738+
let _ = fixture.write_file("projects/project-a/session-a.jsonl", lines.join("\n"));
739+
740+
for (command, total) in claude_report_totals(&fixture) {
741+
assert_eq!(total, 102, "claude {command}");
742+
}
743+
}
744+
717745
#[test]
718746
fn requestless_anthropic_message_id_keeps_largest_usage_across_days_and_sessions() {
719747
let fixture = Fixture::new();

0 commit comments

Comments
 (0)