@@ -218,6 +218,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
218218 usage,
219219 EventContext {
220220 model : model. as_deref ( ) ,
221+ model_id : metadata. model_id ,
221222 provider : metadata. provider ,
222223 timestamp,
223224 trajectory_timestamp,
@@ -234,6 +235,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
234235 usage,
235236 EventContext {
236237 model : model. as_deref ( ) ,
238+ model_id : metadata. model_id ,
237239 provider : metadata. provider ,
238240 timestamp,
239241 trajectory_timestamp,
@@ -285,6 +287,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
285287 usage,
286288 EventContext {
287289 model : model. as_deref ( ) ,
290+ model_id : metadata. model_id ,
288291 provider : None ,
289292 timestamp : metadata. timestamp . map ( |timestamp| ( timestamp, 3 ) ) ,
290293 trajectory_timestamp,
@@ -301,6 +304,7 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Option<Vec<AntigravityUsa
301304 usage,
302305 EventContext {
303306 model : model. as_deref ( ) ,
307+ model_id : metadata. model_id ,
304308 provider : None ,
305309 timestamp : metadata. timestamp . map ( |timestamp| ( timestamp, 3 ) ) ,
306310 trajectory_timestamp,
@@ -446,6 +450,7 @@ fn table_exists(connection: &sqlite::Connection, table: &str) -> Result<bool> {
446450#[ derive( Clone , Copy ) ]
447451struct EventContext < ' a > {
448452 model : Option < & ' a str > ,
453+ model_id : Option < u64 > ,
449454 provider : Option < u64 > ,
450455 timestamp : Option < ( TimestampMs , u8 ) > ,
451456 trajectory_timestamp : Option < TimestampMs > ,
@@ -487,10 +492,19 @@ fn append_usage_event(
487492 let reasoning_tokens = usage
488493 . reasoning_tokens
489494 . max ( total_output_tokens. saturating_sub ( output_tokens) ) ;
490- let model = usage
495+ let id_model = usage
491496 . model_id
492497 . map ( model_name_from_id)
493- . and_then ( |model| normalize_antigravity_model ( & model) )
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_resolved_model ( model) )
506+ . or_else ( || same_model_row. filter ( |model| is_resolved_model ( model) ) )
507+ . or ( id_model)
494508 . or_else ( || context. model . and_then ( normalize_antigravity_model) )
495509 . unwrap_or_else ( || DEFAULT_MODEL . to_string ( ) ) ;
496510 let provider = usage. provider . or ( context. provider ) ;
@@ -552,7 +566,7 @@ pub(super) fn merge_usage_event(
552566 . saturating_add ( target. cache_creation_tokens )
553567 . saturating_add ( target. cache_read_tokens )
554568 . saturating_add ( target. total_output_tokens ) ;
555- if target . model == DEFAULT_MODEL && duplicate . model != DEFAULT_MODEL {
569+ if model_resolution ( & duplicate . model ) > model_resolution ( & target . model ) {
556570 target. model = duplicate. model . clone ( ) ;
557571 }
558572 if target. provider . is_none ( ) {
@@ -888,11 +902,39 @@ fn model_name_from_id(model_id: u64) -> String {
888902 1417 ..=1419 => "gemini-4-argon" . to_string ( ) ,
889903 1402 => "claude-opus-5-5" . to_string ( ) ,
890904 1050 => "gemini-3.1-flash-lite" . to_string ( ) ,
891- 1_000 .. => format ! ( "model_placeholder_m {}" , model_id - 1_000 ) ,
892- _ => format ! ( "antigravity-model- {model_id}" ) ,
905+ 1_000 .. => format ! ( "{UNRESOLVED_PLACEHOLDER_PREFIX} {}" , model_id - 1_000 ) ,
906+ _ => format ! ( "{UNRESOLVED_ID_PREFIX} {model_id}" ) ,
893907 }
894908}
895909
910+ const UNRESOLVED_PLACEHOLDER_PREFIX : & str = "model_placeholder_m" ;
911+ const UNRESOLVED_ID_PREFIX : & str = "antigravity-model-" ;
912+
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 )
926+ || 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
936+ }
937+
896938fn normalize_antigravity_model ( raw : & str ) -> Option < String > {
897939 let trimmed = raw. trim ( ) ;
898940 if trimmed. is_empty ( ) {
@@ -1407,13 +1449,69 @@ pub(super) mod test_support {
14071449mod tests {
14081450 use super :: test_support:: { UsageFixture , metadata_blob_with_steps, step_metadata_blob} ;
14091451 use super :: {
1410- API_PROVIDER_GOOGLE_GEMINI , ProtoField , ProtoValue , calculate_antigravity_cost,
1411- field_bytes, field_bytes_all, field_text, field_varint, missing_antigravity_pricing,
1412- model_candidates, model_name_from_id, normalize_antigravity_model,
1413- 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,
14141457 } ;
14151458 use crate :: { PricingMap , TimestampMs , TokenUsageRaw , cli:: CostMode , parse_ts_timestamp} ;
14161459
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+
14171515 #[ test]
14181516 fn protobuf_scalars_use_last_duplicate_and_messages_keep_merge_order ( ) {
14191517 let first_text = b"first" ;
0 commit comments