kasy-cli 1.15.0 → 1.17.0

package/bin/kasy.js

@@ -346,6 +346,7 @@ function buildProgram(language) {
       .option('-d, --device <id>', 'Run on specific device ID')
       .option('--prod', 'Use production dart-defines (from launch.json)')
       .option('--no-defines', 'Skip dart-defines from launch.json')
+      .option('--rc <mode>', 'RevenueCat key mode: auto (default — picks by device), test, or prod')
       .description(t('cli.command.run.description'))
       .action(async (directory, options) => {
         await runRun(directory, { language, ...options });

package/lib/commands/add.js

@@ -24,7 +24,7 @@ function findBaseDisplayName(id) {
 
 const KASY_AUDIENCE = process.env.KASY_INTERNAL === '1' ? 'internal' : 'public';
 const { applyPatch } = require('../scaffold/engine');
-const { writeRouter, writeNoOpAnalyticsApi, writeNoOpTrackingApi, writeNoOpAdminHomeWidgets, writeNoOpFeatureRequestRepository, writeMainDart, addPubspecDep, localizeReleaseDocs } = require('../scaffold/shared/generator-utils');
+const { writeRouter, writeNoOpAnalyticsApi, writeNoOpTrackingApi, writeNoOpAdminHomeWidgets, writeNoOpFeatureRequestRepository, writeMainDart, addPubspecDep, localizeReleaseDocs, resolveDefaultRcKeys } = require('../scaffold/shared/generator-utils');
 const { toPackageName, buildTokens } = require('../scaffold/backends/firebase/tokens');
 
 const execAsync = promisify(exec);
@@ -217,6 +217,14 @@ function applyKitSetupFlag(config, module, answers) {
     case 'revenuecat':
       config.subscriptionModule = true;
       if (answers.revenuecatWeb) config.revenuecatWeb = true;
+      // Track which RC keys the user configured so `kasy doctor` can warn
+      // about release readiness without re-reading .env. Booleans only — we
+      // never persist the key values themselves to kit_setup.json.
+      config.revenuecatKeys = {
+        test: !!(answers.rcTestKey && answers.rcTestKey.trim()),
+        iosProd: !!(answers.rcIosProdKey && answers.rcIosProdKey.trim()),
+        androidProd: !!(answers.rcAndroidProdKey && answers.rcAndroidProdKey.trim()),
+      };
       break;
     case 'onboarding':
       config.withOnboarding = true;
@@ -263,14 +271,18 @@ const MODULE_META = {
     pubspecDeps: { 'facebook_app_events': '^0.24.0', 'flutter_facebook_auth': '^7.1.5' },
   },
   revenuecat: {
-    promptKeys: ['rcAndroidKey', 'rcIosKey'],
-    defineUpdates: (a) => ({
-      RC_ANDROID_API_KEY: a.rcAndroidKey || 'YOUR_REVENUECAT_ANDROID_KEY',
-      RC_IOS_API_KEY: a.rcIosKey || 'YOUR_REVENUECAT_IOS_KEY',
-    }),
+    promptKeys: ['rcTestKey', 'rcIosProdKey', 'rcAndroidProdKey'],
+    defineUpdates: (a) => {
+      const { android, ios } = resolveDefaultRcKeys(a);
+      return {
+        RC_ANDROID_API_KEY: android,
+        RC_IOS_API_KEY: ios,
+      };
+    },
     envLines: (a) => [
-      `RC_ANDROID_API_KEY=${a.rcAndroidKey || 'YOUR_REVENUECAT_ANDROID_KEY'}`,
-      `RC_IOS_API_KEY=${a.rcIosKey || 'YOUR_REVENUECAT_IOS_KEY'}`,
+      `RC_TEST_KEY=${(a.rcTestKey || '').trim()}`,
+      `RC_IOS_PROD_KEY=${(a.rcIosProdKey || '').trim()}`,
+      `RC_ANDROID_PROD_KEY=${(a.rcAndroidProdKey || '').trim()}`,
     ],
     featureFlag: null,
     pubspecDeps: {},
@@ -337,12 +349,33 @@ const PROMPT_QUESTIONS = {
     onCancel: cancel,
   }),
   // RevenueCat SDK keys ship inside the client binary — not real secrets, plain text input.
-  rcAndroidKey: (t, cancel) => ui.text({
-    message: t('add.prompt.rcAndroidKey'),
+  // Three optional keys: test_ (covers iOS+Android in simulator), appl_ (iOS prod), goog_ (Android prod).
+  // kasy run picks the right one based on the device at launch time.
+  rcTestKey: (t, cancel) => ui.text({
+    message: t('add.prompt.rcTestKey'),
+    validate: (v) => {
+      const s = (v || '').trim();
+      if (!s) return undefined;
+      return /^test_/.test(s) ? undefined : t('new.firebase.q.revenuecat.test.invalid');
+    },
+    onCancel: cancel,
+  }),
+  rcIosProdKey: (t, cancel) => ui.text({
+    message: t('add.prompt.rcIosProdKey'),
+    validate: (v) => {
+      const s = (v || '').trim();
+      if (!s) return undefined;
+      return /^appl_/.test(s) ? undefined : t('new.firebase.q.revenuecat.iosProd.invalid');
+    },
     onCancel: cancel,
   }),
-  rcIosKey: (t, cancel) => ui.text({
-    message: t('add.prompt.rcIosKey'),
+  rcAndroidProdKey: (t, cancel) => ui.text({
+    message: t('add.prompt.rcAndroidProdKey'),
+    validate: (v) => {
+      const s = (v || '').trim();
+      if (!s) return undefined;
+      return /^goog_/.test(s) ? undefined : t('new.firebase.q.revenuecat.androidProd.invalid');
+    },
     onCancel: cancel,
   }),
   llmProvider: (t, cancel) => ui.select({

package/lib/commands/doctor.js

@@ -175,14 +175,45 @@ async function runRevenueCatChecks(projectDir, t, config) {
   const rc = await validateRevenueCat(projectDir, config);
   if (rc.skipped) return;
 
-  if (!rc.iosEmpty && !rc.androidEmpty) {
-    ui.log.success(t('doctor.revenuecat.keysOk'));
+  if (rc.legacy) {
+    // Project predates the test/prod split — show the old summary.
+    if (!rc.iosEmpty && !rc.androidEmpty) {
+      ui.log.success(t('doctor.revenuecat.keysOk'));
+    } else {
+      ui.log.warn(t('doctor.revenuecat.keysEmpty'));
+    }
+    if (rc.bothTest) {
+      ui.log.warn(t('doctor.revenuecat.keysTest'));
+    }
   } else {
-    ui.log.warn(t('doctor.revenuecat.keysEmpty'));
-  }
+    // New 3-key scheme. One line per key with granular status.
+    if (rc.testOk) {
+      ui.log.success(t('doctor.revenuecat.testKeyOk'));
+    } else if (rc.testBadPrefix) {
+      ui.log.warn(t('doctor.revenuecat.prefixMismatch', { key: 'RC_TEST_KEY', expected: 'test_' }));
+    } else {
+      ui.log.warn(t('doctor.revenuecat.testKeyMissing'));
+    }
 
-  if (rc.bothTest) {
-    ui.log.warn(t('doctor.revenuecat.keysTest'));
+    if (rc.iosProdOk) {
+      ui.log.success(t('doctor.revenuecat.iosProdOk'));
+    } else if (rc.iosProdBadPrefix) {
+      ui.log.warn(t('doctor.revenuecat.prefixMismatch', { key: 'RC_IOS_PROD_KEY', expected: 'appl_' }));
+    } else {
+      ui.log.message(kleur.dim(`– ${t('doctor.revenuecat.iosProdMissing')}`));
+    }
+
+    if (rc.androidProdOk) {
+      ui.log.success(t('doctor.revenuecat.androidProdOk'));
+    } else if (rc.androidProdBadPrefix) {
+      ui.log.warn(t('doctor.revenuecat.prefixMismatch', { key: 'RC_ANDROID_PROD_KEY', expected: 'goog_' }));
+    } else {
+      ui.log.message(kleur.dim(`– ${t('doctor.revenuecat.androidProdMissing')}`));
+    }
+
+    if (rc.onlyTest) {
+      ui.log.warn(t('doctor.revenuecat.keysTest'));
+    }
   }
 
   if (rc.webhookUrl) {

package/lib/commands/icon.js

@@ -7,11 +7,17 @@ const ui = require('../utils/ui');
 const { printCompactHeader } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { inspectPng } = require('./splash');
+const {
+  writeAndroidAdaptiveBackground,
+  writeTransparentSquare,
+} = require('../utils/png-padding');
 
 const execAsync = promisify(exec);
 
 const ASSETS_DIR = path.join('assets', 'images');
 const ICON_NAME = 'icon.png';
+const ANDROID_BG_NAME = 'icon_android.png';
+const ANDROID_FG_EMPTY_NAME = 'icon_foreground_empty.png';
 
 async function assertKasyProject(projectDir, t) {
   const kitSetupPath = path.join(projectDir, 'kit_setup.json');
@@ -85,13 +91,35 @@ async function runIcon(projectDir, options = {}) {
     ui.note(warnings.map((w) => `${kleur.yellow('⚠')} ${w}`).join('\n'), t('icon.warn.title'));
   }
 
-  const dest = path.join(projectDir, ASSETS_DIR, ICON_NAME);
+  const assetsDir = path.join(projectDir, ASSETS_DIR);
+  const dest = path.join(assetsDir, ICON_NAME);
+  const androidBgDest = path.join(assetsDir, ANDROID_BG_NAME);
+  const androidFgEmptyDest = path.join(assetsDir, ANDROID_FG_EMPTY_NAME);
 
   const copySpinner = ui.spinner();
   copySpinner.start(t('icon.copying'));
   await fs.copy(imagePath, dest, { overwrite: true });
   copySpinner.stop(t('icon.copied'));
 
+  const adaptiveSpinner = ui.spinner();
+  adaptiveSpinner.start(t('icon.adaptive.generating'));
+  let adaptiveInfo;
+  try {
+    adaptiveInfo = await writeAndroidAdaptiveBackground(dest, androidBgDest);
+    if (!(await fs.pathExists(androidFgEmptyDest))) {
+      await writeTransparentSquare(androidFgEmptyDest);
+    }
+    adaptiveSpinner.stop(t('icon.adaptive.generated'));
+  } catch (err) {
+    adaptiveSpinner.stop(`⚠ ${t('icon.adaptive.failed')}`);
+    ui.log.message(kleur.dim(err.message || String(err)));
+    process.exit(1);
+  }
+
+  if (!adaptiveInfo.color.sampled) {
+    ui.note(t('icon.adaptive.fallbackColor'), t('icon.adaptive.fallbackTitle'));
+  }
+
   if (options.skipGenerate) {
     ui.note(t('icon.skipGenerate.hint'), t('icon.skipGenerate.title'));
     ui.outro(t('icon.done'));

package/lib/commands/new.js

@@ -1192,16 +1192,42 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   const moduleAnswers = {};
 
   if (modules.includes('revenuecat')) {
-    moduleAnswers.rcAndroidKey = await ui.text({
-      message: tr('new.firebase.q.revenuecat.android'),
-      validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.revenuecat.android.required')),
+    // Three keys, all optional, but we require at least one. The kasy run
+    // command picks the right key based on the device:
+    //   simulator/emulator → RC_TEST_KEY
+    //   physical iOS       → RC_IOS_PROD_KEY (falls back to test if missing)
+    //   physical Android   → RC_ANDROID_PROD_KEY (falls back to test if missing)
+    moduleAnswers.rcTestKey = ((await ui.text({
+      message: tr('new.firebase.q.revenuecat.test'),
+      validate: (v) => {
+        const s = (v || '').trim();
+        if (!s) return undefined;
+        return /^test_/.test(s) ? undefined : tr('new.firebase.q.revenuecat.test.invalid');
+      },
       onCancel: cancel,
-    });
-    moduleAnswers.rcIosKey = await ui.text({
-      message: tr('new.firebase.q.revenuecat.ios'),
-      validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.revenuecat.ios.required')),
+    })) || '').trim();
+    moduleAnswers.rcIosProdKey = ((await ui.text({
+      message: tr('new.firebase.q.revenuecat.iosProd'),
+      validate: (v) => {
+        const s = (v || '').trim();
+        if (!s) return undefined;
+        return /^appl_/.test(s) ? undefined : tr('new.firebase.q.revenuecat.iosProd.invalid');
+      },
       onCancel: cancel,
-    });
+    })) || '').trim();
+    moduleAnswers.rcAndroidProdKey = ((await ui.text({
+      message: tr('new.firebase.q.revenuecat.androidProd'),
+      validate: (v) => {
+        const s = (v || '').trim();
+        if (!s) return undefined;
+        return /^goog_/.test(s) ? undefined : tr('new.firebase.q.revenuecat.androidProd.invalid');
+      },
+      onCancel: cancel,
+    })) || '').trim();
+    if (!moduleAnswers.rcTestKey && !moduleAnswers.rcIosProdKey && !moduleAnswers.rcAndroidProdKey) {
+      // Non-blocking: user can fill .env later. Just warn so they're not surprised.
+      ui.log.warn(tr('new.firebase.q.revenuecat.atLeastOne'));
+    }
     moduleAnswers.defaultPaywall = await ui.select({
       message: tr('new.firebase.q.paywall'),
       initialValue: 'basic',

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

@@ -1,10 +1,52 @@
 const path = require('node:path');
+const { spawnSync } = require('node:child_process');
 const fs = require('fs-extra');
 const kleur = require('kleur');
+const ui = require('../utils/ui');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { printCompactHeader } = require('../utils/brand');
 const { spawnFlutterWithSpinner } = require('../utils/flutter-run');
 
+function listFlutterDevices(projectDir) {
+  const res = spawnSync('flutter', ['devices', '--machine'], {
+    cwd: projectDir,
+    encoding: 'utf8',
+  });
+  if (res.status !== 0) return [];
+  try {
+    const parsed = JSON.parse(res.stdout);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+
+function classifyDevice(device) {
+  const platform = (device.targetPlatform || '').toLowerCase();
+  if (platform === 'ios') return device.emulator ? 'ios-simulator' : 'ios-device';
+  if (platform.startsWith('android')) {
+    return device.emulator ? 'android-emulator' : 'android-device';
+  }
+  if (platform.startsWith('web')) return 'web';
+  if (platform.startsWith('darwin')) return 'macos';
+  if (platform.startsWith('linux')) return 'linux';
+  if (platform.startsWith('windows')) return 'windows';
+  return 'unknown';
+}
+
+async function pickDevice(devices, t) {
+  if (devices.length === 0) return null;
+  if (devices.length === 1) return devices[0];
+  const choice = await ui.select({
+    message: t('run.prompt.pickDevice'),
+    options: devices.map((d) => ({
+      value: d.id,
+      label: `${d.name} ${kleur.dim(`(${classifyDevice(d)})`)}`,
+    })),
+  });
+  return devices.find((d) => d.id === choice) || null;
+}
+
 /**
  * Read dart-define args from .vscode/launch.json.
  * Returns the args array from the matching config (dev or prod).
@@ -27,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 || '.');
@@ -35,8 +245,12 @@ async function runRun(directory, options = {}) {
     throw new Error(t('run.error.notFlutterProject'));
   }
 
-  // Resolve device flag
+  // Resolve device flag. If none of the platform shortcuts or -d is set,
+  // ask the user when more than one device is available — `flutter run`
+  // 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) {
@@ -45,13 +259,49 @@ async function runRun(directory, options = {}) {
     deviceArgs.push('-d', 'android');
   } else if (options.device) {
     deviceArgs.push('-d', options.device);
+  } else {
+    const devices = listFlutterDevices(projectDir);
+    if (devices.length > 1) {
+      printCompactHeader(t);
+      pickedDevice = await pickDevice(devices, t);
+      if (!pickedDevice) {
+        console.log(kleur.yellow(`  ⚠  ${t('run.warn.nothingSelected')}`));
+        return;
+      }
+      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='));
@@ -62,7 +312,7 @@ async function runRun(directory, options = {}) {
     ? 'ios'
     : options.android
     ? 'android'
-    : options.device || null;
+    : options.device || resolvedDeviceLabel || null;
   const summaryParts = [];
   if (envValue) summaryParts.push(`ENV=${envValue}`);
   if (deviceLabel) summaryParts.push(`device: ${deviceLabel}`);
@@ -70,6 +320,17 @@ 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 {

package/lib/scaffold/CHANGELOG.json

@@ -1,4 +1,13 @@
 {
+  "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/api/pubspec.yaml.tpl

@@ -98,6 +98,8 @@ flutter_launcher_icons:
   android: ic_launcher
   ios: true
   remove_alpha_ios: true
+  adaptive_icon_background: assets/images/icon_android.png
+  adaptive_icon_foreground: assets/images/icon_foreground_empty.png
   web:
     generate: true
     image_path: assets/images/favicon.png

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 |
 

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

@@ -100,6 +100,8 @@ flutter_launcher_icons:
   android: ic_launcher
   ios: true
   remove_alpha_ios: true
+  adaptive_icon_background: assets/images/icon_android.png
+  adaptive_icon_foreground: assets/images/icon_foreground_empty.png
   web:
     generate: true
     image_path: assets/images/favicon.png