@agiflowai/one-mcp 0.2.1 → 0.2.2

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_http = require('./http-23nhycE8.cjs');
+const require_http = require('./http-3v8zyDO3.cjs');
 let node_fs_promises = require("node:fs/promises");
 let node_path = require("node:path");
 let commander = require("commander");
@@ -63,7 +63,7 @@ const mcpServeCommand = new commander.Command("mcp-serve").description("Start MC
 	try {
 		const transportType = options.type.toLowerCase();
 		const serverOptions = {
-			configFilePath: options.config,
+			configFilePath: options.config || require_http.findConfigFile(),
 			noCache: options.cache === false
 		};
 		if (transportType === "stdio") await startServer(new require_http.StdioTransportHandler(await require_http.createServer(serverOptions)));
@@ -115,11 +115,12 @@ const mcpServeCommand = new commander.Command("mcp-serve").description("Start MC
 */
 const listToolsCommand = new commander.Command("list-tools").description("List all available tools from connected MCP servers").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (options) => {
 	try {
-		if (!options.config) {
-			console.error("Error: --config is required");
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
 			process.exit(1);
 		}
-		const config = await new require_http.ConfigFetcherService({ configFilePath: options.config }).fetchConfiguration();
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new require_http.McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -190,11 +191,12 @@ const listToolsCommand = new commander.Command("list-tools").description("List a
 */
 const describeToolsCommand = new commander.Command("describe-tools").description("Describe specific MCP tools").argument("<toolNames...>", "Tool names to describe").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (toolNames, options) => {
 	try {
-		if (!options.config) {
-			console.error("Error: --config is required");
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
 			process.exit(1);
 		}
-		const config = await new require_http.ConfigFetcherService({ configFilePath: options.config }).fetchConfiguration();
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new require_http.McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -290,8 +292,9 @@ const describeToolsCommand = new commander.Command("describe-tools").description
 */
 const useToolCommand = new commander.Command("use-tool").description("Execute an MCP tool with arguments").argument("<toolName>", "Tool name to execute").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Server name (required if tool exists on multiple servers)").option("-a, --args <json>", "Tool arguments as JSON string", "{}").option("-j, --json", "Output as JSON", false).action(async (toolName, options) => {
 	try {
-		if (!options.config) {
-			console.error("Error: --config is required");
+		const configFilePath = options.config || require_http.findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
 			process.exit(1);
 		}
 		let toolArgs = {};
@@ -301,7 +304,7 @@ const useToolCommand = new commander.Command("use-tool").description("Execute an
 			console.error("Error: Invalid JSON in --args");
 			process.exit(1);
 		}
-		const config = await new require_http.ConfigFetcherService({ configFilePath: options.config }).fetchConfiguration();
+		const config = await new require_http.ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new require_http.McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -457,7 +460,7 @@ const initCommand = new commander.Command("init").description("Initialize MCP co
 
 //#endregion
 //#region package.json
-var version = "0.2.0";
+var version = "0.2.2";
 
 //#endregion
 //#region src/cli.ts

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as McpClientManagerService, i as createServer, n as SseTransportHandler, o as ConfigFetcherService, r as StdioTransportHandler, t as HttpTransportHandler } from "./http-CkWO35l-.mjs";
+import { a as findConfigFile, i as createServer, n as SseTransportHandler, o as McpClientManagerService, r as StdioTransportHandler, s as ConfigFetcherService, t as HttpTransportHandler } from "./http-CzQfsUEI.mjs";
 import { writeFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { Command } from "commander";
@@ -63,7 +63,7 @@ const mcpServeCommand = new Command("mcp-serve").description("Start MCP server w
 	try {
 		const transportType = options.type.toLowerCase();
 		const serverOptions = {
-			configFilePath: options.config,
+			configFilePath: options.config || findConfigFile(),
 			noCache: options.cache === false
 		};
 		if (transportType === "stdio") await startServer(new StdioTransportHandler(await createServer(serverOptions)));
@@ -115,11 +115,12 @@ const mcpServeCommand = new Command("mcp-serve").description("Start MCP server w
 */
 const listToolsCommand = new Command("list-tools").description("List all available tools from connected MCP servers").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (options) => {
 	try {
-		if (!options.config) {
-			console.error("Error: --config is required");
+		const configFilePath = options.config || findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
 			process.exit(1);
 		}
-		const config = await new ConfigFetcherService({ configFilePath: options.config }).fetchConfiguration();
+		const config = await new ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -190,11 +191,12 @@ const listToolsCommand = new Command("list-tools").description("List all availab
 */
 const describeToolsCommand = new Command("describe-tools").description("Describe specific MCP tools").argument("<toolNames...>", "Tool names to describe").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Filter by server name").option("-j, --json", "Output as JSON", false).action(async (toolNames, options) => {
 	try {
-		if (!options.config) {
-			console.error("Error: --config is required");
+		const configFilePath = options.config || findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
 			process.exit(1);
 		}
-		const config = await new ConfigFetcherService({ configFilePath: options.config }).fetchConfiguration();
+		const config = await new ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -290,8 +292,9 @@ const describeToolsCommand = new Command("describe-tools").description("Describe
 */
 const useToolCommand = new Command("use-tool").description("Execute an MCP tool with arguments").argument("<toolName>", "Tool name to execute").option("-c, --config <path>", "Path to MCP server configuration file").option("-s, --server <name>", "Server name (required if tool exists on multiple servers)").option("-a, --args <json>", "Tool arguments as JSON string", "{}").option("-j, --json", "Output as JSON", false).action(async (toolName, options) => {
 	try {
-		if (!options.config) {
-			console.error("Error: --config is required");
+		const configFilePath = options.config || findConfigFile();
+		if (!configFilePath) {
+			console.error("Error: No config file found. Use --config or create mcp-config.yaml");
 			process.exit(1);
 		}
 		let toolArgs = {};
@@ -301,7 +304,7 @@ const useToolCommand = new Command("use-tool").description("Execute an MCP tool
 			console.error("Error: Invalid JSON in --args");
 			process.exit(1);
 		}
-		const config = await new ConfigFetcherService({ configFilePath: options.config }).fetchConfiguration();
+		const config = await new ConfigFetcherService({ configFilePath }).fetchConfiguration();
 		const clientManager = new McpClientManagerService();
 		const connectionPromises = Object.entries(config.mcpServers).map(async ([serverName, serverConfig]) => {
 			try {
@@ -457,7 +460,7 @@ const initCommand = new Command("init").description("Initialize MCP configuratio
 
 //#endregion
 //#region package.json
-var version = "0.2.0";
+var version = "0.2.2";
 
 //#endregion
 //#region src/cli.ts

package/dist/{http-23nhycE8.cjs → http-3v8zyDO3.cjs}

@@ -976,6 +976,75 @@ var McpClientManagerService = class {
 	}
 };
 
+//#endregion
+//#region src/utils/findConfigFile.ts
+/**
+* Config File Finder Utility
+*
+* DESIGN PATTERNS:
+* - Utility function pattern for reusable logic
+* - Fail-fast pattern with early returns
+* - Environment variable configuration pattern
+*
+* CODING STANDARDS:
+* - Use sync filesystem operations for config discovery (performance)
+* - Check PROJECT_PATH environment variable first
+* - Fall back to current working directory
+* - Support both .yaml and .json extensions
+* - Return null if no config file is found
+*
+* AVOID:
+* - Throwing errors (return null instead for optional config)
+* - Hardcoded file names without extension variants
+* - Ignoring environment variables
+*/
+/**
+* Find MCP configuration file by checking PROJECT_PATH first, then cwd
+* Looks for both mcp-config.yaml and mcp-config.json
+*
+* @returns Absolute path to config file, or null if not found
+*/
+function findConfigFile() {
+	const configFileNames = [
+		"mcp-config.yaml",
+		"mcp-config.yml",
+		"mcp-config.json"
+	];
+	const projectPath = process.env.PROJECT_PATH;
+	if (projectPath) for (const fileName of configFileNames) {
+		const configPath = (0, node_path.resolve)(projectPath, fileName);
+		if ((0, node_fs.existsSync)(configPath)) return configPath;
+	}
+	const cwd = process.cwd();
+	for (const fileName of configFileNames) {
+		const configPath = (0, node_path.join)(cwd, fileName);
+		if ((0, node_fs.existsSync)(configPath)) return configPath;
+	}
+	return null;
+}
+
+//#endregion
+//#region src/utils/parseToolName.ts
+/**
+* Parse tool name to extract server and actual tool name
+* Supports both plain tool names and prefixed format: {serverName}__{toolName}
+*
+* @param toolName - The tool name to parse (e.g., "my_tool" or "server__my_tool")
+* @returns Parsed result with optional serverName and actualToolName
+*
+* @example
+* parseToolName("my_tool") // { actualToolName: "my_tool" }
+* parseToolName("server__my_tool") // { serverName: "server", actualToolName: "my_tool" }
+*/
+function parseToolName(toolName) {
+	const separatorIndex = toolName.indexOf("__");
+	if (separatorIndex > 0) return {
+		serverName: toolName.substring(0, separatorIndex),
+		actualToolName: toolName.substring(separatorIndex + 2)
+	};
+	return { actualToolName: toolName };
+}
+
 //#endregion
 //#region src/tools/DescribeToolsTool.ts
 var DescribeToolsTool = class DescribeToolsTool {
@@ -986,46 +1055,50 @@ var DescribeToolsTool = class DescribeToolsTool {
 	}
 	async getDefinition() {
 		const clients = this.clientManager.getAllClients();
-		const serverDescriptions = await Promise.all(clients.map(async (client) => {
+		const toolToServers = /* @__PURE__ */ new Map();
+		const serverToolsMap = /* @__PURE__ */ new Map();
+		await Promise.all(clients.map(async (client) => {
 			try {
 				const tools = await client.listTools();
 				const blacklist = new Set(client.toolBlacklist || []);
 				const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-				const toolList = client.omitToolDescription ? filteredTools.map((t) => t.name).join(", ") : filteredTools.map((t) => `${t.name}: ${t.description || "No description"}`).join("\n");
-				const instructionLine = client.serverInstruction ? `\n- Description: ${client.serverInstruction}` : "";
-				return `\n\n### Server: ${client.serverName}${instructionLine}\n- Available tools:${toolList ? "\n" + toolList : ""}`;
+				serverToolsMap.set(client.serverName, filteredTools);
+				for (const tool of filteredTools) {
+					if (!toolToServers.has(tool.name)) toolToServers.set(tool.name, []);
+					toolToServers.get(tool.name).push(client.serverName);
+				}
 			} catch (error) {
 				console.error(`Failed to list tools from ${client.serverName}:`, error);
-				const instructionLine = client.serverInstruction ? `\n- Description: ${client.serverInstruction}` : "";
-				return `\n\n**Server: ${client.serverName}**${instructionLine}\n`;
+				serverToolsMap.set(client.serverName, []);
 			}
 		}));
+		const serverDescriptions = clients.map((client) => {
+			const tools = serverToolsMap.get(client.serverName) || [];
+			const formatToolName = (toolName) => {
+				return (toolToServers.get(toolName) || []).length > 1 ? `${client.serverName}__${toolName}` : toolName;
+			};
+			const toolList = client.omitToolDescription ? tools.map((t) => formatToolName(t.name)).join(", ") : tools.map((t) => `${formatToolName(t.name)}: """${t.description || "No description"}"""`).join("\n");
+			const instructionLine = client.serverInstruction ? `\n"""${client.serverInstruction}"""` : "";
+			return `\n\n### Server: ${client.serverName}${instructionLine}\n\n- Available tools:\n${toolList || "No tools available"}`;
+		});
 		return {
 			name: DescribeToolsTool.TOOL_NAME,
-			description: `Learn how to use multiple MCP tools before using them. Below are supported tools and capabilities.
-
-## Available MCP Servers:${serverDescriptions.join("")}
+			description: `## Available MCP Servers:${serverDescriptions.join("")}
 
 ## Usage:
-You MUST call this tool with a list of tool names to learn how to use them properly before use_tool; this includes:
+Before you use any tools above, you MUST call this tool with a list of tool names to learn how to use them properly before use_tool; this includes:
 - Arguments schema needed to pass to the tool use
 - Description about each tool
 
 This tool is optimized for batch queries - you can request multiple tools at once for better performance.`,
 			inputSchema: {
 				type: "object",
-				properties: {
-					toolNames: {
-						type: "array",
-						items: { type: "string" },
-						description: "List of tool names to get detailed information about",
-						minItems: 1
-					},
-					serverName: {
-						type: "string",
-						description: "Optional server name to search within. If not specified, searches all servers."
-					}
-				},
+				properties: { toolNames: {
+					type: "array",
+					items: { type: "string" },
+					description: "List of tool names to get detailed information about",
+					minItems: 1
+				} },
 				required: ["toolNames"],
 				additionalProperties: false
 			}
@@ -1033,7 +1106,7 @@ This tool is optimized for batch queries - you can request multiple tools at onc
 	}
 	async execute(input) {
 		try {
-			const { toolNames, serverName } = input;
+			const { toolNames } = input;
 			const clients = this.clientManager.getAllClients();
 			if (!toolNames || toolNames.length === 0) return {
 				content: [{
@@ -1042,127 +1115,85 @@ This tool is optimized for batch queries - you can request multiple tools at onc
 				}],
 				isError: true
 			};
-			if (serverName) {
-				const client = this.clientManager.getClient(serverName);
-				if (!client) return {
-					content: [{
-						type: "text",
-						text: `Server "${serverName}" not found. Available servers: ${clients.map((c) => c.serverName).join(", ")}`
-					}],
-					isError: true
-				};
-				const tools = await client.listTools();
-				const blacklist = new Set(client.toolBlacklist || []);
-				const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-				const foundTools$1 = [];
-				const notFoundTools$1 = [];
-				for (const toolName of toolNames) {
-					if (blacklist.has(toolName)) {
-						notFoundTools$1.push(toolName);
-						continue;
-					}
-					const tool = filteredTools.find((t) => t.name === toolName);
-					if (tool) foundTools$1.push({
-						server: serverName,
-						tool: {
-							name: tool.name,
-							description: tool.description,
-							inputSchema: tool.inputSchema
-						}
-					});
-					else notFoundTools$1.push(toolName);
-				}
-				if (foundTools$1.length === 0) return {
-					content: [{
-						type: "text",
-						text: `None of the requested tools found on server "${serverName}".\nRequested: ${toolNames.join(", ")}\nAvailable tools: ${tools.map((t) => t.name).join(", ")}`
-					}],
-					isError: true
-				};
-				const result$1 = { tools: foundTools$1 };
-				if (notFoundTools$1.length > 0) {
-					result$1.notFound = notFoundTools$1;
-					result$1.warning = `Some tools were not found on server "${serverName}": ${notFoundTools$1.join(", ")}`;
-				}
-				return { content: [{
-					type: "text",
-					text: JSON.stringify(result$1, null, 2)
-				}] };
-			}
-			const foundTools = [];
-			const notFoundTools = [...toolNames];
-			const toolMatches = /* @__PURE__ */ new Map();
-			const results = await Promise.all(clients.map(async (client) => {
+			const serverToolsMap = /* @__PURE__ */ new Map();
+			const toolToServers = /* @__PURE__ */ new Map();
+			await Promise.all(clients.map(async (client) => {
 				try {
 					const tools = await client.listTools();
 					const blacklist = new Set(client.toolBlacklist || []);
 					const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-					const matches = [];
-					for (const toolName of toolNames) {
-						if (blacklist.has(toolName)) continue;
-						const tool = filteredTools.find((t) => t.name === toolName);
-						if (tool) matches.push({
-							toolName,
-							server: client.serverName,
-							tool
-						});
+					serverToolsMap.set(client.serverName, filteredTools);
+					for (const tool of filteredTools) {
+						if (!toolToServers.has(tool.name)) toolToServers.set(tool.name, []);
+						toolToServers.get(tool.name).push(client.serverName);
 					}
-					return matches;
 				} catch (error) {
 					console.error(`Failed to list tools from ${client.serverName}:`, error);
-					return [];
+					serverToolsMap.set(client.serverName, []);
 				}
 			}));
-			for (const matches of results) for (const match of matches) {
-				if (!toolMatches.has(match.toolName)) toolMatches.set(match.toolName, []);
-				toolMatches.get(match.toolName).push({
-					server: match.server,
-					tool: match.tool
-				});
-			}
-			const ambiguousTools = [];
-			for (const toolName of toolNames) {
-				const matches = toolMatches.get(toolName);
-				if (!matches || matches.length === 0) continue;
-				if (matches.length === 1) {
-					const match = matches[0];
-					foundTools.push({
-						server: match.server,
+			const foundTools = [];
+			const notFoundTools = [];
+			for (const requestedToolName of toolNames) {
+				const { serverName, actualToolName } = parseToolName(requestedToolName);
+				if (serverName) {
+					const serverTools = serverToolsMap.get(serverName);
+					if (!serverTools) {
+						notFoundTools.push(requestedToolName);
+						continue;
+					}
+					const tool = serverTools.find((t) => t.name === actualToolName);
+					if (tool) foundTools.push({
+						server: serverName,
 						tool: {
-							name: match.tool.name,
-							description: match.tool.description,
-							inputSchema: match.tool.inputSchema
+							name: tool.name,
+							description: tool.description,
+							inputSchema: tool.inputSchema
 						}
 					});
-					const idx = notFoundTools.indexOf(toolName);
-					if (idx > -1) notFoundTools.splice(idx, 1);
+					else notFoundTools.push(requestedToolName);
 				} else {
-					ambiguousTools.push({
-						toolName,
-						servers: matches.map((m) => m.server)
-					});
-					const idx = notFoundTools.indexOf(toolName);
-					if (idx > -1) notFoundTools.splice(idx, 1);
+					const servers = toolToServers.get(actualToolName);
+					if (!servers || servers.length === 0) {
+						notFoundTools.push(requestedToolName);
+						continue;
+					}
+					if (servers.length === 1) {
+						const server = servers[0];
+						const tool = serverToolsMap.get(server).find((t) => t.name === actualToolName);
+						foundTools.push({
+							server,
+							tool: {
+								name: tool.name,
+								description: tool.description,
+								inputSchema: tool.inputSchema
+							}
+						});
+					} else for (const server of servers) {
+						const tool = serverToolsMap.get(server).find((t) => t.name === actualToolName);
+						foundTools.push({
+							server,
+							tool: {
+								name: tool.name,
+								description: tool.description,
+								inputSchema: tool.inputSchema
+							}
+						});
+					}
 				}
 			}
-			if (foundTools.length === 0 && ambiguousTools.length === 0) return {
+			if (foundTools.length === 0) return {
 				content: [{
 					type: "text",
-					text: `None of the requested tools found on any connected server.\nRequested: ${toolNames.join(", ")}\nUse describe_tools without arguments to see available servers.`
+					text: `None of the requested tools found on any connected server.\nRequested: ${toolNames.join(", ")}\nUse describe_tools to see available tools.`
 				}],
 				isError: true
 			};
 			const result = { tools: foundTools };
-			if (notFoundTools.length > 0) result.notFound = notFoundTools;
-			if (ambiguousTools.length > 0) result.ambiguous = ambiguousTools.map((item) => ({
-				toolName: item.toolName,
-				servers: item.servers,
-				message: `Tool "${item.toolName}" found on multiple servers: ${item.servers.join(", ")}. Please specify serverName to disambiguate.`
-			}));
-			const warnings = [];
-			if (notFoundTools.length > 0) warnings.push(`Tools not found: ${notFoundTools.join(", ")}`);
-			if (ambiguousTools.length > 0) warnings.push(`Ambiguous tools (specify serverName): ${ambiguousTools.map((t) => t.toolName).join(", ")}`);
-			if (warnings.length > 0) result.warnings = warnings;
+			if (notFoundTools.length > 0) {
+				result.notFound = notFoundTools;
+				result.warnings = [`Tools not found: ${notFoundTools.join(", ")}`];
+			}
 			return { content: [{
 				type: "text",
 				text: JSON.stringify(result, null, 2)
@@ -1204,10 +1235,6 @@ var UseToolTool = class UseToolTool {
 					toolArgs: {
 						type: "object",
 						description: "Arguments to pass to the tool, as discovered from describe_tools"
-					},
-					serverName: {
-						type: "string",
-						description: "Optional server name to disambiguate when multiple servers have the same tool"
 					}
 				},
 				required: ["toolName"],
@@ -1217,8 +1244,9 @@ var UseToolTool = class UseToolTool {
 	}
 	async execute(input) {
 		try {
-			const { toolName, toolArgs = {}, serverName } = input;
+			const { toolName: inputToolName, toolArgs = {} } = input;
 			const clients = this.clientManager.getAllClients();
+			const { serverName, actualToolName } = parseToolName(inputToolName);
 			if (serverName) {
 				const client$1 = this.clientManager.getClient(serverName);
 				if (!client$1) return {
@@ -1228,20 +1256,20 @@ var UseToolTool = class UseToolTool {
 					}],
 					isError: true
 				};
-				if (client$1.toolBlacklist && client$1.toolBlacklist.includes(toolName)) return {
+				if (client$1.toolBlacklist && client$1.toolBlacklist.includes(actualToolName)) return {
 					content: [{
 						type: "text",
-						text: `Tool "${toolName}" is blacklisted on server "${serverName}" and cannot be executed.`
+						text: `Tool "${actualToolName}" is blacklisted on server "${serverName}" and cannot be executed.`
 					}],
 					isError: true
 				};
 				try {
-					return await client$1.callTool(toolName, toolArgs);
+					return await client$1.callTool(actualToolName, toolArgs);
 				} catch (error) {
 					return {
 						content: [{
 							type: "text",
-							text: `Failed to call tool "${toolName}" on server "${serverName}": ${error instanceof Error ? error.message : "Unknown error"}`
+							text: `Failed to call tool "${actualToolName}" on server "${serverName}": ${error instanceof Error ? error.message : "Unknown error"}`
 						}],
 						isError: true
 					};
@@ -1250,8 +1278,8 @@ var UseToolTool = class UseToolTool {
 			const matchingServers = [];
 			const results = await Promise.all(clients.map(async (client$1) => {
 				try {
-					if (client$1.toolBlacklist && client$1.toolBlacklist.includes(toolName)) return null;
-					if ((await client$1.listTools()).some((t) => t.name === toolName)) return client$1.serverName;
+					if (client$1.toolBlacklist && client$1.toolBlacklist.includes(actualToolName)) return null;
+					if ((await client$1.listTools()).some((t) => t.name === actualToolName)) return client$1.serverName;
 				} catch (error) {
 					console.error(`Failed to list tools from ${client$1.serverName}:`, error);
 				}
@@ -1261,14 +1289,14 @@ var UseToolTool = class UseToolTool {
 			if (matchingServers.length === 0) return {
 				content: [{
 					type: "text",
-					text: `Tool "${toolName}" not found on any connected server. Use describe_tools to see available tools.`
+					text: `Tool "${actualToolName}" not found on any connected server. Use describe_tools to see available tools.`
 				}],
 				isError: true
 			};
 			if (matchingServers.length > 1) return {
 				content: [{
 					type: "text",
-					text: `Multiple servers provide tool "${toolName}". Please specify serverName. Available servers: ${matchingServers.join(", ")}`
+					text: `Tool "${actualToolName}" found on multiple servers. Use prefixed format to specify: ${matchingServers.map((s) => `${s}__${actualToolName}`).join(", ")}`
 				}],
 				isError: true
 			};
@@ -1282,12 +1310,12 @@ var UseToolTool = class UseToolTool {
 				isError: true
 			};
 			try {
-				return await client.callTool(toolName, toolArgs);
+				return await client.callTool(actualToolName, toolArgs);
 			} catch (error) {
 				return {
 					content: [{
 						type: "text",
-						text: `Failed to call tool "${toolName}": ${error instanceof Error ? error.message : "Unknown error"}`
+						text: `Failed to call tool "${actualToolName}": ${error instanceof Error ? error.message : "Unknown error"}`
 					}],
 					isError: true
 				};
@@ -1482,14 +1510,14 @@ var SseTransportHandler = class {
 		}
 	}
 	async start() {
-		return new Promise((resolve, reject) => {
+		return new Promise((resolve$1, reject) => {
 			try {
 				this.server = this.app.listen(this.config.port, this.config.host, () => {
 					console.error(`@agiflowai/one-mcp MCP server started with SSE transport on http://${this.config.host}:${this.config.port}`);
 					console.error(`SSE endpoint: http://${this.config.host}:${this.config.port}/sse`);
 					console.error(`Messages endpoint: http://${this.config.host}:${this.config.port}/messages`);
 					console.error(`Health check: http://${this.config.host}:${this.config.port}/health`);
-					resolve();
+					resolve$1();
 				});
 				this.server.on("error", (error) => {
 					reject(error);
@@ -1500,17 +1528,17 @@ var SseTransportHandler = class {
 		});
 	}
 	async stop() {
-		return new Promise((resolve, reject) => {
+		return new Promise((resolve$1, reject) => {
 			if (this.server) {
 				this.sessionManager.clear();
 				this.server.close((err) => {
 					if (err) reject(err);
 					else {
 						this.server = null;
-						resolve();
+						resolve$1();
 					}
 				});
-			} else resolve();
+			} else resolve$1();
 		});
 	}
 	getPort() {
@@ -1662,12 +1690,12 @@ var HttpTransportHandler = class {
 		this.sessionManager.deleteSession(sessionId);
 	}
 	async start() {
-		return new Promise((resolve, reject) => {
+		return new Promise((resolve$1, reject) => {
 			try {
 				this.server = this.app.listen(this.config.port, this.config.host, () => {
 					console.error(`@agiflowai/one-mcp MCP server started on http://${this.config.host}:${this.config.port}/mcp`);
 					console.error(`Health check: http://${this.config.host}:${this.config.port}/health`);
-					resolve();
+					resolve$1();
 				});
 				this.server.on("error", (error) => {
 					reject(error);
@@ -1678,17 +1706,17 @@ var HttpTransportHandler = class {
 		});
 	}
 	async stop() {
-		return new Promise((resolve, reject) => {
+		return new Promise((resolve$1, reject) => {
 			if (this.server) {
 				this.sessionManager.clear();
 				this.server.close((err) => {
 					if (err) reject(err);
 					else {
 						this.server = null;
-						resolve();
+						resolve$1();
 					}
 				});
-			} else resolve();
+			} else resolve$1();
 		});
 	}
 	getPort() {
@@ -1741,4 +1769,10 @@ Object.defineProperty(exports, 'createServer', {
   get: function () {
     return createServer;
   }
+});
+Object.defineProperty(exports, 'findConfigFile', {
+  enumerable: true,
+  get: function () {
+    return findConfigFile;
+  }
 });

package/dist/{http-CkWO35l-.mjs → http-CzQfsUEI.mjs}

@@ -5,7 +5,7 @@ import { existsSync } from "node:fs";
 import yaml from "js-yaml";
 import { z } from "zod";
 import { createHash, randomUUID } from "node:crypto";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { tmpdir } from "node:os";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
@@ -951,6 +951,75 @@ var McpClientManagerService = class {
 	}
 };
 
+//#endregion
+//#region src/utils/findConfigFile.ts
+/**
+* Config File Finder Utility
+*
+* DESIGN PATTERNS:
+* - Utility function pattern for reusable logic
+* - Fail-fast pattern with early returns
+* - Environment variable configuration pattern
+*
+* CODING STANDARDS:
+* - Use sync filesystem operations for config discovery (performance)
+* - Check PROJECT_PATH environment variable first
+* - Fall back to current working directory
+* - Support both .yaml and .json extensions
+* - Return null if no config file is found
+*
+* AVOID:
+* - Throwing errors (return null instead for optional config)
+* - Hardcoded file names without extension variants
+* - Ignoring environment variables
+*/
+/**
+* Find MCP configuration file by checking PROJECT_PATH first, then cwd
+* Looks for both mcp-config.yaml and mcp-config.json
+*
+* @returns Absolute path to config file, or null if not found
+*/
+function findConfigFile() {
+	const configFileNames = [
+		"mcp-config.yaml",
+		"mcp-config.yml",
+		"mcp-config.json"
+	];
+	const projectPath = process.env.PROJECT_PATH;
+	if (projectPath) for (const fileName of configFileNames) {
+		const configPath = resolve(projectPath, fileName);
+		if (existsSync(configPath)) return configPath;
+	}
+	const cwd = process.cwd();
+	for (const fileName of configFileNames) {
+		const configPath = join(cwd, fileName);
+		if (existsSync(configPath)) return configPath;
+	}
+	return null;
+}
+
+//#endregion
+//#region src/utils/parseToolName.ts
+/**
+* Parse tool name to extract server and actual tool name
+* Supports both plain tool names and prefixed format: {serverName}__{toolName}
+*
+* @param toolName - The tool name to parse (e.g., "my_tool" or "server__my_tool")
+* @returns Parsed result with optional serverName and actualToolName
+*
+* @example
+* parseToolName("my_tool") // { actualToolName: "my_tool" }
+* parseToolName("server__my_tool") // { serverName: "server", actualToolName: "my_tool" }
+*/
+function parseToolName(toolName) {
+	const separatorIndex = toolName.indexOf("__");
+	if (separatorIndex > 0) return {
+		serverName: toolName.substring(0, separatorIndex),
+		actualToolName: toolName.substring(separatorIndex + 2)
+	};
+	return { actualToolName: toolName };
+}
+
 //#endregion
 //#region src/tools/DescribeToolsTool.ts
 var DescribeToolsTool = class DescribeToolsTool {
@@ -961,46 +1030,50 @@ var DescribeToolsTool = class DescribeToolsTool {
 	}
 	async getDefinition() {
 		const clients = this.clientManager.getAllClients();
-		const serverDescriptions = await Promise.all(clients.map(async (client) => {
+		const toolToServers = /* @__PURE__ */ new Map();
+		const serverToolsMap = /* @__PURE__ */ new Map();
+		await Promise.all(clients.map(async (client) => {
 			try {
 				const tools = await client.listTools();
 				const blacklist = new Set(client.toolBlacklist || []);
 				const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-				const toolList = client.omitToolDescription ? filteredTools.map((t) => t.name).join(", ") : filteredTools.map((t) => `${t.name}: ${t.description || "No description"}`).join("\n");
-				const instructionLine = client.serverInstruction ? `\n- Description: ${client.serverInstruction}` : "";
-				return `\n\n### Server: ${client.serverName}${instructionLine}\n- Available tools:${toolList ? "\n" + toolList : ""}`;
+				serverToolsMap.set(client.serverName, filteredTools);
+				for (const tool of filteredTools) {
+					if (!toolToServers.has(tool.name)) toolToServers.set(tool.name, []);
+					toolToServers.get(tool.name).push(client.serverName);
+				}
 			} catch (error) {
 				console.error(`Failed to list tools from ${client.serverName}:`, error);
-				const instructionLine = client.serverInstruction ? `\n- Description: ${client.serverInstruction}` : "";
-				return `\n\n**Server: ${client.serverName}**${instructionLine}\n`;
+				serverToolsMap.set(client.serverName, []);
 			}
 		}));
+		const serverDescriptions = clients.map((client) => {
+			const tools = serverToolsMap.get(client.serverName) || [];
+			const formatToolName = (toolName) => {
+				return (toolToServers.get(toolName) || []).length > 1 ? `${client.serverName}__${toolName}` : toolName;
+			};
+			const toolList = client.omitToolDescription ? tools.map((t) => formatToolName(t.name)).join(", ") : tools.map((t) => `${formatToolName(t.name)}: """${t.description || "No description"}"""`).join("\n");
+			const instructionLine = client.serverInstruction ? `\n"""${client.serverInstruction}"""` : "";
+			return `\n\n### Server: ${client.serverName}${instructionLine}\n\n- Available tools:\n${toolList || "No tools available"}`;
+		});
 		return {
 			name: DescribeToolsTool.TOOL_NAME,
-			description: `Learn how to use multiple MCP tools before using them. Below are supported tools and capabilities.
-
-## Available MCP Servers:${serverDescriptions.join("")}
+			description: `## Available MCP Servers:${serverDescriptions.join("")}
 
 ## Usage:
-You MUST call this tool with a list of tool names to learn how to use them properly before use_tool; this includes:
+Before you use any tools above, you MUST call this tool with a list of tool names to learn how to use them properly before use_tool; this includes:
 - Arguments schema needed to pass to the tool use
 - Description about each tool
 
 This tool is optimized for batch queries - you can request multiple tools at once for better performance.`,
 			inputSchema: {
 				type: "object",
-				properties: {
-					toolNames: {
-						type: "array",
-						items: { type: "string" },
-						description: "List of tool names to get detailed information about",
-						minItems: 1
-					},
-					serverName: {
-						type: "string",
-						description: "Optional server name to search within. If not specified, searches all servers."
-					}
-				},
+				properties: { toolNames: {
+					type: "array",
+					items: { type: "string" },
+					description: "List of tool names to get detailed information about",
+					minItems: 1
+				} },
 				required: ["toolNames"],
 				additionalProperties: false
 			}
@@ -1008,7 +1081,7 @@ This tool is optimized for batch queries - you can request multiple tools at onc
 	}
 	async execute(input) {
 		try {
-			const { toolNames, serverName } = input;
+			const { toolNames } = input;
 			const clients = this.clientManager.getAllClients();
 			if (!toolNames || toolNames.length === 0) return {
 				content: [{
@@ -1017,127 +1090,85 @@ This tool is optimized for batch queries - you can request multiple tools at onc
 				}],
 				isError: true
 			};
-			if (serverName) {
-				const client = this.clientManager.getClient(serverName);
-				if (!client) return {
-					content: [{
-						type: "text",
-						text: `Server "${serverName}" not found. Available servers: ${clients.map((c) => c.serverName).join(", ")}`
-					}],
-					isError: true
-				};
-				const tools = await client.listTools();
-				const blacklist = new Set(client.toolBlacklist || []);
-				const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-				const foundTools$1 = [];
-				const notFoundTools$1 = [];
-				for (const toolName of toolNames) {
-					if (blacklist.has(toolName)) {
-						notFoundTools$1.push(toolName);
-						continue;
-					}
-					const tool = filteredTools.find((t) => t.name === toolName);
-					if (tool) foundTools$1.push({
-						server: serverName,
-						tool: {
-							name: tool.name,
-							description: tool.description,
-							inputSchema: tool.inputSchema
-						}
-					});
-					else notFoundTools$1.push(toolName);
-				}
-				if (foundTools$1.length === 0) return {
-					content: [{
-						type: "text",
-						text: `None of the requested tools found on server "${serverName}".\nRequested: ${toolNames.join(", ")}\nAvailable tools: ${tools.map((t) => t.name).join(", ")}`
-					}],
-					isError: true
-				};
-				const result$1 = { tools: foundTools$1 };
-				if (notFoundTools$1.length > 0) {
-					result$1.notFound = notFoundTools$1;
-					result$1.warning = `Some tools were not found on server "${serverName}": ${notFoundTools$1.join(", ")}`;
-				}
-				return { content: [{
-					type: "text",
-					text: JSON.stringify(result$1, null, 2)
-				}] };
-			}
-			const foundTools = [];
-			const notFoundTools = [...toolNames];
-			const toolMatches = /* @__PURE__ */ new Map();
-			const results = await Promise.all(clients.map(async (client) => {
+			const serverToolsMap = /* @__PURE__ */ new Map();
+			const toolToServers = /* @__PURE__ */ new Map();
+			await Promise.all(clients.map(async (client) => {
 				try {
 					const tools = await client.listTools();
 					const blacklist = new Set(client.toolBlacklist || []);
 					const filteredTools = tools.filter((t) => !blacklist.has(t.name));
-					const matches = [];
-					for (const toolName of toolNames) {
-						if (blacklist.has(toolName)) continue;
-						const tool = filteredTools.find((t) => t.name === toolName);
-						if (tool) matches.push({
-							toolName,
-							server: client.serverName,
-							tool
-						});
+					serverToolsMap.set(client.serverName, filteredTools);
+					for (const tool of filteredTools) {
+						if (!toolToServers.has(tool.name)) toolToServers.set(tool.name, []);
+						toolToServers.get(tool.name).push(client.serverName);
 					}
-					return matches;
 				} catch (error) {
 					console.error(`Failed to list tools from ${client.serverName}:`, error);
-					return [];
+					serverToolsMap.set(client.serverName, []);
 				}
 			}));
-			for (const matches of results) for (const match of matches) {
-				if (!toolMatches.has(match.toolName)) toolMatches.set(match.toolName, []);
-				toolMatches.get(match.toolName).push({
-					server: match.server,
-					tool: match.tool
-				});
-			}
-			const ambiguousTools = [];
-			for (const toolName of toolNames) {
-				const matches = toolMatches.get(toolName);
-				if (!matches || matches.length === 0) continue;
-				if (matches.length === 1) {
-					const match = matches[0];
-					foundTools.push({
-						server: match.server,
+			const foundTools = [];
+			const notFoundTools = [];
+			for (const requestedToolName of toolNames) {
+				const { serverName, actualToolName } = parseToolName(requestedToolName);
+				if (serverName) {
+					const serverTools = serverToolsMap.get(serverName);
+					if (!serverTools) {
+						notFoundTools.push(requestedToolName);
+						continue;
+					}
+					const tool = serverTools.find((t) => t.name === actualToolName);
+					if (tool) foundTools.push({
+						server: serverName,
 						tool: {
-							name: match.tool.name,
-							description: match.tool.description,
-							inputSchema: match.tool.inputSchema
+							name: tool.name,
+							description: tool.description,
+							inputSchema: tool.inputSchema
 						}
 					});
-					const idx = notFoundTools.indexOf(toolName);
-					if (idx > -1) notFoundTools.splice(idx, 1);
+					else notFoundTools.push(requestedToolName);
 				} else {
-					ambiguousTools.push({
-						toolName,
-						servers: matches.map((m) => m.server)
-					});
-					const idx = notFoundTools.indexOf(toolName);
-					if (idx > -1) notFoundTools.splice(idx, 1);
+					const servers = toolToServers.get(actualToolName);
+					if (!servers || servers.length === 0) {
+						notFoundTools.push(requestedToolName);
+						continue;
+					}
+					if (servers.length === 1) {
+						const server = servers[0];
+						const tool = serverToolsMap.get(server).find((t) => t.name === actualToolName);
+						foundTools.push({
+							server,
+							tool: {
+								name: tool.name,
+								description: tool.description,
+								inputSchema: tool.inputSchema
+							}
+						});
+					} else for (const server of servers) {
+						const tool = serverToolsMap.get(server).find((t) => t.name === actualToolName);
+						foundTools.push({
+							server,
+							tool: {
+								name: tool.name,
+								description: tool.description,
+								inputSchema: tool.inputSchema
+							}
+						});
+					}
 				}
 			}
-			if (foundTools.length === 0 && ambiguousTools.length === 0) return {
+			if (foundTools.length === 0) return {
 				content: [{
 					type: "text",
-					text: `None of the requested tools found on any connected server.\nRequested: ${toolNames.join(", ")}\nUse describe_tools without arguments to see available servers.`
+					text: `None of the requested tools found on any connected server.\nRequested: ${toolNames.join(", ")}\nUse describe_tools to see available tools.`
 				}],
 				isError: true
 			};
 			const result = { tools: foundTools };
-			if (notFoundTools.length > 0) result.notFound = notFoundTools;
-			if (ambiguousTools.length > 0) result.ambiguous = ambiguousTools.map((item) => ({
-				toolName: item.toolName,
-				servers: item.servers,
-				message: `Tool "${item.toolName}" found on multiple servers: ${item.servers.join(", ")}. Please specify serverName to disambiguate.`
-			}));
-			const warnings = [];
-			if (notFoundTools.length > 0) warnings.push(`Tools not found: ${notFoundTools.join(", ")}`);
-			if (ambiguousTools.length > 0) warnings.push(`Ambiguous tools (specify serverName): ${ambiguousTools.map((t) => t.toolName).join(", ")}`);
-			if (warnings.length > 0) result.warnings = warnings;
+			if (notFoundTools.length > 0) {
+				result.notFound = notFoundTools;
+				result.warnings = [`Tools not found: ${notFoundTools.join(", ")}`];
+			}
 			return { content: [{
 				type: "text",
 				text: JSON.stringify(result, null, 2)
@@ -1179,10 +1210,6 @@ var UseToolTool = class UseToolTool {
 					toolArgs: {
 						type: "object",
 						description: "Arguments to pass to the tool, as discovered from describe_tools"
-					},
-					serverName: {
-						type: "string",
-						description: "Optional server name to disambiguate when multiple servers have the same tool"
 					}
 				},
 				required: ["toolName"],
@@ -1192,8 +1219,9 @@ var UseToolTool = class UseToolTool {
 	}
 	async execute(input) {
 		try {
-			const { toolName, toolArgs = {}, serverName } = input;
+			const { toolName: inputToolName, toolArgs = {} } = input;
 			const clients = this.clientManager.getAllClients();
+			const { serverName, actualToolName } = parseToolName(inputToolName);
 			if (serverName) {
 				const client$1 = this.clientManager.getClient(serverName);
 				if (!client$1) return {
@@ -1203,20 +1231,20 @@ var UseToolTool = class UseToolTool {
 					}],
 					isError: true
 				};
-				if (client$1.toolBlacklist && client$1.toolBlacklist.includes(toolName)) return {
+				if (client$1.toolBlacklist && client$1.toolBlacklist.includes(actualToolName)) return {
 					content: [{
 						type: "text",
-						text: `Tool "${toolName}" is blacklisted on server "${serverName}" and cannot be executed.`
+						text: `Tool "${actualToolName}" is blacklisted on server "${serverName}" and cannot be executed.`
 					}],
 					isError: true
 				};
 				try {
-					return await client$1.callTool(toolName, toolArgs);
+					return await client$1.callTool(actualToolName, toolArgs);
 				} catch (error) {
 					return {
 						content: [{
 							type: "text",
-							text: `Failed to call tool "${toolName}" on server "${serverName}": ${error instanceof Error ? error.message : "Unknown error"}`
+							text: `Failed to call tool "${actualToolName}" on server "${serverName}": ${error instanceof Error ? error.message : "Unknown error"}`
 						}],
 						isError: true
 					};
@@ -1225,8 +1253,8 @@ var UseToolTool = class UseToolTool {
 			const matchingServers = [];
 			const results = await Promise.all(clients.map(async (client$1) => {
 				try {
-					if (client$1.toolBlacklist && client$1.toolBlacklist.includes(toolName)) return null;
-					if ((await client$1.listTools()).some((t) => t.name === toolName)) return client$1.serverName;
+					if (client$1.toolBlacklist && client$1.toolBlacklist.includes(actualToolName)) return null;
+					if ((await client$1.listTools()).some((t) => t.name === actualToolName)) return client$1.serverName;
 				} catch (error) {
 					console.error(`Failed to list tools from ${client$1.serverName}:`, error);
 				}
@@ -1236,14 +1264,14 @@ var UseToolTool = class UseToolTool {
 			if (matchingServers.length === 0) return {
 				content: [{
 					type: "text",
-					text: `Tool "${toolName}" not found on any connected server. Use describe_tools to see available tools.`
+					text: `Tool "${actualToolName}" not found on any connected server. Use describe_tools to see available tools.`
 				}],
 				isError: true
 			};
 			if (matchingServers.length > 1) return {
 				content: [{
 					type: "text",
-					text: `Multiple servers provide tool "${toolName}". Please specify serverName. Available servers: ${matchingServers.join(", ")}`
+					text: `Tool "${actualToolName}" found on multiple servers. Use prefixed format to specify: ${matchingServers.map((s) => `${s}__${actualToolName}`).join(", ")}`
 				}],
 				isError: true
 			};
@@ -1257,12 +1285,12 @@ var UseToolTool = class UseToolTool {
 				isError: true
 			};
 			try {
-				return await client.callTool(toolName, toolArgs);
+				return await client.callTool(actualToolName, toolArgs);
 			} catch (error) {
 				return {
 					content: [{
 						type: "text",
-						text: `Failed to call tool "${toolName}": ${error instanceof Error ? error.message : "Unknown error"}`
+						text: `Failed to call tool "${actualToolName}": ${error instanceof Error ? error.message : "Unknown error"}`
 					}],
 					isError: true
 				};
@@ -1675,4 +1703,4 @@ var HttpTransportHandler = class {
 };
 
 //#endregion
-export { McpClientManagerService as a, createServer as i, SseTransportHandler as n, ConfigFetcherService as o, StdioTransportHandler as r, HttpTransportHandler as t };
+export { findConfigFile as a, createServer as i, SseTransportHandler as n, McpClientManagerService as o, StdioTransportHandler as r, ConfigFetcherService as s, HttpTransportHandler as t };

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_http = require('./http-23nhycE8.cjs');
+const require_http = require('./http-3v8zyDO3.cjs');
 
 exports.HttpTransportHandler = require_http.HttpTransportHandler;
 exports.SseTransportHandler = require_http.SseTransportHandler;

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { i as createServer, n as SseTransportHandler, r as StdioTransportHandler, t as HttpTransportHandler } from "./http-CkWO35l-.mjs";
+import { i as createServer, n as SseTransportHandler, r as StdioTransportHandler, t as HttpTransportHandler } from "./http-CzQfsUEI.mjs";
 
 export { HttpTransportHandler, SseTransportHandler, StdioTransportHandler, createServer };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agiflowai/one-mcp",
   "description": "One MCP server package",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "license": "AGPL-3.0",
   "keywords": [
     "mcp",
@@ -25,7 +25,7 @@
     "express": "^4.21.2",
     "js-yaml": "^4.1.0",
     "zod": "^3.24.1",
-    "@agiflowai/aicode-utils": "1.0.3"
+    "@agiflowai/aicode-utils": "1.0.4"
   },
   "devDependencies": {
     "@types/express": "^5.0.0",