spawn-skill 1.1.0 → 1.2.1

package/bin/CLAUDE.md

@@ -7,7 +7,5 @@
 
 | ID | Time | T | Title | Read |
 |----|------|---|-------|------|
-| #905 | 9:07 PM | 🔵 | Spawn-Skill CLI Tool Complete Implementation | ~576 |
-| #894 | 8:55 PM | 🔵 | spawn-skill CLI contains embedded skill documentation | ~435 |
-| #794 | 11:11 AM | ✅ | Simplified spawn-skill CLI package.json generation to use direct ws dependency | ~353 |
+| #913 | 10:14 PM | 🔵 | Spawn-skill CLI tool provides Python SDK implementation | ~343 |
 </claude-mem-context>

package/bin/cli.js

@@ -338,172 +338,6 @@ if __name__ == '__main__':
 `;
 }
 
-function getMCPServer(token) {
-  return `#!/usr/bin/env node
-/**
- * Spawn.wtf MCP Server
- * Bridges Spawn.wtf with Claude Code
- */
-
-import { Server } from '@modelcontextprotocol/sdk/server/index.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import {
-  CallToolRequestSchema,
-  ListToolsRequestSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-import WebSocket from 'ws';
-
-const RELAY_URL = 'wss://spawn-relay.ngvsqdjj5r.workers.dev/v1/agent';
-const TOKEN = process.env.SPAWN_TOKEN || '${token}';
-
-const messageQueue = [];
-let ws = null;
-let connected = false;
-let connectionError = null;
-
-function connectToRelay() {
-  if (!TOKEN) {
-    connectionError = 'SPAWN_TOKEN not set';
-    return;
-  }
-
-  ws = new WebSocket(RELAY_URL, {
-    headers: { 'Authorization': \\\`Bearer \\\${TOKEN}\\\` }
-  });
-
-  ws.on('open', () => {
-    connected = true;
-    connectionError = null;
-    sendMessage('status_update', { status: 'idle', label: 'Ready' });
-  });
-
-  ws.on('message', (data) => {
-    try {
-      const msg = JSON.parse(data.toString());
-      if (msg.type === 'message') {
-        messageQueue.push({
-          id: msg.id,
-          timestamp: msg.ts || Date.now(),
-          text: msg.payload?.text || '',
-          from: msg.payload?.from || 'user'
-        });
-      }
-    } catch (e) {}
-  });
-
-  ws.on('close', () => {
-    connected = false;
-    setTimeout(connectToRelay, 5000);
-  });
-
-  ws.on('error', (err) => {
-    connectionError = err.message;
-  });
-}
-
-function sendMessage(type, payload) {
-  if (ws?.readyState === WebSocket.OPEN) {
-    ws.send(JSON.stringify({
-      type,
-      id: \\\`msg_\\\${Date.now()}\\\`,
-      ts: Date.now(),
-      payload
-    }));
-  }
-}
-
-setInterval(() => {
-  if (ws?.readyState === WebSocket.OPEN) {
-    sendMessage('ping', {});
-  }
-}, 30000);
-
-connectToRelay();
-
-const server = new Server(
-  { name: 'spawn', version: '1.0.0' },
-  { capabilities: { tools: {} } }
-);
-
-server.setRequestHandler(ListToolsRequestSchema, async () => ({
-  tools: [
-    {
-      name: 'spawn_check_messages',
-      description: 'Check for new messages from the Spawn.wtf iOS app',
-      inputSchema: { type: 'object', properties: {}, required: [] }
-    },
-    {
-      name: 'spawn_respond',
-      description: 'Send a response back to the user through Spawn.wtf',
-      inputSchema: {
-        type: 'object',
-        properties: {
-          text: { type: 'string', description: 'Message to send' },
-          format: { type: 'string', enum: ['plain', 'markdown'], default: 'plain' }
-        },
-        required: ['text']
-      }
-    },
-    {
-      name: 'spawn_status',
-      description: 'Update your status in Spawn.wtf (idle/thinking/working)',
-      inputSchema: {
-        type: 'object',
-        properties: {
-          status: { type: 'string', enum: ['idle', 'thinking', 'working'] },
-          label: { type: 'string', description: 'Status label' }
-        },
-        required: ['status']
-      }
-    },
-    {
-      name: 'spawn_connection_info',
-      description: 'Get Spawn.wtf connection status',
-      inputSchema: { type: 'object', properties: {}, required: [] }
-    }
-  ]
-}));
-
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  const { name, arguments: args } = request.params;
-
-  switch (name) {
-    case 'spawn_check_messages': {
-      const messages = [...messageQueue];
-      messageQueue.length = 0;
-      if (messages.length > 0) {
-        sendMessage('status_update', { status: 'thinking', label: 'Reading messages' });
-      }
-      return { content: [{ type: 'text', text: JSON.stringify({ messages, count: messages.length }) }] };
-    }
-    case 'spawn_respond': {
-      if (!connected) {
-        return { content: [{ type: 'text', text: JSON.stringify({ success: false, error: 'Not connected' }) }] };
-      }
-      sendMessage('message', { content_type: 'text', text: args.text, format: args.format || 'plain' });
-      sendMessage('status_update', { status: 'idle', label: 'Ready' });
-      return { content: [{ type: 'text', text: JSON.stringify({ success: true }) }] };
-    }
-    case 'spawn_status': {
-      if (!connected) {
-        return { content: [{ type: 'text', text: JSON.stringify({ success: false, error: 'Not connected' }) }] };
-      }
-      sendMessage('status_update', { status: args.status, label: args.label });
-      return { content: [{ type: 'text', text: JSON.stringify({ success: true }) }] };
-    }
-    case 'spawn_connection_info': {
-      return { content: [{ type: 'text', text: JSON.stringify({ connected, error: connectionError, pendingMessages: messageQueue.length }) }] };
-    }
-    default:
-      throw new Error(\\\`Unknown tool: \\\${name}\\\`);
-  }
-});
-
-const transport = new StdioServerTransport();
-server.connect(transport);
-`;
-}
-
 function getPythonSDK() {
   return `"""
 Spawn.wtf Python SDK
@@ -639,7 +473,122 @@ class SpawnAgent:
 `;
 }
 
-async function createSkillFiles(token, agentName, language, claudeCode = false) {
+function getMoltbotBridge(token, agentName) {
+  return `/**
+ * Spawn.wtf → Moltbot Bridge
+ * Routes messages from Spawn iOS app to your Moltbot backend
+ * Run with: node connect.js
+ */
+
+import WebSocket from 'ws';
+import { spawn } from 'child_process';
+
+const TOKEN = '${token}';
+const NAME = '${agentName}';
+const RELAY = 'wss://spawn-relay.ngvsqdjj5r.workers.dev/v1/agent';
+
+let ws;
+
+function send(type, payload) {
+  if (ws?.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify({
+      type,
+      id: \`msg_\${Date.now()}\`,
+      ts: Date.now(),
+      payload
+    }));
+  }
+}
+
+function sendText(text) {
+  send('message', { content_type: 'text', text, format: 'plain' });
+}
+
+function updateStatus(status, label) {
+  send('status_update', { status, label });
+}
+
+// Forward message to Moltbot and return response
+async function askMoltbot(message) {
+  return new Promise((resolve, reject) => {
+    console.log('📨 Forwarding to Moltbot:', message);
+    updateStatus('thinking', 'Asking Moltbot...');
+
+    // Use shell: true to inherit PATH and find globally installed moltbot
+    const moltbot = spawn('moltbot', ['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());
+
+    moltbot.on('error', (err) => {
+      console.error('✗ Failed to start Moltbot:', err.message);
+      reject(new Error('Moltbot not found. Install with: npm install -g moltbot@latest'));
+    });
+
+    moltbot.on('close', (code) => {
+      if (code === 0) {
+        console.log('✓ Moltbot responded');
+        resolve(response.trim());
+      } else {
+        console.error('✗ Moltbot error:', error);
+        reject(new Error(error || \`Exit code \${code}\`));
+      }
+    });
+  });
+}
+
+function connect() {
+  ws = new WebSocket(RELAY, {
+    headers: { 'Authorization': \`Bearer \${TOKEN}\` }
+  });
+
+  ws.on('open', () => {
+    console.log('🦞 Connected to Spawn.wtf (Moltbot bridge mode)');
+    sendText(\`\${NAME} is online (powered by Moltbot 🦞)\`);
+    updateStatus('idle', 'Ready for commands');
+  });
+
+  ws.on('message', async (data) => {
+    const msg = JSON.parse(data.toString());
+    
+    if (msg.type === 'message') {
+      const text = msg.payload?.text || '';
+      console.log('📱 From Spawn:', text);
+      
+      try {
+        const response = await askMoltbot(text);
+        sendText(response);
+        updateStatus('idle', 'Ready');
+      } catch (err) {
+        sendText(\`Error: \${err.message}\`);
+        updateStatus('idle', 'Ready');
+      }
+    }
+  });
+
+  ws.on('close', () => {
+    console.log('Disconnected, reconnecting in 5s...');
+    setTimeout(connect, 5000);
+  });
+
+  ws.on('error', (err) => console.error('WebSocket error:', err.message));
+}
+
+setInterval(() => ws?.readyState === WebSocket.OPEN && send('ping', {}), 30000);
+
+console.log('🦞 Starting Spawn → Moltbot bridge...');
+connect();
+
+process.on('SIGINT', () => { ws?.close(); process.exit(0); });
+`;
+}
+
+async function createSkillFiles(token, agentName, language, useMoltbot = false) {
   const skillDir = path.join(process.cwd(), 'spawn');
 
   // Create spawn directory
@@ -655,14 +604,17 @@ async function createSkillFiles(token, agentName, language, claudeCode = false)
     name: agentName,
     token: token,
     relay: 'wss://spawn-relay.ngvsqdjj5r.workers.dev/v1/agent',
-    language: language,
-    claudeCode: claudeCode
+    language: language
   };
   fs.writeFileSync(path.join(skillDir, 'config.json'), JSON.stringify(config, null, 2));
 
   if (language === 'typescript') {
     // TypeScript/Node setup
-    fs.writeFileSync(path.join(skillDir, 'connect.js'), getTypeScriptConnector(token, agentName));
+    if (useMoltbot) {
+      fs.writeFileSync(path.join(skillDir, 'connect.js'), getMoltbotBridge(token, agentName));
+    } else {
+      fs.writeFileSync(path.join(skillDir, 'connect.js'), getTypeScriptConnector(token, agentName));
+    }
 
     const packageJson = {
       name: "spawn-agent",
@@ -681,45 +633,7 @@ async function createSkillFiles(token, agentName, language, claudeCode = false)
     fs.writeFileSync(path.join(skillDir, 'requirements.txt'), 'websockets>=12.0\n');
   }
 
-  // Claude Code MCP integration
-  if (claudeCode) {
-    const mcpDir = path.join(skillDir, 'mcp');
-    if (!fs.existsSync(mcpDir)) {
-      fs.mkdirSync(mcpDir, { recursive: true });
-    }
-
-    // Create MCP server
-    fs.writeFileSync(path.join(mcpDir, 'server.js'), getMCPServer(token));
-
-    // Create MCP package.json
-    const mcpPackageJson = {
-      name: "spawn-mcp-server",
-      version: "1.0.0",
-      type: "module",
-      dependencies: {
-        "@modelcontextprotocol/sdk": "^1.0.0",
-        "ws": "^8.16.0"
-      }
-    };
-    fs.writeFileSync(path.join(mcpDir, 'package.json'), JSON.stringify(mcpPackageJson, null, 2));
-
-    // Create Claude Code settings snippet
-    const mcpFullPath = path.resolve(mcpDir, 'server.js');
-    const settingsSnippet = {
-      mcpServers: {
-        spawn: {
-          command: "node",
-          args: [mcpFullPath],
-          env: {
-            SPAWN_TOKEN: token
-          }
-        }
-      }
-    };
-    fs.writeFileSync(path.join(mcpDir, 'claude-settings.json'), JSON.stringify(settingsSnippet, null, 2));
-  }
-
-  return { skillDir, language, claudeCode };
+  return { skillDir, language, useMoltbot };
 }
 
 async function main() {
@@ -785,9 +699,9 @@ async function main() {
 
   questions.push({
     type: 'confirm',
-    name: 'claudeCode',
-    message: 'Add Claude Code integration? (MCP server for chatting via phone)',
-    default: true
+    name: 'useMoltbot',
+    message: 'Use Moltbot as your AI backend? (recommended)',
+    default: false
   });
 
   const answers = await inquirer.prompt(questions);
@@ -795,14 +709,29 @@ async function main() {
   token = token || answers.token;
   agentName = answers.agentName || agentName;
   language = language || answers.language;
-  const claudeCode = answers.claudeCode;
+  const useMoltbot = answers.useMoltbot || false;
 
   console.log('');
 
+  // Check for Moltbot if needed
+  if (useMoltbot) {
+    const moltbotCheck = ora('Checking for Moltbot...').start();
+    try {
+      const { execSync } = await import('child_process');
+      execSync('which moltbot', { stdio: 'pipe' });
+      moltbotCheck.succeed('Moltbot found');
+    } catch {
+      moltbotCheck.warn('Moltbot not installed');
+      console.log(dim('  Install with: npm install -g moltbot@latest'));
+      console.log(dim('  Then run: moltbot onboard'));
+      console.log('');
+    }
+  }
+
   // Create files
   const createSpinner = ora('Creating skill files...').start();
   try {
-    const { skillDir } = await createSkillFiles(token, agentName, language, claudeCode);
+    const { skillDir } = await createSkillFiles(token, agentName, language, useMoltbot);
     createSpinner.succeed('Created skill files');
   } catch (err) {
     createSpinner.fail('Failed to create skill files');
@@ -810,18 +739,6 @@ async function main() {
     process.exit(1);
   }
 
-  // Install MCP dependencies if needed
-  if (claudeCode) {
-    const mcpSpinner = ora('Installing MCP dependencies...').start();
-    try {
-      const { execSync } = await import('child_process');
-      execSync('npm install', { cwd: path.join(process.cwd(), 'spawn', 'mcp'), stdio: 'pipe' });
-      mcpSpinner.succeed('Installed MCP dependencies');
-    } catch (err) {
-      mcpSpinner.warn('Run "cd spawn/mcp && npm install" to finish MCP setup');
-    }
-  }
-
   console.log('');
   console.log(chalk.green.bold('✓ Spawn.wtf skill installed!'));
   console.log('');
@@ -832,20 +749,14 @@ async function main() {
     console.log(dim('    spawn/config.json'));
     console.log(dim('    spawn/connect.js'));
     console.log(dim('    spawn/package.json'));
-    if (claudeCode) {
-      console.log(dim('    spawn/mcp/server.js'));
-      console.log(dim('    spawn/mcp/package.json'));
-      console.log(dim('    spawn/mcp/claude-settings.json'));
-    }
     console.log('');
     console.log('  Next steps:');
     console.log('');
     console.log('  1. ' + chalk.cyan('Install dependencies:'));
-    console.log('     ' + dim('cd spawn'));
-    console.log('     ' + dim('npm install'));
+    console.log('     ' + dim('cd spawn && npm install'));
     console.log('');
     console.log('  2. ' + chalk.cyan('Run the connector:'));
-    console.log('     ' + dim('node connect.js'));
+    console.log('     ' + dim('node spawn/connect.js'));
   } else {
     console.log('  Files created:');
     console.log(dim('    spawn/SKILL.md'));
@@ -853,49 +764,18 @@ async function main() {
     console.log(dim('    spawn/connect.py'));
     console.log(dim('    spawn/spawn_sdk.py'));
     console.log(dim('    spawn/requirements.txt'));
-    if (claudeCode) {
-      console.log(dim('    spawn/mcp/server.js'));
-      console.log(dim('    spawn/mcp/package.json'));
-      console.log(dim('    spawn/mcp/claude-settings.json'));
-    }
     console.log('');
     console.log('  Next steps:');
     console.log('');
     console.log('  1. ' + chalk.cyan('Install dependencies:'));
-    console.log('     ' + dim('cd spawn'));
-    console.log('     ' + dim('pip install -r requirements.txt'));
+    console.log('     ' + dim('cd spawn && pip install -r requirements.txt'));
     console.log('');
     console.log('  2. ' + chalk.cyan('Run the connector:'));
-    console.log('     ' + dim('python connect.py'));
+    console.log('     ' + dim('python spawn/connect.py'));
   }
 
   console.log('');
   console.log('  3. ' + chalk.cyan('Open Spawn.wtf app') + ' - your agent should appear!');
-
-  if (claudeCode) {
-    console.log('');
-    console.log(pink('  ═══ Claude Code Integration ═══'));
-    console.log('');
-    console.log('  Add to your ' + chalk.cyan('.claude/settings.json') + ':');
-    console.log('');
-    const mcpPath = path.resolve(process.cwd(), 'spawn', 'mcp', 'server.js');
-    console.log(dim('  {'));
-    console.log(dim('    "mcpServers": {'));
-    console.log(dim('      "spawn": {'));
-    console.log(dim('        "command": "node",'));
-    console.log(dim(`        "args": ["${mcpPath}"],`));
-    console.log(dim('        "env": { "SPAWN_TOKEN": "' + token.slice(0, 12) + '..." }'));
-    console.log(dim('      }'));
-    console.log(dim('    }'));
-    console.log(dim('  }'));
-    console.log('');
-    console.log('  Or copy from: ' + dim('spawn/mcp/claude-settings.json'));
-    console.log('');
-    console.log('  Then restart Claude Code and ask:');
-    console.log('    ' + chalk.white('"Check Spawn messages"'));
-    console.log('    ' + chalk.white('"Respond: Hello from Claude!"'));
-  }
-
   console.log('');
   console.log('  Docs: ' + pink('https://github.com/SpawnWTF/spawn'));
   console.log('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spawn-skill",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "Connect your AI agent to Spawn.wtf",
   "bin": {
     "spawn-skill": "./bin/cli.js"
@@ -9,7 +9,14 @@
   "files": [
     "bin"
   ],
-  "keywords": ["spawn", "ai", "agent", "claude", "monitoring"],
+  "keywords": [
+    "spawn",
+    "ai",
+    "agent",
+    "claude",
+    "monitoring",
+    "moltbot"
+  ],
   "author": "Spawn.wtf",
   "license": "MIT",
   "repository": {
@@ -21,4 +28,4 @@
     "inquirer": "^9.2.12",
     "ora": "^8.0.1"
   }
-}
+}