@@ -14,7 +14,10 @@ use std::{
1414use jiff:: tz:: TimeZone as JiffTimeZone ;
1515use memchr:: memmem;
1616use rustc_hash:: FxHasher ;
17- use serde:: { Deserialize , de:: DeserializeOwned } ;
17+ use serde:: {
18+ Deserialize ,
19+ de:: { DeserializeOwned , Error as _, MapAccess , SeqAccess , Visitor } ,
20+ } ;
1821
1922use crate :: {
2023 LoadedEntry , LoadedFile , PricingMap , Result , Speed , TimestampMs , TokenUsageRaw , UsageEntry ,
@@ -529,13 +532,107 @@ pub(crate) fn deserialize_usage_line<T: DeserializeOwned>(line: &[u8]) -> Option
529532 if memmem:: find ( line, b"null" ) . is_none ( ) {
530533 return serde_json:: from_slice ( line) . ok ( ) ;
531534 }
532- let root = serde_json:: from_slice :: < serde_json :: Value > ( line) . ok ( ) ?;
535+ let root = serde_json:: from_slice :: < UniqueJsonValue > ( line) . ok ( ) ?. 0 ;
533536 if has_unsupported_null_field_in_value ( & root) {
534537 return None ;
535538 }
536539 serde_json:: from_value ( root) . ok ( )
537540}
538541
542+ /// A JSON value parser that preserves typed Serde's rejection of duplicate members.
543+ /// Parsing through `serde_json::Value` normally keeps only the final duplicate, which could
544+ /// make a malformed transcript valid before the in-memory typed deserialization runs.
545+ struct UniqueJsonValue ( serde_json:: Value ) ;
546+
547+ impl < ' de > Deserialize < ' de > for UniqueJsonValue {
548+ fn deserialize < D > ( deserializer : D ) -> std:: result:: Result < Self , D :: Error >
549+ where
550+ D : serde:: Deserializer < ' de > ,
551+ {
552+ deserializer. deserialize_any ( UniqueJsonValueVisitor )
553+ }
554+ }
555+
556+ struct UniqueJsonValueVisitor ;
557+
558+ impl < ' de > Visitor < ' de > for UniqueJsonValueVisitor {
559+ type Value = UniqueJsonValue ;
560+
561+ fn expecting ( & self , formatter : & mut std:: fmt:: Formatter < ' _ > ) -> std:: fmt:: Result {
562+ formatter. write_str ( "a JSON value without duplicate object members" )
563+ }
564+
565+ fn visit_bool < E > ( self , value : bool ) -> std:: result:: Result < Self :: Value , E > {
566+ Ok ( UniqueJsonValue ( serde_json:: Value :: Bool ( value) ) )
567+ }
568+
569+ fn visit_i64 < E > ( self , value : i64 ) -> std:: result:: Result < Self :: Value , E > {
570+ Ok ( UniqueJsonValue ( serde_json:: Value :: Number ( value. into ( ) ) ) )
571+ }
572+
573+ fn visit_u64 < E > ( self , value : u64 ) -> std:: result:: Result < Self :: Value , E > {
574+ Ok ( UniqueJsonValue ( serde_json:: Value :: Number ( value. into ( ) ) ) )
575+ }
576+
577+ fn visit_f64 < E : serde:: de:: Error > ( self , value : f64 ) -> std:: result:: Result < Self :: Value , E > {
578+ serde_json:: Number :: from_f64 ( value)
579+ . map ( serde_json:: Value :: Number )
580+ . map ( UniqueJsonValue )
581+ . ok_or_else ( || E :: custom ( "non-finite JSON number" ) )
582+ }
583+
584+ fn visit_str < E > ( self , value : & str ) -> std:: result:: Result < Self :: Value , E > {
585+ Ok ( UniqueJsonValue ( serde_json:: Value :: String ( value. to_owned ( ) ) ) )
586+ }
587+
588+ fn visit_string < E > ( self , value : String ) -> std:: result:: Result < Self :: Value , E > {
589+ Ok ( UniqueJsonValue ( serde_json:: Value :: String ( value) ) )
590+ }
591+
592+ fn visit_none < E > ( self ) -> std:: result:: Result < Self :: Value , E > {
593+ Ok ( UniqueJsonValue ( serde_json:: Value :: Null ) )
594+ }
595+
596+ fn visit_unit < E > ( self ) -> std:: result:: Result < Self :: Value , E > {
597+ Ok ( UniqueJsonValue ( serde_json:: Value :: Null ) )
598+ }
599+
600+ fn visit_some < D > ( self , deserializer : D ) -> std:: result:: Result < Self :: Value , D :: Error >
601+ where
602+ D : serde:: Deserializer < ' de > ,
603+ {
604+ UniqueJsonValue :: deserialize ( deserializer)
605+ }
606+
607+ fn visit_seq < A > ( self , mut sequence : A ) -> std:: result:: Result < Self :: Value , A :: Error >
608+ where
609+ A : SeqAccess < ' de > ,
610+ {
611+ let mut values = Vec :: new ( ) ;
612+ while let Some ( value) = sequence. next_element :: < UniqueJsonValue > ( ) ? {
613+ values. push ( value. 0 ) ;
614+ }
615+ Ok ( UniqueJsonValue ( serde_json:: Value :: Array ( values) ) )
616+ }
617+
618+ fn visit_map < A > ( self , mut object : A ) -> std:: result:: Result < Self :: Value , A :: Error >
619+ where
620+ A : MapAccess < ' de > ,
621+ {
622+ let mut fields = serde_json:: Map :: new ( ) ;
623+ while let Some ( field) = object. next_key :: < String > ( ) ? {
624+ if fields. contains_key ( & field) {
625+ return Err ( A :: Error :: custom ( format ! (
626+ "duplicate object member `{field}`"
627+ ) ) ) ;
628+ }
629+ let value = object. next_value :: < UniqueJsonValue > ( ) ?;
630+ fields. insert ( field, value. 0 ) ;
631+ }
632+ Ok ( UniqueJsonValue ( serde_json:: Value :: Object ( fields) ) )
633+ }
634+ }
635+
539636fn has_unsupported_null_field_in_value ( root : & serde_json:: Value ) -> bool {
540637 let iteration_arrays = [
541638 root. pointer ( "/message/usage/iterations" ) ,
@@ -654,8 +751,8 @@ mod tests {
654751 use std:: { path:: Path , sync:: Arc } ;
655752
656753 use super :: {
657- extract_session_parts , has_unsupported_null_field , paths :: is_project_path_segment ,
658- push_deduped_entry, read_usage_file, usage_files,
754+ deserialize_usage_line , extract_session_parts , has_unsupported_null_field ,
755+ paths :: is_project_path_segment , push_deduped_entry, read_usage_file, usage_files,
659756 } ;
660757 use crate :: {
661758 LoadedEntry , PricingMap , TimestampMs , TokenUsageRaw , UsageEntry , UsageMessage ,
@@ -840,6 +937,14 @@ mod tests {
840937 ) ) ;
841938 }
842939
940+ #[ test]
941+ fn rejects_duplicate_members_before_typed_deserialization ( ) {
942+ assert ! ( deserialize_usage_line:: <UsageEntry >(
943+ br#"{"type":"assistant","timestamp":"2026-09-12T04:38:42.296Z","sessionId":"session-a","message":{"id":"msg_1","model":"first","model":"second","usage":{"input_tokens":2,"output_tokens":289,"iterations":[{"type":"message","model":null,"input_tokens":2,"output_tokens":289}]}}}"#
944+ )
945+ . is_none( ) ) ;
946+ }
947+
843948 /// The repro line from #1710 loads as one Fable 5.1 entry with its own token counts.
844949 #[ test]
845950 fn counts_entries_whose_iteration_model_is_null ( ) {
0 commit comments