kasy-cli 1.5.3 → 1.7.0

package/lib/commands/new.js

@@ -14,37 +14,9 @@
 const path = require('node:path');
 const crypto = require('node:crypto');
 const kleur = require('kleur');
-const gradient = require('gradient-string');
-const oraPackage = require('ora');
-const ora = oraPackage.default || oraPackage;
 
 function sleep(ms) { return new Promise((r) => setTimeout(r, ms)); }
 
-// Spinner manager for multi-step long-running operations.
-// Each call to .next(text) succeeds the previous step and starts a new one.
-// Call .succeed(text) or .fail(text) to close the last step.
-function makeProgressSpinner() {
-  let current = null;
-  return {
-    next(text) {
-      if (current) current.succeed();
-      current = ora(`  ${text}`).start();
-    },
-    succeed(text) {
-      if (current) { current.succeed(text ? `  ${text}` : undefined); current = null; }
-    },
-    fail(text) {
-      if (current) { current.fail(text ? `  ${text}` : undefined); current = null; }
-    },
-    warn(text) {
-      if (current) { current.warn(text ? `  ${text}` : undefined); current = null; }
-    },
-    stop() {
-      if (current) { current.stop(); current = null; }
-    },
-  };
-}
-
 function generateWebhookKey() {
   return 'rc_wh_' + crypto.randomBytes(16).toString('hex');
 }
@@ -68,8 +40,8 @@ function openUrl(url) {
     exec(cmd, { shell: true });
   } catch (_) {}
 }
-const prompts = require('prompts');
 const ui = require('../utils/ui');
+const { printBanner, infoBox, successBox } = require('../utils/brand');
 const fs = require('fs-extra');
 const { createTranslator } = require('../utils/i18n');
 const { getStoredLanguage, setStoredLanguage } = require('../utils/license');
@@ -111,51 +83,37 @@ const BILLING_OTHER = '__other__';
 async function promptBillingAccountIfNeeded(tr, onCancel) {
   const billingList = await listBillingAccounts();
   if (!billingList.ok) return null;
-  if (!billingList.accounts?.length) {
-    console.log(kleur.yellow(`  ${tr('new.firebase.q.billingAccount.context')}`));
-    const { manualId } = await prompts(
-      {
-        type: 'text',
-        name: 'manualId',
-        message: tr('new.firebase.q.billingAccount.manualId'),
-        hint: tr('new.firebase.q.billingAccount.manualId.hint'),
-        validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.billingAccount.manualId.required')),
-      },
-      { onCancel }
-    );
-    return manualId?.trim() || null;
-  }
-  const choices = [
-    ...billingList.accounts.map((a) => ({
-      title: `${a.name || a.id} (${a.id})`,
-      value: a.id,
-    })),
-    { title: tr('new.firebase.q.billingAccount.other'), value: BILLING_OTHER },
-  ];
-  console.log(kleur.yellow(`  ${tr('new.firebase.q.billingAccount.context')}`));
-  const { billingAccountId } = await prompts(
-    {
-      type: 'select',
-      name: 'billingAccountId',
-      message: tr('new.firebase.q.billingAccount'),
-      hint: tr('new.firebase.q.billingAccount.hint'),
-      choices,
-    },
-    { onCancel }
-  );
-  if (billingAccountId === BILLING_OTHER) {
-    const { manualId } = await prompts(
-      {
-        type: 'text',
-        name: 'manualId',
-        message: tr('new.firebase.q.billingAccount.manualId'),
-        hint: tr('new.firebase.q.billingAccount.manualId.hint'),
-        validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.billingAccount.manualId.required')),
-      },
-      { onCancel }
-    );
+
+  const askManualId = async () => {
+    const manualId = await ui.text({
+      message: tr('new.firebase.q.billingAccount.manualId'),
+      placeholder: tr('new.firebase.q.billingAccount.manualId.hint'),
+      validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.billingAccount.manualId.required')),
+      onCancel,
+    });
     return manualId?.trim() || null;
+  };
+
+  if (!billingList.accounts?.length) {
+    ui.note(tr('new.firebase.q.billingAccount.context'));
+    return askManualId();
   }
+
+  ui.note(tr('new.firebase.q.billingAccount.context'));
+  const billingAccountId = await ui.select({
+    message: tr('new.firebase.q.billingAccount'),
+    initialValue: billingList.accounts[0].id,
+    options: [
+      ...billingList.accounts.map((a) => ({
+        value: a.id,
+        label: `${a.name || a.id} (${a.id})`,
+      })),
+      { value: BILLING_OTHER, label: tr('new.firebase.q.billingAccount.other') },
+    ],
+    onCancel,
+  });
+
+  if (billingAccountId === BILLING_OTHER) return askManualId();
   return billingAccountId;
 }
 
@@ -169,100 +127,77 @@ async function promptBillingAccountIfNeeded(tr, onCancel) {
 async function promptOrganizationIfNeeded(tr, onCancel) {
   const orgList = await listGcpOrganizations();
   if (!orgList.ok || !orgList.organizations?.length) return null;
-  const choices = [
-    ...orgList.organizations.map((o) => ({
-      title: `${o.name} (${o.id})`,
-      value: o.id,
-    })),
-    { title: tr('new.firebase.q.organization.none'), value: null },
-  ];
-  const { organizationId } = await prompts(
-    {
-      type: 'select',
-      name: 'organizationId',
-      message: tr('new.firebase.q.organization'),
-      hint: tr('new.firebase.q.organization.hint'),
-      choices,
-    },
-    { onCancel }
-  );
+  const organizationId = await ui.select({
+    message: tr('new.firebase.q.organization'),
+    initialValue: orgList.organizations[0].id,
+    options: [
+      ...orgList.organizations.map((o) => ({
+        value: o.id,
+        label: `${o.name} (${o.id})`,
+      })),
+      { value: null, label: tr('new.firebase.q.organization.none') },
+    ],
+    onCancel,
+  });
   return organizationId || null;
 }
 
 // ── Helpers ───────────────────────────────────────────────────────────────────
 
-function printBanner(tr) {
-  const bar = kleur.gray('─────────────────────────────────────────────────');
-  const logo = [
-    '  ╦╔═ ╔═╗ ╔═╗ ╦ ╦',
-    '  ╠╩╗ ╠═╣ ╚═╗ ╚╦╝',
-    '  ╩ ╩ ╩ ╩ ╚═╝  ╩ ',
-  ]
-    .map((line) => gradient(['#a78bfa', '#60a5fa'])(line))
-    .join('\n');
-  console.log(`\n${bar}\n`);
-  console.log(logo);
-  console.log('');
-  console.log(`  ${kleur.dim(tr('new.subtitle2'))}`);
-  console.log(`\n${bar}\n`);
-}
-
 function printPrerequisites(tr, backend, firebaseSetupMode = 'existing', checkResults = []) {
   const gcloudOk = checkResults.every(
     (r) => !r.name?.includes('gcloud') || r.ok
   );
-  console.log(kleur.bold().yellow(`  ${tr('new.prereq.title')}`));
   const firebaseCreate = firebaseSetupMode === 'create';
+  const items = [];
+
   if (backend === 'firebase') {
     if (firebaseCreate) {
-      if (!gcloudOk) {
-        console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.1')}`));
-      }
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.2')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.projectQuota')}`));
-      console.log(kleur.cyan(`  ${tr('new.firebase.prereq.create.note')}`));
+      if (!gcloudOk) items.push(tr('new.firebase.prereq.create.1'));
+      items.push(tr('new.firebase.prereq.create.2'));
+      items.push(tr('new.firebase.prereq.create.projectQuota'));
+      items.push(tr('new.firebase.prereq.create.note'));
     } else {
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.1')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.2')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.3')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.4')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.5')}`));
-      console.log(kleur.cyan(`  ${tr('new.firebase.prereq.doc')}`));
+      items.push(tr('new.firebase.prereq.1'));
+      items.push(tr('new.firebase.prereq.2'));
+      items.push(tr('new.firebase.prereq.3'));
+      items.push(tr('new.firebase.prereq.4'));
+      items.push(tr('new.firebase.prereq.5'));
+      items.push(tr('new.firebase.prereq.doc'));
     }
   } else if (backend === 'supabase') {
     if (firebaseCreate) {
-      if (!gcloudOk) {
-        console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.1')}`));
-      }
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.2')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.projectQuota')}`));
-      console.log(kleur.cyan(`  ${tr('new.firebase.prereq.create.pushNote')}`));
-      console.log(kleur.gray(`  ${tr('new.supabase.prereq.1')}`));
-      console.log(kleur.gray(`  ${tr('new.supabase.prereq.2')}`));
-      console.log(kleur.cyan(`  ${tr('new.supabase.prereq.login')}`));
+      if (!gcloudOk) items.push(tr('new.firebase.prereq.create.1'));
+      items.push(tr('new.firebase.prereq.create.2'));
+      items.push(tr('new.firebase.prereq.create.projectQuota'));
+      items.push(tr('new.firebase.prereq.create.pushNote'));
+      items.push(tr('new.supabase.prereq.1'));
+      items.push(tr('new.supabase.prereq.2'));
+      items.push(tr('new.supabase.prereq.login'));
     } else {
-      console.log(kleur.gray(`  ${tr('new.supabase.prereq.1')}`));
-      console.log(kleur.gray(`  ${tr('new.supabase.prereq.2')}`));
-      console.log(kleur.gray(`  ${tr('new.supabase.prereq.3')}`));
-      console.log(kleur.cyan(`  ${tr('new.supabase.prereq.login')}`));
+      items.push(tr('new.supabase.prereq.1'));
+      items.push(tr('new.supabase.prereq.2'));
+      items.push(tr('new.supabase.prereq.3'));
+      items.push(tr('new.supabase.prereq.login'));
     }
   } else if (backend === 'api') {
     if (firebaseCreate) {
-      if (!gcloudOk) {
-        console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.1')}`));
-      }
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.2')}`));
-      console.log(kleur.gray(`  ${tr('new.firebase.prereq.create.projectQuota')}`));
-      console.log(kleur.cyan(`  ${tr('new.firebase.prereq.create.pushNote')}`));
-      console.log(kleur.gray(`  ${tr('new.api.prereq.1')}`));
-      console.log(kleur.gray(`  ${tr('new.api.prereq.2')}`));
+      if (!gcloudOk) items.push(tr('new.firebase.prereq.create.1'));
+      items.push(tr('new.firebase.prereq.create.2'));
+      items.push(tr('new.firebase.prereq.create.projectQuota'));
+      items.push(tr('new.firebase.prereq.create.pushNote'));
+      items.push(tr('new.api.prereq.1'));
+      items.push(tr('new.api.prereq.2'));
     } else {
-      console.log(kleur.gray(`  ${tr('new.api.prereq.1')}`));
-      console.log(kleur.gray(`  ${tr('new.api.prereq.2')}`));
-      console.log(kleur.gray(`  ${tr('new.api.prereq.3')}`));
+      items.push(tr('new.api.prereq.1'));
+      items.push(tr('new.api.prereq.2'));
+      items.push(tr('new.api.prereq.3'));
     }
   }
