@bike4mind/cli 0.2.5-feat-server-side-tool-execution.17093 → 0.2.5-feat-cli-docker-mcp-support.17095

package/README.md

@@ -172,13 +172,15 @@ export SERPER_API_KEY="your-key-here"
 
 MCP (Model Context Protocol) servers provide additional tools and capabilities. Configure them in `~/.bike4mind/config.json`:
 
+#### Internal MCP Servers (Node.js)
+
+For MCP servers bundled with the monorepo, you can omit `command` and `args` - the CLI will automatically discover them:
+
 ```json
 {
   "mcpServers": [
     {
       "name": "github",
-      "command": "node",
-      "args": ["path/to/mcp/server.js"],
       "env": {
         "GITHUB_ACCESS_TOKEN": "ghp_..."
       },
@@ -188,12 +190,56 @@ MCP (Model Context Protocol) servers provide additional tools and capabilities.
 }
 ```
 
-**Available MCP Servers:**
+#### External MCP Servers (Docker)
+
+You can run MCP servers in Docker containers for isolation and portability:
+
+```json
+{
+  "mcpServers": [
+    {
+      "name": "github",
+      "command": "docker",
+      "args": ["run", "-i", "--rm", "-e", "GITHUB_TOKEN", "ghcr.io/github/github-mcp-server"],
+      "env": {
+        "GITHUB_TOKEN": "ghp_..."
+      },
+      "enabled": true
+    }
+  ]
+}
+```
+
+**Docker Configuration Notes:**
+- The `-i` flag is required for stdin communication with the MCP server
+- Use `-e VAR_NAME` (without value) to pass environment variables from the host
+- The `--rm` flag ensures containers are cleaned up after use
+- Requires Docker to be installed and running
+
+#### External MCP Servers (npx/Custom Commands)
+
+You can also run any MCP server via npx or custom executables:
+
+```json
+{
+  "mcpServers": [
+    {
+      "name": "filesystem",
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/path/to/allowed/dir"],
+      "env": {},
+      "enabled": true
+    }
+  ]
+}
+```
+
+**Available Built-in MCP Servers:**
 - 🔧 **GitHub** - Repository management, issues, PRs (requires `GITHUB_ACCESS_TOKEN`)
 - 🔧 **LinkedIn** - Post management, analytics (requires `LINKEDIN_ACCESS_TOKEN`, `COMPANY_NAME`)
 - 🔧 **Atlassian** - Jira/Confluence integration (requires `ATLASSIAN_ACCESS_TOKEN`, `ATLASSIAN_CLOUD_ID`, `ATLASSIAN_SITE_URL`)
 
-**Note:** MCP servers must be built and available in the `b4m-core/packages/mcp/dist/src/` directory. The CLI will automatically find them if you're running from the monorepo.
+**Note:** Internal MCP servers must be built and available in the `b4m-core/packages/mcp/dist/src/` directory. The CLI will automatically find them if you're running from the monorepo. For Docker-based servers, ensure Docker is installed and the image is accessible.
 
 ## Session Storage
 

package/dist/index.js

