kasy-cli 1.16.0 → 1.17.0

package/lib/scaffold/shared/post-build.js

@@ -665,49 +665,123 @@ async function validateFacebookAndroidStrings(projectDir) {
 }
 
 /**
- * Validate RevenueCat API keys (RC_IOS_API_KEY, RC_ANDROID_API_KEY) from the project Makefile
- * and return the webhook URL derived from kit_setup.json backend config.
+ * Read a project `.env` file into a plain object. Returns `{}` if the file is
+ * missing. Supports KEY=VALUE lines; ignores comments and blank lines.
  */
-async function validateRevenueCat(projectDir, config = {}) {
-  const makefilePath = path.join(projectDir, 'Makefile');
-  if (!(await fs.pathExists(makefilePath))) {
-    return { ok: true, skipped: true, reason: 'no_makefile' };
-  }
-
+async function readDotenv(projectDir) {
+  const envPath = path.join(projectDir, '.env');
+  if (!(await fs.pathExists(envPath))) return {};
   let content;
   try {
-    content = await fs.readFile(makefilePath, 'utf8');
-  } catch (err) {
-    return { ok: false, error: `Failed to read Makefile: ${err.message}` };
+    content = await fs.readFile(envPath, 'utf8');
+  } catch {
+    return {};
+  }
+  const env = {};
+  for (const rawLine of content.split('\n')) {
+    const line = rawLine.trim();
+    if (!line || line.startsWith('#')) continue;
+    const eq = line.indexOf('=');
+    if (eq === -1) continue;
+    const key = line.slice(0, eq).trim();
+    let value = line.slice(eq + 1).trim();
+    if ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'"))) {
+      value = value.slice(1, -1);
+    }
+    if (key) env[key] = value;
   }
+  return env;
+}
 
