kasy-cli 1.13.0 → 1.15.0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/lib/utils/apple-release.js

@@ -5,7 +5,7 @@ const fs = require('fs-extra');
 const os = require('node:os');
 const kleur = require('kleur');
 const ui = require('./ui');
-const { exec } = require('node:child_process');
+const { exec, spawn } = require('node:child_process');
 const { promisify } = require('node:util');
 
 const execAsync = promisify(exec);
@@ -43,6 +43,27 @@ async function isKasyFlutterProject(projectDir) {
 }
 
 async function readBundleId(projectDir) {
+  // Source of truth is the Xcode project file — what the build actually uses
+  // when installing on a device. kit_setup.json can drift if the user renames
+  // the bundle id manually after `kasy new`, so it's only used as a fallback
+  // when the iOS project hasn't been generated yet.
+  const pbxPath = path.join(projectDir, 'ios', 'Runner.xcodeproj', 'project.pbxproj');
+  if (await fs.pathExists(pbxPath)) {
+    const content = await fs.readFile(pbxPath, 'utf8');
+    // Match the main target only — skip Widget/NotificationService extensions
+    // by picking the first identifier that doesn't contain a dot extension.
+    const matches = [...content.matchAll(/PRODUCT_BUNDLE_IDENTIFIER = ([^;]+);/g)];
+    for (const m of matches) {
+      const id = m[1].trim().replace(/"/g, '');
+      if (
+        !id.endsWith('.HomeWidgetExtension') &&
+        !id.endsWith('.NotificationService')
+      ) {
+        return id;
+      }
+    }
+    if (matches[0]) return matches[0][1].trim().replace(/"/g, '');
+  }
   const kitSetupPath = path.join(projectDir, 'kit_setup.json');
   if (await fs.pathExists(kitSetupPath)) {
     try {
@@ -52,12 +73,6 @@ async function readBundleId(projectDir) {
       // ignore
     }
   }
-  const pbxPath = path.join(projectDir, 'ios', 'Runner.xcodeproj', 'project.pbxproj');
-  if (await fs.pathExists(pbxPath)) {
-    const content = await fs.readFile(pbxPath, 'utf8');
-    const m = content.match(/PRODUCT_BUNDLE_IDENTIFIER = ([^;]+);/);
-    if (m) return m[1].trim().replace(/"/g, '');
-  }
   return null;
 }
 
@@ -170,6 +185,18 @@ const XCODE_CACHE_ERROR_PATTERNS = [
   /clang: error: no such file or directory:.*\.swiftmodule/i,
 ];
 
+const POD_NETWORK_ERROR_PATTERNS = [
+  /curl:\s*\(6\)/i,
+  /curl:\s*\(7\)/i,
+  /curl:\s*\(28\)/i,
+  /curl:\s*\(35\)/i,
+  /curl:\s*\(56\)/i,
+  /Connection reset by peer/i,
+  /Could not resolve host/i,
+  /Network is unreachable/i,
+  /Operation timed out/i,
+];
+
 async function getFreeDiskGb(checkPath) {
   if (process.platform !== 'darwin' && process.platform !== 'linux') {
     return null;
@@ -201,6 +228,11 @@ function isXcodeCacheBuildError(output) {
   return XCODE_CACHE_ERROR_PATTERNS.some((re) => re.test(text));
 }
 
+function isPodNetworkError(output) {
+  const text = String(output || '');
+  return POD_NETWORK_ERROR_PATTERNS.some((re) => re.test(text));
+}
+
 function printBuildFailureHints(t, projectDir) {
   const name = path.basename(projectDir);
   const cleanArg = projectDir !== process.cwd() ? ` ${projectDir}` : '';
@@ -220,6 +252,17 @@ function printBuildFailureHints(t, projectDir) {
   ui.note(lines.join('\n'), t('ios.hints.title'));
 }
 
+function printPodNetworkHints(t) {
+  const lines = [
+    t('ios.hints.network.body'),
+    '',
+    `1. ${t('ios.hints.network.step1')}`,
+    `2. ${t('ios.hints.network.step2')}: ${kleur.cyan('kasy ios')}`,
+    `3. ${t('ios.hints.network.step3')}: ${kleur.cyan('kasy ios clean')}`,
+  ];
+  ui.note(lines.join('\n'), t('ios.hints.network.title'));
+}
+
 async function runIosClean(projectDir, t) {
   const steps = [
     { label: t('ios.clean.step.flutterClean'), cmd: 'flutter clean' },
@@ -247,15 +290,69 @@ async function runReleaseScript(projectDir, args, t) {
   if (!(await fs.pathExists(scriptPath))) {
     throw new Error(t('ios.error.noScript'));
   }
-  const cmd = `bash "${scriptPath}" ${args.join(' ')}`.trim();
-  try {
-    await execAsync(cmd, { cwd: projectDir, maxBuffer: 50 * 1024 * 1024 });
-  } catch (err) {
-    const output = [err.stdout, err.stderr, err.message].filter(Boolean).join('\n');
-    const error = new Error(output || err.message);
-    error.buildOutput = output;
-    throw error;
-  }
+
+  const isBuildOnly = args.includes('--no-upload');
+  const titleKey = isBuildOnly ? 'ios.build.task.building' : 'ios.release.task.building';
+  const doneKey = isBuildOnly ? 'ios.build.task.done' : 'ios.release.task.done';
+  const failKey = isBuildOnly ? 'ios.build.task.failed' : 'ios.release.task.failed';
+
+  const spinner = ui.timedSpinner();
+  spinner.start(t(titleKey));
+
+  return new Promise((resolve, reject) => {
+    const proc = spawn('bash', [scriptPath, ...args], {
+      cwd: projectDir,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    let allOutput = '';
+    let uploadStage = false;
+
+    // Trim noise so the spinner message stays readable. Skip empty lines,
+    // pure dotted progress bars (e.g. "....."), and lines that are just
+    // separators. Show the last meaningful line as the spinner status.
+    const isMeaningful = (line) => {
+      if (!line) return false;
+      if (/^[.\s]+$/.test(line)) return false;
+      if (/^=+$/.test(line)) return false;
+      return true;
+    };
+
+    const handleChunk = (chunk) => {
+      const text = chunk.toString();
+      allOutput += text;
+
+      if (!uploadStage && /Uploading to App Store Connect/i.test(text)) {
+        uploadStage = true;
+        spinner.message(t('ios.release.task.uploading'));
+        return;
+      }
+
+      const lines = text.split('\n').map((l) => l.replace(/\r/g, '').trim()).filter(isMeaningful);
+      const lastLine = lines[lines.length - 1];
+      if (lastLine) spinner.message(lastLine);
+    };
+
+    proc.stdout.on('data', handleChunk);
+    proc.stderr.on('data', handleChunk);
+
+    proc.on('close', (code) => {
+      if (code === 0) {
+        spinner.stop(t(doneKey));
+        resolve();
+      } else {
+        spinner.stop(t(failKey), 2);
+        const error = new Error(allOutput || `release script exited with code ${code}`);
+        error.buildOutput = allOutput;
+        reject(error);
+      }
+    });
+
+    proc.on('error', (err) => {
+      spinner.stop(t(failKey), 2);
+      reject(err);
+    });
+  });
 }
 
 module.exports = {
@@ -280,6 +377,8 @@ module.exports = {
   getFreeDiskGb,
   checkDiskSpaceForIosBuild,
   isXcodeCacheBuildError,
+  isPodNetworkError,
   printBuildFailureHints,
+  printPodNetworkHints,
   runIosClean,
 };

package/lib/utils/checks.js

@@ -1,13 +1,10 @@
 const { exec } = require('node:child_process');
 const { promisify } = require('node:util');
-const readline = require('node:readline');
 const kleur = require('kleur');
-const oraPackage = require('ora');
 const ui = require('./ui');
 const { createTranslator, detectDefaultLanguage } = require('./i18n');
 
 const execAsync = promisify(exec);
-const ora = oraPackage.default || oraPackage;
 
 // Timeout para verificar se uma ferramenta está instalada (15 s é mais que suficiente)
 const TOOL_CHECK_TIMEOUT = 15_000;
@@ -19,19 +16,6 @@ const MIN_NODE_VERSION = '18.0.0';
 const MIN_FLUTTER_VERSION = '3.24.0';
 const MIN_DART_VERSION = '3.5.0';
 
-/**
- * Compare two semver strings. Returns true if actual >= required.
- */
-function meetsMinVersion(actual, required) {
-  if (!actual || !required) return true;
-  const parse = (v) => v.replace(/[^0-9.]/g, '').split('.').map(Number);
-  const [aMaj, aMin, aPat = 0] = parse(actual);
-  const [rMaj, rMin, rPat = 0] = parse(required);
-  if (aMaj !== rMaj) return aMaj > rMaj;
-  if (aMin !== rMin) return aMin > rMin;
-  return aPat >= rPat;
-}
-
 const BASE_CHECKS = [
   {
     name: 'Node.js',
@@ -106,7 +90,7 @@ const FIREBASE_CHECKS = [
     command: 'gcloud --version',
     required: false,
     failHint: getGcloudInstallHint(),
-    waitPrompt: 'Após instalar o gcloud, pressione Enter para verificar novamente...',
+    waitPromptKey: 'checks.waitPrompt.gcloud.install',
   },
   {
     name: 'gcloud auth (create-from-scratch)',
@@ -114,7 +98,7 @@ const FIREBASE_CHECKS = [
     required: false,
     showVersion: false,
     failHint: 'gcloud auth login',
-    waitPrompt: 'Após fazer login com gcloud auth login, pressione Enter para verificar...',
+    waitPromptKey: 'checks.waitPrompt.gcloud.auth',
   },
 ];
 
@@ -175,128 +159,71 @@ function extractVersion(stdout, checkName) {
   return m ? m[0] : raw.slice(0, 20);
 }
 
-/**
- * Wait for the user to press Enter in the terminal.
- * Used to pause the flow so the user can install something or authenticate.
- */
-function waitForUserInput(prompt) {
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const done = () => { rl.close(); resolve(); };
-    rl.question(`\n  ${kleur.cyan(prompt)}\n  `, done);
-    rl.on('close', resolve);
-    rl.on('error', resolve);
-  });
-}
-
 async function runSingleCheck(check, options = {}) {
   const showVersion = check.showVersion !== undefined ? check.showVersion : (options.showVersion !== undefined ? options.showVersion : true);
-  const silent = options.silent === true;
-  const t = check.t || createTranslator(check.language || detectDefaultLanguage());
-  const spinner = silent ? null : ora(t('checks.checking', { name: check.name })).start();
   let autoInstallFailed = false;
 
   try {
     const { stdout } = await execAsync(check.command, { encoding: 'utf8', timeout: TOOL_CHECK_TIMEOUT });
     const version = showVersion ? extractVersion(stdout, check.name) : null;
-    const msg = version
-      ? t('checks.foundWithVersion', { name: check.name, version })
-      : t('checks.found', { name: check.name });
-
-    if (!silent) {
-      // Warn if version is below minimum requirement
-      if (version && check.minVersion && !meetsMinVersion(version, check.minVersion)) {
-        spinner.warn(`${msg} ${kleur.yellow(`(mínimo recomendado: ${check.minVersion})`)}`);
-      } else {
-        spinner.succeed(msg);
-      }
-    }
     return { ...check, ok: true, version: version || null };
   } catch (err) {
     const diagnosis = diagnoseFailure(err);
     if (check.tryInstall) {
-      if (!silent) spinner.text = t(check.tryInstallMessageKey || 'setup.flutterfire.installing');
       try {
         await execAsync(check.tryInstall, { encoding: 'utf8', timeout: INSTALL_TIMEOUT });
         const { stdout: retryOut } = await execAsync(check.retryCommand || check.command, { encoding: 'utf8', timeout: TOOL_CHECK_TIMEOUT });
         const version = showVersion ? extractVersion(retryOut, check.name) : null;
-        const msg = version
-          ? t('checks.foundWithVersion', { name: check.name, version: version || 'installed' })
-          : t('checks.found', { name: check.name });
-        if (!silent) spinner.succeed(msg);
         return { ...check, ok: true, version: version || null };
       } catch {
         autoInstallFailed = true;
       }
     }
-
-    // Guided interactive prompt: show instructions and wait for the user to act.
-    if (check.waitPrompt && !silent) {
-      spinner.stop();
-      if (check.failHint) {
-        console.log(kleur.yellow(`\n  ⚠  ${check.name} não encontrado.\n`));
-        console.log(kleur.bold('  Execute:\n'));
-        console.log(kleur.cyan(`    ${check.failHint}\n`));
-      }
-      await waitForUserInput(check.waitPrompt);
-      try {
-        const { stdout: retryOut } = await execAsync(check.command, { encoding: 'utf8', timeout: TOOL_CHECK_TIMEOUT });
-        const version = showVersion ? extractVersion(retryOut, check.name) : null;
-        const msg = version
-          ? t('checks.foundWithVersion', { name: check.name, version })
-          : t('checks.found', { name: check.name });
-        spinner.succeed(msg);
-        return { ...check, ok: true, version: version || null };
-      } catch {
-        // Still failing — fall through to report
-      }
-    }
-
-    if (!silent) {
-      if (check.required) {
-        const detail = autoInstallFailed ? ` — ${t('checks.install.failed')}` : '';
-        const diagSuffix = diagnosis ? `\n    ${kleur.dim(`→ ${t(`checks.diagnostic.${diagnosis}`, { name: check.name })}`)}` : '';
-        spinner.fail(t('checks.missing', { name: check.name }) + detail + diagSuffix);
-      } else if (diagnosis) {
-        spinner.warn(t(`checks.diagnostic.${diagnosis}`, { name: check.name }));
-      } else {
-        const hint = !check.waitPrompt && check.failHint ? `\n    ${kleur.dim(`→ ${check.failHint}`)}` : '';
-        if (check.warnMessage) {
-          spinner.warn(check.warnMessage + hint);
-        } else if (check.warnMessageKey) {
-          spinner.warn(t(check.warnMessageKey) + hint);
-        } else {
-          spinner.warn(t('checks.notFound', { name: check.name }) + hint);
-        }
-      }
-    }
-
     return { ...check, ok: false, autoInstallFailed, diagnosis };
   }
 }
 
+/**
+ * Retry a check after the user installs/auths a missing tool. Used when the
+ * check definition has `waitPrompt` — we offer the user to run the install
+ * step, then re-check on Enter. Returns true if the recheck succeeded.
+ */
+async function retryCheckInteractively(check, t) {
+  ui.log.warn(`${check.name} ${t('checks.notFound.short') || 'not found'}`);
+  if (check.failHint) {
+    ui.log.message(`${t('checks.runHint') || 'Run'}: ${kleur.cyan(check.failHint)}`);
+  }
+  const proceed = await ui.confirm({
+    message: check.waitPrompt,
+    initialValue: true,
+  });
+  if (!proceed) return false;
+  try {
+    const { stdout } = await execAsync(check.command, { encoding: 'utf8', timeout: TOOL_CHECK_TIMEOUT });
+    const version = extractVersion(stdout, check.name);
+    ui.log.success(version
+      ? `${check.name} — ${version}`
+      : check.name);
+    return true;
+  } catch {
+    ui.log.error(`${check.name} ${t('checks.stillMissing') || 'still missing'}`);
+    return false;
+  }
+}
+
 async function runChecks(checks, title, options = {}) {
   const t = options.t || createTranslator(options.language || detectDefaultLanguage());
-  const { showVersion = true, compact = false } = options;
+  const { showVersion = true } = options;
 
-  if (!compact) {
-    console.log(kleur.bold(`\n${title}`));
-    const results = [];
-    for (const check of checks) {
-      const result = await runSingleCheck({ ...check, t }, { showVersion });
-      results.push(result);
-    }
-    return results;
-  }
-
-  // Compact mode: single spinner, show failures only
+  // Single spinner over all checks, show failures afterwards. The visual
+  // sits inside the clack rail (│) opened by the caller's ui.intro().
   const { spinnerLabel = title, doneLabel = title } = options;
   const spinner = ui.spinner();
   spinner.start(spinnerLabel);
 
   const results = [];
   for (const check of checks) {
-    results.push(await runSingleCheck({ ...check, t }, { showVersion, silent: true }));
+    results.push(await runSingleCheck({ ...check, t }, { showVersion }));
   }
 
   const failures = results.filter((r) => !r.ok);
@@ -316,6 +243,17 @@ async function runChecks(checks, title, options = {}) {
   }
 
   for (const result of failures) {
+    // Interactive recovery for checks with a waitPrompt (e.g. gcloud install).
+    // Lets the user fix the env without restarting the command.
+    const waitPromptText = result.waitPromptKey ? t(result.waitPromptKey) : result.waitPrompt;
+    if (waitPromptText) {
+      const recovered = await retryCheckInteractively({ ...result, waitPrompt: waitPromptText }, t);
+      if (recovered) {
+        const idx = results.indexOf(result);
+        if (idx >= 0) results[idx] = { ...result, ok: true };
+      }
+      continue;
+    }
     const hint = result.failHint ? `\n${kleur.dim(`→ ${result.failHint}`)}` : '';
     if (result.required) {
       const detail = result.autoInstallFailed ? ` — ${t('checks.install.failed')}` : '';