@elizaos/plugin-mcp 1.8.1 → 1.8.2

package/dist/index.js

@@ -7954,7 +7954,7 @@ var provider = {
 };
 
 // src/service.ts
-import { Service, logger as logger6 } from "@elizaos/core";
+import { Service, logger as logger6, getRequestContext } from "@elizaos/core";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
@@ -8747,7 +8747,17 @@ class McpService extends Service {
     if (!config.url)
       throw new Error(`Missing URL for server ${name}`);
     const url = new URL(config.url);
-    const opts = config.headers ? { requestInit: { headers: config.headers } } : undefined;
+    const headers = { ...config.headers };
+    const apiKey = this.runtime.getSetting("ELIZAOS_API_KEY");
+    if (apiKey && typeof apiKey === "string" && !headers["X-API-Key"]) {
+      const baseUrl = process.env.NEXT_PUBLIC_APP_URL || process.env.APP_URL || "http://localhost:3000";
+      try {
+        if (url.origin === new URL(baseUrl).origin) {
+          headers["X-API-Key"] = apiKey;
+        }
+      } catch {}
+    }
+    const opts = Object.keys(headers).length > 0 ? { requestInit: { headers } } : undefined;
     return config.type === "sse" ? new SSEClientTransport(url, opts) : new StreamableHTTPClientTransport(url, opts);
   }
   setupTransportHandlers(name, conn, state, isStdio) {
@@ -8897,25 +8907,38 @@ class McpService extends Service {
   isLazyConnection(serverName) {
     return this.lazyConnections.has(serverName);
   }
+  getConnectionKey(serverName) {
+    const config = this.lazyConnections.get(serverName);
+    if (config && config.type !== "stdio") {
+      const ctx = getRequestContext();
+      if (ctx?.entityId)
+        return `${serverName}:${ctx.entityId}`;
+    }
+    return serverName;
+  }
+  getConnection(serverName) {
+    const key = this.getConnectionKey(serverName);
+    return this.connections.get(key) || this.connections.get(serverName);
+  }
   async ensureConnected(serverName) {
-    if (this.connections.has(serverName))
+    const connectionKey = this.getConnectionKey(serverName);
+    if (this.connections.has(connectionKey) || this.connections.has(serverName))
       return;
     const config = this.lazyConnections.get(serverName);
     if (!config)
       throw new Error(`Unknown server: ${serverName}`);
     const start = Date.now();
-    await this.connect(serverName, config);
-    this.lazyConnections.delete(serverName);
-    const server = this.connections.get(serverName)?.server;
+    await this.connect(connectionKey, config);
+    const server = this.connections.get(connectionKey)?.server;
     if (this.schemaCache.isEnabled && server?.tools?.length) {
       await this.schemaCache.setSchemas(this.runtime.agentId, serverName, this.schemaCache.hashConfig(config), server.tools);
     }
-    logger6.info(`[MCP] Lazy connected: ${serverName} in ${Date.now() - start}ms`);
+    logger6.info(`[MCP] Connected: ${connectionKey} in ${Date.now() - start}ms`);
     this.mcpProvider = buildMcpProviderData(this.getServers());
   }
   async callTool(serverName, toolName, args) {
     await this.ensureConnected(serverName);
-    const conn = this.connections.get(serverName);
+    const conn = this.getConnection(serverName);
     if (!conn)
       throw new Error(`No connection: ${serverName}`);
     if (conn.server.disabled)
@@ -8929,7 +8952,7 @@ class McpService extends Service {
   }
   async readResource(serverName, uri) {
     await this.ensureConnected(serverName);
-    const conn = this.connections.get(serverName);
+    const conn = this.getConnection(serverName);
     if (!conn)
       throw new Error(`No connection: ${serverName}`);
     if (conn.server.disabled)
@@ -8937,12 +8960,12 @@ class McpService extends Service {
     return conn.client.readResource({ uri });
   }
   async restartConnection(serverName) {
-    const conn = this.connections.get(serverName);
+    const connectionKey = this.getConnectionKey(serverName);
+    const conn = this.getConnection(serverName);
     if (!conn)
       throw new Error(`No connection: ${serverName}`);
-    const config = conn.server.config;
-    await this.disconnect(serverName);
-    await this.connect(serverName, JSON.parse(config));
+    await this.disconnect(connectionKey);
+    await this.connect(connectionKey, JSON.parse(conn.server.config));
   }
 }
 
@@ -8981,4 +9004,4 @@ export {
   BACKOFF_MULTIPLIER
 };
 
-//# debugId=FF2F732BBC24508A64756E2164756E21
+//# debugId=711DD608A619744C64756E2164756E21