kasy-cli 1.5.3 → 1.7.0

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 };

package/lib/commands/codemagic.js

@@ -2,7 +2,8 @@
 
 const path = require('node:path');
 const kleur = require('kleur');
-const prompts = require('prompts');
+const ui = require('../utils/ui');
+const { printCompactHeader } = require('../utils/brand');
 const { createTranslator, detectDefaultLanguage } = require('../utils/i18n');
 const { isKasyFlutterProject, openUrl } = require('../utils/apple-release');
 const { validateGoogleIosUrlScheme } = require('../scaffold/shared/post-build');
@@ -29,53 +30,48 @@ async function runConfigure(directory, options = {}) {
 
   await assertProject(projectDir, t);
 
-  console.log(kleur.bold(`\n${t('codemagic.configure.title')}\n`));
-  console.log(kleur.dim(`  ${t('codemagic.configure.doc')}: ${codemagicReleaseDocPath(lang)}\n`));
-  console.log(kleur.yellow(`  ${t('codemagic.configure.checklist')}\n`));
+  printCompactHeader(t);
+  ui.intro(t('codemagic.configure.title'));
+  ui.log.message(kleur.dim(`${t('codemagic.configure.doc')}: ${codemagicReleaseDocPath(lang)}`));
+  ui.log.warn(t('codemagic.configure.checklist'));
 
-  console.log(kleur.cyan(t('codemagic.configure.openingLinks')));
+  ui.log.info(t('codemagic.configure.openingLinks'));
   openUrl(URL_CODEMAGIC_API);
   openUrl(URL_CODEMAGIC_APPS);
 
-  const response = await prompts(
-    [
-      {
-        type: 'password',
-        name: 'token',
-        message: t('codemagic.configure.q.token'),
-        validate: (v) => (v && v.trim().length > 0 ? true : t('codemagic.configure.q.required')),
-      },
-      {
-        type: 'text',
-        name: 'appId',
-        message: t('codemagic.configure.q.appId'),
-        validate: (v) => (v && v.trim().length > 0 ? true : t('codemagic.configure.q.required')),
-      },
-      {
-        type: 'text',
-        name: 'workflowId',
-        message: t('codemagic.configure.q.workflowId'),
-        initial: 'ios-workflow',
-      },
-      {
-        type: 'text',
-        name: 'branch',
-        message: t('codemagic.configure.q.branch'),
-        initial: 'main',
-      },
-    ],
-    { onCancel: () => { throw new Error(t('codemagic.configure.cancelled')); } }
-  );
+  const cancel = () => { ui.cancel(t('codemagic.configure.cancelled')); process.exit(0); };
+  const required = (v) => (v && String(v).trim().length > 0 ? undefined : t('codemagic.configure.q.required'));
+
+  const token = await ui.password({
+    message: t('codemagic.configure.q.token'),
+    validate: required,
+    onCancel: cancel,
+  });
+  const appId = await ui.text({
+    message: t('codemagic.configure.q.appId'),
+    validate: required,
+    onCancel: cancel,
+  });
+  const workflowId = await ui.text({
+    message: t('codemagic.configure.q.workflowId'),
+    initialValue: 'ios-workflow',
+    onCancel: cancel,
+  });
+  const branch = await ui.text({
+    message: t('codemagic.configure.q.branch'),
+    initialValue: 'main',
+    onCancel: cancel,
+  });
 
   await writeCodemagicEnv(projectDir, {
-    token: response.token.trim(),
-    appId: response.appId.trim(),
-    workflowId: response.workflowId.trim() || 'ios-workflow',
-    branch: response.branch.trim() || 'main',
+    token: String(token).trim(),
+    appId: String(appId).trim(),
+    workflowId: String(workflowId).trim() || 'ios-workflow',
+    branch: String(branch).trim() || 'main',
   });
 
-  console.log(kleur.green(`\n✓ ${t('codemagic.configure.success')}`));
-  console.log(kleur.cyan(`\n  ${t('codemagic.configure.next')}: kasy codemagic release\n`));
+  ui.log.success(t('codemagic.configure.success'));
+  ui.outro(kleur.cyan(`${t('codemagic.configure.next')}: kasy codemagic release`));
 }
 
 async function runRelease(directory, options = {}) {
@@ -86,12 +82,13 @@ async function runRelease(directory, options = {}) {
 
   const validation = await validateCodemagicSetup(projectDir);
   if (!validation.ok) {
-    console.log(kleur.red(`\n✗ ${t('codemagic.error.notConfigured')}\n`));
+    printCompactHeader(t);
+    ui.log.error(t('codemagic.error.notConfigured'));
     if (validation.issues.includes('missing_yaml')) {
-      console.log(kleur.dim(`  ${t('codemagic.error.addCi')}\n`));
+      ui.log.message(kleur.dim(t('codemagic.error.addCi')));
     }
     if (validation.issues.includes('missing_env')) {
-      console.log(kleur.dim(`  ${t('codemagic.error.runConfigure')}\n`));
+      ui.log.message(kleur.dim(t('codemagic.error.runConfigure')));
     }
     process.exitCode = 1;
     return;
@@ -99,27 +96,30 @@ async function runRelease(directory, options = {}) {
 
   const googleScheme = await validateGoogleIosUrlScheme(projectDir);
   if (!googleScheme.ok) {
-    console.log(kleur.red(`\n✗ ${t('codemagic.error.googleUrlScheme')}\n`));
-    console.log(kleur.dim(`  ${googleScheme.error}`));
-    console.log(kleur.cyan(`  ${t('ios.error.googleUrlSchemeHint')}\n`));
+    printCompactHeader(t);
+    ui.log.error(t('codemagic.error.googleUrlScheme'));
+    ui.log.message(kleur.dim(googleScheme.error));
+    ui.log.info(t('ios.error.googleUrlSchemeHint'));
     process.exitCode = 1;
     return;
   }
 
-  console.log(kleur.bold(`\n${t('codemagic.release.title')}\n`));
+  printCompactHeader(t);
+  ui.intro(t('codemagic.release.title'));
 
   try {
     const result = await triggerBuild(projectDir, validation.env);
     const buildId = result.buildId || result._id;
     if (buildId) {
-      console.log(kleur.green(`✓ ${t('codemagic.release.triggered')}`));
-      console.log(kleur.cyan(`  Build ID: ${buildId}`));
-      console.log(kleur.dim(`  https://codemagic.io/builds/${buildId}\n`));
+      ui.log.success(t('codemagic.release.triggered'));
+      ui.log.info(`Build ID: ${kleur.cyan(buildId)}`);
+      ui.log.message(kleur.dim(`https://codemagic.io/builds/${buildId}`));
+      ui.outro('');
     } else {
-      console.log(kleur.green(`✓ ${t('codemagic.release.triggered')}\n`));
+      ui.outro(t('codemagic.release.triggered'));
     }
   } catch (err) {
-    console.error(kleur.red(`\n✗ ${err.message}\n`));
+    ui.log.error(err.message);
     process.exitCode = 1;
   }
 }
@@ -132,24 +132,27 @@ async function runStatus(buildId, directory, options = {}) {
 
   const validation = await validateCodemagicSetup(projectDir);
   if (!validation.env?.CODEMAGIC_API_TOKEN) {
-    console.log(kleur.red(`\n✗ ${t('codemagic.error.runConfigure')}\n`));
+    printCompactHeader(t);
+    ui.log.error(t('codemagic.error.runConfigure'));
     process.exitCode = 1;
     return;
   }
 
   if (!buildId) {
-    console.log(kleur.yellow(`\n${t('codemagic.status.usage')}\n`));
+    printCompactHeader(t);
+    ui.log.warn(t('codemagic.status.usage'));
     process.exitCode = 1;
     return;
   }
 
   try {
     const result = await getBuildStatus(buildId, validation.env.CODEMAGIC_API_TOKEN);
-    console.log(kleur.bold(`\n${t('codemagic.status.title')}: ${buildId}\n`));
-    console.log(JSON.stringify(result, null, 2));
-    console.log('');
+    printCompactHeader(t);
+    ui.intro(`${t('codemagic.status.title')}: ${buildId}`);
+    ui.note(JSON.stringify(result, null, 2));
+    ui.outro('');
   } catch (err) {
-    console.error(kleur.red(`\n✗ ${err.message}\n`));
+    ui.log.error(err.message);
     process.exitCode = 1;
   }
 }

package/lib/commands/deploy.js

@@ -16,8 +16,8 @@
 const path = require('node:path');
 const fs = require('fs-extra');
 const kleur = require('kleur');
-const prompts = require('prompts');
-const oraPackage = require('ora');
+const ui = require('../utils/ui');
+const { printCompactHeader } = require('../utils/brand');
 
 const { createTranslator } = require('../utils/i18n');
 const { getStoredLanguage } = require('../utils/license');
@@ -25,14 +25,13 @@ const { runDeploy: runFirebaseDeploy } = require('../scaffold/backends/firebase/
 const { deployFunctions, setSupabaseSecrets, linkProject } = require('../scaffold/backends/supabase/deploy');
 const { createFcmServiceAccountKey } = require('../scaffold/shared/fcm-service-account');
 
-const ora = oraPackage.default || oraPackage;
-
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
 function printStep(ok, skipped, label, detail) {
-  const icon = ok ? kleur.green('✓') : skipped ? kleur.gray('–') : kleur.red('✗');
-  const msg  = ok ? label : skipped ? kleur.gray(label) : kleur.red(label);
-  console.log(`  ${icon} ${msg}${detail ? kleur.gray(` — ${detail.split('\n')[0]}`) : ''}`);
+  const text = `${label}${detail ? kleur.gray(` — ${detail.split('\n')[0]}`) : ''}`;
+  if (ok) ui.log.success(text);
+  else if (skipped) ui.log.message(kleur.dim(`– ${text}`));
+  else ui.log.error(text);
 }
 
 /**
@@ -84,7 +83,7 @@ async function isServiceAccountJsonSet(projectDir) {
 // ── Firebase deploy ───────────────────────────────────────────────────────────
 
 async function deployFirebase(projectDir, options, tr) {
-  const cancel = () => { console.log(''); process.exit(0); };
+  const cancel = () => { ui.cancel('Cancelled'); process.exit(0); };
 
   // Auto-detect Firebase Project ID
   let firebaseProjectId = options.project;
@@ -96,17 +95,17 @@ async function deployFirebase(projectDir, options, tr) {
         const detected = rc.projects?.default;
         if (detected) {
           firebaseProjectId = detected;
-          console.log(kleur.gray(`  ${tr('deploy.detected.project')} ${kleur.cyan(detected)}`));
+          ui.log.message(kleur.gray(`${tr('deploy.detected.project')} ${kleur.cyan(detected)}`));
         }
       } catch (_) {}
     }
   }
   if (!firebaseProjectId) {
-    const { pid } = await prompts(
-      { type: 'text', name: 'pid', message: tr('deploy.q.project') },
-      { onCancel: cancel }
-    );
-    firebaseProjectId = pid?.trim();
+    const pid = await ui.text({
+      message: tr('deploy.q.project'),
+      onCancel: cancel,
+    });
+    firebaseProjectId = String(pid || '').trim();
     if (!firebaseProjectId) process.exit(0);
   }
 
@@ -123,50 +122,48 @@ async function deployFirebase(projectDir, options, tr) {
     }
   }
 
-  console.log('');
-  const spinner = ora(kleur.cyan('Deploying Firebase...')).start();
+  const spinner = ui.spinner();
+  spinner.start('Deploying Firebase...');
   let steps;
   try {
     steps = await runFirebaseDeploy(projectDir, null, firebaseProjectId, {
       functionsRegion,
-      onProgress: (key) => { spinner.text = kleur.cyan(key); },
+      onProgress: (key) => { spinner.message(String(key)); },
     });
-    spinner.stop();
+    spinner.stop('Firebase deploy completed');
   } catch (err) {
-    spinner.fail(kleur.red(err.message));
+    spinner.error(err.message);
     throw err;
   }
 
   if (steps?.length) {
-    console.log('');
     for (const s of steps) {
       printStep(s.ok, s.skipped, s.name, s.detail);
     }
-    console.log('');
   }
 
   // ── APNs reminder — required for iOS push notifications ──────────────────
   // Cannot be automated: the .p8 key only exists in Apple Developer Portal.
-  console.log(kleur.bold().yellow(`  ⚠  Push iOS: configure a APNs Key no Firebase Console`));
-  console.log(kleur.gray(`     1. Apple Developer Portal → Keys → criar APNs Key (.p8)`));
-  console.log(kleur.gray(`     2. Firebase Console → Cloud Messaging → app iOS → upload da APNs Key`));
-  console.log(kleur.cyan(`     https://console.firebase.google.com/project/${firebaseProjectId}/settings/cloudmessaging`));
-  console.log('');
+  const apnsBody = [
+    kleur.yellow('Push iOS: configure a APNs Key no Firebase Console'),
+    kleur.dim('1. Apple Developer Portal → Keys → criar APNs Key (.p8)'),
+    kleur.dim('2. Firebase Console → Cloud Messaging → app iOS → upload da APNs Key'),
+    kleur.cyan(`https://console.firebase.google.com/project/${firebaseProjectId}/settings/cloudmessaging`),
+  ].join('\n');
+  ui.note(apnsBody);
 }
 
 // ── Supabase deploy ───────────────────────────────────────────────────────────
 
 async function deploySupabase(projectDir) {
-  console.log('');
-
   // ── 1. Get project ref ──────────────────────────────────────────────────
   const projectRef = await readSupabaseProjectRef(projectDir);
   if (!projectRef) {
-    console.error(kleur.red(`\n  ✗ Projeto Supabase não está vinculado neste diretório.`));
-    console.error(kleur.gray(`    Execute: supabase link --project-ref SEU_PROJECT_REF`));
+    ui.log.error('Projeto Supabase não está vinculado neste diretório.');
+    ui.log.message(kleur.gray('Execute: supabase link --project-ref SEU_PROJECT_REF'));
     process.exit(1);
   }
-  console.log(kleur.gray(`  Project ref: ${kleur.cyan(projectRef)}`));
+  ui.log.message(kleur.gray(`Project ref: ${kleur.cyan(projectRef)}`));
 
   // ── 2. FCM Service Account JSON ─────────────────────────────────────────
   const alreadySet = await isServiceAccountJsonSet(projectDir);
@@ -176,12 +173,12 @@ async function deploySupabase(projectDir) {
     const firebaseProjectId = await readFirebaseProjectId(projectDir);
 
     if (firebaseProjectId) {
-      const fcmSpinner = ora(kleur.cyan('Gerando chave FCM (Service Account)…')).start();
+      const fcmSpinner = ui.spinner();
+      fcmSpinner.start('Gerando chave FCM (Service Account)…');
       const fcmResult = await createFcmServiceAccountKey(firebaseProjectId);
-      fcmSpinner.stop();
+      fcmSpinner.stop('Chave FCM gerada');
 
       if (fcmResult.ok) {
-        // Set the secret via setSupabaseSecrets (reuses existing logic with JSON compaction)
         const secretSteps = await setSupabaseSecrets(projectDir, {
           firebaseProjectId,
           firebaseServiceAccountJson: fcmResult.json,
@@ -189,7 +186,7 @@ async function deploySupabase(projectDir) {
         for (const s of secretSteps) printStep(s.ok, false, s.name, s.error);
       } else {
         printStep(false, false, 'FIREBASE_SERVICE_ACCOUNT_JSON', fcmResult.error);
-        console.log(kleur.yellow(`    Configure manualmente: supabase secrets set FIREBASE_SERVICE_ACCOUNT_JSON='...'`));
+        ui.log.warn("Configure manualmente: supabase secrets set FIREBASE_SERVICE_ACCOUNT_JSON='...'");
       }
     } else {
       printStep(false, false, 'FIREBASE_SERVICE_ACCOUNT_JSON', 'google-services.json não encontrado — configure manualmente');
@@ -197,9 +194,10 @@ async function deploySupabase(projectDir) {
   }
 
   // ── 3. Deploy edge functions ────────────────────────────────────────────
-  const fnSpinner = ora(kleur.cyan('Publicando edge functions…')).start();
+  const fnSpinner = ui.spinner();
+  fnSpinner.start('Publicando edge functions…');
   const fnResult = await deployFunctions(projectDir);
-  fnSpinner.stop();
+  fnSpinner.stop('Edge functions processadas');
 
   if (Array.isArray(fnResult)) {
     fnResult.forEach((s) => printStep(s.ok, s.skipped, s.name, s.error));
@@ -211,14 +209,15 @@ async function deploySupabase(projectDir) {
 
   // ── 4. APNs reminder ────────────────────────────────────────────────────
   const firebaseProjectId = await readFirebaseProjectId(projectDir);
-  console.log('');
-  console.log(kleur.bold().yellow(`  ⚠  Push iOS: configure a APNs Key no Firebase Console`));
-  console.log(kleur.gray(`     1. Apple Developer Portal → Keys → criar APNs Key (.p8)`));
-  console.log(kleur.gray(`     2. Firebase Console → Cloud Messaging → app iOS → upload da APNs Key`));
+  const apnsLines = [
+    kleur.yellow('Push iOS: configure a APNs Key no Firebase Console'),
+    kleur.dim('1. Apple Developer Portal → Keys → criar APNs Key (.p8)'),
+    kleur.dim('2. Firebase Console → Cloud Messaging → app iOS → upload da APNs Key'),
+  ];
   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'));
 }
 
 // ── Entry point ───────────────────────────────────────────────────────────────
@@ -240,17 +239,22 @@ async function runDeployCommand(directory, options = {}, { language: langHint }
   const isSupabase  = await fs.pathExists(path.join(projectDir, 'supabase'));
 
   if (isFirebase) {
+    printCompactHeader(tr);
+    ui.intro('Deploy — Firebase');
     await deployFirebase(projectDir, options, tr);
+    ui.outro('Deploy concluído');
     return;
   }
 
   if (isSupabase) {
-    console.log(kleur.bold(`\n  Deploy — Supabase\n`));
+    printCompactHeader(tr);
+    ui.intro('Deploy — Supabase');
     await deploySupabase(projectDir);
+    ui.outro('Deploy concluído');
     return;
   }
 
-  console.error(kleur.red(`\n  ✗ ${tr('deploy.error.notProject')}\n`));
+  ui.log.error(tr('deploy.error.notProject'));
   process.exit(1);
 }