-  console.log('');
+
+  if (items.length > 0) {
+    ui.note(items.map((i) => `• ${i}`).join('\n'), tr('new.prereq.title'));
+  }
 }
 
 function printSummary(tr, answers) {
@@ -271,25 +206,18 @@ function printSummary(tr, answers) {
     : tr('new.firebase.confirm.none');
 
   const backendLabel = { firebase: '🔥 Firebase', supabase: '🟢 Supabase', api: '🔗 API REST' }[answers.backend] || answers.backend;
-  const bar = kleur.gray('  ─────────────────────────────────────────────');
-
-  console.log(`\n${bar}`);
-  console.log(kleur.bold(`  📦 ${tr('new.firebase.confirm.title')}`));
-  console.log(bar);
-  console.log(`  ${kleur.dim(tr('new.firebase.confirm.app') + ':')}        ${kleur.white(answers.appName)}`);
-  console.log(`  ${kleur.dim('Bundle:')}        ${kleur.white(answers.bundleId)}`);
-  console.log(`  ${kleur.dim('Backend:')}       ${kleur.white(backendLabel)}`);
-  if (answers.firebaseProjectId) {
-    console.log(`  ${kleur.dim('Firebase:')}      ${kleur.white(answers.firebaseProjectId)}`);
-  }
-  if (answers.supabaseUrl) {
-    console.log(`  ${kleur.dim('Supabase URL:')}  ${kleur.white(answers.supabaseUrl)}`);
-  }
-  if (answers.apiBaseUrl) {
-    console.log(`  ${kleur.dim('API URL:')}       ${kleur.white(answers.apiBaseUrl)}`);
-  }
-  console.log(`  ${kleur.dim(tr('new.firebase.confirm.modules') + ':')}     ${kleur.white(modules)}`);
-  console.log(bar);
+
+  const rows = [
+    `${kleur.dim(tr('new.firebase.confirm.app') + ':')}        ${kleur.white(answers.appName)}`,
+    `${kleur.dim('Bundle:')}        ${kleur.white(answers.bundleId)}`,
+    `${kleur.dim('Backend:')}       ${kleur.white(backendLabel)}`,
+  ];
+  if (answers.firebaseProjectId) rows.push(`${kleur.dim('Firebase:')}      ${kleur.white(answers.firebaseProjectId)}`);
+  if (answers.supabaseUrl)       rows.push(`${kleur.dim('Supabase URL:')}  ${kleur.white(answers.supabaseUrl)}`);
+  if (answers.apiBaseUrl)        rows.push(`${kleur.dim('API URL:')}       ${kleur.white(answers.apiBaseUrl)}`);
+  rows.push(`${kleur.dim(tr('new.firebase.confirm.modules') + ':')}     ${kleur.white(modules)}`);
+
+  console.log(infoBox(`📦 ${tr('new.firebase.confirm.title')}`, rows.join('\n')));
 }
 
 const STEP_LABELS = {
@@ -378,38 +306,35 @@ function stepProgress(key, lang) {
 function printCreateFromScratchStatus(result, tr) {
   if (result.sha1Skipped) {
     const err = (result.sha1Error || '').replace(/\s+/g, ' ').slice(0, 120);
-    if (result.sha1Skipped === 'api_failed') {
-      console.log(kleur.yellow(`  ${tr('new.sha1.skipped.apiFailed', { error: err })}`));
-    } else {
-      console.log(kleur.yellow(`  ${tr('new.sha1.skipped.other', { reason: result.sha1Skipped })}`));
-    }
-    console.log(kleur.yellow(`     ${tr('new.sha1.addManually')}`));
-    if (result.sha1ManualUrl) console.log(kleur.cyan(`     ${result.sha1ManualUrl}`));
+    const msg = result.sha1Skipped === 'api_failed'
+      ? tr('new.sha1.skipped.apiFailed', { error: err })
+      : tr('new.sha1.skipped.other', { reason: result.sha1Skipped });
+    const url = result.sha1ManualUrl ? `\n${kleur.cyan(result.sha1ManualUrl)}` : '';
+    ui.log.warn(`${msg}\n${tr('new.sha1.addManually')}${url}`);
   } else {
-    console.log(kleur.green(`  ${tr('new.sha1.added')}`));
+    ui.log.success(tr('new.sha1.added'));
   }
 
   if (result.firestoreCreated) {
-    console.log(kleur.green(`  ${tr('new.firestore.created')}`));
+    ui.log.success(tr('new.firestore.created'));
   } else {
-    if (result.firestoreError) console.log(kleur.yellow(`  ${tr('new.firestore.notCreated.error', { error: (result.firestoreError || '').slice(0, 100) })}`));
-    else console.log(kleur.yellow(`  ${tr('new.firestore.notCreated')}`));
-    console.log(kleur.yellow(`     ${tr('new.activateManually')}`));
-    console.log(kleur.cyan(`     ${result.firestoreUrl}`));
+    const msg = result.firestoreError
+      ? tr('new.firestore.notCreated.error', { error: (result.firestoreError || '').slice(0, 100) })
+      : tr('new.firestore.notCreated');
+    ui.log.warn(`${msg}\n${tr('new.activateManually')}\n${kleur.cyan(result.firestoreUrl)}`);
   }
 
   if (result.storageCreated) {
-    console.log(kleur.green(`  ${tr('new.storage.created')}`));
+    ui.log.success(tr('new.storage.created'));
   } else {
-    if (result.storageError) console.log(kleur.yellow(`  ${tr('new.storage.notCreated.error', { error: (result.storageError || '').slice(0, 100) })}`));
-    else console.log(kleur.yellow(`  ${tr('new.storage.notCreated')}`));
-    console.log(kleur.yellow(`     ${tr('new.activateManually')}`));
-    console.log(kleur.cyan(`     ${result.storageUrl}`));
+    const msg = result.storageError
+      ? tr('new.storage.notCreated.error', { error: (result.storageError || '').slice(0, 100) })
+      : tr('new.storage.notCreated');
+    ui.log.warn(`${msg}\n${tr('new.activateManually')}\n${kleur.cyan(result.storageUrl)}`);
   }
 }
 
 function printSuccessCard(tr, answers, targetDir) {
-  const bar = kleur.gray('  ─────────────────────────────────────────────');
   const folderName = path.basename(targetDir);
   const consoleUrl = answers.backend === 'firebase' && answers.firebaseProjectId
     ? `https://console.firebase.google.com/project/${answers.firebaseProjectId}`
@@ -417,71 +342,62 @@ function printSuccessCard(tr, answers, targetDir) {
       ? 'https://supabase.com/dashboard'
       : answers.apiBaseUrl || null;
 
-  console.log(`\n${bar}`);
-  console.log(kleur.bold(gradient(['#a78bfa', '#60a5fa'])(`  🎉 ${tr('new.success.title')}`)));
-  console.log(bar);
-  console.log('');
-  console.log(`  ${kleur.bold(tr('new.success.nextSteps'))}`);
-  console.log('');
-  console.log(`  ${kleur.dim('1.')} ${kleur.dim(tr('new.success.step.cd'))}`);
-  console.log(`     ${kleur.cyan(`cd ${folderName}`)}`);
-  console.log('');
+  const lines = [];
+  lines.push(kleur.bold(tr('new.success.nextSteps')));
+  lines.push('');
+  lines.push(`${kleur.dim('1.')} ${kleur.dim(tr('new.success.step.cd'))}`);
+  lines.push(`   ${kleur.cyan(`cd ${folderName}`)}`);
   let stepNum = 2;
   if (answers.backend === 'firebase') {
-    console.log(`  ${kleur.dim(`${stepNum++}.`)} ${kleur.dim(tr('new.success.step.deploy'))}`);
-    console.log(`     ${kleur.cyan('kasy deploy')}`);
-    console.log('');
+    lines.push('');
+    lines.push(`${kleur.dim(`${stepNum++}.`)} ${kleur.dim(tr('new.success.step.deploy'))}`);
+    lines.push(`   ${kleur.cyan('kasy deploy')}`);
   }
-  console.log(`  ${kleur.dim(`${stepNum++}.`)} ${kleur.dim(tr('new.success.step.run'))}`);
-  console.log(`     ${kleur.cyan('kasy run')}`);
-  console.log(`     ${kleur.dim(tr('new.success.step.run.vscode'))}`);
+  lines.push('');
+  lines.push(`${kleur.dim(`${stepNum++}.`)} ${kleur.dim(tr('new.success.step.run'))}`);
+  lines.push(`   ${kleur.cyan('kasy run')}`);
+  lines.push(`   ${kleur.dim(tr('new.success.step.run.vscode'))}`);
   if (consoleUrl) {
-    console.log('');
-    console.log(`  ${kleur.dim(`${stepNum}.`)} ${kleur.dim(tr('new.success.step.console'))}`);
-    console.log(`     ${kleur.cyan(consoleUrl)}`);
+    lines.push('');
+    lines.push(`${kleur.dim(`${stepNum}.`)} ${kleur.dim(tr('new.success.step.console'))}`);
+    lines.push(`   ${kleur.cyan(consoleUrl)}`);
   }
-  console.log('');
-  console.log(bar);
-  console.log('');
+
+  console.log(successBox(`🎉 ${tr('new.success.title')}`, lines.join('\n')));
 }
 
 function printStepResult(step, lang = 'pt') {
+  const label = stepLabel(step.name, lang);
   if (step.skipped) {
-    const label = stepLabel(step.name, lang);
-    console.log(`  ${kleur.gray('⏭')}  ${kleur.gray(label)} ${kleur.gray('(skipped)')}`);
+    ui.log.step(`${kleur.dim(label)} ${kleur.dim('(skipped)')}`);
     return;
   }
-  const icon = step.ok ? kleur.green('✓') : kleur.red('✗');
-  const label = step.ok
-    ? kleur.white(stepLabel(step.name, lang))
-    : kleur.red(stepLabel(step.name, lang));
-  console.log(`  ${icon}  ${label}${step.detail ? kleur.gray(` — ${step.detail.split('\n')[0]}`) : ''}`);
+  const detail = step.detail ? kleur.dim(` — ${step.detail.split('\n')[0]}`) : '';
+  if (step.ok) {
+    ui.log.success(`${label}${detail}`);
+  } else {
+    ui.log.error(`${label}${detail}`);
+  }
 }
 
 function onCancel(tr) {
-  console.log(kleur.yellow(`\n  ${tr('new.firebase.error.aborted')}\n`));
+  ui.cancel(tr('new.firebase.error.aborted'));
   process.exit(0);
 }
 
 async function promptSupabaseManual(tr, cancel) {
-  return prompts(
-    [
-      {
-        type: 'text',
-        name: 'supabaseUrl',
-        message: tr('prompt.supabase.url.enter'),
-        hint: 'https://xxxx.supabase.co',
-        validate: (v) => (v && v.trim() ? true : tr('prompt.supabase.url.required')),
-      },
-      {
-        type: 'text',
-        name: 'supabaseAnonKey',
-        message: tr('prompt.supabase.anonKey.enter'),
-        validate: (v) => (v && v.trim() ? true : tr('prompt.supabase.anonKey.required')),
-      },
-    ],
-    { onCancel: cancel }
-  );
+  const supabaseUrl = await ui.text({
+    message: tr('prompt.supabase.url.enter'),
+    placeholder: 'https://xxxx.supabase.co',
+    validate: (v) => (v && v.trim() ? undefined : tr('prompt.supabase.url.required')),
+    onCancel: cancel,
+  });
+  const supabaseAnonKey = await ui.text({
+    message: tr('prompt.supabase.anonKey.enter'),
+    validate: (v) => (v && v.trim() ? undefined : tr('prompt.supabase.anonKey.required')),
+    onCancel: cancel,
+  });
+  return { supabaseUrl, supabaseAnonKey };
 }
 
 // ── Module presets ────────────────────────────────────────────────────────────
@@ -568,7 +484,7 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
     });
   } else {
     const backendLabel = { firebase: '🔥 Firebase', supabase: '🟢 Supabase', api: '🔗 API REST' }[backend] || backend;
-    console.log(kleur.gray(`  Backend: ${kleur.white(backendLabel)}`));
+    ui.log.info(`Backend: ${kleur.white(backendLabel)}`);
   }
 
   // ── 3b. Backend tool checks (required — blocks if missing) ───────────────
@@ -577,7 +493,7 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   let backendCheckResults = [];
   if (backendChecks.length > 0) {
     if (backend === 'supabase' || backend === 'api') {
-      console.log(kleur.dim(`\n  ℹ ${tr('new.checks.firebaseForPush')}`));
+      ui.log.info(tr('new.checks.firebaseForPush'));
     }
     const backendLabel = tr('setup.checks.backend', { backend }) || `  Checking ${backend} tools…`;
     backendCheckResults = await runChecks(backendChecks, backendLabel, {
@@ -587,14 +503,15 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       doneLabel: tr('setup.checks.backend.done', { backend }) || `${backend} tools ready`,
     });
     if (hasRequiredFailures(backendCheckResults)) {
-      console.log(kleur.red(`\n  ✖ ${tr('new.checks.requiredBlock')}`));
-      console.log(kleur.dim(`\n  ${tr('new.checks.installFirebase')}`));
+      const installSteps = [tr('new.checks.installFirebase')];
       if (backend === 'supabase') {
         const platform = process.platform === 'darwin' ? 'darwin' : process.platform === 'win32' ? 'win32' : 'linux';
         const supabaseKey = `new.checks.installSupabase.${platform}`;
-        console.log(kleur.dim(`  ${tr(supabaseKey) || tr('new.checks.installSupabase')}`));
+        installSteps.push(tr(supabaseKey) || tr('new.checks.installSupabase'));
       }
-      console.log('');
+      ui.log.error(tr('new.checks.requiredBlock'));
+      ui.note(installSteps.map((s) => `• ${s}`).join('\n'));
+      ui.cancel(tr('new.firebase.error.aborted'));
       process.exit(1);
     }
   }
@@ -603,7 +520,8 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   let core;
   if (yes) {
     if (!hasExplicitDir) {
-      console.error(kleur.red(`\n  ✗ --yes requires an app name: kasy new MyApp --yes\n`));
+      ui.log.error('--yes requires an app name: kasy new MyApp --yes');
+      ui.cancel(tr('new.firebase.error.aborted'));
       process.exit(1);
     }
     const appName = path.basename(targetDir);
@@ -614,8 +532,8 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       .replace(/[^a-z0-9]/g, '');
     const bundleId = (slug && !/^\d/.test(slug)) ? `com.${slug}.app` : 'com.example.app';
     core = { appName, bundleId };
-    console.log(kleur.gray(`  App:      ${kleur.white(appName)}`));
-    console.log(kleur.gray(`  Bundle:   ${kleur.white(bundleId)}`));
+    ui.log.info(`App: ${kleur.white(appName)}`);
+    ui.log.info(`Bundle: ${kleur.white(bundleId)}`);
   } else {
     const appName = await ui.text({
       message: tr('new.firebase.q.appName'),
@@ -735,96 +653,70 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   } else {
     let firebaseProjectId = projectHint?.trim() || '';
     if (!firebaseProjectId && backend === 'firebase') {
-      const { pid } = await prompts(
-        {
-          type: 'text',
-          name: 'pid',
-          message: tr('new.firebase.q.projectId'),
-          hint: tr('new.firebase.q.projectId.hint'),
-          validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.projectId.required')),
-        },
-        { onCancel: cancel }
-      );
+      const pid = await ui.text({
+        message: tr('new.firebase.q.projectId'),
+        placeholder: tr('new.firebase.q.projectId.hint'),
+        validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.projectId.required')),
+        onCancel: cancel,
+      });
       firebaseProjectId = pid?.trim() || '';
     }
     if (firebaseProjectId) {
       core.firebaseProjectId = firebaseProjectId;
-      console.log(kleur.gray(`  Project:  ${kleur.white(firebaseProjectId)}`));
+      ui.log.info(`Project: ${kleur.white(firebaseProjectId)}`);
     }
   }
 
   // ── Firebase region — Quick mode uses default (us-central1) ──────────
   let firebaseRegion = 'us-central1';
   if (backend === 'firebase' && !isQuick) {
-    const { region } = await prompts(
-      {
-        type: 'select',
-        name: 'region',
-        message: tr('new.firebase.q.region'),
-        choices: [
-          { title: tr('new.firebase.q.region.us'),      value: 'us-central1' },
-          { title: tr('new.firebase.q.region.europe'),  value: 'europe-west1' },
-          { title: tr('new.firebase.q.region.brazil'),  value: 'southamerica-east1' },
-        ],
-        initial: 0,
-      },
-      { onCancel: cancel }
-    );
+    const region = await ui.select({
+      message: tr('new.firebase.q.region'),
+      initialValue: 'us-central1',
+      options: [
+        { value: 'us-central1',         label: tr('new.firebase.q.region.us') },
+        { value: 'europe-west1',        label: tr('new.firebase.q.region.europe') },
+        { value: 'southamerica-east1',  label: tr('new.firebase.q.region.brazil') },
+      ],
+      onCancel: cancel,
+    });
     firebaseRegion = region || 'us-central1';
   }
 
   // ── Firebase: create from scratch (when selected) ─────────────────────────
   let firebaseIncludeWeb = true;
   if (backend === 'firebase' && firebaseSetupMode === 'create') {
-    const { includeWeb } = await prompts(
-      {
-        type: 'confirm',
-        name: 'includeWeb',
-        message: tr('new.firebase.create.includeWeb'),
-        initial: true,
-      },
-      { onCancel: cancel }
-    );
-    firebaseIncludeWeb = includeWeb !== false;
+    firebaseIncludeWeb = await ui.confirm({
+      message: tr('new.firebase.create.includeWeb'),
+      initialValue: true,
+      onCancel: cancel,
+    });
     const gcloudCheck = await checkGcloudAuth();
     if (!gcloudCheck.ok) {
-      console.log(kleur.red(`  ${tr('new.firebase.create.gcloudRequired')}`));
+      ui.log.error(tr('new.firebase.create.gcloudRequired'));
       if (gcloudCheck.missing === 'gcloud') {
         const instructions = getGcloudInstallInstructions();
-        console.log(kleur.cyan(`\n  ${tr('new.firebase.create.installTitle')}`));
-        if (instructions.install) {
-          console.log(kleur.white(`  ${tr('new.firebase.create.installCommand')}:`));
-          console.log(kleur.cyan(`    ${instructions.install}`));
-        }
-        if (instructions.hint) {
-          console.log(kleur.gray(`  ${instructions.hint}`));
-        }
-        console.log(kleur.white(`  ${tr('new.firebase.create.installAfter')}:`));
-        console.log(kleur.cyan(`    ${instructions.after}`));
-        console.log(kleur.gray(`  ${tr('new.firebase.create.installUrl')}: ${instructions.url}`));
-        console.log('');
+        const noteLines = [tr('new.firebase.create.installTitle')];
+        if (instructions.install) noteLines.push(`${tr('new.firebase.create.installCommand')}:\n  ${kleur.cyan(instructions.install)}`);
+        if (instructions.hint) noteLines.push(instructions.hint);
+        noteLines.push(`${tr('new.firebase.create.installAfter')}:\n  ${kleur.cyan(instructions.after)}`);
+        noteLines.push(`${tr('new.firebase.create.installUrl')}: ${instructions.url}`);
+        ui.note(noteLines.join('\n\n'));
       } else {
-        console.log(kleur.cyan(`  ${tr('new.firebase.create.authCommand')}`));
-        console.log('');
+        ui.note(tr('new.firebase.create.authCommand'));
       }
-      console.log(kleur.yellow(`  ${tr('new.firebase.create.fallbackHint')}`));
-      const fallback = await prompts(
-        {
-          type: 'text',
-          name: 'firebaseProjectId',
-          message: tr('new.firebase.q.projectId'),
-          hint: tr('new.firebase.q.projectId.hint'),
-          validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.projectId.required')),
-        },
-        { onCancel: cancel }
-      );
-      core.firebaseProjectId = fallback.firebaseProjectId;
+      ui.log.warn(tr('new.firebase.create.fallbackHint'));
+      core.firebaseProjectId = await ui.text({
+        message: tr('new.firebase.q.projectId'),
+        placeholder: tr('new.firebase.q.projectId.hint'),
+        validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.projectId.required')),
+        onCancel: cancel,
+      });
     } else {
       const selectedOrgId = await promptOrganizationIfNeeded(tr, cancel);
       let selectedBillingId = await promptBillingAccountIfNeeded(tr, cancel);
-      console.log(kleur.dim(`\n  ⏱  ${tr('new.firebase.create.estimatedTime')}`));
-      console.log(kleur.dim(`  ${tr('new.internet.warning')}\n`));
-      const ps1 = makeProgressSpinner();
+      ui.log.info(`${tr('new.firebase.create.estimatedTime')}\n${tr('new.internet.warning')}`);
+      const ps1 = ui.makeStepper();
       ps1.next(tr('new.firebase.create.creating'));
       const setupResult = await setupFromScratch(core.appName.trim(), core.bundleId.trim(), {
         includeWeb: firebaseIncludeWeb,
@@ -841,15 +733,31 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
             ps1.next(stepProgress('storage', language));
           } else if (key === 'auth-providers-warn') {
             ps1.stop();
-            console.log(kleur.yellow(`  ⚠ ${tr('new.firebase.interactive.authWarn')}`));
-            console.log(kleur.cyan(`     ${data?.url || ''}`));
+            ui.log.warn(`${tr('new.firebase.interactive.authWarn')}\n${kleur.cyan(data?.url || '')}`);
           }
         },
       });
+      const askReady = async (readyKey) => {
+        const ok = await ui.confirm({
+          message: tr(readyKey),
+          initialValue: true,
+          onCancel: cancel,
+        });
+        if (!ok) {
+          ui.cancel(tr('prompt.cancelled'));
+          process.exit(0);
+        }
+      };
+      const showBeforeContinue = (step1Key, authUrl) => {
+        ui.note(
+          `${tr(step1Key)}\n${kleur.cyan(authUrl)}`,
+          tr('new.firebase.create.beforeContinue.title')
+        );
+      };
       if (setupResult.ok) {
         ps1.succeed(tr('new.firebase.create.success'));
         core.firebaseProjectId = setupResult.projectId;
-        console.log(kleur.dim(`  Project ID: ${core.firebaseProjectId}`));
+        ui.log.info(`Project ID: ${core.firebaseProjectId}`);
         printCreateFromScratchStatus(setupResult, tr);
         const authUrl = `https://console.firebase.google.com/project/${core.firebaseProjectId}/authentication/providers`;
         if (setupResult.authEnabled && !setupResult.googleSignInSkipped) {
@@ -862,50 +770,33 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
           const readyKey = setupResult.googleSignInSkipped
             ? 'new.firebase.create.beforeContinue.ready'
             : 'new.firebase.create.beforeContinue.ready.noAuth';
-          console.log(kleur.bold().yellow(`\n  ${tr('new.firebase.create.beforeContinue.title')}`));
-          console.log(kleur.gray(`  ${tr(step1Key)}`));
-          console.log(kleur.cyan(`     ${authUrl}`));
+          showBeforeContinue(step1Key, authUrl);
           openUrl(authUrl);
-          const { ready } = await prompts(
-            {
-              type: 'confirm',
-              name: 'ready',
-              message: tr(readyKey),
-              initial: true,
-            },
-            { onCancel: cancel }
-          );
-          if (!ready) {
-            console.log(kleur.gray(`  ${tr('prompt.cancelled')}`));
-            process.exit(0);
-          }
+          await askReady(readyKey);
         }
 
       } else {
         ps1.fail(tr('new.firebase.create.failed'));
         let lastResult = setupResult;
         while (lastResult.billingFailed && lastResult.projectId) {
-          console.log(kleur.red(`  ${tr('new.firebase.create.failed')}: ${lastResult.error}`));
-          console.log(kleur.yellow(`\n  ${tr('new.firebase.create.billingRetry.title')}`));
-          console.log(kleur.cyan(`     ${lastResult.billingManualLink}`));
-          console.log(kleur.gray(`  ${tr('new.firebase.create.billingRetry.hint')}`));
-          const { retry } = await prompts(
-            {
-              type: 'confirm',
-              name: 'retry',
-              message: tr('new.firebase.create.billingRetry.ready'),
-              initial: true,
-            },
-            { onCancel: cancel }
+          ui.log.error(`${tr('new.firebase.create.failed')}: ${lastResult.error}`);
+          ui.note(
+            `${kleur.cyan(lastResult.billingManualLink)}\n\n${tr('new.firebase.create.billingRetry.hint')}`,
+            tr('new.firebase.create.billingRetry.title')
           );
+          const retry = await ui.confirm({
+            message: tr('new.firebase.create.billingRetry.ready'),
+            initialValue: true,
+            onCancel: cancel,
+          });
           if (!retry) {
-            console.log(kleur.gray(`  ${tr('new.firebase.create.billingRetry.exit')}`));
-            console.log(kleur.cyan(`  ${tr('new.firebase.create.useExistingHint', { id: lastResult.projectId })}`));
+            ui.log.message(tr('new.firebase.create.billingRetry.exit'));
+            ui.log.info(tr('new.firebase.create.useExistingHint', { id: lastResult.projectId }));
             process.exit(0);
           }
-          console.log(kleur.gray(`  ${tr('new.firebase.create.billingRetry.retrying')}`));
+          ui.log.message(tr('new.firebase.create.billingRetry.retrying'));
           selectedBillingId = await promptBillingAccountIfNeeded(tr, cancel);
-          const ps2 = makeProgressSpinner();
+          const ps2 = ui.makeStepper();
           ps2.next(tr('new.firebase.create.creating'));
           lastResult = await setupFromScratch(core.appName.trim(), core.bundleId.trim(), {
                 includeWeb: firebaseIncludeWeb,
@@ -927,7 +818,7 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
           if (lastResult.ok) {
             ps2.succeed(tr('new.firebase.create.success'));
             core.firebaseProjectId = lastResult.projectId;
-            console.log(kleur.dim(`  Project ID: ${core.firebaseProjectId}`));
+            ui.log.info(`Project ID: ${core.firebaseProjectId}`);
             printCreateFromScratchStatus(lastResult, tr);
             const authUrl = `https://console.firebase.google.com/project/${core.firebaseProjectId}/authentication/providers`;
             if (lastResult.authEnabled && !lastResult.googleSignInSkipped) {
@@ -939,47 +830,32 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
               const lastReadyKey = lastResult.googleSignInSkipped
                 ? 'new.firebase.create.beforeContinue.ready'
                 : 'new.firebase.create.beforeContinue.ready.noAuth';
-              console.log(kleur.bold().yellow(`\n  ${tr('new.firebase.create.beforeContinue.title')}`));
-              console.log(kleur.gray(`  ${tr(step1Key)}`));
-              console.log(kleur.cyan(`     ${authUrl}`));
+              showBeforeContinue(step1Key, authUrl);
               openUrl(authUrl);
-              const { ready } = await prompts(
-                {
-                  type: 'confirm',
-                  name: 'ready',
-                  message: tr(lastReadyKey),
-                  initial: true,
-                },
-                { onCancel: cancel }
-              );
-              if (!ready) {
-                console.log(kleur.gray(`  ${tr('prompt.cancelled')}`));
-                process.exit(0);
-              }
+              await askReady(lastReadyKey);
             }
 
             break;
+          } else {
+            // Loop will replace ps2 next iteration; close the failed step now
+            // so the previous spinner doesn't stay in the running state visually.
+            ps2.fail(tr('new.firebase.create.failed'));
           }
         }
         if (!lastResult.ok && !lastResult.billingFailed) {
           const isProjectQuota = /exceeded your allotted project quota|project quota/i.test(String(lastResult.error || ''));
           const msg = isProjectQuota ? tr('new.firebase.create.projectQuotaExceeded') : `${tr('new.firebase.create.failed')}: ${lastResult.error}`;
-          console.log(kleur.red(`  ${msg}`));
+          ui.log.error(msg);
           if (lastResult.projectId) {
             core.firebaseProjectId = lastResult.projectId;
-            console.log(kleur.gray(`  ${tr('new.firebase.create.usingProjectId', { id: lastResult.projectId })}`));
+            ui.log.message(tr('new.firebase.create.usingProjectId', { id: lastResult.projectId }));
           } else {
-            const fallback = await prompts(
-              {
-                type: 'text',
-                name: 'firebaseProjectId',
-                message: tr('new.firebase.q.projectId'),
-                hint: tr('new.firebase.q.projectId.hint'),
-                validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.projectId.required')),
-              },
-              { onCancel: cancel }
-            );
-            core.firebaseProjectId = fallback.firebaseProjectId;
+            core.firebaseProjectId = await ui.text({
+              message: tr('new.firebase.q.projectId'),
+              placeholder: tr('new.firebase.q.projectId.hint'),
+              validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.projectId.required')),
+              onCancel: cancel,
+            });
           }
         }
       }
@@ -990,42 +866,30 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   if ((backend === 'supabase' || backend === 'api') && firebaseSetupMode === 'create') {
     const gcloudCheck = await checkGcloudAuth();
     if (!gcloudCheck.ok) {
-      console.log(kleur.red(`  ${tr('new.firebase.create.gcloudRequired')}`));
+      ui.log.error(tr('new.firebase.create.gcloudRequired'));
       if (gcloudCheck.missing === 'gcloud') {
         const instructions = getGcloudInstallInstructions();
-        console.log(kleur.cyan(`\n  ${tr('new.firebase.create.installTitle')}`));
-        if (instructions.install) {
-          console.log(kleur.white(`  ${tr('new.firebase.create.installCommand')}:`));
-          console.log(kleur.cyan(`    ${instructions.install}`));
-        }
-        if (instructions.hint) {
-          console.log(kleur.gray(`  ${instructions.hint}`));
-        }
-        console.log(kleur.white(`  ${tr('new.firebase.create.installAfter')}:`));
-        console.log(kleur.cyan(`    ${instructions.after}`));
-        console.log(kleur.gray(`  ${tr('new.firebase.create.installUrl')}: ${instructions.url}`));
-        console.log('');
+        const noteLines = [tr('new.firebase.create.installTitle')];
+        if (instructions.install) noteLines.push(`${tr('new.firebase.create.installCommand')}:\n  ${kleur.cyan(instructions.install)}`);
+        if (instructions.hint) noteLines.push(instructions.hint);
+        noteLines.push(`${tr('new.firebase.create.installAfter')}:\n  ${kleur.cyan(instructions.after)}`);
+        noteLines.push(`${tr('new.firebase.create.installUrl')}: ${instructions.url}`);
+        ui.note(noteLines.join('\n\n'));
       } else {
-        console.log(kleur.cyan(`  ${tr('new.firebase.create.authCommand')}`));
-        console.log('');
+        ui.note(tr('new.firebase.create.authCommand'));
       }
-      console.log(kleur.yellow(`  ${tr('new.firebase.create.fallbackHint')}`));
-      const fallback = await prompts(
-        {
-          type: 'text',
-          name: 'firebaseProjectId',
-          message: tr('new.firebase.q.projectId'),
-          hint: tr('new.firebase.q.projectId.hint') + ' (FCM + Remote Config)',
-          validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.projectId.required')),
-        },
-        { onCancel: cancel }
-      );
-      core.firebaseProjectId = fallback.firebaseProjectId;
+      ui.log.warn(tr('new.firebase.create.fallbackHint'));
+      core.firebaseProjectId = await ui.text({
+        message: tr('new.firebase.q.projectId'),
+        placeholder: tr('new.firebase.q.projectId.hint') + ' (FCM + Remote Config)',
+        validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.projectId.required')),
+        onCancel: cancel,
+      });
     } else {
       const selectedOrgId = await promptOrganizationIfNeeded(tr, cancel);
       const selectedBillingId = await promptBillingAccountIfNeeded(tr, cancel);
-      console.log(kleur.dim(`\n  ${tr('new.internet.warning')}\n`));
-      const ps3 = makeProgressSpinner();
+      ui.log.info(tr('new.internet.warning'));
+      const ps3 = ui.makeStepper();
       ps3.next(tr('new.firebase.create.creatingPush'));
       const setupResult = await setupFromScratch(core.appName.trim(), core.bundleId.trim(), {
         includeWeb: true,
@@ -1046,26 +910,21 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       if (setupResult.ok) {
         ps3.succeed(tr('new.firebase.create.successPush'));
         core.firebaseProjectId = setupResult.projectId;
-        console.log(kleur.dim(`  Project ID: ${core.firebaseProjectId}`));
+        ui.log.info(`Project ID: ${core.firebaseProjectId}`);
         printCreateFromScratchStatus(setupResult, tr);
       } else {
         ps3.fail(tr('new.firebase.create.failed'));
-        console.log(kleur.red(`  ${tr('new.firebase.create.failed')}: ${setupResult.error}`));
+        ui.log.error(`${tr('new.firebase.create.failed')}: ${setupResult.error}`);
         if (setupResult.projectId) {
           core.firebaseProjectId = setupResult.projectId;
-          console.log(kleur.gray(`  ${tr('new.firebase.create.usingProjectId', { id: setupResult.projectId })}`));
+          ui.log.message(tr('new.firebase.create.usingProjectId', { id: setupResult.projectId }));
         } else {
-          const fallback = await prompts(
-            {
-              type: 'text',
-              name: 'firebaseProjectId',
-              message: tr('new.firebase.q.projectId'),
-              hint: tr('new.firebase.q.projectId.hint') + ' (FCM + Remote Config)',
-              validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.projectId.required')),
-            },
-            { onCancel: cancel }
-          );
-          core.firebaseProjectId = fallback.firebaseProjectId;
+          core.firebaseProjectId = await ui.text({
+            message: tr('new.firebase.q.projectId'),
+            placeholder: tr('new.firebase.q.projectId.hint') + ' (FCM + Remote Config)',
+            validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.projectId.required')),
+            onCancel: cancel,
+          });
         }
       }
     }
@@ -1079,91 +938,75 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   let supabaseExistingResult = null;
 
   if (backend === 'supabase') {
-    const { createSupabase } = await prompts(
-      {
-        type: 'select',
-        name: 'createSupabase',
-        message: tr('new.supabase.q.create'),
-        choices: [
-          { title: tr('new.supabase.q.create.create'), value: true },
-          { title: tr('new.supabase.q.create.existing'), value: false },
-        ],
-        initial: 0,
-      },
-      { onCancel: cancel }
-    );
-    supabaseCreate = createSupabase;
+    supabaseCreate = await ui.select({
+      message: tr('new.supabase.q.create'),
+      initialValue: true,
+      options: [
+        { value: true,  label: tr('new.supabase.q.create.create') },
+        { value: false, label: tr('new.supabase.q.create.existing') },
+      ],
+      onCancel: cancel,
+    });
+
+    const showLoginRequired = () => {
+      ui.log.warn(`${tr('new.supabase.loginRequired')}\n${kleur.cyan(tr('new.supabase.loginCommand'))}`);
+    };
 
     if (supabaseCreate) {
       const loginCheck = await checkLoggedIn();
-      if (!loginCheck.ok) {
-        console.log(kleur.yellow(`  ${tr('new.supabase.loginRequired')}`));
-        console.log(kleur.cyan(`  ${tr('new.supabase.loginCommand')}`));
-        console.log('');
-      }
+      if (!loginCheck.ok) showLoginRequired();
       const orgsResult = await getOrgsList();
       if (!orgsResult.ok || !orgsResult.orgs?.length) {
-        console.log(kleur.red(`  ${tr('new.supabase.orgsRequired')}`));
+        ui.log.error(tr('new.supabase.orgsRequired'));
         supabaseCreateResult = { ok: false, error: tr('new.supabase.orgsRequired') };
       } else {
         let orgId = orgsResult.orgs[0].id;
         if (orgsResult.orgs.length > 1) {
-          const { selectedOrgId } = await prompts(
-            {
-              type: 'select',
-              name: 'selectedOrgId',
-              message: tr('new.supabase.q.orgSelect'),
-              choices: orgsResult.orgs.map((o) => ({ title: o.name, value: o.id })),
-            },
-            { onCancel: cancel }
-          );
-          orgId = selectedOrgId;
+          orgId = await ui.select({
+            message: tr('new.supabase.q.orgSelect'),
+            initialValue: orgsResult.orgs[0].id,
+            options: orgsResult.orgs.map((o) => ({ value: o.id, label: o.name })),
+            onCancel: cancel,
+          });
         }
         let supabaseRegion = DEFAULT_SUPABASE_REGION;
         if (!isQuick) {
-          const { region } = await prompts(
-            {
-              type: 'select',
-              name: 'region',
-              message: tr('new.supabase.q.region'),
-              choices: [
-                { title: tr('new.supabase.q.region.brazil'), value: 'sa-east-1' },
-                { title: tr('new.supabase.q.region.us'),     value: 'us-east-1' },
-                { title: tr('new.supabase.q.region.europe'), value: 'eu-west-1' },
-                { title: tr('new.supabase.q.region.global'), value: 'us-east-1' },
-              ],
-              initial: 0,
-            },
-            { onCancel: cancel }
-          );
+          const region = await ui.select({
+            message: tr('new.supabase.q.region'),
+            initialValue: 'sa-east-1',
+            options: [
+              { value: 'sa-east-1', label: tr('new.supabase.q.region.brazil') },
+              { value: 'us-east-1', label: tr('new.supabase.q.region.us') },
+              { value: 'eu-west-1', label: tr('new.supabase.q.region.europe') },
+            ],
+            onCancel: cancel,
+          });
           supabaseRegion = region || DEFAULT_SUPABASE_REGION;
         }
-        const { dbPassword } = await prompts(
-          {
-            type: 'password',
-            name: 'dbPassword',
-            message: tr('new.supabase.q.dbPassword'),
-            validate: (v) => (v && v.length >= 6 ? true : tr('new.supabase.q.dbPassword.required')),
-          },
-          { onCancel: cancel }
-        );
+        const dbPassword = await ui.password({
+          message: tr('new.supabase.q.dbPassword'),
+          validate: (v) => (v && v.length >= 6 ? undefined : tr('new.supabase.q.dbPassword.required')),
+          onCancel: cancel,
+        });
         supabaseDbPassword = dbPassword;
-        console.log(kleur.dim(`  ${tr('new.internet.warning')}`));
-        console.log(kleur.gray(`  ${tr('new.supabase.creating')}`));
+        ui.log.info(tr('new.internet.warning'));
+        const createSpinner = ui.spinner();
+        createSpinner.start(tr('new.supabase.creating'));
         supabaseCreateResult = await createProjectAndGetKeys(
           core.appName.trim().replace(/\s+/g, '-').toLowerCase(),
           supabaseDbPassword,
           supabaseRegion,
           orgId
         );
+        createSpinner.stop(tr('new.supabase.creating'));
       }
       if (supabaseCreateResult.ok) {
         core.supabaseUrl = supabaseCreateResult.supabaseUrl;
         core.supabaseAnonKey = supabaseCreateResult.supabaseAnonKey;
-        console.log(kleur.green(`  ✓ ${tr('new.supabase.created')}`));
+        ui.log.success(tr('new.supabase.created'));
       } else {
-        console.log(kleur.red(`  ${tr('new.supabase.createFailed')}: ${supabaseCreateResult.error}`));
-        console.log(kleur.gray(`  ${tr('new.supabase.loginHint')}`));
+        ui.log.error(`${tr('new.supabase.createFailed')}: ${supabaseCreateResult.error}`);
+        ui.log.message(tr('new.supabase.loginHint'));
         Object.assign(core, await promptSupabaseManual(tr, cancel));
         supabaseCreate = false;
       }
@@ -1171,54 +1014,46 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       // Usar projeto Supabase existente: org → projeto → keys → senha (mesmo fluxo de setup, sem criar)
       const loginCheck = await checkLoggedIn();
       if (!loginCheck.ok) {
-        console.log(kleur.yellow(`  ${tr('new.supabase.loginRequired')}`));
-        console.log(kleur.cyan(`  ${tr('new.supabase.loginCommand')}`));
-        console.log('');
+        showLoginRequired();
         Object.assign(core, await promptSupabaseManual(tr, cancel));
       } else {
         const orgsResult = await getOrgsList();
         if (!orgsResult.ok || !orgsResult.orgs?.length) {
-          console.log(kleur.red(`  ${tr('new.supabase.orgsRequired')}`));
+          ui.log.error(tr('new.supabase.orgsRequired'));
           Object.assign(core, await promptSupabaseManual(tr, cancel));
         } else {
           let orgId = orgsResult.orgs[0].id;
           if (orgsResult.orgs.length > 1) {
-            const { selectedOrgId } = await prompts(
-              { type: 'select', name: 'selectedOrgId', message: tr('new.supabase.q.useExisting.orgSelect'), choices: orgsResult.orgs.map((o) => ({ title: o.name, value: o.id })) },
-              { onCancel: cancel }
-            );
-            orgId = selectedOrgId;
+            orgId = await ui.select({
+              message: tr('new.supabase.q.useExisting.orgSelect'),
+              initialValue: orgsResult.orgs[0].id,
+              options: orgsResult.orgs.map((o) => ({ value: o.id, label: o.name })),
+              onCancel: cancel,
+            });
           }
           const projectsResult = await getProjectsByOrg(orgId);
           if (!projectsResult.ok || !projectsResult.projects?.length) {
-            console.log(kleur.yellow(`  ${tr('new.supabase.projectsRequired')}`));
+            ui.log.warn(tr('new.supabase.projectsRequired'));
             Object.assign(core, await promptSupabaseManual(tr, cancel));
           } else {
-            const { selectedProjectRef } = await prompts(
-              {
-                type: 'select',
-                name: 'selectedProjectRef',
-                message: tr('new.supabase.q.useExisting.projectSelect'),
-                choices: projectsResult.projects.map((p) => ({ title: `${p.name} (${p.id})`, value: p.id })),
-              },
-              { onCancel: cancel }
-            );
+            const selectedProjectRef = await ui.select({
+              message: tr('new.supabase.q.useExisting.projectSelect'),
+              initialValue: projectsResult.projects[0].id,
+              options: projectsResult.projects.map((p) => ({ value: p.id, label: `${p.name} (${p.id})` })),
+              onCancel: cancel,
+            });
             const keysResult = await getProjectKeys(selectedProjectRef);
             if (!keysResult.ok) {
-              console.log(kleur.red(`  ${keysResult.error}`));
+              ui.log.error(keysResult.error);
               Object.assign(core, await promptSupabaseManual(tr, cancel));
             } else {
               core.supabaseUrl = keysResult.supabaseUrl;
               core.supabaseAnonKey = keysResult.supabaseAnonKey;
-              const { dbPassword } = await prompts(
-                {
-                  type: 'password',
-                  name: 'dbPassword',
-                  message: tr('new.supabase.q.dbPassword.existing'),
-                  validate: (v) => (v && v.length >= 6 ? true : tr('new.supabase.q.dbPassword.required')),
-                },
-                { onCancel: cancel }
-              );
+              const dbPassword = await ui.password({
+                message: tr('new.supabase.q.dbPassword.existing'),
+                validate: (v) => (v && v.length >= 6 ? undefined : tr('new.supabase.q.dbPassword.required')),
+                onCancel: cancel,
+              });
               supabaseExistingResult = {
                 ok: true,
                 projectRef: selectedProjectRef,
@@ -1226,7 +1061,7 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
                 supabaseAnonKey: keysResult.supabaseAnonKey,
                 dbPassword,
               };
-              console.log(kleur.green(`  ✓ ${tr('new.supabase.existingLinked')}`));
+              ui.log.success(tr('new.supabase.existingLinked'));
             }
           }
         }
@@ -1242,22 +1077,17 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   let googleIosClientId = '';
 
   if (backend === 'api') {
-    const api = await prompts(
-      {
-        type: 'text',
-        name: 'apiBaseUrl',
-        message: tr('new.api.q.baseUrl'),
-        hint: tr('new.api.q.baseUrl.hint'),
-        initial: 'https://api.example.com',
-      },
-      { onCancel: cancel }
-    );
-    Object.assign(core, api);
+    core.apiBaseUrl = await ui.text({
+      message: tr('new.api.q.baseUrl'),
+      placeholder: tr('new.api.q.baseUrl.hint'),
+      initialValue: 'https://api.example.com',
+      onCancel: cancel,
+    });
   }
 
   // ── Firebase existing project: enable APIs + create Firestore/Storage ───
   if (backend === 'firebase' && firebaseSetupMode === 'existing' && core.firebaseProjectId) {
-    const ps4 = makeProgressSpinner();
+    const ps4 = ui.makeStepper();
     ps4.next(stepProgress('enable-apis', language));
     const existingSetup = await setupExistingProject(core.firebaseProjectId, {
       onProgress: (key, data) => {
@@ -1265,19 +1095,17 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
           ps4.next(stepProgress('enable-apis', language));
         } else if (key === 'enable-apis-warn') {
           ps4.warn(`${tr('new.firebase.create.failed')}: APIs`);
-          console.log(kleur.yellow(`  ⚠ ${tr('new.firebase.existing.apisFailed')} ${(data?.error || '').slice(0, 80)}`));
+          ui.log.warn(`${tr('new.firebase.existing.apisFailed')} ${(data?.error || '').slice(0, 80)}`);
         } else if (key === 'firestore') {
           ps4.next(stepProgress('firestore', language));
         } else if (key === 'storage') {
           ps4.next(stepProgress('storage', language));
         } else if (key === 'auth-providers-warn') {
           ps4.stop();
-          console.log(kleur.yellow(`  ⚠ ${tr('new.firebase.interactive.authWarn')}`));
-          console.log(kleur.cyan(`     ${data?.url || ''}`));
+          ui.log.warn(`${tr('new.firebase.interactive.authWarn')}\n${kleur.cyan(data?.url || '')}`);
         } else if (key === 'auth-google-warn') {
           ps4.stop();
-          console.log(kleur.yellow(`  ⚠ ${tr('new.firebase.existing.googleSignInManual')}`));
-          console.log(kleur.cyan(`     ${data?.url || ''}`));
+          ui.log.warn(`${tr('new.firebase.existing.googleSignInManual')}\n${kleur.cyan(data?.url || '')}`);
         }
       },
     });
@@ -1285,17 +1113,15 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       ps4.succeed(stepLabel('firestore', language));
     } else if (existingSetup.firestoreError && !existingSetup.firestoreError.includes('ALREADY_EXISTS')) {
       ps4.fail(`Firestore: ${(existingSetup.firestoreError || '').slice(0, 80)}`);
-      console.log(kleur.cyan(`     ${existingSetup.firestoreUrl}`));
+      ui.log.message(kleur.cyan(existingSetup.firestoreUrl));
     } else {
       ps4.stop();
     }
     if (existingSetup.storageCreated) {
-      console.log(kleur.green(`  ✔ ${stepLabel('storage', language)}`));
+      ui.log.success(stepLabel('storage', language));
     } else if (existingSetup.storageError && !existingSetup.storageError.includes('ALREADY_EXISTS')) {
-      console.log(kleur.yellow(`  ⚠ Storage: ${(existingSetup.storageError || '').slice(0, 80)}`));
-      console.log(kleur.cyan(`     ${existingSetup.storageUrl}`));
+      ui.log.warn(`Storage: ${(existingSetup.storageError || '').slice(0, 80)}\n${kleur.cyan(existingSetup.storageUrl)}`);
     }
-    console.log('');
   }
 
   // ── Optional modules ────────────────────────────────────────────────────
@@ -1311,22 +1137,18 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
     modules = preselectedModules;
   } else if (isQuick) {
     // Quick mode: show preset picker (no multiselect).
-    const { preset } = await prompts(
-      {
-        type: 'select',
-        name: 'preset',
-        message: tr('new.q.preset'),
-        choices: [
-          { title: tr('new.q.preset.starter'), value: 'starter' },
-          { title: tr('new.q.preset.saas'),    value: 'saas' },
-          { title: tr('new.q.preset.content'), value: 'content' },
-          { title: tr('new.q.preset.full'),    value: 'full' },
-          { title: tr('new.q.preset.none'),    value: 'none' },
-        ],
-        initial: 0,
-      },
-      { onCancel: cancel }
-    );
+    const preset = await ui.select({
+      message: tr('new.q.preset'),
+      initialValue: 'starter',
+      options: [
+        { value: 'starter', label: tr('new.q.preset.starter') },
+        { value: 'saas',    label: tr('new.q.preset.saas') },
+        { value: 'content', label: tr('new.q.preset.content') },
+        { value: 'full',    label: tr('new.q.preset.full') },
+        { value: 'none',    label: tr('new.q.preset.none') },
+      ],
+      onCancel: cancel,
+    });
     modules = MODULE_PRESETS[preset] || [];
   } else {
     // Advanced mode: full multiselect — built from catalog, filtered by audience + backend.
@@ -1344,7 +1166,9 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       { header: 'new.modules.header.ci',           ids: ['ci'] },
     ];
 
-    const moduleChoices = [];
+    // Clack multiselect does not support disabled separator rows, so we
+    // prefix each option with its group name (e.g. "Monetização · RevenueCat").
+    const moduleOptions = [];
     for (const group of groups) {
       const inGroup = visibleFeatures.filter((f) => {
         if (!group.ids.includes(f.id)) return false;
@@ -1352,29 +1176,24 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
         return true;
       });
       if (inGroup.length === 0) continue;
-      if (group.header) {
-        moduleChoices.push({ title: tr(group.header), value: `__header_${group.header}__`, disabled: true });
-      }
+      const groupLabel = group.header ? tr(group.header) : null;
       for (const f of inGroup) {
-        const label = tr(`new.firebase.module.${f.id}`) + (f.status === 'internal' ? ' [beta]' : '');
-        moduleChoices.push({ title: label, value: f.id, selected: false });
+        const moduleLabel = tr(`new.firebase.module.${f.id}`) + (f.status === 'internal' ? ' [beta]' : '');
+        const label = groupLabel
+          ? `${kleur.dim(groupLabel + ' · ')}${moduleLabel}`
+          : moduleLabel;
+        moduleOptions.push({ value: f.id, label });
       }
     }
 
-    const { modules: rawModules } = await prompts(
-      {
-        type: 'multiselect',
-        name: 'modules',
-        message: tr('new.firebase.q.modules'),
-        hint: tr('new.firebase.q.modules.hint'),
-        instructions: tr('prompt.multiselect.instructions'),
-        choices: moduleChoices,
-        min: 0,
-        warn: tr('prompt.multiselect.warnDisabled'),
-      },
-      { onCancel: cancel }
-    );
-    modules = (rawModules || []).filter((m) => !String(m).startsWith('__header_'));
+    const rawModules = await ui.multiselect({
+      message: tr('new.firebase.q.modules'),
+      options: moduleOptions,
+      initialValues: [],
+      required: false,
+      onCancel: cancel,
+    });
+    modules = rawModules || [];
   }
 
   if (backend === 'firebase' && firebaseSetupMode === 'create' && firebaseIncludeWeb) {
@@ -1385,57 +1204,41 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   const moduleAnswers = {};
 
   if (modules.includes('revenuecat')) {
-    const rc = await prompts(
-      [
-        {
-          type: 'text',
-          name: 'rcAndroidKey',
-          message: tr('new.firebase.q.revenuecat.android'),
-          validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.revenuecat.android.required')),
-        },
-        {
-          type: 'text',
-          name: 'rcIosKey',
-          message: tr('new.firebase.q.revenuecat.ios'),
-          validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.revenuecat.ios.required')),
-        },
-        {
-          type: 'select',
-          name: 'defaultPaywall',
-          message: tr('new.firebase.q.paywall'),
-          hint: tr('new.firebase.q.paywall.hint'),
-          choices: [
-            { title: 'Basic (list of plans)', value: 'basic' },
-            { title: 'With trial switch', value: 'withSwitch' },
-            { title: 'Row + comparison table', value: 'basicRow' },
-            { title: 'Minimal (benefits + CTA)', value: 'minimal' },
-          ],
-          initial: 0,
-        },
+    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')),
+      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')),
+      onCancel: cancel,
+    });
+    moduleAnswers.defaultPaywall = await ui.select({
+      message: tr('new.firebase.q.paywall'),
+      initialValue: 'basic',
+      options: [
+        { value: 'basic',      label: 'Basic (list of plans)' },
+        { value: 'withSwitch', label: 'With trial switch' },
+        { value: 'basicRow',   label: 'Row + comparison table' },
+        { value: 'minimal',    label: 'Minimal (benefits + CTA)' },
       ],
-      { onCancel: cancel }
-    );
-    Object.assign(moduleAnswers, rc);
+      onCancel: cancel,
+    });
   }
 
   // RC web key — only in advanced mode (optional credential, can configure later).
   if (!isQuick && modules.includes('revenuecat') && modules.includes('web')) {
-    const rcWebKey = await prompts(
-      {
-        type: 'text',
-        name: 'rcWebKey',
-        message: tr('new.firebase.q.revenuecat.webKey'),
-        validate: (v) => {
-          if (!v || !v.trim()) return true; // optional — blank is fine
-          return /^rcb_/.test(v.trim()) ? true : tr('new.firebase.q.revenuecat.webKey.invalid');
-        },
+    const rcWebKey = await ui.text({
+      message: tr('new.firebase.q.revenuecat.webKey'),
+      validate: (v) => {
+        if (!v || !v.trim()) return undefined; // optional — blank is fine
+        return /^rcb_/.test(v.trim()) ? undefined : tr('new.firebase.q.revenuecat.webKey.invalid');
       },
-      { onCancel: cancel }
-    );
-    Object.assign(moduleAnswers, {
-      revenuecatWeb: true,
-      rcWebKey: (rcWebKey.rcWebKey || '').trim(),
+      onCancel: cancel,
     });
+    moduleAnswers.revenuecatWeb = true;
+    moduleAnswers.rcWebKey = (rcWebKey || '').trim();
   } else if (modules.includes('revenuecat') && modules.includes('web')) {
     // Quick mode: mark web billing as included but key will be configured later.
     moduleAnswers.revenuecatWeb = true;
@@ -1444,76 +1247,52 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
 
   // Sentry DSN — already optional (blank = configure later). Skip in quick mode.
   if (!isQuick && modules.includes('sentry')) {
-    const s = await prompts(
-      {
-        type: 'text',
-        name: 'sentryDsn',
-        message: tr('new.firebase.q.sentry.dsn'),
-        validate: (v) => {
-          if (!v || !v.trim()) return true; // optional — blank is fine
-          return /^https?:\/\/[^@\s]+@[^/\s]+\/\d+$/.test(v.trim())
-            ? true
-            : tr('new.firebase.q.sentry.dsn.invalid');
-        },
+    moduleAnswers.sentryDsn = await ui.text({
+      message: tr('new.firebase.q.sentry.dsn'),
+      validate: (v) => {
+        if (!v || !v.trim()) return undefined; // optional — blank is fine
+        return /^https?:\/\/[^@\s]+@[^/\s]+\/\d+$/.test(v.trim())
+          ? undefined
+          : tr('new.firebase.q.sentry.dsn.invalid');
       },
-      { onCancel: cancel }
-    );
-    Object.assign(moduleAnswers, s);
+      onCancel: cancel,
+    });
   }
 
   // Mixpanel token — already optional. Skip in quick mode.
   if (!isQuick && modules.includes('analytics')) {
-    const mx = await prompts(
-      {
-        type: 'text',
-        name: 'mixpanelToken',
-        message: tr('new.firebase.q.mixpanel.token'),
-      },
-      { onCancel: cancel }
-    );
-    Object.assign(moduleAnswers, mx);
+    moduleAnswers.mixpanelToken = await ui.text({
+      message: tr('new.firebase.q.mixpanel.token'),
+      onCancel: cancel,
+    });
   }
 
   // LLM Chat credentials — skip in quick mode, all fields optional.
   if (!isQuick && modules.includes('llm_chat')) {
-    const { configureLlmNow } = await prompts(
-      {
-        type: 'confirm',
-        name: 'configureLlmNow',
-        message: tr('new.q.llm_chat.configureNow'),
-        hint: tr('new.q.llm_chat.configureNow.hint'),
-        initial: true,
-      },
-      { onCancel: cancel }
-    );
+    const configureLlmNow = await ui.confirm({
+      message: tr('new.q.llm_chat.configureNow'),
+      initialValue: true,
+      onCancel: cancel,
+    });
 
     if (configureLlmNow) {
-      const llm = await prompts(
-        [
-          {
-            type: 'select',
-            name: 'llmProvider',
-            message: tr('add.prompt.llmProvider'),
-            choices: [
-              { title: 'OpenAI (gpt-4o-mini)', value: 'openai' },
-              { title: 'Google Gemini (gemini-1.5-flash)', value: 'gemini' },
-            ],
-            initial: 0,
-          },
-          {
-            type: 'text',
-            name: 'llmSystemPrompt',
-            message: tr('add.prompt.llmSystemPrompt'),
-          },
-          {
-            type: 'text',
-            name: 'llmApiKey',
-            message: tr('add.prompt.llmApiKey'),
-          },
+      moduleAnswers.llmProvider = await ui.select({
+        message: tr('add.prompt.llmProvider'),
+        initialValue: 'openai',
+        options: [
+          { value: 'openai', label: 'OpenAI (gpt-4o-mini)' },
+          { value: 'gemini', label: 'Google Gemini (gemini-1.5-flash)' },
         ],
-        { onCancel: cancel }
-      );
-      Object.assign(moduleAnswers, llm);
+        onCancel: cancel,
+      });
+      moduleAnswers.llmSystemPrompt = await ui.text({
+        message: tr('add.prompt.llmSystemPrompt'),
+        onCancel: cancel,
+      });
+      moduleAnswers.llmApiKey = await ui.password({
+        message: tr('add.prompt.llmApiKey'),
+        onCancel: cancel,
+      });
     } else {
       moduleAnswers.llmConfigureLater = true;
     }
@@ -1523,70 +1302,48 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
 
   // Facebook — required credentials, always ask.
   if (modules.includes('facebook')) {
-    const fb = await prompts(
-      [
-        {
-          type: 'text',
-          name: 'fbAppId',
-          message: tr('new.firebase.q.facebook.appId'),
-          validate: (v) => {
-            if (!v || !v.trim()) return tr('new.firebase.q.facebook.appId.required');
-            return /^\d+$/.test(v.trim()) ? true : tr('new.firebase.q.facebook.appId.invalid');
-          },
-        },
-        {
-          type: 'text',
-          name: 'fbToken',
-          message: tr('new.firebase.q.facebook.token'),
-          validate: (v) => (v && v.trim() ? true : tr('new.firebase.q.facebook.token.required')),
-        },
-      ],
-      { onCancel: cancel }
-    );
-    Object.assign(moduleAnswers, fb);
+    moduleAnswers.fbAppId = await ui.text({
+      message: tr('new.firebase.q.facebook.appId'),
+      validate: (v) => {
+        if (!v || !v.trim()) return tr('new.firebase.q.facebook.appId.required');
+        return /^\d+$/.test(v.trim()) ? undefined : tr('new.firebase.q.facebook.appId.invalid');
+      },
+      onCancel: cancel,
+    });
+    moduleAnswers.fbToken = await ui.password({
+      message: tr('new.firebase.q.facebook.token'),
+      validate: (v) => (v && v.trim() ? undefined : tr('new.firebase.q.facebook.token.required')),
+      onCancel: cancel,
+    });
   }
 
   // Server secrets (webhook, Meta Ads) — skip in quick mode, configure later via `kasy deploy`.
   if (!isQuick && modules.includes('revenuecat') && (backend === 'supabase' || backend === 'firebase')) {
-    const { configureSecretsNow } = await prompts(
-      {
-        type: 'confirm',
-        name: 'configureSecretsNow',
-        message: tr('new.firebase.q.secrets.configureNow'),
-        hint: tr('new.firebase.q.secrets.configureNow.hint'),
-        initial: true,
-      },
-      { onCancel: cancel }
-    );
+    const configureSecretsNow = await ui.confirm({
+      message: tr('new.firebase.q.secrets.configureNow'),
+      initialValue: true,
+      onCancel: cancel,
+    });
 
     if (configureSecretsNow) {
-      const rcSecrets = await prompts(
-        [
-          {
-            type: 'text',
-            name: 'rcWebhookKey',
-            message: tr('new.firebase.q.revenuecat.webhookKey'),
-            initial: generateWebhookKey(),
-            hint: tr('new.firebase.q.revenuecat.webhookKey.hint'),
-          },
-          {
-            type: 'text',
-            name: 'metaAccessToken',
-            message: tr('new.firebase.q.revenuecat.metaToken'),
-          },
-          {
-            type: 'text',
-            name: 'metaDatasetId',
-            message: tr('new.firebase.q.revenuecat.metaDataset'),
-            validate: (v) => {
-              if (!v || !v.trim()) return true; // optional — blank is fine
-              return /^\d+$/.test(v.trim()) ? true : tr('new.firebase.q.revenuecat.metaDataset.invalid');
-            },
-          },
-        ],
-        { onCancel: cancel }
-      );
-      Object.assign(moduleAnswers, rcSecrets);
+      moduleAnswers.rcWebhookKey = await ui.text({
+        message: tr('new.firebase.q.revenuecat.webhookKey'),
+        initialValue: generateWebhookKey(),
+        placeholder: tr('new.firebase.q.revenuecat.webhookKey.hint'),
+        onCancel: cancel,
+      });
+      moduleAnswers.metaAccessToken = await ui.password({
+        message: tr('new.firebase.q.revenuecat.metaToken'),
+        onCancel: cancel,
+      });
+      moduleAnswers.metaDatasetId = await ui.text({
+        message: tr('new.firebase.q.revenuecat.metaDataset'),
+        validate: (v) => {
+          if (!v || !v.trim()) return undefined; // optional — blank is fine
+          return /^\d+$/.test(v.trim()) ? undefined : tr('new.firebase.q.revenuecat.metaDataset.invalid');
+        },
+        onCancel: cancel,
+      });
     } else {
       moduleAnswers.secretsConfigureLater = true;
     }
@@ -1616,24 +1373,29 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   printSummary(tr, answers);
 
   if (!yes) {
-    const { proceed } = await prompts(
-      {
-        type: 'confirm',
-        name: 'proceed',
-        message: tr('new.firebase.confirm.proceed'),
-        initial: true,
-      },
-      { onCancel: cancel }
-    );
+    const proceed = await ui.confirm({
+      message: tr('new.firebase.confirm.proceed'),
+      initialValue: true,
+      onCancel: cancel,
+    });
     if (!proceed) {
-      console.log(kleur.gray(`\n  ${tr('prompt.cancelled')}\n`));
+      ui.cancel(tr('prompt.cancelled'));
       process.exit(0);
     }
   }
 
   // ── Generate ────────────────────────────────────────────────────────────
-  console.log('');
-  const spinner = ora(stepProgress('project-setup', language)).start();
+  // Stepper shows each step closing as ✦ and the next starting as ⠙ — so the
+  // user gets explicit "X done → Y starting" feedback instead of a single
+  // spinner with a mutating message.
+  const stepper = ui.makeStepper();
+  // First step started here so even silent prep work shows progress.
+  stepper.next(stepProgress('project-setup', language));
+
+  const onProgress = (key) => {
+    // Each onProgress closes previous step with ✦ and starts the new one.
+    stepper.next(stepProgress(key, language));
+  };
 
   let result;
   try {
@@ -1647,9 +1409,7 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
         modules: answers.modules,
         moduleAnswers,
         language,
-        onProgress: (key) => {
-          spinner.text = kleur.cyan(stepProgress(key, language));
-        },
+        onProgress,
       });
     } else if (backend === 'api') {
       result = await generateApiProject(targetDir, {
@@ -1660,9 +1420,7 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
         modules: answers.modules,
         moduleAnswers,
         language,
-        onProgress: (key) => {
-          spinner.text = kleur.cyan(stepProgress(key, language));
-        },
+        onProgress,
       });
     } else {
       result = await generateFirebaseProject(targetDir, {
@@ -1675,14 +1433,14 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
         includeWeb: answers.includeWeb !== false,
         functionsRegion: firebaseRegion,
         language,
-        onProgress: (key) => {
-          spinner.text = kleur.cyan(stepProgress(key, language));
-        },
+        onProgress,
       });
     }
-    spinner.stop();
+    // Close the last in-flight step. We don't need a label — its own message
+    // is already shown next to the ✦ by Clack.
+    stepper.succeed();
   } catch (err) {
-    spinner.fail(kleur.red(err.message));
+    stepper.fail(err.message);
     throw err;
   }
 
@@ -1709,8 +1467,12 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   }
 
   // ── Results ─────────────────────────────────────────────────────────────
-  console.log('');
-  result.steps.forEach((s) => printStepResult(s, language));
+  // Stepper already announced each successful step. Print only failures and
+  // skipped steps here, so the user notices what didn't run without seeing
+  // every success twice.
+  result.steps
+    .filter((s) => s.skipped || !s.ok)
+    .forEach((s) => printStepResult(s, language));
 
   // ── Supabase: link + db push + functions deploy (when project was created or existing selected) ─
   const supabaseSetupPayload = (supabaseCreate && supabaseCreateResult?.ok)
@@ -1750,19 +1512,20 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
       // ── FCM Service Account key (best effort via gcloud — Firebase uses ADC, Supabase needs JSON) ──
       let fcmServiceAccountJson = null;
       if (answers.firebaseProjectId) {
-        const fcmSpinner = ora(kleur.cyan(tr('new.fcm.generating'))).start();
+        const fcmSpinner = ui.spinner();
+        fcmSpinner.start(tr('new.fcm.generating'));
         const fcmResult = await createFcmServiceAccountKey(answers.firebaseProjectId);
+        fcmSpinner.stop(tr('new.fcm.generating'));
         if (fcmResult.ok) {
           fcmServiceAccountJson = fcmResult.json;
-          fcmSpinner.stop();
           printStepResult({ name: 'fcm-key', ok: true }, language);
         } else {
-          fcmSpinner.stop();
           printStepResult({ name: 'fcm-key', ok: false, detail: 'configure FIREBASE_SERVICE_ACCOUNT_JSON manualmente' }, language);
         }
       }
 
-      const setupSpinner = ora(kleur.cyan(tr('new.supabase.setup'))).start();
+      const setupSpinner = ui.spinner();
+      setupSpinner.start(tr('new.supabase.setup'));
       try {
         const secrets = {
           firebaseProjectId: answers.firebaseProjectId,
@@ -1788,21 +1551,22 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
           secrets,
           google
         );
-        setupSpinner.stop();
+        setupSpinner.stop(tr('new.supabase.setup'));
         setupSteps.forEach((s) => printStepResult(s, language));
       } catch (err) {
-        setupSpinner.fail(kleur.red(err.message));
-        console.log(kleur.yellow(`  ${tr('new.supabase.setupManual')}`));
+        setupSpinner.error(err.message);
+        ui.log.warn(tr('new.supabase.setupManual'));
       }
     }
   }
 
   // ── API: FCM Service Account key — save to .kasy/ for server configuration ──
   if (backend === 'api' && answers.firebaseProjectId) {
-    const fcmSpinner = ora(kleur.cyan(tr('new.fcm.generating'))).start();
+    const fcmSpinner = ui.spinner();
+    fcmSpinner.start(tr('new.fcm.generating'));
     const fcmResult = await createFcmServiceAccountKey(answers.firebaseProjectId);
+    fcmSpinner.stop(tr('new.fcm.generating'));
     if (fcmResult.ok) {
-      fcmSpinner.stop();
       try {
         const kasyDir = path.join(targetDir, '.kasy');
         await fs.ensureDir(kasyDir);
@@ -1817,12 +1581,11 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
           }
         }
         printStepResult({ name: 'fcm-key-saved', ok: true }, language);
-        console.log(kleur.gray(`     ${tr('new.fcm.serverConfig')}`));
+        ui.log.message(tr('new.fcm.serverConfig'));
       } catch (_) {
         printStepResult({ name: 'fcm-key-saved', ok: false, detail: 'salvar arquivo de chave falhou' }, language);
       }
     } else {
-      fcmSpinner.stop();
       printStepResult({ name: 'fcm-key', ok: false, detail: 'configure FIREBASE_SERVICE_ACCOUNT_JSON manualmente' }, language);
     }
   }
@@ -1835,9 +1598,10 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   if (answers.firebaseProjectId && firebaseSetupMode === 'existing') {
     const flutterfireOkForSha1 = result.steps.find((s) => s.name === 'flutterfire')?.ok;
     if (flutterfireOkForSha1) {
-      const sha1Spinner = ora(kleur.cyan(tr('new.sha1.registering'))).start();
+      const sha1Spinner = ui.spinner();
+      sha1Spinner.start(tr('new.sha1.registering'));
       const sha1Result = await registerDebugSha1(answers.firebaseProjectId, answers.bundleId);
-      sha1Spinner.stop();
+      sha1Spinner.stop(tr('new.sha1.registering'));
       if (sha1Result.ok) {
         if (!sha1Result.existed) {
           printStepResult({ name: 'sha1', ok: true }, language);
@@ -1845,9 +1609,9 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
         // existed === true → already registered, silent success
       } else {
         const sha1ManualUrl = `https://console.firebase.google.com/project/${answers.firebaseProjectId}/settings/general/android:${answers.bundleId}`;
-        console.log(kleur.yellow(`  ⚠ ${tr('new.sha1.failed', { error: (sha1Result.sha1Error || '').slice(0, 120) })}`));
-        console.log(kleur.yellow(`     ${tr('new.sha1.manual')}`));
-        console.log(kleur.cyan(`     ${sha1ManualUrl}`));
+        ui.log.warn(
+          `${tr('new.sha1.failed', { error: (sha1Result.sha1Error || '').slice(0, 120) })}\n${tr('new.sha1.manual')}\n${kleur.cyan(sha1ManualUrl)}`
+        );
         openUrl(sha1ManualUrl);
       }
     }
@@ -1856,14 +1620,9 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   const flutterfireStep = result.steps.find((s) => s.name === 'flutterfire');
   if (flutterfireStep && !flutterfireStep.ok) {
     const platforms = answers.includeWeb !== false ? 'android,ios,web' : 'android,ios';
-    console.log(kleur.yellow(`\n  ${tr('new.firebase.warn.flutterfire')}`));
-    console.log(kleur.yellow(`  ${tr('new.firebase.warn.flutterfire.manual')}`));
-    console.log(
-      kleur.cyan(
-        `  dart pub global run flutterfire_cli:flutterfire configure` +
-        ` --project=${answers.firebaseProjectId}` +
-        ` --out lib/firebase_options_dev.dart --platforms=${platforms} --yes`
-      )
+    const cmd = `dart pub global run flutterfire_cli:flutterfire configure --project=${answers.firebaseProjectId} --out lib/firebase_options_dev.dart --platforms=${platforms} --yes`;
+    ui.log.warn(
+      `${tr('new.firebase.warn.flutterfire')}\n${tr('new.firebase.warn.flutterfire.manual')}\n${kleur.cyan(cmd)}`
     );
   }
 
@@ -1871,16 +1630,15 @@ async function runNew(directory, { language: langHint = null, backend: backendHi
   // Cannot be automated: the .p8 key only exists in Apple Developer Portal.
   if (answers.firebaseProjectId) {
     const apnsUrl = `https://console.firebase.google.com/project/${answers.firebaseProjectId}/settings/cloudmessaging`;
-    console.log('');
-    console.log(kleur.bold().yellow(`  ${tr('new.apns.warning')}`));
-    console.log(kleur.gray(`     ${tr('new.apns.step1')}`));
-    console.log(kleur.gray(`     ${tr('new.apns.step2')}`));
-    console.log(kleur.cyan(`     ${apnsUrl}`));
+    ui.log.warn(
+      `${tr('new.apns.warning')}\n${tr('new.apns.step1')}\n${tr('new.apns.step2')}\n${kleur.cyan(apnsUrl)}`
+    );
     openUrl(apnsUrl);
   }
 
   printSuccessCard(tr, answers, targetDir);
 
+  ui.outro(kleur.bold(tr('new.success.title')));
 }
 
 module.exports = { runNew };