@agimon-ai/mcp-proxy 0.7.3 → 0.9.0

package/dist/{src-Y-cyyxaw.mjs → src-DA5H3rpr.mjs}

@@ -23,10 +23,8 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { Hono } from "hono";
 import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-
 //#region package.json
-var version = "0.7.2";
-
+var version = "0.8.0";
 //#endregion
 //#region src/utils/mcpConfigSchema.ts
 /**
@@ -421,7 +419,6 @@ function parseMcpConfig(rawConfig) {
 	const internalConfig = transformClaudeCodeConfig(ClaudeCodeMcpConfigSchema.parse(rawConfig));
 	return InternalMcpConfigSchema.parse(internalConfig);
 }
-
 //#endregion
 //#region src/services/RemoteConfigCacheService.ts
 /**
@@ -648,7 +645,6 @@ var RemoteConfigCacheService = class {
 		this.writeEnabled = enabled;
 	}
 };
-
 //#endregion
 //#region src/services/ConfigFetcherService.ts
 /**
@@ -875,7 +871,6 @@ var ConfigFetcherService = class {
 		return this.cachedConfig !== null && now - this.lastFetchTime < this.cacheTtlMs;
 	}
 };
-
 //#endregion
 //#region src/constants/index.ts
 /**
@@ -895,17 +890,6 @@ const LOG_PREFIX_SKILL_DETECTION = "[skill-detection]";
 * Log prefix for general MCP capability discovery messages.
 */
 const LOG_PREFIX_CAPABILITY_DISCOVERY = "[capability-discovery]";
-/**
-* Prefix for prompt-based skill locations.
-* Format: "prompt:{serverName}:{promptName}"
-*/
-const PROMPT_LOCATION_PREFIX = "prompt:";
-/**
-* Default server ID used when no ID is provided via CLI or config.
-* This fallback is used when auto-generation also fails.
-*/
-const DEFAULT_SERVER_ID = "unknown";
-
 //#endregion
 //#region src/utils/findConfigFile.ts
 /**
@@ -958,7 +942,6 @@ function findConfigFile() {
 	}
 	return null;
 }
-
 //#endregion
 //#region src/utils/parseToolName.ts
 /**
@@ -980,7 +963,6 @@ function parseToolName(toolName) {
 	};
 	return { actualToolName: toolName };
 }
-
 //#endregion
 //#region src/utils/parseFrontMatter.ts
 /**
@@ -1114,7 +1096,6 @@ function extractSkillFrontMatter(content) {
 	};
 	return null;
 }
-
 //#endregion
 //#region src/utils/generateServerId.ts
 /**
@@ -1179,7 +1160,6 @@ function generateServerId(length = DEFAULT_ID_LENGTH) {
 	}
 	return result;
 }
-
 //#endregion
 //#region src/services/DefinitionsCacheService.ts
 /**
@@ -1478,7 +1458,6 @@ var DefinitionsCacheService = class {
 		return promptSkills;
 	}
 };
-
 //#endregion
 //#region src/services/logger.ts
 function isRecord(value) {
@@ -1532,7 +1511,6 @@ async function createProxyLogger(options = {}) {
 		maxFileCount: options.maxFileCount
 	}));
 }
-
 //#endregion
 //#region src/services/McpClientManagerService.ts
 /** Default connection timeout in milliseconds (30 seconds) */
@@ -1604,8 +1582,8 @@ var McpClient = class {
 		this.logger = logger;
 		this.client = client;
 	}
