1- use std:: collections:: HashMap ;
1+ use std:: { collections:: HashMap , path :: PathBuf } ;
22
3- use crate :: { LoadedEntry , PricingMap , Result , cli:: SharedArgs , debug_log , parse_tz} ;
3+ use crate :: { LoadedEntry , PricingMap , Result , cli:: SharedArgs , parse_tz} ;
44
55use super :: {
66 parser:: { AntigravityUsageEvent , event_to_loaded, merge_usage_event, parse_sqlite_file} ,
77 paths:: conversation_db_paths,
88} ;
99
10+ #[ derive( Debug , PartialEq ) ]
11+ enum SkippedDatabase {
12+ Uninitialized ( PathBuf ) ,
13+ Unreadable { path : PathBuf , error : String } ,
14+ }
15+
1016/// Loads Antigravity generation metadata from all discovered conversation databases.
1117pub fn load_entries ( shared : & SharedArgs , pricing : & PricingMap ) -> Result < Vec < LoadedEntry > > {
12- crate :: progress:: track_usage_load (
18+ let ( entries , warnings ) = crate :: progress:: track_usage_load (
1319 crate :: progress:: UsageLoadAgent ( "Antigravity" ) ,
1420 shared. json ,
15- || load_entries_inner ( shared, pricing) ,
16- )
21+ || load_entries_with_warnings ( shared, pricing) ,
22+ ) ?;
23+ warnings. iter ( ) . for_each ( |warning| eprintln ! ( "{warning}" ) ) ;
24+ Ok ( entries)
1725}
1826
19- fn load_entries_inner ( shared : & SharedArgs , pricing : & PricingMap ) -> Result < Vec < LoadedEntry > > {
20- let timezone = parse_tz ( shared. timezone . as_deref ( ) ) ;
21- let database_paths = conversation_db_paths ( ) ?;
22- let mut parsed_events = Vec :: new ( ) ;
23- for database_path in database_paths {
24- match parse_sqlite_file ( & database_path) ? {
25- Some ( events) => parsed_events. extend ( events) ,
26- None => debug_log (
27- shared,
28- format ! (
29- "Skipping uninitialized Antigravity database '{}': empty SQLite snapshot" ,
30- database_path. display( )
31- ) ,
32- ) ,
33- }
27+ /// Loads Antigravity entries and returns the skipped-database messages instead
28+ /// of printing them, so callers can emit them once their progress output stops.
29+ pub fn load_entries_with_warnings (
30+ shared : & SharedArgs ,
31+ pricing : & PricingMap ,
32+ ) -> Result < ( Vec < LoadedEntry > , Vec < String > ) > {
33+ let ( entries, skipped) = load_entries_inner ( shared, pricing) ?;
34+ let warnings = skipped
35+ . iter ( )
36+ . filter_map ( |database| skipped_database_message ( shared, database) )
37+ . collect ( ) ;
38+ Ok ( ( entries, warnings) )
39+ }
40+
41+ fn skipped_database_message ( shared : & SharedArgs , database : & SkippedDatabase ) -> Option < String > {
42+ match database {
43+ SkippedDatabase :: Uninitialized ( path) => shared. debug . then ( || {
44+ format ! (
45+ "Skipping uninitialized Antigravity database '{}': empty SQLite snapshot" ,
46+ path. display( )
47+ )
48+ } ) ,
49+ SkippedDatabase :: Unreadable { path, error } => ( crate :: log_level ( ) != Some ( 0 ) ) . then ( || {
50+ format ! (
51+ "WARN Skipping unreadable Antigravity database '{}': {error}" ,
52+ path. display( )
53+ )
54+ } ) ,
3455 }
56+ }
57+
58+ fn load_entries_inner (
59+ shared : & SharedArgs ,
60+ pricing : & PricingMap ,
61+ ) -> Result < ( Vec < LoadedEntry > , Vec < SkippedDatabase > ) > {
62+ let timezone = parse_tz ( shared. timezone . as_deref ( ) ) ;
63+ let ( parsed_events, skipped) = conversation_db_paths ( ) ?. into_iter ( ) . fold (
64+ ( Vec :: new ( ) , Vec :: new ( ) ) ,
65+ |( mut events, mut skipped) , database_path| {
66+ match parse_sqlite_file ( & database_path) {
67+ Ok ( Some ( parsed) ) => events. extend ( parsed) ,
68+ Ok ( None ) => skipped. push ( SkippedDatabase :: Uninitialized ( database_path) ) ,
69+ Err ( error) => skipped. push ( SkippedDatabase :: Unreadable {
70+ path : database_path,
71+ error : error. to_string ( ) ,
72+ } ) ,
73+ }
74+ ( events, skipped)
75+ } ,
76+ ) ;
3577 let mut events = deduplicate_events ( parsed_events) ;
3678 events. sort_by_key ( |event| event. timestamp ) ;
37- Ok ( events
79+ let entries = events
3880 . into_iter ( )
3981 . map ( |event| event_to_loaded ( event, timezone. as_ref ( ) , shared. mode , pricing) )
40- . collect ( ) )
82+ . collect ( ) ;
83+ Ok ( ( entries, skipped) )
4184}
4285
4386fn deduplicate_events (
@@ -108,6 +151,16 @@ mod tests {
108151 }
109152 }
110153
154+ fn load_single_unreadable_database ( ) -> ( PathBuf , String ) {
155+ let ( entries, skipped) =
156+ load_entries_inner ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap ( ) ;
157+ assert ! ( entries. is_empty( ) ) ;
158+ match <[ SkippedDatabase ; 1 ] >:: try_from ( skipped) {
159+ Ok ( [ SkippedDatabase :: Unreadable { path, error } ] ) => ( path, error) ,
160+ other => panic ! ( "expected one unreadable database, got {other:?}" ) ,
161+ }
162+ }
163+
111164 fn load_from_fixture ( fixture : & Fixture , single_thread : bool ) -> Vec < LoadedEntry > {
112165 let pricing = PricingMap :: load_embedded ( ) ;
113166 load_from_fixture_with_pricing ( fixture, single_thread, & pricing)
@@ -841,7 +894,7 @@ mod tests {
841894 }
842895
843896 #[ test]
844- fn still_propagates_errors_for_nonempty_databases_alongside_empty_ones ( ) {
897+ fn skips_malformed_database_alongside_empty_databases ( ) {
845898 let fixture = Fixture :: new ( ) ;
846899 let _ = fixture. write_file ( "conversations/empty.db" , "" ) ;
847900 create_database (
@@ -855,29 +908,42 @@ mod tests {
855908 Some ( OsString :: from ( fixture. root ( ) ) ) ,
856909 ) ] ) ;
857910
858- let error = load_entries ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap_err ( ) ;
911+ let ( entries, skipped) =
912+ load_entries_inner ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap ( ) ;
859913
860- assert ! ( error. to_string( ) . contains( "parse Antigravity metadata" ) ) ;
914+ assert ! ( entries. is_empty( ) ) ;
915+ assert_eq ! ( skipped. len( ) , 2 ) ;
916+ assert ! ( skipped. contains( & SkippedDatabase :: Uninitialized (
917+ fixture. path( "conversations/empty.db" )
918+ ) ) ) ;
919+ assert ! ( skipped. iter( ) . any( |database| matches!(
920+ database,
921+ SkippedDatabase :: Unreadable { path, error }
922+ if * path == fixture. path( "conversations/malformed.db" )
923+ && error. contains( "parse Antigravity metadata" )
924+ ) ) ) ;
861925 }
862926
863927 #[ test]
864- fn propagates_database_open_and_query_errors ( ) {
928+ fn skips_database_open_and_query_errors ( ) {
865929 let fixture = Fixture :: new ( ) ;
866930 let not_a_database = fixture. write_file ( "conversations/not-a-db.db" , "not sqlite" ) ;
867931 let _guard = EnvVarsGuard :: set_many ( [ (
868932 super :: super :: paths:: ANTIGRAVITY_DATA_DIR_ENV ,
869933 Some ( OsString :: from ( fixture. root ( ) ) ) ,
870934 ) ] ) ;
871935
872- let error = load_entries ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap_err ( ) ;
873- let message = error. to_string ( ) ;
936+ let ( path, error) = load_single_unreadable_database ( ) ;
874937
875- assert ! ( message. contains( not_a_database. to_string_lossy( ) . as_ref( ) ) ) ;
876- assert ! ( message. contains( "open" ) || message. contains( "database" ) ) ;
938+ assert_eq ! ( path, not_a_database) ;
939+ assert_eq ! (
940+ error,
941+ "Failed to inspect Antigravity database: file is not a database (code 26)"
942+ ) ;
877943 }
878944
879945 #[ test]
880- fn propagates_missing_generation_table_errors ( ) {
946+ fn skips_database_missing_generation_table ( ) {
881947 let fixture = Fixture :: new ( ) ;
882948 let db_path = fixture. path ( "conversations/missing-table.db" ) ;
883949 let _ = fixture. create_dir_all ( "conversations" ) ;
@@ -890,13 +956,14 @@ mod tests {
890956 Some ( OsString :: from ( fixture. root ( ) ) ) ,
891957 ) ] ) ;
892958
893- let error = load_entries ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap_err ( ) ;
959+ let ( path , error ) = load_single_unreadable_database ( ) ;
894960
895- assert ! ( error. to_string( ) . contains( "gen_metadata" ) ) ;
961+ assert_eq ! ( path, db_path) ;
962+ assert ! ( error. contains( "gen_metadata" ) , "{error}" ) ;
896963 }
897964
898965 #[ test]
899- fn propagates_present_optional_table_schema_errors ( ) {
966+ fn skips_database_with_invalid_optional_table_schema ( ) {
900967 let fixture = Fixture :: new ( ) ;
901968 let db_path = fixture. path ( "conversations/bad-steps.db" ) ;
902969 let _ = fixture. create_dir_all ( "conversations" ) ;
@@ -932,13 +999,14 @@ mod tests {
932999 Some ( OsString :: from ( fixture. root ( ) ) ) ,
9331000 ) ] ) ;
9341001
935- let error = load_entries ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap_err ( ) ;
1002+ let ( path , error ) = load_single_unreadable_database ( ) ;
9361003
937- assert ! ( error. to_string( ) . contains( "steps" ) ) ;
1004+ assert_eq ! ( path, db_path) ;
1005+ assert ! ( error. contains( "steps" ) , "{error}" ) ;
9381006 }
9391007
9401008 #[ test]
941- fn propagates_malformed_metadata_errors ( ) {
1009+ fn skips_database_with_malformed_metadata ( ) {
9421010 let fixture = Fixture :: new ( ) ;
9431011 create_database (
9441012 & fixture. path ( "conversations/malformed.db" ) ,
@@ -951,8 +1019,44 @@ mod tests {
9511019 Some ( OsString :: from ( fixture. root ( ) ) ) ,
9521020 ) ] ) ;
9531021
954- let error = load_entries ( & shared ( true ) , & PricingMap :: load_embedded ( ) ) . unwrap_err ( ) ;
1022+ let ( path, error) = load_single_unreadable_database ( ) ;
1023+
1024+ assert_eq ! ( path, fixture. path( "conversations/malformed.db" ) ) ;
1025+ assert ! (
1026+ error. starts_with( "Failed to parse Antigravity metadata row 1:" ) ,
1027+ "{error}"
1028+ ) ;
1029+ }
1030+
1031+ #[ test]
1032+ fn skipped_database_messages_name_the_path_once_and_respect_log_level ( ) {
1033+ let path = PathBuf :: from ( "/data/conversations/broken.db" ) ;
1034+ let unreadable = SkippedDatabase :: Unreadable {
1035+ path : path. clone ( ) ,
1036+ error : "Failed to inspect Antigravity database: disk I/O error (code 10)" . to_string ( ) ,
1037+ } ;
1038+ let uninitialized = SkippedDatabase :: Uninitialized ( path) ;
1039+ let debug = SharedArgs {
1040+ debug : true ,
1041+ ..shared ( true )
1042+ } ;
1043+
1044+ {
1045+ let _guard = EnvVarsGuard :: set_many ( [ ( "LOG_LEVEL" , None :: < OsString > ) ] ) ;
1046+ assert_eq ! (
1047+ skipped_database_message( & shared( true ) , & unreadable) . as_deref( ) ,
1048+ Some (
1049+ "WARN Skipping unreadable Antigravity database '/data/conversations/broken.db': Failed to inspect Antigravity database: disk I/O error (code 10)"
1050+ )
1051+ ) ;
1052+ assert_eq ! (
1053+ skipped_database_message( & shared( true ) , & uninitialized) ,
1054+ None
1055+ ) ;
1056+ assert ! ( skipped_database_message( & debug, & uninitialized) . is_some( ) ) ;
1057+ }
9551058
956- assert ! ( error. to_string( ) . contains( "parse Antigravity metadata" ) ) ;
1059+ let _guard = EnvVarsGuard :: set_many ( [ ( "LOG_LEVEL" , Some ( OsString :: from ( "0" ) ) ) ] ) ;
1060+ assert_eq ! ( skipped_database_message( & shared( true ) , & unreadable) , None ) ;
9571061 }
9581062}
0 commit comments