swytchcode 2.10.3 → 2.14.0-beta.2

package/bin/swytchcode.js

@@ -87,7 +87,7 @@ function menuArrow(prompt, options) {
           resolve(options[n - 1].value);
           return;
         }
-        writeln(`${c.red}  Invalid choice. Please enter a number between 1 and ${options.length}.${c.reset}`);
+        writeln(`${c.red}  invalid choice — enter a number between 1 and ${options.length}${c.reset}`);
       }
     }
 
@@ -165,11 +165,11 @@ function spinner(msg) {
   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`);
     },
   };
 }
@@ -208,7 +208,7 @@ function apiPost(urlStr, body) {
 function spawnBin(binPath, args, extraEnv = {}) {
   const env = { ...process.env, ...extraEnv };
   let result;
-  if (process.stdin.isTTY) {
+  if (process.stdin.isTTY || (args.length > 0 && args[0] === 'mcp')) {
     result = spawnSync(binPath, args, { stdio: 'inherit', env });
   } else {
     let stdinData;
@@ -242,9 +242,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 +260,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
@@ -351,6 +356,39 @@ 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_MARK = [
+  '         ▄▄▄█████████▄▄',
+  '      ▄▄███▀▀▀     ▀▀▀███▄',
+  '    ▄███▀',
+  '   ███            ▄████████▀',
+  '  ██▀            █████████',
+  ' ██▀           ▄████████▀',
+  '███          ▄████████▀',
+  '██          █████████',
+  '██        ▄██████████████▀',
+  '██      ▄██████████████▀',
+  '▀██    ██████▀▄█████▀',
+  ' ██▄         ▄████▀',
+  '  ██▄      ▄████▀',
+  '   ▀██▄   ▄██▀            ▄',
+  '    ▀▀▀ ▄█▀▀           ▄▄███',
+  '       ▄▀   ▄▄▄▄▄▄▄▄▄████▀▀',
+  '      ▀    ▀▀████████▀▀',
+];
+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);
@@ -427,6 +465,140 @@ async function runDemoSelection() {
   }
 }
 
+// ─── 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; }
+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.
+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`);
+  const dim    = s => !useColor ? s : `\x1b[2m${s}\x1b[0m`;
+  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;
+
+  const wmCardW = margin + wmW + margin + 2; // framed wordmark-only box width
+
+  if (!isTTY || noColor) { compactCard(cliVersion, false); return; }
+  if (!utf8 || width < wmCardW + 2) { compactCard(cliVersion, useColor); return; }
+  if (!truecolor || width < cardW + 2) { wordmarkCard({ orange, dim, frame, green, wm, wmW }); return; }
+
+  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));
+  }
+  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, frame, green, wm, wmW }) {
+  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));
+  for (const row of wm) writeln(boxRow(rep(' ', margin) + orange(row), margin + wmW));
+  writeln(boxRow('', 0));
+  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 });
+}
+
+// cardBelow prints the description, sign-in line, cwd, and get-started hints.
+function cardBelow({ orange, dim, green }) {
+  writeln();
+  writeln(`${orange('●')}  ${dim('not signed in — run ')}${orange('swytchcode login')}`);
+  const cwd = process.cwd().replace(/\\/g, '/');
+  const home = (require('os').homedir() || '').replace(/\\/g, '/');
+  writeln(dim(home && cwd.startsWith(home) ? '~' + cwd.slice(home.length) : cwd));
+  writeln(`\n${dim('get started')}`);
+  const rows = [
+    ['swytchcode init', 'set up this project'],
+    ['swytchcode get <project>', 'fetch integration bundles'],
+    ['swytchcode exec <canonical_id>', 'run a tool'],
+  ];
+  for (const [cmd, desc] of rows) writeln(`  ${green('›')}  ${cmd.padEnd(32)}  ${dim(desc)}`);
+  writeln();
+}
+
 async function runOnboarding() {
   let cliVersion = '0.0.0';
   try {
@@ -445,13 +617,12 @@ async function runOnboarding() {
   // Clear screen for a clean experience
   process.stdout.write('\x1Bc');
 
+  welcomeCard(cliVersion);
+
+  // Divider between the welcome card/info and the interactive walkthrough,
+  // matching the rules drawn between steps below.
   writeln();
-  const vPad = ' '.repeat(Math.max(0, 34 - cliVersion.length));
-  writeln(`  ${c.yellow}==========================================${c.reset}`);
-  writeln(`  ${c.yellow}|${c.reset}  ${c.yellow}⚡ ${c.bold}Welcome to Swytchcode${c.reset}              ${c.yellow}|${c.reset}`);
-  writeln(`  ${c.yellow}|${c.reset}     ${c.dim}v${cliVersion}${c.reset}${vPad}${c.yellow}|${c.reset}`);
-  writeln(`  ${c.yellow}|${c.reset}     ${c.dim}Execution authority layer${c.reset}          ${c.yellow}|${c.reset}`);
-  writeln(`  ${c.yellow}==========================================${c.reset}`);
+  writeln('  ' + '─'.repeat(45));
   writeln();
 
   // ── Step 1: Demo ──────────────────────────────────────────────────────────
@@ -470,12 +641,11 @@ async function runOnboardingSteps2to4() {
   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(`  ${c.dim}$ npm install -g swytchcode${c.reset}`);
   writeln();
 
-  const installChoice = await menuArrow('Install here?', [
-    { label: 'Yes, install here', value: 'yes' },
+  const installChoice = await menuArrow('Install globally?', [
+    { label: 'Yes, install globally', value: 'yes' },
     { label: 'Skip for now',      value: 'no'  },
   ]);
 
@@ -483,13 +653,12 @@ async function runOnboardingSteps2to4() {
 
   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}`);
+    writeln(`  ${c.cyan}npm install -g swytchcode${c.reset}`);
   } else {
-    const installSpin = spinner('Running npm install swytchcode ...');
+    const installSpin = spinner('Running npm install -g swytchcode ...');
     try {
-      execSync('npm install swytchcode', { stdio: 'pipe' });
-      installSpin.stop('Installed successfully');
+      execSync('npm install -g swytchcode', { stdio: 'pipe' });
+      installSpin.stop('installed');
     } catch (e) {
       if (e.signal === 'SIGINT') {
         installSpin.stop('Cancelled');
@@ -499,10 +668,6 @@ async function runOnboardingSteps2to4() {
       }
       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 ──────────────────────────────────────────────────
@@ -529,7 +694,7 @@ async function runOnboardingSteps2to4() {
       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}✔  Logged in successfully.${c.reset}`);
+      writeln(`  ${c.green}›${c.reset}  logged in`);
     }
   } else if (authChoice === 'register') {
     writeln(`  ${c.dim}Opening browser to create your account ...${c.reset}`);
@@ -540,7 +705,7 @@ async function runOnboardingSteps2to4() {
       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}`);
     } else {
-      writeln(`  ${c.green}✔  Account connected successfully.${c.reset}`);
+      writeln(`  ${c.green}›${c.reset}  account connected`);
     }
   } else {
     writeln(`  ${c.dim}No problem — you can connect your account any time with:${c.reset}`);

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "swytchcode",
-  "version": "2.10.3",
+  "version": "2.14.0-beta.2",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitlab.com/swytchcode/cli.git"
+  },
   "description": "Execution authority layer for API integrations",
   "keywords": [
     "api",
@@ -13,7 +17,8 @@
   "homepage": "https://cli.swytchcode.com",
   "license": "MIT",
   "bin": {
-    "swytchcode": "./bin/swytchcode.js"
+    "swytchcode": "./bin/swytchcode.js",
+    "swy": "./bin/swytchcode.js"
   },
   "engines": {
     "node": ">=14"
@@ -23,11 +28,11 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "swytchcode-cli-darwin-arm64": "2.10.3",
-    "swytchcode-cli-darwin-x64": "2.10.3",
-    "swytchcode-cli-linux-arm64": "2.10.3",
-    "swytchcode-cli-linux-x64": "2.10.3",
-    "swytchcode-cli-win32-arm64": "2.10.3",
-    "swytchcode-cli-win32-x64": "2.10.3"
+    "swytchcode-cli-darwin-arm64": "2.14.0-beta.2",
+    "swytchcode-cli-darwin-x64": "2.14.0-beta.2",
+    "swytchcode-cli-linux-arm64": "2.14.0-beta.2",
+    "swytchcode-cli-linux-x64": "2.14.0-beta.2",
+    "swytchcode-cli-win32-arm64": "2.14.0-beta.2",
+    "swytchcode-cli-win32-x64": "2.14.0-beta.2"
   }
 }