-  // Only consider non-commented lines
-  const activeLines = content.split('\n').filter((l) => !/^\s*#/.test(l)).join('\n');
-
-  const iosMatch = activeLines.match(/RC_IOS_API_KEY=([^\s\\]+)/);
-  const androidMatch = activeLines.match(/RC_ANDROID_API_KEY=([^\s\\]+)/);
-
-  const iosKey = iosMatch ? iosMatch[1].trim() : '';
-  const androidKey = androidMatch ? androidMatch[1].trim() : '';
-
-  const iosEmpty = !iosKey || iosKey === 'xxx';
-  const androidEmpty = !androidKey || androidKey === 'xxx';
-
-  const iosTest = iosKey.startsWith('test_');
-  const androidTest = androidKey.startsWith('test_');
+/**
+ * Validate RevenueCat keys. The new `.env` is the source of truth:
+ *   RC_TEST_KEY (test_xxx — simulator/emulator)
+ *   RC_IOS_PROD_KEY (appl_xxx — physical iOS)
+ *   RC_ANDROID_PROD_KEY (goog_xxx — physical Android)
+ *
+ * Legacy fallback: if none of the new vars are set we read the old
+ * RC_ANDROID_API_KEY/RC_IOS_API_KEY from `.env`, and finally the Makefile
+ * (oldest projects). Returns flags `doctor.js` uses to render granular hints.
+ */
+async function validateRevenueCat(projectDir, config = {}) {
+  const env = await readDotenv(projectDir);
 
+  // Webhook URL (only Supabase exposes it directly; Firebase points to Console).
   let webhookUrl = null;
   if (config.backendProvider === 'supabase' && config.supabaseProjectId) {
     webhookUrl = `https://${config.supabaseProjectId}.supabase.co/functions/v1/revenuecat-webhook`;
   }
 
+  const testKey = (env.RC_TEST_KEY || '').trim();
+  const iosProdKey = (env.RC_IOS_PROD_KEY || '').trim();
+  const androidProdKey = (env.RC_ANDROID_PROD_KEY || '').trim();
+  const hasNewKeys = !!(testKey || iosProdKey || androidProdKey);
+
+  // Legacy single-key path (for projects generated before the test/prod split).
+  if (!hasNewKeys) {
+    let iosKey = (env.RC_IOS_API_KEY || '').trim();
+    let androidKey = (env.RC_ANDROID_API_KEY || '').trim();
+
+    // Last resort: read from Makefile (oldest projects).
+    if (!iosKey && !androidKey) {
+      const makefilePath = path.join(projectDir, 'Makefile');
+      if (await fs.pathExists(makefilePath)) {
+        try {
+          const content = await fs.readFile(makefilePath, 'utf8');
+          const activeLines = content.split('\n').filter((l) => !/^\s*#/.test(l)).join('\n');
+          const iosMatch = activeLines.match(/RC_IOS_API_KEY=([^\s\\]+)/);
+          const androidMatch = activeLines.match(/RC_ANDROID_API_KEY=([^\s\\]+)/);
+          iosKey = iosMatch ? iosMatch[1].trim() : '';
+          androidKey = androidMatch ? androidMatch[1].trim() : '';
+        } catch { /* ignore */ }
+      }
+    }
+
+    const iosEmpty = !iosKey || iosKey === 'xxx';
+    const androidEmpty = !androidKey || androidKey === 'xxx';
+    const iosTest = iosKey.startsWith('test_');
+    const androidTest = androidKey.startsWith('test_');
+
+    return {
+      ok: !iosEmpty && !androidEmpty,
+      legacy: true,
+      iosKey,
+      androidKey,
+      iosEmpty,
+      androidEmpty,
+      bothTest: iosTest && androidTest,
+      webhookUrl,
+    };
+  }
+
+  // New 3-key scheme.
+  const testOk = !!testKey && /^test_/.test(testKey);
+  const testBadPrefix = !!testKey && !/^test_/.test(testKey);
+  const iosProdOk = !!iosProdKey && /^appl_/.test(iosProdKey);
+  const iosProdBadPrefix = !!iosProdKey && !/^appl_/.test(iosProdKey);
+  const androidProdOk = !!androidProdKey && /^goog_/.test(androidProdKey);
+  const androidProdBadPrefix = !!androidProdKey && !/^goog_/.test(androidProdKey);
+
+  // OK if user can run at least one device flow end-to-end. Test alone is fine
+  // for development; prod-only configurations also work but skip the simulator.
+  const anyOk = testOk || iosProdOk || androidProdOk;
+
   return {
-    ok: !iosEmpty && !androidEmpty,
-    iosKey,
-    androidKey,
-    iosEmpty,
-    androidEmpty,
-    bothTest: iosTest && androidTest,
+    ok: anyOk,
+    legacy: false,
+    testKey,
+    iosProdKey,
+    androidProdKey,
+    testOk,
+    testBadPrefix,
+    iosProdOk,
+    iosProdBadPrefix,
+    androidProdOk,
+    androidProdBadPrefix,
+    testMissing: !testKey,
+    iosProdMissing: !iosProdKey,
+    androidProdMissing: !androidProdKey,
+    onlyTest: testOk && !iosProdOk && !androidProdOk,
     webhookUrl,
   };
 }

package/lib/scaffold/shared/template-strings.js

@@ -33,6 +33,8 @@ const TEMPLATE_STRINGS = {
       supabase: '# Supabase',
       apiRest: '# API REST',
       revenuecat: '# RevenueCat',
+      revenuecatTest: '# Test Store key (test_xxx) — auto-used on simulator/emulator',
+      revenuecatProd: '# Production keys — auto-used on physical devices',
       sentry: '# Sentry (prod only)',
       mixpanel: '# Mixpanel',
       llmChat: '# LLM Chat — Cloud/Edge Function endpoint (API key stays on the server, not here)',
@@ -65,6 +67,8 @@ const TEMPLATE_STRINGS = {
       supabase: '# Supabase',
       apiRest: '# API REST',
       revenuecat: '# RevenueCat',
+      revenuecatTest: '# Chave Test Store (test_xxx) — usada automaticamente em simulador/emulador',
+      revenuecatProd: '# Chaves de produção — usadas automaticamente em dispositivo físico',
       sentry: '# Sentry (apenas prod)',
       mixpanel: '# Mixpanel',
       llmChat: '# LLM Chat — endpoint da Cloud/Edge Function (a chave de API fica no servidor, não aqui)',
@@ -97,6 +101,8 @@ const TEMPLATE_STRINGS = {
       supabase: '# Supabase',
       apiRest: '# API REST',
       revenuecat: '# RevenueCat',
+      revenuecatTest: '# Clave Test Store (test_xxx) — se usa automáticamente en simulador/emulador',
+      revenuecatProd: '# Claves de producción — se usan automáticamente en dispositivo físico',
       sentry: '# Sentry (solo prod)',
       mixpanel: '# Mixpanel',
       llmChat: '# LLM Chat — endpoint de Cloud/Edge Function (la clave de API queda en el servidor, no aquí)',

package/lib/utils/i18n/messages-en.js

@@ -419,8 +419,15 @@ module.exports = {
 
     'doctor.revenuecat.title': 'RevenueCat',
     'doctor.revenuecat.keysOk': 'API keys configured (iOS + Android)',
-    'doctor.revenuecat.keysEmpty': 'API keys not configured — set RC_IOS_API_KEY and RC_ANDROID_API_KEY in Makefile and .vscode/launch.json',
-    'doctor.revenuecat.keysTest': 'Using Test Store keys (test_) — replace with appl_ and goog_ for production',
+    'doctor.revenuecat.keysEmpty': 'No keys configured — set at least RC_TEST_KEY in .env (kasy run uses it on simulator/emulator)',
+    'doctor.revenuecat.testKeyOk': 'RC_TEST_KEY configured (test_) — used on simulator/emulator',
+    'doctor.revenuecat.testKeyMissing': 'RC_TEST_KEY missing — subscription flow will not work on simulator/emulator',
+    'doctor.revenuecat.iosProdOk': 'RC_IOS_PROD_KEY configured (appl_) — used on physical iPhone',
+    'doctor.revenuecat.iosProdMissing': 'RC_IOS_PROD_KEY missing — kasy run on physical iPhone will fall back to the test key',
+    'doctor.revenuecat.androidProdOk': 'RC_ANDROID_PROD_KEY configured (goog_) — used on physical Android',
+    'doctor.revenuecat.androidProdMissing': 'RC_ANDROID_PROD_KEY missing — kasy run on physical Android will fall back to the test key',
+    'doctor.revenuecat.prefixMismatch': 'Key has wrong prefix: {key} should start with {expected}',
+    'doctor.revenuecat.keysTest': 'Only Test Store keys (test_) configured — store releases require appl_/goog_, otherwise the app crashes',
     'doctor.revenuecat.webhookUrlSupabase': 'Webhook URL (paste in RevenueCat → Integrations → Webhooks)',
     'doctor.revenuecat.webhookUrlFirebase': 'Webhook URL: Firebase Console → Functions → subscriptionsOnRcPremiumUpdate',
 
@@ -488,6 +495,14 @@ module.exports = {
     'new.firebase.q.revenuecat.webhookKey.hint': 'Save this value. In RevenueCat dashboard, paste as: Bearer <this-value>',
     'new.firebase.q.revenuecat.metaToken': 'Meta Access Token (for Ads Conversions API, optional)',
     'new.firebase.q.revenuecat.metaDataset': 'Meta Dataset ID / Pixel ID (optional)',
+    'new.firebase.q.revenuecat.test': 'Test Store key (test_xxx) — optional, works for both iOS+Android and runs in the simulator',
+    'new.firebase.q.revenuecat.test.invalid': 'Test Store key must start with test_ (e.g. test_xxxxxxxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.iosProd': 'iOS production key (appl_xxx) — optional, used only on physical iPhone',
+    'new.firebase.q.revenuecat.iosProd.invalid': 'iOS production key must start with appl_ (e.g. appl_xxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.androidProd': 'Android production key (goog_xxx) — optional, used only on physical Android',
+    'new.firebase.q.revenuecat.androidProd.invalid': 'Android production key must start with goog_ (e.g. goog_xxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.atLeastOne': 'Configure at least one key (Test, iOS prod or Android prod). You can add the others later in .env.',
+    // Legacy keys — kept for projects/scripts that still reference them.
     'new.firebase.q.revenuecat.android': 'RevenueCat API key for Android',
     'new.firebase.q.revenuecat.ios': 'RevenueCat API key for iOS',
     'new.firebase.q.paywall': 'Which paywall style?',
@@ -661,6 +676,12 @@ module.exports = {
     'run.stage.buildSuccess': 'Build done — launching app…',
     'run.error.notFlutterProject': 'No pubspec.yaml found. Run this command from inside a Flutter project.',
     'run.error.flutterNotFound': 'Flutter not found. Make sure Flutter is installed and on your PATH.',
+    'run.rc.usingTest': 'RevenueCat: using test key (test_) — simulator/emulator',
+    'run.rc.usingProd': 'RevenueCat: using production keys — physical device',
+    'run.rc.fallbackToTest': 'RevenueCat: production key missing ({platform}) — falling back to test_; set RC_{var} in .env to test real in-app purchases',
+    'run.rc.forcedTest': 'RevenueCat: --rc=test forced',
+    'run.rc.forcedProd': 'RevenueCat: --rc=prod forced',
+    'run.rc.forcedProdMissing': 'RevenueCat: --rc=prod requested but RC_IOS_PROD_KEY/RC_ANDROID_PROD_KEY not set in .env',
 
     // reset command
     'cli.command.reset.description': 'Uninstall the app on a simulator/emulator/device so you can test as a fresh install',
@@ -840,6 +861,10 @@ module.exports = {
     'add.cancelled': 'Cancelled.',
     'add.prompt.sentryDsn': 'Sentry DSN (leave blank to configure later):',
     'add.prompt.mixpanelToken': 'Mixpanel Token (leave blank to configure later):',
+    'add.prompt.rcTestKey': 'Test Store key (test_xxx) — optional, works for both iOS+Android and on simulator:',
+    'add.prompt.rcIosProdKey': 'iOS production key (appl_xxx) — optional, only on physical device:',
+    'add.prompt.rcAndroidProdKey': 'Android production key (goog_xxx) — optional, only on physical device:',
+    // Legacy keys — kept for compatibility with old scripts.
     'add.prompt.rcAndroidKey': 'RevenueCat Android API key (leave blank to configure later):',
     'add.prompt.rcIosKey': 'RevenueCat iOS API key (leave blank to configure later):',
     'add.note.facebook': 'Add your Facebook App ID and token in .vscode/launch.json (FB_APP_ID, FB_TOKEN).',

package/lib/utils/i18n/messages-es.js

@@ -421,8 +421,15 @@ module.exports = {
 
     'doctor.revenuecat.title': 'RevenueCat',
     'doctor.revenuecat.keysOk': 'Claves de API configuradas (iOS + Android)',
-    'doctor.revenuecat.keysEmpty': 'Claves de API no configuradas — define RC_IOS_API_KEY y RC_ANDROID_API_KEY en Makefile y .vscode/launch.json',
-    'doctor.revenuecat.keysTest': 'Usando claves Test Store (test_) — reemplaza por appl_ y goog_ para producción',
+    'doctor.revenuecat.keysEmpty': 'Ninguna clave configurada — define al menos RC_TEST_KEY en .env (kasy run la usa en simulador/emulador)',
+    'doctor.revenuecat.testKeyOk': 'RC_TEST_KEY configurada (test_) — usada en simulador/emulador',
+    'doctor.revenuecat.testKeyMissing': 'RC_TEST_KEY ausente — el flujo de suscripción no funciona en simulador/emulador',
+    'doctor.revenuecat.iosProdOk': 'RC_IOS_PROD_KEY configurada (appl_) — usada en iPhone físico',
+    'doctor.revenuecat.iosProdMissing': 'RC_IOS_PROD_KEY ausente — kasy run en iPhone físico va a usar la clave de prueba',
+    'doctor.revenuecat.androidProdOk': 'RC_ANDROID_PROD_KEY configurada (goog_) — usada en Android físico',
+    'doctor.revenuecat.androidProdMissing': 'RC_ANDROID_PROD_KEY ausente — kasy run en Android físico va a usar la clave de prueba',
+    'doctor.revenuecat.prefixMismatch': 'Clave con prefijo incorrecto: {key} debe empezar con {expected}',
+    'doctor.revenuecat.keysTest': 'Solo claves Test Store (test_) configuradas — los releases en la tienda requieren appl_/goog_, sino el app crashea',
     'doctor.revenuecat.webhookUrlSupabase': 'URL del webhook (pega en RevenueCat → Integrations → Webhooks)',
     'doctor.revenuecat.webhookUrlFirebase': 'URL del webhook: Firebase Console → Functions → subscriptionsOnRcPremiumUpdate',
 
@@ -488,6 +495,14 @@ module.exports = {
     'new.firebase.q.revenuecat.webhookKey.hint': 'Guarda este valor. En el panel RevenueCat, pega como: Bearer <este-valor>',
     'new.firebase.q.revenuecat.metaToken': 'Meta Access Token (Conversions API, opcional)',
     'new.firebase.q.revenuecat.metaDataset': 'Meta Dataset ID / Pixel ID (opcional)',
+    'new.firebase.q.revenuecat.test': 'Clave Test Store (test_xxx) — opcional, sirve para iOS+Android y funciona en simulador',
+    'new.firebase.q.revenuecat.test.invalid': 'Clave Test Store debe empezar con test_ (ej: test_xxxxxxxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.iosProd': 'Clave iOS de producción (appl_xxx) — opcional, se usa solo en dispositivo físico',
+    'new.firebase.q.revenuecat.iosProd.invalid': 'Clave iOS de producción debe empezar con appl_ (ej: appl_xxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.androidProd': 'Clave Android de producción (goog_xxx) — opcional, se usa solo en dispositivo físico',
+    'new.firebase.q.revenuecat.androidProd.invalid': 'Clave Android de producción debe empezar con goog_ (ej: goog_xxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.atLeastOne': 'Configura al menos una clave (Test, iOS prod o Android prod). Puedes agregar las demás después en .env.',
+    // Legacy keys — kept for projects/scripts that still reference them.
     'new.firebase.q.revenuecat.android': 'Clave API RevenueCat para Android',
     'new.firebase.q.revenuecat.ios': 'Clave API RevenueCat para iOS',
     'new.firebase.q.paywall': '¿Qué estilo de paywall?',
@@ -694,6 +709,12 @@ module.exports = {
     'run.stage.buildSuccess': 'Build listo — abriendo la app…',
     'run.error.notFlutterProject': 'No se encontro pubspec.yaml. Ejecuta este comando dentro de un proyecto Flutter.',
     'run.error.flutterNotFound': 'Flutter no encontrado. Verifica que Flutter este instalado y en el PATH.',
+    'run.rc.usingTest': 'RevenueCat: usando clave de prueba (test_) — simulador/emulador',
+    'run.rc.usingProd': 'RevenueCat: usando claves de producción — dispositivo físico',
+    'run.rc.fallbackToTest': 'RevenueCat: clave de producción ausente ({platform}) — usando test_; configura RC_{var} en .env para probar in-app purchase real',
+    'run.rc.forcedTest': 'RevenueCat: --rc=test forzado',
+    'run.rc.forcedProd': 'RevenueCat: --rc=prod forzado',
+    'run.rc.forcedProdMissing': 'RevenueCat: --rc=prod pedido pero RC_IOS_PROD_KEY/RC_ANDROID_PROD_KEY no configuradas en .env',
 
     // doctor project checks
     'doctor.project.title': 'Proyecto',
@@ -838,6 +859,10 @@ module.exports = {
     'add.cancelled': 'Cancelado.',
     'add.prompt.sentryDsn': 'Sentry DSN (deja en blanco para configurar después):',
     'add.prompt.mixpanelToken': 'Mixpanel Token (deja en blanco para configurar después):',
+    'add.prompt.rcTestKey': 'Clave Test Store (test_xxx) — opcional, sirve para iOS+Android y simulador:',
+    'add.prompt.rcIosProdKey': 'Clave iOS de producción (appl_xxx) — opcional, solo en dispositivo físico:',
+    'add.prompt.rcAndroidProdKey': 'Clave Android de producción (goog_xxx) — opcional, solo en dispositivo físico:',
+    // Legacy keys — kept for compatibility with old scripts.
     'add.prompt.rcAndroidKey': 'RevenueCat Android API key (deja en blanco para configurar después):',
     'add.prompt.rcIosKey': 'RevenueCat iOS API key (deja en blanco para configurar después):',
     'add.note.facebook': 'Agrega tu Facebook App ID y token en .vscode/launch.json (FB_APP_ID, FB_TOKEN).',

package/lib/utils/i18n/messages-pt.js

@@ -419,8 +419,15 @@ module.exports = {
 
     'doctor.revenuecat.title': 'RevenueCat',
     'doctor.revenuecat.keysOk': 'Chaves de API configuradas (iOS + Android)',
-    'doctor.revenuecat.keysEmpty': 'Chaves de API não configuradas — defina RC_IOS_API_KEY e RC_ANDROID_API_KEY no Makefile e .vscode/launch.json',
-    'doctor.revenuecat.keysTest': 'Usando chaves Test Store (test_) — substitua por appl_ e goog_ para produção',
+    'doctor.revenuecat.keysEmpty': 'Nenhuma chave configurada — defina pelo menos RC_TEST_KEY no .env (kasy run usa em simulador/emulador)',
+    'doctor.revenuecat.testKeyOk': 'RC_TEST_KEY configurada (test_) — usada em simulador/emulador',
+    'doctor.revenuecat.testKeyMissing': 'RC_TEST_KEY ausente — fluxo de assinatura não funciona em simulador/emulador',
+    'doctor.revenuecat.iosProdOk': 'RC_IOS_PROD_KEY configurada (appl_) — usada em iPhone físico',
+    'doctor.revenuecat.iosProdMissing': 'RC_IOS_PROD_KEY ausente — kasy run em iPhone físico vai usar a chave de teste',
+    'doctor.revenuecat.androidProdOk': 'RC_ANDROID_PROD_KEY configurada (goog_) — usada em Android físico',
+    'doctor.revenuecat.androidProdMissing': 'RC_ANDROID_PROD_KEY ausente — kasy run em Android físico vai usar a chave de teste',
+    'doctor.revenuecat.prefixMismatch': 'Chave com prefixo errado: {key} deveria começar com {expected}',
+    'doctor.revenuecat.keysTest': 'Apenas chaves Test Store (test_) configuradas — releases na loja exigem appl_/goog_, senão o app crasha',
     'doctor.revenuecat.webhookUrlSupabase': 'URL do webhook (cole no RevenueCat → Integrations → Webhooks)',
     'doctor.revenuecat.webhookUrlFirebase': 'URL do webhook: Firebase Console → Functions → subscriptionsOnRcPremiumUpdate',
 
@@ -488,6 +495,14 @@ module.exports = {
     'new.firebase.q.revenuecat.webhookKey.hint': 'Salve esse valor. No painel RevenueCat, cole como: Bearer <esse-valor>',
     'new.firebase.q.revenuecat.metaToken': 'Meta Access Token (Conversions API, opcional)',
     'new.firebase.q.revenuecat.metaDataset': 'Meta Dataset ID / Pixel ID (opcional)',
+    'new.firebase.q.revenuecat.test': 'Chave Test Store (test_xxx) — opcional, serve pra iOS+Android e funciona em simulador',
+    'new.firebase.q.revenuecat.test.invalid': 'Chave Test Store deve começar com test_ (ex: test_xxxxxxxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.iosProd': 'Chave iOS de produção (appl_xxx) — opcional, usada só em dispositivo físico',
+    'new.firebase.q.revenuecat.iosProd.invalid': 'Chave iOS de produção deve começar com appl_ (ex: appl_xxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.androidProd': 'Chave Android de produção (goog_xxx) — opcional, usada só em dispositivo físico',
+    'new.firebase.q.revenuecat.androidProd.invalid': 'Chave Android de produção deve começar com goog_ (ex: goog_xxxxxxxxxxxxxxx).',
+    'new.firebase.q.revenuecat.atLeastOne': 'Configure pelo menos uma chave (Test, iOS prod ou Android prod). Você pode adicionar as outras depois no .env.',
+    // Legacy keys — kept for projects/scripts that still reference them.
     'new.firebase.q.revenuecat.android': 'Chave de API RevenueCat para Android',
     'new.firebase.q.revenuecat.ios': 'Chave de API RevenueCat para iOS',
     'new.firebase.q.paywall': 'Qual estilo de paywall?',
@@ -694,6 +709,12 @@ module.exports = {
     'run.stage.buildSuccess': 'Build pronto — abrindo o app…',
     'run.error.notFlutterProject': 'Nenhum pubspec.yaml encontrado. Execute este comando dentro de um projeto Flutter.',
     'run.error.flutterNotFound': 'Flutter não encontrado. Verifique se o Flutter está instalado e no PATH.',
+    'run.rc.usingTest': 'RevenueCat: usando chave de teste (test_) — simulador/emulador',
+    'run.rc.usingProd': 'RevenueCat: usando chaves de produção — dispositivo físico',
+    'run.rc.fallbackToTest': 'RevenueCat: chave de produção ausente ({platform}) — caindo para test_; configure RC_{var} no .env para testar in-app purchase real',
+    'run.rc.forcedTest': 'RevenueCat: --rc=test forçado',
+    'run.rc.forcedProd': 'RevenueCat: --rc=prod forçado',
+    'run.rc.forcedProdMissing': 'RevenueCat: --rc=prod pedido mas RC_IOS_PROD_KEY/RC_ANDROID_PROD_KEY não configuradas no .env',
 
     // doctor project checks
     'doctor.project.title': 'Projeto',
@@ -838,6 +859,10 @@ module.exports = {
     'add.cancelled': 'Cancelado.',
     'add.prompt.sentryDsn': 'Sentry DSN (deixe em branco para configurar depois):',
     'add.prompt.mixpanelToken': 'Mixpanel Token (deixe em branco para configurar depois):',
+    'add.prompt.rcTestKey': 'Chave Test Store (test_xxx) — opcional, serve pra iOS+Android e simulador:',
+    'add.prompt.rcIosProdKey': 'Chave iOS de produção (appl_xxx) — opcional, só em dispositivo físico:',
+    'add.prompt.rcAndroidProdKey': 'Chave Android de produção (goog_xxx) — opcional, só em dispositivo físico:',
+    // Legacy keys — kept for compatibility with old scripts.
     'add.prompt.rcAndroidKey': 'RevenueCat Android API key (deixe em branco para configurar depois):',
     'add.prompt.rcIosKey': 'RevenueCat iOS API key (deixe em branco para configurar depois):',
     'add.note.facebook': 'Adicione seu Facebook App ID e token no .vscode/launch.json (FB_APP_ID, FB_TOKEN).',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kasy-cli",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "description": "CLI for scaffolding production-ready Flutter SaaS apps with Firebase, Supabase, or API REST backends.",
   "bin": {
     "kasy": "./bin/kasy.js"

package/templates/firebase/README.en.md

@@ -48,16 +48,26 @@ They live in `.vscode/launch.json` as build environment variables (`--dart-defin
 
 | Variable | Module | How to get |
 |----------|--------|------------|
-| `RC_ANDROID_API_KEY` | RevenueCat | RevenueCat dashboard → Apps → Android → **Google Play** public key (`goog_…`) |
-| `RC_IOS_API_KEY` | RevenueCat | RevenueCat dashboard → Apps → iOS → **Apple App Store** public key (`appl_…`) |
+| `RC_TEST_KEY` | RevenueCat | RevenueCat dashboard → Apps → Test Store → key (`test_…`). **One key for both iOS+Android.** Auto-used on simulator/emulator. |
+| `RC_IOS_PROD_KEY` | RevenueCat | RevenueCat dashboard → Apps → App Store → key (`appl_…`). Auto-used on physical iPhone (Sandbox and Production). |
+| `RC_ANDROID_PROD_KEY` | RevenueCat | RevenueCat dashboard → Apps → Google Play → key (`goog_…`). Auto-used on physical Android. |
 | `RC_WEB_API_KEY` | RevenueCat Web | RevenueCat dashboard → Apps → Web Billing → **production** key (`rcb_…`, not `rcb_sb_`) for release builds |
 
-### RevenueCat: `test_` vs store keys (TestFlight / release)
+### RevenueCat: `kasy run` picks the right key automatically
 
-- Keys starting with **`test_`** are RevenueCat **Test Store**: fine for **`flutter run` debug** on your Mac (fake purchases in RC’s test environment). **Do not** bake them into TestFlight/App Store IPAs — the SDK rejects them or the kit skips RC init.
-- **TestFlight / Apple sandbox** (no real charges): use **store** public keys — **`appl_…`** (iOS) and **`goog_…`** (Android). TestFlight purchases still use **Apple/Google sandbox**, not real billing.
-- The VS Code **Firebase — prod** config **no longer** sets RC keys; put `appl_` / `goog_` in **`Firebase/.env`** or **`.dart_defines`** (see `Makefile`) when building release / TestFlight.
-- **Firebase — dev** still ships sample `test_` keys for local development only.
+The CLI detects whether you're running on **simulator/emulator** or **physical device** and injects the right key:
+
+| Where you run | Key used |
+|---|---|
+| iOS Simulator / Android Emulator | `RC_TEST_KEY` (test_) |
+| Physical iPhone | `RC_IOS_PROD_KEY` (appl_) — falls back to `RC_TEST_KEY` if missing |
+| Physical Android | `RC_ANDROID_PROD_KEY` (goog_) — falls back to `RC_TEST_KEY` if missing |
+
+Force manually: `kasy run --rc=test` or `kasy run --rc=prod`. `--rc=auto` (default) applies the rule above.
+
+- **Why the split?** Simulators can't run real in-app purchases against `appl_`/`goog_` — only RevenueCat Test Store works there. On physical devices, `appl_`/`goog_` covers both Sandbox and Production (the SDK detects the environment).
+- **TestFlight and release:** use the production keys. **NEVER ship `test_` to the store** — the RevenueCat SDK crashes the app on release.
+- **VS Code (F5 without kasy run):** `launch.json` defaults to `RC_TEST_KEY` (or production if test_ is missing). To switch manually, run via `kasy run`.
 | `SENTRY_DSN` | Sentry | Dashboard Sentry → Project → DSN |
 | `MIXPANEL_TOKEN` | Mixpanel | Dashboard Mixpanel → Settings → Token |
 

package/templates/firebase/README.es.md

@@ -48,16 +48,26 @@ Están en `.vscode/launch.json` como variables de entorno de build (`--dart-defi
 
 | Variable | Módulo | Cómo obtener |
 |----------|--------|--------------|
-| `RC_ANDROID_API_KEY` | RevenueCat | Panel RevenueCat → Apps → Android → clave pública **Google Play** (`goog_…`) |
-| `RC_IOS_API_KEY` | RevenueCat | Panel RevenueCat → Apps → iOS → clave pública **Apple App Store** (`appl_…`) |
+| `RC_TEST_KEY` | RevenueCat | Panel RevenueCat → Apps → Test Store → clave (`test_…`). **Una sola clave sirve para iOS+Android.** Usada automáticamente en simulador/emulador. |
+| `RC_IOS_PROD_KEY` | RevenueCat | Panel RevenueCat → Apps → App Store → clave (`appl_…`). Usada automáticamente en iPhone físico (Sandbox y Producción). |
+| `RC_ANDROID_PROD_KEY` | RevenueCat | Panel RevenueCat → Apps → Google Play → clave (`goog_…`). Usada automáticamente en Android físico. |
 | `RC_WEB_API_KEY` | RevenueCat Web | Panel RevenueCat → Apps → Web Billing → clave **producción** (`rcb_…`, no `rcb_sb_`) en builds release |
 
-### RevenueCat: `test_` vs tienda (TestFlight / release)
+### RevenueCat: `kasy run` elige la clave automáticamente
 
-- Clave **`test_`** = **Test Store** de RevenueCat: sirve para **`flutter run` en debug** en tu Mac. **No** la empaques en IPA de TestFlight/App Store.
-- **TestFlight / sandbox de Apple** (sin cobro real): usa claves de **tienda** — **`appl_…`** (iOS) y **`goog_…`** (Android).
-- La config **Firebase — prod** en VS Code **ya no** define RC; pon `appl_` / `goog_` en **`.env`** o **`.dart_defines`** al generar release / TestFlight.
-- **Firebase — dev** sigue con `test_` de ejemplo solo para desarrollo local.
+La CLI detecta si vas a correr en **simulador/emulador** o en **dispositivo físico** e inyecta la clave correcta:
+
+| Dónde corres | Clave usada |
+|---|---|
+| iOS Simulator / Android Emulator | `RC_TEST_KEY` (test_) |
+| iPhone físico | `RC_IOS_PROD_KEY` (appl_) — fallback `RC_TEST_KEY` si falta |
+| Android físico | `RC_ANDROID_PROD_KEY` (goog_) — fallback `RC_TEST_KEY` si falta |
+
+Forzar manualmente: `kasy run --rc=test` o `kasy run --rc=prod`. `--rc=auto` (por defecto) aplica la regla anterior.
+
+- **¿Por qué el split?** Los simuladores no pueden hacer compras reales con claves `appl_`/`goog_` — solo funciona Test Store de RevenueCat. En dispositivo físico, `appl_`/`goog_` cubre Sandbox y Producción (el SDK lo detecta).
+- **TestFlight y release:** usa las claves de producción. **NUNCA subas `test_` a la tienda** — el SDK de RevenueCat crashea el app en release.
+- **VS Code (F5 sin kasy run):** `launch.json` usa `RC_TEST_KEY` por defecto (o producción si test_ falta). Para alternar manualmente, corre `kasy run`.
 | `SENTRY_DSN` | Sentry | Dashboard Sentry → Proyecto → DSN |
 | `MIXPANEL_TOKEN` | Mixpanel | Dashboard Mixpanel → Configuración → Token |
 

package/templates/firebase/README.md

@@ -48,16 +48,26 @@ Ficam no `.vscode/launch.json` como variáveis de ambiente de build (`--dart-def
 
 | Variável | Módulo | Como obter |
 |----------|--------|------------|
-| `RC_ANDROID_API_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Android → chave pública **Google Play** (`goog_…`) |
-| `RC_IOS_API_KEY` | RevenueCat | Dashboard RevenueCat → Apps → iOS → chave pública **Apple App Store** (`appl_…`) |
+| `RC_TEST_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Test Store → chave (`test_…`). **Uma chave só, serve pra iOS+Android.** Usada automaticamente em simulador/emulador. |
+| `RC_IOS_PROD_KEY` | RevenueCat | Dashboard RevenueCat → Apps → App Store → chave (`appl_…`). Usada automaticamente em iPhone físico (Sandbox e Produção). |
+| `RC_ANDROID_PROD_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Google Play → chave (`goog_…`). Usada automaticamente em Android físico. |
 | `RC_WEB_API_KEY` | RevenueCat Web | Dashboard RevenueCat → Apps → Web Billing → chave **produção** (`rcb_…`, não `rcb_sb_`) em builds release |
 
-### RevenueCat: `test_` vs loja (TestFlight / release)
+### RevenueCat: `kasy run` escolhe a chave automaticamente
 
-- Chave que começa com **`test_`** = **Test Store** da RevenueCat: serve para **`flutter run` em debug** no Mac (compras fictícias no ambiente de teste da RC). **Não** use em IPA de TestFlight/App Store — o SDK bloqueia ou o app ignora o RC (comportamento atual do kit).
-- **TestFlight / sandbox da Apple** (compras sem cobrar de verdade): use no IPA as chaves públicas de **loja** — **`appl_…`** (iOS) e **`goog_…`** (Android). No TestFlight as compras ainda são **sandbox** da Apple/Google, não cobrança real.
-- A configuração **Firebase — prod** no VS Code **não** define mais RC; coloque `appl_` / `goog_` no seu **`.env`** na raiz do `Firebase/` ou em **`.dart_defines`** (ver `Makefile`) ao gerar release / TestFlight.
-- **Firebase — dev** no VS Code continua com `test_` de exemplo só para desenvolvimento local.
+A CLI detecta se você vai rodar em **simulador/emulador** ou em **dispositivo físico** e injeta a chave certa:
+
+| Onde você roda | Chave usada |
+|---|---|
+| iOS Simulator / Android Emulator | `RC_TEST_KEY` (test_) |
+| iPhone físico | `RC_IOS_PROD_KEY` (appl_) — fallback `RC_TEST_KEY` se ausente |
+| Android físico | `RC_ANDROID_PROD_KEY` (goog_) — fallback `RC_TEST_KEY` se ausente |
+
+Forçar manualmente: `kasy run --rc=test` ou `kasy run --rc=prod`. `--rc=auto` (default) usa a regra acima.
+
+- **Por que o split?** Simulador iOS e emulador Android não conseguem fazer in-app purchase real com chaves `appl_`/`goog_` — só funciona Test Store da RevenueCat. Já em físico, `appl_`/`goog_` cobre Sandbox e Produção (o SDK detecta sozinho).
+- **TestFlight e release:** use as chaves de produção. **NUNCA suba `test_` para a loja** — o SDK do RevenueCat crasha o app no release.
+- **VS Code (F5 sem kasy run):** o `launch.json` carrega `RC_TEST_KEY` como default (ou produção se test_ ausente). Pra alternar manualmente, rode pelo `kasy run`.
 | `SENTRY_DSN` | Sentry | Dashboard Sentry → Projeto → DSN |
 | `MIXPANEL_TOKEN` | Mixpanel | Dashboard Mixpanel → Configurações → Token |
 

package/templates/firebase/android/app/src/main/kotlin/com/aicrus/firebase/kit/MainActivity.kt

@@ -1,7 +1,9 @@
 package com.aicrus.firebase.kit
 
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import com.google.android.gms.ads.identifier.AdvertisingIdClient
 import io.flutter.embedding.android.FlutterActivity
@@ -20,6 +22,19 @@ class MainActivity : FlutterActivity() {
     super.onCreate(savedInstanceState)
   }
 
+  // Logs the incoming intent so we can diagnose warm-starts from the home
+  // widget that land on go_router's 404. With this, the Dart side's onException
+  // logs and these adb logs together show whether the intent itself carries a
+  // bad URI (data Uri / extras) or whether the 404 comes from elsewhere.
+  override fun onNewIntent(intent: Intent) {
+    Log.d(
+      "KasyWidgetTap",
+      "onNewIntent action=${intent.action} data=${intent.data} " +
+        "flags=0x${Integer.toHexString(intent.flags)} extras=${intent.extras}",
+    )
+    super.onNewIntent(intent)
+  }
+
   // Forces the night mode to match the user's saved theme preference (read
   // from `shared_preferences`) so the native splash drawable selection
   // (drawable-night vs drawable) follows the in-app choice, not just the OS.

package/templates/firebase/android/app/src/main/kotlin/com/aicrus/firebase/kit/MyWidget.kt

@@ -1,7 +1,6 @@
 package com.aicrus.firebase.kit
 
 import android.content.Context
-import android.content.Intent
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
@@ -14,7 +13,7 @@ import androidx.glance.LocalSize
 import androidx.glance.action.clickable
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.SizeMode
-import androidx.glance.appwidget.action.actionStartActivity
+import androidx.glance.appwidget.action.actionRunCallback
 import androidx.glance.appwidget.provideContent
 import androidx.glance.background
 import androidx.glance.currentState
@@ -89,7 +88,7 @@ class MyWidgetWidget : GlanceAppWidget() {
     Box(
       modifier = GlanceModifier
         .fillMaxSize()
-        .clickable(actionStartActivity(launchAppIntent(context))),
+        .clickable(actionRunCallback<OpenAppAction>()),
     ) {
       Image(
         provider = ImageProvider(R.drawable.widget_gradient_inner),
@@ -153,7 +152,7 @@ class MyWidgetWidget : GlanceAppWidget() {
               contentDescription = "Add",
               modifier = GlanceModifier
                 .size(34.dp)
-                .clickable(actionStartActivity(launchAppIntent(context))),
+                .clickable(actionRunCallback<OpenAppAction>()),
             )
           }
         }
@@ -219,19 +218,4 @@ class MyWidgetWidget : GlanceAppWidget() {
     }
     return DefaultStrings(greeting, hello)
   }
-
-  /// Builds the exact Intent the system launcher fires when the user taps
-  /// the app icon. We must NOT add extra flags here — getLaunchIntentForPackage
-  /// already returns `FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_RESET_IF_NEEDED`,
-  /// which is the same combo the launcher uses. Adding `CLEAR_TOP` destroys
-  /// go_router's navigation stack on warm starts and lands the user on the
-  /// errorBuilder ("404 - Page not found").
-  private fun launchAppIntent(context: Context): Intent {
-    return context.packageManager.getLaunchIntentForPackage(context.packageName)
-      ?: Intent(context, MainActivity::class.java).apply {
-        action = Intent.ACTION_MAIN
-        addCategory(Intent.CATEGORY_LAUNCHER)
-        flags = Intent.FLAG_ACTIVITY_NEW_TASK
-      }
-  }
 }

package/templates/firebase/android/app/src/main/kotlin/com/aicrus/firebase/kit/MyWidgetReceiver.kt

@@ -1,7 +1,44 @@
 package com.aicrus.firebase.kit
 
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import androidx.glance.appwidget.GlanceAppWidgetManager
 import es.antonborri.home_widget.HomeWidgetGlanceWidgetReceiver
+import kotlinx.coroutines.runBlocking
 
 class MyWidgetReceiver : HomeWidgetGlanceWidgetReceiver<MyWidgetWidget>() {
     override val glanceAppWidget = MyWidgetWidget()
+
+    // Override the parent's onUpdate because its updateAppWidgetState
+    // transformation returns the SAME state instance back. Glance compares
+    // references, treats the state as unchanged, and skips the recomposition.
+    // The symptom on the Flutter side: first language switch does not update,
+    // user has to tap twice. We force a fresh recompose by calling update()
+    // directly on each widget id — the composable then reads the latest
+    // SharedPreferences values that Dart already committed synchronously.
+    override fun onUpdate(
+        context: Context,
+        appWidgetManager: AppWidgetManager,
+        appWidgetIds: IntArray,
+    ) {
+        runBlocking {
+            val manager = GlanceAppWidgetManager(context)
+            appWidgetIds.forEach { widgetId ->
+                val glanceId = manager.getGlanceIdBy(widgetId)
+                glanceAppWidget.update(context, glanceId)
+            }
+            // Defensive 2nd update: Glance occasionally coalesces or skips the
+            // first invalidation when the user triggers two updates in quick
+            // succession (e.g. tapping the language tile and immediately
+            // returning to the home screen). A short gap + second update
+            // guarantees the freshly committed SharedPreferences values
+            // actually reach the composition. The symptom without this:
+            // first language tap appears to do nothing, second tap "fixes" it.
+            kotlinx.coroutines.delay(200)
+            appWidgetIds.forEach { widgetId ->
+                val glanceId = manager.getGlanceIdBy(widgetId)
+                glanceAppWidget.update(context, glanceId)
+            }
+        }
+    }
 }