-	setChildProcess(process$1) {
-		this.childProcess = process$1;
+	setChildProcess(process) {
+		this.childProcess = process;
 	}
 	setConnected(connected) {
 		this.connected = connected;
@@ -1734,7 +1712,7 @@ var McpClientManagerService = class {
 			if (childProcess && !childProcess.killed) {
 				this.logger.info(`Killing stdio MCP server: ${serverName} (PID: ${childProcess.pid})`);
 				childProcess.kill("SIGTERM");
-				killPromises.push(new Promise((resolve$1) => {
+				killPromises.push(new Promise((resolve) => {
 					setTimeout(() => {
 						try {
 							if (!childProcess.killed) {
@@ -1742,7 +1720,7 @@ var McpClientManagerService = class {
 								childProcess.kill("SIGKILL");
 							}
 						} catch {}
-						resolve$1();
+						resolve();
 					}, 1e3);
 				}));
 			}
@@ -1893,7 +1871,6 @@ var McpClientManagerService = class {
 		return this.clients.has(serverName);
 	}
 };
-
 //#endregion
 //#region src/services/RuntimeStateService.ts
 /**
@@ -1995,24 +1972,10 @@ var RuntimeStateService = class RuntimeStateService {
 		await rm(this.getRecordPath(serverId), { force: true });
 	}
 };
-
-//#endregion
-//#region src/services/StopServerService/constants.ts
-/**
-* StopServerService constants.
-*/
-/** Maximum time in milliseconds to wait for a shutdown to complete. */
-const DEFAULT_STOP_TIMEOUT_MS = 5e3;
-/** Minimum timeout in milliseconds for individual health check requests. */
-const HEALTH_REQUEST_TIMEOUT_FLOOR_MS = 250;
-/** Delay in milliseconds between shutdown polling attempts. */
-const SHUTDOWN_POLL_INTERVAL_MS = 200;
 /** Path for the runtime health check endpoint. */
 const HEALTH_CHECK_PATH = "/health";
 /** Path for the authenticated admin shutdown endpoint. */
 const ADMIN_SHUTDOWN_PATH = "/admin/shutdown";
-/** HTTP GET method identifier. */
-const HTTP_METHOD_GET = "GET";
 /** HTTP POST method identifier. */
 const HTTP_METHOD_POST = "POST";
 /** HTTP header name for bearer token authorization. */
@@ -2021,35 +1984,12 @@ const AUTHORIZATION_HEADER_NAME = "Authorization";
 const BEARER_TOKEN_PREFIX = "Bearer ";
 /** HTTP protocol scheme prefix for URL construction. */
 const HTTP_PROTOCOL = "http://";
-/** Separator between host and port in URL construction. */
-const URL_PORT_SEPARATOR = ":";
-/** Loopback hostname. */
-const LOOPBACK_HOST_LOCALHOST = "localhost";
-/** IPv4 loopback address. */
-const LOOPBACK_HOST_IPV4 = "127.0.0.1";
-/** IPv6 loopback address. */
-const LOOPBACK_HOST_IPV6 = "::1";
 /** Hosts that are safe to send admin requests to (loopback only). */
 const ALLOWED_HOSTS = new Set([
-	LOOPBACK_HOST_LOCALHOST,
-	LOOPBACK_HOST_IPV4,
-	LOOPBACK_HOST_IPV6
+	"localhost",
+	"127.0.0.1",
+	"::1"
 ]);
-/** Expected status value in a healthy runtime response. */
-const HEALTH_STATUS_OK = "ok";
-/** Expected transport value in a healthy runtime response. */
-const HEALTH_TRANSPORT_HTTP = "http";
-/** Property key for status field in health responses. */
-const KEY_STATUS = "status";
-/** Property key for transport field in health responses. */
-const KEY_TRANSPORT = "transport";
-/** Property key for serverId field in runtime responses. */
-const KEY_SERVER_ID = "serverId";
-/** Property key for ok field in shutdown responses. */
-const KEY_OK = "ok";
-/** Property key for message field in shutdown responses. */
-const KEY_MESSAGE = "message";
-
 //#endregion
 //#region src/services/StopServerService/types.ts
 /**
@@ -2068,7 +2008,7 @@ function toRecord(value) {
 function isHealthResponse(value) {
 	if (typeof value !== "object" || value === null) return false;
 	const record = toRecord(value);
-	return KEY_STATUS in record && record[KEY_STATUS] === HEALTH_STATUS_OK && KEY_TRANSPORT in record && record[KEY_TRANSPORT] === HEALTH_TRANSPORT_HTTP && (!(KEY_SERVER_ID in record) || record[KEY_SERVER_ID] === void 0 || typeof record[KEY_SERVER_ID] === "string");
+	return "status" in record && record["status"] === "ok" && "transport" in record && record["transport"] === "http" && (!("serverId" in record) || record["serverId"] === void 0 || typeof record["serverId"] === "string");
 }
 /**
 * Type guard for shutdown responses.
@@ -2078,9 +2018,8 @@ function isHealthResponse(value) {
 function isShutdownResponse(value) {
 	if (typeof value !== "object" || value === null) return false;
 	const record = toRecord(value);
-	return KEY_OK in record && typeof record[KEY_OK] === "boolean" && KEY_MESSAGE in record && typeof record[KEY_MESSAGE] === "string" && (!(KEY_SERVER_ID in record) || record[KEY_SERVER_ID] === void 0 || typeof record[KEY_SERVER_ID] === "string");
+	return "ok" in record && typeof record["ok"] === "boolean" && "message" in record && typeof record["message"] === "string" && (!("serverId" in record) || record["serverId"] === void 0 || typeof record["serverId"] === "string");
 }
-
 //#endregion
 //#region src/services/StopServerService/StopServerService.ts
 /**
@@ -2090,16 +2029,16 @@ function isShutdownResponse(value) {
 * @param path - Request path to append
 * @returns Full runtime URL
 */
-function buildRuntimeUrl(runtime, path$1) {
+function buildRuntimeUrl(runtime, path) {
 	if (!ALLOWED_HOSTS.has(runtime.host)) throw new Error(`Refusing to connect to non-loopback host '${runtime.host}'. Only ${Array.from(ALLOWED_HOSTS).join(", ")} are allowed.`);
-	return `${HTTP_PROTOCOL}${runtime.host}${URL_PORT_SEPARATOR}${runtime.port}${path$1}`;
+	return `${HTTP_PROTOCOL}${runtime.host}:${runtime.port}${path}`;
 }
 function toErrorMessage$1(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 function sleep(delayMs) {
-	return new Promise((resolve$1) => {
-		setTimeout(resolve$1, delayMs);
+	return new Promise((resolve) => {
+		setTimeout(resolve, delayMs);
 	});
 }
 /**
@@ -2118,7 +2057,7 @@ var StopServerService = class {
 	* @returns Stop result payload
 	*/
 	async stop(request) {
-		const timeoutMs = request.timeoutMs ?? DEFAULT_STOP_TIMEOUT_MS;
+		const timeoutMs = request.timeoutMs ?? 5e3;
 		const runtime = await this.resolveRuntime(request);
 		const health = await this.fetchHealth(runtime, timeoutMs);
 		if (!health.reachable) {
@@ -2164,7 +2103,7 @@ var StopServerService = class {
 	*/
 	async fetchHealth(runtime, timeoutMs) {
 		try {
-			const response = await this.fetchWithTimeout(buildRuntimeUrl(runtime, HEALTH_CHECK_PATH), { method: HTTP_METHOD_GET }, timeoutMs);
+			const response = await this.fetchWithTimeout(buildRuntimeUrl(runtime, HEALTH_CHECK_PATH), { method: "GET" }, timeoutMs);
 			if (!response.ok) return { reachable: false };
 			const payload = await response.json();
 			if (!isHealthResponse(payload)) throw new Error("Received invalid health response payload.");
@@ -2203,8 +2142,8 @@ var StopServerService = class {
 	async waitForShutdown(runtime, timeoutMs) {
 		const deadline = Date.now() + timeoutMs;
 		while (Date.now() < deadline) {
-			if (!(await this.fetchHealth(runtime, Math.max(HEALTH_REQUEST_TIMEOUT_FLOOR_MS, deadline - Date.now()))).reachable) return;
-			await sleep(SHUTDOWN_POLL_INTERVAL_MS);
+			if (!(await this.fetchHealth(runtime, Math.max(250, deadline - Date.now()))).reachable) return;
+			await sleep(200);
 		}
 		throw new Error(`Timed out waiting for runtime '${runtime.serverId}' to stop at http://${runtime.host}:${runtime.port}.`);
 	}
@@ -2232,7 +2171,6 @@ var StopServerService = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/services/SkillService.ts
 /**
@@ -2270,13 +2208,13 @@ var SkillLoadError = class extends Error {
 * @returns true if path exists, false otherwise
 * @throws Error for unexpected filesystem errors (permission denied, etc.)
 */
-async function pathExists(path$1) {
+async function pathExists(path) {
 	try {
-		await access(path$1);
+		await access(path);
 		return true;
 	} catch (error) {
 		if (error instanceof Error && "code" in error && error.code === "ENOENT") return false;
-		throw new Error(`Failed to check path existence for "${path$1}": ${error instanceof Error ? error.message : "Unknown error"}`);
+		throw new Error(`Failed to check path existence for "${path}": ${error instanceof Error ? error.message : "Unknown error"}`);
 	}
 }
 /**
@@ -2589,54 +2527,14 @@ var SkillService = class {
 		};
 	}
 };
-
-//#endregion
-//#region src/services/PrefetchService/constants.ts
-/**
-* PrefetchService Constants
-*
-* Constants for package manager commands and process configuration.
-*/
-/** Transport type for stdio-based MCP servers */
-const TRANSPORT_STDIO = "stdio";
-/** npx command name */
-const COMMAND_NPX = "npx";
-/** npm command name */
-const COMMAND_NPM = "npm";
 /** pnpx command name (pnpm's npx equivalent) */
 const COMMAND_PNPX = "pnpx";
 /** pnpm command name */
 const COMMAND_PNPM = "pnpm";
-/** uvx command name */
-const COMMAND_UVX = "uvx";
-/** uv command name */
-const COMMAND_UV = "uv";
-/** Path suffix for npx command */
-const COMMAND_NPX_SUFFIX = "/npx";
-/** Path suffix for pnpx command */
-const COMMAND_PNPX_SUFFIX = "/pnpx";
-/** Path suffix for uvx command */
-const COMMAND_UVX_SUFFIX = "/uvx";
-/** Path suffix for uv command */
-const COMMAND_UV_SUFFIX = "/uv";
-/** Run subcommand for uv */
-const ARG_RUN = "run";
 /** Tool subcommand for uv */
 const ARG_TOOL = "tool";
 /** Install subcommand for uv tool and npm/pnpm */
 const ARG_INSTALL = "install";
-/** Add subcommand for pnpm */
-const ARG_ADD = "add";
-/** Global flag for npm/pnpm install */
-const ARG_GLOBAL = "-g";
-/** Flag prefix for command arguments */
-const FLAG_PREFIX = "-";
-/** npx --package flag (long form) */
-const FLAG_PACKAGE_LONG = "--package";
-/** npx -p flag (short form) */
-const FLAG_PACKAGE_SHORT = "-p";
-/** Equals delimiter used in flag=value patterns */
-const EQUALS_DELIMITER = "=";
 /**
 * Regex pattern for valid package names (npm, pnpm, uvx, uv)
 * Allows: @scope/package-name@version, package-name, package_name
@@ -2648,13 +2546,10 @@ const EQUALS_DELIMITER = "=";
 const VALID_PACKAGE_NAME_PATTERN = /^(@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9._-]+(@[a-zA-Z0-9._-]+)?$/;
 /** Windows platform identifier */
 const PLATFORM_WIN32 = "win32";
-/** Success exit code */
-const EXIT_CODE_SUCCESS = 0;
 /** Stdio option to ignore stream */
 const STDIO_IGNORE = "ignore";
 /** Stdio option to pipe stream */
 const STDIO_PIPE = "pipe";
-
 //#endregion
 //#region src/services/PrefetchService/PrefetchService.ts
 /**
@@ -2714,7 +2609,7 @@ var PrefetchService = class {
 		const { mcpConfig, filter } = this.config;
 		for (const [serverName, serverConfig] of Object.entries(mcpConfig.mcpServers)) {
 			if (serverConfig.disabled) continue;
-			if (serverConfig.transport !== TRANSPORT_STDIO) continue;
+			if (serverConfig.transport !== "stdio") continue;
 			if (!isMcpStdioConfig(serverConfig.config)) continue;
 			const packageInfo = this.extractPackageInfo(serverName, serverConfig.config);
 			if (packageInfo) {
@@ -2803,21 +2698,21 @@ var PrefetchService = class {
 	extractPackageInfo(serverName, config) {
 		const command = config.command.toLowerCase();
 		const args = config.args || [];
-		if (command === COMMAND_NPX || command.endsWith(COMMAND_NPX_SUFFIX)) {
+		if (command === "npx" || command.endsWith("/npx")) {
 			const packageName = this.extractNpxPackage(args);
 			if (packageName && this.isValidPackageName(packageName)) return {
 				serverName,
-				packageManager: COMMAND_NPX,
+				packageManager: "npx",
 				packageName,
 				fullCommand: [
-					COMMAND_NPM,
+					"npm",
 					ARG_INSTALL,
-					ARG_GLOBAL,
+					"-g",
 					packageName
 				]
 			};
 		}
-		if (command === COMMAND_PNPX || command.endsWith(COMMAND_PNPX_SUFFIX)) {
+		if (command === "pnpx" || command.endsWith("/pnpx")) {
 			const packageName = this.extractNpxPackage(args);
 			if (packageName && this.isValidPackageName(packageName)) return {
 				serverName,
@@ -2825,29 +2720,29 @@ var PrefetchService = class {
 				packageName,
 				fullCommand: [
 					COMMAND_PNPM,
-					ARG_ADD,
-					ARG_GLOBAL,
+					"add",
+					"-g",
 					packageName
 				]
 			};
 		}
-		if (command === COMMAND_UVX || command.endsWith(COMMAND_UVX_SUFFIX)) {
+		if (command === "uvx" || command.endsWith("/uvx")) {
 			const packageName = this.extractUvxPackage(args);
 			if (packageName && this.isValidPackageName(packageName)) return {
 				serverName,
-				packageManager: COMMAND_UVX,
+				packageManager: "uvx",
 				packageName,
-				fullCommand: [COMMAND_UVX, packageName]
+				fullCommand: ["uvx", packageName]
 			};
 		}
-		if ((command === COMMAND_UV || command.endsWith(COMMAND_UV_SUFFIX)) && args.includes(ARG_RUN)) {
+		if ((command === "uv" || command.endsWith("/uv")) && args.includes("run")) {
 			const packageName = this.extractUvRunPackage(args);
 			if (packageName && this.isValidPackageName(packageName)) return {
 				serverName,
-				packageManager: COMMAND_UV,
+				packageManager: "uv",
 				packageName,
 				fullCommand: [
-					COMMAND_UV,
+					"uv",
 					ARG_TOOL,
 					ARG_INSTALL,
 					packageName
@@ -2874,18 +2769,18 @@ var PrefetchService = class {
 	extractNpxPackage(args) {
 		for (let i = 0; i < args.length; i++) {
 			const arg = args[i];
-			if (arg.startsWith(FLAG_PACKAGE_LONG + EQUALS_DELIMITER)) return arg.slice(FLAG_PACKAGE_LONG.length + EQUALS_DELIMITER.length) || null;
-			if (arg === FLAG_PACKAGE_LONG && i + 1 < args.length) {
+			if (arg.startsWith("--package=")) return arg.slice(10) || null;
+			if (arg === "--package" && i + 1 < args.length) {
 				const nextArg = args[i + 1];
-				if (!nextArg.startsWith(FLAG_PREFIX)) return nextArg;
+				if (!nextArg.startsWith("-")) return nextArg;
 			}
-			if (arg === FLAG_PACKAGE_SHORT && i + 1 < args.length) {
+			if (arg === "-p" && i + 1 < args.length) {
 				const nextArg = args[i + 1];
-				if (!nextArg.startsWith(FLAG_PREFIX)) return nextArg;
+				if (!nextArg.startsWith("-")) return nextArg;
 			}
 		}
 		for (const arg of args) {
-			if (arg.startsWith(FLAG_PREFIX)) continue;
+			if (arg.startsWith("-")) continue;
 			return arg;
 		}
 		return null;
@@ -2902,7 +2797,7 @@ var PrefetchService = class {
 	*/
 	extractUvxPackage(args) {
 		for (const arg of args) {
-			if (arg.startsWith(FLAG_PREFIX)) continue;
+			if (arg.startsWith("-")) continue;
 			return arg;
 		}
 		return null;
@@ -2919,11 +2814,11 @@ var PrefetchService = class {
 	* extractUvRunPackage(['install', 'pkg']) // returns null (no 'run')
 	*/
 	extractUvRunPackage(args) {
-		const runIndex = args.indexOf(ARG_RUN);
+		const runIndex = args.indexOf("run");
 		if (runIndex === -1) return null;
 		for (let i = runIndex + 1; i < args.length; i++) {
 			const arg = args[i];
-			if (arg.startsWith(FLAG_PREFIX)) continue;
+			if (arg.startsWith("-")) continue;
 			return arg;
 		}
 		return null;
@@ -2935,7 +2830,7 @@ var PrefetchService = class {
 	* @returns Promise with success status and output
 	*/
 	runCommand(command, args) {
-		return new Promise((resolve$1) => {
+		return new Promise((resolve) => {
 			const proc = spawn(command, args, {
 				stdio: [
 					STDIO_IGNORE,
@@ -2953,13 +2848,13 @@ var PrefetchService = class {
 				stderr += data.toString();
 			});
 			proc.on("close", (code) => {
-				resolve$1({
-					success: code === EXIT_CODE_SUCCESS,
+				resolve({
+					success: code === 0,
 					output: stdout || stderr
 				});
 			});
 			proc.on("error", (error) => {
-				resolve$1({
+				resolve({
 					success: false,
 					output: error.message
 				});
@@ -2967,11 +2862,9 @@ var PrefetchService = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/templates/toolkit-description.liquid?raw
 var toolkit_description_default = "<toolkit id=\"{{ serverId }}\">\n<instruction>\nBefore you use any capabilities below, you MUST call this tool with a list of names to learn how to use them properly; this includes:\n- For tools: Arguments schema needed to pass to use_tool\n- For skills: Detailed instructions that will expand when invoked (Prefer to be explored first when relevant)\n\nThis tool is optimized for batch queries - you can request multiple capabilities at once for better performance.\n\nHow to invoke:\n- For MCP tools: Use use_tool with toolName and toolArgs based on the schema\n- For skills: Use this tool with the skill name to get expanded instructions\n</instruction>\n\n<available_capabilities>\n{% for server in servers -%}\n<group original-mcp-server=\"{{ server.name }}\">\n{% if server.instruction -%}\n<group_instruction>{{ server.instruction }}</group_instruction>\n{% endif -%}\n{% if server.omitToolDescription -%}\n{% for toolName in server.toolNames -%}\n<item name=\"{{ toolName }}\"></item>\n{% endfor -%}\n{% else -%}\n{% for tool in server.tools -%}\n<item name=\"{{ tool.displayName }}\"><description>{{ tool.description | default: \"No description\" }}</description></item>\n{% endfor -%}\n{% endif -%}\n</group>\n{% endfor -%}\n{% if skills.size > 0 -%}\n<group name=\"skills\">\n{% for skill in skills -%}\n<item name=\"{{ skill.displayName }}\"><description>{{ skill.description }}</description></item>\n{% endfor -%}\n</group>\n{% endif -%}\n</available_capabilities>\n</toolkit>\n";
-
 //#endregion
 //#region src/tools/DescribeToolsTool.ts
 /**
@@ -3026,7 +2919,7 @@ var DescribeToolsTool = class DescribeToolsTool {
 	constructor(clientManager, skillService, serverId, definitionsCacheService) {
 		this.clientManager = clientManager;
 		this.skillService = skillService;
-		this.serverId = serverId || DEFAULT_SERVER_ID;
+		this.serverId = serverId || "unknown";
 		this.definitionsCacheService = definitionsCacheService || new DefinitionsCacheService(clientManager, skillService);
 	}
 	/**
@@ -3142,7 +3035,7 @@ var DescribeToolsTool = class DescribeToolsTool {
 			}).join("\n") || "";
 			return {
 				name: promptSkill.skill.name,
-				location: promptSkill.skill.folder || `${PROMPT_LOCATION_PREFIX}${promptSkill.serverName}/${promptSkill.promptName}`,
+				location: promptSkill.skill.folder || `prompt:${promptSkill.serverName}/${promptSkill.promptName}`,
 				instructions: formatSkillInstructions(promptSkill.skill.name, rawInstructions)
 			};
 		} catch (error) {
@@ -3258,6 +3151,115 @@ var DescribeToolsTool = class DescribeToolsTool {
 			inputSchema: z.toJSONSchema(DescribeToolsToolInputSchema, { reused: "inline" })
 		};
 	}
+	async runLookups(toolNames, serverDefinitions) {
+		const serverToolsMap = /* @__PURE__ */ new Map();
+		const toolToServers = /* @__PURE__ */ new Map();
+		for (const serverDefinition of serverDefinitions) {
+			const typedTools = serverDefinition.tools.map((tool) => ({
+				name: tool.name,
+				description: tool.description,
+				inputSchema: tool.inputSchema
+			}));
+			serverToolsMap.set(serverDefinition.serverName, typedTools);
+			for (const tool of typedTools) {
+				if (!toolToServers.has(tool.name)) toolToServers.set(tool.name, []);
+				toolToServers.get(tool.name)?.push(serverDefinition.serverName);
+			}
+		}
+		const lookupResults = await Promise.all(toolNames.map(async (requestedName) => {
+			const result = {
+				tools: [],
+				skills: [],
+				notFound: null
+			};
+			if (requestedName.startsWith("skill__")) {
+				const skillName = requestedName.slice(7);
+				if (this.skillService) {
+					const skill = await this.skillService.getSkill(skillName);
+					if (skill) {
+						result.skills.push({
+							name: skill.name,
+							location: skill.basePath,
+							instructions: formatSkillInstructions(skill.name, skill.content)
+						});
+						return result;
+					}
+				}
+				const promptSkillContent = await this.getPromptSkillContent(skillName);
+				if (promptSkillContent) {
+					result.skills.push(promptSkillContent);
+					return result;
+				}
+				result.notFound = requestedName;
+				return result;
+			}
+			const { serverName, actualToolName } = parseToolName(requestedName);
+			if (serverName) {
+				const serverTools = serverToolsMap.get(serverName);
+				if (!serverTools) {
+					result.notFound = requestedName;
+					return result;
+				}
+				const tool = serverTools.find((t) => t.name === actualToolName);
+				if (tool) result.tools.push({
+					server: serverName,
+					tool: {
+						name: tool.name,
+						description: tool.description,
+						inputSchema: tool.inputSchema
+					}
+				});
+				else result.notFound = requestedName;
+				return result;
+			}
+			const servers = toolToServers.get(actualToolName);
+			if (!servers || servers.length === 0) {
+				if (this.skillService) {
+					const skill = await this.skillService.getSkill(actualToolName);
+					if (skill) {
+						result.skills.push({
+							name: skill.name,
+							location: skill.basePath,
+							instructions: formatSkillInstructions(skill.name, skill.content)
+						});
+						return result;
+					}
+				}
+				const promptSkillContent = await this.getPromptSkillContent(actualToolName);
+				if (promptSkillContent) {
+					result.skills.push(promptSkillContent);
+					return result;
+				}
+				result.notFound = requestedName;
+				return result;
+			}
+			for (const server of servers) {
+				const tool = serverToolsMap.get(server).find((t) => t.name === actualToolName);
+				result.tools.push({
+					server,
+					tool: {
+						name: tool.name,
+						description: tool.description,
+						inputSchema: tool.inputSchema
+					}
+				});
+			}
+			return result;
+		}));
+		const foundTools = [];
+		const foundSkills = [];
+		const notFoundItems = [];
+		for (const result of lookupResults) {
+			foundTools.push(...result.tools);
+			foundSkills.push(...result.skills);
+			if (result.notFound) notFoundItems.push(result.notFound);
+		}
+		return {
+			foundTools,
+			foundSkills,
+			notFoundItems
+		};
+	}
 	/**
 	* Executes tool description lookup for the requested tool and skill names.
 	*
@@ -3272,7 +3274,6 @@ var DescribeToolsTool = class DescribeToolsTool {
 	async execute(rawInput) {
 		try {
 			const { toolNames } = DescribeToolsToolInputSchema.parse(rawInput);
-			const serverDefinitions = await this.definitionsCacheService.getServerDefinitions();
 			if (!toolNames || toolNames.length === 0) return {
 				content: [{
 					type: "text",
@@ -3280,119 +3281,13 @@ var DescribeToolsTool = class DescribeToolsTool {
 				}],
 				isError: true
 			};
-			const serverToolsMap = /* @__PURE__ */ new Map();
-			const toolToServers = /* @__PURE__ */ new Map();
-			for (const serverDefinition of serverDefinitions) {
-				const typedTools = serverDefinition.tools.map((tool) => ({
-					name: tool.name,
-					description: tool.description,
-					inputSchema: tool.inputSchema
-				}));
-				serverToolsMap.set(serverDefinition.serverName, typedTools);
-				for (const tool of typedTools) {
-					if (!toolToServers.has(tool.name)) toolToServers.set(tool.name, []);
-					toolToServers.get(tool.name)?.push(serverDefinition.serverName);
-				}
-			}
-			const lookupResults = await Promise.all(toolNames.map(async (requestedName) => {
-				const result$1 = {
-					tools: [],
-					skills: [],
-					notFound: null
-				};
-				if (requestedName.startsWith(SKILL_PREFIX)) {
-					const skillName = requestedName.slice(SKILL_PREFIX.length);
-					if (this.skillService) {
-						const skill = await this.skillService.getSkill(skillName);
-						if (skill) {
-							result$1.skills.push({
-								name: skill.name,
-								location: skill.basePath,
-								instructions: formatSkillInstructions(skill.name, skill.content)
-							});
-							return result$1;
-						}
-					}
-					const promptSkillContent = await this.getPromptSkillContent(skillName);
-					if (promptSkillContent) {
-						result$1.skills.push(promptSkillContent);
-						return result$1;
-					}
-					result$1.notFound = requestedName;
-					return result$1;
-				}
-				const { serverName, actualToolName } = parseToolName(requestedName);
-				if (serverName) {
-					const serverTools = serverToolsMap.get(serverName);
-					if (!serverTools) {
-						result$1.notFound = requestedName;
-						return result$1;
-					}
-					const tool = serverTools.find((t) => t.name === actualToolName);
-					if (tool) result$1.tools.push({
-						server: serverName,
-						tool: {
-							name: tool.name,
-							description: tool.description,
-							inputSchema: tool.inputSchema
-						}
-					});
-					else result$1.notFound = requestedName;
-					return result$1;
-				}
-				const servers = toolToServers.get(actualToolName);
-				if (!servers || servers.length === 0) {
-					if (this.skillService) {
-						const skill = await this.skillService.getSkill(actualToolName);
-						if (skill) {
-							result$1.skills.push({
-								name: skill.name,
-								location: skill.basePath,
-								instructions: formatSkillInstructions(skill.name, skill.content)
-							});
-							return result$1;
-						}
-					}
-					const promptSkillContent = await this.getPromptSkillContent(actualToolName);
-					if (promptSkillContent) {
-						result$1.skills.push(promptSkillContent);
-						return result$1;
-					}
-					result$1.notFound = requestedName;
-					return result$1;
-				}
-				if (servers.length === 1) {
-					const server = servers[0];
-					const tool = serverToolsMap.get(server).find((t) => t.name === actualToolName);
-					result$1.tools.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);
-					result$1.tools.push({
-						server,
-						tool: {
-							name: tool.name,
-							description: tool.description,
-							inputSchema: tool.inputSchema
-						}
-					});
-				}
-				return result$1;
-			}));
-			const foundTools = [];
-			const foundSkills = [];
-			const notFoundItems = [];
-			for (const result$1 of lookupResults) {
-				foundTools.push(...result$1.tools);
-				foundSkills.push(...result$1.skills);
-				if (result$1.notFound) notFoundItems.push(result$1.notFound);
+			let lookup = await this.runLookups(toolNames, await this.definitionsCacheService.getServerDefinitions());
+			if (lookup.notFoundItems.length > 0) {
+				this.definitionsCacheService.clearLiveCache();
+				await this.definitionsCacheService.collectForCache();
+				lookup = await this.runLookups(toolNames, await this.definitionsCacheService.getServerDefinitions());
 			}
+			const { foundTools, foundSkills, notFoundItems } = lookup;
 			if (foundTools.length === 0 && foundSkills.length === 0) return {
 				content: [{
 					type: "text",
@@ -3430,7 +3325,6 @@ var DescribeToolsTool = class DescribeToolsTool {
 		}
 	}
 };
-
 //#endregion
 //#region src/utils/toolCapabilities.ts
 const TOOL_CAPABILITIES_META_KEY = "agiflowai/capabilities";
@@ -3442,7 +3336,6 @@ function getToolCapabilities(tool) {
 function getUniqueSortedCapabilities(tools) {
 	return Array.from(new Set(tools.flatMap((tool) => getToolCapabilities(tool)))).sort();
 }
-
 //#endregion
 //#region src/tools/SearchListToolsTool.ts
 const SearchListToolsToolInputSchema = z.object({
@@ -3504,17 +3397,15 @@ var SearchListToolsTool = class SearchListToolsTool {
 				capabilities: getToolCapabilities(tool)
 			}))
 		})).filter((server) => server.tools.length > 0);
-		const result = { servers: filteredServers };
 		return {
 			content: [{
 				type: "text",
-				text: JSON.stringify(result, null, 2)
+				text: JSON.stringify({ servers: filteredServers }, null, 2)
 			}],
 			isError: filteredServers.length === 0 ? true : void 0
 		};
 	}
 };
-
 //#endregion
 //#region src/tools/UseToolTool.ts
 /**
@@ -3580,7 +3471,7 @@ var UseToolTool = class UseToolTool {
 		this.clientManager = clientManager;
 		this.skillService = skillService;
 		this.definitionsCacheService = definitionsCacheService || new DefinitionsCacheService(clientManager, skillService);
-		this.serverId = serverId || DEFAULT_SERVER_ID;
+		this.serverId = serverId || "unknown";
 	}
 	/**
 	* Returns the MCP tool definition with name, description, and input schema.
@@ -3673,8 +3564,8 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 	async execute(rawInput) {
 		try {
 			const { toolName: inputToolName, toolArgs = {} } = UseToolToolInputSchema.parse(rawInput);
-			if (inputToolName.startsWith(SKILL_PREFIX)) {
-				const skillName = inputToolName.slice(SKILL_PREFIX.length);
+			if (inputToolName.startsWith("skill__")) {
+				const skillName = inputToolName.slice(7);
 				if (this.skillService) {
 					const skill = await this.skillService.getSkill(skillName);
 					if (skill) return this.executeSkill(skill);
@@ -3712,7 +3603,12 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 					isError: true
 				};
 			}
-			const matchingServers = await this.definitionsCacheService.getServersForTool(actualToolName);
+			let matchingServers = await this.definitionsCacheService.getServersForTool(actualToolName);
+			if (matchingServers.length === 0) {
+				this.definitionsCacheService.clearLiveCache();
+				await this.definitionsCacheService.collectForCache();
+				matchingServers = await this.definitionsCacheService.getServersForTool(actualToolName);
+			}
 			if (matchingServers.length === 0) {
 				if (this.skillService) {
 					const skill = await this.skillService.getSkill(actualToolName);
@@ -3761,7 +3657,6 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 		}
 	}
 };
-
 //#endregion
 //#region src/transports/http.ts
 /**
@@ -3903,13 +3798,13 @@ var AdminRateLimiter = class {
 * Parse JSON body from IncomingMessage
 */
 async function parseJsonBody$1(req) {
-	return new Promise((resolve$1, reject) => {
+	return new Promise((resolve, reject) => {
 		const chunks = [];
 		req.on("data", (chunk) => chunks.push(chunk));
 		req.on("end", () => {
 			try {
 				const body = Buffer.concat(chunks).toString("utf-8");
-				resolve$1(body ? JSON.parse(body) : void 0);
+				resolve(body ? JSON.parse(body) : void 0);
 			} catch (error) {
 				reject(/* @__PURE__ */ new Error(`Failed to parse JSON body: ${toErrorMessage(error)}`));
 			}
@@ -3997,24 +3892,24 @@ var HttpTransportHandler = class {
 	}
 	async handleAdminShutdownRequest(c) {
 		if (!this.adminOptions?.onShutdownRequested) {
-			const payload$1 = {
+			const payload = {
 				ok: false,
 				message: "Shutdown endpoint is not enabled for this server instance.",
 				serverId: this.adminOptions?.serverId
 			};
-			return c.json(payload$1, 404);
+			return c.json(payload, 404);
 		}
 		const headers = {
 			authorization: c.req.header("authorization"),
 			"x-mcp-proxy-shutdown-token": c.req.header("x-mcp-proxy-shutdown-token")
 		};
 		if (!this.isAuthorizedShutdownRequest(headers)) {
-			const payload$1 = {
+			const payload = {
 				ok: false,
 				message: "Unauthorized shutdown request: invalid or missing shutdown token.",
 				serverId: this.adminOptions?.serverId
 			};
-			return c.json(payload$1, 401);
+			return c.json(payload, 401);
 		}
 		const payload = {
 			ok: true,
@@ -4170,7 +4065,6 @@ var HttpTransportHandler = class {
 		return this.config.host;
 	}
 };
-
 //#endregion
 //#region src/transports/sse.ts
 /**
@@ -4240,13 +4134,13 @@ var SseSessionManager = class {
 * Parse JSON body from IncomingMessage
 */
 async function parseJsonBody(req) {
-	return new Promise((resolve$1, reject) => {
+	return new Promise((resolve, reject) => {
 		const chunks = [];
 		req.on("data", (chunk) => chunks.push(chunk));
 		req.on("end", () => {
 			try {
 				const body = Buffer.concat(chunks).toString("utf-8");
-				resolve$1(body ? JSON.parse(body) : void 0);
+				resolve(body ? JSON.parse(body) : void 0);
 			} catch (error) {
 				reject(/* @__PURE__ */ new Error(`Failed to parse JSON body: ${error instanceof Error ? error.message : String(error)}`));
 			}
@@ -4330,7 +4224,7 @@ var SseTransportHandler = class {
 		}
 	}
 	async start() {
-		return new Promise((resolve$1, reject) => {
+		return new Promise((resolve, reject) => {
 			try {
 				const honoHandler = getRequestListener(this.honoApp.fetch);
 				const server = createServer(async (req, res) => {
@@ -4345,7 +4239,7 @@ var SseTransportHandler = class {
 					this.logger.info(`SSE endpoint: http://${this.config.host}:${this.config.port}/sse`);
 					this.logger.info(`Messages endpoint: http://${this.config.host}:${this.config.port}/messages`);
 					this.logger.info(`Health check: http://${this.config.host}:${this.config.port}/health`);
-					resolve$1();
+					resolve();
 				});
 				server.on("error", (error) => {
 					reject(error);
@@ -4357,7 +4251,7 @@ var SseTransportHandler = class {
 		});
 	}
 	async stop() {
-		return new Promise((resolve$1, reject) => {
+		return new Promise((resolve, reject) => {
 			if (this.server) {
 				const server = this.server;
 				(async () => {
@@ -4367,14 +4261,14 @@ var SseTransportHandler = class {
 							if (err) reject(err);
 							else {
 								this.server = null;
-								resolve$1();
+								resolve();
 							}
 						});
 					} catch (error) {
 						reject(error);
 					}
 				})();
-			} else resolve$1();
+			} else resolve();
 		});
 	}
 	getPort() {
@@ -4384,7 +4278,6 @@ var SseTransportHandler = class {
 		return this.config.host;
 	}
 };
-
 //#endregion
 //#region src/transports/stdio.ts
 /**
@@ -4411,7 +4304,6 @@ var StdioTransportHandler = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/transports/stdio-http.ts
 /**
@@ -4533,7 +4425,7 @@ var StdioHttpTransportHandler = class {
 	async reconnectWithBackoff() {
 		for (let attempt = 0; attempt < this.MAX_RECONNECT_ATTEMPTS; attempt++) {
 			const delay = Math.min(this.RECONNECT_BASE_MS * 2 ** attempt, this.RECONNECT_MAX_MS);
-			await new Promise((resolve$1) => setTimeout(resolve$1, delay));
+			await new Promise((resolve) => setTimeout(resolve, delay));
 			try {
 				await this.httpClient?.close().catch(() => void 0);
 				const client = await this.createAndConnectClient();
@@ -4619,7 +4511,6 @@ var StdioHttpTransportHandler = class {
 		return proxyServer;
 	}
 };
-
 //#endregion
 //#region src/container/index.ts
 /**
@@ -4651,13 +4542,13 @@ function createProxyIoCContainer(logger = console) {
 		createDescribeToolsTool: (clientManager, skillService, serverId, definitionsCacheService) => new DescribeToolsTool(clientManager, skillService, serverId, definitionsCacheService),
 		createUseToolTool: (clientManager, skillService, serverId, definitionsCacheService) => new UseToolTool(clientManager, skillService, serverId, definitionsCacheService),
 		createSearchListToolsTool: (clientManager, definitionsCacheService) => new SearchListToolsTool(clientManager, definitionsCacheService),
-		createStdioTransportHandler: async (createServer$2) => {
-			return new StdioTransportHandler(await createServer$2(), logger);
+		createStdioTransportHandler: async (createServer) => {
+			return new StdioTransportHandler(await createServer(), logger);
 		},
-		createSseTransportHandler: async (createServer$2, config) => {
-			return new SseTransportHandler(await createServer$2(), config, logger);
+		createSseTransportHandler: async (createServer, config) => {
+			return new SseTransportHandler(await createServer(), config, logger);
 		},
-		createHttpTransportHandler: (createServer$2, config, adminOptions) => new HttpTransportHandler(createServer$2, config, adminOptions, logger),
+		createHttpTransportHandler: (createServer, config, adminOptions) => new HttpTransportHandler(createServer, config, adminOptions, logger),
 		createStdioHttpTransportHandler: (endpoint) => new StdioHttpTransportHandler({ endpoint }, logger)
 	};
 }
@@ -4794,22 +4685,22 @@ async function createProxyContainer(options) {
 /**
 * Create a sessionless stdio transport handler from the shared server factory.
 */
-async function createStdioTransportHandler(createServer$2) {
-	const server = await createServer$2();
+async function createStdioTransportHandler(createServer) {
+	const server = await createServer();
 	return createProxyIoCContainer().createStdioTransportHandler(() => Promise.resolve(server));
 }
 /**
 * Create an SSE transport handler from the shared server factory.
 */
-async function createSseTransportHandler(createServer$2, config) {
-	const server = await createServer$2();
+async function createSseTransportHandler(createServer, config) {
+	const server = await createServer();
 	return createProxyIoCContainer().createSseTransportHandler(() => Promise.resolve(server), config);
 }
 /**
 * Create an HTTP transport handler from shared services.
 */
-function createHttpTransportHandler(createServer$2, config, adminOptions) {
-	return createProxyIoCContainer().createHttpTransportHandler(createServer$2, config, adminOptions);
+function createHttpTransportHandler(createServer, config, adminOptions) {
+	return createProxyIoCContainer().createHttpTransportHandler(createServer, config, adminOptions);
 }
 /**
 * Create a stdio-http transport handler from an endpoint URL.
@@ -4823,7 +4714,6 @@ function createStdioHttpTransportHandler(endpoint) {
 async function initializeSharedServices(options) {
 	return createProxyContainer(options);
 }
-
 //#endregion
 //#region src/server/index.ts
 /**
@@ -5074,7 +4964,6 @@ async function createSessionServer(shared) {
 async function createServer$1(options) {
 	return createSessionServer(await createProxyContainer(options));
 }
-
 //#endregion
 //#region src/types/index.ts
 /**
@@ -5085,6 +4974,5 @@ const TRANSPORT_MODE = {
 	HTTP: "http",
 	SSE: "sse"
 };
-
 //#endregion
-export { DefinitionsCacheService as C, version as D, ConfigFetcherService as E, createProxyLogger as S, findConfigFile as T, DescribeToolsTool as _, createProxyContainer as a, RuntimeStateService as b, createStdioHttpTransportHandler as c, StdioHttpTransportHandler as d, StdioTransportHandler as f, SearchListToolsTool as g, UseToolTool as h, createHttpTransportHandler as i, createStdioTransportHandler as l, HttpTransportHandler as m, createServer$1 as n, createProxyIoCContainer as o, SseTransportHandler as p, createSessionServer as r, createSseTransportHandler as s, TRANSPORT_MODE as t, initializeSharedServices as u, SkillService as v, generateServerId as w, McpClientManagerService as x, StopServerService as y };
+export { DefinitionsCacheService as C, version as D, ConfigFetcherService as E, createProxyLogger as S, findConfigFile as T, DescribeToolsTool as _, createProxyContainer as a, RuntimeStateService as b, createStdioHttpTransportHandler as c, StdioHttpTransportHandler as d, StdioTransportHandler as f, SearchListToolsTool as g, UseToolTool as h, createHttpTransportHandler as i, createStdioTransportHandler as l, HttpTransportHandler as m, createServer$1 as n, createProxyIoCContainer as o, SseTransportHandler as p, createSessionServer as r, createSseTransportHandler as s, TRANSPORT_MODE as t, initializeSharedServices as u, SkillService as v, generateServerId as w, McpClientManagerService as x, StopServerService as y };