@@ -492,18 +492,19 @@ fn append_usage_event(
492492 let reasoning_tokens = usage
493493 . reasoning_tokens
494494 . max ( total_output_tokens. saturating_sub ( output_tokens) ) ;
495- let same_model_row = context. model . filter ( |_| context. model_id == usage. model_id ) ;
496- let model = usage
495+ let id_model = usage
497496 . model_id
498- . and_then ( known_model_name)
499- . and_then ( normalize_antigravity_model)
500- . or_else ( || same_model_row. and_then ( normalize_antigravity_model) )
501- . or_else ( || {
502- usage
503- . model_id
504- . map ( model_name_from_id)
505- . and_then ( |model| normalize_antigravity_model ( & model) )
506- } )
497+ . map ( model_name_from_id)
498+ . and_then ( |model| normalize_antigravity_model ( & model) ) ;
499+ let same_model_row = context
500+ . model
501+ . filter ( |_| context. model_id == usage. model_id )
502+ . and_then ( normalize_antigravity_model) ;
503+ let model = id_model
504+ . clone ( )
505+ . filter ( |model| !is_unresolved_model ( model) )
506+ . or_else ( || same_model_row. filter ( |model| !is_unresolved_model ( model) ) )
507+ . or ( id_model)
507508 . or_else ( || context. model . and_then ( normalize_antigravity_model) )
508509 . unwrap_or_else ( || DEFAULT_MODEL . to_string ( ) ) ;
509510 let provider = usage. provider . or ( context. provider ) ;
@@ -565,7 +566,7 @@ pub(super) fn merge_usage_event(
565566 . saturating_add ( target. cache_creation_tokens )
566567 . saturating_add ( target. cache_read_tokens )
567568 . saturating_add ( target. total_output_tokens ) ;
568- if target. model == DEFAULT_MODEL && duplicate. model != DEFAULT_MODEL {
569+ if is_unresolved_model ( & target. model ) && ! is_unresolved_model ( & duplicate. model ) {
569570 target. model = duplicate. model . clone ( ) ;
570571 }
571572 if target. provider . is_none ( ) {
@@ -879,40 +880,42 @@ fn field_text(fields: &[ProtoField<'_>], number: u32) -> Option<String> {
879880}
880881
881882fn model_name_from_id ( model_id : u64 ) -> String {
882- known_model_name ( model_id) . map_or_else (
883- || match model_id {
884- 1_000 .. => format ! ( "model_placeholder_m{}" , model_id - 1_000 ) ,
885- _ => format ! ( "antigravity-model-{model_id}" ) ,
886- } ,
887- ToString :: to_string,
888- )
883+ match model_id {
884+ 246 => "gemini-2.5-pro" . to_string ( ) ,
885+ 312 => "gemini-2.5-flash" . to_string ( ) ,
886+ 313 | 329 => "gemini-2.5-flash-thinking" . to_string ( ) ,
887+ 330 => "gemini-2.5-flash-lite" . to_string ( ) ,
888+ 281 | 282 => "claude-4-sonnet" . to_string ( ) ,
889+ 290 | 291 => "claude-4-opus" . to_string ( ) ,
890+ 333 | 334 => "claude-4.5-sonnet" . to_string ( ) ,
891+ 340 | 341 => "claude-4.5-haiku" . to_string ( ) ,
892+ 342 => "model_openai_gpt_oss_120b_medium" . to_string ( ) ,
893+ 1318 => "gemini-3.8-flash-high" . to_string ( ) ,
894+ 1319 => "gemini-3.8-flash-medium" . to_string ( ) ,
895+ 1320 => "gemini-3.8-flash-low" . to_string ( ) ,
896+ 1298 => "gemini-3.7-flash-high" . to_string ( ) ,
897+ 1299 => "gemini-3.7-flash-medium" . to_string ( ) ,
898+ 1300 => "gemini-3.7-flash-low" . to_string ( ) ,
899+ 1071 => "gemini-3.6-flash-high" . to_string ( ) ,
900+ 1072 => "gemini-3.6-flash-medium" . to_string ( ) ,
901+ 1073 => "gemini-3.6-flash-low" . to_string ( ) ,
902+ 1417 ..=1419 => "gemini-4-argon" . to_string ( ) ,
903+ 1402 => "claude-opus-5-5" . to_string ( ) ,
904+ 1050 => "gemini-3.1-flash-lite" . to_string ( ) ,
905+ 1_000 .. => format ! ( "{UNRESOLVED_PLACEHOLDER_PREFIX}{}" , model_id - 1_000 ) ,
906+ _ => format ! ( "{UNRESOLVED_ID_PREFIX}{model_id}" ) ,
907+ }
889908}
890909
891- fn known_model_name ( model_id : u64 ) -> Option < & ' static str > {
892- Some ( match model_id {
893- 246 => "gemini-2.5-pro" ,
894- 312 => "gemini-2.5-flash" ,
895- 313 | 329 => "gemini-2.5-flash-thinking" ,
896- 330 => "gemini-2.5-flash-lite" ,
897- 281 | 282 => "claude-4-sonnet" ,
898- 290 | 291 => "claude-4-opus" ,
899- 333 | 334 => "claude-4.5-sonnet" ,
900- 340 | 341 => "claude-4.5-haiku" ,
901- 342 => "model_openai_gpt_oss_120b_medium" ,
902- 1318 => "gemini-3.8-flash-high" ,
903- 1319 => "gemini-3.8-flash-medium" ,
904- 1320 => "gemini-3.8-flash-low" ,
905- 1298 => "gemini-3.7-flash-high" ,
906- 1299 => "gemini-3.7-flash-medium" ,
907- 1300 => "gemini-3.7-flash-low" ,
908- 1071 => "gemini-3.6-flash-high" ,
909- 1072 => "gemini-3.6-flash-medium" ,
910- 1073 => "gemini-3.6-flash-low" ,
911- 1417 ..=1419 => "gemini-4-argon" ,
912- 1402 => "claude-opus-5-5" ,
913- 1050 => "gemini-3.1-flash-lite" ,
914- _ => return None ,
915- } )
910+ const UNRESOLVED_PLACEHOLDER_PREFIX : & str = "model_placeholder_m" ;
911+ const UNRESOLVED_ID_PREFIX : & str = "antigravity-model-" ;
912+
913+ // A placeholder that normalization did not map to a real model, so a model
914+ // name from another field or a duplicate copy should replace it.
915+ fn is_unresolved_model ( model : & str ) -> bool {
916+ model == DEFAULT_MODEL
917+ || model. starts_with ( UNRESOLVED_PLACEHOLDER_PREFIX )
918+ || model. starts_with ( UNRESOLVED_ID_PREFIX )
916919}
917920
918921fn normalize_antigravity_model ( raw : & str ) -> Option < String > {
0 commit comments