builderos-cli 2.0.1 → 2.0.3

package/index.js

@@ -9,6 +9,7 @@
  * Usage:
  *   npx builderos-cli init [options]
  *   npx builderos-cli update [options]
+ *   npx builderos-cli mcp          # Start MCP server
  *
  * Options:
  *   --api-url=<url>     BuilderOS API URL (default: http://builder-os.test)
@@ -21,10 +22,22 @@
 import { mkdir, writeFile, readFile, access } from 'fs/promises';
 import { join } from 'path';
 import { constants } from 'fs';
+import { startMCPServer } from './mcp-server.js';
 
 // Parse command line arguments
 const args = process.argv.slice(2);
 
+// Check for MCP server command first
+const command = args[0];
+if (command === 'mcp') {
+  // Start MCP server (this will run indefinitely)
+  await startMCPServer().catch((error) => {
+    console.error('Fatal error:', error);
+    process.exit(1);
+  });
+  // MCP server is now running, this code won't be reached
+}
+
 // Default options
 const options = {
   apiUrl: process.env.BUILDEROS_API_URL || 'http://builder-os.test',
@@ -35,7 +48,6 @@ const options = {
 };
 
 // Check if first arg is help or no command
-const command = args[0];
 if (!command || command === '--help' || command === '-h') {
   options.help = true;
 }
@@ -58,15 +70,17 @@ for (const arg of args) {
 // Show help
 if (options.help) {
   console.log(`
-BuilderOS CLI v2.0.0
+BuilderOS CLI v2.0.3
 
 Usage:
   npx builderos-cli init [options]
   npx builderos-cli update [options]
+  npx builderos-cli mcp
 
 Commands:
   init      Initialize BuilderOS in current project
   update    Update skills from BuilderOS API
+  mcp       Start MCP server (used by Claude Code)
 
 Options:
   --api-url=<url>     BuilderOS API URL (default: http://builder-os.test)
@@ -87,6 +101,9 @@ Examples:
 
   # Force reinstall
   npx builderos-cli init --force
+
+  # Start MCP server (automatically used by .mcp.json)
+  npx builderos-cli mcp
 `);
   process.exit(0);
 }
@@ -105,11 +122,15 @@ async function fileExists(path) {
 async function fetchAPI(endpoint) {
   try {
     const url = `${options.apiUrl}${endpoint}`;
-    const response = await fetch(url, {
-      headers: {
-        'Host': 'builder-os.test', // For local nginx-proxy
-      },
-    });
+
+    // Only set Host header if API URL is not builder-os.test
+    // (for cases where we need to access through IP but want nginx to route correctly)
+    const headers = {};
+    if (!options.apiUrl.includes('builder-os.test')) {
+      headers['Host'] = 'builder-os.test';
+    }
+
+    const response = await fetch(url, { headers });
 
     if (!response.ok) {
       throw new Error(`HTTP ${response.status}: ${response.statusText}`);
@@ -118,6 +139,8 @@ async function fetchAPI(endpoint) {
     return await response.json();
   } catch (error) {
     console.error(`❌ Error fetching ${endpoint}:`, error.message);
+    console.error(`   URL: ${url}`);
+    console.error(`   Stack:`, error.stack);
     return null;
   }
 }
@@ -139,14 +162,13 @@ async function installMCP() {
     }
   }
 
-  // Always use remote mode (npx @builderos/mcp-client)
-  // This CLI is meant to be standalone, not requiring local BuilderOS code
+  // Use builderos-cli mcp command as MCP server
   const mcpConfig = {
     mcpServers: {
       'builder-os': {
         type: 'stdio',
         command: 'npx',
-        args: ['-y', '@builderos/mcp-client'],
+        args: ['-y', 'builderos-cli', 'mcp'],
         env: {
           BUILDEROS_API_URL: options.apiUrl,
         },
@@ -166,12 +188,15 @@ async function installSkills() {
 
   // Fetch skills list
   const data = await fetchAPI('/api/skills');
-  if (!data || !data.skills) {
+  if (!data || !data.data) {
     console.log('   ❌ Failed to fetch skills list');
+    if (data) {
+      console.log('   Response structure:', JSON.stringify(Object.keys(data)));
+    }
     return;
   }
 
-  const skills = data.skills;
+  const skills = data.data;
   console.log(`   Found ${skills.length} skills`);
 
   // Create .claude/skills directory
@@ -187,7 +212,7 @@ async function installSkills() {
 
     const skillData = await fetchAPI(`/api/skills/${skill.slug}`);
 
-    if (!skillData || !skillData.content) {
+    if (!skillData || !skillData.data || !skillData.data.content) {
       console.log(`      ⚠️  No content available`);
       failedSkills.push(skill.slug);
       continue;
@@ -199,7 +224,7 @@ async function installSkills() {
 
     // Write skill.md
     const skillPath = join(skillDir, 'skill.md');
-    await writeFile(skillPath, skillData.content);
+    await writeFile(skillPath, skillData.data.content);
 
     console.log(`      ✅ Saved to ${skillDir}/skill.md`);
     successCount++;

package/mcp-server.js

@@ -0,0 +1,143 @@
+#!/usr/bin/env node
+
+/**
+ * BuilderOS MCP Server
+ *
+ * MCP server that connects to BuilderOS HTTP API.
+ * Used by Claude Code to access BuilderOS tools.
+ */
+
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import {
+  CallToolRequestSchema,
+  ListToolsRequestSchema,
+} from '@modelcontextprotocol/sdk/types.js';
+
+// Get API URL from environment variable
+const API_URL = process.env.BUILDEROS_API_URL || 'http://builder-os.test';
+
+/**
+ * Fetch tools from BuilderOS API
+ */
+async function fetchTools() {
+  try {
+    // Only set Host header if API URL is not builder-os.test
+    const headers = {};
+    if (!API_URL.includes('builder-os.test')) {
+      headers['Host'] = 'builder-os.test';
+    }
+
+    const response = await fetch(`${API_URL}/api/mcp/tools`, { headers });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch tools: ${response.statusText}`);
+    }
+
+    const data = await response.json();
+    return data.tools || [];
+  } catch (error) {
+    console.error('Error fetching tools:', error);
+    return [];
+  }
+}
+
+/**
+ * Execute tool via BuilderOS API
+ */
+async function executeTool(toolName, args) {
+  try {
+    // Only set Host header if API URL is not builder-os.test
+    const headers = {
+      'Content-Type': 'application/json',
+    };
+    if (!API_URL.includes('builder-os.test')) {
+      headers['Host'] = 'builder-os.test';
+    }
+
+    const response = await fetch(`${API_URL}/api/mcp/execute`, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify({
+        tool: toolName,
+        arguments: args
+      })
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to execute tool: ${response.statusText}`);
+    }
+
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error('Error executing tool:', error);
+    throw error;
+  }
+}
+
+/**
+ * Start MCP server
+ */
+export async function startMCPServer() {
+  const server = new Server(
+    {
+      name: 'builderos-cli-mcp',
+      version: '2.0.3',
+    },
+    {
+      capabilities: {
+        tools: {},
+      },
+    }
+  );
+
+  // List available tools
+  server.setRequestHandler(ListToolsRequestSchema, async () => {
+    const tools = await fetchTools();
+    return { tools };
+  });
+
+  // Execute tool
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+
+    try {
+      const result = await executeTool(name, args || {});
+
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(result, null, 2),
+          },
+        ],
+      };
+    } catch (error) {
+      return {
+        content: [
+          {
+            type: 'text',
+            text: `Error: ${error.message}`,
+          },
+        ],
+        isError: true,
+      };
+    }
+  });
+
+  // Start server
+  const transport = new StdioServerTransport();
+  await server.connect(transport);
+
+  console.error('BuilderOS MCP Server started');
+  console.error(`Connected to: ${API_URL}`);
+}
+
+// Run if called directly
+if (import.meta.url === `file://${process.argv[1]}`) {
+  startMCPServer().catch((error) => {
+    console.error('Fatal error:', error);
+    process.exit(1);
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "builderos-cli",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "BuilderOS CLI - Initialize BuilderOS in any project without requiring local code",
   "type": "module",
   "main": "index.js",
@@ -26,5 +26,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/builderos/builderos"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.0.4"
   }
 }