swytchcode 2.6.0 → 2.6.2

package/bin/swytchcode.js

@@ -1,6 +1,12 @@
 #!/usr/bin/env node
 'use strict';
 
+process.on('SIGINT', () => {
+  try { process.stdin.setRawMode(false); } catch (_) {} // prevent stuck raw mode on Windows CMD
+  process.stdout.write('\x1b[?25h');                    // restore cursor
+  process.exit(130);
+});
+
 const { spawnSync, execSync } = require('child_process');
 const fs   = require('fs');
 const path = require('path');
@@ -45,7 +51,20 @@ function stripAnsi(str) {
 function ask(prompt) {
   return new Promise(resolve => {
     const iface = rl.createInterface({ input: process.stdin, output: process.stdout });
-    iface.question(prompt, answer => { iface.close(); resolve(answer.trim()); });
+
+    function onClose() {
+      try { process.stdin.setRawMode(false); } catch (_) {}
+      process.stdout.write('\x1b[?25h');
+      process.exit(130);
+    }
+
+    iface.on('close', onClose);
+
+    iface.question(prompt, answer => {
+      iface.removeListener('close', onClose); // only removes this specific listener
+      iface.close();
+      resolve(answer.trim());
+    });
   });
 }
 
@@ -188,17 +207,27 @@ function apiPost(urlStr, body) {
 // ─── Binary resolution (shared by normal pass-through AND onboarding) ────────
 function spawnBin(binPath, args, extraEnv = {}) {
   const env = { ...process.env, ...extraEnv };
+  let result;
   if (process.stdin.isTTY) {
-    return spawnSync(binPath, args, { stdio: 'inherit', env });
+    result = spawnSync(binPath, args, { stdio: 'inherit', env });
+  } else {
+    let stdinData;
+    try { stdinData = fs.readFileSync(0); }
+    catch (_) { stdinData = Buffer.alloc(0); }
+    result = spawnSync(binPath, args, {
+      stdio: ['pipe', 'inherit', 'inherit'],
+      input: stdinData,
+      env,
+    });
   }
-  let stdinData;
-  try { stdinData = fs.readFileSync(0); }
-  catch (_) { stdinData = Buffer.alloc(0); }
-  return spawnSync(binPath, args, {
-    stdio: ['pipe', 'inherit', 'inherit'],
-    input: stdinData,
-    env,
-  });
+
+  if (result.signal === 'SIGINT') {
+    try { process.stdin.setRawMode(false); } catch (_) {}
+    process.stdout.write('\x1b[?25h');
+    process.exit(130);
+  }
+
+  return result;
 }
 
 function exitCode(result) {
@@ -271,6 +300,8 @@ 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
+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('-')) {
   userArgs.unshift('exec');
@@ -293,28 +324,9 @@ async function runOnboardingDirectDemo(canonicalId) {
   await runOnboardingSteps2to4();
 }
 
-// ─── Normal pass-through (not npx, or npx with non-demo args) ───────────────
-if (!isNpx || (userArgs.length > 0 && !isCanonicalDemoArg)) {
-  const result = spawnBin(binPath, userArgs);
-  if (result.error) {
-    err(`swytchcode: failed to launch binary: ${result.error.message}`);
-  }
-  process.exit(exitCode(result));
-}
-// ─── NPX with canonical ID: run demo directly then show onboarding ───────────
-if (isNpx && isCanonicalDemoArg) {
-  runOnboardingDirectDemo(originalArg).catch(e => {
-    err(`\nswytchcode: onboarding error (${e.message}) — falling back to CLI.\n`);
-    const result = spawnBin(binPath, userArgs);
-    process.exit(exitCode(result));
-  });
-} else {
-// ─── NPX ONBOARDING FLOW ─────────────────────────────────────────────────────
-// Only reached when: isNpx === true AND no args passed (bare `npx swytchcode`)
-
+// ─── HTTP helpers (used by both canonical-demo and bare-npx onboarding paths) ─
 const API_BASE = 'https://api-v2.swytchcode.com/v2/cli';
 
-// Helper to perform HTTP GET (declared inside so it doesn't conflict)
 function apiGet(urlStr) {
   return new Promise((resolve, reject) => {
     const parsed = new URL(urlStr);
@@ -339,6 +351,43 @@ function apiGet(urlStr) {
   });
 }
 
+// ─── Normal pass-through (not npx, or npx with non-demo args) ───────────────
+if (!isNpx || (userArgs.length > 0 && !isCanonicalDemoArg && !isNpxBareWordArg)) {
+  const result = spawnBin(binPath, userArgs);
+  if (result.error) {
+    err(`swytchcode: failed to launch binary: ${result.error.message}`);
+  }
+  process.exit(exitCode(result));
+}
+
+// ─── NPX routing: three mutually exclusive paths ─────────────────────────────
+if (isNpx && isCanonicalDemoArg) {
+  // 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`);
+    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
+  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}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`);
+      process.exit(1);
+    });
+} else {
+  // Bare npx swytchcode (no args) — full onboarding with welcome banner
+  runOnboarding().catch(e => {
+    err(`\nswytchcode: onboarding error (${e.message}) — falling back to CLI.\n`);
+    const result = spawnBin(binPath, userArgs);
+    process.exit(exitCode(result));
+  });
 }
 
 async function runDemoSelection() {
@@ -371,10 +420,7 @@ async function runDemoSelection() {
   if (chosen !== '__skip__') {
     writeln();
     writeln(`  ${c.gray}$ swytchcode demo stripe${c.reset}`);
-    spawnSync(binPath, ['demo', 'stripe'], {
-      stdio: 'inherit',
-      env: { ...process.env, SWYTCHCODE_ONBOARDING: '1' }
-    });
+    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}`);
@@ -445,6 +491,12 @@ async function runOnboardingSteps2to4() {
       execSync('npm install swytchcode', { stdio: 'pipe' });
       installSpin.stop('Installed successfully');
     } 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.');
     }
 
@@ -472,7 +524,7 @@ async function runOnboardingSteps2to4() {
   if (authChoice === 'login') {
     writeln(`  ${c.dim}Opening browser for login ...${c.reset}`);
     writeln();
-    const result = spawnSync(binPath, ['login'], { stdio: 'inherit' });
+    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}`);
@@ -483,7 +535,7 @@ async function runOnboardingSteps2to4() {
     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 = spawnSync(binPath, ['login'], { stdio: 'inherit' });
+    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}`);
@@ -513,14 +565,14 @@ async function runOnboardingSteps2to4() {
   if (nextAction === 'init') {
     writeln(`  ${c.dim}Starting project setup ...${c.reset}`);
     writeln();
-    const result = spawnSync(binPath, ['init'], { stdio: 'inherit' });
+    const result = spawnBin(binPath, ['init']);
     if (result.error) {
       writeln(`  ${c.red}Could not launch swytchcode init: ${result.error.message}${c.reset}`);
     }
   } else if (nextAction === 'examples') {
     writeln(`  ${c.dim}Loading examples ...${c.reset}`);
     writeln();
-    const result = spawnSync(binPath, ['examples'], { stdio: 'inherit' });
+    const result = spawnBin(binPath, ['examples']);
     if (result.error) {
       writeln(`  ${c.red}Could not launch swytchcode examples: ${result.error.message}${c.reset}`);
     }
@@ -540,8 +592,3 @@ async function runOnboardingSteps2to4() {
   writeln();
 }
 
-runOnboarding().catch(e => {
-  err(`\nswytchcode: onboarding error (${e.message}) — falling back to CLI.\n`);
-  const result = spawnBin(binPath, userArgs);
-  process.exit(exitCode(result));
-});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swytchcode",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "Execution authority layer for API integrations",
   "keywords": [
     "api",
@@ -23,11 +23,11 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "swytchcode-cli-darwin-arm64": "2.6.0",
-    "swytchcode-cli-darwin-x64": "2.6.0",
-    "swytchcode-cli-linux-arm64": "2.6.0",
-    "swytchcode-cli-linux-x64": "2.6.0",
-    "swytchcode-cli-win32-arm64": "2.6.0",
-    "swytchcode-cli-win32-x64": "2.6.0"
+    "swytchcode-cli-darwin-arm64": "2.6.2",
+    "swytchcode-cli-darwin-x64": "2.6.2",
+    "swytchcode-cli-linux-arm64": "2.6.2",
+    "swytchcode-cli-linux-x64": "2.6.2",
+    "swytchcode-cli-win32-arm64": "2.6.2",
+    "swytchcode-cli-win32-x64": "2.6.2"
   }
 }