kasy-cli 1.12.1 → 1.14.0

package/lib/scaffold/backends/api/patch/README.md

@@ -1,4 +1,4 @@
-# AppFirebase
+# Kasy App
 
 Flutter app com backend API REST — gerado pelo kasy.
 

package/lib/scaffold/backends/api/patch/android/app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
-        android:label="AppFirebase"
+        android:label="Kasy App"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

package/lib/scaffold/backends/api/patch/lib/features/notifications/api/device_api.dart

@@ -29,6 +29,14 @@ abstract class DeviceApi {
   /// Register the device in the backend
   /// Of course your backend should check if the device is already registered
   /// throws an [ApiError] if something goes wrong
+  ///
+  /// IMPORTANT — Cross-user token uniqueness:
+  /// The backend `POST /users/{userId}/devices` endpoint MUST guarantee that
+  /// the FCM token is unique across users. When the same token is registered
+  /// for a new user, delete any existing record holding that same token under
+  /// other users. Without this, a failed logout (offline) leaves the phone
+  /// registered to both accounts, and push for account A delivers to a phone
+  /// now signed in as account B.
   Future<DeviceEntity> register(String userId, DeviceEntity device);
 
   /// Update the device in the backend
@@ -38,6 +46,25 @@ abstract class DeviceApi {
   /// Unregister the device in the backend
   Future<void> unregister(String userId, String deviceId);
 
+  /// Heartbeat — tell the backend this install is still active.
+  /// Backend should update a `lastUpdateDate` (or equivalent) timestamp and use
+  /// it to skip stale devices when sending push notifications. Without this,
+  /// re-installing the app (Xcode -> TestFlight, build updates) leaves
+  /// orphan device records that still receive push, causing duplicates.
+  ///
+  /// Suggested endpoint: `PATCH /users/{userId}/devices/{installationId}/touch`
+  /// Implement on your API to update the device row's last-seen timestamp.
+  Future<void> touch(String userId, String installationId);
+
+  /// Ask the backend to drop device records of the same user that haven't
+  /// been heartbeated in a while (typically 30 days). Called after registering
+  /// a fresh installation to clean up orphans from previous installs on the
+  /// same physical device.
+  ///
+  /// Suggested endpoint: `POST /users/{userId}/devices/cleanup-stale`
+  /// with body `{ "currentInstallationId": "...", "olderThanDays": 30 }`.
+  Future<void> cleanupStaleDevices(String userId, String currentInstallationId);
+
   /// Listen to token refresh
   void onTokenRefresh(OnTokenRefresh onTokenRefresh);
 
@@ -153,6 +180,32 @@ class FirebaseDeviceApi implements DeviceApi {
     }
   }
 
+  @override
+  Future<void> touch(String userId, String installationId) async {
+    // Fire-and-forget: silently no-ops if the backend doesn't implement
+    // the touch endpoint yet. The duplicated-push protection becomes active
+    // once the API exposes the endpoint described in the abstract above.
+    try {
+      await _client.patch('/users/$userId/devices/$installationId/touch');
+    } catch (_) {}
+  }
+
+  @override
+  Future<void> cleanupStaleDevices(
+    String userId,
+    String currentInstallationId,
+  ) async {
+    try {
+      await _client.post(
+        '/users/$userId/devices/cleanup-stale',
+        data: {
+          'currentInstallationId': currentInstallationId,
+          'olderThanDays': 30,
+        },
+      );
+    } catch (_) {}
+  }
+
   @override
   void onTokenRefresh(OnTokenRefresh onTokenRefresh) {
     _onTokenRefreshSubscription =

package/lib/scaffold/backends/api/patch/lib/main.dart

@@ -108,7 +108,7 @@ void run(SharedPreferences prefs) => runApp(
 //   mode: ThemeMode.dark,
 // ),
 // See ./docs/theme.md for more details
-class MyApp extends ConsumerWidget {
+class MyApp extends ConsumerStatefulWidget {
   final SharedPreferences sharedPreferences;
 
   const MyApp({
@@ -116,23 +116,42 @@ class MyApp extends ConsumerWidget {
     required this.sharedPreferences,
   });
 
+  @override
+  ConsumerState<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends ConsumerState<MyApp> {
+  late final AppTheme _appTheme;
+
+  @override
+  void initState() {
+    super.initState();
+    _appTheme = AppTheme.uniform(
+      sharedPreferences: widget.sharedPreferences,
+      themeFactory: const UniversalThemeFactory(),
+      lightColors: KasyColors.light(),
+      darkColors: KasyColors.dark(),
+      textTheme: KasyTextTheme.build(),
+      defaultMode: ThemeMode.system,
+    );
+  }
+
+  @override
+  void dispose() {
+    _appTheme.dispose();
+    super.dispose();
+  }
+
   // This widget is the root of your application.
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     ErrorWidget.builder = (FlutterErrorDetails details) {
       return AppErrorWidget(error: details);
     };
     final goRouter = ref.watch(goRouterProvider);
 
     return ThemeProvider(
-      notifier: AppTheme.uniform(
-        sharedPreferences: sharedPreferences,
-        themeFactory: const UniversalThemeFactory(),
-        lightColors: KasyColors.light(),
-        darkColors: KasyColors.dark(),
-        textTheme: KasyTextTheme.build(),
-        defaultMode: ThemeMode.light,
-      ),
+      notifier: _appTheme,
       child: Builder(builder: (context) {
         return WebDevicePreview.wrap(
           child: DevInspector.wrap(

package/lib/scaffold/backends/api/pubspec.yaml.tpl

@@ -98,11 +98,21 @@ flutter_launcher_icons:
   android: ic_launcher
   ios: true
   remove_alpha_ios: true
+  web:
+    generate: true
+    image_path: assets/images/favicon.png
+    background_color: "#01171f"
+    theme_color: "#01171f"
 flutter_native_splash:
   color: "#FFFFFF"
+  color_dark: "#000000"
   fullscreen: true
   ios: true
   android: true
-  image: assets/images/splashscreen.png
+  image: assets/images/splash_logo_light.png
+  image_dark: assets/images/splash_logo_dark.png
   android_12:
     color: "#FFFFFF"
+    color_dark: "#000000"
+    image: assets/images/splash_logo_light.png
+    image_dark: assets/images/splash_logo_dark.png

package/lib/scaffold/backends/firebase/tokens.js

@@ -10,13 +10,13 @@
  * Original hardcoded values in Firebase/:
  *   - package name  : kasy_kit       (Dart import path prefix)
  *   - bundle ID     : com.aicrus.firebase.kit (Android namespace, iOS bundle ID)
- *   - app display   : AppFirebase             (AndroidManifest, Info.plist)
+ *   - app display   : Kasy App                (AndroidManifest, Info.plist) — unique string with space, won't collide with KasyButton/KasyTheme/etc
  *   - short name    : appfirebase             (kAppName Dart constant)
  */
 
 const ORIGINAL_PACKAGE = 'kasy_kit';
 const ORIGINAL_BUNDLE_ID = 'com.aicrus.firebase.kit';
-const ORIGINAL_APP_NAME = 'AppFirebase';
+const ORIGINAL_APP_NAME = 'Kasy App';
 const ORIGINAL_SHORT_NAME = 'appfirebase';
 
 /**

package/lib/scaffold/backends/supabase/edge-functions/send-push-notification/index.ts

@@ -254,11 +254,17 @@ Deno.serve(async (req: Request) => {
   const serviceRoleKey = Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!;
   const supabase = createClient(supabaseUrl, serviceRoleKey);
 
-  // Fetch device tokens for the user
+  // Fetch device tokens for the user, skipping orphan installs.
+  // Devices not touched in the last 60 days are treated as leftovers from
+  // previous installations on the same physical device (each install gets a
+  // fresh installation_id). Sending to them causes duplicated push delivery.
+  const STALE_DEVICE_TTL_MS = 60 * 24 * 60 * 60 * 1000;
+  const cutoffIso = new Date(Date.now() - STALE_DEVICE_TTL_MS).toISOString();
   const { data: devices, error: devErr } = await supabase
     .from("devices")
     .select("id, token")
-    .eq("user_id", notification.user_id);
+    .eq("user_id", notification.user_id)
+    .or(`last_update_date.is.null,last_update_date.gte.${cutoffIso}`);
 
   if (devErr || !devices?.length) {
     console.log(`[send-push] no devices for user ${notification.user_id}`);

package/lib/scaffold/backends/supabase/migrations/20240101000011_dedupe_device_tokens.sql

@@ -0,0 +1,34 @@
+-- Cross-user device token deduplication.
+--
+-- Guarantees that a single FCM token belongs to at most one user at any time.
+-- When the same install registers under a new account (typical scenario:
+-- logout failed offline), the old row is automatically deleted so the iPhone
+-- only receives push for the account currently signed in.
+--
+-- Winner = the row that was just inserted/updated (most recent intent).
+
+CREATE OR REPLACE FUNCTION public.cleanup_duplicate_device_tokens()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = public
+AS $$
+BEGIN
+  IF NEW.token IS NULL OR NEW.token = '' THEN
+    RETURN NEW;
+  END IF;
+
+  DELETE FROM public.devices
+   WHERE token = NEW.token
+     AND id <> NEW.id;
+
+  RETURN NEW;
+END;
+$$;
+
+DROP TRIGGER IF EXISTS trg_cleanup_duplicate_device_tokens ON public.devices;
+
+CREATE TRIGGER trg_cleanup_duplicate_device_tokens
+AFTER INSERT OR UPDATE OF token ON public.devices
+FOR EACH ROW
+EXECUTE FUNCTION public.cleanup_duplicate_device_tokens();

package/lib/scaffold/backends/supabase/patch/README.md

@@ -1,4 +1,4 @@
-# AppFirebase
+# Kasy App
 
 Flutter app com backend Supabase — gerado pelo kasy.
 

package/lib/scaffold/backends/supabase/patch/android/app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
-        android:label="AppFirebase"
+        android:label="Kasy App"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

package/lib/scaffold/backends/supabase/patch/lib/features/notifications/api/device_api.dart

@@ -36,6 +36,15 @@ abstract class DeviceApi {
   /// Unregister the device in the backend
   Future<void> unregister(String userId, String deviceId);
 
+  /// Heartbeat — update `last_update_date` on the current device row.
+  /// Used so the backend can detect orphan rows from previous installs.
+  Future<void> touch(String userId, String installationId);
+
+  /// Delete device rows of the same user that haven't been touched in a while.
+  /// Called after registering a fresh installation to remove orphans left by
+  /// previous installs (whose installation_id no longer matches).
+  Future<void> cleanupStaleDevices(String userId, String currentInstallationId);
+
   /// Listen to token refresh
   void onTokenRefresh(OnTokenRefresh onTokenRefresh);
 
@@ -160,6 +169,40 @@ class FirebaseDeviceApi implements DeviceApi {
     }
   }
 
+  @override
+  Future<void> touch(String userId, String installationId) async {
+    try {
+      await _client
+          .from('devices')
+          .update({'last_update_date': DateTime.now().toIso8601String()})
+          .eq('user_id', userId)
+          .eq('installation_id', installationId);
+    } catch (_) {
+      // Missing row — caller will re-register on next session.
+    }
+  }
+
+  @override
+  Future<void> cleanupStaleDevices(
+    String userId,
+    String currentInstallationId,
+  ) async {
+    // Devices not touched in the last 30 days are treated as orphans from
+    // previous installations on the same physical device. Active second
+    // devices stay above this threshold via heartbeat.
+    final cutoff = DateTime.now().subtract(const Duration(days: 30));
+    try {
+      await _client
+          .from('devices')
+          .delete()
+          .eq('user_id', userId)
+          .neq('installation_id', currentInstallationId)
+          .lt('last_update_date', cutoff.toIso8601String());
+    } catch (e) {
+      Logger().w('cleanupStaleDevices failed: $e');
+    }
+  }
+
   @override
   Future<void> clear(String userId) async {
     try {

package/lib/scaffold/backends/supabase/patch/lib/main.dart

@@ -138,7 +138,7 @@ void run(SharedPreferences prefs) => runApp(
 //   mode: ThemeMode.dark,
 // ),
 // See ./docs/theme.md for more details
-class MyApp extends ConsumerWidget {
+class MyApp extends ConsumerStatefulWidget {
   final SharedPreferences sharedPreferences;
 
   const MyApp({
@@ -146,23 +146,42 @@ class MyApp extends ConsumerWidget {
     required this.sharedPreferences,
   });
 
+  @override
+  ConsumerState<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends ConsumerState<MyApp> {
+  late final AppTheme _appTheme;
+
+  @override
+  void initState() {
+    super.initState();
+    _appTheme = AppTheme.uniform(
+      sharedPreferences: widget.sharedPreferences,
+      themeFactory: const UniversalThemeFactory(),
+      lightColors: KasyColors.light(),
+      darkColors: KasyColors.dark(),
+      textTheme: KasyTextTheme.build(),
+      defaultMode: ThemeMode.system,
+    );
+  }
+
+  @override
+  void dispose() {
+    _appTheme.dispose();
+    super.dispose();
+  }
+
   // This widget is the root of your application.
   @override
-  Widget build(BuildContext context, WidgetRef ref) {
+  Widget build(BuildContext context) {
     ErrorWidget.builder = (FlutterErrorDetails details) {
       return AppErrorWidget(error: details);
     };
     final goRouter = ref.watch(goRouterProvider);
 
     return ThemeProvider(
-      notifier: AppTheme.uniform(
-        sharedPreferences: sharedPreferences,
-        themeFactory: const UniversalThemeFactory(),
-        lightColors: KasyColors.light(),
-        darkColors: KasyColors.dark(),
-        textTheme: KasyTextTheme.build(),
-        defaultMode: ThemeMode.light,
-      ),
+      notifier: _appTheme,
       child: Builder(builder: (context) {
         return WebDevicePreview.wrap(
           child: DevInspector.wrap(

package/lib/scaffold/backends/supabase/pubspec.yaml.tpl

@@ -100,11 +100,21 @@ flutter_launcher_icons:
   android: ic_launcher
   ios: true
   remove_alpha_ios: true
+  web:
+    generate: true
+    image_path: assets/images/favicon.png
+    background_color: "#01171f"
+    theme_color: "#01171f"
 flutter_native_splash:
   color: "#FFFFFF"
+  color_dark: "#000000"
   fullscreen: true
   ios: true
   android: true
-  image: assets/images/splashscreen.png
+  image: assets/images/splash_logo_light.png
+  image_dark: assets/images/splash_logo_dark.png
   android_12:
     color: "#FFFFFF"
+    color_dark: "#000000"
+    image: assets/images/splash_logo_light.png
+    image_dark: assets/images/splash_logo_dark.png

package/lib/scaffold/features/README.md

@@ -1,151 +1,27 @@
 # Feature Patches
 
-Este diretório contém os **patches por feature**: arquivos extras que são copiados para o projeto gerado quando o usuário seleciona um módulo específico no wizard do CLI.
+Este diretório guarda **patches por feature**: arquivos extras que são copiados para o projeto gerado quando o usuário seleciona um módulo específico no wizard do CLI.
 
-## Estrutura esperada
+## Estado atual
 
-```
-features/
-  ci/                  ← patch aplicado quando o usuário seleciona o módulo "ci"
-    .github/
-      workflows/
-        app.yml
-    .gitlab-ci.yml
-    ...
-  web/                 ← patch aplicado quando "web" é selecionado
-    web/
-      index.html
-      ...
-  widget/              ← patch aplicado quando "widget" é selecionado
-    android/
-      ...
-```
+Este diretório está intencionalmente vazio (só este README). Todas as features já vivem dentro de `Firebase/` e são incluídas em `cli/templates/firebase/` pelo `cli/scripts/bundle-template.js` no momento do publish. Features opcionais são controladas por `removeModuleDirs()` em `cli/lib/scaffold/shared/generator-utils.js` — quando a feature não é selecionada, sua pasta é removida do projeto gerado.
 
-Cada subdiretório tem o **mesmo nome** que o valor do módulo em `new.js` (`sentry`, `analytics`, `facebook`, `revenuecat`, `onboarding`, `web`, `widget`, `llm_chat`, `local_notifications`, `feedback`, `ci`).
+## Quando criar um patch aqui
 
-Ao gerar um projeto, o engine copia recursivamente o conteúdo de `features/{modulo}/` para a raiz do projeto, sobrescrevendo ou acrescentando arquivos.
+Apenas quando a feature precisar de arquivos que **não existem** em `Firebase/`. Se o mesmo caminho já existe em `Firebase/`, **não crie patch** — o patch vai sobrescrever silenciosamente o template atualizado pela versão (provavelmente antiga) que estiver no patch, causando regressão no projeto do cliente (perda de integrações, validações, UI nova, etc.).
 
-## Módulos que precisam de patch físico
+## Como adicionar um patch
 
-| Módulo       | Patch necessário? | Motivo                                              |
-|-------------|------------------|-----------------------------------------------------|
-| `ci`        | ✅ Sim            | Adiciona `.github/`, `.gitlab-ci.yml`, etc.         |
-| `web`       | ✅ Sim            | Adiciona pasta `web/` e configurações de plataforma |
-| `widget`    | Não               | Os arquivos do widget (iOS + Android + Dart) já vão no template base. Quando o módulo não é selecionado, `removeAndroidWidgetArtifacts` + `writeNoOpAdminHomeWidgets` em `generate.js` limpam o que sobra. |
-| `llm_chat`  | Não               | Apenas `LLM_CHAT_ENDPOINT` via dart-define. A chave da API LLM fica no servidor (Firebase Secret / Supabase Secret) — nunca no app. |
-| `sentry`    | Não               | Apenas dart-define (`SENTRY_DSN`)                   |
-| `analytics` | Não               | Apenas dart-define                                  |
-| `facebook`  | Não               | Token já substituído via `buildTokens`              |
-| `revenuecat`| Não               | Apenas dart-define (`REVENUECAT_KEY_*`)             |
-| `onboarding`| Não               | Habilitado via dart-define / `features_config.json` |
-| `feedback`  | Não               | Habilitado via dart-define / `features_config.json` |
-| `local_notifications` | ✅ Sim  | Copia `lib/features/local_reminder/` com UI, provider e repositório |
+1. Crie `features/{modulo}/`.
+2. Coloque os arquivos exatamente como devem aparecer no projeto gerado (caminhos relativos à raiz do projeto).
+3. Adicione o nome do módulo a `ALLOWED_FEATURE_PATCHES` em `cli/scripts/check-feature-patches.js`, com um comentário de uma linha explicando por que o patch é necessário.
+4. O engine aplica os patches depois de copiar o template base e o patch do backend.
 
-## Como criar um patch
+## Drift guard
 
-1. Crie a pasta `features/{modulo}/`.
-2. Coloque dentro dela os arquivos **exatamente como devem aparecer** no projeto gerado (caminhos relativos à raiz do projeto).
-3. O engine aplica os patches após copiar o template base e após aplicar o patch do backend.
+`cli/scripts/check-feature-patches.js` roda no `npm prepack` (antes de qualquer `npm publish` ou `npm pack`). O build falha se:
 
-> Os patches de feature são aplicados pelo `generate.js` via `applyFeaturePatches()`.
-> Os geradores específicos por backend (`firebase/generator.js`, `supabase/generator.js`, `api/generator.js`)
-> precisam ser atualizados para chamar essa etapa quando a unificação for concluída.
+- alguma pasta dentro de `features/` não estiver listada em `ALLOWED_FEATURE_PATCHES`, ou
+- algum arquivo dentro de um patch permitido tiver caminho equivalente em `Firebase/` (significa que o patch é duplicata desatualizada).
 
----
-
-## Feature: `local_notifications` — Notificações Locais Agendadas
-
-> **Plataformas:** iOS e Android apenas (sem suporte Web/Desktop).
-
-### O que esta feature faz
-
-Permite ao usuário configurar um lembrete recorrente diretamente no app, sem servidor. A notificação é agendada localmente via `flutter_local_notifications` e persiste entre sessões via `SharedPreferences`.
-
-### Tipos de lembrete suportados
-
-| Tipo            | Comportamento                                        |
-|-----------------|------------------------------------------------------|
-| `daily`         | Dispara todo dia no horário escolhido                |
-| `weekly`        | Dispara uma vez por semana no dia + horário escolhido |
-| `specificDate`  | Dispara uma única vez na data + hora escolhida        |
-
-### Entrada do usuário
-
-Acesso via **Settings → Lembretes** (`/reminder`):
-
-1. **Toggle "Ativar lembrete"** — liga/desliga (cancela notificação pendente ao desligar)
-2. **Segmented button "Repetir"** — escolhe o tipo: `Todo dia / Toda semana / Data específica`
-3. **Horário** — `TimePicker` nativo do sistema
-4. **Dia da semana** — `ChoiceChip` (seg–dom), aparece somente no modo semanal
-5. **Data e hora** — `DatePicker` + `TimePicker` em sequência, aparece somente no modo data específica
-
-### Estrutura de arquivos gerados no projeto
-
-```
-lib/features/local_reminder/
-  repositories/
-    reminder_preferences.dart    ← SharedPreferences (load/save ReminderState)
-  providers/
-    reminder_notifier.dart       ← AsyncNotifier (keepAlive) + agenda/cancela
-    reminder_notifier.g.dart     ← gerado pelo build_runner (provider: reminderProvider)
-  ui/
-    reminder_page.dart           ← ReminderPage + _ReminderForm + subwidgets
-```
-
-### Integrações automáticas pelo CLI
-
-| Arquivo                        | O que é adicionado                                      |
-|--------------------------------|---------------------------------------------------------|
-| `lib/core/config/features.dart` | `const bool withLocalNotifications = true/false;`      |
-| `lib/router.dart`              | Import + `GoRoute(path: '/reminder', ...)`              |
-| `lib/features/settings/settings_page.dart` | Tile "Lembretes" → `context.push('/reminder')` |
-
-### Model — `ReminderState`
-
-```dart
-class ReminderState {
-  final bool enabled;
-  final ReminderType type;   // daily | weekly | specificDate
-  final int hour;
-  final int minute;
-  final int dayOfWeek;       // 1=Segunda … 7=Domingo
-  final DateTime? date;      // usado somente para specificDate
-}
-```
-
-### Notificação agendada
-
-ID fixo `42`. Texto configurado via i18n (`dailyReminder.title` / `dailyReminder.body`).  
-Ao salvar qualquer mudança, o provider cancela o ID 42 e re-agenda com os novos parâmetros.
-
-### Dependências (já no core — não adicionadas pelo módulo)
-
-- `flutter_local_notifications`
-- `flutter_timezone` + `timezone`
-- `shared_preferences`
-- `riverpod_annotation`
-
-### Traduções adicionadas
-
-Chaves em `lib/i18n/{pt,en,es}.i18n.json`:
-
-```json
-"reminderPage": {
-  "title": "Lembretes",
-  "toggleLabel": "Ativar lembrete",
-  "typeLabel": "Repetir",
-  "daily": "Todo dia",
-  "weekly": "Toda semana",
-  "specificDate": "Data específica",
-  "timeLabel": "Horário",
-  "dayLabel": "Dia da semana",
-  "dateLabel": "Data e hora",
-  "selectDate": "Selecionar data e hora"
-},
-"dailyReminder": { "title": "Lembrete", "body": "Está na hora de beber água." },
-"settings": { "reminders": "Lembretes" }
-```
-
-### Bug corrigido durante a implementação
-
-`local_notifier.dart` tinha um método `scheduleFromNow()` com lógica invertida (agendava apenas quando **não** havia notificações pendentes) e usava `Future.delayed` que não sobrevive ao restart do app. O método foi **removido** completamente.
+Esse é o mecanismo que impede o cenário em que patches divergem de `Firebase/` ao longo do tempo e o CLI passa a entregar código velho para os clientes.

package/lib/scaffold/shared/generator-utils.js

@@ -273,7 +273,6 @@ async function writeRouter(projectDir, modules, packageName, defaultPaywall = 'b
   lines.push(`import 'package:${pkg}/features/authentication/ui/signin_page.dart';`);
   lines.push(`import 'package:${pkg}/features/authentication/ui/signup_page.dart';`);
   if (withFeedback) {
-    lines.push(`import 'package:${pkg}/features/feedbacks/ui/component/add_feature_form.dart';`);
     lines.push(`import 'package:${pkg}/features/feedbacks/ui/feedback_page.dart';`);
   }
   if (withLlmChat) {
@@ -374,11 +373,6 @@ async function writeRouter(projectDir, modules, packageName, defaultPaywall = 'b
     lines.push(`        path: '/feedback',`);
     lines.push(`        builder: (context, state) => const FeedbackPage(),`);
     lines.push(`      ),`);
-    lines.push(`      GoRoute(`);
-    lines.push(`        name: 'feedback_new',`);
-    lines.push(`        path: '/feedback/new',`);
-    lines.push(`        builder: (context, state) => const AddFeatureComponent(),`);
-    lines.push(`      ),`);
   }
 
   // LLM Chat
@@ -596,6 +590,13 @@ class NoOpAnalyticsApi implements AnalyticsApi {
   @override Future<void> identify(User user) async {}
 }
 
+// Stub kept for source-compat with code that still calls MixpanelAnalyticsApi.instance().
+// Run: kasy add analytics to swap this file for the real Mixpanel-backed implementation.
+class MixpanelAnalyticsApi extends NoOpAnalyticsApi {
+  const MixpanelAnalyticsApi._() : super();
+  factory MixpanelAnalyticsApi.instance() => const MixpanelAnalyticsApi._();
+}
+
 class AnalyticsObserver extends RouteObserver<ModalRoute<dynamic>> {
   final AnalyticsApi analyticsApi;
   final String? prefix;
@@ -1186,11 +1187,8 @@ async function stripPubspecDeps(projectDir, modules) {
 }
 
 /**
- * Patches core files that always import sentry_flutter, removing the dependency
+ * Patches files that always import sentry_flutter, removing the dependency
  * when neither sentry, revenuecat, nor facebook modules are selected.
- * Affected files:
- *   - lib/core/initializer/onstart_widget.dart
- *   - lib/core/data/api/remote_config_api.dart
  *
  * @param {string} projectDir
  */
@@ -1200,15 +1198,16 @@ async function writeNoOpSentryUsages(projectDir) {
   const files = [
     path.join(projectDir, 'lib', 'core', 'initializer', 'onstart_widget.dart'),
     path.join(projectDir, 'lib', 'core', 'data', 'api', 'remote_config_api.dart'),
+    path.join(projectDir, 'lib', 'features', 'notifications', 'api', 'local_notifier.dart'),
+    path.join(projectDir, 'lib', 'features', 'notifications', 'providers', 'models', 'notification.dart'),
+    path.join(projectDir, 'lib', 'features', 'notifications', 'shared', 'notification_permission_bottom_sheet.dart'),
   ];
 
   for (const filePath of files) {
     if (!(await fs.pathExists(filePath))) continue;
     let content = await fs.readFile(filePath, 'utf8');
-    // Remove sentry import line
     content = content.replace(sentryImport, '');
-    // Remove single-line Sentry.captureException(...); calls (with leading whitespace)
-    content = content.replace(/^[ \t]*Sentry\.captureException\([^)]+\);\n/gm, '');
+    content = content.replace(/^[ \t]*Sentry\.captureException\([^)]*\);\n/gm, '');
     await fs.outputFile(filePath, content, 'utf8');
   }
 }
@@ -1469,11 +1468,13 @@ class PremiumPageArgs {
     'utf8',
   );
 
-  // 4. No-op premium_page_factory.dart (used by admin_paywalls)
+  // 4. No-op premium_page_factory.dart (used by admin_paywalls).
+  // Mirror the constants declared in Firebase/.../premium_page_factory.dart so that
+  // admin_routes.dart compiles even without revenuecat selected.
   await fs.outputFile(
     path.join(projectDir, 'lib', 'features', 'subscription', 'ui', 'component', 'premium_page_factory.dart'),
     `// No-op paywall factory. Run: kasy add revenuecat to activate.
-enum PaywallFactory { basic }
+enum PaywallFactory { basic, basicRow, minimal, withSwitch }
 `,
     'utf8',
   );