@aiwerk/mcp-bridge 2.8.44 → 2.9.0

package/dist/src/mcp-router.js

@@ -13,8 +13,6 @@ import { ToolResolver } from "./tool-resolution.js";
 import { OAuth2TokenManager } from "./oauth2-token-manager.js";
 import { FileTokenStore } from "./token-store.js";
 import { RateLimiter } from "./rate-limiter.js";
-import { CatalogClient } from "./catalog-client.js";
-import { recipeToServerConfig, collectRequiredEnvVars } from "./config.js";
 const DEFAULT_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
 const DEFAULT_CONNECT_ERROR_COOLDOWN_MS = 10 * 1000;
 const DEFAULT_MAX_CONCURRENT = 5;
@@ -35,7 +33,6 @@ export class McpRouter {
     tokenManager;
     rateLimiter;
     requestIdState = { value: 0 };
-    catalogClient;
     intentRouter = null;
     promotion = null;
     constructor(servers, clientConfig, logger, transportRefs) {
@@ -61,7 +58,6 @@ export class McpRouter {
         this.toolResolver = new ToolResolver(Object.keys(servers));
         this.tokenManager = new OAuth2TokenManager(logger, new FileTokenStore());
         this.rateLimiter = new RateLimiter();
-        this.catalogClient = new CatalogClient({ logger });
         if (clientConfig.adaptivePromotion?.enabled) {
             this.promotion = new AdaptivePromotion(clientConfig.adaptivePromotion, logger);
         }
@@ -69,7 +65,7 @@ export class McpRouter {
     static generateDescription(servers) {
         const serverNames = Object.keys(servers);
         if (serverNames.length === 0) {
-            return "MCP server manager with no servers configured yet. To add MCP servers, always use this tool first (not npm install): action='search' to find servers in the verified catalog (100+ signed, security-audited recipes), action='install' to add a server by name, action='catalog' to browse all available servers.";
+            return "MCP server manager with no servers configured yet.";
         }
         const serverList = serverNames
             .map((name) => {
@@ -77,7 +73,7 @@ export class McpRouter {
             return desc ? `${name} (${desc})` : name;
         })
             .join(", ");
-        return `MCP server manager with ${serverNames.length} connected servers: ${serverList}. Actions: 'call' to execute a tool, 'list' to discover tools on a server, 'batch' for multiple calls in one round-trip, 'status' to check connections, 'refresh' to re-discover tools. To add new MCP servers, always use this tool first (not npm install): 'search' to find servers in the verified catalog (100+ signed, security-audited recipes), 'install' to add a server by name. Use 'set-env' with params.key and params.value to configure API keys (stored in ~/.mcp-bridge/.env). If the user mentions a specific tool by name, the call action auto-connects and works without listing first.`;
+        return `MCP server manager with ${serverNames.length} connected servers: ${serverList}. Actions: 'call' to execute a tool, 'list' to discover tools on a server, 'batch' for multiple calls in one round-trip, 'status' to check connections, 'refresh' to re-discover tools. Use 'set-env' with params.key and params.value to configure API keys (stored in ~/.mcp-bridge/.env). If the user mentions a specific tool by name, the call action auto-connects and works without listing first.`;
     }
     async dispatch(server, action = "call", tool, params) {
         try {
@@ -98,137 +94,6 @@ export class McpRouter {
                 }
                 return this.resolveIntent(intent);
             }
-            // Search catalog
-            if (normalizedAction === "search") {
-                const query = params?.query || server || tool;
-                if (!query) {
-                    return this.error("invalid_params", "query is required for action=search (pass as params.query or server field)");
-                }
-                if (!this.catalogClient) {
-                    return this.error("mcp_error", "Catalog client not available");
-                }
-                try {
-                    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) => ({
-                            id: r.name,
-                            name: r.name,
-                            description: r.description || "",
-                            category: r.category,
-                            auth: r.authSummary || (r.authRequired ? "required" : "none"),
-                            origin: r.origin,
-                            maturity: r.maturity,
-                            sideEffects: r.sideEffects,
-                            pricing: r.pricing,
-                            signed: Array.isArray(r.badges) ? r.badges.includes("signed") : false,
-                        }))
-                    };
-                }
-                catch (err) {
-                    return this.error("mcp_error", `Catalog search failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
-            // Browse catalog
-            if (normalizedAction === "catalog") {
-                if (!this.catalogClient) {
-                    return this.error("mcp_error", "Catalog client not available");
-                }
-                try {
-                    const recipeList = await this.catalogClient.list({ limit: 200 });
-                    return {
-                        action: "catalog",
-                        recipes: recipeList.results.map((r) => ({
-                            id: r.name,
-                            name: r.name,
-                            description: r.description || "",
-                            category: r.category,
-                            auth: r.authSummary || (r.authRequired ? "required" : "none"),
-                            origin: r.origin,
-                            maturity: r.maturity,
-                            sideEffects: r.sideEffects,
-                            pricing: r.pricing,
-                            signed: Array.isArray(r.badges) ? r.badges.includes("signed") : false,
-                        }))
-                    };
-                }
-                catch (err) {
-                    return this.error("mcp_error", `Catalog browse failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
-            // Install server from catalog (runtime + persisted to config file)
-            if (normalizedAction === "install") {
-                const serverName = server || params?.server || params?.name;
-                if (!serverName) {
-                    return this.error("invalid_params", "server name is required for action=install (pass as server field or params.name)");
-                }
-                // Sanitize serverName: only lowercase alphanumeric + hyphens (matches recipe spec id format)
-                if (!/^[a-z0-9][a-z0-9-]*$/.test(serverName)) {
-                    return this.error("invalid_params", `Invalid server name "${serverName}". Must match /^[a-z0-9][a-z0-9-]*$/ (lowercase alphanumeric + hyphens).`);
-                }
-                if (this.servers[serverName]) {
-                    return { action: "install", server: serverName, installed: true, message: `Server "${serverName}" is already configured.` };
-                }
-                if (!this.catalogClient) {
-                    return this.error("mcp_error", "Catalog client not available");
-                }
-                try {
-                    const recipe = await this.catalogClient.resolve(serverName);
-                    const serverConfig = recipeToServerConfig(recipe);
-                    if (!serverConfig) {
-                        return this.error("mcp_error", `Unsupported recipe format for "${serverName}"`);
-                    }
-                    // Check env vars
-                    const requiredVars = collectRequiredEnvVars(recipe);
-                    const missing = requiredVars.filter(v => !process.env[v]);
-                    // Add to runtime config
-                    this.servers[serverName] = serverConfig;
-                    this.clientConfig.servers[serverName] = serverConfig;
-                    // Persist to config file
-                    try {
-                        const os = await import("os");
-                        const fs = await import("fs");
-                        const path = await import("path");
-                        const configPath = path.join(os.homedir(), ".mcp-bridge", "config.json");
-                        if (fs.existsSync(configPath)) {
-                            const raw = JSON.parse(fs.readFileSync(configPath, "utf-8"));
-                            if (!raw.servers)
-                                raw.servers = {};
-                            if (!raw.servers[serverName]) {
-                                raw.servers[serverName] = serverConfig;
-                                fs.writeFileSync(configPath, JSON.stringify(raw, null, 2) + "\n", "utf-8");
-                                this.logger.info(`Persisted "${serverName}" to ${configPath}`);
-                            }
-                        }
-                    }
-                    catch (persistErr) {
-                        this.logger.warn(`Could not persist "${serverName}" to config: ${persistErr instanceof Error ? persistErr.message : String(persistErr)}`);
-                    }
-                    const credUrl = recipe.auth?.credentialsUrl;
-                    if (missing.length > 0) {
-                        return {
-                            action: "install",
-                            server: serverName,
-                            installed: true,
-                            message: `Server "${serverName}" installed. Missing env vars: ${missing.join(", ")}. Set them before calling.`,
-                            missingEnvVars: missing,
-                            ...(credUrl ? { credentialsUrl: credUrl } : {}),
-                        };
-                    }
-                    return {
-                        action: "install",
-                        server: serverName,
-                        installed: true,
-                        message: `Server "${serverName}" installed and ready to use.`
-                    };
-                }
-                catch (err) {
-                    return this.error("mcp_error", `Install failed: ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
             if (normalizedAction === "remove") {
                 const serverName = server || params?.server || params?.name;
                 if (!serverName) {
@@ -464,7 +329,7 @@ export class McpRouter {
                 }
             }
             if (normalizedAction !== "call") {
-                return this.error("invalid_params", `action must be one of: list, call, batch, refresh, schema, intent, status, promotions, search, catalog, install, set-mode, set-env`);
+                return this.error("invalid_params", `action must be one of: list, call, batch, refresh, schema, intent, status, promotions, remove, set-mode, set-env`);
             }
             if (!tool) {
                 return this.error("invalid_params", "tool is required for action=call");

package/dist/src/standalone-server.js

@@ -228,7 +228,7 @@ export class StandaloneServer {
                                 type: "object",
                                 properties: {
                                     server: { type: "string", description: "Server name" },
-                                    action: { type: "string", description: "list | call | batch | refresh | status | intent | schema | promotions | search | catalog | install | remove | set-mode | set-env" },
+                                    action: { type: "string", description: "list | call | batch | refresh | status | intent | schema | promotions | remove | set-mode | set-env" },
                                     tool: { type: "string", description: "Tool name for action=call/schema" },
                                     params: { type: "object", description: "Tool arguments" },
                                     calls: {
@@ -409,15 +409,13 @@ export class StandaloneServer {
                     return { jsonrpc: "2.0", id, result: { content: [{ type: "text", text: `Failed to set env var: ${err instanceof Error ? err.message : String(err)}` }] } };
                 }
             }
-            if (action === "search" || action === "install" || action === "catalog" || action === "set-mode" || action === "remove") {
+            if (action === "set-mode" || action === "remove") {
                 // Delegate to router dispatch (create a temporary router for management actions)
                 if (!this.router) {
                     const { McpRouter } = await import("./mcp-router.js");
                     this.router = new McpRouter(this.config.servers, this.config, this.logger);
                 }
                 const params = {};
-                if (query)
-                    params.query = query;
                 if (server)
                     params.server = server;
                 if (server)
@@ -425,13 +423,9 @@ export class StandaloneServer {
                 if (toolArgs?.mode)
                     params.mode = toolArgs.mode;
                 const result = await this.router.dispatch(server, action, undefined, params);
-                // If install succeeded, notify about new tools
-                if (action === "install" && "installed" in result && result.installed) {
-                    this.sendToolsChanged();
-                }
                 return { jsonrpc: "2.0", id, result: { content: [{ type: "text", text: JSON.stringify(result) }] } };
             }
-            return { jsonrpc: "2.0", id, result: { content: [{ type: "text", text: "Unknown action. Use: search, install, remove, catalog, status, servers, discover, set-mode" }] } };
+            return { jsonrpc: "2.0", id, result: { content: [{ type: "text", text: "Unknown action. Use: remove, status, servers, discover, set-mode, set-env" }] } };
         }
         // Handle mcp_discover tool (legacy, kept for backward compatibility)
         if (toolName === "mcp_discover") {
@@ -607,13 +601,12 @@ export class StandaloneServer {
         const serverNames = Object.keys(this.config.servers);
         return {
             name: "mcp_manage",
-            description: `MCP server manager. Actions: 'search' to find servers in the verified catalog (100+ signed recipes), 'install' to add a server by name, 'remove' to remove a server, 'catalog' to browse all, 'status' to check connections, 'servers' to list configured servers, 'discover' to connect a server and discover its tools, 'set-mode' to switch between router/direct mode, 'set-env' to configure API keys in ~/.mcp-bridge/.env. Connected servers: ${serverNames.join(", ") || "none"}.`,
+            description: `MCP server manager. Actions: 'remove' to remove a server, 'status' to check connections, 'servers' to list configured servers, 'discover' to connect a server and discover its tools, 'set-mode' to switch between router/direct mode, 'set-env' to configure API keys in ~/.mcp-bridge/.env. Connected servers: ${serverNames.join(", ") || "none"}.`,
             inputSchema: {
                 type: "object",
                 properties: {
-                    action: { type: "string", description: "search | install | remove | catalog | status | servers | discover | set-mode | set-env", enum: ["search", "install", "remove", "catalog", "status", "servers", "discover", "set-mode", "set-env"] },
-                    server: { type: "string", description: "Server name (for install, remove, discover)" },
-                    query: { type: "string", description: "Search query (for action=search)" },
+                    action: { type: "string", description: "remove | status | servers | discover | set-mode | set-env", enum: ["remove", "status", "servers", "discover", "set-mode", "set-env"] },
+                    server: { type: "string", description: "Server name (for remove, discover)" },
                     mode: { type: "string", description: "Mode (for action=set-mode): router or direct", enum: ["router", "direct"] },
                     key: { type: "string", description: "Environment variable name for action=set-env (e.g. TODOIST_API_TOKEN)" },
                     value: { type: "string", description: "Environment variable value for action=set-env" }

package/dist/src/types.d.ts

@@ -175,14 +175,4 @@ export interface BridgeConfig extends McpClientConfig {
          */
         requireCleanAudit?: boolean;
     };
-    /**
-     * Whether bootstrapCatalog() fetches recipes from the remote catalog.
-     * Default: true (catalog discovery is enabled).
-     */
-    catalog?: boolean;
-    /**
-     * Whether mergeRecipesIntoConfig() auto-merges cached recipes into config.
-     * Default: false (opt-in). Set to true to enable automatic recipe merging.
-     */
-    autoMerge?: boolean;
 }

package/dist/src/validate-recipe.js

@@ -274,6 +274,68 @@ export function validateRecipe(recipe) {
             }
         }
     }
+    // ── v2 spec field acceptance (Universal Recipe Spec v2, fields added since 2.8.x) ──
+    //
+    // These are typo-guarded boolean/string checks. Recipes shipped from the
+    // hosted bridge use them; the standalone runtime mostly informs the user
+    // and does not enforce hosted-only semantics (e.g. localOnly is not a
+    // gate locally — every recipe runs on the user's machine anyway).
+    // localOnly: top-level boolean. Hosted bridge refuses these recipes;
+    // standalone accepts them and lets the user spawn locally.
+    if (recipe.localOnly !== undefined && typeof recipe.localOnly !== "boolean") {
+        errors.push(`localOnly must be boolean, got ${typeof recipe.localOnly}`);
+    }
+    // multiInstance + instanceNameHint: hosted-only semantics today. Standalone
+    // accepts the fields without enforcing multi-instance install behavior.
+    if (recipe.multiInstance !== undefined && typeof recipe.multiInstance !== "boolean") {
+        errors.push(`multiInstance must be boolean, got ${typeof recipe.multiInstance}`);
+    }
+    if (recipe.instanceNameHint !== undefined && typeof recipe.instanceNameHint !== "string") {
+        errors.push(`instanceNameHint must be string, got ${typeof recipe.instanceNameHint}`);
+    }
+    // auth.options[]: multi-auth picker. If present, must be an array of objects
+    // with an id (string), label (string), and type (string).
+    const authOptions = recipe.auth?.options;
+    if (authOptions !== undefined) {
+        if (!Array.isArray(authOptions)) {
+            errors.push("auth.options must be an array");
+        }
+        else {
+            for (let i = 0; i < authOptions.length; i++) {
+                const opt = authOptions[i];
+                if (!opt || typeof opt !== "object") {
+                    errors.push(`auth.options[${i}]: must be an object`);
+                    continue;
+                }
+                if (typeof opt.id !== "string" || opt.id.trim().length === 0) {
+                    errors.push(`auth.options[${i}]: id is required (non-empty string)`);
+                }
+                if (typeof opt.label !== "string" || opt.label.trim().length === 0) {
+                    errors.push(`auth.options[${i}]: label is required (non-empty string)`);
+                }
+                if (typeof opt.type !== "string" || opt.type.trim().length === 0) {
+                    errors.push(`auth.options[${i}]: type is required (non-empty string)`);
+                }
+                if (opt.recommended !== undefined && typeof opt.recommended !== "boolean") {
+                    errors.push(`auth.options[${i}]: recommended must be boolean if present`);
+                }
+            }
+        }
+    }
+    // oauth2.envBinding: env var name to bind the OAuth access_token at spawn time.
+    // oauth2.credentialsFileType: marks recipes that need a credentials file
+    //   written to disk (e.g. workspace-mcp). Standalone reads but does not yet
+    //   write the file; will be plumbed through OAuth2 token manager when the
+    //   feature is needed locally.
+    const oauth2 = recipe.auth?.oauth2;
+    if (oauth2 && typeof oauth2 === "object") {
+        if (oauth2.envBinding !== undefined && typeof oauth2.envBinding !== "string") {
+            errors.push(`auth.oauth2.envBinding must be string, got ${typeof oauth2.envBinding}`);
+        }
+        if (oauth2.credentialsFileType !== undefined && typeof oauth2.credentialsFileType !== "string") {
+            errors.push(`auth.oauth2.credentialsFileType must be string, got ${typeof oauth2.credentialsFileType}`);
+        }
+    }
     // ── Build result ───────────────────────────────────────────────────────────
     const valid = errors.length === 0;
     const result = { valid, errors, warnings };

package/package.json

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

package/scripts/install-server.sh

@@ -50,30 +50,17 @@ done
 
 SERVER_DIR="$SCRIPT_DIR/../servers/$SERVER_NAME"
 
-# v2.8.0: Try catalog first, fall back to bundled servers/
-RECIPE_CACHE_DIR="$HOME/.mcp-bridge/recipes/$SERVER_NAME"
-if [[ -f "$RECIPE_CACHE_DIR/recipe.json" ]]; then
-    echo "[mcp-bridge] Using cached catalog recipe for $SERVER_NAME"
-    SERVER_DIR="$RECIPE_CACHE_DIR"
-elif command -v curl &>/dev/null; then
-    echo "[mcp-bridge] Fetching recipe from catalog..."
-    mkdir -p "$RECIPE_CACHE_DIR"
-    ENCODED_NAME="$(python3 -c "import urllib.parse,sys; print(urllib.parse.quote(sys.argv[1]))" "$SERVER_NAME" 2>/dev/null || echo "$SERVER_NAME")"
-    if curl -sf --connect-timeout 5 --max-time 15 \
-        "https://catalog.aiwerk.ch/api/recipes/$ENCODED_NAME/download" \
-        -o "$RECIPE_CACHE_DIR/recipe.json" 2>/dev/null \
-        && [[ -s "$RECIPE_CACHE_DIR/recipe.json" ]]; then
-        echo "[mcp-bridge] ✓ Recipe downloaded from catalog"
-        SERVER_DIR="$RECIPE_CACHE_DIR"
-    else
-        rm -f "$RECIPE_CACHE_DIR/recipe.json"
-        echo "[mcp-bridge] Catalog unavailable, using bundled recipe"
-        # Fall through to existing SERVER_DIR
-    fi
-fi
+# Historical note (2026-04-10): earlier versions of this script fetched
+# recipes over HTTP from catalog.aiwerk.ch (and briefly from
+# bridge.aiwerk.ch) before falling back to the bundled servers/ directory.
+# That coupling has been removed — mcp-bridge is a pure router and the
+# bundled servers/ tree is the only recipe source. Users who want to add
+# their own server should either copy a bundled recipe into servers/ as a
+# starting point, or write their own ~/.mcp-bridge/config.json entry
+# directly and point it to any MCP server they want.
 
 if [[ ! -d "$SERVER_DIR" ]]; then
-    echo "Error: Server '$SERVER_NAME' not found."
+    echo "Error: Server '$SERVER_NAME' not found in $SCRIPT_DIR/../servers/"
     usage
 fi