kasy-cli 1.16.0 → 1.18.0

package/lib/commands/remove.js

@@ -49,17 +49,28 @@ const MODULE_DEPS = {
 const MODULE_DEFINES = {
   sentry:     ['SENTRY_DSN'],
   analytics:  ['MIXPANEL_TOKEN'],
-  revenuecat: ['RC_ANDROID_API_KEY', 'RC_IOS_API_KEY'],
+  revenuecat: ['RC_ANDROID_API_KEY', 'RC_IOS_API_KEY', 'RC_WEB_API_KEY'],
   llm_chat:   ['LLM_CHAT_ENDPOINT'],
 };
 
 /**
- * .env.example variable names to remove per module.
+ * .env.example variable names to remove per module. We list both the new
+ * test/prod split (RC_TEST_KEY / RC_IOS_PROD_KEY / RC_ANDROID_PROD_KEY) and
+ * the legacy single-key vars so removal works on any project age.
  */
 const MODULE_ENV_KEYS = {
   sentry:     ['SENTRY_DSN'],
   analytics:  ['MIXPANEL_TOKEN'],
-  revenuecat: ['RC_ANDROID_API_KEY', 'RC_IOS_API_KEY'],
+  revenuecat: [
+    'RC_TEST_KEY',
+    'RC_IOS_PROD_KEY',
+    'RC_ANDROID_PROD_KEY',
+    'RC_WEB_API_KEY',
+    // Legacy single-key format — only present in projects generated before
+    // the test/prod split. Listed here so removal cleans them up too.
+    'RC_ANDROID_API_KEY',
+    'RC_IOS_API_KEY',
+  ],
 };
 
 /**

package/lib/commands/run.js

@@ -69,6 +69,174 @@ async function readLaunchArgs(projectDir, useProd) {
   }
 }
 
+/**
+ * Parse the project `.env` into a plain object.
+ * Supports KEY=VALUE lines; ignores comments and blank lines.
+ * Quotes around values are stripped. Missing file returns {}.
+ */
+async function loadEnvFile(projectDir) {
+  const envPath = path.join(projectDir, '.env');
+  if (!(await fs.pathExists(envPath))) return {};
+  const content = await fs.readFile(envPath, 'utf8');
+  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;
+}
+
+/**
+ * Decide whether the chosen device is a physical phone or a simulator/emulator.
+ * Returns one of: 'ios-simulator' | 'ios-device' | 'android-emulator' |
+ * 'android-device' | 'web' | 'desktop' | 'unknown'.
+ *
+ * When the user passes a generic `--ios`/`--android` shortcut we list devices
+ * and use the only matching one. With ambiguous matches we return
+ * 'ios-unknown' / 'android-unknown' so the caller can pick a safe default
+ * (test key) and warn the user.
+ */
+function classifyTargetDevice(projectDir, options, pickedDevice) {
+  if (options.web) return 'web';
+  if (pickedDevice) return classifyDevice(pickedDevice);
+
+  const devices = listFlutterDevices(projectDir);
+
+  if (options.device) {
+    const match = devices.find((d) => d.id === options.device || d.name === options.device);
+    return match ? classifyDevice(match) : 'unknown';
+  }
+
+  if (options.ios) {
+    const ios = devices.filter((d) => (d.targetPlatform || '').toLowerCase() === 'ios');
+    if (ios.length === 1) return classifyDevice(ios[0]);
+    return 'ios-unknown';
+  }
+  if (options.android) {
+    const android = devices.filter((d) => (d.targetPlatform || '').toLowerCase().startsWith('android'));
+    if (android.length === 1) return classifyDevice(android[0]);
+    return 'android-unknown';
+  }
+
+  // No flag, no picked device: flutter run picks the only device available.
+  // Use it to choose the right RC key when there's exactly one mobile device.
+  const mobile = devices.filter((d) => {
+    const p = (d.targetPlatform || '').toLowerCase();
+    return p === 'ios' || p.startsWith('android');
+  });
+  if (mobile.length === 1) return classifyDevice(mobile[0]);
+
+  return 'unknown';
+}
+
+/**
+ * Resolve which RC keys to inject given the .env contents, the classified
+ * device, and the requested mode ('auto' | 'test' | 'prod').
+ *
+ * Returns { android, ios, mode, warnings } where `mode` is 'test' or 'prod'
+ * (informational) and `warnings` is an array of human-readable strings.
+ *
+ * Behavior:
+ *   - 'test' mode → both keys = RC_TEST_KEY (or empty if missing).
+ *   - 'prod' mode → ios = RC_IOS_PROD_KEY, android = RC_ANDROID_PROD_KEY.
+ *     If either is missing we warn and fall back to RC_TEST_KEY for that one.
+ *   - 'auto' mode → infer from device class:
+ *       simulator/emulator/unknown → test
+ *       ios-device → prod for iOS define (fallback test), test for Android
+ *       android-device → prod for Android define (fallback test), test for iOS
+ *
+ * Legacy fallback: if .env has no RC_TEST_KEY / RC_*_PROD_KEY but has the
+ * old RC_ANDROID_API_KEY / RC_IOS_API_KEY, we honor those as-is so projects
+ * generated before the test/prod split keep working without manual migration.
+ */
+function resolveRcKeys(env, deviceClass, mode, t) {
+  const warnings = [];
+  const legacyAndroid = env.RC_ANDROID_API_KEY;
+  const legacyIos = env.RC_IOS_API_KEY;
+  const test = env.RC_TEST_KEY;
+  const iosProd = env.RC_IOS_PROD_KEY;
+  const androidProd = env.RC_ANDROID_PROD_KEY;
+
+  const hasNewKeys = !!(test || iosProd || androidProd);
+  if (!hasNewKeys && (legacyAndroid || legacyIos)) {
+    return {
+      android: legacyAndroid || '',
+      ios: legacyIos || '',
+      mode: 'legacy',
+      warnings,
+    };
+  }
+
+  const isSimulator = deviceClass === 'ios-simulator' || deviceClass === 'android-emulator';
+  const isIosDevice = deviceClass === 'ios-device';
+  const isAndroidDevice = deviceClass === 'android-device';
+
+  // Resolve effective mode.
+  let effectiveMode = mode;
+  if (mode === 'auto') {
+    effectiveMode = (isIosDevice || isAndroidDevice) ? 'prod' : 'test';
+  }
+
+  // Build android+ios.
+  let android;
+  let ios;
+
+  if (effectiveMode === 'test') {
+    android = test || '';
+    ios = test || '';
+  } else {
+    // prod mode — pick per platform, fall back to test if prod missing.
+    if (isIosDevice) {
+      ios = iosProd || test || '';
+      android = test || '';
+      if (!iosProd) {
+        warnings.push(t('run.rc.fallbackToTest', { platform: 'iOS', var: 'IOS_PROD_KEY' }));
+      }
+    } else if (isAndroidDevice) {
+      android = androidProd || test || '';
+      ios = test || '';
+      if (!androidProd) {
+        warnings.push(t('run.rc.fallbackToTest', { platform: 'Android', var: 'ANDROID_PROD_KEY' }));
+      }
+    } else {
+      // Forced --rc=prod with no clear device: try both prod keys, fall back to test.
+      ios = iosProd || test || '';
+      android = androidProd || test || '';
+      if (!iosProd && !androidProd && !test) {
+        warnings.push(t('run.rc.forcedProdMissing'));
+      }
+    }
+  }
+
+  return { android, ios, mode: effectiveMode, warnings };
+}
+
+/**
+ * Apply `replacements` to the dart-define list, replacing existing values
+ * for the same key. Returns a new array; never mutates the input.
+ */
+function overrideDartDefines(defines, replacements) {
+  const out = [];
+  const seen = new Set(Object.keys(replacements));
+  for (const def of defines) {
+    const m = def.match(/^--dart-define=([^=]+)=/);
+    if (m && seen.has(m[1])) continue;
+    out.push(def);
+  }
+  for (const [key, value] of Object.entries(replacements)) {
+    out.push(`--dart-define=${key}=${value}`);
+  }
+  return out;
+}
+
 async function runRun(directory, options = {}) {
   const t = createTranslator(options.language || detectDefaultLanguage());
   const projectDir = path.resolve(directory || '.');
@@ -82,6 +250,7 @@ async function runRun(directory, options = {}) {
   // bails out with "More than one device connected" otherwise.
   const deviceArgs = [];
   let resolvedDeviceLabel = null;
+  let pickedDevice = null;
   if (options.web) {
     deviceArgs.push('-d', 'chrome');
   } else if (options.ios) {
@@ -94,23 +263,45 @@ async function runRun(directory, options = {}) {
     const devices = listFlutterDevices(projectDir);
     if (devices.length > 1) {
       printCompactHeader(t);
-      const picked = await pickDevice(devices, t);
-      if (!picked) {
+      pickedDevice = await pickDevice(devices, t);
+      if (!pickedDevice) {
         console.log(kleur.yellow(`  ⚠  ${t('run.warn.nothingSelected')}`));
         return;
       }
-      deviceArgs.push('-d', picked.id);
-      resolvedDeviceLabel = `${picked.name} (${picked.id})`;
+      deviceArgs.push('-d', pickedDevice.id);
+      resolvedDeviceLabel = `${pickedDevice.name} (${pickedDevice.id})`;
     }
     // 0 or 1 device → let flutter handle it; it picks the only one or
     // prints its own "no devices" message.
   }
 
   // Read dart-defines from .vscode/launch.json (skip if --no-defines)
-  const dartDefines = options.noDefines
+  let dartDefines = options.noDefines
     ? []
     : await readLaunchArgs(projectDir, options.prod);
 
+  // Override RC keys based on device. We only touch RC_ANDROID_API_KEY /
+  // RC_IOS_API_KEY when the launch.json already declares them — that's the
+  // signal the project uses RevenueCat. Web defines (RC_WEB_API_KEY) aren't
+  // touched here; they're already a single key.
+  const usesRc = dartDefines.some(
+    (a) => a.startsWith('--dart-define=RC_ANDROID_API_KEY=') ||
+           a.startsWith('--dart-define=RC_IOS_API_KEY='),
+  );
+  let rcInfo = null;
+  if (usesRc && !options.web) {
+    const env = await loadEnvFile(projectDir);
+    const mode = (options.rc || 'auto').toLowerCase();
+    const deviceClass = classifyTargetDevice(projectDir, options, pickedDevice);
+    rcInfo = resolveRcKeys(env, deviceClass, mode, t);
+    if (rcInfo.mode !== 'legacy') {
+      dartDefines = overrideDartDefines(dartDefines, {
+        RC_ANDROID_API_KEY: rcInfo.android,
+        RC_IOS_API_KEY: rcInfo.ios,
+      });
+    }
+  }
+
   const args = ['run', ...deviceArgs, ...dartDefines];
 
   const envDefine = dartDefines.find((a) => a.startsWith('--dart-define=ENV='));
@@ -129,10 +320,21 @@ async function runRun(directory, options = {}) {
 
   printCompactHeader(t);
   console.log(kleur.bold(`${t('run.launching')}${summary}`));
+  if (rcInfo && rcInfo.mode !== 'legacy') {
+    const mode = (options.rc || 'auto').toLowerCase();
+    let label;
+    if (mode === 'test') label = t('run.rc.forcedTest');
+    else if (mode === 'prod') label = t('run.rc.forcedProd');
+    else label = rcInfo.mode === 'prod' ? t('run.rc.usingProd') : t('run.rc.usingTest');
+    console.log(kleur.dim(`  ✦ ${label}`));
+    for (const w of rcInfo.warnings) {
+      console.log(kleur.yellow(`  ⚠  ${w}`));
+    }
+  }
   console.log(kleur.dim(`  ✦ ${t('run.updateHint.prefix')} `) + kleur.cyan('kasy update') + kleur.dim(` ${t('run.updateHint.suffix')}\n`));
 
   try {
-    await spawnFlutterWithSpinner(args, projectDir, t);
+    await spawnFlutterWithSpinner(args, projectDir, t, { raw: Boolean(options.raw) });
   } catch (err) {
     if (err.code === 'ENOENT') {
       throw new Error(t('run.error.flutterNotFound'));

package/lib/commands/splash.js

@@ -5,7 +5,7 @@ const { exec } = require('node:child_process');
 const { promisify } = require('node:util');
 const kleur = require('kleur');
 const ui = require('../utils/ui');
-const { printCompactHeader } = require('../utils/brand');
+const { printCompactHeader, paintLime } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { writeAndroid12Variant } = require('../utils/png-padding');
 
@@ -117,7 +117,7 @@ async function runSplash(projectDir, options = {}) {
     }
   }
 
-  const inspectSpinner = ui.spinner();
+  const inspectSpinner = ui.spinner({ color: paintLime });
   inspectSpinner.start(t('splash.validating'));
 
   let lightInfo;
@@ -165,13 +165,13 @@ async function runSplash(projectDir, options = {}) {
   const destLightA12 = path.join(projectDir, ASSETS_DIR, LIGHT_ANDROID12_NAME);
   const destDarkA12 = path.join(projectDir, ASSETS_DIR, DARK_ANDROID12_NAME);
 
-  const copySpinner = ui.spinner();
+  const copySpinner = ui.spinner({ color: paintLime });
   copySpinner.start(t('splash.copying'));
   await fs.copy(lightPath, destLight, { overwrite: true });
   await fs.copy(darkPath, destDark, { overwrite: true });
   copySpinner.stop(t('splash.copied'));
 
-  const a12Spinner = ui.spinner();
+  const a12Spinner = ui.spinner({ color: paintLime });
   a12Spinner.start(t('splash.android12Generating'));
   await writeAndroid12Variant(destLight, destLightA12);
   await writeAndroid12Variant(destDark, destDarkA12);
@@ -183,7 +183,7 @@ async function runSplash(projectDir, options = {}) {
     return;
   }
 
-  const genSpinner = ui.spinner();
+  const genSpinner = ui.spinner({ color: paintLime });
   genSpinner.start(t('splash.generating'));
   const result = await runFlutterNativeSplash(projectDir);
   if (result.ok) {

package/lib/commands/update.js

@@ -7,7 +7,7 @@ const fs = require('fs-extra');
 const pkg = require('../../package.json');
 const kleur = require('kleur');
 const ui = require('../utils/ui');
-const { printCompactHeader } = require('../utils/brand');
+const { printCompactHeader, paintLime } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const {
   AVAILABLE_FEATURES,
@@ -185,7 +185,7 @@ async function runUpdate(module, options = {}) {
         }
       }
 
-      const spinner = ui.spinner();
+      const spinner = ui.spinner({ color: paintLime });
       spinner.start(t('update.applyingComponents'));
       try {
         const filesApplied = await applyBaseComponents(projectDir);
@@ -201,7 +201,7 @@ async function runUpdate(module, options = {}) {
       }
 
       {
-        const spinnerPubGet = ui.spinner();
+        const spinnerPubGet = ui.spinner({ color: paintLime });
         spinnerPubGet.start(t('update.pubGet'));
         try {
           await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
@@ -233,7 +233,7 @@ async function runUpdate(module, options = {}) {
         }
       }
 
-      const spinner = ui.spinner();
+      const spinner = ui.spinner({ color: paintLime });
       spinner.start(t('update.applyingCore'));
       try {
         const filesApplied = await applyCoreFiles(projectDir);
@@ -249,7 +249,7 @@ async function runUpdate(module, options = {}) {
       }
 
       {
-        const spinnerPubGet = ui.spinner();
+        const spinnerPubGet = ui.spinner({ color: paintLime });
         spinnerPubGet.start(t('update.pubGet'));
         try {
           await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
@@ -284,7 +284,7 @@ async function runUpdate(module, options = {}) {
           return;
         }
       }
-      const spinner = ui.spinner();
+      const spinner = ui.spinner({ color: paintLime });
       spinner.start(t('update.applying', { module: IOS_RELEASE_UPDATE_TARGET }));
       try {
         const { tokens, pathReplacements } = buildTokens({
@@ -345,7 +345,7 @@ async function runUpdate(module, options = {}) {
 
     // Re-apply patch
     {
-      const spinner = ui.spinner();
+      const spinner = ui.spinner({ color: paintLime });
       spinner.start(t('update.applying', { module: normalized }));
       try {
         const { tokens, pathReplacements } = buildTokens({
@@ -362,7 +362,7 @@ async function runUpdate(module, options = {}) {
 
     // flutter pub get
     {
-      const spinner = ui.spinner();
+      const spinner = ui.spinner({ color: paintLime });
       spinner.start(t('update.pubGet'));
       try {
         await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
@@ -374,7 +374,7 @@ async function runUpdate(module, options = {}) {
 
     // build_runner (only for modules that generate code)
     if (NEEDS_BUILD_RUNNER.includes(normalized)) {
-      const spinner = ui.timedSpinner();
+      const spinner = ui.timedSpinner({ color: paintLime });
       spinner.start(t('update.buildRunner'));
       try {
         await execAsync(

package/lib/scaffold/CHANGELOG.json

@@ -1,4 +1,27 @@
 {
+  "1.18.0": {
+    "modules": {
+      "components": {
+        "pt": "Novo KasyDatePicker (seleção de data com modo intervalo). KasyTabs redesenhado seguindo o Figma — espaçamento corrigido, transição suave (fade + slide) ao trocar de aba. KasyAvatar refatorado com gradientes estruturados (mais fácil de customizar).",
+        "en": "New KasyDatePicker (date selection with range mode). KasyTabs redesigned to match Figma — fixed spacing, smooth fade + slide transition when switching tabs. KasyAvatar refactored with structured gradients (easier to customize).",
+        "es": "Nuevo KasyDatePicker (selección de fecha con modo rango). KasyTabs rediseñado siguiendo el Figma — espaciado corregido, transición suave (fade + slide) al cambiar de pestaña. KasyAvatar refactorizado con gradientes estructurados (más fácil de personalizar)."
+      },
+      "widget": {
+        "pt": "Autor da citação agora aparece junto da quote no widget. Locale carregado sincronamente — corrige caso em que o widget abria em inglês mesmo com o app em pt/es por causa de race condition. Cores do widget Android passaram a vir de res/values/colors.xml (branding consistente, fácil de trocar). Layout do widget responde ao tamanho real (pequeno/médio/grande) sem cortar conteúdo.",
+        "en": "Quote author now appears alongside the quote in the widget. Locale loaded synchronously — fixes case where the widget opened in English even with the app in pt/es due to a race condition. Android widget colors now come from res/values/colors.xml (consistent branding, easy to swap). Widget layout responds to actual size (small/medium/large) without clipping content.",
+        "es": "El autor de la cita ahora aparece junto a la quote en el widget. Locale cargado sincrónicamente — corrige el caso en que el widget abría en inglés aunque la app estuviera en pt/es por una race condition. Los colores del widget Android ahora vienen de res/values/colors.xml (branding consistente, fácil de cambiar). El layout del widget responde al tamaño real (pequeño/mediano/grande) sin cortar contenido."
+      }
+    }
+  },
+  "1.17.0": {
+    "modules": {
+      "revenuecat": {
+        "pt": "kasy run agora detecta se você está rodando em simulador/emulador ou dispositivo físico e injeta a chave certa automaticamente. Três chaves no .env: RC_TEST_KEY (test_, simulador), RC_IOS_PROD_KEY (appl_, iPhone físico), RC_ANDROID_PROD_KEY (goog_, Android físico). Projetos antigos continuam funcionando — pra ganhar a separação, basta adicionar as 3 chaves no .env. Forçar manualmente: kasy run --rc=test ou --rc=prod.",
+        "en": "kasy run now detects whether you're on a simulator/emulator or a physical device and injects the right key automatically. Three keys in .env: RC_TEST_KEY (test_, simulator), RC_IOS_PROD_KEY (appl_, physical iPhone), RC_ANDROID_PROD_KEY (goog_, physical Android). Old projects keep working — to get the split, just add the 3 keys to .env. Force manually: kasy run --rc=test or --rc=prod.",
+        "es": "kasy run ahora detecta si estás corriendo en simulador/emulador o dispositivo físico e inyecta la clave correcta automáticamente. Tres claves en .env: RC_TEST_KEY (test_, simulador), RC_IOS_PROD_KEY (appl_, iPhone físico), RC_ANDROID_PROD_KEY (goog_, Android físico). Los proyectos antiguos siguen funcionando — para obtener el split, basta con agregar las 3 claves en .env. Forzar manualmente: kasy run --rc=test o --rc=prod."
+      }
+    }
+  },
   "1.13.0": {
     "modules": {
       "onboarding": {

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

@@ -32,8 +32,9 @@ Ficam no `.vscode/launch.json` como variáveis de ambiente de build (`--dart-def
 | Variável | Módulo | Como obter |
 |----------|--------|------------|
 | `BACKEND_URL` | API REST | URL da sua API |
-| `RC_ANDROID_API_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Android |
-| `RC_IOS_API_KEY` | RevenueCat | Dashboard RevenueCat → Apps → iOS |
+| `RC_TEST_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Test Store (chave `test_`, vale iOS+Android, usada automaticamente em simulador) |
+| `RC_IOS_PROD_KEY` | RevenueCat | Dashboard RevenueCat → Apps → App Store (chave `appl_`, usada automaticamente em iPhone físico) |
+| `RC_ANDROID_PROD_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Google Play (chave `goog_`, usada automaticamente em Android físico) |
 | `SENTRY_DSN` | Sentry | Dashboard Sentry → Projeto → DSN |
 | `MIXPANEL_TOKEN` | Mixpanel | Dashboard Mixpanel → Configurações → Token |
 

package/lib/scaffold/backends/firebase/enable-auth-via-cli.js

@@ -0,0 +1,108 @@
+/**
+ * Enable Firebase Auth providers using the official Firebase CLI flow:
+ *
+ *   1. Merge `firebase.json` with `auth.providers.{anonymous, emailPassword, googleSignIn}`
+ *   2. Run `firebase deploy --only auth --project <id>`
+ *
+ * Docs: https://firebase.google.com/docs/auth/configure-providers-cli
+ *
+ * This is the only documented way to activate Google Sign-In without manually
+ * clicking "Enable" in the Firebase Console: the deploy creates the OAuth 2.0
+ * Web Client automatically (same backend the Console hits internally).
+ */
+
+const path = require('node:path');
+const { promisify } = require('node:util');
+const execAsync = promisify(require('node:child_process').exec);
+const fs = require('fs-extra');
+
+const DEPLOY_TIMEOUT_MS = 5 * 60 * 1000; // 5 min — auth deploys are fast but allow slack
+
+async function getGcloudAccountEmail() {
+  try {
+    const { stdout } = await execAsync('gcloud config get-value account 2>/dev/null');
+    const email = (stdout || '').trim();
+    return email && email !== '(unset)' ? email : null;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Merge auth.providers into the project's firebase.json without touching
+ * other top-level keys (functions, firestore, storage, flutter, etc.).
+ */
+async function mergeAuthIntoFirebaseJson(projectDir, providers) {
+  const firebaseJsonPath = path.join(projectDir, 'firebase.json');
+  if (!(await fs.pathExists(firebaseJsonPath))) {
+    return { ok: false, error: 'firebase.json not found in project root' };
+  }
+  let config;
+  try {
+    config = await fs.readJson(firebaseJsonPath);
+  } catch (err) {
+    return { ok: false, error: `Failed to parse firebase.json: ${err.message}` };
+  }
+  config.auth = {
+    ...(config.auth || {}),
+    providers: {
+      ...(config.auth?.providers || {}),
+      ...providers,
+    },
+  };
+  await fs.writeJson(firebaseJsonPath, config, { spaces: 2 });
+  return { ok: true };
+}
+
+/**
+ * @param {object} options
+ * @param {string} options.projectDir
+ * @param {string} options.projectId
+ * @param {string} options.appName
+ * @param {string} [options.supportEmail] - falls back to active gcloud account
+ * @returns {{ ok: boolean, error?: string, supportEmail?: string }}
+ */
+async function enableAuthViaFirebaseCli({ projectDir, projectId, appName, supportEmail }) {
+  // 1. Resolve support email (required by Google's OAuth consent screen)
+  let email = (supportEmail || '').trim();
+  if (!email) email = await getGcloudAccountEmail();
+  if (!email) {
+    return {
+      ok: false,
+      error: 'support_email_required',
+    };
+  }
+
+  // 2. Merge firebase.json
+  const merge = await mergeAuthIntoFirebaseJson(projectDir, {
+    anonymous: true,
+    emailPassword: true,
+    googleSignIn: {
+      oAuthBrandDisplayName: appName,
+      supportEmail: email,
+    },
+  });
+  if (!merge.ok) return merge;
+
+  // 3. Deploy. --non-interactive prevents the CLI from prompting on edge cases.
+  const cmd = `firebase deploy --only auth --project ${projectId} --non-interactive`;
+  try {
+    await execAsync(cmd, { cwd: projectDir, timeout: DEPLOY_TIMEOUT_MS, maxBuffer: 10 * 1024 * 1024 });
+    return { ok: true, supportEmail: email };
+  } catch (err) {
+    const stderr = (err.stderr || '').toString();
+    const stdout = (err.stdout || '').toString();
+    return {
+      ok: false,
+      error: (stderr || err.message || '').slice(0, 800),
+      stdout: stdout.slice(0, 800),
+      supportEmail: email,
+    };
+  }
+}
+
+module.exports = {
+  enableAuthViaFirebaseCli,
+  getGcloudAccountEmail,
+  mergeAuthIntoFirebaseJson,
+};

package/lib/scaffold/backends/firebase/setup-from-scratch.js

@@ -689,6 +689,8 @@ async function enableAuthProviders(projectId, { maxRetries = 3, retryDelayMs = 1
           enabled: true,
         }),
       });
+      let googleEnabled = false;
+      let googleSignInSkipped = false;
       if (!googleRes.ok) {
         const googleText = await googleRes.text();
         // 409 = already exists — update it to ensure it's enabled.
@@ -703,13 +705,49 @@ async function enableAuthProviders(projectId, { maxRetries = 3, retryDelayMs = 1
             },
             body: JSON.stringify({ enabled: true }),
           });
-          return { ok: true };
+          googleEnabled = true;
+        } else {
+          // 400 INVALID_CONFIG (client_id empty) = no OAuth client created yet.
+          // Email/Password and Anonymous are already enabled — just mark Google as skipped.
+          googleSignInSkipped = true;
         }
-        // 400 INVALID_CONFIG (client_id empty) = no OAuth client created yet.
-        // Email/Password and Anonymous are already enabled — just skip Google.
-        return { ok: true, googleSignInSkipped: true };
+      } else {
+        googleEnabled = true;
       }
-      return { ok: true };
+
+      // Step 4: Apple Sign-In (best effort). Apple requires Service ID + JWT client secret
+      // that we cannot generate without the user's Apple Developer credentials, but the
+      // provider entry itself can be created so the Console shows the row ready for the
+      // user to fill in when they ship to iOS. Failure here is silent.
+      const appleUrl = `https://identitytoolkit.googleapis.com/admin/v2/projects/${projectId}/defaultSupportedIdpConfigs?idpId=apple.com`;
+      let appleEnabled = false;
+      try {
+        const appleRes = await fetch(appleUrl, {
+          method: 'POST',
+          headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+            'X-Goog-User-Project': projectId,
+          },
+          body: JSON.stringify({
+            name: `projects/${projectId}/defaultSupportedIdpConfigs/apple.com`,
+            enabled: true,
+          }),
+        });
+        if (appleRes.ok) {
+          appleEnabled = true;
+        } else {
+          const appleText = await appleRes.text();
+          if (appleRes.status === 409 || appleText.includes('ALREADY_EXISTS')) {
+            appleEnabled = true;
+          }
+          // Any other failure is non-fatal — Apple is a nice-to-have.
+        }
+      } catch (_) {
+        // Network error — skip silently.
+      }
+
+      return { ok: true, googleSignInSkipped, googleEnabled, appleEnabled };
     }
     const text = await res.text();
     lastError = `${res.status}: ${text}`;
@@ -766,6 +804,7 @@ async function setupFromScratch(appName, bundleId, options = {}) {
       error: `Project created but billing link failed: ${shortError}. Manage projects: ${manageLink}`,
       projectId,
       billingFailed: true,
+      billingQuotaError: isQuota,
       billingManualLink: manageLink,
     };
   }

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

@@ -68,8 +68,9 @@ Ficam no `.vscode/launch.json` como variáveis de ambiente de build (`--dart-def
 |----------|--------|------------|
 | `BACKEND_URL` | Supabase | Dashboard Supabase → Project Settings → API → Project URL |
 | `SUPABASE_TOKEN` | Supabase | Dashboard Supabase → Project Settings → API → anon key |
-| `RC_ANDROID_API_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Android |
-| `RC_IOS_API_KEY` | RevenueCat | Dashboard RevenueCat → Apps → iOS |
+| `RC_TEST_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Test Store (chave `test_`, vale iOS+Android, usada automaticamente em simulador) |
+| `RC_IOS_PROD_KEY` | RevenueCat | Dashboard RevenueCat → Apps → App Store (chave `appl_`, usada automaticamente em iPhone físico) |
+| `RC_ANDROID_PROD_KEY` | RevenueCat | Dashboard RevenueCat → Apps → Google Play (chave `goog_`, usada automaticamente em Android físico) |
 | `SENTRY_DSN` | Sentry | Dashboard Sentry → Projeto → DSN |
 | `MIXPANEL_TOKEN` | Mixpanel | Dashboard Mixpanel → Configurações → Token |