Skip to content

Commit 00fead0

Browse files
github-actions[bot]zhibisoraryoppippi
authored
fix(antigravity): deduplicate unkeyed mirror usage via step index fallback (ccusage#2027)
* fix(antigravity): deduplicate unkeyed mirror usage via step index fallback Co-authored-by: zhibisora <[email protected]> * fix(antigravity): keep distinct retry attempts out of the turn fallback identity The step/generator positional fallback identity identifies the primary turn, but it was also attached to every unkeyed retry_infos entry. Because deduplicate_events merges by taking the max of each token field, a real failed attempt (e.g. same input, fewer output tokens) was folded into the successful attempt and its usage silently disappeared. retry_infos lists every attempt, including the one already reported as the primary usage. So the only retry that duplicates the primary is that one mirror entry, whatever the attempt count. Drop exactly that entry (not only when there is a single retry, which still left 2x for multi-attempt turns), and leave the remaining retries without the turn's positional identity so they are counted as their own usage. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: zhibisora <[email protected]> Co-authored-by: ryoppippi <[email protected]>
1 parent 3297d33 commit 00fead0

2 files changed

Lines changed: 299 additions & 14 deletions

File tree

‎rust/adapters/antigravity/src/loader.rs‎

Lines changed: 134 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ mod tests {
139139

140140
use super::*;
141141
use crate::parser::test_support::{
142-
UsageFixture, create_database, metadata_blob, step_metadata_blob, trajectory_metadata_blob,
142+
UsageFixture, create_database, metadata_blob, metadata_blob_with_steps, step_metadata_blob,
143+
trajectory_metadata_blob,
143144
};
144145

145146
fn shared(single_thread: bool) -> SharedArgs {
@@ -532,6 +533,138 @@ mod tests {
532533
assert_eq!(entries[1].data.message.usage.input_tokens, 11);
533534
}
534535

536+
#[test]
537+
fn deduplicates_unkeyed_mirror_copies_via_step_index() {
538+
let fixture = Fixture::new();
539+
let unkeyed = UsageFixture {
540+
input_tokens: 15_027,
541+
total_output_tokens: 49,
542+
visible_output_tokens: 49,
543+
cache_read_tokens: 500_131,
544+
..UsageFixture::default()
545+
};
546+
create_database(
547+
&fixture.path("conversations/session.db"),
548+
&[(
549+
0,
550+
metadata_blob_with_steps(
551+
Some("gemini-4-argon"),
552+
Some(unkeyed),
553+
Some((1_778_100_001, 0)),
554+
&[unkeyed],
555+
&[1],
556+
),
557+
)],
558+
&[(
559+
1,
560+
step_metadata_blob(
561+
Some("gemini-4-argon-medium"),
562+
Some(unkeyed),
563+
Some((1_778_100_000, 0)),
564+
&[],
565+
None,
566+
),
567+
)],
568+
&[],
569+
);
570+
571+
let entries = load_from_fixture(&fixture, true);
572+
573+
assert_eq!(entries.len(), 1);
574+
assert_eq!(entries[0].data.message.usage.input_tokens, 15_027);
575+
assert_eq!(
576+
entries[0].data.message.usage.cache_read_input_tokens,
577+
500_131
578+
);
579+
assert_eq!(entries[0].data.message.usage.output_tokens, 49);
580+
}
581+
582+
#[test]
583+
fn drops_unkeyed_retry_mirror_without_step_link() {
584+
let fixture = Fixture::new();
585+
let unkeyed = UsageFixture {
586+
input_tokens: 100,
587+
total_output_tokens: 50,
588+
visible_output_tokens: 50,
589+
..UsageFixture::default()
590+
};
591+
create_database(
592+
&fixture.path("conversations/session.db"),
593+
&[(
594+
1,
595+
metadata_blob(
596+
Some("gemini-3-pro"),
597+
Some(unkeyed),
598+
Some((1_778_100_001, 0)),
599+
&[unkeyed],
600+
),
601+
)],
602+
&[],
603+
&[],
604+
);
605+
606+
let entries = load_from_fixture(&fixture, true);
607+
608+
assert_eq!(entries.len(), 1);
609+
assert_eq!(entries[0].data.message.usage.input_tokens, 100);
610+
assert_eq!(entries[0].data.message.usage.output_tokens, 50);
611+
}
612+
613+
#[test]
614+
fn keeps_unkeyed_failed_attempt_when_retries_mirror_primary() {
615+
let fixture = Fixture::new();
616+
let success = UsageFixture {
617+
input_tokens: 100,
618+
total_output_tokens: 50,
619+
visible_output_tokens: 50,
620+
..UsageFixture::default()
621+
};
622+
let failed = UsageFixture {
623+
input_tokens: 100,
624+
total_output_tokens: 10,
625+
visible_output_tokens: 10,
626+
..UsageFixture::default()
627+
};
628+
create_database(
629+
&fixture.path("conversations/session.db"),
630+
&[(
631+
0,
632+
metadata_blob_with_steps(
633+
Some("gemini-3-pro"),
634+
Some(success),
635+
Some((1_778_100_001, 0)),
636+
&[failed, success],
637+
&[1],
638+
),
639+
)],
640+
&[(
641+
1,
642+
step_metadata_blob(
643+
Some("gemini-3-pro"),
644+
Some(success),
645+
Some((1_778_100_000, 0)),
646+
&[],
647+
None,
648+
),
649+
)],
650+
&[],
651+
);
652+
653+
let entries = load_from_fixture(&fixture, true);
654+
655+
let mut usages = entries
656+
.iter()
657+
.map(|entry| {
658+
(
659+
entry.data.message.usage.input_tokens,
660+
entry.data.message.usage.output_tokens,
661+
)
662+
})
663+
.collect::<Vec<_>>();
664+
usages.sort_unstable();
665+
assert_eq!(usages, vec![(100, 10), (100, 50)]);
666+
}
667+
535668
#[test]
536669
fn attributes_step_and_retry_usage_to_their_token_models() {
537670
let fixture = Fixture::new();

0 commit comments

Comments
 (0)