diff --git a/apps/weblibre/lib/core/providers/app_state.g.dart b/apps/weblibre/lib/core/providers/app_state.g.dart
index 947b8d87..45229758 100644
--- a/apps/weblibre/lib/core/providers/app_state.g.dart
+++ b/apps/weblibre/lib/core/providers/app_state.g.dart
@@ -50,7 +50,7 @@ abstract class _$AppStateKey
   GlobalKey<State<StatefulWidget>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -68,6 +68,6 @@ abstract class _$AppStateKey
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/core/providers/device_info.g.dart b/apps/weblibre/lib/core/providers/device_info.g.dart
index 7df92ecc..8a4d1d8d 100644
--- a/apps/weblibre/lib/core/providers/device_info.g.dart
+++ b/apps/weblibre/lib/core/providers/device_info.g.dart
@@ -40,7 +40,7 @@ abstract class _$AndroidDeviceInfo
   FutureOr<AndroidDeviceInfoData?> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<AndroidDeviceInfoData?>, AndroidDeviceInfoData?>;
@@ -55,6 +55,6 @@ abstract class _$AndroidDeviceInfo
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/core/providers/format.g.dart b/apps/weblibre/lib/core/providers/format.g.dart
index 0735dea7..4ad09963 100644
--- a/apps/weblibre/lib/core/providers/format.g.dart
+++ b/apps/weblibre/lib/core/providers/format.g.dart
@@ -38,7 +38,7 @@ abstract class _$Format extends $AsyncNotifier<void> {
   FutureOr<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, void>;
     final element =
         ref.element
@@ -48,6 +48,6 @@ abstract class _$Format extends $AsyncNotifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/core/providers/global_drop.g.dart b/apps/weblibre/lib/core/providers/global_drop.g.dart
index 9f200eb0..0f1ba05e 100644
--- a/apps/weblibre/lib/core/providers/global_drop.g.dart
+++ b/apps/weblibre/lib/core/providers/global_drop.g.dart
@@ -47,7 +47,7 @@ abstract class _$WillAcceptDrop extends $Notifier<DropTargetData?> {
   DropTargetData? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<DropTargetData?, DropTargetData?>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$WillAcceptDrop extends $Notifier<DropTargetData?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/core/providers/persisted_bool.g.dart b/apps/weblibre/lib/core/providers/persisted_bool.g.dart
index 52efd8f3..04017321 100644
--- a/apps/weblibre/lib/core/providers/persisted_bool.g.dart
+++ b/apps/weblibre/lib/core/providers/persisted_bool.g.dart
@@ -92,7 +92,7 @@ abstract class _$PersistedBool extends $Notifier<bool> {
   bool build(PersistedBoolKey key);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -102,6 +102,6 @@ abstract class _$PersistedBool extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/core/providers/router.g.dart b/apps/weblibre/lib/core/providers/router.g.dart
index f5bb2fd7..a264f90a 100644
--- a/apps/weblibre/lib/core/providers/router.g.dart
+++ b/apps/weblibre/lib/core/providers/router.g.dart
@@ -81,7 +81,7 @@ abstract class _$CurrentTopRoute extends $Notifier<RouteBase?> {
   RouteBase? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<RouteBase?, RouteBase?>;
     final element =
         ref.element
@@ -91,6 +91,6 @@ abstract class _$CurrentTopRoute extends $Notifier<RouteBase?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/domain/repositories/locale_resolver.g.dart b/apps/weblibre/lib/domain/repositories/locale_resolver.g.dart
index 3d60ffb5..1edd4281 100644
--- a/apps/weblibre/lib/domain/repositories/locale_resolver.g.dart
+++ b/apps/weblibre/lib/domain/repositories/locale_resolver.g.dart
@@ -94,7 +94,7 @@ abstract class _$LocaleResolverRepository extends $Notifier<void> {
   void build(intl.Locale targetLocale);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -104,7 +104,7 @@ abstract class _$LocaleResolverRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
diff --git a/apps/weblibre/lib/domain/services/app_initialization.g.dart b/apps/weblibre/lib/domain/services/app_initialization.g.dart
index 2c2535c2..fcbf5acd 100644
--- a/apps/weblibre/lib/domain/services/app_initialization.g.dart
+++ b/apps/weblibre/lib/domain/services/app_initialization.g.dart
@@ -65,7 +65,7 @@ abstract class _$AppInitializationService
   build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -93,6 +93,6 @@ abstract class _$AppInitializationService
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/domain/services/generic_website.g.dart b/apps/weblibre/lib/domain/services/generic_website.g.dart
index e9a66b9f..1989e227 100644
--- a/apps/weblibre/lib/domain/services/generic_website.g.dart
+++ b/apps/weblibre/lib/domain/services/generic_website.g.dart
@@ -136,7 +136,7 @@ abstract class _$GenericWebsiteService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -146,6 +146,6 @@ abstract class _$GenericWebsiteService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/account/data/repositories/account_sync_repository.g.dart b/apps/weblibre/lib/features/account/data/repositories/account_sync_repository.g.dart
index a1cb1322..12ffbfc4 100644
--- a/apps/weblibre/lib/features/account/data/repositories/account_sync_repository.g.dart
+++ b/apps/weblibre/lib/features/account/data/repositories/account_sync_repository.g.dart
@@ -77,7 +77,7 @@ abstract class _$AccountSyncRepository extends $Notifier<SupabaseClient?> {
   SupabaseClient? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<SupabaseClient?, SupabaseClient?>;
     final element =
         ref.element
@@ -87,6 +87,6 @@ abstract class _$AccountSyncRepository extends $Notifier<SupabaseClient?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/account/domain/repositories/account_auth.g.dart b/apps/weblibre/lib/features/account/domain/repositories/account_auth.g.dart
index 41fcd2cf..c565977f 100644
--- a/apps/weblibre/lib/features/account/domain/repositories/account_auth.g.dart
+++ b/apps/weblibre/lib/features/account/domain/repositories/account_auth.g.dart
@@ -41,7 +41,7 @@ abstract class _$AccountAuthRepository
   FutureOr<AccountAuthState> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<AccountAuthState>, AccountAuthState>;
     final element =
@@ -52,6 +52,6 @@ abstract class _$AccountAuthRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/account/domain/repositories/subscription_repository.g.dart b/apps/weblibre/lib/features/account/domain/repositories/subscription_repository.g.dart
index 726d9afa..577b0250 100644
--- a/apps/weblibre/lib/features/account/domain/repositories/subscription_repository.g.dart
+++ b/apps/weblibre/lib/features/account/domain/repositories/subscription_repository.g.dart
@@ -41,7 +41,7 @@ abstract class _$SubscriptionRepository
   FutureOr<SubscriptionStatus> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<SubscriptionStatus>, SubscriptionStatus>;
     final element =
@@ -52,6 +52,6 @@ abstract class _$SubscriptionRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/account/domain/services/prefs_sync_service.g.dart b/apps/weblibre/lib/features/account/domain/services/prefs_sync_service.g.dart
index 5042672d..02525649 100644
--- a/apps/weblibre/lib/features/account/domain/services/prefs_sync_service.g.dart
+++ b/apps/weblibre/lib/features/account/domain/services/prefs_sync_service.g.dart
@@ -47,7 +47,7 @@ abstract class _$PrefsSyncService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$PrefsSyncService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/account/domain/services/settings_sync_service.g.dart b/apps/weblibre/lib/features/account/domain/services/settings_sync_service.g.dart
index 94919421..50687463 100644
--- a/apps/weblibre/lib/features/account/domain/services/settings_sync_service.g.dart
+++ b/apps/weblibre/lib/features/account/domain/services/settings_sync_service.g.dart
@@ -48,7 +48,7 @@ abstract class _$SettingsSyncService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$SettingsSyncService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/addons/domain/providers.g.dart b/apps/weblibre/lib/features/addons/domain/providers.g.dart
index 96afc9e5..85d53fe7 100644
--- a/apps/weblibre/lib/features/addons/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/addons/domain/providers.g.dart
@@ -84,7 +84,7 @@ abstract class _$AddonDetails extends $AsyncNotifier<AddonInfo?> {
   FutureOr<AddonInfo?> build(String addonId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<AddonInfo?>, AddonInfo?>;
     final element =
         ref.element
@@ -94,7 +94,7 @@ abstract class _$AddonDetails extends $AsyncNotifier<AddonInfo?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
@@ -373,7 +373,7 @@ abstract class _$AddonStoreAppFilter extends $Notifier<AddonStoreApp> {
   AddonStoreApp build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AddonStoreApp, AddonStoreApp>;
     final element =
         ref.element
@@ -383,7 +383,7 @@ abstract class _$AddonStoreAppFilter extends $Notifier<AddonStoreApp> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -693,7 +693,7 @@ abstract class _$AddonUpdateCheck
   AsyncValue<AddonUpdateRunResult> build(String addonId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -711,7 +711,7 @@ abstract class _$AddonUpdateCheck
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
@@ -745,7 +745,7 @@ abstract class _$AddonList extends $AsyncNotifier<List<AddonInfo>> {
   FutureOr<List<AddonInfo>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<List<AddonInfo>>, List<AddonInfo>>;
     final element =
         ref.element
@@ -755,7 +755,7 @@ abstract class _$AddonList extends $AsyncNotifier<List<AddonInfo>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -797,7 +797,7 @@ abstract class _$AddonBusyIds extends $Notifier<Set<String>> {
   Set<String> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Set<String>, Set<String>>;
     final element =
         ref.element
@@ -807,7 +807,7 @@ abstract class _$AddonBusyIds extends $Notifier<Set<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -849,7 +849,7 @@ abstract class _$PinnedAddonIds extends $Notifier<Set<String>> {
   Set<String> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Set<String>, Set<String>>;
     final element =
         ref.element
@@ -859,7 +859,7 @@ abstract class _$PinnedAddonIds extends $Notifier<Set<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -901,7 +901,7 @@ abstract class _$BulkAddonUpdate extends $Notifier<AsyncValue<void>> {
   AsyncValue<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, AsyncValue<void>>;
     final element =
         ref.element
@@ -911,6 +911,6 @@ abstract class _$BulkAddonUpdate extends $Notifier<AsyncValue<void>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/bangs/data/services/data_source.g.dart b/apps/weblibre/lib/features/bangs/data/services/data_source.g.dart
index 0de61968..a89fd56e 100644
--- a/apps/weblibre/lib/features/bangs/data/services/data_source.g.dart
+++ b/apps/weblibre/lib/features/bangs/data/services/data_source.g.dart
@@ -48,7 +48,7 @@ abstract class _$BangDataSourceService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BangDataSourceService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/bangs/domain/providers/search.g.dart b/apps/weblibre/lib/features/bangs/domain/providers/search.g.dart
index 18c977b5..086d2289 100644
--- a/apps/weblibre/lib/features/bangs/domain/providers/search.g.dart
+++ b/apps/weblibre/lib/features/bangs/domain/providers/search.g.dart
@@ -39,7 +39,7 @@ abstract class _$BangSearch extends $StreamNotifier<List<BangData>> {
   Stream<List<BangData>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<List<BangData>>, List<BangData>>;
     final element =
         ref.element
@@ -49,7 +49,7 @@ abstract class _$BangSearch extends $StreamNotifier<List<BangData>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -91,7 +91,7 @@ abstract class _$SeamlessBang extends $Notifier<AsyncValue<List<BangData>>> {
   AsyncValue<List<BangData>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<List<BangData>>, AsyncValue<List<BangData>>>;
@@ -106,6 +106,6 @@ abstract class _$SeamlessBang extends $Notifier<AsyncValue<List<BangData>>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/bangs/domain/repositories/data.g.dart b/apps/weblibre/lib/features/bangs/domain/repositories/data.g.dart
index c1111885..220d2dd0 100644
--- a/apps/weblibre/lib/features/bangs/domain/repositories/data.g.dart
+++ b/apps/weblibre/lib/features/bangs/domain/repositories/data.g.dart
@@ -48,7 +48,7 @@ abstract class _$BangDataRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BangDataRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/bangs/domain/repositories/sync.g.dart b/apps/weblibre/lib/features/bangs/domain/repositories/sync.g.dart
index 75dcba9b..b5baab81 100644
--- a/apps/weblibre/lib/features/bangs/domain/repositories/sync.g.dart
+++ b/apps/weblibre/lib/features/bangs/domain/repositories/sync.g.dart
@@ -48,7 +48,7 @@ abstract class _$BangSyncRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BangSyncRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/bangs/domain/services/reverse_match.g.dart b/apps/weblibre/lib/features/bangs/domain/services/reverse_match.g.dart
index 7ca15d78..18163794 100644
--- a/apps/weblibre/lib/features/bangs/domain/services/reverse_match.g.dart
+++ b/apps/weblibre/lib/features/bangs/domain/services/reverse_match.g.dart
@@ -48,7 +48,7 @@ abstract class _$ReverseBangMatcher extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$ReverseBangMatcher extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/bangs/domain/services/search_history_cleanup.g.dart b/apps/weblibre/lib/features/bangs/domain/services/search_history_cleanup.g.dart
index 5b1e9569..94d21f50 100644
--- a/apps/weblibre/lib/features/bangs/domain/services/search_history_cleanup.g.dart
+++ b/apps/weblibre/lib/features/bangs/domain/services/search_history_cleanup.g.dart
@@ -58,7 +58,7 @@ abstract class _$SearchHistoryCleanupService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -68,6 +68,6 @@ abstract class _$SearchHistoryCleanupService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart b/apps/weblibre/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart
index 3ecfd3a5..7f9e3326 100644
--- a/apps/weblibre/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart
@@ -48,7 +48,7 @@ abstract class _$BottomSheetController extends $Notifier<Sheet?> {
   Sheet? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Sheet?, Sheet?>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BottomSheetController extends $Notifier<Sheet?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/controllers/overlay.g.dart b/apps/weblibre/lib/features/geckoview/domain/controllers/overlay.g.dart
index b39d6022..dc9c00c4 100644
--- a/apps/weblibre/lib/features/geckoview/domain/controllers/overlay.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/controllers/overlay.g.dart
@@ -47,7 +47,7 @@ abstract class _$OverlayController extends $Notifier<WidgetBuilder?> {
   WidgetBuilder? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<WidgetBuilder?, WidgetBuilder?>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$OverlayController extends $Notifier<WidgetBuilder?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers.g.dart
index 3dcb15b9..5cf9ebe6 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers.g.dart
@@ -378,7 +378,7 @@ abstract class _$EngineReadyState extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -388,7 +388,7 @@ abstract class _$EngineReadyState extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -483,7 +483,7 @@ abstract class _$TranslationEngineState
   TranslationEngineStateData? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<TranslationEngineStateData?, TranslationEngineStateData?>;
@@ -498,7 +498,7 @@ abstract class _$TranslationEngineState
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -546,7 +546,7 @@ abstract class _$MlDownloadState extends $Notifier<MlProgressData?> {
   MlProgressData? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<MlProgressData?, MlProgressData?>;
     final element =
         ref.element
@@ -556,6 +556,6 @@ abstract class _$MlDownloadState extends $Notifier<MlProgressData?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/desktop_mode.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/desktop_mode.g.dart
index b75870ef..25694ab5 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/desktop_mode.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/desktop_mode.g.dart
@@ -84,7 +84,7 @@ abstract class _$DesktopMode extends $Notifier<bool> {
   bool build(String tabId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -94,7 +94,7 @@ abstract class _$DesktopMode extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/pending_tab_selection.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/pending_tab_selection.g.dart
index 71ba305c..83704a1d 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/pending_tab_selection.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/pending_tab_selection.g.dart
@@ -65,7 +65,7 @@ abstract class _$PendingTabSelection extends $Notifier<String?> {
   String? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -75,6 +75,6 @@ abstract class _$PendingTabSelection extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/restore_complete.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/restore_complete.g.dart
index 6e29fb92..6dd2334c 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/restore_complete.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/restore_complete.g.dart
@@ -65,7 +65,7 @@ abstract class _$BrowserRestoreComplete extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -75,6 +75,6 @@ abstract class _$BrowserRestoreComplete extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/selected_tab.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/selected_tab.g.dart
index 46f2fc4d..e9393545 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/selected_tab.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/selected_tab.g.dart
@@ -47,7 +47,7 @@ abstract class _$SelectedTab extends $Notifier<String?> {
   String? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$SelectedTab extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/tab_list.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/tab_list.g.dart
index fba8372c..4efb3cda 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/tab_list.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/tab_list.g.dart
@@ -47,7 +47,7 @@ abstract class _$TabList extends $Notifier<EquatableValue<List<String>>> {
   EquatableValue<List<String>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<EquatableValue<List<String>>, EquatableValue<List<String>>>;
@@ -62,6 +62,6 @@ abstract class _$TabList extends $Notifier<EquatableValue<List<String>>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/tab_session.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/tab_session.g.dart
index fd19554f..4868c151 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/tab_session.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/tab_session.g.dart
@@ -84,7 +84,7 @@ abstract class _$TabSession extends $Notifier<void> {
   void build({required String? tabId});
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -94,7 +94,7 @@ abstract class _$TabSession extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(tabId: _$args));
+    return element.handleCreate(ref, () => build(tabId: _$args));
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/tab_state.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/tab_state.g.dart
index a6232417..e409643b 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/tab_state.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/tab_state.g.dart
@@ -47,7 +47,7 @@ abstract class _$TabStates extends $Notifier<Map<String, TabState>> {
   Map<String, TabState> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Map<String, TabState>, Map<String, TabState>>;
     final element =
         ref.element
@@ -57,7 +57,7 @@ abstract class _$TabStates extends $Notifier<Map<String, TabState>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/domain/providers/web_extensions_state.g.dart b/apps/weblibre/lib/features/geckoview/domain/providers/web_extensions_state.g.dart
index 8cd4672b..59b90287 100644
--- a/apps/weblibre/lib/features/geckoview/domain/providers/web_extensions_state.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/providers/web_extensions_state.g.dart
@@ -97,7 +97,7 @@ abstract class _$WebExtensionsState
   Map<String, WebExtensionState> build(WebExtensionActionType actionType);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -115,6 +115,6 @@ abstract class _$WebExtensionsState
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/domain/repositories/tab.g.dart b/apps/weblibre/lib/features/geckoview/domain/repositories/tab.g.dart
index 0d42fa98..e972d910 100644
--- a/apps/weblibre/lib/features/geckoview/domain/repositories/tab.g.dart
+++ b/apps/weblibre/lib/features/geckoview/domain/repositories/tab.g.dart
@@ -47,7 +47,7 @@ abstract class _$TabRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$TabRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmark_list_ui_state.g.dart b/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmark_list_ui_state.g.dart
index b82ee652..982fc6d3 100644
--- a/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmark_list_ui_state.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmark_list_ui_state.g.dart
@@ -50,7 +50,7 @@ abstract class _$BookmarkListUiStateNotifier
   BookmarkListUiState build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<BookmarkListUiState, BookmarkListUiState>;
     final element =
         ref.element
@@ -60,6 +60,6 @@ abstract class _$BookmarkListUiStateNotifier
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmarks.g.dart b/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmarks.g.dart
index 3de74d78..2a1973a5 100644
--- a/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmarks.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/providers/bookmarks.g.dart
@@ -39,7 +39,7 @@ abstract class _$BookmarksSearch extends $StreamNotifier<Set<String>> {
   Stream<Set<String>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<Set<String>>, Set<String>>;
     final element =
         ref.element
@@ -49,7 +49,7 @@ abstract class _$BookmarksSearch extends $StreamNotifier<Set<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -92,7 +92,7 @@ abstract class _$BookmarkSearchResults extends $Notifier<List<BookmarkEntry>> {
   List<BookmarkEntry> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<List<BookmarkEntry>, List<BookmarkEntry>>;
     final element =
         ref.element
@@ -102,7 +102,7 @@ abstract class _$BookmarkSearchResults extends $Notifier<List<BookmarkEntry>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -311,7 +311,7 @@ abstract class _$SeamlessBookmarks
   });
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<BookmarkItem?>, AsyncValue<BookmarkItem?>>;
     final element =
@@ -322,7 +322,7 @@ abstract class _$SeamlessBookmarks
               Object?,
               Object?
             >;
-    element.handleCreate(
+    return element.handleCreate(
       ref,
       () => build(_$args.$1, hideEmptyRoots: _$args.hideEmptyRoots),
     );
diff --git a/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/repositories/bookmarks.g.dart b/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/repositories/bookmarks.g.dart
index f60cfda6..d6fee072 100644
--- a/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/repositories/bookmarks.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/bookmarks/domain/repositories/bookmarks.g.dart
@@ -40,7 +40,7 @@ abstract class _$BookmarksRepository extends $AsyncNotifier<BookmarkItem?> {
   FutureOr<BookmarkItem?> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<BookmarkItem?>, BookmarkItem?>;
     final element =
         ref.element
@@ -50,6 +50,6 @@ abstract class _$BookmarksRepository extends $AsyncNotifier<BookmarkItem?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/providers.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/providers.g.dart
index 02a53c1d..a97d22dc 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/providers.g.dart
@@ -135,7 +135,7 @@ abstract class _$SelectedBangTrigger extends $Notifier<BangKey?> {
   BangKey? build({String? domain});
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<BangKey?, BangKey?>;
     final element =
         ref.element
@@ -145,7 +145,7 @@ abstract class _$SelectedBangTrigger extends $Notifier<BangKey?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(domain: _$args));
+    return element.handleCreate(ref, () => build(domain: _$args));
   }
 }
 
@@ -232,7 +232,7 @@ abstract class _$SelectedBangData extends $Notifier<BangData?> {
   BangData? build({String? domain});
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<BangData?, BangData?>;
     final element =
         ref.element
@@ -242,7 +242,7 @@ abstract class _$SelectedBangData extends $Notifier<BangData?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(domain: _$args));
+    return element.handleCreate(ref, () => build(domain: _$args));
   }
 }
 
@@ -1285,7 +1285,7 @@ abstract class _$AppLinksModeNotifier extends $AsyncNotifier<AppLinksMode> {
   FutureOr<AppLinksMode> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<AppLinksMode>, AppLinksMode>;
     final element =
         ref.element
@@ -1295,6 +1295,6 @@ abstract class _$AppLinksModeNotifier extends $AsyncNotifier<AppLinksMode> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/intent.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/intent.g.dart
index d40cc259..85158478 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/intent.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/intent.g.dart
@@ -41,7 +41,7 @@ abstract class _$EngineBoundIntentStream
   Stream<SharedContent> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<SharedContent>, SharedContent>;
     final element =
         ref.element
@@ -51,6 +51,6 @@ abstract class _$EngineBoundIntentStream
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart
index 7af84b42..b55b748b 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/providers/lifecycle.g.dart
@@ -48,7 +48,7 @@ abstract class _$BrowserViewLifecycle extends $Notifier<AppLifecycleState?> {
   AppLifecycleState? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AppLifecycleState?, AppLifecycleState?>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BrowserViewLifecycle extends $Notifier<AppLifecycleState?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/site_permissions.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/site_permissions.g.dart
index 7e63f300..53c8682c 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/site_permissions.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/site_permissions.g.dart
@@ -97,7 +97,7 @@ abstract class _$SitePermissionsRepository
   });
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<SitePermissions?>, SitePermissions?>;
     final element =
@@ -108,7 +108,7 @@ abstract class _$SitePermissionsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(
+    return element.handleCreate(
       ref,
       () => build(origin: _$args.origin, isPrivate: _$args.isPrivate),
     );
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/tracking_protection.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/tracking_protection.g.dart
index 6f793851..5ee76ecb 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/tracking_protection.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/repositories/tracking_protection.g.dart
@@ -63,7 +63,7 @@ abstract class _$TrackingProtectionRepository
   FutureOr<List<TrackingProtectionException>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -81,6 +81,6 @@ abstract class _$TrackingProtectionRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart
index aaf6ab36..ad0335be 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_addon.g.dart
@@ -40,7 +40,7 @@ abstract class _$AllowUnsignedExtensions extends $AsyncNotifier<bool> {
   FutureOr<bool> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<bool>, bool>;
     final element =
         ref.element
@@ -50,7 +50,7 @@ abstract class _$AllowUnsignedExtensions extends $AsyncNotifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -84,7 +84,7 @@ abstract class _$AddonAutoUpdate extends $AsyncNotifier<bool> {
   FutureOr<bool> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<bool>, bool>;
     final element =
         ref.element
@@ -94,7 +94,7 @@ abstract class _$AddonAutoUpdate extends $AsyncNotifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -137,7 +137,7 @@ abstract class _$BrowserAddonService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -147,6 +147,6 @@ abstract class _$BrowserAddonService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart
index f016e851..5776e8fb 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/browser_data.g.dart
@@ -48,7 +48,7 @@ abstract class _$BrowserDataService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BrowserDataService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart
index 074d0155..e1618cfd 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/engine_settings_replication.g.dart
@@ -50,7 +50,7 @@ abstract class _$EngineSettingsReplicationService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -60,6 +60,6 @@ abstract class _$EngineSettingsReplicationService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart
index 01b6bf72..f78ba811 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/domain/services/proxy_settings_replication.g.dart
@@ -48,7 +48,7 @@ abstract class _$ProxySettingsReplication extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$ProxySettingsReplication extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/tab_view_controllers.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/tab_view_controllers.g.dart
index f9e552c8..83933afa 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/tab_view_controllers.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/tab_view_controllers.g.dart
@@ -48,7 +48,7 @@ abstract class _$TabsViewModeController extends $Notifier<TabsViewMode> {
   TabsViewMode build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<TabsViewMode, TabsViewMode>;
     final element =
         ref.element
@@ -58,7 +58,7 @@ abstract class _$TabsViewModeController extends $Notifier<TabsViewMode> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -105,7 +105,7 @@ abstract class _$TabViewFilterControllerBase
   TabViewFilterOptions build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<TabViewFilterOptions, TabViewFilterOptions>;
     final element =
         ref.element
@@ -115,7 +115,7 @@ abstract class _$TabViewFilterControllerBase
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -179,7 +179,7 @@ abstract class _$CollapsedGroups extends $Notifier<Set<String>> {
   Set<String> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Set<String>, Set<String>>;
     final element =
         ref.element
@@ -189,7 +189,7 @@ abstract class _$CollapsedGroups extends $Notifier<Set<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -232,7 +232,7 @@ abstract class _$TabsReorderableController extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -242,7 +242,7 @@ abstract class _$TabsReorderableController extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/toolbar_visibility.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/toolbar_visibility.g.dart
index 3aa9db44..63088dae 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/toolbar_visibility.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/presentation/controllers/toolbar_visibility.g.dart
@@ -96,7 +96,7 @@ abstract class _$ToolbarVisibilityController
   ToolbarVisibility build(String? tabId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<ToolbarVisibility, ToolbarVisibility>;
     final element =
         ref.element
@@ -106,6 +106,6 @@ abstract class _$ToolbarVisibilityController
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/browser/presentation/providers/browser_viewport_toolbar_insets.g.dart b/apps/weblibre/lib/features/geckoview/features/browser/presentation/providers/browser_viewport_toolbar_insets.g.dart
index 6b5d4b5b..ce30a4e0 100644
--- a/apps/weblibre/lib/features/geckoview/features/browser/presentation/providers/browser_viewport_toolbar_insets.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/browser/presentation/providers/browser_viewport_toolbar_insets.g.dart
@@ -138,7 +138,7 @@ abstract class _$BrowserViewportToolbarInsetsController
   BrowserViewportToolbarInsetsState build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -156,6 +156,6 @@ abstract class _$BrowserViewportToolbarInsetsController
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart b/apps/weblibre/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart
index fd034f7d..f26c47da 100644
--- a/apps/weblibre/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/find_in_page/domain/repositories/find_in_page.g.dart
@@ -93,7 +93,7 @@ abstract class _$FindInPageRepository extends $Notifier<String?> {
   String? build(String? tabId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -103,6 +103,6 @@ abstract class _$FindInPageRepository extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart b/apps/weblibre/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart
index 883f22fe..81661085 100644
--- a/apps/weblibre/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/find_in_page/presentation/controllers/find_in_page.g.dart
@@ -93,7 +93,7 @@ abstract class _$FindInPageController extends $Notifier<FindInPageState> {
   FindInPageState build(String tabId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<FindInPageState, FindInPageState>;
     final element =
         ref.element
@@ -103,6 +103,6 @@ abstract class _$FindInPageController extends $Notifier<FindInPageState> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/history/domain/providers.g.dart b/apps/weblibre/lib/features/geckoview/features/history/domain/providers.g.dart
index accf9742..8c103c41 100644
--- a/apps/weblibre/lib/features/geckoview/features/history/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/history/domain/providers.g.dart
@@ -52,7 +52,7 @@ abstract class _$HistoryVisitsFilterBase
   HistoryFilterOptions build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<HistoryFilterOptions, HistoryFilterOptions>;
     final element =
         ref.element
@@ -62,7 +62,7 @@ abstract class _$HistoryVisitsFilterBase
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -109,7 +109,7 @@ abstract class _$HistoryDownloadsFilterBase
   HistoryFilterOptions build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<HistoryFilterOptions, HistoryFilterOptions>;
     final element =
         ref.element
@@ -119,7 +119,7 @@ abstract class _$HistoryDownloadsFilterBase
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/features/history/domain/repositories/history.g.dart b/apps/weblibre/lib/features/geckoview/features/history/domain/repositories/history.g.dart
index e877b66a..e7130976 100644
--- a/apps/weblibre/lib/features/geckoview/features/history/domain/repositories/history.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/history/domain/repositories/history.g.dart
@@ -47,7 +47,7 @@ abstract class _$HistoryRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$HistoryRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_file.g.dart b/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_file.g.dart
index cb91cc31..086f2fd3 100644
--- a/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_file.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_file.g.dart
@@ -49,7 +49,7 @@ abstract class _$UrlCleanerCatalogFileService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -59,6 +59,6 @@ abstract class _$UrlCleanerCatalogFileService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_service.g.dart b/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_service.g.dart
index 1ebae60a..c2a568e4 100644
--- a/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_service.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_cleaner_catalog_service.g.dart
@@ -42,7 +42,7 @@ abstract class _$UrlCleanerCatalogService
   FutureOr<List<UrlCleanerRule>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<List<UrlCleanerRule>>, List<UrlCleanerRule>>;
@@ -57,6 +57,6 @@ abstract class _$UrlCleanerCatalogService
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_unshortener_service.g.dart b/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_unshortener_service.g.dart
index c38bea04..7e933502 100644
--- a/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_unshortener_service.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/open_link_tools/domain/services/url_unshortener_service.g.dart
@@ -40,7 +40,7 @@ abstract class _$UrlUnshortenerService extends $AsyncNotifier<Set<String>> {
   FutureOr<Set<String>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<Set<String>>, Set<String>>;
     final element =
         ref.element
@@ -50,6 +50,6 @@ abstract class _$UrlUnshortenerService extends $AsyncNotifier<Set<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/open_link_tools/presentation/controllers/open_shared_content_unshorten_controller.g.dart b/apps/weblibre/lib/features/geckoview/features/open_link_tools/presentation/controllers/open_shared_content_unshorten_controller.g.dart
index b8212b6b..1ea056b7 100644
--- a/apps/weblibre/lib/features/geckoview/features/open_link_tools/presentation/controllers/open_shared_content_unshorten_controller.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/open_link_tools/presentation/controllers/open_shared_content_unshorten_controller.g.dart
@@ -56,7 +56,7 @@ abstract class _$OpenSharedContentUnshortenController
   AsyncValue<UnshortenResult>? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<UnshortenResult>?, AsyncValue<UnshortenResult>?>;
@@ -71,6 +71,6 @@ abstract class _$OpenSharedContentUnshortenController
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_observer.g.dart b/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_observer.g.dart
index 45e6d38f..eca1e078 100644
--- a/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_observer.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_observer.g.dart
@@ -40,7 +40,7 @@ abstract class _$PreferenceChangeListener extends $StreamNotifier<GeckoPref> {
   Stream<GeckoPref> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<GeckoPref>, GeckoPref>;
     final element =
         ref.element
@@ -50,7 +50,7 @@ abstract class _$PreferenceChangeListener extends $StreamNotifier<GeckoPref> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -92,7 +92,7 @@ abstract class _$PreferenceFixator extends $Notifier<Map<String, Object>> {
   Map<String, Object> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Map<String, Object>, Map<String, Object>>;
     final element =
         ref.element
@@ -102,6 +102,6 @@ abstract class _$PreferenceFixator extends $Notifier<Map<String, Object>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart b/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart
index 5d20aa00..b4ce0920 100644
--- a/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/preferences/data/repositories/preference_settings.g.dart
@@ -51,7 +51,7 @@ abstract class _$StartupPreferenceEnforcementService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -61,7 +61,7 @@ abstract class _$StartupPreferenceEnforcementService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -369,7 +369,7 @@ abstract class _$PreferenceRepository
   Raw<Stream<Map<String, GeckoPref>>> build(PreferencePartition partition);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -387,7 +387,7 @@ abstract class _$PreferenceRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
@@ -482,7 +482,7 @@ abstract class _$UnifiedPreferenceSettingsRepository
   );
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -500,7 +500,7 @@ abstract class _$UnifiedPreferenceSettingsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
@@ -598,7 +598,7 @@ abstract class _$PreferenceSettingsGroupRepository
   );
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<PreferenceSettingGroup>, PreferenceSettingGroup>;
@@ -613,6 +613,6 @@ abstract class _$PreferenceSettingsGroupRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args.$1, _$args.$2));
+    return element.handleCreate(ref, () => build(_$args.$1, _$args.$2));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/pwa/domain/providers.g.dart b/apps/weblibre/lib/features/geckoview/features/pwa/domain/providers.g.dart
index 94605202..9355c760 100644
--- a/apps/weblibre/lib/features/geckoview/features/pwa/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/pwa/domain/providers.g.dart
@@ -100,7 +100,7 @@ abstract class _$PwaManifestState extends $Notifier<Map<String, PwaManifest?>> {
   Map<String, PwaManifest?> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<Map<String, PwaManifest?>, Map<String, PwaManifest?>>;
     final element =
@@ -111,7 +111,7 @@ abstract class _$PwaManifestState extends $Notifier<Map<String, PwaManifest?>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart b/apps/weblibre/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart
index c2cbd784..00bf997b 100644
--- a/apps/weblibre/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/readerview/presentation/controllers/readerable.g.dart
@@ -41,7 +41,7 @@ abstract class _$ReaderableScreenController extends $AsyncNotifier<void> {
   FutureOr<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, void>;
     final element =
         ref.element
@@ -51,6 +51,6 @@ abstract class _$ReaderableScreenController extends $AsyncNotifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart
index 9f272af3..80f2e396 100644
--- a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/engine_suggestions.g.dart
@@ -40,7 +40,7 @@ abstract class _$EngineSuggestions
   Stream<List<GeckoSuggestion>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<List<GeckoSuggestion>>, List<GeckoSuggestion>>;
@@ -55,7 +55,7 @@ abstract class _$EngineSuggestions
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_autofocus.g.dart b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_autofocus.g.dart
index bef54452..3f9b59f0 100644
--- a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_autofocus.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_autofocus.g.dart
@@ -49,7 +49,7 @@ abstract class _$SearchAutofocusSuppression extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -59,6 +59,6 @@ abstract class _$SearchAutofocusSuppression extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_module_order.g.dart b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_module_order.g.dart
index 9529f695..975cbfe3 100644
--- a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_module_order.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_module_order.g.dart
@@ -127,7 +127,7 @@ abstract class _$SearchModuleOrder extends $Notifier<List<ModuleOrderEntry>> {
   List<ModuleOrderEntry> build(SearchModuleGroup group);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<List<ModuleOrderEntry>, List<ModuleOrderEntry>>;
     final element =
@@ -138,6 +138,6 @@ abstract class _$SearchModuleOrder extends $Notifier<List<ModuleOrderEntry>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_modules_view.g.dart b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_modules_view.g.dart
index e51d0e33..ddff8b24 100644
--- a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_modules_view.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_modules_view.g.dart
@@ -105,7 +105,7 @@ abstract class _$SearchModuleDisplayStateController
   SearchModuleDisplayState build(SearchModuleType module);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<SearchModuleDisplayState, SearchModuleDisplayState>;
     final element =
@@ -116,7 +116,7 @@ abstract class _$SearchModuleDisplayStateController
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
@@ -158,7 +158,7 @@ abstract class _$SearchReorderMode extends $Notifier<SearchModuleGroup?> {
   SearchModuleGroup? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<SearchModuleGroup?, SearchModuleGroup?>;
     final element =
         ref.element
@@ -168,6 +168,6 @@ abstract class _$SearchReorderMode extends $Notifier<SearchModuleGroup?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart
index fb5da88b..35efe0f1 100644
--- a/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/search/domain/providers/search_suggestions.g.dart
@@ -133,7 +133,7 @@ abstract class _$SearchSuggestions extends $StreamNotifier<List<String>> {
   Stream<List<String>> build({ISearchSuggestionProvider? suggestionsProvider});
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<List<String>>, List<String>>;
     final element =
         ref.element
@@ -143,6 +143,6 @@ abstract class _$SearchSuggestions extends $StreamNotifier<List<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(suggestionsProvider: _$args));
+    return element.handleCreate(ref, () => build(suggestionsProvider: _$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart b/apps/weblibre/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart
index 3cf232f6..446d1c28 100644
--- a/apps/weblibre/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/search/domain/repositories/search_suggestions.g.dart
@@ -106,7 +106,7 @@ abstract class _$SearchSuggestionsRepository
   );
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<Raw<Stream<List<String>>>, Raw<Stream<List<String>>>>;
     final element =
@@ -117,6 +117,6 @@ abstract class _$SearchSuggestionsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/data/database/definitions.drift.dart b/apps/weblibre/lib/features/geckoview/features/tabs/data/database/definitions.drift.dart
index 23c3a43f..21c03408 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/data/database/definitions.drift.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/data/database/definitions.drift.dart
@@ -56,10 +56,7 @@ final class $ContainerReferences
     i0.GeneratedDatabase db,
   ) => i0.MultiTypedResultKey.fromTable(
     i9.ReadDatabaseContainer(db).resultSet<i3.Tab>('tab'),
-    aliasName: i0.$_aliasNameGenerator(
-      i9.ReadDatabaseContainer(db).resultSet<i3.Container>('container').id,
-      i9.ReadDatabaseContainer(db).resultSet<i3.Tab>('tab').containerId,
-    ),
+    aliasName: 'container__id__tab__container_id',
   );
 
   i3.$TabProcessedTableManager get tabRefs {
@@ -410,14 +407,7 @@ final class $TabReferences
   static i3.Container _containerIdTable(i0.GeneratedDatabase db) =>
       i9.ReadDatabaseContainer(db)
           .resultSet<i3.Container>('container')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i9.ReadDatabaseContainer(db).resultSet<i3.Tab>('tab').containerId,
-              i9.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.Container>('container').id,
-            ),
-          );
+          .createAlias('tab__container_id__container__id');
 
   i3.$ContainerProcessedTableManager? get containerId {
     final $_column = $_itemColumn<String>('container_id');
@@ -439,12 +429,7 @@ final class $TabReferences
   _captureTabRefsTable(i0.GeneratedDatabase db) =>
       i0.MultiTypedResultKey.fromTable(
         i9.ReadDatabaseContainer(db).resultSet<i3.CaptureTab>('capture_tab'),
-        aliasName: i0.$_aliasNameGenerator(
-          i9.ReadDatabaseContainer(db).resultSet<i3.Tab>('tab').id,
-          i9.ReadDatabaseContainer(
-            db,
-          ).resultSet<i3.CaptureTab>('capture_tab').tabId,
-        ),
+        aliasName: 'tab__id__capture_tab__tab_id',
       );
 
   i3.$CaptureTabProcessedTableManager get captureTabRefs {
@@ -1229,16 +1214,9 @@ final class $CaptureTabReferences
   $CaptureTabReferences(super.$_db, super.$_table, super.$_typedResult);
 
   static i3.Tab _tabIdTable(i0.GeneratedDatabase db) =>
-      i9.ReadDatabaseContainer(db)
-          .resultSet<i3.Tab>('tab')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i9.ReadDatabaseContainer(
-                db,
-              ).resultSet<i3.CaptureTab>('capture_tab').tabId,
-              i9.ReadDatabaseContainer(db).resultSet<i3.Tab>('tab').id,
-            ),
-          );
+      i9.ReadDatabaseContainer(
+        db,
+      ).resultSet<i3.Tab>('tab').createAlias('capture_tab__tab_id__tab__id');
 
   i3.$TabProcessedTableManager get tabId {
     final $_column = $_itemColumn<String>('tab_id')!;
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart
index de305613..7124cf22 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/providers/selected_container.g.dart
@@ -47,7 +47,7 @@ abstract class _$SelectedContainer extends $Notifier<String?> {
   String? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -57,7 +57,7 @@ abstract class _$SelectedContainer extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart
index c0afc14e..b343230f 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/container.g.dart
@@ -48,7 +48,7 @@ abstract class _$ContainerRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$ContainerRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/gecko_inference.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/gecko_inference.g.dart
index c8a99285..182d298c 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/gecko_inference.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/gecko_inference.g.dart
@@ -48,7 +48,7 @@ abstract class _$GeckoInferenceRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,7 +58,7 @@ abstract class _$GeckoInferenceRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/history_search.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/history_search.g.dart
index 9daa90d2..c6c9d05e 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/history_search.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/history_search.g.dart
@@ -71,7 +71,7 @@ abstract class _$HistorySearchRepository
   FutureOr<({String query, List<HistoryQueryResult> results})?> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -89,6 +89,6 @@ abstract class _$HistorySearchRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart
index 1502bc8f..76f5927f 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab.g.dart
@@ -47,7 +47,7 @@ abstract class _$TabDataRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$TabDataRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart
index 818ecc89..7db3f9b9 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/repositories/tab_search.g.dart
@@ -92,7 +92,7 @@ abstract class _$TabSearchRepository
   );
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -110,6 +110,6 @@ abstract class _$TabSearchRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_pruner.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_pruner.g.dart
index 6914a763..0674576b 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_pruner.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_pruner.g.dart
@@ -72,7 +72,7 @@ abstract class _$LocalIndexPruner extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -82,6 +82,6 @@ abstract class _$LocalIndexPruner extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_settings_sync.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_settings_sync.g.dart
index 91db9def..fe2df35f 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_settings_sync.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/domain/services/local_index_settings_sync.g.dart
@@ -81,7 +81,7 @@ abstract class _$LocalIndexSettingsSync extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -91,6 +91,6 @@ abstract class _$LocalIndexSettingsSync extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/tabs/presentation/controllers/container_topic.g.dart b/apps/weblibre/lib/features/geckoview/features/tabs/presentation/controllers/container_topic.g.dart
index dfe373b1..911e3076 100644
--- a/apps/weblibre/lib/features/geckoview/features/tabs/presentation/controllers/container_topic.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/tabs/presentation/controllers/container_topic.g.dart
@@ -48,7 +48,7 @@ abstract class _$ContainerTopicController extends $Notifier<AsyncValue<void>> {
   AsyncValue<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, AsyncValue<void>>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$ContainerTopicController extends $Notifier<AsyncValue<void>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/geckoview/features/top_sites/domain/repositories/top_site_repository.g.dart b/apps/weblibre/lib/features/geckoview/features/top_sites/domain/repositories/top_site_repository.g.dart
index 164473ee..d06d3d33 100644
--- a/apps/weblibre/lib/features/geckoview/features/top_sites/domain/repositories/top_site_repository.g.dart
+++ b/apps/weblibre/lib/features/geckoview/features/top_sites/domain/repositories/top_site_repository.g.dart
@@ -47,7 +47,7 @@ abstract class _$TopSiteRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$TopSiteRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/gestures/domain/repositories/gesture_settings.g.dart b/apps/weblibre/lib/features/gestures/domain/repositories/gesture_settings.g.dart
index 32b71ad0..17455a43 100644
--- a/apps/weblibre/lib/features/gestures/domain/repositories/gesture_settings.g.dart
+++ b/apps/weblibre/lib/features/gestures/domain/repositories/gesture_settings.g.dart
@@ -42,7 +42,7 @@ abstract class _$GestureSettingsRepository
   Stream<GestureSettings> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<GestureSettings>, GestureSettings>;
     final element =
         ref.element
@@ -52,7 +52,7 @@ abstract class _$GestureSettingsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/gestures/domain/services/gesture_control.g.dart b/apps/weblibre/lib/features/gestures/domain/services/gesture_control.g.dart
index 9fc28a17..7224a1b2 100644
--- a/apps/weblibre/lib/features/gestures/domain/services/gesture_control.g.dart
+++ b/apps/weblibre/lib/features/gestures/domain/services/gesture_control.g.dart
@@ -81,7 +81,7 @@ abstract class _$GestureControlService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -91,7 +91,7 @@ abstract class _$GestureControlService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/intent_gatekeeper/domain/services/intent_gatekeeper.g.dart b/apps/weblibre/lib/features/intent_gatekeeper/domain/services/intent_gatekeeper.g.dart
index d5c9cfcc..2a6a2884 100644
--- a/apps/weblibre/lib/features/intent_gatekeeper/domain/services/intent_gatekeeper.g.dart
+++ b/apps/weblibre/lib/features/intent_gatekeeper/domain/services/intent_gatekeeper.g.dart
@@ -40,7 +40,7 @@ abstract class _$IntentGatekeeper
   Stream<PendingIntentDecision> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<PendingIntentDecision>, PendingIntentDecision>;
@@ -55,6 +55,6 @@ abstract class _$IntentGatekeeper
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/intent_gatekeeper/domain/services/native_gatekeeper_replicator.g.dart b/apps/weblibre/lib/features/intent_gatekeeper/domain/services/native_gatekeeper_replicator.g.dart
index 71018d82..6b4b2c89 100644
--- a/apps/weblibre/lib/features/intent_gatekeeper/domain/services/native_gatekeeper_replicator.g.dart
+++ b/apps/weblibre/lib/features/intent_gatekeeper/domain/services/native_gatekeeper_replicator.g.dart
@@ -79,7 +79,7 @@ abstract class _$NativeIntentGatekeeperReplicator extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -89,6 +89,6 @@ abstract class _$NativeIntentGatekeeperReplicator extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/onboarding/domain/providers.g.dart b/apps/weblibre/lib/features/onboarding/domain/providers.g.dart
index 310001b6..7684d265 100644
--- a/apps/weblibre/lib/features/onboarding/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/onboarding/domain/providers.g.dart
@@ -48,7 +48,7 @@ abstract class _$OnboardingModeNotifier extends $Notifier<OnboardingMode> {
   OnboardingMode build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<OnboardingMode, OnboardingMode>;
     final element =
         ref.element
@@ -58,7 +58,7 @@ abstract class _$OnboardingModeNotifier extends $Notifier<OnboardingMode> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -101,7 +101,7 @@ abstract class _$EulaAcceptedNotifier extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -111,6 +111,6 @@ abstract class _$EulaAcceptedNotifier extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/repositories/container_proxy.g.dart b/apps/weblibre/lib/features/proxy/domain/repositories/container_proxy.g.dart
index 970c240f..c017d536 100644
--- a/apps/weblibre/lib/features/proxy/domain/repositories/container_proxy.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/repositories/container_proxy.g.dart
@@ -48,7 +48,7 @@ abstract class _$ContainerProxyRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$ContainerProxyRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_credentials.g.dart b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_credentials.g.dart
index 020e7440..01bee35a 100644
--- a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_credentials.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_credentials.g.dart
@@ -51,7 +51,7 @@ abstract class _$SingboxProxyCredentialsRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -61,6 +61,6 @@ abstract class _$SingboxProxyCredentialsRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_logs.g.dart b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_logs.g.dart
index 6b87a8e2..e9e100d7 100644
--- a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_logs.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_logs.g.dart
@@ -52,7 +52,7 @@ abstract class _$SingboxProxyLogs extends $Notifier<List<ProxyLogMessage>> {
   List<ProxyLogMessage> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<List<ProxyLogMessage>, List<ProxyLogMessage>>;
     final element =
         ref.element
@@ -62,6 +62,6 @@ abstract class _$SingboxProxyLogs extends $Notifier<List<ProxyLogMessage>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_profiles.g.dart b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_profiles.g.dart
index f2b86f82..a81bb1ff 100644
--- a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_profiles.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_profiles.g.dart
@@ -46,7 +46,7 @@ abstract class _$SingboxProxyProfilesRepository
   Stream<List<ProxyProfile>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<List<ProxyProfile>>, List<ProxyProfile>>;
     final element =
@@ -57,6 +57,6 @@ abstract class _$SingboxProxyProfilesRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_runtime.g.dart b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_runtime.g.dart
index 42eb4664..40c0bee6 100644
--- a/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_runtime.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/repositories/singbox_proxy_runtime.g.dart
@@ -94,7 +94,7 @@ abstract class _$SingboxProxyRuntimeRepository
   FutureOr<SingboxProxyRuntimeState> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -112,6 +112,6 @@ abstract class _$SingboxProxyRuntimeRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/services/proxy_input_consumer.g.dart b/apps/weblibre/lib/features/proxy/domain/services/proxy_input_consumer.g.dart
index 3faa6517..6d30f735 100644
--- a/apps/weblibre/lib/features/proxy/domain/services/proxy_input_consumer.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/services/proxy_input_consumer.g.dart
@@ -48,7 +48,7 @@ abstract class _$ProxyInputConsumer extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$ProxyInputConsumer extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/services/proxy_latency_tester.g.dart b/apps/weblibre/lib/features/proxy/domain/services/proxy_latency_tester.g.dart
index cf4c8d7e..026804c7 100644
--- a/apps/weblibre/lib/features/proxy/domain/services/proxy_latency_tester.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/services/proxy_latency_tester.g.dart
@@ -71,7 +71,7 @@ abstract class _$ProxyLatencyResults
   Map<ProxyConnectionId, AsyncValue<ProxyLatencyData>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -89,6 +89,6 @@ abstract class _$ProxyLatencyResults
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/domain/services/singbox_proxy_endpoint_sync.g.dart b/apps/weblibre/lib/features/proxy/domain/services/singbox_proxy_endpoint_sync.g.dart
index be90deca..85456661 100644
--- a/apps/weblibre/lib/features/proxy/domain/services/singbox_proxy_endpoint_sync.g.dart
+++ b/apps/weblibre/lib/features/proxy/domain/services/singbox_proxy_endpoint_sync.g.dart
@@ -101,7 +101,7 @@ abstract class _$SingboxProxyEndpointSync extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -111,6 +111,6 @@ abstract class _$SingboxProxyEndpointSync extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/proxy/presentation/controllers/proxy_profile_draft_controller.g.dart b/apps/weblibre/lib/features/proxy/presentation/controllers/proxy_profile_draft_controller.g.dart
index 84f0dfdd..3c945baa 100644
--- a/apps/weblibre/lib/features/proxy/presentation/controllers/proxy_profile_draft_controller.g.dart
+++ b/apps/weblibre/lib/features/proxy/presentation/controllers/proxy_profile_draft_controller.g.dart
@@ -277,7 +277,7 @@ abstract class _$ProxyProfileDraft extends $Notifier<ProxyProfileDraftState> {
   ProxyProfileDraftState build({String? profileId, ProxyProfileSeed? seed});
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<ProxyProfileDraftState, ProxyProfileDraftState>;
     final element =
@@ -288,7 +288,7 @@ abstract class _$ProxyProfileDraft extends $Notifier<ProxyProfileDraftState> {
               Object?,
               Object?
             >;
-    element.handleCreate(
+    return element.handleCreate(
       ref,
       () => build(profileId: _$args.profileId, seed: _$args.seed),
     );
diff --git a/apps/weblibre/lib/features/quotes/domain/repositories/quotes.g.dart b/apps/weblibre/lib/features/quotes/domain/repositories/quotes.g.dart
index e4bc66e4..80e418e2 100644
--- a/apps/weblibre/lib/features/quotes/domain/repositories/quotes.g.dart
+++ b/apps/weblibre/lib/features/quotes/domain/repositories/quotes.g.dart
@@ -47,7 +47,7 @@ abstract class _$QuotesRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$QuotesRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search/domain/autosuggest/brave.g.dart b/apps/weblibre/lib/features/search/domain/autosuggest/brave.g.dart
index 5ddcd236..4d622104 100644
--- a/apps/weblibre/lib/features/search/domain/autosuggest/brave.g.dart
+++ b/apps/weblibre/lib/features/search/domain/autosuggest/brave.g.dart
@@ -48,7 +48,7 @@ abstract class _$BraveAutosuggestService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BraveAutosuggestService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search/domain/autosuggest/duckduckgo.g.dart b/apps/weblibre/lib/features/search/domain/autosuggest/duckduckgo.g.dart
index b2516ec8..c5c92169 100644
--- a/apps/weblibre/lib/features/search/domain/autosuggest/duckduckgo.g.dart
+++ b/apps/weblibre/lib/features/search/domain/autosuggest/duckduckgo.g.dart
@@ -49,7 +49,7 @@ abstract class _$DuckDuckGoAutosuggestService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -59,6 +59,6 @@ abstract class _$DuckDuckGoAutosuggestService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search/domain/autosuggest/empty.g.dart b/apps/weblibre/lib/features/search/domain/autosuggest/empty.g.dart
index 548ad625..e3f05ef8 100644
--- a/apps/weblibre/lib/features/search/domain/autosuggest/empty.g.dart
+++ b/apps/weblibre/lib/features/search/domain/autosuggest/empty.g.dart
@@ -48,7 +48,7 @@ abstract class _$EmptyAutosuggestService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$EmptyAutosuggestService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search/domain/autosuggest/kagi.g.dart b/apps/weblibre/lib/features/search/domain/autosuggest/kagi.g.dart
index afc7f526..a9bd8677 100644
--- a/apps/weblibre/lib/features/search/domain/autosuggest/kagi.g.dart
+++ b/apps/weblibre/lib/features/search/domain/autosuggest/kagi.g.dart
@@ -48,7 +48,7 @@ abstract class _$KagiAutosuggestService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$KagiAutosuggestService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search/domain/autosuggest/qwant.g.dart b/apps/weblibre/lib/features/search/domain/autosuggest/qwant.g.dart
index 84637162..2953b6e1 100644
--- a/apps/weblibre/lib/features/search/domain/autosuggest/qwant.g.dart
+++ b/apps/weblibre/lib/features/search/domain/autosuggest/qwant.g.dart
@@ -48,7 +48,7 @@ abstract class _$QwantAutosuggestService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$QwantAutosuggestService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search_credits/domain/controllers/search_token_issuance_controller.g.dart b/apps/weblibre/lib/features/search_credits/domain/controllers/search_token_issuance_controller.g.dart
index 856a9046..7ab210f6 100644
--- a/apps/weblibre/lib/features/search_credits/domain/controllers/search_token_issuance_controller.g.dart
+++ b/apps/weblibre/lib/features/search_credits/domain/controllers/search_token_issuance_controller.g.dart
@@ -54,7 +54,7 @@ abstract class _$SearchTokenIssuanceController
   SearchTokenIssuanceState build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<SearchTokenIssuanceState, SearchTokenIssuanceState>;
     final element =
@@ -65,7 +65,7 @@ abstract class _$SearchTokenIssuanceController
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/search_credits/domain/repositories/search_credits_repository.g.dart b/apps/weblibre/lib/features/search_credits/domain/repositories/search_credits_repository.g.dart
index a7d1da3e..eaec08b4 100644
--- a/apps/weblibre/lib/features/search_credits/domain/repositories/search_credits_repository.g.dart
+++ b/apps/weblibre/lib/features/search_credits/domain/repositories/search_credits_repository.g.dart
@@ -42,7 +42,7 @@ abstract class _$SearchCreditsRepository
   FutureOr<SearchCreditsStatus> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<SearchCreditsStatus>, SearchCreditsStatus>;
     final element =
@@ -53,6 +53,6 @@ abstract class _$SearchCreditsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/search_credits/domain/repositories/web_search_settings.g.dart b/apps/weblibre/lib/features/search_credits/domain/repositories/web_search_settings.g.dart
index 439595c6..a51771ce 100644
--- a/apps/weblibre/lib/features/search_credits/domain/repositories/web_search_settings.g.dart
+++ b/apps/weblibre/lib/features/search_credits/domain/repositories/web_search_settings.g.dart
@@ -53,7 +53,7 @@ abstract class _$WebSearchSettingsControllerBase
   WebSearchSettings build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<WebSearchSettings, WebSearchSettings>;
     final element =
         ref.element
@@ -63,7 +63,7 @@ abstract class _$WebSearchSettingsControllerBase
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/settings/domain/providers/log_filter.g.dart b/apps/weblibre/lib/features/settings/domain/providers/log_filter.g.dart
index 8d157a63..d0bef464 100644
--- a/apps/weblibre/lib/features/settings/domain/providers/log_filter.g.dart
+++ b/apps/weblibre/lib/features/settings/domain/providers/log_filter.g.dart
@@ -46,7 +46,7 @@ abstract class _$LogFilter extends $Notifier<Level> {
   Level build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Level, Level>;
     final element =
         ref.element
@@ -56,6 +56,6 @@ abstract class _$LogFilter extends $Notifier<Level> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/settings/domain/providers/pending_settings_highlight.g.dart b/apps/weblibre/lib/features/settings/domain/providers/pending_settings_highlight.g.dart
index 549a3462..c8d8d30b 100644
--- a/apps/weblibre/lib/features/settings/domain/providers/pending_settings_highlight.g.dart
+++ b/apps/weblibre/lib/features/settings/domain/providers/pending_settings_highlight.g.dart
@@ -65,7 +65,7 @@ abstract class _$PendingSettingsHighlight extends $Notifier<String?> {
   String? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -75,6 +75,6 @@ abstract class _$PendingSettingsHighlight extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/settings/presentation/controllers/save_settings.g.dart b/apps/weblibre/lib/features/settings/presentation/controllers/save_settings.g.dart
index 13c0c5dd..d16cb7d1 100644
--- a/apps/weblibre/lib/features/settings/presentation/controllers/save_settings.g.dart
+++ b/apps/weblibre/lib/features/settings/presentation/controllers/save_settings.g.dart
@@ -41,7 +41,7 @@ abstract class _$SaveGeneralSettingsController extends $AsyncNotifier<void> {
   FutureOr<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, void>;
     final element =
         ref.element
@@ -51,7 +51,7 @@ abstract class _$SaveGeneralSettingsController extends $AsyncNotifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -87,7 +87,7 @@ abstract class _$SaveEngineSettingsController extends $AsyncNotifier<void> {
   FutureOr<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, void>;
     final element =
         ref.element
@@ -97,7 +97,7 @@ abstract class _$SaveEngineSettingsController extends $AsyncNotifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -132,7 +132,7 @@ abstract class _$SaveTorSettingsController extends $AsyncNotifier<void> {
   FutureOr<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, void>;
     final element =
         ref.element
@@ -142,6 +142,6 @@ abstract class _$SaveTorSettingsController extends $AsyncNotifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/small_web/data/database/definitions.drift.dart b/apps/weblibre/lib/features/small_web/data/database/definitions.drift.dart
index b2a7e437..00a399b8 100644
--- a/apps/weblibre/lib/features/small_web/data/database/definitions.drift.dart
+++ b/apps/weblibre/lib/features/small_web/data/database/definitions.drift.dart
@@ -56,14 +56,7 @@ final class $SmallWebItemsReferences
         i6.ReadDatabaseContainer(
           db,
         ).resultSet<i1.SmallWebMemberships>('small_web_memberships'),
-        aliasName: i0.$_aliasNameGenerator(
-          i6.ReadDatabaseContainer(
-            db,
-          ).resultSet<i1.SmallWebItems>('small_web_items').id,
-          i6.ReadDatabaseContainer(
-            db,
-          ).resultSet<i1.SmallWebMemberships>('small_web_memberships').itemId,
-        ),
+        aliasName: 'small_web_items__id__small_web_memberships__item_id',
       );
 
   i1.$SmallWebMembershipsProcessedTableManager get smallWebMembershipsRefs {
@@ -90,14 +83,7 @@ final class $SmallWebItemsReferences
         i6.ReadDatabaseContainer(
           db,
         ).resultSet<i1.SmallWebVisits>('small_web_visits'),
-        aliasName: i0.$_aliasNameGenerator(
-          i6.ReadDatabaseContainer(
-            db,
-          ).resultSet<i1.SmallWebItems>('small_web_items').id,
-          i6.ReadDatabaseContainer(
-            db,
-          ).resultSet<i1.SmallWebVisits>('small_web_visits').itemId,
-        ),
+        aliasName: 'small_web_items__id__small_web_visits__item_id',
       );
 
   i1.$SmallWebVisitsProcessedTableManager get smallWebVisitsRefs {
@@ -587,16 +573,7 @@ final class $SmallWebMembershipsReferences
   static i1.SmallWebItems _itemIdTable(i0.GeneratedDatabase db) =>
       i6.ReadDatabaseContainer(db)
           .resultSet<i1.SmallWebItems>('small_web_items')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(db)
-                  .resultSet<i1.SmallWebMemberships>('small_web_memberships')
-                  .itemId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.SmallWebItems>('small_web_items').id,
-            ),
-          );
+          .createAlias('small_web_memberships__item_id__small_web_items__id');
 
   i1.$SmallWebItemsProcessedTableManager get itemId {
     final $_column = $_itemColumn<String>('item_id')!;
@@ -1424,16 +1401,7 @@ final class $SmallWebVisitsReferences
   static i1.SmallWebItems _itemIdTable(i0.GeneratedDatabase db) =>
       i6.ReadDatabaseContainer(db)
           .resultSet<i1.SmallWebItems>('small_web_items')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.SmallWebVisits>('small_web_visits').itemId,
-              i6.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.SmallWebItems>('small_web_items').id,
-            ),
-          );
+          .createAlias('small_web_visits__item_id__small_web_items__id');
 
   i1.$SmallWebItemsProcessedTableManager get itemId {
     final $_column = $_itemColumn<String>('item_id')!;
diff --git a/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_mode_controller.g.dart b/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_mode_controller.g.dart
index fae68421..e09727dd 100644
--- a/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_mode_controller.g.dart
+++ b/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_mode_controller.g.dart
@@ -48,7 +48,7 @@ abstract class _$SmallWebModeController extends $Notifier<String?> {
   String? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$SmallWebModeController extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_session_controller.g.dart b/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_session_controller.g.dart
index e496d0a2..ca1691b6 100644
--- a/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_session_controller.g.dart
+++ b/apps/weblibre/lib/features/small_web/presentation/controllers/small_web_session_controller.g.dart
@@ -231,7 +231,7 @@ abstract class _$SmallWebSessionController
   AsyncValue<SmallWebSessionState> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -249,6 +249,6 @@ abstract class _$SmallWebSessionController
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/sync/domain/repositories/sync.g.dart b/apps/weblibre/lib/features/sync/domain/repositories/sync.g.dart
index 28238d21..70914500 100644
--- a/apps/weblibre/lib/features/sync/domain/repositories/sync.g.dart
+++ b/apps/weblibre/lib/features/sync/domain/repositories/sync.g.dart
@@ -90,7 +90,7 @@ abstract class _$TabsTrayScopeController extends $Notifier<TabsTrayScope> {
   TabsTrayScope build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<TabsTrayScope, TabsTrayScope>;
     final element =
         ref.element
@@ -100,7 +100,7 @@ abstract class _$TabsTrayScopeController extends $Notifier<TabsTrayScope> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -186,7 +186,7 @@ abstract class _$SelectedSyncedTabsDeviceId extends $Notifier<String?> {
   String? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<String?, String?>;
     final element =
         ref.element
@@ -196,7 +196,7 @@ abstract class _$SelectedSyncedTabsDeviceId extends $Notifier<String?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -342,7 +342,7 @@ abstract class _$SyncRepository extends $AsyncNotifier<SyncRepositoryState> {
   FutureOr<SyncRepositoryState> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<SyncRepositoryState>, SyncRepositoryState>;
     final element =
@@ -353,7 +353,7 @@ abstract class _$SyncRepository extends $AsyncNotifier<SyncRepositoryState> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/tor/data/services/builtin_bridges.g.dart b/apps/weblibre/lib/features/tor/data/services/builtin_bridges.g.dart
index a631d5b2..9102d1fd 100644
--- a/apps/weblibre/lib/features/tor/data/services/builtin_bridges.g.dart
+++ b/apps/weblibre/lib/features/tor/data/services/builtin_bridges.g.dart
@@ -48,7 +48,7 @@ abstract class _$BuiltinBridgesService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BuiltinBridgesService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/tor/domain/repositories/builtin_bridges.g.dart b/apps/weblibre/lib/features/tor/domain/repositories/builtin_bridges.g.dart
index 1d67107b..a1f44ff4 100644
--- a/apps/weblibre/lib/features/tor/domain/repositories/builtin_bridges.g.dart
+++ b/apps/weblibre/lib/features/tor/domain/repositories/builtin_bridges.g.dart
@@ -94,7 +94,7 @@ abstract class _$BuiltinBridgesRepository extends $Notifier<void> {
   void build(MoatService service);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -104,6 +104,6 @@ abstract class _$BuiltinBridgesRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
diff --git a/apps/weblibre/lib/features/tor/domain/services/tor_proxy.g.dart b/apps/weblibre/lib/features/tor/domain/services/tor_proxy.g.dart
index 9ebb8f04..efe7fdf2 100644
--- a/apps/weblibre/lib/features/tor/domain/services/tor_proxy.g.dart
+++ b/apps/weblibre/lib/features/tor/domain/services/tor_proxy.g.dart
@@ -39,7 +39,7 @@ abstract class _$TorProxyService extends $StreamNotifier<TorStatus> {
   Stream<TorStatus> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<TorStatus>, TorStatus>;
     final element =
         ref.element
@@ -49,6 +49,6 @@ abstract class _$TorProxyService extends $StreamNotifier<TorStatus> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart b/apps/weblibre/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart
index c660beb9..4a5a8695 100644
--- a/apps/weblibre/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart
+++ b/apps/weblibre/lib/features/tor/presentation/controllers/start_tor_proxy.g.dart
@@ -48,7 +48,7 @@ abstract class _$StartProxyController extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$StartProxyController extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/user/domain/providers/backup_directory.g.dart b/apps/weblibre/lib/features/user/domain/providers/backup_directory.g.dart
index b516be5a..b369a263 100644
--- a/apps/weblibre/lib/features/user/domain/providers/backup_directory.g.dart
+++ b/apps/weblibre/lib/features/user/domain/providers/backup_directory.g.dart
@@ -48,7 +48,7 @@ abstract class _$BackupDirectoryUri extends $Notifier<Uri?> {
   Uri? build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Uri?, Uri?>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$BackupDirectoryUri extends $Notifier<Uri?> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/user/domain/providers/profile_auth.g.dart b/apps/weblibre/lib/features/user/domain/providers/profile_auth.g.dart
index 678b78f9..e558065e 100644
--- a/apps/weblibre/lib/features/user/domain/providers/profile_auth.g.dart
+++ b/apps/weblibre/lib/features/user/domain/providers/profile_auth.g.dart
@@ -47,7 +47,7 @@ abstract class _$ProfileAuthState extends $Notifier<bool> {
   bool build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<bool, bool>;
     final element =
         ref.element
@@ -57,7 +57,7 @@ abstract class _$ProfileAuthState extends $Notifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/user/domain/repositories/cache.g.dart b/apps/weblibre/lib/features/user/domain/repositories/cache.g.dart
index f33cefa5..56289b6c 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/cache.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/cache.g.dart
@@ -47,7 +47,7 @@ abstract class _$CacheRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$CacheRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/user/domain/repositories/engine_settings.g.dart b/apps/weblibre/lib/features/user/domain/repositories/engine_settings.g.dart
index d88da557..2b09a6b1 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/engine_settings.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/engine_settings.g.dart
@@ -41,7 +41,7 @@ abstract class _$EngineSettingsRepository
   Stream<EngineSettings> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<EngineSettings>, EngineSettings>;
     final element =
         ref.element
@@ -51,7 +51,7 @@ abstract class _$EngineSettingsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/user/domain/repositories/general_settings.g.dart b/apps/weblibre/lib/features/user/domain/repositories/general_settings.g.dart
index 9a4d9c5d..503d7c6e 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/general_settings.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/general_settings.g.dart
@@ -42,7 +42,7 @@ abstract class _$GeneralSettingsRepository
   Stream<GeneralSettings> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<GeneralSettings>, GeneralSettings>;
     final element =
         ref.element
@@ -52,7 +52,7 @@ abstract class _$GeneralSettingsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/user/domain/repositories/onboarding.g.dart b/apps/weblibre/lib/features/user/domain/repositories/onboarding.g.dart
index 1967009f..a4e9083d 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/onboarding.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/onboarding.g.dart
@@ -48,7 +48,7 @@ abstract class _$OnboardingRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$OnboardingRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/user/domain/repositories/profile.g.dart b/apps/weblibre/lib/features/user/domain/repositories/profile.g.dart
index 250c14a5..310a8afe 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/profile.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/profile.g.dart
@@ -39,7 +39,7 @@ abstract class _$ProfileRepository extends $AsyncNotifier<List<Profile>> {
   FutureOr<List<Profile>> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<List<Profile>>, List<Profile>>;
     final element =
         ref.element
@@ -49,6 +49,6 @@ abstract class _$ProfileRepository extends $AsyncNotifier<List<Profile>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/user/domain/repositories/proxy_routing_settings.g.dart b/apps/weblibre/lib/features/user/domain/repositories/proxy_routing_settings.g.dart
index 7fec48e7..2aa207ce 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/proxy_routing_settings.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/proxy_routing_settings.g.dart
@@ -46,7 +46,7 @@ abstract class _$ProxyRoutingSettingsRepository
   Stream<ProxyRoutingSettings> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<AsyncValue<ProxyRoutingSettings>, ProxyRoutingSettings>;
@@ -61,7 +61,7 @@ abstract class _$ProxyRoutingSettingsRepository
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/user/domain/repositories/tor_settings.g.dart b/apps/weblibre/lib/features/user/domain/repositories/tor_settings.g.dart
index 029c689a..4ae458a2 100644
--- a/apps/weblibre/lib/features/user/domain/repositories/tor_settings.g.dart
+++ b/apps/weblibre/lib/features/user/domain/repositories/tor_settings.g.dart
@@ -40,7 +40,7 @@ abstract class _$TorSettingsRepository extends $StreamNotifier<TorSettings> {
   Stream<TorSettings> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<TorSettings>, TorSettings>;
     final element =
         ref.element
@@ -50,7 +50,7 @@ abstract class _$TorSettingsRepository extends $StreamNotifier<TorSettings> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
diff --git a/apps/weblibre/lib/features/user/domain/services/local_authentication.g.dart b/apps/weblibre/lib/features/user/domain/services/local_authentication.g.dart
index 5b151bb6..7cc8df01 100644
--- a/apps/weblibre/lib/features/user/domain/services/local_authentication.g.dart
+++ b/apps/weblibre/lib/features/user/domain/services/local_authentication.g.dart
@@ -41,7 +41,7 @@ abstract class _$LocalAuthenticationService extends $AsyncNotifier<bool> {
   FutureOr<bool> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<bool>, bool>;
     final element =
         ref.element
@@ -51,6 +51,6 @@ abstract class _$LocalAuthenticationService extends $AsyncNotifier<bool> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/user/domain/services/user_backup.g.dart b/apps/weblibre/lib/features/user/domain/services/user_backup.g.dart
index eb45b06b..89ba4058 100644
--- a/apps/weblibre/lib/features/user/domain/services/user_backup.g.dart
+++ b/apps/weblibre/lib/features/user/domain/services/user_backup.g.dart
@@ -47,7 +47,7 @@ abstract class _$UserBackupService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$UserBackupService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_feed/data/database/definitions.drift.dart b/apps/weblibre/lib/features/web_feed/data/database/definitions.drift.dart
index 51dcdb84..866384bc 100644
--- a/apps/weblibre/lib/features/web_feed/data/database/definitions.drift.dart
+++ b/apps/weblibre/lib/features/web_feed/data/database/definitions.drift.dart
@@ -52,10 +52,7 @@ final class $FeedReferences
   _articleRefsTable(i0.GeneratedDatabase db) =>
       i0.MultiTypedResultKey.fromTable(
         i10.ReadDatabaseContainer(db).resultSet<i1.Article>('article'),
-        aliasName: i0.$_aliasNameGenerator(
-          i10.ReadDatabaseContainer(db).resultSet<i1.Feed>('feed').url,
-          i10.ReadDatabaseContainer(db).resultSet<i1.Article>('article').feedId,
-        ),
+        aliasName: 'feed__url__article__feed_id',
       );
 
   i1.$ArticleProcessedTableManager get articleRefs {
@@ -454,16 +451,9 @@ final class $ArticleReferences
   $ArticleReferences(super.$_db, super.$_table, super.$_typedResult);
 
   static i1.Feed _feedIdTable(i0.GeneratedDatabase db) =>
-      i10.ReadDatabaseContainer(db)
-          .resultSet<i1.Feed>('feed')
-          .createAlias(
-            i0.$_aliasNameGenerator(
-              i10.ReadDatabaseContainer(
-                db,
-              ).resultSet<i1.Article>('article').feedId,
-              i10.ReadDatabaseContainer(db).resultSet<i1.Feed>('feed').url,
-            ),
-          );
+      i10.ReadDatabaseContainer(
+        db,
+      ).resultSet<i1.Feed>('feed').createAlias('article__feed_id__feed__url');
 
   i1.$FeedProcessedTableManager get feedId {
     final $_column = $_itemColumn<String>('feed_id')!;
diff --git a/apps/weblibre/lib/features/web_feed/domain/providers.g.dart b/apps/weblibre/lib/features/web_feed/domain/providers.g.dart
index 79b6dc6b..401dc93b 100644
--- a/apps/weblibre/lib/features/web_feed/domain/providers.g.dart
+++ b/apps/weblibre/lib/features/web_feed/domain/providers.g.dart
@@ -84,7 +84,7 @@ abstract class _$ArticleSearch extends $StreamNotifier<List<FeedArticle>> {
   Stream<List<FeedArticle>> build(Uri? feedId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<List<FeedArticle>>, List<FeedArticle>>;
     final element =
@@ -95,7 +95,7 @@ abstract class _$ArticleSearch extends $StreamNotifier<List<FeedArticle>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
@@ -373,7 +373,7 @@ abstract class _$FilteredArticleList
   AsyncValue<List<FeedArticle>> build(Uri? feedId);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref
             as $Ref<
@@ -391,7 +391,7 @@ abstract class _$FilteredArticleList
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
diff --git a/apps/weblibre/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart b/apps/weblibre/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart
index 6f36f1ad..475d5881 100644
--- a/apps/weblibre/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart
+++ b/apps/weblibre/lib/features/web_feed/domain/providers/add_dialog_blocking.g.dart
@@ -48,7 +48,7 @@ abstract class _$AddFeedDialogBlocking extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$AddFeedDialogBlocking extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_feed/domain/providers/article_filter.g.dart b/apps/weblibre/lib/features/web_feed/domain/providers/article_filter.g.dart
index 5ab9a129..014ab6b7 100644
--- a/apps/weblibre/lib/features/web_feed/domain/providers/article_filter.g.dart
+++ b/apps/weblibre/lib/features/web_feed/domain/providers/article_filter.g.dart
@@ -47,7 +47,7 @@ abstract class _$ArticleFilter extends $Notifier<Set<String>> {
   Set<String> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<Set<String>, Set<String>>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$ArticleFilter extends $Notifier<Set<String>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_feed/domain/repositories/feed_repository.g.dart b/apps/weblibre/lib/features/web_feed/domain/repositories/feed_repository.g.dart
index 8cfd8fee..9bb507cc 100644
--- a/apps/weblibre/lib/features/web_feed/domain/repositories/feed_repository.g.dart
+++ b/apps/weblibre/lib/features/web_feed/domain/repositories/feed_repository.g.dart
@@ -47,7 +47,7 @@ abstract class _$FeedRepository extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -57,6 +57,6 @@ abstract class _$FeedRepository extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_feed/domain/services/article_content_processor.g.dart b/apps/weblibre/lib/features/web_feed/domain/services/article_content_processor.g.dart
index 9b984e06..660f9d64 100644
--- a/apps/weblibre/lib/features/web_feed/domain/services/article_content_processor.g.dart
+++ b/apps/weblibre/lib/features/web_feed/domain/services/article_content_processor.g.dart
@@ -49,7 +49,7 @@ abstract class _$ArticleContentProcessorService extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -59,6 +59,6 @@ abstract class _$ArticleContentProcessorService extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_feed/domain/services/feed_reader.g.dart b/apps/weblibre/lib/features/web_feed/domain/services/feed_reader.g.dart
index f12a1991..6cd37453 100644
--- a/apps/weblibre/lib/features/web_feed/domain/services/feed_reader.g.dart
+++ b/apps/weblibre/lib/features/web_feed/domain/services/feed_reader.g.dart
@@ -46,7 +46,7 @@ abstract class _$FeedReader extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -56,6 +56,6 @@ abstract class _$FeedReader extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart b/apps/weblibre/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart
index 95c70b9d..55d096de 100644
--- a/apps/weblibre/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart
+++ b/apps/weblibre/lib/features/web_feed/presentation/controllers/fetch_articles.g.dart
@@ -48,7 +48,7 @@ abstract class _$FetchArticlesController extends $Notifier<AsyncValue<void>> {
   AsyncValue<void> build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<AsyncValue<void>, AsyncValue<void>>;
     final element =
         ref.element
@@ -58,6 +58,6 @@ abstract class _$FetchArticlesController extends $Notifier<AsyncValue<void>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_search/domain/controllers/sandbox_capture_controller.g.dart b/apps/weblibre/lib/features/web_search/domain/controllers/sandbox_capture_controller.g.dart
index 9a129971..8fd9b3d0 100644
--- a/apps/weblibre/lib/features/web_search/domain/controllers/sandbox_capture_controller.g.dart
+++ b/apps/weblibre/lib/features/web_search/domain/controllers/sandbox_capture_controller.g.dart
@@ -457,7 +457,7 @@ abstract class _$SandboxCaptureController extends $Notifier<void> {
   void build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<void, void>;
     final element =
         ref.element
@@ -467,6 +467,6 @@ abstract class _$SandboxCaptureController extends $Notifier<void> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.g.dart b/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.g.dart
index 24cd2af3..ad078516 100644
--- a/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.g.dart
+++ b/apps/weblibre/lib/features/web_search/domain/controllers/search_controller.g.dart
@@ -48,7 +48,7 @@ abstract class _$MetaSearchController extends $Notifier<MetaSearchState> {
   MetaSearchState build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<MetaSearchState, MetaSearchState>;
     final element =
         ref.element
@@ -58,7 +58,7 @@ abstract class _$MetaSearchController extends $Notifier<MetaSearchState> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
 
@@ -119,7 +119,7 @@ abstract class _$WebSearchScrollOffset extends $Notifier<double> {
   double build();
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref = this.ref as $Ref<double, double>;
     final element =
         ref.element
@@ -129,6 +129,6 @@ abstract class _$WebSearchScrollOffset extends $Notifier<double> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, build);
+    return element.handleCreate(ref, build);
   }
 }
diff --git a/apps/weblibre/lib/presentation/controllers/website_title.g.dart b/apps/weblibre/lib/presentation/controllers/website_title.g.dart
index e8b8fe22..540edb38 100644
--- a/apps/weblibre/lib/presentation/controllers/website_title.g.dart
+++ b/apps/weblibre/lib/presentation/controllers/website_title.g.dart
@@ -92,7 +92,7 @@ abstract class _$CompletePageInfo extends $Notifier<AsyncValue<WebPageInfo>> {
   AsyncValue<WebPageInfo> build(TabState cached);
   @$mustCallSuper
   @override
-  void runBuild() {
+  WhenComplete runBuild() {
     final ref =
         this.ref as $Ref<AsyncValue<WebPageInfo>, AsyncValue<WebPageInfo>>;
     final element =
@@ -103,7 +103,7 @@ abstract class _$CompletePageInfo extends $Notifier<AsyncValue<WebPageInfo>> {
               Object?,
               Object?
             >;
-    element.handleCreate(ref, () => build(_$args));
+    return element.handleCreate(ref, () => build(_$args));
   }
 }
 
diff --git a/apps/weblibre/pubspec.yaml b/apps/weblibre/pubspec.yaml
index 020744e2..c60757ae 100644
--- a/apps/weblibre/pubspec.yaml
+++ b/apps/weblibre/pubspec.yaml
@@ -18,8 +18,8 @@ dependencies:
   crypto: ^3.0.7
   cryptography_flutter: ^2.3.4
   device_info_plus: ^13.1.0
-  drift: ^2.33.0
-  drift_dev: ^2.33.0
+  drift: ^2.34.0
+  drift_dev: ^2.34.0
   dynamic_color: ^1.8.1
   exceptions: ^0.6.1
   fading_scroll: ^0.9.4
@@ -46,8 +46,8 @@ dependencies:
   go_router: ^17.3.0
   google_fonts: ^8.1.0
   graphview: ^1.5.1
-  home_widget: ^0.9.2
-  hooks_riverpod: ^3.3.1
+  home_widget: ^0.9.3
+  hooks_riverpod: ^3.3.2
   html: ^0.15.6
   http: ^1.6.0
   intl: ^0.20.2
@@ -75,8 +75,8 @@ dependencies:
       path: packages/privacypass_client
   qr_code_scanner_plus: ^2.1.2
   quick_actions: ^1.1.0
-  riverpod: ^3.2.1
-  riverpod_annotation: ^4.0.2
+  riverpod: ^3.3.2
+  riverpod_annotation: ^4.0.3
   rss_dart: ^1.0.14
   rxdart: ^0.28.0
   saf_stream: ^3.0.0
@@ -106,7 +106,7 @@ dependencies:
   speech_to_text_dialog:
     path: ../../packages/speech_to_text_dialog
   sqlite3: ^3.3.2
-  supabase: ^2.12.1
+  supabase: ^2.12.2
   synchronized: ^3.4.1
   text_scroll: ^0.2.1
   timeago: ^3.7.1
@@ -128,7 +128,7 @@ dev_dependencies:
   json_serializable: ^6.14.0
   lint: ^2.8.0
   mockito: ^5.6.4
-  riverpod_generator: ^4.0.4-dev.1
+  riverpod_generator: ^4.0.4
 
 flutter:
   uses-material-design: true
diff --git a/packages/flutter_mozilla_components/example/pubspec.yaml b/packages/flutter_mozilla_components/example/pubspec.yaml
index 3565f9fc..2c940106 100644
--- a/packages/flutter_mozilla_components/example/pubspec.yaml
+++ b/packages/flutter_mozilla_components/example/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
 
   flutter_mozilla_components:
     path: ../
-  hooks_riverpod: ^3.3.1
+  hooks_riverpod: ^3.3.2
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/flutter_mozilla_components/pubspec.yaml b/packages/flutter_mozilla_components/pubspec.yaml
index 75951cbf..2347b0ad 100644
--- a/packages/flutter_mozilla_components/pubspec.yaml
+++ b/packages/flutter_mozilla_components/pubspec.yaml
@@ -18,7 +18,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^2.8.0
-  pigeon: ^26.3.4
+  pigeon: ^27.1.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/flutter_singbox_proxy/example/pubspec.yaml b/packages/flutter_singbox_proxy/example/pubspec.yaml
index cb4ded62..d113d773 100644
--- a/packages/flutter_singbox_proxy/example/pubspec.yaml
+++ b/packages/flutter_singbox_proxy/example/pubspec.yaml
@@ -26,7 +26,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  hooks_riverpod: ^3.3.1
+  hooks_riverpod: ^3.3.2
 
 dev_dependencies:
   flutter_lints: ^6.0.0
diff --git a/packages/flutter_singbox_proxy/pubspec.yaml b/packages/flutter_singbox_proxy/pubspec.yaml
index d2116e32..350b2e11 100644
--- a/packages/flutter_singbox_proxy/pubspec.yaml
+++ b/packages/flutter_singbox_proxy/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^2.8.0
-  pigeon: ^26.3.4
+  pigeon: ^27.1.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/flutter_tor/example/pubspec.yaml b/packages/flutter_tor/example/pubspec.yaml
index 54110d20..18444012 100644
--- a/packages/flutter_tor/example/pubspec.yaml
+++ b/packages/flutter_tor/example/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
     sdk: flutter
   flutter_tor:
     path: ../
-  hooks_riverpod: ^3.3.1
+  hooks_riverpod: ^3.3.2
 
   # HTTP client for testing Tor connectivity
   http: ^1.6.0
diff --git a/packages/flutter_tor/pubspec.yaml b/packages/flutter_tor/pubspec.yaml
index fbe888bb..c56c7b6a 100644
--- a/packages/flutter_tor/pubspec.yaml
+++ b/packages/flutter_tor/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^2.8.0
-  pigeon: ^26.3.4
+  pigeon: ^27.1.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/locale_resolver/pubspec.yaml b/packages/locale_resolver/pubspec.yaml
index f09a2524..7adec447 100644
--- a/packages/locale_resolver/pubspec.yaml
+++ b/packages/locale_resolver/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^2.8.0
-  pigeon: ^26.3.4
+  pigeon: ^27.1.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/simple_intent_receiver/example/pubspec.yaml b/packages/simple_intent_receiver/example/pubspec.yaml
index 940eefc8..a5285dfc 100644
--- a/packages/simple_intent_receiver/example/pubspec.yaml
+++ b/packages/simple_intent_receiver/example/pubspec.yaml
@@ -17,7 +17,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  hooks_riverpod: ^3.3.1
+  hooks_riverpod: ^3.3.2
   logger: ^2.7.0
   simple_intent_receiver:
     # When depending on this package from a real application you should use:
diff --git a/packages/simple_intent_receiver/pubspec.yaml b/packages/simple_intent_receiver/pubspec.yaml
index 2c9aa515..d14830c4 100644
--- a/packages/simple_intent_receiver/pubspec.yaml
+++ b/packages/simple_intent_receiver/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^2.8.0
-  pigeon: ^26.3.4
+  pigeon: ^27.1.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/speech_to_text_dialog/example/pubspec.yaml b/packages/speech_to_text_dialog/example/pubspec.yaml
index 878fdc04..98ba4697 100644
--- a/packages/speech_to_text_dialog/example/pubspec.yaml
+++ b/packages/speech_to_text_dialog/example/pubspec.yaml
@@ -17,7 +17,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  hooks_riverpod: ^3.3.1
+  hooks_riverpod: ^3.3.2
 
   speech_to_text_dialog:
     # When depending on this package from a real application you should use:
diff --git a/packages/speech_to_text_dialog/pubspec.yaml b/packages/speech_to_text_dialog/pubspec.yaml
index a8a3f64e..d075a0cd 100644
--- a/packages/speech_to_text_dialog/pubspec.yaml
+++ b/packages/speech_to_text_dialog/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   lint: ^2.8.0
-  pigeon: ^26.3.4
+  pigeon: ^27.1.0
 
 flutter:
   plugin: