kasy-cli 1.21.8 → 1.22.0

package/lib/scaffold/backends/supabase/patch/lib/features/onboarding/ui/widgets/onboarding_radio_question.dart

@@ -7,6 +7,7 @@ import 'package:kasy_kit/core/theme/theme.dart';
 import 'package:kasy_kit/core/widgets/responsive_layout.dart';
 import 'package:kasy_kit/features/onboarding/ui/widgets/onboarding_background.dart';
 import 'package:kasy_kit/features/onboarding/ui/widgets/onboarding_progress.dart';
+import 'package:kasy_kit/features/onboarding/ui/widgets/onboarding_step_header.dart';
 import 'package:kasy_kit/features/onboarding/ui/widgets/onboarding_sticky_footer.dart';
 import 'package:kasy_kit/features/onboarding/ui/widgets/selectable_row_tile.dart';
 
@@ -18,9 +19,11 @@ typedef OnOptionIdSelected = void Function(String id);
 
 typedef OnValidate = void Function(String? key);
 
-/// Single choice question with radio buttons
+/// Single choice question with selectable tiles, matching the clean‑premium
+/// onboarding layout (shared header, left‑aligned title, sticky footer).
 class OnboardingRadioQuestion extends ConsumerStatefulWidget {
-  final double? progress;
+  final int step;
+  final int totalSteps;
   final String title;
   final String description;
   final String btnText;
@@ -37,7 +40,8 @@ class OnboardingRadioQuestion extends ConsumerStatefulWidget {
     required this.btnText,
     required this.optionIds,
     required this.optionBuilder,
-    this.progress,
+    required this.step,
+    this.totalSteps = kOnboardingSteps,
     this.onOptionIdSelected,
     this.onValidate,
     this.reassuranceBuilder,
@@ -54,61 +58,68 @@ class _OnboardingRadioQuestionState
 
   @override
   Widget build(BuildContext context) {
+    const gutter = KasySpacing.lg;
+
     final scrollBody = Column(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        if (widget.progress != null)
-          OnboardingProgress(value: widget.progress!),
+        OnboardingStepHeader(step: widget.step, totalSteps: widget.totalSteps),
         Padding(
-          padding: const EdgeInsets.fromLTRB(
-            KasySpacing.md,
-            KasySpacing.xl,
-            KasySpacing.md,
-            0,
-          ),
+          padding: const EdgeInsets.fromLTRB(gutter, KasySpacing.lg, gutter, 0),
           child: MoveFadeAnim(
-            delayInMs: 100,
+            delayInMs: 120,
             child: Text(
               widget.title,
-              textAlign: TextAlign.center,
-              style: context.textTheme.headlineLarge?.copyWith(
+              textAlign: TextAlign.start,
+              style: context.textTheme.headlineMedium?.copyWith(
                 color: context.colors.onBackground,
+                fontSize: 26,
+                fontWeight: FontWeight.w700,
+                letterSpacing: -0.2,
+                height: 1.2,
               ),
             ),
           ),
         ),
         Padding(
           padding: const EdgeInsets.fromLTRB(
+            gutter,
+            KasySpacing.smd,
+            gutter,
             KasySpacing.lg,
-            KasySpacing.md,
-            KasySpacing.lg,
-            KasySpacing.xl,
           ),
           child: MoveFadeAnim(
             delayInMs: 200,
             child: Text(
               widget.description,
-              textAlign: TextAlign.center,
+              textAlign: TextAlign.start,
               style: context.textTheme.bodyLarge?.copyWith(
-                color: context.colors.onBackground.withValues(alpha: 0.6),
+                color: context.colors.muted,
+                height: 1.45,
               ),
             ),
           ),
         ),
         Padding(
-          padding: const EdgeInsets.symmetric(horizontal: KasySpacing.md),
+          padding: const EdgeInsets.symmetric(horizontal: gutter),
           child: OnboardingSelectableRowGroup(
             physics: const NeverScrollableScrollPhysics(),
-            options: widget.optionIds
-                .map(
+            options: widget.optionIds.map(
               (e) {
                 final index = widget.optionIds.indexOf(e);
                 return Animate(
                   effects: [
                     FadeEffect(
-                      delay: Duration(milliseconds: 300 + index * 100),
-                      duration: const Duration(milliseconds: 550),
-                      curve: Curves.easeInOut,
+                      delay: Duration(milliseconds: 280 + index * 80),
+                      duration: const Duration(milliseconds: 450),
+                      curve: Curves.easeOut,
+                    ),
+                    MoveEffect(
+                      delay: Duration(milliseconds: 280 + index * 80),
+                      duration: const Duration(milliseconds: 450),
+                      curve: Curves.easeOut,
+                      begin: const Offset(0, 24),
+                      end: Offset.zero,
                     ),
                   ],
                   child: widget.optionBuilder(e, e == selectedChoiceId),
@@ -153,8 +164,7 @@ class _OnboardingRadioQuestionState
           ),
           DeviceSizeBuilder(
             builder: (device) => OnboardingStickyFooter(
-              maxContentWidth:
-                  device == DeviceType.small ? null : 600,
+              maxContentWidth: device == DeviceType.small ? null : 600,
               children: [
                 KasyButton(
                   label: widget.btnText,

package/lib/scaffold/backends/supabase/patch/lib/features/settings/ui/components/admin/admin_users_api.dart

@@ -0,0 +1,93 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/core/data/api/base_api_exceptions.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+/// One row of the admin Users table, as returned by the `admin-list-users` Edge
+/// Function. The function verifies the caller is `role == "admin"` and only then
+/// reads across all users with the service role, so this data is never readable
+/// by a non-admin client.
+///
+/// This file mirrors the shared admin data-layer contract (see the Firebase
+/// version): the public surface — [AdminUser], [AdminUsersResult] and
+/// [adminUsersApiProvider] — is identical across backends so the Users tab UI
+/// stays the same; only the body of [AdminUsersApi.fetch] differs.
+class AdminUser {
+  final String id;
+  final String? email;
+  final String? name;
+  final DateTime? createdAt;
+  final bool subscriber;
+
+  const AdminUser({
+    required this.id,
+    required this.subscriber,
+    this.email,
+    this.name,
+    this.createdAt,
+  });
+
+  factory AdminUser.fromMap(Map<String, dynamic> m) {
+    final createdMillis = m['createdAt'];
+    return AdminUser(
+      id: (m['id'] as String?) ?? '',
+      email: m['email'] as String?,
+      name: m['name'] as String?,
+      createdAt: createdMillis is num
+          ? DateTime.fromMillisecondsSinceEpoch(createdMillis.toInt())
+          : null,
+      subscriber: m['subscriber'] == true,
+    );
+  }
+}
+
+/// The full (bounded) set of users plus collection metadata. The UI searches,
+/// sorts and paginates this list locally, so those interactions are instant.
+class AdminUsersResult {
+  final List<AdminUser> users;
+  final int totalUsers;
+  final bool truncated;
+
+  const AdminUsersResult({
+    required this.users,
+    required this.totalUsers,
+    required this.truncated,
+  });
+}
+
+final adminUsersApiProvider = Provider<AdminUsersApi>(
+  (ref) => AdminUsersApi(client: Supabase.instance.client),
+);
+
+class AdminUsersApi {
+  final SupabaseClient _client;
+
+  AdminUsersApi({required SupabaseClient client}) : _client = client;
+
+  /// Loads the users for the admin console via the `admin-list-users` Edge
+  /// Function. Returns the whole bounded set in one call; the UI handles
+  /// search/sort/pagination on the client.
+  Future<AdminUsersResult> fetch() async {
+    try {
+      final res = await _client.functions.invoke('admin-list-users');
+      if (res.status != 200) {
+        final msg = res.data is Map && res.data != null
+            ? (res.data as Map)['error'] as String? ?? 'Error listing users'
+            : 'Error listing users';
+        throw ApiError(code: res.status, message: msg);
+      }
+      final data = Map<String, dynamic>.from(res.data as Map);
+      final rawUsers = (data['users'] as List?) ?? const [];
+      return AdminUsersResult(
+        users: rawUsers
+            .map((e) => AdminUser.fromMap(Map<String, dynamic>.from(e as Map)))
+            .toList(),
+        totalUsers: (data['totalUsers'] as num?)?.toInt() ?? 0,
+        truncated: data['truncated'] == true,
+      );
+    } on ApiError {
+      rethrow;
+    } catch (e, stacktrace) {
+      throw ApiError(code: 0, message: '$e: $stacktrace');
+    }
+  }
+}

package/lib/scaffold/backends/supabase/patch/lib/features/{subscription → subscriptions}/api/entities/subscription_entity.dart

@@ -15,6 +15,17 @@ enum SubscriptionStatus {
   CANCELLED,
 }
 
+/// Where the subscription was purchased (its origin). `STRIPE` means it was
+/// bought on the web via Stripe. Used to route the user to the correct
+/// management flow regardless of the device they are currently on.
+enum SubscriptionStore {
+  PLAY_STORE,
+  APPLE_STORE,
+  EARLY_BIRD,
+  STRIPE,
+  unknown,
+}
+
 
 @freezed
 sealed class SubscriptionEntity with _$SubscriptionEntity {
@@ -27,6 +38,8 @@ sealed class SubscriptionEntity with _$SubscriptionEntity {
     @JsonKey(name: 'last_update_date') DateTime? lastUpdateDate,
     @JsonKey(name: 'period_end_date') DateTime? periodEndDate,
     @JsonKey(name: 'status') required SubscriptionStatus status,
+    @JsonKey(name: 'store', unknownEnumValue: SubscriptionStore.unknown)
+    SubscriptionStore? store,
   }) = SubscriptionEntityData;
 
   factory SubscriptionEntity.fromJson(Map<String, Object?> json) =>

package/lib/scaffold/backends/supabase/patch/lib/features/subscriptions/api/stripe_backend_api.dart

@@ -0,0 +1,52 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:kasy_kit/features/subscriptions/api/stripe_product.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+final stripeBackendApiProvider = Provider<StripeBackendApi>(
+  (ref) => StripeBackendApi(client: Supabase.instance.client),
+);
+
+/// Talks to the Stripe backend (Supabase Edge Functions). The user identity is
+/// taken server-side from the verified JWT — never trusted from the client.
+/// This file replaces the Firebase version so the rest of the Stripe client
+/// code stays backend-agnostic.
+class StripeBackendApi {
+  final SupabaseClient _client;
+
+  StripeBackendApi({required SupabaseClient client}) : _client = client;
+
+  /// Active recurring prices, mapped to paywall offers.
+  Future<List<StripeProduct>> listPrices() async {
+    final res = await _client.functions.invoke('stripe-list-prices');
+    final list = (res.data as List).cast<dynamic>();
+    return list
+        .map((e) => StripeProduct.fromJson(Map<String, dynamic>.from(e as Map)))
+        .toList();
+  }
+
+  /// Create a hosted Checkout session for [priceId] and return its URL.
+  Future<String> createCheckoutSession({
+    required String priceId,
+    String? successUrl,
+    String? cancelUrl,
+  }) async {
+    final res = await _client.functions.invoke(
+      'stripe-create-checkout-session',
+      body: {
+        'priceId': priceId,
+        if (successUrl != null) 'successUrl': successUrl,
+        if (cancelUrl != null) 'cancelUrl': cancelUrl,
+      },
+    );
+    return (res.data as Map)['url'] as String;
+  }
+
+  /// Create a Customer Portal session (manage / cancel) and return its URL.
+  Future<String> createPortalSession({String? returnUrl}) async {
+    final res = await _client.functions.invoke(
+      'stripe-create-portal-session',
+      body: {if (returnUrl != null) 'returnUrl': returnUrl},
+    );
+    return (res.data as Map)['url'] as String;
+  }
+}

package/lib/scaffold/backends/supabase/patch/lib/features/{subscription → subscriptions}/api/subscription_api.dart

@@ -1,7 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:logger/logger.dart';
 import 'package:kasy_kit/core/data/api/base_api_exceptions.dart';
-import 'package:kasy_kit/features/subscription/api/entities/subscription_entity.dart';
+import 'package:kasy_kit/features/subscriptions/api/entities/subscription_entity.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 final subscriptionApiProvider = Provider(

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

@@ -95,7 +95,6 @@ flutter:
   assets:
     - .env
     - assets/images/
-    - assets/images/onboarding/
     - assets/icons/
 flutter_launcher_icons:
   image_path: assets/images/icon.png
@@ -110,15 +109,15 @@ flutter_launcher_icons:
     background_color: "#01171f"
     theme_color: "#01171f"
 flutter_native_splash:
-  color: "#FFFFFF"
-  color_dark: "#000000"
+  color: "#FAF9FC"
+  color_dark: "#0C0A14"
   fullscreen: true
   ios: true
   android: true
   image: assets/images/splash_logo_light.png
   image_dark: assets/images/splash_logo_dark.png
   android_12:
-    color: "#FFFFFF"
-    color_dark: "#000000"
+    color: "#FAF9FC"
+    color_dark: "#0C0A14"
     image: assets/images/splash_logo_light_android12.png
     image_dark: assets/images/splash_logo_dark_android12.png

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

@@ -1,7 +1,7 @@
 /**
- * @deprecated Este arquivo não é importado por nenhum módulo.
- * O token map é compartilhado por todos os backends via firebase/tokens.js.
- * Mantido apenas para referência histórica — pode ser removido com segurança.
+ * @deprecated This file is not imported by any module.
+ * The token map is shared by all backends via firebase/tokens.js.
+ * Kept only for historical reference — can be safely removed.
  */
 
 const { buildTokens } = require('../firebase/tokens');

package/lib/scaffold/catalog.js

@@ -34,7 +34,6 @@ const AVAILABLE_BACKENDS = [
  *                 project but only sells real plans once RevenueCat is added.
  *
  * Note on id vs folder name (intentional, not a bug):
- *   - id `local_notifications` → folder `lib/features/local_reminder/`
  *   - id `feedback`            → folder `lib/features/feedbacks/`
  *   The id describes the user-facing capability; the folder describes the
  *   Dart component. The generator (see generator-utils.js writeRouter and
@@ -47,13 +46,14 @@ const FEATURE_CATALOG = [
   { id: 'analytics',           displayName: 'Analytics',              status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['starter', 'saas', 'content', 'full'] },
   { id: 'facebook',            displayName: 'Facebook (Login + Ads)', status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['full'] },
   // monetization
-  { id: 'revenuecat',          displayName: 'RevenueCat',             status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['saas', 'full'], enhances: 'subscription' },
+  { id: 'revenuecat',          displayName: 'In-App Purchases (RevenueCat)', status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['saas', 'full'], enhances: 'subscriptions' },
+  { id: 'stripe',              displayName: 'Web Payments (Stripe)',  status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['saas', 'full'], enhances: 'subscriptions' },
   // features
   { id: 'onboarding',          displayName: 'Onboarding',             status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['starter', 'saas', 'content', 'full'] },
   { id: 'web',                 displayName: 'Web Support (PWA)',      status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['full'] },
   { id: 'widget',              displayName: 'Home Widget',            status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['full'] },
-  { id: 'llm_chat',            displayName: 'AI Chat',                status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['content', 'full'] },
-  { id: 'local_notifications', displayName: 'Local Reminders',        status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: [] },
+  { id: 'ai_chat',            displayName: 'AI Chat',                status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['content', 'full'] },
+  { id: 'local_reminders', displayName: 'Local Reminders',        status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: [] },
   // feedback (Firebase/Supabase only)
   { id: 'feedback',            displayName: 'Feature Requests',       status: 'public',   availableIn: ['firebase', 'supabase', 'api'], defaultInPresets: ['saas', 'full'], tag: 'requiresDb' },
   // ci/cd
@@ -66,11 +66,11 @@ const FEATURE_CATALOG = [
  * Listed in the CLI so users understand what ships with every project.
  */
 const BASE_FEATURES = [
-  { id: 'authentication', displayName: 'Auth' },
-  { id: 'home',           displayName: 'Home Screen' },
-  { id: 'settings',       displayName: 'Settings Screen' },
+  { id: 'authentication', displayName: 'Authentication' },
+  { id: 'home',           displayName: 'Home' },
+  { id: 'settings',       displayName: 'Settings' },
   { id: 'notifications',  displayName: 'Push Notifications' },
-  { id: 'subscription',   displayName: 'Subscriptions' },
+  { id: 'subscriptions',  displayName: 'Subscriptions' },
 ];
 
 function getBaseFeatures() {
@@ -203,11 +203,9 @@ function normalizeFeature(value) {
   }
 
   const aliases = {
-    llm: 'llm_chat',
-    llmchat: 'llm_chat',
-    llm_chat: 'llm_chat',
     rc: 'revenuecat',
     revenue: 'revenuecat',
+    stripe: 'stripe',
     onboard: 'onboarding',
     fb: 'facebook',
   };

package/lib/scaffold/generate.js

@@ -1,27 +1,27 @@
 /**
- * generate.js — Motor unificado de geração de projetos.
+ * generate.js — Unified project generation engine.
  *
- * Todos os backends (Firebase, Supabase, API) usam este motor.
- * Cada backend fornece dois hooks opcionais:
+ * All backends (Firebase, Supabase, API) use this engine.
+ * Each backend provides two optional hooks:
  *
  *   applyBackendSetup(targetDir, tokens, pathReplacements, options)
- *     → Chamado dentro do bloco project-setup, logo após copyWithTokens.
- *     → Responsável por: aplicar patch do backend, trocar pubspec.yaml,
- *       remover artefatos irrelevantes, escrever overrides de environment
- *       e copiar arquivos extras do backend (ex: supabase/migrations/).
- *     → Retorna: { detail?, extraAnswers?, kitSetupExtra?, returnExtra? }
- *         - detail       : string extra para o log do passo (ex: "12 patch files")
- *         - extraAnswers : campos extras para writeVsCodeLaunch / writeEnvExample
- *         - kitSetupExtra: campos extras para writeKitSetup
- *         - returnExtra  : campos extras no objeto de retorno da função
+ *     → Called inside the project-setup block, right after copyWithTokens.
+ *     → Responsible for: applying the backend patch, swapping pubspec.yaml,
+ *       removing irrelevant artifacts, writing environment overrides
+ *       and copying extra backend files (e.g. supabase/migrations/).
+ *     → Returns: { detail?, extraAnswers?, kitSetupExtra?, returnExtra? }
+ *         - detail       : extra string for the step log (e.g. "12 patch files")
+ *         - extraAnswers : extra fields for writeVsCodeLaunch / writeEnvExample
+ *         - kitSetupExtra: extra fields for writeKitSetup
+ *         - returnExtra  : extra fields in the function's return object
  *
  *   postBuild(targetDir, options, steps)
- *     → Chamado após build-runner e flutterfire configure.
- *     → Responsável por: deploy automático (Firebase), etc.
+ *     → Called after build-runner and flutterfire configure.
+ *     → Responsible for: automatic deploy (Firebase), etc.
  *
- * Passos comuns executados para todos os backends:
- *   1.  Validação do template base (Firebase/)
- *   2.  buildTokens (tokens de substituição de texto)
+ * Common steps executed for all backends:
+ *   1.  Validate the base template (Firebase/)
+ *   2.  buildTokens (text replacement tokens)
  *   3.  copyWithTokens  (Firebase/ → targetDir)
  *   [hook: applyBackendSetup]
  *   3b. applyFeaturePatches  (features/ci/, features/web/, etc.)
@@ -32,7 +32,7 @@
  *   8.  flutter pub get
  *   9.  dart run slang
  *   10. dart run build_runner build
- *   11. flutterfire configure  (Firebase para FCM + Remote Config — todos os backends)
+ *   11. flutterfire configure  (Firebase for FCM + Remote Config — all backends)
  *   12. writeFirebaserc
  *   [hook: postBuild]
  */
@@ -61,6 +61,7 @@ const {
   patchLanguageSwitcherNoWidget,
   writeNoOpFeatureRequestRepository,
   writeNoOpSubscriptionStubs,
+  writeStripeOnlySubscription,
   writeNoOpSentryUsages,
   writeMainDart,
   removeModuleDirs,
@@ -69,21 +70,22 @@ const {
   localizeReleaseDocs,
 } = require('./shared/generator-utils');
 const { pubGet, slangGenerate, buildRunner, dartFix, flutterfireConfigure, writeGoogleAuthOptions, writeGoogleIosUrlScheme, patchFirebaseServiceWorker, deployFirestoreRules } = require('./shared/post-build');
+const { sortImportsInDirs } = require('./shared/sort-imports');
 const { FIREBASE_SOURCE_DIR } = require('./shared/backend-config');
 
 /**
- * Gera um projeto Flutter para o backend indicado.
+ * Generates a Flutter project for the given backend.
  *
- * @param {string} targetDir - Caminho absoluto do diretório de destino.
- * @param {'firebase'|'supabase'|'api'} backend - Backend selecionado.
+ * @param {string} targetDir - Absolute path of the destination directory.
+ * @param {'firebase'|'supabase'|'api'} backend - Selected backend.
  * @param {object} options
  * @param {string}   options.appName
  * @param {string}   options.bundleId
  * @param {string}   options.firebaseProjectId
  * @param {string[]} [options.modules=[]]
  * @param {object}   [options.moduleAnswers={}]
- * @param {Function} [options.onProgress]  - Callback para atualizar spinner no CLI.
- * @param {object}   [options.deploy]      - Usado pelo hook postBuild do Firebase.
+ * @param {Function} [options.onProgress]  - Callback to update the spinner in the CLI.
+ * @param {object}   [options.deploy]      - Used by the Firebase postBuild hook.
  * @param {object}   [hooks={}]
  * @param {Function|null} [hooks.applyBackendSetup]
  * @param {Function|null} [hooks.postBuild]
@@ -248,17 +250,24 @@ async function generateProject(targetDir, backend, options, hooks = {}) {
       await removeFacebookSigninFromAuthPages(targetDir);
     }
 
-    // Write no-op feature_request_repository.dart if feedback not selected but revenuecat IS selected.
-    // Only premium_page_provider.dart (subscription module) imports this — when revenuecat is not
-    // selected the subscription module is removed entirely, so the stub is not needed.
-    if (!modules.includes('feedback') && modules.includes('revenuecat')) {
+    // Write no-op feature_request_repository.dart if feedback not selected but the
+    // subscription CORE is present (RevenueCat OR Stripe). Only premium_page_provider.dart
+    // (subscription module) imports this — when neither is selected the subscription module
+    // is removed entirely, so the stub is not needed.
+    if (!modules.includes('feedback') && (modules.includes('revenuecat') || modules.includes('stripe'))) {
       await writeNoOpFeatureRequestRepository(targetDir, packageName);
     }
 
-    // Write no-op subscription stubs if revenuecat not selected
-    // (user_repository, home_page, admin_paywalls, onboarding_page reference subscription types)
-    if (!modules.includes('revenuecat')) {
+    // Subscription core gating:
+    // - neither RevenueCat nor Stripe → remove the module, write no-op stubs
+    //   (user_repository, home_page, admin_paywalls, onboarding_page reference subscription types).
+    // - Stripe without RevenueCat → keep the core but strip the purchases_flutter
+    //   (RevenueCat) files so the app compiles without the RevenueCat SDK.
+    // - RevenueCat (with or without Stripe) → keep everything as-is.
+    if (!modules.includes('revenuecat') && !modules.includes('stripe')) {
       await writeNoOpSubscriptionStubs(targetDir, packageName);
+    } else if (modules.includes('stripe') && !modules.includes('revenuecat')) {
+      await writeStripeOnlySubscription(targetDir, packageName);
     }
 
     // Write no-op admin_home_widgets.dart if widget not selected
@@ -290,6 +299,11 @@ async function generateProject(targetDir, backend, options, hooks = {}) {
 
     // Remove internal DEVELOPMENT_TEAM from iOS project — clients use their own Apple team
     await removeDevelopmentTeam(targetDir);
+
+    // Sort Dart imports so the renamed package keeps the directives_ordering
+    // lint happy (the source order is alphabetical for `kasy_kit`, which breaks
+    // once renamed to the project's package). Best-effort, never throws.
+    sortImportsInDirs([path.join(targetDir, 'lib'), path.join(targetDir, 'test')]);
     // ── End Phase B ──────────────────────────────────────────────────────────
 
     steps.push({ name: 'project-setup', ok: true, detail: setupDetail });
@@ -383,7 +397,7 @@ async function generateProject(targetDir, backend, options, hooks = {}) {
     steps.push({ name: 'firestore-rules', ok: rulesResult.ok, detail: rulesResult.ok ? null : rulesResult.error });
   }
 
-  // ── 3. Post-build específico do backend ────────────────────────────────────
+  // ── 3. Backend-specific post-build ────────────────────────────────────
   if (postBuild) {
     try {
       await postBuild(targetDir, options, steps);