swytchcode 2.14.0-beta.1 → 2.14.0-beta.3

package/bin/swytchcode.js

@@ -22,6 +22,7 @@ const c = {
   green:  '\x1b[32m',
   yellow: '\x1b[33m',
   cyan:   '\x1b[36m',
+  orange: '\x1b[38;5;214m', // brand orange (matches internal/output banner 256 fallback)
   white:  '\x1b[37m',
   gray:   '\x1b[90m',
   bgGreen: '\x1b[42m',
@@ -33,7 +34,7 @@ function write(msg) { process.stdout.write(msg); }
 function writeln(msg = '') { process.stdout.write(msg + '\n'); }
 function err(msg) { process.stderr.write(msg + '\n'); }
 
-function box(lines, colour = c.cyan) {
+function box(lines, colour = c.orange) {
   const width = Math.max(...lines.map(l => stripAnsi(l).length)) + 4;
   const bar   = colour + '─'.repeat(width) + c.reset;
   writeln(bar);
@@ -77,7 +78,7 @@ function menuArrow(prompt, options) {
       writeln(c.bold + prompt + c.reset);
       writeln();
       options.forEach((o, i) => {
-        writeln(`  ${c.cyan}${i + 1}${c.reset}  ${stripAnsi(o.label)}`);
+        writeln(`  ${c.orange}${i + 1}${c.reset}  ${stripAnsi(o.label)}`);
       });
       writeln();
       while (true) {
@@ -103,7 +104,7 @@ function menuArrow(prompt, options) {
       writeln();
       options.forEach((o, i) => {
         if (i === selectedIndex) {
-          writeln(`  ${c.cyan}❯${c.reset} ${c.bold}${c.green}${stripAnsi(o.label)}${c.reset}`);
+          writeln(`  ${c.orange}❯${c.reset} ${c.bold}${c.green}${stripAnsi(o.label)}${c.reset}`);
         } else {
           writeln(`    ${c.dim}${stripAnsi(o.label)}${c.reset}`);
         }
@@ -160,16 +161,16 @@ function spinner(msg) {
   const frames = ['⠋','⠙','⠹','⠸','⠼','⠴','⠦','⠧','⠇','⠏'];
   let i = 0;
   const iv = setInterval(() => {
-    process.stdout.write(`\r${c.cyan}${frames[i++ % frames.length]}${c.reset}  ${msg}`);
+    process.stdout.write(`\r${c.orange}${frames[i++ % frames.length]}${c.reset}  ${msg}`);
   }, 80);
   return {
     stop(doneMsg) {
       clearInterval(iv);
-      process.stdout.write(`\r${c.green}›${c.reset}  ${doneMsg}\n`);
+      process.stdout.write(`\r\x1b[K${c.green}›${c.reset}  ${doneMsg}\n`);
     },
     fail(failMsg) {
       clearInterval(iv);
-      process.stdout.write(`\r${c.red}×${c.reset}  ${failMsg}\n`);
+      process.stdout.write(`\r\x1b[K${c.red}×${c.reset}  ${failMsg}\n`);
     },
   };
 }
@@ -242,9 +243,16 @@ function exitCode(result) {
   return 1;
 }
 
-// Explicit override: SWYTCHCODE_BIN=/path/to/binary bypasses platform resolution.
+// Explicit override: SWYTCHCODE_BIN=/path/to/binary bypasses platform resolution
+// and passes straight through to that binary. The one exception is a bare
+// npx-style launch (npm_command=exec / npx, with no args): there we keep the
+// override binary but skip the passthrough so the onboarding still runs (using
+// that binary for its subprocess calls), which makes onboarding testable locally.
 const explicitBin = (process.env.SWYTCHCODE_BIN || '').trim();
-if (explicitBin) {
+const bareNpxLaunch =
+  process.argv.length <= 2 &&
+  ((process.env.npm_command || '') === 'exec' || (process.env.npm_execpath || '').includes('npx'));
+if (explicitBin && !bareNpxLaunch) {
   const result = spawnBin(explicitBin, process.argv.slice(2));
   if (result.error) {
     err(`swytchcode: failed to launch SWYTCHCODE_BIN="${explicitBin}": ${result.error.message}`);
@@ -253,40 +261,38 @@ if (explicitBin) {
   process.exit(exitCode(result));
 }
 
-const PLATFORM_PACKAGES = {
-  'darwin-arm64': 'swytchcode-cli-darwin-arm64',
-  'darwin-x64':   'swytchcode-cli-darwin-x64',
-  'linux-arm64':  'swytchcode-cli-linux-arm64',
-  'linux-x64':    'swytchcode-cli-linux-x64',
-  'win32-arm64':  'swytchcode-cli-win32-arm64',
-  'win32-x64':    'swytchcode-cli-win32-x64',
-};
-
-const platform = process.platform;
-const arch     = process.arch;
-const key      = `${platform}-${arch}`;
-const pkg      = PLATFORM_PACKAGES[key];
-
-if (!pkg) {
-  err(
-    `swytchcode: unsupported platform "${key}".\n` +
-    `Supported: ${Object.keys(PLATFORM_PACKAGES).join(', ')}\n` +
-    `Install via curl instead: https://cli.swytchcode.com`
-  );
-  process.exit(1);
-}
-
-const isWindows = platform === 'win32';
-const binName   = isWindows ? 'swytchcode.exe' : 'swytchcode';
 let binPath;
-try {
-  binPath = require.resolve(`${pkg}/bin/${binName}`);
-} catch (_) {
-  err(
-    `swytchcode: could not find the binary for "${key}".\n` +
-    `Try reinstalling: npm install -g swytchcode`
-  );
-  process.exit(1);
+if (explicitBin) {
+  binPath = explicitBin;
+} else {
+  const PLATFORM_PACKAGES = {
+    'darwin-arm64': 'swytchcode-cli-darwin-arm64',
+    'darwin-x64':   'swytchcode-cli-darwin-x64',
+    'linux-arm64':  'swytchcode-cli-linux-arm64',
+    'linux-x64':    'swytchcode-cli-linux-x64',
+    'win32-arm64':  'swytchcode-cli-win32-arm64',
+    'win32-x64':    'swytchcode-cli-win32-x64',
+  };
+  const key = `${process.platform}-${process.arch}`;
+  const pkg = PLATFORM_PACKAGES[key];
+  if (!pkg) {
+    err(
+      `swytchcode: unsupported platform "${key}".\n` +
+      `Supported: ${Object.keys(PLATFORM_PACKAGES).join(', ')}\n` +
+      `Install via curl instead: https://cli.swytchcode.com`
+    );
+    process.exit(1);
+  }
+  const binName = process.platform === 'win32' ? 'swytchcode.exe' : 'swytchcode';
+  try {
+    binPath = require.resolve(`${pkg}/bin/${binName}`);
+  } catch (_) {
+    err(
+      `swytchcode: could not find the binary for "${key}".\n` +
+      `Try reinstalling: npm install -g swytchcode`
+    );
+    process.exit(1);
+  }
 }
 
 // Detect npx
@@ -308,15 +314,15 @@ if (userArgs.length > 0 && /^[\w]+\.[\w.]+$/.test(userArgs[0]) && !userArgs[0].s
 }
 async function runOnboardingDirectDemo(canonicalId) {
   writeln();
-  writeln(`  ${c.yellow}⚡ Running ${c.bold}${canonicalId}${c.reset}${c.yellow} live...${c.reset}`);
+  writeln(`  ${c.dim}Running ${c.reset}${c.bold}${canonicalId}${c.reset}${c.dim} ...${c.reset}`);
   writeln();
   const demoResult = spawnBin(binPath, ['exec', canonicalId], { SWYTCHCODE_ONBOARDING: '1' });
   writeln();
   if (demoResult.status === 0) {
-    writeln(`  ${c.dim}That was a real API call through Swytchcode.${c.reset}`);
+    writeln(`  ${c.dim}Done — ran through Swytchcode.${c.reset}`);
     writeln();
   } else {
-    writeln(`  ${c.yellow}⚠  ${c.bold}${canonicalId}${c.reset}${c.yellow} isn't a valid demo tool.${c.reset}`);
+    writeln(`  ${c.dim}${c.bold}${canonicalId}${c.reset}${c.dim} isn't a demo tool — running a sample instead.${c.reset}`);
     writeln(`  ${c.dim}Let's run a working demo instead.${c.reset}`);
     writeln();
     await runDemoSelection();
@@ -351,6 +357,20 @@ function apiGet(urlStr) {
   });
 }
 
+// ─── Welcome card data (mirrors internal/output/banner.go). Declared before the
+// dispatch below because runOnboarding() runs at module-load time and must not
+// hit a temporal-dead-zone on these consts. ─────────────────────────────────
+const CARD_WORDMARK = [
+  '███████╗██╗    ██╗██╗   ██╗████████╗ ██████╗██╗  ██╗ ██████╗ ██████╗ ██████╗ ███████╗',
+  '██╔════╝██║    ██║╚██╗ ██╔╝╚══██╔══╝██╔════╝██║  ██║██╔════╝██╔═══██╗██╔══██╗██╔════╝',
+  '███████╗██║ █╗ ██║ ╚████╔╝    ██║   ██║     ███████║██║     ██║   ██║██║  ██║█████╗',
+  '╚════██║██║███╗██║  ╚██╔╝     ██║   ██║     ██╔══██║██║     ██║   ██║██║  ██║██╔══╝',
+  '███████║╚███╔███╔╝   ██║      ██║   ╚██████╗██║  ██║╚██████╗╚██████╔╝██████╔╝███████╗',
+  '╚══════╝ ╚══╝╚══╝    ╚═╝      ╚═╝    ╚═════╝╚═╝  ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝',
+];
+const CARD_TAGLINE = 'Your agent calls an API. We make sure it goes through.';
+const CARD_DESCRIPTION = 'Swytchcode sits between your agent and any API — auth, retries, idempotency, and schema validation, handled. Run a command below, or swytchcode --help for the full list.';
+
 // ─── Normal pass-through (not npx, or npx with non-demo args) ───────────────
 if (!isNpx || (userArgs.length > 0 && !isCanonicalDemoArg && !isNpxBareWordArg)) {
   const result = spawnBin(binPath, userArgs);
@@ -371,7 +391,7 @@ if (isNpx && isCanonicalDemoArg) {
 } else if (isNpxBareWordArg) {
   // Single bare word (e.g. "abcd") — not a valid canonical ID; show message then onboard
   writeln();
-  writeln(`  ${c.yellow}⚠  ${c.bold}${originalArg}${c.reset}${c.yellow} isn't a valid demo tool — canonical IDs look like ${c.bold}provider.method${c.reset}`);
+  writeln(`  ${c.dim}${c.bold}${originalArg}${c.reset}${c.dim} isn't a demo tool — IDs look like ${c.reset}${c.bold}provider.method${c.reset}`);
   writeln(`  ${c.dim}Let's run a working demo instead.${c.reset}`);
   writeln();
   Promise.resolve()
@@ -422,40 +442,12 @@ async function runDemoSelection() {
     writeln(`  ${c.gray}$ swytchcode demo stripe${c.reset}`);
     spawnBin(binPath, ['demo', 'stripe'], { SWYTCHCODE_ONBOARDING: '1' });
     writeln();
-    writeln(`  ${c.dim}That was a real API call. No credentials, no setup.${c.reset}`);
-    writeln(`  ${c.dim}With Swytchcode, every API integration works exactly like this.${c.reset}`);
+    writeln(`  ${c.dim}Done — ran through Swytchcode's demo account.${c.reset}`);
+    writeln(`  ${c.dim}Every integration runs the same way.${c.reset}`);
   }
 }
 
-// ─── Welcome card (mirrors internal/output/banner.go) ───────────────────────
-const CARD_WORDMARK = [
-  '███████╗██╗    ██╗██╗   ██╗████████╗ ██████╗██╗  ██╗ ██████╗ ██████╗ ██████╗ ███████╗',
-  '██╔════╝██║    ██║╚██╗ ██╔╝╚══██╔══╝██╔════╝██║  ██║██╔════╝██╔═══██╗██╔══██╗██╔════╝',
-  '███████╗██║ █╗ ██║ ╚████╔╝    ██║   ██║     ███████║██║     ██║   ██║██║  ██║█████╗',
-  '╚════██║██║███╗██║  ╚██╔╝     ██║   ██║     ██╔══██║██║     ██║   ██║██║  ██║██╔══╝',
-  '███████║╚███╔███╔╝   ██║      ██║   ╚██████╗██║  ██║╚██████╗╚██████╔╝██████╔╝███████╗',
-  '╚══════╝ ╚══╝╚══╝    ╚═╝      ╚═╝    ╚═════╝╚═╝  ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝',
-];
-const CARD_MARK = [
-  '         ▄▄▄█████████▄▄',
-  '      ▄▄███▀▀▀     ▀▀▀███▄',
-  '    ▄███▀',
-  '   ███            ▄████████▀',
-  '  ██▀            █████████',
-  ' ██▀           ▄████████▀',
-  '███          ▄████████▀',
-  '██          █████████',
-  '██        ▄██████████████▀',
-  '██      ▄██████████████▀',
-  '▀██    ██████▀▄█████▀',
-  ' ██▄         ▄████▀',
-  '  ██▄      ▄████▀',
-  '   ▀██▄   ▄██▀            ▄',
-  '    ▀▀▀ ▄█▀▀           ▄▄███',
-  '       ▄▀   ▄▄▄▄▄▄▄▄▄████▀▀',
-  '      ▀    ▀▀████████▀▀',
-];
-const CARD_TAGLINE = 'Your agent calls an API. We make sure it goes through.';
+// ─── Welcome card render helpers (data consts are hoisted above the dispatch) ─
 
 function rep(ch, n) { return n > 0 ? ch.repeat(n) : ''; }
 function vlen(s) { return [...s].length; }
@@ -463,20 +455,38 @@ function padRows(rows) {
   const w = Math.max(...rows.map(vlen));
   return { rows: rows.map(r => r + rep(' ', w - vlen(r))), w };
 }
+// wrapText greedily word-wraps s to the given visible width (in code points).
+function wrapText(s, width) {
+  if (width < 1) width = 1;
+  const lines = [];
+  let cur = '';
+  for (const word of s.split(/\s+/).filter(Boolean)) {
+    if (cur === '') cur = word;
+    else if (vlen(cur) + 1 + vlen(word) <= width) cur += ' ' + word;
+    else { lines.push(cur); cur = word; }
+  }
+  if (cur !== '') lines.push(cur);
+  return lines;
+}
+// writeDescRows renders the wrapped description inside a framed box (boxRow closes
+// over innerW), with the "swytchcode --help" hint highlighted.
+function writeDescRows(boxRow, orange, contentW, margin) {
+  for (const ln of wrapText(CARD_DESCRIPTION, contentW)) {
+    const colored = ln.replace('swytchcode --help', orange('swytchcode --help'));
+    writeln(boxRow(rep(' ', margin) + colored, margin + vlen(ln)));
+  }
+}
 
-// welcomeCard renders the framed welcome card (logo mark left + wordmark right,
-// wordmark vertically centered), stepping down to a plain wordmark or the compact
-// banner based on width / UTF-8 / truecolor / TTY / NO_COLOR. Mirrors the Go banner.
+// welcomeCard renders the universal welcome banner: the "swytchcode" figlet
+// wordmark, version, tagline, and wrapped description inside a framed box — no
+// bolt logo. Mirrors wordmarkBanner in internal/output/banner.go so npx
+// onboarding and the installed CLI look identical (single form, no tiering).
 function welcomeCard(cliVersion) {
   const isTTY = !!process.stdout.isTTY;
-  const width = process.stdout.columns || 0;
   const ct = process.env.COLORTERM || '';
   const truecolor = ct === 'truecolor' || ct === '24bit';
   const noColor = !!process.env.NO_COLOR || !!process.env.CI;
   const useColor = !noColor && isTTY;
-  const utf8 = process.platform === 'win32'
-    ? (!!process.env.WT_SESSION || process.env.TERM_PROGRAM === 'vscode' || process.env.ConEmuANSI === 'ON')
-    : /utf-?8/i.test(process.env.LC_ALL || process.env.LC_CTYPE || process.env.LANG || '');
 
   const orange = s => !useColor ? s : (truecolor ? `\x1b[38;2;245;148;30m${s}\x1b[0m` : `\x1b[38;5;214m${s}\x1b[0m`);
   const frame  = s => !useColor ? s : (truecolor ? `\x1b[38;2;122;78;24m${s}\x1b[0m` : `\x1b[38;5;214m${s}\x1b[0m`);
@@ -484,62 +494,28 @@ function welcomeCard(cliVersion) {
   const green  = s => !useColor ? s : `\x1b[32m${s}\x1b[0m`;
 
   const { rows: wm, w: wmW } = padRows(CARD_WORDMARK);
-  const { rows: mk, w: mkW } = padRows(CARD_MARK);
-  const gutter = 4, margin = 2;
-  const innerW = margin + mkW + gutter + wmW + margin;
-  const cardW = innerW + 2;
-
-  if (!isTTY || noColor) { compactCard(cliVersion, false); return; }
-  if (!utf8 || width < 87) { compactCard(cliVersion, useColor); return; }
-  if (!truecolor || width < cardW + 2) { wordmarkCard({ orange, dim, green, wm }); return; }
-
+  const margin = 2;
+  const innerW = margin + wmW + margin;
   const boxRow = (colored, vis) => frame('│') + colored + rep(' ', Math.max(0, innerW - vis)) + frame('│');
+
   writeln();
   const title = ' Welcome to Swytchcode ';
   writeln(frame('┌─' + title + rep('─', innerW - 1 - vlen(title)) + '┐'));
   writeln(boxRow('', 0));
-  // Logo (left) + wordmark (right); wordmark vertically centered.
-  const nRows = Math.max(mk.length, wm.length);
-  const wmOff = Math.max(0, Math.floor((mk.length - wm.length) / 2));
-  for (let i = 0; i < nRows; i++) {
-    const left = i < mk.length ? orange(mk[i]) : rep(' ', mkW);
-    const wi = i - wmOff;
-    const right = (wi >= 0 && wi < wm.length) ? orange(wm[wi]) : rep(' ', wmW);
-    writeln(boxRow(rep(' ', margin) + left + rep(' ', gutter) + right, margin + mkW + gutter + wmW));
-  }
+  for (const row of wm) writeln(boxRow(rep(' ', margin) + orange(row), margin + wmW));
+  writeln(boxRow(rep(' ', margin) + dim('v' + cliVersion), margin + 1 + vlen(cliVersion)));
   writeln(boxRow('', 0));
-  // Tagline centered across the inner width.
   const lead = margin + Math.floor((innerW - 2 * margin - vlen(CARD_TAGLINE)) / 2);
   writeln(boxRow(rep(' ', lead) + dim(CARD_TAGLINE), lead + vlen(CARD_TAGLINE)));
   writeln(boxRow('', 0));
+  writeDescRows(boxRow, orange, innerW - 2 * margin, margin);
+  writeln(boxRow('', 0));
   writeln(frame('└' + rep('─', innerW) + '┘'));
   cardBelow({ orange, dim, green });
 }
 
-function compactCard(cliVersion, useColor) {
-  const orange = s => useColor ? `\x1b[38;5;214m${s}\x1b[0m` : s;
-  const dim = s => useColor ? `\x1b[2m${s}\x1b[0m` : s;
-  writeln();
-  writeln(`  ${orange('swytchcode')}  ${dim('v' + cliVersion)}`);
-  writeln(`  ${CARD_TAGLINE}`);
-  writeln();
-  writeln(`  ${dim('docs')}  docs.swytchcode.com`);
-  writeln(`  ${dim('chat')}  discord.gg/zuSXSv5GWs`);
-  writeln();
-}
-
-function wordmarkCard({ orange, dim, green, wm }) {
-  writeln();
-  for (const row of wm) writeln(`  ${orange(row)}`);
-  writeln(`\n  ${dim(CARD_TAGLINE)}`);
-  cardBelow({ orange, dim, green });
-}
-
 // cardBelow prints the description, sign-in line, cwd, and get-started hints.
 function cardBelow({ orange, dim, green }) {
-  writeln();
-  writeln('Swytchcode sits between your agent and any API — auth, retries, idempotency, and schema');
-  writeln(`validation, handled. Run a command below, or ${orange('swytchcode --help')} for the full list.`);
   writeln();
   writeln(`${orange('●')}  ${dim('not signed in — run ')}${orange('swytchcode login')}`);
   const cwd = process.cwd().replace(/\\/g, '/');
@@ -575,55 +551,102 @@ async function runOnboarding() {
 
   welcomeCard(cliVersion);
 
+  // Divider between the welcome card/info and the interactive walkthrough,
+  // matching the rules drawn between steps below.
+  writeln();
+  writeln('  ' + '─'.repeat(45));
+  writeln();
+
   // ── Step 1: Demo ──────────────────────────────────────────────────────────
-  writeln(`${c.bold}  Step 1 of 4  —  See it in action${c.reset}`);
-  writeln(`${c.dim}  Run a live API call right now, no setup required.${c.reset}`);
+  writeln(`${c.bold}  Step 1 of 4  —  Run a live call${c.reset}`);
+  writeln(`${c.dim}  Run a real API call through Swytchcode.${c.reset}`);
   writeln();
   await runDemoSelection();
   await runOnboardingSteps2to4();
 }
 
+// isGloballyInstalled reports whether a real, persistent global `swytchcode`
+// exists on PATH — as opposed to the transient npx cache binary this script is
+// currently running from. Used to skip the "install globally" onboarding step
+// when it's already installed.
+function isGloballyInstalled() {
+  try {
+    const probe = process.platform === 'win32' ? 'where swytchcode' : 'command -v swytchcode';
+    const out = execSync(probe, { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8' }).trim();
+    if (!out) return false;
+    // Any resolved path that isn't inside the npx cache means a global install exists.
+    return out.split(/\r?\n/).some(line => line && !line.toLowerCase().includes('_npx'));
+  } catch (_) {
+    return false; // not found on PATH
+  }
+}
+
+// authStatus reports whether the user is already authenticated, so onboarding
+// can skip the login prompt. Priority: SWYTCHCODE_TOKEN env var, then a
+// SWYTCHCODE_TOKEN in ./.env, then a valid (unexpired) user session in
+// ~/.swytchcode/auth.json.
+function authStatus() {
+  if ((process.env.SWYTCHCODE_TOKEN || '').trim()) {
+    return { authed: true, label: 'authenticated via SWYTCHCODE_TOKEN' };
+  }
+  try {
+    const envPath = path.join(process.cwd(), '.env');
+    if (fs.existsSync(envPath)) {
+      const m = fs.readFileSync(envPath, 'utf8').match(/^\s*SWYTCHCODE_TOKEN\s*=\s*["']?([^"'\r\n#]+)/m);
+      if (m && m[1].trim()) return { authed: true, label: 'authenticated via .env token' };
+    }
+  } catch (_) {}
+  try {
+    const authPath = path.join(require('os').homedir(), '.swytchcode', 'auth.json');
+    const s = JSON.parse(fs.readFileSync(authPath, 'utf8'));
+    if (s && s.access_token && typeof s.expires_at === 'number' && Date.now() < s.expires_at * 1000) {
+      return { authed: true, label: s.email ? ('signed in as ' + s.email) : 'signed in' };
+    }
+  } catch (_) {}
+  return { authed: false, label: '' };
+}
+
 async function runOnboardingSteps2to4() {
   // ── Step 2: Install ───────────────────────────────────────────────────────
   writeln();
   writeln('  ' + '─'.repeat(45));
   writeln();
   writeln(`${c.bold}  Step 2 of 4  —  Install Swytchcode${c.reset}`);
-  writeln(`${c.dim}  Install once, use everywhere. Adds the ${c.reset}${c.cyan}swytchcode${c.reset}${c.dim} command to your terminal.${c.reset}`);
-  writeln();
-  writeln(`  ${c.dim}Installing into: ${process.cwd()}${c.reset}`);
-  writeln(`  ${c.dim}$ npm install swytchcode${c.reset}`);
-  writeln();
 
-  const installChoice = await menuArrow('Install here?', [
-    { label: 'Yes, install here', value: 'yes' },
-    { label: 'Skip for now',      value: 'no'  },
-  ]);
+  if (isGloballyInstalled()) {
+    // Already installed — don't re-offer the install step.
+    writeln(`  ${c.green}›${c.reset}  ${c.dim}swytchcode is already installed globally — skipping.${c.reset}`);
+  } else {
+    writeln(`${c.dim}  Install the ${c.reset}${c.orange}swytchcode${c.reset}${c.dim} command globally.${c.reset}`);
+    writeln();
+    writeln(`  ${c.dim}$ npm install -g swytchcode${c.reset}`);
+    writeln();
 
-  writeln();
+    const installChoice = await menuArrow('Install globally?', [
+      { label: 'Yes, install globally', value: 'yes' },
+      { label: 'Skip for now',      value: 'no'  },
+    ]);
 
-  if (installChoice === 'no') {
-    writeln(`  ${c.dim}Skipped. Install manually with:${c.reset}`);
-    writeln(`  ${c.cyan}npm install swytchcode${c.reset}`);
-    writeln(`  ${c.dim}For global access:${c.reset} ${c.cyan}npm install -g swytchcode${c.reset}`);
-  } else {
-    const installSpin = spinner('Running npm install swytchcode ...');
-    try {
-      execSync('npm install swytchcode', { stdio: 'pipe' });
-      installSpin.stop('installed');
-    } catch (e) {
-      if (e.signal === 'SIGINT') {
-        installSpin.stop('Cancelled');
-        try { process.stdin.setRawMode(false); } catch (_) {}
-        process.stdout.write('\x1b[?25h');
-        process.exit(130);
+    writeln();
+
+    if (installChoice === 'no') {
+      writeln(`  ${c.dim}Skipped. Install manually with:${c.reset}`);
+      writeln(`  ${c.orange}npm install -g swytchcode${c.reset}`);
+    } else {
+      const installSpin = spinner('Running npm install -g swytchcode ...');
+      try {
+        execSync('npm install -g swytchcode', { stdio: 'pipe' });
+        installSpin.stop('installed');
+      } catch (e) {
+        if (e.signal === 'SIGINT') {
+          installSpin.stop('Cancelled');
+          try { process.stdin.setRawMode(false); } catch (_) {}
+          process.stdout.write('\x1b[?25h');
+          process.exit(130);
+        }
+        installSpin.fail('Installation failed.');
       }
-      installSpin.fail('Installation failed.');
     }
-
-    writeln();
-    writeln(`  ${c.dim}To make it available globally, run:${c.reset}`);
-    writeln(`  ${c.bold}${c.green}npm install -g swytchcode${c.reset}`);
   }
 
   // ── Step 3: Account sync ──────────────────────────────────────────────────
@@ -631,41 +654,48 @@ async function runOnboardingSteps2to4() {
   writeln('  ' + '─'.repeat(45));
   writeln();
   writeln(`${c.bold}  Step 3 of 4  —  Connect your account${c.reset}`);
-  writeln(`${c.dim}  See your usage analytics, execution history, and saved projects.${c.reset}`);
-  writeln();
 
-  const authChoice = await menuArrow('Do you already have an account?', [
-    { label: 'Login to my account',   value: 'login'     },
-    { label: 'Create a new account',  value: 'register'  },
-    { label: 'Continue anonymously',  value: 'anon'      },
-  ]);
+  const auth = authStatus();
+  if (auth.authed) {
+    // Already authenticated — never re-prompt for login.
+    writeln(`  ${c.green}›${c.reset}  ${c.dim}Already ${auth.label} — skipping.${c.reset}`);
+  } else {
+    writeln(`${c.dim}  See your usage analytics, execution history, and saved projects.${c.reset}`);
+    writeln();
 
-  writeln();
+    const authChoice = await menuArrow('Do you already have an account?', [
+      { label: 'Login to my account',   value: 'login'     },
+      { label: 'Create a new account',  value: 'register'  },
+      { label: 'Continue anonymously',  value: 'anon'      },
+    ]);
 
-  if (authChoice === 'login') {
-    writeln(`  ${c.dim}Opening browser for login ...${c.reset}`);
-    writeln();
-    const result = spawnBin(binPath, ['login']);
-    if (result.error || result.status !== 0) {
-      writeln(`  ${c.yellow}Login window closed or failed.${c.reset}`);
-      writeln(`  ${c.dim}You can log in later with:${c.reset} ${c.cyan}swytchcode login${c.reset}`);
-    } else {
-      writeln(`  ${c.green}›${c.reset}  logged in`);
-    }
-  } else if (authChoice === 'register') {
-    writeln(`  ${c.dim}Opening browser to create your account ...${c.reset}`);
     writeln();
-    // login command handles both login and registration via the browser flow
-    const result = spawnBin(binPath, ['login']);
-    if (result.error || result.status !== 0) {
-      writeln(`  ${c.yellow}Browser window closed or failed.${c.reset}`);
-      writeln(`  ${c.dim}Create your account at:${c.reset} ${c.cyan}https://swytchcode.com/signup${c.reset}`);
+
+    if (authChoice === 'login') {
+      writeln(`  ${c.dim}Opening browser for login ...${c.reset}`);
+      writeln();
+      const result = spawnBin(binPath, ['login']);
+      if (result.error || result.status !== 0) {
+        writeln(`  ${c.yellow}Login window closed or failed.${c.reset}`);
+        writeln(`  ${c.dim}You can log in later with:${c.reset} ${c.orange}swytchcode login${c.reset}`);
+      } else {
+        writeln(`  ${c.green}›${c.reset}  logged in`);
+      }
+    } else if (authChoice === 'register') {
+      writeln(`  ${c.dim}Opening browser to create your account ...${c.reset}`);
+      writeln();
+      // login command handles both login and registration via the browser flow
+      const result = spawnBin(binPath, ['login']);
+      if (result.error || result.status !== 0) {
+        writeln(`  ${c.yellow}Browser window closed or failed.${c.reset}`);
+        writeln(`  ${c.dim}Create your account at:${c.reset} ${c.orange}https://swytchcode.com/signup${c.reset}`);
+      } else {
+        writeln(`  ${c.green}›${c.reset}  account connected`);
+      }
     } else {
-      writeln(`  ${c.green}›${c.reset}  account connected`);
+      writeln(`  ${c.dim}No problem — you can connect your account any time with:${c.reset}`);
+      writeln(`  ${c.orange}swytchcode login${c.reset}`);
     }
-  } else {
-    writeln(`  ${c.dim}No problem — you can connect your account any time with:${c.reset}`);
-    writeln(`  ${c.cyan}swytchcode login${c.reset}`);
   }
 
   // ── Step 4: Next action ───────────────────────────────────────────────────
@@ -701,11 +731,11 @@ async function runOnboardingSteps2to4() {
     writeln(`  ${c.bold}You're all set.${c.reset}`);
     writeln();
     writeln(`  Quick reference:`);
-    writeln(`  ${c.cyan}swytchcode init${c.reset}         ${c.dim}Set up a new project${c.reset}`);
-    writeln(`  ${c.cyan}swytchcode examples${c.reset}     ${c.dim}Browse example integrations${c.reset}`);
-    writeln(`  ${c.cyan}swytchcode get <api>${c.reset}    ${c.dim}Install an API integration${c.reset}`);
-    writeln(`  ${c.cyan}swytchcode exec <id>${c.reset}    ${c.dim}Execute an API method${c.reset}`);
-    writeln(`  ${c.cyan}swytchcode --help${c.reset}       ${c.dim}Full command reference${c.reset}`);
+    writeln(`  ${c.orange}swytchcode init${c.reset}         ${c.dim}Set up a new project${c.reset}`);
+    writeln(`  ${c.orange}swytchcode examples${c.reset}     ${c.dim}Browse example integrations${c.reset}`);
+    writeln(`  ${c.orange}swytchcode get <api>${c.reset}    ${c.dim}Install an API integration${c.reset}`);
+    writeln(`  ${c.orange}swytchcode exec <id>${c.reset}    ${c.dim}Execute an API method${c.reset}`);
+    writeln(`  ${c.orange}swytchcode --help${c.reset}       ${c.dim}Full command reference${c.reset}`);
   }
 
   writeln();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swytchcode",
-  "version": "2.14.0-beta.1",
+  "version": "2.14.0-beta.3",
   "repository": {
     "type": "git",
     "url": "git+https://gitlab.com/swytchcode/cli.git"
@@ -28,11 +28,11 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "swytchcode-cli-darwin-arm64": "2.14.0-beta.1",
-    "swytchcode-cli-darwin-x64": "2.14.0-beta.1",
-    "swytchcode-cli-linux-arm64": "2.14.0-beta.1",
-    "swytchcode-cli-linux-x64": "2.14.0-beta.1",
-    "swytchcode-cli-win32-arm64": "2.14.0-beta.1",
-    "swytchcode-cli-win32-x64": "2.14.0-beta.1"
+    "swytchcode-cli-darwin-arm64": "2.14.0-beta.3",
+    "swytchcode-cli-darwin-x64": "2.14.0-beta.3",
+    "swytchcode-cli-linux-arm64": "2.14.0-beta.3",
+    "swytchcode-cli-linux-x64": "2.14.0-beta.3",
+    "swytchcode-cli-win32-arm64": "2.14.0-beta.3",
+    "swytchcode-cli-win32-x64": "2.14.0-beta.3"
   }
 }