kasy-cli 1.5.3 → 1.6.0

package/bin/kasy.js

@@ -35,6 +35,7 @@ const { getStoredLanguage, setStoredLanguage } = require('../lib/utils/license')
 const { promptLanguage } = require('../lib/utils/prompts');
 const { ensureLicenseKey, shouldRequireLicenseForArgv } = require('../lib/utils/license-gate');
 const { checkForUpdates } = require('../lib/utils/updates');
+const { printCompactHeader } = require('../lib/utils/brand');
 
 function createLocalizedHelpConfig(t) {
   return {
@@ -322,7 +323,8 @@ function buildProgram(language) {
       .description(t('cli.command.upgrade.description'))
       .action(() => {
         const { spawnSync } = require('node:child_process');
-        console.log('\n' + kleur.cyan(t('cli.command.upgrade.running')) + '\n');
+        printCompactHeader(t);
+        console.log(kleur.cyan(t('cli.command.upgrade.running')) + '\n');
         const result = spawnSync('npm', ['install', '-g', 'kasy-cli'], { stdio: 'inherit', shell: true });
         if (result.status === 0) {
           console.log('\n' + kleur.green('✓ ' + t('cli.command.upgrade.done')) + '\n');
@@ -339,7 +341,8 @@ function buildProgram(language) {
       .description(t('cli.command.uninstall.description'))
       .action(() => {
         const { spawnSync } = require('node:child_process');
-        console.log('\n' + kleur.cyan(t('cli.command.uninstall.running')) + '\n');
+        printCompactHeader(t);
+        console.log(kleur.cyan(t('cli.command.uninstall.running')) + '\n');
         const result = spawnSync('npm', ['uninstall', '-g', 'kasy-cli'], { stdio: 'inherit', shell: true });
         if (result.status === 0) {
           console.log('\n' + kleur.green('✓ ' + t('cli.command.uninstall.done')) + '\n');

package/lib/commands/add.js

@@ -5,8 +5,8 @@ const os = require('node:os');
 const fs = require('fs-extra');
 const pkg = require('../../package.json');
 const kleur = require('kleur');
-const prompts = require('prompts');
-const oraPackage = require('ora');
+const ui = require('../utils/ui');
+const { printCompactHeader } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const {
   AVAILABLE_FEATURES,
@@ -21,7 +21,6 @@ const { writeRouter, writeNoOpAnalyticsApi, writeNoOpTrackingApi, writeNoOpAdmin
 const { toPackageName, buildTokens } = require('../scaffold/backends/firebase/tokens');
 
 const execAsync = promisify(exec);
-const ora = oraPackage.default || oraPackage;
 
 /** URL do endpoint LLM no app (espelha defineUpdates de llm_chat). */
 function resolveLlmChatEndpoint(answers, kitSetup) {
@@ -317,58 +316,48 @@ const MODULE_META = {
   },
 };
 
+/**
+ * Each entry returns a fn (t, cancel) -> Promise<value> that asks the user.
+ * Secret-like values (DSNs, API keys, tokens) use ui.password to mask input.
+ */
 const PROMPT_QUESTIONS = {
-  sentryDsn: (t) => ({
-    type: 'text',
-    name: 'sentryDsn',
+  sentryDsn: (t, cancel) => ui.password({
     message: t('add.prompt.sentryDsn'),
-    initial: '',
+    onCancel: cancel,
   }),
-  mixpanelToken: (t) => ({
-    type: 'text',
-    name: 'mixpanelToken',
+  mixpanelToken: (t, cancel) => ui.password({
     message: t('add.prompt.mixpanelToken'),
-    initial: '',
+    onCancel: cancel,
   }),
-  rcAndroidKey: (t) => ({
-    type: 'text',
-    name: 'rcAndroidKey',
+  // RevenueCat SDK keys ship inside the client binary — not real secrets, plain text input.
+  rcAndroidKey: (t, cancel) => ui.text({
     message: t('add.prompt.rcAndroidKey'),
-    initial: '',
+    onCancel: cancel,
   }),
-  rcIosKey: (t) => ({
-    type: 'text',
-    name: 'rcIosKey',
+  rcIosKey: (t, cancel) => ui.text({
     message: t('add.prompt.rcIosKey'),
-    initial: '',
+    onCancel: cancel,
   }),
-  llmProvider: (t) => ({
-    type: 'select',
-    name: 'llmProvider',
+  llmProvider: (t, cancel) => ui.select({
     message: t('add.prompt.llmProvider'),
-    choices: [
-      { title: 'OpenAI (gpt-4o-mini)', value: 'openai' },
-      { title: 'Google Gemini (gemini-1.5-flash)', value: 'gemini' },
+    initialValue: 'openai',
+    options: [
+      { value: 'openai', label: 'OpenAI (gpt-4o-mini)' },
+      { value: 'gemini', label: 'Google Gemini (gemini-1.5-flash)' },
     ],
-    initial: 0,
+    onCancel: cancel,
   }),
-  llmSystemPrompt: (t) => ({
-    type: 'text',
-    name: 'llmSystemPrompt',
+  llmSystemPrompt: (t, cancel) => ui.text({
     message: t('add.prompt.llmSystemPrompt'),
-    initial: '',
+    onCancel: cancel,
   }),
-  llmApiKey: (t) => ({
-    type: 'text',
-    name: 'llmApiKey',
+  llmApiKey: (t, cancel) => ui.password({
     message: t('add.prompt.llmApiKey'),
-    initial: '',
+    onCancel: cancel,
   }),
-  llmEndpoint: (t) => ({
-    type: 'text',
-    name: 'llmEndpoint',
+  llmEndpoint: (t, cancel) => ui.text({
     message: t('add.prompt.llmEndpoint'),
-    initial: '',
+    onCancel: cancel,
   }),
 };
 
@@ -411,7 +400,7 @@ async function postAddLlmChat(projectDir, kitSetup, answers, t) {
 
   // 2. Set API key as secret (skip if blank)
   if (!apiKey) {
-    console.log(kleur.yellow(`\n  ${t('add.llm_chat.skipSecret')}\n`));
+    ui.log.warn(t('add.llm_chat.skipSecret'));
     return { deployOk: false, deployAttempted: false };
   }
 
@@ -419,21 +408,23 @@ async function postAddLlmChat(projectDir, kitSetup, answers, t) {
   const refFlag = backend === 'supabase' && projectRef ? ` --project-ref ${projectRef}` : '';
 
   if (backend === 'firebase') {
-    const spinner = ora(t('add.llm_chat.settingSecret')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('add.llm_chat.settingSecret'));
     try {
       // Write to temp file — avoids trailing newline (echo) and shell injection risks
       const tmpFile = path.join(os.tmpdir(), `llm_api_key_${Date.now()}.tmp`);
       await fs.outputFile(tmpFile, apiKey, 'utf8');
       await execAsync(`firebase functions:secrets:set LLM_API_KEY --data-file="${tmpFile}"`, { cwd: projectDir });
       await fs.remove(tmpFile);
-      spinner.succeed(t('add.llm_chat.secretSet'));
+      spinner.stop(t('add.llm_chat.secretSet'));
       secretsOk = true;
     } catch {
-      spinner.warn(t('add.llm_chat.secretFailed'));
-      console.log(kleur.dim(`  Run manually: firebase functions:secrets:set LLM_API_KEY`));
+      spinner.stop(`⚠ ${t('add.llm_chat.secretFailed')}`);
+      ui.log.message(kleur.dim('Run manually: firebase functions:secrets:set LLM_API_KEY'));
     }
   } else if (backend === 'supabase') {
-    const spinner = ora(t('add.llm_chat.settingSecret')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('add.llm_chat.settingSecret'));
     // Set LLM_API_KEY, LLM_PROVIDER and LLM_SYSTEM_PROMPT all as Supabase Secrets.
     // Deployed Edge Functions read from Deno.env.get() = Supabase Secrets, NOT from .env files.
     const esc = (v) => String(v).replace(/"/g, '\\"');
@@ -451,32 +442,33 @@ async function postAddLlmChat(projectDir, kitSetup, answers, t) {
       if (r && r.ok === false) allOk = false;
     }
     if (allOk) {
-      spinner.succeed(t('add.llm_chat.secretSet'));
+      spinner.stop(t('add.llm_chat.secretSet'));
       secretsOk = true;
     } else {
-      spinner.warn(t('add.llm_chat.secretFailed'));
-      console.log(kleur.dim(`  Run manually: supabase secrets set LLM_API_KEY=YOUR_KEY LLM_PROVIDER=${provider}${refFlag}`));
+      spinner.stop(`⚠ ${t('add.llm_chat.secretFailed')}`);
+      ui.log.message(kleur.dim(`Run manually: supabase secrets set LLM_API_KEY=YOUR_KEY LLM_PROVIDER=${provider}${refFlag}`));
     }
   }
 
   // 3. Deploy the LLM function automatically
   if (backend === 'api') return { deployOk: false, deployAttempted: false };
 
-  const deploySpinner = ora(t('add.llm_chat.deploying')).start();
+  const deploySpinner = ui.spinner();
+  deploySpinner.start(t('add.llm_chat.deploying'));
   try {
     if (backend === 'firebase') {
       await execAsync('firebase deploy --only functions:llmChat', { cwd: projectDir, timeout: 180_000 });
     } else if (backend === 'supabase') {
       await execAsync(`supabase functions deploy llm-chat --no-verify-jwt${refFlag}`, { cwd: projectDir, timeout: 180_000 });
     }
-    deploySpinner.succeed(t('add.llm_chat.deployed'));
+    deploySpinner.stop(t('add.llm_chat.deployed'));
     return { deployOk: true, deployAttempted: true };
   } catch {
-    deploySpinner.warn(t('add.llm_chat.deployFailed'));
+    deploySpinner.stop(`⚠ ${t('add.llm_chat.deployFailed')}`);
     if (backend === 'firebase') {
-      console.log(kleur.dim(`  Run manually: firebase deploy --only functions:llmChat`));
+      ui.log.message(kleur.dim('Run manually: firebase deploy --only functions:llmChat'));
     } else {
-      console.log(kleur.dim(`  Run manually: supabase functions deploy llm-chat --no-verify-jwt${refFlag}`));
+      ui.log.message(kleur.dim(`Run manually: supabase functions deploy llm-chat --no-verify-jwt${refFlag}`));
     }
     return { deployOk: false, deployAttempted: true };
   }
@@ -485,8 +477,6 @@ async function postAddLlmChat(projectDir, kitSetup, answers, t) {
 // ── List command ──────────────────────────────────────────────────────────────
 
 async function listModules(projectDir, t) {
-  console.log(kleur.bold(`\n${t('add.list.title')}\n`));
-
   let activeModules = [];
   const kitSetupPath = path.join(projectDir, 'kit_setup.json');
   if (await fs.pathExists(kitSetupPath)) {
@@ -498,14 +488,15 @@ async function listModules(projectDir, t) {
     }
   }
 
+  const lines = [];
   for (const feature of getVisibleFeatures({ audience: KASY_AUDIENCE })) {
     const active = activeModules.includes(feature.id);
     const badge = feature.status === 'internal' ? kleur.yellow(' [beta]') : '';
     const icon = active ? kleur.green('✓') : kleur.dim('○');
     const label = active ? kleur.green(feature.id) : kleur.white(feature.id);
-    console.log(`  ${icon}  ${label}${badge}`);
+    lines.push(`${icon}  ${label}${badge}`);
   }
-  console.log('');
+  ui.note(lines.join('\n'), t('add.list.title'));
 }
 
 // ── Main command ──────────────────────────────────────────────────────────────
@@ -513,16 +504,23 @@ async function listModules(projectDir, t) {
 async function runAdd(module, options = {}) {
   const t = createTranslator(options.language || detectDefaultLanguage());
   const projectDir = path.resolve(options.directory || '.');
+  const cancel = () => { ui.cancel(t('add.cancelled')); process.exit(0); };
 
   // --list flag
   if (options.list) {
+    printCompactHeader(t);
+    ui.intro(t('add.list.title'));
     await listModules(projectDir, t);
+    ui.outro('');
     return;
   }
 
   if (!module) {
-    console.log(kleur.yellow(t('add.error.noModule')));
+    printCompactHeader(t);
+    ui.intro(t('add.list.title'));
+    ui.log.warn(t('add.error.noModule'));
     await listModules(projectDir, t);
+    ui.outro('');
     return;
   }
 
@@ -542,13 +540,16 @@ async function runAdd(module, options = {}) {
   if (moduleLower === 'ios-release' || moduleLower === 'ios_release' || moduleLower === 'iosrelease') {
     const scriptPath = path.join(projectDir, 'scripts', 'release-ios.sh');
     if (await fs.pathExists(scriptPath)) {
-      console.log(kleur.yellow(`\n${t('add.iosRelease.already')}\n`));
+      printCompactHeader(t);
+      ui.log.warn(t('add.iosRelease.already'));
       return;
     }
     const patchDir = path.join(FEATURES_PATCH_DIR, 'ios-release');
     if (!(await fs.pathExists(patchDir))) {
       throw new Error(t('add.error.unknownModule', { module, list: 'ios-release' }));
     }
+    printCompactHeader(t);
+    ui.intro(t('add.applying', { module: 'ios-release' }));
     const { tokens, pathReplacements } = buildTokens({
       appName: kitSetup.appName,
       bundleId: kitSetup.bundleId,
@@ -557,8 +558,8 @@ async function runAdd(module, options = {}) {
     await localizeReleaseDocs(projectDir, options.language || detectDefaultLanguage());
     await ensureIosReleaseMakefile(projectDir);
     await ensureGitignoreKasyEnv(projectDir);
-    console.log(kleur.green(`\n✓ ${t('add.iosRelease.success')}\n`));
-    console.log(kleur.cyan(`  kasy ios configure\n`));
+    ui.log.success(t('add.iosRelease.success'));
+    ui.outro(kleur.cyan('kasy ios configure'));
     return;
   }
 
@@ -578,23 +579,22 @@ async function runAdd(module, options = {}) {
   if (activeModules.includes(normalized)) {
     // llm_chat can be re-run to reconfigure credentials even when already active
     if (normalized !== 'llm_chat') {
-      console.log(kleur.yellow(`\n${t('add.alreadyActive', { module: normalized })}\n`));
+      printCompactHeader(t);
+      ui.log.warn(t('add.alreadyActive', { module: normalized }));
       return;
     }
-    console.log(kleur.yellow(`\n${t('add.llm_chat.reconfigure')}\n`));
+    printCompactHeader(t);
+    ui.intro(t('add.llm_chat.reconfigure'));
     // Skip to credential-only flow: prompt → postAdd → done
     const answers = {};
     if (!options.yes) {
-      console.log('');
       for (const key of ['llmProvider', 'llmSystemPrompt', 'llmApiKey']) {
-        const question = PROMPT_QUESTIONS[key]?.(t);
-        if (!question) continue;
-        const response = await prompts(question, { onCancel: () => { throw new Error(t('add.cancelled')); } });
-        answers[key] = response[key] ?? '';
+        const ask = PROMPT_QUESTIONS[key];
+        if (!ask) continue;
+        answers[key] = (await ask(t, cancel)) ?? '';
       }
       if (kitSetup.backendProvider === 'api') {
-        const response = await prompts(PROMPT_QUESTIONS.llmEndpoint(t), { onCancel: () => { throw new Error(t('add.cancelled')); } });
-        answers.llmEndpoint = response.llmEndpoint || '';
+        answers.llmEndpoint = (await PROMPT_QUESTIONS.llmEndpoint(t, cancel)) || '';
       }
     }
     const defines = MODULE_META.llm_chat.defineUpdates(answers, kitSetup);
@@ -610,41 +610,37 @@ async function runAdd(module, options = {}) {
     const { deployOk, deployAttempted } = await postAddLlmChat(projectDir, kitSetup, answers, t);
     const backend = kitSetup?.backendProvider ?? 'firebase';
     const needsManualDeploy = deployAttempted && !deployOk;
+    let nextStepsMsg;
     if (backend === 'firebase') {
-      console.log(kleur.cyan(t(needsManualDeploy ? 'add.llm_chat.nextSteps.firebase.deployFailed' : 'add.llm_chat.nextSteps.firebase')));
+      nextStepsMsg = t(needsManualDeploy ? 'add.llm_chat.nextSteps.firebase.deployFailed' : 'add.llm_chat.nextSteps.firebase');
     } else if (backend === 'supabase') {
-      console.log(kleur.cyan(t(needsManualDeploy ? 'add.llm_chat.nextSteps.supabase.deployFailed' : 'add.llm_chat.nextSteps.supabase')));
+      nextStepsMsg = t(needsManualDeploy ? 'add.llm_chat.nextSteps.supabase.deployFailed' : 'add.llm_chat.nextSteps.supabase');
     } else {
-      console.log(kleur.cyan(t('add.llm_chat.nextSteps.api')));
+      nextStepsMsg = t('add.llm_chat.nextSteps.api');
     }
+    ui.outro(kleur.cyan(nextStepsMsg));
     return;
   }
 
   const meta = MODULE_META[normalized] || { promptKeys: [], defineUpdates: () => ({}), envLines: () => [], featureFlag: null };
 
+  printCompactHeader(t);
+  ui.intro(t('add.applying', { module: normalized }));
+
   // 4. Prompt for API keys (skip if --yes)
   const answers = {};
   if (!options.yes && meta.promptKeys.length > 0) {
-    console.log('');
     for (const key of meta.promptKeys) {
-      const question = PROMPT_QUESTIONS[key]?.(t);
-      if (!question) continue;
-      const response = await prompts(question, {
-        onCancel: () => { throw new Error(t('add.cancelled')); },
-      });
-      answers[key] = response[key] ?? '';
+      const ask = PROMPT_QUESTIONS[key];
+      if (!ask) continue;
+      answers[key] = (await ask(t, cancel)) ?? '';
     }
     // Extra prompt for API backend (custom LLM endpoint)
     if (normalized === 'llm_chat' && kitSetup.backendProvider === 'api') {
-      const response = await prompts(PROMPT_QUESTIONS.llmEndpoint(t), {
-        onCancel: () => { throw new Error(t('add.cancelled')); },
-      });
-      answers.llmEndpoint = response.llmEndpoint || '';
+      answers.llmEndpoint = (await PROMPT_QUESTIONS.llmEndpoint(t, cancel)) || '';
     }
   }
 
-  console.log(kleur.bold(`\n${t('add.applying', { module: normalized })}\n`));
-
   // 5. Enable feature flag in features.dart
   if (meta.featureFlag) {
     await enableFeatureFlag(projectDir, meta.featureFlag);
@@ -667,16 +663,17 @@ async function runAdd(module, options = {}) {
   // 8. Apply patch if it exists under features/<module>/
   const patchDir = path.join(FEATURES_PATCH_DIR, normalized);
   if (await fs.pathExists(patchDir)) {
-    const spinner = ora(t('add.applyingPatch')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('add.applyingPatch'));
     try {
       const { tokens: patchTokens, pathReplacements: patchPathReplacements } = buildTokens({
         appName: kitSetup.appName,
         bundleId: kitSetup.bundleId,
       });
       await applyPatch(patchDir, projectDir, patchTokens, patchPathReplacements);
-      spinner.succeed(t('add.patchApplied'));
+      spinner.stop(t('add.patchApplied'));
     } catch (err) {
-      spinner.fail(t('add.patchFailed'));
+      spinner.error(t('add.patchFailed'));
       throw err;
     }
   }
@@ -726,24 +723,26 @@ async function runAdd(module, options = {}) {
 
   // 10. flutter pub get
   {
-    const spinner = ora(t('add.pubGet')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('add.pubGet'));
     try {
       await execAsync('flutter pub get', { cwd: projectDir, timeout: 300_000 });
-      spinner.succeed(t('add.pubGetDone'));
+      spinner.stop(t('add.pubGetDone'));
     } catch {
-      spinner.warn(t('add.pubGetFailed'));
+      spinner.stop(`⚠ ${t('add.pubGetFailed')}`);
     }
   }
 
   // 11. build_runner (only when needed: features with codegen)
   const needsBuildRunner = ['revenuecat', 'analytics', 'sentry', 'onboarding', 'llm_chat', 'feedback'].includes(normalized);
   if (needsBuildRunner) {
-    const spinner = ora(t('add.buildRunner')).start();
+    const spinner = ui.spinner();
+    spinner.start(t('add.buildRunner'));
     try {
       await execAsync('dart run build_runner build --delete-conflicting-outputs', { cwd: projectDir, timeout: 600_000 });
-      spinner.succeed(t('add.buildRunnerDone'));
+      spinner.stop(t('add.buildRunnerDone'));
     } catch {
-      spinner.warn(t('add.buildRunnerFailed'));
+      spinner.stop(`⚠ ${t('add.buildRunnerFailed')}`);
     }
   }
 
@@ -755,23 +754,25 @@ async function runAdd(module, options = {}) {
 
   // Show note if any
   if (meta.note) {
-    console.log(kleur.dim(`\n  ${t(meta.note)}\n`));
+    ui.log.message(kleur.dim(t(meta.note)));
   }
 
-  console.log(kleur.green(`\n✓ ${t('add.success', { module: normalized })}\n`));
-
   // LLM Chat: show next steps (adjust based on whether deploy succeeded)
   if (normalized === 'llm_chat') {
     const backend = kitSetup?.backendProvider ?? 'firebase';
     const needsManualDeploy = llmDeployResult?.deployAttempted && !llmDeployResult?.deployOk;
+    let nextStepsMsg;
     if (backend === 'firebase') {
-      console.log(kleur.cyan(t(needsManualDeploy ? 'add.llm_chat.nextSteps.firebase.deployFailed' : 'add.llm_chat.nextSteps.firebase')));
+      nextStepsMsg = t(needsManualDeploy ? 'add.llm_chat.nextSteps.firebase.deployFailed' : 'add.llm_chat.nextSteps.firebase');
     } else if (backend === 'supabase') {
-      console.log(kleur.cyan(t(needsManualDeploy ? 'add.llm_chat.nextSteps.supabase.deployFailed' : 'add.llm_chat.nextSteps.supabase')));
+      nextStepsMsg = t(needsManualDeploy ? 'add.llm_chat.nextSteps.supabase.deployFailed' : 'add.llm_chat.nextSteps.supabase');
     } else {
-      console.log(kleur.cyan(t('add.llm_chat.nextSteps.api')));
+      nextStepsMsg = t('add.llm_chat.nextSteps.api');
     }
+    ui.log.info(nextStepsMsg);
   }
+
+  ui.outro(t('add.success', { module: normalized }));
 }
 
 module.exports = { runAdd };

package/lib/commands/check.js

@@ -17,15 +17,16 @@
 const path = require('node:path');
 const fs = require('fs-extra');
 const kleur = require('kleur');
-const oraPackage = require('ora');
+const ui = require('../utils/ui');
+const { printCompactHeader } = require('../utils/brand');
 const { exec } = require('node:child_process');
 const { promisify } = require('node:util');
 
 const { getStoredLanguage } = require('../utils/license');
+const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { createFcmServiceAccountKey } = require('../scaffold/shared/fcm-service-account');
 const { setSupabaseSecrets } = require('../scaffold/backends/supabase/deploy');
 
-const ora = oraPackage.default || oraPackage;
 const execAsync = promisify(exec);
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
@@ -39,10 +40,10 @@ async function runCmd(cmd, cwd) {
   }
 }
 
-function ok(label, detail)      { console.log(`  ${kleur.green('✓')}  ${label}${detail ? kleur.gray(` — ${detail}`) : ''}`); }
-function fail(label, detail)    { console.log(`  ${kleur.red('✗')}  ${kleur.red(label)}${detail ? kleur.gray(` — ${detail}`) : ''}`); }
-function warn(label, detail)    { console.log(`  ${kleur.yellow('⚠')}  ${kleur.yellow(label)}${detail ? kleur.gray(` — ${detail}`) : ''}`); }
-function info(label)            { console.log(`  ${kleur.gray('–')}  ${kleur.gray(label)}`); }
+function ok(label, detail)   { ui.log.success(`${label}${detail ? kleur.gray(` — ${detail}`) : ''}`); }
+function fail(label, detail) { ui.log.error(`${label}${detail ? kleur.gray(` — ${detail}`) : ''}`); }
+function warn(label, detail) { ui.log.warn(`${label}${detail ? kleur.gray(` — ${detail}`) : ''}`); }
+function info(label)         { ui.log.message(kleur.dim(`– ${label}`)); }
 
 /**
  * Read the linked Supabase project ref.
@@ -105,8 +106,11 @@ async function listDeployedFunctions(projectDir) {
  */
 async function runCheck(options = {}) {
   const projectDir = path.resolve(options.directory || '.');
+  const lang = options.language || getStoredLanguage() || detectDefaultLanguage();
+  const t = createTranslator(lang);
 
-  console.log(kleur.bold(`\n  Kasy Check — Push Notifications\n`));
+  printCompactHeader(t);
+  ui.intro('Kasy Check — Push Notifications');
 
   // ── Detect backend ────────────────────────────────────────────────────────
   const isFirebase = await fs.pathExists(path.join(projectDir, 'firebase.json'));
@@ -115,20 +119,22 @@ async function runCheck(options = {}) {
   if (isFirebase && !isSupabase) {
     ok('Firebase backend');
     info('Firebase usa Application Default Credentials — nenhuma configuração extra necessária.');
-    console.log('');
-    // APNs Key is still required for iOS push — show reminder even for Firebase backend.
     const firebaseProjectId = await readFirebaseProjectId(projectDir);
-    console.log(kleur.bold().yellow(`  ⚠  Push iOS requer APNs Key (não verificável via CLI)`));
-    console.log(kleur.gray(`     Firebase Console → Cloud Messaging → app iOS → Chave de autenticação APNs`));
+    const apnsLines = [
+      kleur.yellow('Push iOS requer APNs Key (não verificável via CLI)'),
+      kleur.dim('Firebase Console → Cloud Messaging → app iOS → Chave de autenticação APNs'),
+    ];
     if (firebaseProjectId) {
-      console.log(kleur.cyan(`     https://console.firebase.google.com/project/${firebaseProjectId}/settings/cloudmessaging`));
+      apnsLines.push(kleur.cyan(`https://console.firebase.google.com/project/${firebaseProjectId}/settings/cloudmessaging`));
     }
-    console.log('');
+    ui.note(apnsLines.join('\n'));
+    ui.outro('Done');
     return;
   }
 
   if (!isSupabase) {
-    console.error(kleur.red(`  ✗ Diretório não parece ser um projeto Kasy.\n`));
+    ui.log.error('Diretório não parece ser um projeto Kasy.');
+    ui.cancel('Aborted');
     process.exit(1);
   }
 
@@ -136,15 +142,16 @@ async function runCheck(options = {}) {
   const projectRef = await readProjectRef(projectDir);
   if (!projectRef) {
     fail('Projeto Supabase não vinculado', 'execute: supabase link --project-ref SEU_REF');
-    console.log('');
+    ui.cancel('Aborted');
     process.exit(1);
   }
   ok('Projeto vinculado', projectRef);
 
   // ── Read secrets list ─────────────────────────────────────────────────────
-  const spinner = ora(kleur.gray('  Verificando secrets…')).start();
+  const spinner = ui.spinner();
+  spinner.start('Verificando secrets…');
   const secrets = await listSecretNames(projectDir);
-  spinner.stop();
+  spinner.stop('Secrets verificados');
 
   if (!secrets) {
     warn('Não foi possível listar secrets', 'verifique: supabase login');
@@ -158,7 +165,7 @@ async function runCheck(options = {}) {
     } else {
       fail('FIREBASE_PROJECT_ID ausente');
       if (firebaseProjectId) {
-        console.log(kleur.gray(`    Corrija: supabase secrets set FIREBASE_PROJECT_ID="${firebaseProjectId}"`));
+        ui.log.message(kleur.gray(`Corrija: supabase secrets set FIREBASE_PROJECT_ID="${firebaseProjectId}"`));
         if (options.fix) {
           const r = await runCmd(`supabase secrets set FIREBASE_PROJECT_ID="${firebaseProjectId}"`, projectDir);
           r.ok
@@ -177,9 +184,10 @@ async function runCheck(options = {}) {
       fail('FIREBASE_SERVICE_ACCOUNT_JSON ausente');
 
       if (options.fix && firebaseProjectId) {
-        const fixSpinner = ora(kleur.cyan('  Gerando e configurando chave FCM…')).start();
+        const fixSpinner = ui.spinner();
+        fixSpinner.start('Gerando e configurando chave FCM…');
         const fcmResult = await createFcmServiceAccountKey(firebaseProjectId);
-        fixSpinner.stop();
+        fixSpinner.stop('Chave FCM gerada');
 
         if (fcmResult.ok) {
           const secretSteps = await setSupabaseSecrets(projectDir, {
@@ -192,21 +200,26 @@ async function runCheck(options = {}) {
             : fail('FIREBASE_SERVICE_ACCOUNT_JSON → falhou ao configurar', setStep?.error);
         } else {
           fail('FIREBASE_SERVICE_ACCOUNT_JSON → não foi possível gerar chave', fcmResult.error);
-          console.log(kleur.gray(`    Manual: Firebase Console → Configurações → Contas de serviço → Gerar chave`));
-          console.log(kleur.gray(`    Depois: supabase secrets set FIREBASE_SERVICE_ACCOUNT_JSON='$(cat chave.json)'`));
+          ui.log.message(kleur.gray(
+            'Manual: Firebase Console → Configurações → Contas de serviço → Gerar chave\n' +
+            "Depois: supabase secrets set FIREBASE_SERVICE_ACCOUNT_JSON='$(cat chave.json)'"
+          ));
         }
       } else {
-        console.log(kleur.gray(`    Corrija automaticamente: kasy check --fix`));
-        console.log(kleur.gray(`    Ou manualmente: Firebase Console → Configurações → Contas de serviço → Gerar chave`));
-        console.log(kleur.gray(`    Depois: supabase secrets set FIREBASE_SERVICE_ACCOUNT_JSON='$(cat chave.json)'`));
+        ui.log.message(kleur.gray(
+          'Corrija automaticamente: kasy check --fix\n' +
+          'Ou manualmente: Firebase Console → Configurações → Contas de serviço → Gerar chave\n' +
+          "Depois: supabase secrets set FIREBASE_SERVICE_ACCOUNT_JSON='$(cat chave.json)'"
+        ));
       }
     }
   }
 
   // ── 4. Edge function send-push-notification ────────────────────────────────
-  const fnSpinner = ora(kleur.gray('  Verificando edge functions…')).start();
+  const fnSpinner = ui.spinner();
+  fnSpinner.start('Verificando edge functions…');
   const functions = await listDeployedFunctions(projectDir);
-  fnSpinner.stop();
+  fnSpinner.stop('Edge functions verificadas');
 
   if (!functions) {
     warn('Não foi possível listar edge functions', 'verifique: supabase login');
@@ -215,26 +228,30 @@ async function runCheck(options = {}) {
   } else {
     fail('Edge function send-push-notification não deployada');
     if (options.fix) {
-      const deploySpinner = ora(kleur.cyan('  Publicando send-push-notification…')).start();
+      const deploySpinner = ui.spinner();
+      deploySpinner.start('Publicando send-push-notification…');
       const r = await runCmd('supabase functions deploy send-push-notification', projectDir);
-      deploySpinner.stop();
       r.ok
-        ? ok('send-push-notification → deployada automaticamente')
-        : fail('send-push-notification → falhou no deploy', r.error);
+        ? deploySpinner.stop('send-push-notification → deployada automaticamente')
+        : deploySpinner.error(`send-push-notification → falhou no deploy${r.error ? ` — ${r.error}` : ''}`);
     } else {
-      console.log(kleur.gray(`    Corrija automaticamente: kasy check --fix`));
-      console.log(kleur.gray(`    Ou manualmente: supabase functions deploy send-push-notification`));
+      ui.log.message(kleur.gray(
+        'Corrija automaticamente: kasy check --fix\n' +
+        'Ou manualmente: supabase functions deploy send-push-notification'
+      ));
     }
   }
 
   // ── 5. APNs reminder ─────────────────────────────────────────────────────
-  console.log('');
-  console.log(kleur.bold().yellow(`  ⚠  Push iOS requer APNs Key (não verificável via CLI)`));
-  console.log(kleur.gray(`     Firebase Console → Cloud Messaging → app iOS → Chave de autenticação APNs`));
+  const apnsLines = [
+    kleur.yellow('Push iOS requer APNs Key (não verificável via CLI)'),
+    kleur.dim('Firebase Console → Cloud Messaging → app iOS → Chave de autenticação APNs'),
+  ];
   if (firebaseProjectId) {
-    console.log(kleur.cyan(`     https://console.firebase.google.com/project/${firebaseProjectId}/settings/cloudmessaging`));
+    apnsLines.push(kleur.cyan(`https://console.firebase.google.com/project/${firebaseProjectId}/settings/cloudmessaging`));
   }
-  console.log('');
+  ui.note(apnsLines.join('\n'));
+  ui.outro('Done');
 }
 
 module.exports = { runCheck };