@@ -502,8 +502,8 @@ fn append_usage_event(
502502 . and_then ( normalize_antigravity_model) ;
503503 let model = id_model
504504 . clone ( )
505- . filter ( |model| ! is_unresolved_model ( model) )
506- . or_else ( || same_model_row. filter ( |model| ! is_unresolved_model ( model) ) )
505+ . filter ( |model| is_resolved_model ( model) )
506+ . or_else ( || same_model_row. filter ( |model| is_resolved_model ( model) ) )
507507 . or ( id_model)
508508 . or_else ( || context. model . and_then ( normalize_antigravity_model) )
509509 . unwrap_or_else ( || DEFAULT_MODEL . to_string ( ) ) ;
@@ -566,7 +566,7 @@ pub(super) fn merge_usage_event(
566566 . saturating_add ( target. cache_creation_tokens )
567567 . saturating_add ( target. cache_read_tokens )
568568 . saturating_add ( target. total_output_tokens ) ;
569- if is_unresolved_model ( & target . model ) && ! is_unresolved_model ( & duplicate . model ) {
569+ if model_resolution ( & duplicate . model ) > model_resolution ( & target . model ) {
570570 target. model = duplicate. model . clone ( ) ;
571571 }
572572 if target. provider . is_none ( ) {
@@ -910,12 +910,29 @@ fn model_name_from_id(model_id: u64) -> String {
910910const UNRESOLVED_PLACEHOLDER_PREFIX : & str = "model_placeholder_m" ;
911911const UNRESOLVED_ID_PREFIX : & str = "antigravity-model-" ;
912912
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 )
913+ #[ derive( PartialEq , Eq , PartialOrd , Ord ) ]
914+ enum ModelResolution {
915+ Default ,
916+ Placeholder ,
917+ Resolved ,
918+ }
919+
920+ // Placeholders that normalization did not map to a real model rank below a
921+ // model name from another field or a duplicate copy, but above the default.
922+ fn model_resolution ( model : & str ) -> ModelResolution {
923+ if model == DEFAULT_MODEL {
924+ ModelResolution :: Default
925+ } else if model. starts_with ( UNRESOLVED_PLACEHOLDER_PREFIX )
918926 || model. starts_with ( UNRESOLVED_ID_PREFIX )
927+ {
928+ ModelResolution :: Placeholder
929+ } else {
930+ ModelResolution :: Resolved
931+ }
932+ }
933+
934+ fn is_resolved_model ( model : & str ) -> bool {
935+ model_resolution ( model) == ModelResolution :: Resolved
919936}
920937
921938fn normalize_antigravity_model ( raw : & str ) -> Option < String > {
@@ -1432,13 +1449,69 @@ pub(super) mod test_support {
14321449mod tests {
14331450 use super :: test_support:: { UsageFixture , metadata_blob_with_steps, step_metadata_blob} ;
14341451 use super :: {
1435- API_PROVIDER_GOOGLE_GEMINI , ProtoField , ProtoValue , calculate_antigravity_cost,
1436- field_bytes, field_bytes_all, field_text, field_varint, missing_antigravity_pricing,
1437- model_candidates, model_name_from_id, normalize_antigravity_model,
1438- parse_generator_metadata, parse_step_metadata,
1452+ API_PROVIDER_GOOGLE_GEMINI , DEFAULT_MODEL , EventContext , ModelUsage , ProtoField ,
1453+ ProtoValue , append_usage_event, calculate_antigravity_cost, field_bytes, field_bytes_all,
1454+ field_text, field_varint, merge_usage_event, missing_antigravity_pricing, model_candidates,
1455+ model_name_from_id, normalize_antigravity_model, parse_generator_metadata,
1456+ parse_step_metadata,
14391457 } ;
14401458 use crate :: { PricingMap , TimestampMs , TokenUsageRaw , cli:: CostMode , parse_ts_timestamp} ;
14411459
1460+ #[ test]
1461+ fn merge_prefers_resolved_then_placeholder_then_default_model ( ) {
1462+ let event = |model : Option < & str > | {
1463+ let mut events = Vec :: new ( ) ;
1464+ append_usage_event (
1465+ & mut events,
1466+ & mut std:: collections:: HashMap :: new ( ) ,
1467+ ModelUsage {
1468+ input_tokens : 1 ,
1469+ ..ModelUsage :: default ( )
1470+ } ,
1471+ EventContext {
1472+ model,
1473+ model_id : None ,
1474+ provider : None ,
1475+ timestamp : None ,
1476+ trajectory_timestamp : None ,
1477+ fallback_timestamp : TimestampMs :: UNIX_EPOCH ,
1478+ session_id : "session" ,
1479+ fallback_identities : & [ ] ,
1480+ } ,
1481+ ) ;
1482+ events. remove ( 0 )
1483+ } ;
1484+ let merged_model = |target : Option < & str > , duplicate : Option < & str > | {
1485+ let mut target = event ( target) ;
1486+ merge_usage_event ( & mut target, event ( duplicate) ) ;
1487+ target. model
1488+ } ;
1489+
1490+ assert_eq ! (
1491+ merged_model( None , Some ( "model_placeholder_m401" ) ) ,
1492+ "model_placeholder_m401"
1493+ ) ;
1494+ assert_eq ! (
1495+ merged_model( Some ( "model_placeholder_m401" ) , None ) ,
1496+ "model_placeholder_m401"
1497+ ) ;
1498+ assert_eq ! (
1499+ merged_model(
1500+ Some ( "model_placeholder_m401" ) ,
1501+ Some ( "claude-opus-5-5-medium" )
1502+ ) ,
1503+ "claude-opus-5-5-medium"
1504+ ) ;
1505+ assert_eq ! (
1506+ merged_model(
1507+ Some ( "claude-opus-5-5-medium" ) ,
1508+ Some ( "model_placeholder_m401" )
1509+ ) ,
1510+ "claude-opus-5-5-medium"
1511+ ) ;
1512+ assert_eq ! ( merged_model( None , None ) , DEFAULT_MODEL ) ;
1513+ }
1514+
14421515 #[ test]
14431516 fn protobuf_scalars_use_last_duplicate_and_messages_keep_merge_order ( ) {
14441517 let first_text = b"first" ;
0 commit comments