@@ -244,21 +244,32 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Vec<GeminiUsageEvent>> {
244244 }
245245 let parsed = parse_antigravity_protobuf ( & blob) ;
246246 let model = parsed
247- . get ( "1.3" )
248- . map ( |value| value. to_string ( ) )
247+ . strings
248+ . get ( "1.19" )
249+ . or_else ( || parsed. strings . get ( "1.21" ) )
250+ . or_else ( || parsed. strings . get ( "1.3" ) )
251+ . cloned ( )
249252 . unwrap_or_else ( || "gemini-internal-model" . to_string ( ) ) ;
250- let input_tokens = parsed. get ( "1.4.2" ) . copied ( ) . unwrap_or ( 0 ) ;
251- let output_tokens = parsed. get ( "1.4.3" ) . copied ( ) . unwrap_or ( 0 ) ;
252- let cache_read_tokens = parsed. get ( "1.4.5" ) . copied ( ) . unwrap_or ( 0 ) ;
253- let reasoning_tokens = parsed. get ( "1.4.9" ) . copied ( ) . unwrap_or ( 0 ) ;
254- let visible_tokens = parsed. get ( "1.4.10" ) . copied ( ) . unwrap_or ( 0 ) ;
255- let timestamp = parsed
256- . get ( "1.9.4.1" )
253+ let input_tokens = parsed. numbers . get ( "1.4.2" ) . copied ( ) . unwrap_or ( 0 ) ;
254+ let output_tokens = parsed. numbers . get ( "1.4.3" ) . copied ( ) . unwrap_or ( 0 ) ;
255+ let cache_read_tokens = parsed. numbers . get ( "1.4.5" ) . copied ( ) . unwrap_or ( 0 ) ;
256+ let reasoning_tokens = parsed. numbers . get ( "1.4.9" ) . copied ( ) . unwrap_or ( 0 ) ;
257+ let visible_tokens = parsed. numbers . get ( "1.4.10" ) . copied ( ) . unwrap_or ( 0 ) ;
258+ let timestamp_seconds = parsed. numbers . get ( "1.9.4.1" ) . copied ( ) ;
259+ let timestamp_nanos = parsed
260+ . numbers
261+ . get ( "1.9.4.2" )
257262 . copied ( )
263+ . unwrap_or ( 0 )
264+ . min ( 999_999_999 ) ;
265+ let timestamp = timestamp_seconds
258266 . and_then ( |value| i64:: try_from ( value) . ok ( ) )
259- . and_then ( |ms| {
260- if ms > 0 {
261- Some ( TimestampMs :: from_millis ( ms * 1000 ) )
267+ . and_then ( |secs| {
268+ if secs > 0 {
269+ let ms = secs
270+ . saturating_mul ( 1000 )
271+ . saturating_add ( ( timestamp_nanos / 1_000_000 ) as i64 ) ;
272+ Some ( TimestampMs :: from_millis ( ms) )
262273 } else {
263274 None
264275 }
@@ -294,13 +305,29 @@ pub(super) fn parse_sqlite_file(path: &Path) -> Result<Vec<GeminiUsageEvent>> {
294305 Ok ( events)
295306}
296307
297- fn parse_antigravity_protobuf ( blob : & [ u8 ] ) -> HashMap < String , u64 > {
298- let mut out = HashMap :: new ( ) ;
299- parse_antigravity_protobuf_fields ( blob, & mut out, "" ) ;
308+ const MAX_PROTOBUF_DEPTH : usize = 16 ;
309+
310+ #[ derive( Default ) ]
311+ struct AntigravityProtobuf {
312+ numbers : HashMap < String , u64 > ,
313+ strings : HashMap < String , String > ,
314+ }
315+
316+ fn parse_antigravity_protobuf ( blob : & [ u8 ] ) -> AntigravityProtobuf {
317+ let mut out = AntigravityProtobuf :: default ( ) ;
318+ parse_antigravity_protobuf_fields ( blob, & mut out, "" , 0 ) ;
300319 out
301320}
302321
303- fn parse_antigravity_protobuf_fields ( blob : & [ u8 ] , out : & mut HashMap < String , u64 > , prefix : & str ) {
322+ fn parse_antigravity_protobuf_fields (
323+ blob : & [ u8 ] ,
324+ out : & mut AntigravityProtobuf ,
325+ prefix : & str ,
326+ depth : usize ,
327+ ) {
328+ if depth >= MAX_PROTOBUF_DEPTH {
329+ return ;
330+ }
304331 let mut cursor = 0usize ;
305332 while cursor < blob. len ( ) {
306333 let Some ( ( tag, next) ) = read_varint ( blob, cursor) else {
@@ -320,7 +347,7 @@ fn parse_antigravity_protobuf_fields(blob: &[u8], out: &mut HashMap<String, u64>
320347 break ;
321348 } ;
322349 cursor = next;
323- out. insert ( path, value) ;
350+ out. numbers . insert ( path, value) ;
324351 }
325352 2 => {
326353 let Some ( ( len, next) ) = read_varint ( blob, cursor) else {
@@ -335,15 +362,15 @@ fn parse_antigravity_protobuf_fields(blob: &[u8], out: &mut HashMap<String, u64>
335362 break ;
336363 } ;
337364 let payload = & blob[ cursor..end] ;
338- let mut nested = HashMap :: new ( ) ;
339- parse_antigravity_protobuf_fields ( payload, & mut nested, & path) ;
340- if nested. is_empty ( ) {
341- out. insert ( path, 0 ) ;
342- } else {
343- for ( nested_path, value) in nested {
344- out. insert ( nested_path, value) ;
345- }
365+ if let Ok ( text) = std:: str:: from_utf8 ( payload)
366+ && !text. is_empty ( )
367+ && text
368+ . chars ( )
369+ . all ( |c| !c. is_control ( ) || c == '\n' || c == '\t' )
370+ {
371+ out. strings . insert ( path. clone ( ) , text. to_string ( ) ) ;
346372 }
373+ parse_antigravity_protobuf_fields ( payload, out, & path, depth + 1 ) ;
347374 cursor = end;
348375 }
349376 1 => cursor += 8 ,
@@ -362,7 +389,11 @@ fn read_varint(blob: &[u8], mut offset: usize) -> Option<(u64, usize)> {
362389 }
363390 let byte = blob[ offset] ;
364391 offset += 1 ;
365- value |= u64:: from ( byte & 0x7F ) << shift;
392+ let payload = byte & 0x7F ;
393+ if shift == 63 && payload > 1 {
394+ return None ;
395+ }
396+ value |= u64:: from ( payload) << shift;
366397 if byte & 0x80 == 0 {
367398 return Some ( ( value, offset) ) ;
368399 }
0 commit comments