@@ -1421,8 +1421,8 @@ var CliConfigSchema = z.object({
   mcpServers: z.array(
     z.object({
       name: z.string(),
-      command: z.string(),
-      args: z.array(z.string()),
+      command: z.string().optional(),
+      args: z.array(z.string()).optional(),
       env: z.record(z.string()),
       enabled: z.boolean()
     })
@@ -8790,12 +8790,16 @@ var MCPClient = class {
   mcp;
   transport = null;
   envVariables;
+  customCommand;
+  customArgs;
   tools = [];
   serverName;
-  constructor({ envVariables, name, selectedRepositories }) {
+  constructor({ envVariables, name, selectedRepositories, command, args }) {
     this.mcp = new Client2({ name: "mcp-client-cli", version: "1.0.0" });
     this.envVariables = [...envVariables];
     this.serverName = name;
+    this.customCommand = command;
+    this.customArgs = args;
     if (name === "github" && selectedRepositories) {
       const reposJson = JSON.stringify(selectedRepositories);
       this.envVariables.push({
@@ -8806,37 +8810,48 @@ var MCPClient = class {
   }
   async connectToServer() {
     try {
-      const root = process.env.INIT_CWD || process.cwd();
-      const candidatePaths = [
-        // When running from SST Lambda with node_modules structure (copyFiles)
-        path12.join(root, `node_modules/@bike4mind/mcp/dist/src/${this.serverName}/index.js`),
-        // When running from SST Lambda deployed environment (/var/task)
-        path12.join(root, `b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        // When running from SST Lambda (.sst/artifacts/mcpHandler-dev), navigate to monorepo root (3 levels up)
-        path12.join(root, `../../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        // When running from packages/client (Next.js app), navigate to monorepo root (2 levels up)
-        path12.join(root, `../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        // Original paths (backward compatibility)
-        path12.join(root, `/b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-        path12.join(root, "core", "mcp", "servers", this.serverName, "dist", "index.js")
-      ];
-      const serverScriptPath = candidatePaths.find((p) => existsSync6(p));
-      if (!serverScriptPath) {
-        const getDirectories = (source) => readdirSync3(source, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
-        console.error(`[MCP] Server script not found. Tried paths:`, candidatePaths);
-        console.error(`[MCP] Available directories in ${root}:`, getDirectories(root));
-        throw new Error(`MCP Server script path not found for ${this.serverName}. Root: ${root}, Available dirs: ${getDirectories(root).join(", ")}`);
-      }
-      console.log(`[MCP] Using server: ${this.serverName} at ${serverScriptPath}`);
+      const envVarsObject = this.envVariables.reduce((acc, env) => ({
+        ...acc,
+        [env.key]: env.value
+      }), {});
+      let command;
+      let args;
+      if (this.customCommand && this.customCommand.trim() !== "") {
+        command = this.customCommand;
+        args = this.customArgs ?? [];
+        console.log(`[MCP] Using external command for ${this.serverName}: ${command} ${args.join(" ")}`);
+      } else {
+        const root = process.env.INIT_CWD || process.cwd();
+        const candidatePaths = [
+          // When running from SST Lambda with node_modules structure (copyFiles)
+          path12.join(root, `node_modules/@bike4mind/mcp/dist/src/${this.serverName}/index.js`),
+          // When running from SST Lambda deployed environment (/var/task)
+          path12.join(root, `b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          // When running from SST Lambda (.sst/artifacts/mcpHandler-dev), navigate to monorepo root (3 levels up)
+          path12.join(root, `../../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          // When running from packages/client (Next.js app), navigate to monorepo root (2 levels up)
+          path12.join(root, `../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          // Original paths (backward compatibility)
+          path12.join(root, `/b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          path12.join(root, "core", "mcp", "servers", this.serverName, "dist", "index.js")
+        ];
+        const serverScriptPath = candidatePaths.find((p) => existsSync6(p));
+        if (!serverScriptPath) {
+          const getDirectories = (source) => readdirSync3(source, { withFileTypes: true }).filter((dirent) => dirent.isDirectory()).map((dirent) => dirent.name);
+          console.error(`[MCP] Server script not found. Tried paths:`, candidatePaths);
+          console.error(`[MCP] Available directories in ${root}:`, getDirectories(root));
+          throw new Error(`MCP Server script path not found for ${this.serverName}. Root: ${root}, Available dirs: ${getDirectories(root).join(", ")}`);
+        }
+        command = process.execPath;
+        args = [serverScriptPath];
+        console.log(`[MCP] Using server: ${this.serverName} at ${serverScriptPath}`);
+      }
       this.transport = new StdioClientTransport({
-        command: process.execPath,
-        args: [serverScriptPath],
+        command,
+        args,
         env: {
-          ...process.env,
-          ...this.envVariables.reduce((acc, env) => ({
-            ...acc,
-            [env.key]: env.value
-          }), {})
+          ...Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] !== void 0)),
+          ...envVarsObject
         }
       });
       this.transport.onerror = (error) => {
@@ -8944,7 +8959,9 @@ var McpManager = class {
       }));
       const client = new MCPClient({
         envVariables,
-        name: serverConfig.name
+        name: serverConfig.name,
+        command: serverConfig.command,
+        args: serverConfig.args
       });
       await client.connectToServer();
       const mcpData = {
@@ -9402,7 +9419,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.5-feat-server-side-tool-execution.17093+db1662b89",
+  version: "0.2.5-feat-cli-docker-mcp-support.17095+1671ebc5f",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -9504,10 +9521,10 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.37.1-feat-server-side-tool-execution.17093+db1662b89",
-    "@bike4mind/mcp": "1.19.6-feat-server-side-tool-execution.17093+db1662b89",
-    "@bike4mind/services": "2.32.2-feat-server-side-tool-execution.17093+db1662b89",
-    "@bike4mind/utils": "2.1.1-feat-server-side-tool-execution.17093+db1662b89",
+    "@bike4mind/common": "2.37.1-feat-cli-docker-mcp-support.17095+1671ebc5f",
+    "@bike4mind/mcp": "1.19.6-feat-cli-docker-mcp-support.17095+1671ebc5f",
+    "@bike4mind/services": "2.32.2-feat-cli-docker-mcp-support.17095+1671ebc5f",
+    "@bike4mind/utils": "2.1.1-feat-cli-docker-mcp-support.17095+1671ebc5f",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "^22.9.0",
@@ -9519,7 +9536,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "db1662b8926451c7fdba8eb99245b75f6fae6693"
+  gitHead: "1671ebc5f5250ee3a79c12b4c549b2c256e71f4d"
 };
 
 // src/config/constants.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.2.5-feat-server-side-tool-execution.17093+db1662b89",
+  "version": "0.2.5-feat-cli-docker-mcp-support.17095+1671ebc5f",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -102,10 +102,10 @@
   },
   "devDependencies": {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.37.1-feat-server-side-tool-execution.17093+db1662b89",
-    "@bike4mind/mcp": "1.19.6-feat-server-side-tool-execution.17093+db1662b89",
-    "@bike4mind/services": "2.32.2-feat-server-side-tool-execution.17093+db1662b89",
-    "@bike4mind/utils": "2.1.1-feat-server-side-tool-execution.17093+db1662b89",
+    "@bike4mind/common": "2.37.1-feat-cli-docker-mcp-support.17095+1671ebc5f",
+    "@bike4mind/mcp": "1.19.6-feat-cli-docker-mcp-support.17095+1671ebc5f",
+    "@bike4mind/services": "2.32.2-feat-cli-docker-mcp-support.17095+1671ebc5f",
+    "@bike4mind/utils": "2.1.1-feat-cli-docker-mcp-support.17095+1671ebc5f",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "^22.9.0",
@@ -117,5 +117,5 @@
     "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   },
-  "gitHead": "db1662b8926451c7fdba8eb99245b75f6fae6693"
+  "gitHead": "1671ebc5f5250ee3a79c12b4c549b2c256e71f4d"
 }