@mastra/mcp 2.9.0-alpha.2 → 2.9.0-alpha.3

package/dist/index.js

@@ -19148,6 +19148,7 @@ onListChanged: async (serverName, handler) => {
 			errorId: "MCP_CLIENT_GET_TOOLS_FAILED",
 			logMessage: "Failed to list tools from server:"
 		}, options);
+		const keySources = /* @__PURE__ */ new Map();
 		for (const { serverName, value, error, duration } of settled) {
 			durations[serverName] = duration;
 			if (error !== void 0) {
@@ -19155,7 +19156,7 @@ onListChanged: async (serverName, handler) => {
 				errorDetails[serverName] = error;
 				continue;
 			}
-			for (const [toolName, toolConfig] of Object.entries(value)) connectedTools[`${serverName}_${toolName}`] = toolConfig;
+			for (const [toolName, toolConfig] of Object.entries(value)) this.setNamespacedTool(connectedTools, keySources, serverName, toolName, toolConfig);
 		}
 		const result = {
 			tools: connectedTools,
@@ -19327,16 +19328,18 @@ onListChanged: async (serverName, handler) => {
 	async toolsFromDefinitions({ definitions: catalog }) {
 		const configuredServers = new Set(Object.keys(this.serverConfigs));
 		const tools = {};
+		const keySources = /* @__PURE__ */ new Map();
 		for (const [serverName, definitions] of Object.entries(catalog)) {
 			if (!configuredServers.has(serverName)) {
 				this.logger.warn("Skipping cached MCP tool definitions for a server that is no longer configured", { serverName });
 				continue;
 			}
 			for (const [toolName, definition] of Object.entries(modelVisibleDefinitions(definitions))) try {
-				tools[`${serverName}_${toolName}`] = await this.toolFromDefinition({
+				const tool = await this.toolFromDefinition({
 					serverName,
 					definition
 				});
+				this.setNamespacedTool(tools, keySources, serverName, toolName, tool);
 			} catch (error) {
 				if (!(error instanceof MastraError && error.id === "MCP_CLIENT_INVALID_TOOL_INPUT_SCHEMA")) throw error;
 			}
@@ -19397,6 +19400,28 @@ onListChanged: async (serverName, handler) => {
 		} : result;
 	}
 	/**
+	* Stores a tool under its `serverName_toolName` key. Server and tool names can both contain `_`,
+	* so two different pairs can produce one key (`local` + `x_status` and `local_x` + `status`).
+	* The later pair keeps the key, as before; this logs a warning instead of dropping a tool silently.
+	*/
+	setNamespacedTool(tools, keySources, serverName, toolName, tool) {
+		const key = `${serverName}_${toolName}`;
+		const replaced = keySources.get(key);
+		if (replaced) this.logger.warn(`MCP tool key "${key}" from server "${serverName}" (tool "${toolName}") replaces the tool from server "${replaced.serverName}" (tool "${replaced.toolName}"), which produces the same key. Only the tool from "${serverName}" is kept. Rename one of the servers in \`servers\` to keep both.`, {
+			key,
+			replaced,
+			replacedBy: {
+				serverName,
+				toolName
+			}
+		});
+		keySources.set(key, {
+			serverName,
+			toolName
+		});
+		tools[key] = tool;
+	}
+	/**
 	* Runs a per-server discovery `operation` against every configured server
 	* concurrently, isolating and logging per-server failures. Results are
 	* returned in configuration order (`Object.keys(serverConfigs)`) so callers