spawn-skill 1.2.3 → 1.2.5

package/bin/cli.js

@@ -481,13 +481,60 @@ function getMoltbotBridge(token, agentName) {
  */
 
 import WebSocket from 'ws';
-import { spawn } from 'child_process';
+import { spawn, execSync } from 'child_process';
+import path from 'path';
+import os from 'os';
 
 const TOKEN = '${token}';
 const NAME = '${agentName}';
 const RELAY = 'wss://spawn-relay.ngvsqdjj5r.workers.dev/v1/agent';
 
 let ws;
+let moltbotPath = null;
+
+// Find moltbot executable (also check for old name 'clawdbot')
+function findMoltbot() {
+  if (moltbotPath) return moltbotPath;
+
+  // Try both names - moltbot and clawdbot (old name)
+  const names = ['moltbot', 'clawdbot'];
+
+  for (const name of names) {
+    // Try common locations
+    const candidates = [
+      name,  // In PATH
+      path.join(os.homedir(), '.npm-global', 'bin', name),
+      path.join(os.homedir(), '.nvm', 'versions', 'node', process.version, 'bin', name),
+      '/usr/local/bin/' + name,
+      '/opt/homebrew/bin/' + name,
+    ];
+
+    // Also try to get npm prefix
+    try {
+      const npmPrefix = execSync('npm config get prefix', { encoding: 'utf8', shell: true }).trim();
+      candidates.push(path.join(npmPrefix, 'bin', name));
+    } catch {}
+
+    for (const cmd of candidates) {
+      try {
+        execSync(\`"\${cmd}" --version\`, { stdio: 'pipe', shell: true });
+        console.log(\`✓ Found \${name} at:\`, cmd);
+        moltbotPath = cmd;
+        return cmd;
+      } catch {}
+    }
+
+    // Try npx
+    try {
+      execSync(\`npx \${name} --version\`, { stdio: 'pipe', shell: true });
+      console.log(\`✓ Found \${name} via npx\`);
+      moltbotPath = \`npx \${name}\`;
+      return \`npx \${name}\`;
+    } catch {}
+  }
+
+  return null;
+}
 
 function send(type, payload) {
   if (ws?.readyState === WebSocket.OPEN) {
@@ -514,23 +561,41 @@ async function askMoltbot(message) {
     console.log('📨 Forwarding to Moltbot:', message);
     updateStatus('thinking', 'Asking Moltbot...');
 
-    // Use npx to find moltbot regardless of PATH
-    const moltbot = spawn('npx', ['moltbot', 'agent', '--message', message, '--thinking', 'high'], {
-      shell: true,
-      env: { ...process.env }
-    });
+    const cmd = findMoltbot();
+    if (!cmd) {
+      reject(new Error('Moltbot not found. Install with: npm install -g moltbot@latest'));
+      return;
+    }
+
+    // Build command based on whether we're using npx or direct path
+    let proc;
+    if (cmd.startsWith('npx ')) {
+      // npx moltbot or npx clawdbot
+      const pkgName = cmd.split(' ')[1];
+      proc = spawn('npx', [pkgName, 'agent', '--message', message, '--thinking', 'high'], {
+        shell: true,
+        env: { ...process.env }
+      });
+    } else {
+      proc = spawn(cmd, ['agent', '--message', message, '--thinking', 'high'], {
+        shell: true,
+        env: { ...process.env }
+      });
+    }
+
     let response = '';
     let error = '';
 
-    moltbot.stdout.on('data', (data) => response += data.toString());
-    moltbot.stderr.on('data', (data) => error += data.toString());
+    proc.stdout.on('data', (data) => response += data.toString());
+    proc.stderr.on('data', (data) => error += data.toString());
 
-    moltbot.on('error', (err) => {
+    proc.on('error', (err) => {
       console.error('✗ Failed to start Moltbot:', err.message);
+      moltbotPath = null;  // Reset so we try finding again
       reject(new Error('Moltbot not found. Install with: npm install -g moltbot@latest'));
     });
 
-    moltbot.on('close', (code) => {
+    proc.on('close', (code) => {
       if (code === 0) {
         console.log('✓ Moltbot responded');
         resolve(response.trim());
@@ -713,16 +778,48 @@ async function main() {
 
   console.log('');
 
-  // Check for Moltbot if needed
+  // Check for Moltbot if needed (also check old name 'clawdbot')
   if (useMoltbot) {
     const moltbotCheck = ora('Checking for Moltbot...').start();
-    try {
-      const { execSync } = await import('child_process');
-      // Use npx to find moltbot regardless of PATH
-      execSync('npx moltbot --version', { stdio: 'pipe', shell: true });
-      moltbotCheck.succeed('Moltbot found');
-    } catch {
-      moltbotCheck.warn('Moltbot not found in PATH');
+    let moltbotFound = false;
+    let foundName = null;
+    const { execSync } = await import('child_process');
+    const os = await import('os');
+
+    // Try both names
+    const names = ['moltbot', 'clawdbot'];
+
+    for (const name of names) {
+      if (moltbotFound) break;
+
+      const candidates = [
+        `${name} --version`,
+        `npx ${name} --version`,
+        `"${path.join(os.homedir(), '.npm-global', 'bin', name)}" --version`,
+        `/usr/local/bin/${name} --version`,
+        `/opt/homebrew/bin/${name} --version`,
+      ];
+
+      // Also try npm prefix
+      try {
+        const npmPrefix = execSync('npm config get prefix', { encoding: 'utf8', shell: true }).trim();
+        candidates.push(`"${path.join(npmPrefix, 'bin', name)}" --version`);
+      } catch {}
+
+      for (const cmd of candidates) {
+        try {
+          execSync(cmd, { stdio: 'pipe', shell: true });
+          moltbotFound = true;
+          foundName = name;
+          break;
+        } catch {}
+      }
+    }
+
+    if (moltbotFound) {
+      moltbotCheck.succeed(foundName === 'clawdbot' ? 'Found clawdbot (old name for Moltbot)' : 'Moltbot found');
+    } else {
+      moltbotCheck.warn('Moltbot not found');
       console.log(dim('  Install with: npm install -g moltbot@latest'));
       console.log(dim('  Then run: moltbot onboard'));
       console.log('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spawn-skill",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Connect your AI agent to Spawn.wtf",
   "bin": {
     "spawn-skill": "./bin/cli.js"