swytchcode 2.14.0-beta.6 → 2.15.0

package/bin/swytchcode.js

@@ -88,7 +88,7 @@ function menuArrow(prompt, options) {
           resolve(options[n - 1].value);
           return;
         }
-        writeln(`${c.red}  invalid choice — 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}`);
       }
     }
 
@@ -306,7 +306,7 @@ const userArgs = process.argv.slice(2);
 // Capture original arg BEFORE mutation
 const originalArg = process.argv[2] || '';
 const isCanonicalDemoArg = /^[\w]+\.[\w.]+$/.test(originalArg) && !originalArg.startsWith('-');
-// A single bare word under npx is a potential (invalid) demo lookup — don't pass through to cobra
+// A single bare word under npx is a potential (invalid) demo lookup - don't pass through to cobra
 const isNpxBareWordArg = isNpx && userArgs.length === 1 && /^[\w]+$/.test(originalArg) && !originalArg.startsWith('-');
 // Legacy support: npx swytchcode <canonical_id> → npx swytchcode exec <canonical_id>
 if (userArgs.length > 0 && /^[\w]+\.[\w.]+$/.test(userArgs[0]) && !userArgs[0].startsWith('-')) {
@@ -319,10 +319,10 @@ async function runOnboardingDirectDemo(canonicalId) {
   const demoResult = spawnBin(binPath, ['exec', canonicalId], { SWYTCHCODE_ONBOARDING: '1' });
   writeln();
   if (demoResult.status === 0) {
-    writeln(`  ${c.dim}Done — ran through Swytchcode.${c.reset}`);
+    writeln(`  ${c.dim}Done - ran through Swytchcode.${c.reset}`);
     writeln();
   } else {
-    writeln(`  ${c.dim}${c.bold}${canonicalId}${c.reset}${c.dim} isn't a demo tool — running a sample instead.${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();
@@ -369,7 +369,7 @@ 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.';
+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)) {
@@ -382,29 +382,29 @@ if (!isNpx || (userArgs.length > 0 && !isCanonicalDemoArg && !isNpxBareWordArg))
 
 // ─── NPX routing: three mutually exclusive paths ─────────────────────────────
 if (isNpx && isCanonicalDemoArg) {
-  // Dotted canonical ID (e.g. stripe.create_payment) — run demo then onboard
+  // Dotted canonical ID (e.g. stripe.create_payment) - run demo then onboard
   runOnboardingDirectDemo(originalArg).catch(e => {
-    err(`\nswytchcode: onboarding error (${e.message}) — falling back to CLI.\n`);
+    err(`\nswytchcode: onboarding error (${e.message}) - falling back to CLI.\n`);
     const result = spawnBin(binPath, userArgs);
     process.exit(exitCode(result));
   });
 } else if (isNpxBareWordArg) {
-  // Single bare word (e.g. "abcd") — not a valid canonical ID; show message then onboard
+  // Single bare word (e.g. "abcd") - not a valid canonical ID; show message then onboard
   writeln();
-  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}${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()
     .then(() => runDemoSelection())
     .then(() => runOnboardingSteps2to4())
     .catch(e => {
-      err(`\nswytchcode: onboarding error (${e.message}) — falling back to CLI.\n`);
+      err(`\nswytchcode: onboarding error (${e.message}) - falling back to CLI.\n`);
       process.exit(1);
     });
 } else {
-  // Bare npx swytchcode (no args) — full onboarding with welcome banner
+  // Bare npx swytchcode (no args) - full onboarding with welcome banner
   runOnboarding().catch(e => {
-    err(`\nswytchcode: onboarding error (${e.message}) — falling back to CLI.\n`);
+    err(`\nswytchcode: onboarding error (${e.message}) - falling back to CLI.\n`);
     const result = spawnBin(binPath, userArgs);
     process.exit(exitCode(result));
   });
@@ -420,13 +420,13 @@ async function runDemoSelection() {
   } catch (_) {}
 
   if (demoTools.length === 0) {
-    writeln(`${c.yellow}  Demo unavailable right now — skipping to setup.${c.reset}`);
+    writeln(`${c.yellow}  Demo unavailable right now - skipping to setup.${c.reset}`);
     writeln();
     return;
   }
 
   const friendlyName = {
-    'stripe.create_payment': 'Stripe — Create a payment ($20.00)',
+    'stripe.create_payment': 'Stripe - Create a payment ($20.00)',
   };
 
   const demoOptions = demoTools.map(t => ({
@@ -442,7 +442,7 @@ async function runDemoSelection() {
     writeln(`  ${c.gray}$ swytchcode demo stripe${c.reset}`);
     spawnBin(binPath, ['demo', 'stripe'], { SWYTCHCODE_ONBOARDING: '1' });
     writeln();
-    writeln(`  ${c.dim}Done — ran through Swytchcode's demo account.${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}`);
   }
 }
@@ -478,10 +478,10 @@ function writeDescRows(boxRow, orange, contentW, margin) {
 }
 
 // welcomeCard renders the universal welcome banner: the "swytchcode" figlet
-// wordmark, version, tagline, and wrapped description inside a framed box — no
+// 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) {
+function welcomeCard(cliVersion, auth) {
   const isTTY = !!process.stdout.isTTY;
   const ct = process.env.COLORTERM || '';
   const truecolor = ct === 'truecolor' || ct === '24bit';
@@ -511,13 +511,19 @@ function welcomeCard(cliVersion) {
   writeDescRows(boxRow, orange, innerW - 2 * margin, margin);
   writeln(boxRow('', 0));
   writeln(frame('└' + rep('─', innerW) + '┘'));
-  cardBelow({ orange, dim, green });
+  cardBelow({ orange, dim, green, auth });
 }
 
-// cardBelow prints the description, sign-in line, cwd, and get-started hints.
-function cardBelow({ orange, dim, green }) {
+// cardBelow prints the sign-in line, cwd, and get-started hints. The sign-in
+// line reflects the real auth state so it stays consistent with the Step 3
+// skip-login logic (no "not signed in" when the user is actually authenticated).
+function cardBelow({ orange, dim, green, auth }) {
   writeln();
-  writeln(`${orange('●')}  ${dim('not signed in — run ')}${orange('swytchcode login')}`);
+  if (auth && auth.authed) {
+    writeln(`${orange('●')}  ${dim(auth.label)}`);
+  } else {
+    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));
@@ -549,7 +555,7 @@ async function runOnboarding() {
   // Clear screen for a clean experience
   process.stdout.write('\x1Bc');
 
-  welcomeCard(cliVersion);
+  welcomeCard(cliVersion, authStatus());
 
   // Divider between the welcome card/info and the interactive walkthrough,
   // matching the rules drawn between steps below.
@@ -558,27 +564,38 @@ async function runOnboarding() {
   writeln();
 
   // ── Step 1: Demo ──────────────────────────────────────────────────────────
-  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(`${c.bold}  Step 1 of 4  -  Try it${c.reset}`);
+  writeln(`${c.dim}  Run an 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
+// 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() {
+  // Primary: look for the binary under npm's global prefix. This is independent
+  // of PATH ordering - under npx the transient cache binary is first on PATH, so
+  // a `command -v` first-match check would miss a real global install.
+  try {
+    const prefix = execSync('npm prefix -g', { stdio: ['ignore', 'pipe', 'ignore'], encoding: 'utf8' }).trim();
+    if (prefix) {
+      const candidates = process.platform === 'win32'
+        ? ['swytchcode.cmd', 'swytchcode.ps1', 'swytchcode'].map(n => path.join(prefix, n))
+        : [path.join(prefix, 'bin', 'swytchcode')];
+      if (candidates.some(p => fs.existsSync(p))) return true;
+    }
+  } catch (_) {}
+  // Fallback: inspect EVERY PATH match (not just the first), excluding the npx
+  // cache. `where` (Windows) and `which -a` (POSIX) both list all matches.
   try {
-    const probe = process.platform === 'win32' ? 'where swytchcode' : 'command -v swytchcode';
+    const probe = process.platform === 'win32' ? 'where swytchcode' : 'which -a 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
-  }
+    if (out) return out.split(/\r?\n/).some(line => line && !line.toLowerCase().includes('_npx'));
+  } catch (_) {}
+  return false;
 }
 
 // authStatus reports whether the user is already authenticated, so onboarding
@@ -611,11 +628,11 @@ async function runOnboardingSteps2to4() {
   writeln();
   writeln('  ' + '─'.repeat(45));
   writeln();
-  writeln(`${c.bold}  Step 2 of 4  —  Install Swytchcode${c.reset}`);
+  writeln(`${c.bold}  Step 2 of 4  -  Install Swytchcode${c.reset}`);
 
   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}`);
+    // 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();
@@ -653,12 +670,12 @@ async function runOnboardingSteps2to4() {
   writeln();
   writeln('  ' + '─'.repeat(45));
   writeln();
-  writeln(`${c.bold}  Step 3 of 4  —  Connect your account${c.reset}`);
+  writeln(`${c.bold}  Step 3 of 4  -  Connect your account${c.reset}`);
 
   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}`);
+    // 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();
@@ -674,26 +691,28 @@ async function runOnboardingSteps2to4() {
     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 {
+      spawnBin(binPath, ['login']);
+      // A zero exit doesn't guarantee a session was created - confirm the token.
+      if (authStatus().authed) {
         writeln(`  ${c.green}›${c.reset}  logged in`);
+      } else {
+        writeln(`  ${c.yellow}Login didn't complete.${c.reset}`);
+        writeln(`  ${c.dim}You can log in later with:${c.reset} ${c.orange}swytchcode login${c.reset}`);
       }
     } 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 {
+      // The browser flow handles both signup and login; verify a session
+      // actually exists before claiming the account is connected.
+      spawnBin(binPath, ['login']);
+      if (authStatus().authed) {
         writeln(`  ${c.green}›${c.reset}  account connected`);
+      } else {
+        writeln(`  ${c.yellow}Account not connected yet.${c.reset}`);
+        writeln(`  ${c.dim}Create your account at:${c.reset} ${c.orange}https://swytchcode.com/signup${c.reset}`);
       }
     } else {
-      writeln(`  ${c.dim}No problem — you can connect your account any time with:${c.reset}`);
+      writeln(`  ${c.dim}No problem - you can connect your account any time with:${c.reset}`);
       writeln(`  ${c.orange}swytchcode login${c.reset}`);
     }
   }
@@ -702,12 +721,12 @@ async function runOnboardingSteps2to4() {
   writeln();
   writeln('  ' + '─'.repeat(45));
   writeln();
-  writeln(`${c.bold}  Step 4 of 4  —  What would you like to do next?${c.reset}`);
+  writeln(`${c.bold}  Step 4 of 4  -  What would you like to do next?${c.reset}`);
   writeln();
 
   const nextAction = await menuArrow('Choose an action:', [
-    { label: `${c.bold}Build a new integration${c.reset}  ${c.dim}— run swytchcode init in your project${c.reset}`, value: 'init'     },
-    { label: `${c.bold}Explore examples${c.reset}         ${c.dim}— download a working example project${c.reset}`,  value: 'examples' },
+    { label: `${c.bold}Build a new integration${c.reset}  ${c.dim}- run swytchcode init in your project${c.reset}`, value: 'init'     },
+    { label: `${c.bold}Explore examples${c.reset}         ${c.dim}- download a working example project${c.reset}`,  value: 'examples' },
     { label: `${c.bold}Exit${c.reset}`,                                                                              value: 'exit'     },
   ]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swytchcode",
-  "version": "2.14.0-beta.6",
+  "version": "2.15.0",
   "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.6",
-    "swytchcode-cli-darwin-x64": "2.14.0-beta.6",
-    "swytchcode-cli-linux-arm64": "2.14.0-beta.6",
-    "swytchcode-cli-linux-x64": "2.14.0-beta.6",
-    "swytchcode-cli-win32-arm64": "2.14.0-beta.6",
-    "swytchcode-cli-win32-x64": "2.14.0-beta.6"
+    "swytchcode-cli-darwin-arm64": "2.15.0",
+    "swytchcode-cli-darwin-x64": "2.15.0",
+    "swytchcode-cli-linux-arm64": "2.15.0",
+    "swytchcode-cli-linux-x64": "2.15.0",
+    "swytchcode-cli-win32-arm64": "2.15.0",
+    "swytchcode-cli-win32-x64": "2.15.0"
   }
 }