@aiwerk/mcp-bridge 2.8.13 → 2.8.15

package/dist/bin/mcp-bridge.js

@@ -98,6 +98,14 @@ function parseArgs(argv) {
             case "--offline":
                 args.offline = true;
                 break;
+            case "--register":
+                i++;
+                if (!argv[i]) {
+                    process.stderr.write("Error: --register requires a client name (claude-code, codex, cursor, windsurf)\n");
+                    process.exit(1);
+                }
+                args.register = argv[i];
+                break;
             case "--daily":
                 i++;
                 args.daily = parseInt(argv[i], 10);
@@ -171,7 +179,7 @@ Usage:
   mcp-bridge                        Start in stdio mode (default)
   mcp-bridge --sse --port 3000      Start as SSE server
   mcp-bridge --http --port 3000     Start as streamable-http server
-  mcp-bridge init                   Create ~/.mcp-bridge/ with config template
+  mcp-bridge init [--register <client>]  Create config + optionally register with a client
   mcp-bridge install <server>       Install a server from the catalog
   mcp-bridge catalog [--offline]    List available servers
   mcp-bridge servers                List configured servers
@@ -203,130 +211,123 @@ function whichCmd(name) {
         return false;
     }
 }
-function cmdInit(logger) {
+function cmdInit(logger, register) {
     initConfigDir(logger);
     const isGlobal = __dirname.includes("node_modules") && (__dirname.includes("/lib/node_modules/") || __dirname.includes("\\lib\\node_modules\\"));
     const bridgeCmd = isGlobal ? "mcp-bridge" : "node";
     const bridgeArgs = isGlobal ? ["serve"] : [join(__dirname, "..", "bin", "mcp-bridge.js"), "serve"];
-    // Auto-detect and register with known clients
-    let registered = false;
-    // Claude Code
-    if (whichCmd("claude")) {
-        try {
-            const addArgs = ["mcp", "add", "-s", "user", "mcp-bridge", "--", bridgeCmd, ...bridgeArgs];
-            execFileSync("claude", addArgs, { stdio: "pipe" });
-            process.stdout.write("✓ Registered with Claude Code (user scope) → ~/.claude.json\n  Restart Claude Code to activate.\n");
-            registered = true;
+    const cmd = isGlobal ? "mcp-bridge" : `node ${join(__dirname, "..", "bin", "mcp-bridge.js")}`;
+    if (register) {
+        registerClient(register, bridgeCmd, bridgeArgs, cmd);
+        return;
+    }
+    const detected = [];
+    if (whichCmd("claude"))
+        detected.push("claude-code");
+    if (whichCmd("codex"))
+        detected.push("codex");
+    if (existsSync(join(homedir(), ".cursor")))
+        detected.push("cursor");
+    if (existsSync(join(homedir(), ".windsurf")))
+        detected.push("windsurf");
+    if (detected.length > 0) {
+        process.stdout.write("\nDetected MCP clients. Register with:\n");
+        for (const client of detected) {
+            process.stdout.write(`  mcp-bridge init --register ${client}\n`);
         }
-        catch (err) {
-            const msg = err instanceof Error ? err.message : String(err);
-            if (msg.includes("already exists")) {
-                registered = true;
-                // Silent - already configured, no need to print
+    }
+    else {
+        process.stdout.write(`\nNo supported MCP client detected. Manual setup:\n\n  Claude Code:    claude mcp add -s user mcp-bridge -- ${cmd} serve\n  Codex:          codex mcp add mcp-bridge -- ${cmd} serve\n  Cursor:         Add to ~/.cursor/mcp.json\n  Claude Desktop: Add to claude_desktop_config.json\n  OpenClaw:       openclaw plugins install @aiwerk/openclaw-mcp-bridge\n\nJSON config block (Cursor/Claude Desktop/Windsurf):\n\n  {\n    "mcp-bridge": {\n      "command": "${isGlobal ? "mcp-bridge" : "node"}",\n      "args": ${JSON.stringify(bridgeArgs)}\n    }\n  }\n`);
+    }
+    if (!isGlobal) {
+        process.stdout.write("\nTip: Install globally for a cleaner setup:\n  npm install -g @aiwerk/mcp-bridge\n");
+    }
+}
+function registerClient(client, bridgeCmd, bridgeArgs, cmd) {
+    switch (client) {
+        case "claude-code": {
+            try {
+                execFileSync("claude", ["mcp", "add", "-s", "user", "mcp-bridge", "--", bridgeCmd, ...bridgeArgs], { stdio: "pipe" });
+                process.stdout.write("✓ Registered with Claude Code → ~/.claude.json\n  Restart Claude Code to activate.\n");
             }
-            else {
-                process.stdout.write("⚠ Claude Code detected but registration failed. Manual setup:\n");
-                process.stdout.write(`  claude mcp add -s user mcp-bridge -- ${bridgeCmd} ${bridgeArgs.join(" ")}\n\n`);
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                if (msg.includes("already exists")) {
+                    process.stdout.write("✓ Claude Code already configured.\n");
+                }
+                else {
+                    process.stdout.write(`⚠ Registration failed. Manual setup:\n  claude mcp add -s user mcp-bridge -- ${cmd} serve\n`);
+                }
             }
+            break;
         }
-    }
-    // Cursor
-    const cursorConfigPath = join(homedir(), ".cursor", "mcp.json");
-    if (existsSync(join(homedir(), ".cursor"))) {
-        try {
-            let cursorConfig = {};
-            if (existsSync(cursorConfigPath)) {
-                cursorConfig = JSON.parse(readFileSync(cursorConfigPath, "utf-8"));
+        case "codex": {
+            const codexConfigPath = join(homedir(), ".codex", "config.toml");
+            try {
+                const codexConfig = existsSync(codexConfigPath) ? readFileSync(codexConfigPath, "utf-8") : "";
+                if (codexConfig.includes("[mcp_servers.mcp-bridge]") || codexConfig.includes("[mcp_servers.aiwerk-bridge]")) {
+                    process.stdout.write("✓ Codex already configured.\n");
+                }
+                else {
+                    execFileSync("codex", ["mcp", "add", "mcp-bridge", "--", bridgeCmd, ...bridgeArgs], { stdio: "pipe" });
+                    process.stdout.write(`✓ Registered with Codex → ${codexConfigPath}\n  Restart Codex to activate.\n`);
+                }
             }
-            if (!cursorConfig.mcpServers)
-                cursorConfig.mcpServers = {};
-            if (!cursorConfig.mcpServers["mcp-bridge"]) {
-                cursorConfig.mcpServers["mcp-bridge"] = { command: bridgeCmd, args: bridgeArgs };
-                writeFileSync(cursorConfigPath, JSON.stringify(cursorConfig, null, 2) + "\n", "utf-8");
-                process.stdout.write(`✓ Registered with Cursor → ${cursorConfigPath}\n  Restart Cursor to activate.\n`);
-                registered = true;
+            catch {
+                process.stdout.write(`⚠ Registration failed. Manual setup:\n  codex mcp add mcp-bridge -- ${cmd} serve\n`);
             }
-            else {
-                registered = true;
-                // Silent - already configured
-                registered = true;
-            }
-        }
-        catch {
-            process.stdout.write("⚠ Cursor detected but registration failed.\n");
+            break;
         }
-    }
-    // Windsurf
-    const windsurfConfigPath = join(homedir(), ".windsurf", "mcp.json");
-    if (existsSync(join(homedir(), ".windsurf"))) {
-        try {
-            let wsConfig = {};
-            if (existsSync(windsurfConfigPath)) {
-                wsConfig = JSON.parse(readFileSync(windsurfConfigPath, "utf-8"));
-            }
-            if (!wsConfig.mcpServers)
-                wsConfig.mcpServers = {};
-            if (!wsConfig.mcpServers["mcp-bridge"]) {
-                wsConfig.mcpServers["mcp-bridge"] = { command: bridgeCmd, args: bridgeArgs };
-                writeFileSync(windsurfConfigPath, JSON.stringify(wsConfig, null, 2) + "\n", "utf-8");
-                process.stdout.write(`✓ Registered with Windsurf → ${windsurfConfigPath}\n  Restart Windsurf to activate.\n`);
-                registered = true;
+        case "cursor": {
+            const configPath = join(homedir(), ".cursor", "mcp.json");
+            try {
+                let config = {};
+                if (existsSync(configPath))
+                    config = JSON.parse(readFileSync(configPath, "utf-8"));
+                if (!config.mcpServers)
+                    config.mcpServers = {};
+                if (config.mcpServers["mcp-bridge"]) {
+                    process.stdout.write("✓ Cursor already configured.\n");
+                }
+                else {
+                    config.mcpServers["mcp-bridge"] = { command: bridgeCmd, args: bridgeArgs };
+                    writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+                    process.stdout.write(`✓ Registered with Cursor → ${configPath}\n  Restart Cursor to activate.\n`);
+                }
             }
-            else {
-                registered = true;
-                // Silent - already configured
-                registered = true;
+            catch {
+                process.stdout.write("⚠ Cursor registration failed.\n");
             }
+            break;
         }
-        catch {
-            process.stdout.write("⚠ Windsurf detected but registration failed.\n");
-        }
-    }
-    // Codex (OpenAI)
-    if (whichCmd("codex")) {
-        const codexConfigPath = join(homedir(), ".codex", "config.toml");
-        try {
-            const codexConfig = existsSync(codexConfigPath) ? readFileSync(codexConfigPath, "utf-8") : "";
-            if (codexConfig.includes("[mcp_servers.mcp-bridge]") || codexConfig.includes("[mcp_servers.aiwerk-bridge]")) {
-                registered = true;
-                // Silent - already configured
+        case "windsurf": {
+            const configPath = join(homedir(), ".windsurf", "mcp.json");
+            try {
+                let config = {};
+                if (existsSync(configPath))
+                    config = JSON.parse(readFileSync(configPath, "utf-8"));
+                if (!config.mcpServers)
+                    config.mcpServers = {};
+                if (config.mcpServers["mcp-bridge"]) {
+                    process.stdout.write("✓ Windsurf already configured.\n");
+                }
+                else {
+                    config.mcpServers["mcp-bridge"] = { command: bridgeCmd, args: bridgeArgs };
+                    writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+                    process.stdout.write(`✓ Registered with Windsurf → ${configPath}\n  Restart Windsurf to activate.\n`);
+                }
             }
-            else {
-                execFileSync("codex", ["mcp", "add", "mcp-bridge", "--", bridgeCmd, ...bridgeArgs], { stdio: "pipe" });
-                process.stdout.write(`✓ Registered with Codex → ${codexConfigPath}\n  Restart Codex to activate.\n`);
-                registered = true;
+            catch {
+                process.stdout.write("⚠ Windsurf registration failed.\n");
             }
+            break;
         }
-        catch {
-            process.stdout.write("⚠ Codex detected but registration failed. Manual setup:\n");
-            process.stdout.write(`  codex mcp add mcp-bridge -- ${bridgeCmd} ${bridgeArgs.join(" ")}\n\n`);
+        default: {
+            const isGlob = bridgeCmd === "mcp-bridge";
+            process.stdout.write(`Unknown client "${client}". Generic MCP config (add to your client's MCP settings):\n\n  {\n    "mcp-bridge": {\n      "command": "${isGlob ? "mcp-bridge" : "node"}",\n      "args": ${JSON.stringify(bridgeArgs)}\n    }\n  }\n\nKnown clients with auto-registration: claude-code, codex, cursor, windsurf\n`);
+            break;
         }
     }
-    if (!registered) {
-        const cmd = isGlobal ? "mcp-bridge" : `node ${join(__dirname, "..", "bin", "mcp-bridge.js")}`;
-        process.stdout.write(`
-No supported MCP client detected. Add manually:
-
-  Claude Code:    claude mcp add -s user mcp-bridge -- ${cmd} serve
-  Codex:          codex mcp add mcp-bridge -- ${cmd} serve
-  Cursor:         Add to ~/.cursor/mcp.json
-  Claude Desktop: Add to claude_desktop_config.json
-  OpenClaw:       openclaw plugins install @aiwerk/openclaw-mcp-bridge
-
-JSON config block (Cursor/Claude Desktop/Windsurf):
-
-  {
-    "mcp-bridge": {
-      "command": "${isGlobal ? "mcp-bridge" : "node"}",
-      "args": ${JSON.stringify(bridgeArgs)}
-    }
-  }
-`);
-    }
-    if (!isGlobal) {
-        process.stdout.write("\nTip: Install globally for a cleaner setup:\n  npm install -g @aiwerk/mcp-bridge\n");
-    }
-    process.stdout.write("\nRestart your client. The bridge appears as an 'mcp' tool with\nsearch, install, and catalog actions to discover and add MCP servers.\n");
 }
 function cmdCatalog(logger) {
     const catalogPath = join(PACKAGE_ROOT, "servers", "index.json");
@@ -763,7 +764,7 @@ async function main() {
             printHelp();
             break;
         case "init":
-            cmdInit(logger);
+            cmdInit(logger, args.register);
             break;
         case "catalog":
             cmdCatalog(logger);

package/dist/src/mcp-router.js

@@ -108,11 +108,13 @@ export class McpRouter {
                     return this.error("mcp_error", "Catalog client not available");
                 }
                 try {
-                    const results = await this.catalogClient.search(query);
+                    const searchResponse = await this.catalogClient.search(query);
+                    // search() may return array or {results: [...]} depending on catalog API version
+                    const results = Array.isArray(searchResponse) ? searchResponse : searchResponse.results || [];
                     return {
                         action: "search",
                         query,
-                        results: results.map(r => ({
+                        results: results.map((r) => ({
                             id: r.name,
                             name: r.name,
                             description: r.description || "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiwerk/mcp-bridge",
-  "version": "2.8.13",
+  "version": "2.8.15",
   "description": "Standalone MCP server that multiplexes multiple MCP servers into one interface",
   "type": "module",
   "main": "./dist/src/index.js",