swytchcode 2.5.2 → 2.6.1

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());
+    });
   });
 }
 
@@ -186,17 +205,29 @@ function apiPost(urlStr, body) {
 }
 
 // ─── Binary resolution (shared by normal pass-through AND onboarding) ────────
-function spawnBin(binPath, args) {
+function spawnBin(binPath, args, extraEnv = {}) {
+  const env = { ...process.env, ...extraEnv };
+  let result;
   if (process.stdin.isTTY) {
-    return spawnSync(binPath, args, { stdio: 'inherit' });
+    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,
-  });
+
+  if (result.signal === 'SIGINT') {
+    try { process.stdin.setRawMode(false); } catch (_) {}
+    process.stdout.write('\x1b[?25h');
+    process.exit(130);
+  }
+
+  return result;
 }
 
 function exitCode(result) {
@@ -266,22 +297,47 @@ const isNpx =
   (process.env.npm_execpath || '').includes('npx');
 
 const userArgs = process.argv.slice(2);
-
+// Capture original arg BEFORE mutation
+const originalArg = process.argv[2] || '';
+const isCanonicalDemoArg = /^[\w]+\.[\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');
 }
+async function runOnboardingDirectDemo(canonicalId) {
+  writeln();
+  writeln(`  ${c.yellow}⚡ Running ${c.bold}${canonicalId}${c.reset}${c.yellow} live...${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();
+  } else {
+    writeln(`  ${c.yellow}⚠  ${c.bold}${canonicalId}${c.reset}${c.yellow} isn't a valid demo tool.${c.reset}`);
+    writeln(`  ${c.dim}Let's run a working demo instead.${c.reset}`);
+    writeln();
+    await runDemoSelection();
+  }
+  await runOnboardingSteps2to4();
+}
 
-// ─── Normal pass-through (not npx, or npx with args) ────────────────────────
-if (!isNpx || userArgs.length > 0) {
+// ─── 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(1);
   }
   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`)
 
@@ -311,6 +367,46 @@ function apiGet(urlStr) {
     req.end();
   });
 }
+
+}
+
+async function runDemoSelection() {
+  let demoTools = [];
+  try {
+    const res = await apiGet(`${API_BASE}/demo/tools`);
+    if (res.status === 200 && Array.isArray(res.body.tools)) {
+      demoTools = res.body.tools;
+    }
+  } catch (_) {}
+
+  if (demoTools.length === 0) {
+    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)',
+  };
+
+  const demoOptions = demoTools.map(t => ({
+    label: friendlyName[t] || t,
+    value: t,
+  }));
+  demoOptions.push({ label: 'Skip demo', value: '__skip__' });
+
+  const chosen = await menuArrow('Choose a demo to run:', demoOptions);
+
+  if (chosen !== '__skip__') {
+    writeln();
+    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}`);
+  }
+}
+
 async function runOnboarding() {
   let cliVersion = '0.0.0';
   try {
@@ -342,45 +438,11 @@ async function runOnboarding() {
   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();
+  await runDemoSelection();
+  await runOnboardingSteps2to4();
+}
 
-  // Fetch available demo tools
-  let demoTools = [];
-  try {
-    const res = await apiGet(`${API_BASE}/demo/tools`);
-    if (res.status === 200 && Array.isArray(res.body.tools)) {
-      demoTools = res.body.tools;
-    }
-  } catch (_) {
-    // silently fall through — skip demo if API is unreachable
-  }
-
-  if (demoTools.length === 0) {
-    writeln(`${c.yellow}  Demo unavailable right now — skipping to setup.${c.reset}`);
-    writeln();
-  } else {
-    // Map tool IDs to friendly names
-    const friendlyName = {
-      'stripe.create_payment': 'Stripe — Create a payment ($20.00)',
-    };
-
-    const demoOptions = demoTools.map(t => ({
-      label: friendlyName[t] || t,
-      value: t,
-    }));
-    demoOptions.push({ label: 'Skip demo', value: '__skip__' });
-
-    const chosen = await menuArrow('Choose a demo to run:', demoOptions);
-
-    if (chosen !== '__skip__') {
-      writeln();
-      writeln(`  ${c.gray}$ swytchcode demo stripe${c.reset}`);
-      spawnSync(binPath, ['demo', 'stripe'], { stdio: 'inherit' });
-      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}`);
-    }
-  }
-
+async function runOnboardingSteps2to4() {
   // ── Step 2: Install ───────────────────────────────────────────────────────
   writeln();
   writeln('  ' + '─'.repeat(45));
@@ -409,6 +471,12 @@ async function runOnboarding() {
       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.');
     }
 
@@ -436,7 +504,7 @@ async function runOnboarding() {
   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}`);
@@ -447,7 +515,7 @@ async function runOnboarding() {
     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}`);
@@ -477,14 +545,14 @@ async function runOnboarding() {
   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}`);
     }
@@ -505,7 +573,6 @@ async function runOnboarding() {
 }
 
 runOnboarding().catch(e => {
-  // If onboarding crashes for any reason, fall back to normal binary pass-through
   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.5.2",
+  "version": "2.6.1",
   "description": "Execution authority layer for API integrations",
   "keywords": [
     "api",
@@ -23,11 +23,11 @@
     "README.md"
   ],
   "optionalDependencies": {
-    "swytchcode-cli-darwin-arm64": "2.5.2",
-    "swytchcode-cli-darwin-x64": "2.5.2",
-    "swytchcode-cli-linux-arm64": "2.5.2",
-    "swytchcode-cli-linux-x64": "2.5.2",
-    "swytchcode-cli-win32-arm64": "2.5.2",
-    "swytchcode-cli-win32-x64": "2.5.2"
+    "swytchcode-cli-darwin-arm64": "2.6.1",
+    "swytchcode-cli-darwin-x64": "2.6.1",
+    "swytchcode-cli-linux-arm64": "2.6.1",
+    "swytchcode-cli-linux-x64": "2.6.1",
+    "swytchcode-cli-win32-arm64": "2.6.1",
+    "swytchcode-cli-win32-x64": "2.6.1"
   }
 }