@agimon-ai/mcp-proxy 0.7.2 → 0.8.0

package/dist/{src-BXEt-Hpg.cjs → src-dZuRf3Wt.cjs}

@@ -1,4 +1,4 @@
-//#region rolldown:runtime
+//#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -6,16 +6,12 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
+	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+		key = keys[i];
+		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+			get: ((k) => from[k]).bind(null, key),
+			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+		});
 	}
 	return to;
 };
@@ -23,37 +19,35 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-
 //#endregion
-let __modelcontextprotocol_sdk_server_index_js = require("@modelcontextprotocol/sdk/server/index.js");
-let __modelcontextprotocol_sdk_types_js = require("@modelcontextprotocol/sdk/types.js");
+let _agimon_ai_foundation_validator = require("@agimon-ai/foundation-validator");
+let _modelcontextprotocol_sdk_server_index_js = require("@modelcontextprotocol/sdk/server/index.js");
+let _modelcontextprotocol_sdk_types_js = require("@modelcontextprotocol/sdk/types.js");
+let zod = require("zod");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
 let js_yaml = require("js-yaml");
 js_yaml = __toESM(js_yaml);
-let zod = require("zod");
 let node_crypto = require("node:crypto");
 let node_os = require("node:os");
 let node_path = require("node:path");
-let __agimon_ai_log_sink_mcp = require("@agimon-ai/log-sink-mcp");
-let __modelcontextprotocol_sdk_client_index_js = require("@modelcontextprotocol/sdk/client/index.js");
-let __modelcontextprotocol_sdk_client_sse_js = require("@modelcontextprotocol/sdk/client/sse.js");
-let __modelcontextprotocol_sdk_client_stdio_js = require("@modelcontextprotocol/sdk/client/stdio.js");
-let __modelcontextprotocol_sdk_client_streamableHttp_js = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
+let _agimon_ai_log_sink_mcp = require("@agimon-ai/log-sink-mcp");
+let _modelcontextprotocol_sdk_client_index_js = require("@modelcontextprotocol/sdk/client/index.js");
+let _modelcontextprotocol_sdk_client_sse_js = require("@modelcontextprotocol/sdk/client/sse.js");
+let _modelcontextprotocol_sdk_client_stdio_js = require("@modelcontextprotocol/sdk/client/stdio.js");
+let _modelcontextprotocol_sdk_client_streamableHttp_js = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
 let node_child_process = require("node:child_process");
 let liquidjs = require("liquidjs");
 let node_events = require("node:events");
 let node_http = require("node:http");
 let node_util = require("node:util");
-let __hono_node_server = require("@hono/node-server");
-let __modelcontextprotocol_sdk_server_streamableHttp_js = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
+let _hono_node_server = require("@hono/node-server");
+let _modelcontextprotocol_sdk_server_streamableHttp_js = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
 let hono = require("hono");
-let __modelcontextprotocol_sdk_server_sse_js = require("@modelcontextprotocol/sdk/server/sse.js");
-let __modelcontextprotocol_sdk_server_stdio_js = require("@modelcontextprotocol/sdk/server/stdio.js");
-
+let _modelcontextprotocol_sdk_server_sse_js = require("@modelcontextprotocol/sdk/server/sse.js");
+let _modelcontextprotocol_sdk_server_stdio_js = require("@modelcontextprotocol/sdk/server/stdio.js");
 //#region package.json
-var version = "0.7.1";
-
+var version = "0.7.3";
 //#endregion
 //#region src/utils/mcpConfigSchema.ts
 /**
@@ -448,7 +442,6 @@ function parseMcpConfig(rawConfig) {
 	const internalConfig = transformClaudeCodeConfig(ClaudeCodeMcpConfigSchema.parse(rawConfig));
 	return InternalMcpConfigSchema.parse(internalConfig);
 }
-
 //#endregion
 //#region src/services/RemoteConfigCacheService.ts
 /**
@@ -675,7 +668,6 @@ var RemoteConfigCacheService = class {
 		this.writeEnabled = enabled;
 	}
 };
-
 //#endregion
 //#region src/services/ConfigFetcherService.ts
 /**
@@ -902,7 +894,6 @@ var ConfigFetcherService = class {
 		return this.cachedConfig !== null && now - this.lastFetchTime < this.cacheTtlMs;
 	}
 };
-
 //#endregion
 //#region src/constants/index.ts
 /**
@@ -922,17 +913,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
 /**
@@ -985,7 +965,6 @@ function findConfigFile() {
 	}
 	return null;
 }
-
 //#endregion
 //#region src/utils/parseToolName.ts
 /**
@@ -1007,7 +986,6 @@ function parseToolName(toolName) {
 	};
 	return { actualToolName: toolName };
 }
-
 //#endregion
 //#region src/utils/parseFrontMatter.ts
 /**
@@ -1141,7 +1119,6 @@ function extractSkillFrontMatter(content) {
 	};
 	return null;
 }
-
 //#endregion
 //#region src/utils/generateServerId.ts
 /**
@@ -1206,7 +1183,6 @@ function generateServerId(length = DEFAULT_ID_LENGTH) {
 	}
 	return result;
 }
-
 //#endregion
 //#region src/services/DefinitionsCacheService.ts
 /**
@@ -1365,6 +1341,9 @@ var DefinitionsCacheService = class {
 	async getServersForTool(toolName) {
 		return (await this.getServerDefinitions()).filter((serverDefinition) => serverDefinition.tools.some((tool) => tool.name === toolName)).map((serverDefinition) => serverDefinition.serverName);
 	}
+	async getToolSchema(serverName, toolName) {
+		return (await this.getDefinitions()).servers[serverName]?.tools.find((t) => t.name === toolName)?.inputSchema;
+	}
 	async getServersForResource(uri) {
 		return (await this.getServerDefinitions()).filter((serverDefinition) => serverDefinition.resources.some((resource) => resource.uri === uri)).map((serverDefinition) => serverDefinition.serverName);
 	}
@@ -1502,7 +1481,6 @@ var DefinitionsCacheService = class {
 		return promptSkills;
 	}
 };
-
 //#endregion
 //#region src/services/logger.ts
 function isRecord(value) {
@@ -1545,7 +1523,7 @@ function createLoggerFacade(handle) {
 	};
 }
 async function createProxyLogger(options = {}) {
-	return createLoggerFacade(await (0, __agimon_ai_log_sink_mcp.createNodeTelemetry)({
+	return createLoggerFacade(await (0, _agimon_ai_log_sink_mcp.createNodeTelemetry)({
 		env: options.env,
 		workspaceRoot: options.workspaceRoot,
 		serviceName: options.serviceName ?? "@agimon-ai/mcp-proxy",
@@ -1556,7 +1534,6 @@ async function createProxyLogger(options = {}) {
 		maxFileCount: options.maxFileCount
 	}));
 }
-
 //#endregion
 //#region src/services/McpClientManagerService.ts
 /** Default connection timeout in milliseconds (30 seconds) */
@@ -1628,8 +1605,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;
@@ -1758,7 +1735,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$2) => {
+				killPromises.push(new Promise((resolve) => {
 					setTimeout(() => {
 						try {
 							if (!childProcess.killed) {
@@ -1766,7 +1743,7 @@ var McpClientManagerService = class {
 								childProcess.kill("SIGKILL");
 							}
 						} catch {}
-						resolve$2();
+						resolve();
 					}, 1e3);
 				}));
 			}
@@ -1809,8 +1786,8 @@ var McpClientManagerService = class {
 	}
 	async createConnection(serverName, config) {
 		const timeoutMs = config.timeout ?? DEFAULT_CONNECTION_TIMEOUT_MS;
-		const client = new __modelcontextprotocol_sdk_client_index_js.Client({
-			name: `@agimon-ai/mcp-proxy-client`,
+		const client = new _modelcontextprotocol_sdk_client_index_js.Client({
+			name: "@agimon-ai/mcp-proxy-client",
 			version: "0.1.0"
 		}, { capabilities: {} });
 		const mcpClient = new McpClient(serverName, config.transport, client, this.logger, {
@@ -1824,7 +1801,7 @@ var McpClientManagerService = class {
 			mcpClient.setConnected(true);
 			if (config.transport === "http" || config.transport === "sse") mcpClient.setReconnectFn(async () => {
 				try {
-					const newClient = new __modelcontextprotocol_sdk_client_index_js.Client({
+					const newClient = new _modelcontextprotocol_sdk_client_index_js.Client({
 						name: "@agimon-ai/mcp-proxy-client",
 						version: "0.1.0"
 					}, { capabilities: {} });
@@ -1859,7 +1836,7 @@ var McpClientManagerService = class {
 		else throw new Error(`Unsupported transport type: ${config.transport}`);
 	}
 	async connectStdioClient(mcpClient, config) {
-		const transport = new __modelcontextprotocol_sdk_client_stdio_js.StdioClientTransport({
+		const transport = new _modelcontextprotocol_sdk_client_stdio_js.StdioClientTransport({
 			command: config.command,
 			args: config.args,
 			env: {
@@ -1872,11 +1849,11 @@ var McpClientManagerService = class {
 		if (childProcess) mcpClient.setChildProcess(childProcess);
 	}
 	async connectHttpClient(mcpClient, config) {
-		const transport = new __modelcontextprotocol_sdk_client_streamableHttp_js.StreamableHTTPClientTransport(new URL(config.url), { requestInit: config.headers ? { headers: config.headers } : void 0 });
+		const transport = new _modelcontextprotocol_sdk_client_streamableHttp_js.StreamableHTTPClientTransport(new URL(config.url), { requestInit: config.headers ? { headers: config.headers } : void 0 });
 		await mcpClient["client"].connect(transport);
 	}
 	async connectSseClient(mcpClient, config) {
-		const transport = new __modelcontextprotocol_sdk_client_sse_js.SSEClientTransport(new URL(config.url));
+		const transport = new _modelcontextprotocol_sdk_client_sse_js.SSEClientTransport(new URL(config.url));
 		await mcpClient["client"].connect(transport);
 	}
 	/**
@@ -1917,7 +1894,6 @@ var McpClientManagerService = class {
 		return this.clients.has(serverName);
 	}
 };
-
 //#endregion
 //#region src/services/RuntimeStateService.ts
 /**
@@ -2019,24 +1995,10 @@ var RuntimeStateService = class RuntimeStateService {
 		await (0, node_fs_promises.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. */
@@ -2045,35 +2007,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
 /**
@@ -2092,7 +2031,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.
@@ -2102,9 +2041,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
 /**
@@ -2116,14 +2054,14 @@ function isShutdownResponse(value) {
 */
 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}`;
+	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$2) => {
-		setTimeout(resolve$2, delayMs);
+	return new Promise((resolve) => {
+		setTimeout(resolve, delayMs);
 	});
 }
 /**
@@ -2142,7 +2080,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) {
@@ -2188,7 +2126,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.");
@@ -2227,8 +2165,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}.`);
 	}
@@ -2256,7 +2194,6 @@ var StopServerService = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/services/SkillService.ts
 /**
@@ -2613,54 +2550,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
@@ -2672,13 +2569,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
 /**
@@ -2738,7 +2632,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) {
@@ -2827,21 +2721,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,
@@ -2849,29 +2743,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
@@ -2898,18 +2792,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;
@@ -2926,7 +2820,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;
@@ -2943,11 +2837,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;
@@ -2959,7 +2853,7 @@ var PrefetchService = class {
 	* @returns Promise with success status and output
 	*/
 	runCommand(command, args) {
-		return new Promise((resolve$2) => {
+		return new Promise((resolve) => {
 			const proc = (0, node_child_process.spawn)(command, args, {
 				stdio: [
 					STDIO_IGNORE,
@@ -2977,13 +2871,13 @@ var PrefetchService = class {
 				stderr += data.toString();
 			});
 			proc.on("close", (code) => {
-				resolve$2({
-					success: code === EXIT_CODE_SUCCESS,
+				resolve({
+					success: code === 0,
 					output: stdout || stderr
 				});
 			});
 			proc.on("error", (error) => {
-				resolve$2({
+				resolve({
 					success: false,
 					output: error.message
 				});
@@ -2991,11 +2885,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 name=\"{{ 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";
-
+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
 /**
@@ -3010,6 +2902,11 @@ function formatSkillInstructions(name, instructions) {
 	return `<command-message>The "${name}" skill is loading</command-message>\n${instructions}`;
 }
 /**
+* Input schema for the DescribeToolsTool
+* @property toolNames - Array of tool names to get detailed information about
+*/
+const DescribeToolsToolInputSchema = zod.z.object({ toolNames: zod.z.array(zod.z.string().min(1)).min(1).describe("List of tool names to get detailed information about") });
+/**
 * DescribeToolsTool provides progressive disclosure of MCP tools and skills.
 *
 * This tool lists available tools from all connected MCP servers and skills
@@ -3045,7 +2942,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);
 	}
 	/**
@@ -3161,7 +3058,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) {
@@ -3266,25 +3163,124 @@ var DescribeToolsTool = class DescribeToolsTool {
 	*
 	* @returns Tool definition with description and input schema
 	*/
+	getInputSchema() {
+		return DescribeToolsToolInputSchema;
+	}
 	async getDefinition() {
 		const { content } = await this.buildToolkitDescription();
 		return {
 			name: DescribeToolsTool.TOOL_NAME,
 			description: content,
-			inputSchema: {
-				type: "object",
-				properties: { toolNames: {
-					type: "array",
-					items: {
-						type: "string",
-						minLength: 1
-					},
-					description: "List of tool names to get detailed information about",
-					minItems: 1
-				} },
-				required: ["toolNames"],
-				additionalProperties: false
+			inputSchema: zod.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
 		};
 	}
 	/**
@@ -3298,10 +3294,9 @@ var DescribeToolsTool = class DescribeToolsTool {
 	* @param input - Object containing toolNames array
 	* @returns CallToolResult with tool/skill descriptions or error
 	*/
-	async execute(input) {
+	async execute(rawInput) {
 		try {
-			const { toolNames } = input;
-			const serverDefinitions = await this.definitionsCacheService.getServerDefinitions();
+			const { toolNames } = DescribeToolsToolInputSchema.parse(rawInput);
 			if (!toolNames || toolNames.length === 0) return {
 				content: [{
 					type: "text",
@@ -3309,119 +3304,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",
@@ -3459,7 +3348,6 @@ var DescribeToolsTool = class DescribeToolsTool {
 		}
 	}
 };
-
 //#endregion
 //#region src/utils/toolCapabilities.ts
 const TOOL_CAPABILITIES_META_KEY = "agiflowai/capabilities";
@@ -3471,9 +3359,12 @@ 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 = zod.z.object({
+	capability: zod.z.string().optional().describe("Optional capability filter. Matches explicit capability tags first, then server summaries, server names, tool names, and tool descriptions."),
+	serverName: zod.z.string().optional().describe("Optional server name filter.")
+});
 var SearchListToolsTool = class SearchListToolsTool {
 	static TOOL_NAME = "list_tools";
 	constructor(_clientManager, definitionsCacheService) {
@@ -3483,6 +3374,9 @@ var SearchListToolsTool = class SearchListToolsTool {
 	formatToolName(toolName, serverName, toolToServers) {
 		return (toolToServers.get(toolName) || []).length > 1 ? `${serverName}__${toolName}` : toolName;
 	}
+	getInputSchema() {
+		return SearchListToolsToolInputSchema;
+	}
 	async getDefinition() {
 		const serverDefinitions = await this.definitionsCacheService.getServerDefinitions();
 		const capabilitySummary = serverDefinitions.length > 0 ? serverDefinitions.map((server) => {
@@ -3493,23 +3387,11 @@ var SearchListToolsTool = class SearchListToolsTool {
 		return {
 			name: SearchListToolsTool.TOOL_NAME,
 			description: `Search proxied MCP tools by server capability summary.\n\nAvailable capabilities:\n${capabilitySummary}`,
-			inputSchema: {
-				type: "object",
-				properties: {
-					capability: {
-						type: "string",
-						description: "Optional capability filter. Matches explicit capability tags first, then server summaries, server names, tool names, and tool descriptions."
-					},
-					serverName: {
-						type: "string",
-						description: "Optional server name filter."
-					}
-				},
-				additionalProperties: false
-			}
+			inputSchema: zod.z.toJSONSchema(SearchListToolsToolInputSchema, { reused: "inline" })
 		};
 	}
-	async execute(input) {
+	async execute(rawInput) {
+		const input = SearchListToolsToolInputSchema.parse(rawInput);
 		const serverDefinitions = await this.definitionsCacheService.getServerDefinitions();
 		const capabilityFilter = input.capability?.trim().toLowerCase();
 		const serverNameFilter = input.serverName?.trim().toLowerCase();
@@ -3538,20 +3420,51 @@ 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
 /**
+* UseToolTool - Progressive disclosure tool for calling MCP tools and skills
+*
+* DESIGN PATTERNS:
+* - Tool pattern with getDefinition() and execute() methods
+* - Dependency injection for client manager and skill service
+* - Progressive disclosure pattern
+* - Proxy pattern for forwarding tool calls
+*
+* CODING STANDARDS:
+* - Implement Tool interface from ../types
+* - Use TOOL_NAME constant with snake_case
+* - Return CallToolResult with content array
+* - Handle errors with isError flag
+*
+* AVOID:
+* - Complex business logic in execute method
+* - Unhandled promise rejections
+* - Missing error handling
+*
+* NAMING CONVENTIONS:
+* - Tools from MCP servers use serverName__toolName format when clashing
+* - Skills use skill__skillName format (skill__ prefix)
+*/
+/**
+* Input schema for UseToolTool
+* @property toolName - Name of the tool or skill to execute
+* @property toolArgs - Arguments to pass to the tool (from describe_tools schema)
+*/
+const UseToolToolInputSchema = zod.z.object({
+	toolName: zod.z.string().min(1).describe("Name of the tool to execute"),
+	toolArgs: zod.z.record(zod.z.string(), zod.z.unknown()).optional().describe("Arguments to pass to the tool, as discovered from describe_tools")
+});
+/**
 * UseToolTool executes MCP tools and skills with proper error handling.
 *
 * This tool supports three invocation patterns:
@@ -3581,7 +3494,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.
@@ -3591,6 +3504,9 @@ var UseToolTool = class UseToolTool {
 	*
 	* @returns The tool definition conforming to MCP spec
 	*/
+	getInputSchema() {
+		return UseToolToolInputSchema;
+	}
 	getDefinition() {
 		return {
 			name: UseToolTool.TOOL_NAME,
@@ -3600,22 +3516,7 @@ var UseToolTool = class UseToolTool {
 
 IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverId}".
 `,
-			inputSchema: {
-				type: "object",
-				properties: {
-					toolName: {
-						type: "string",
-						description: "Name of the tool to execute",
-						minLength: 1
-					},
-					toolArgs: {
-						type: "object",
-						description: "Arguments to pass to the tool, as discovered from describe_tools"
-					}
-				},
-				required: ["toolName"],
-				additionalProperties: false
-			}
+			inputSchema: zod.z.toJSONSchema(UseToolToolInputSchema, { reused: "inline" })
 		};
 	}
 	/**
@@ -3628,6 +3529,16 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 	* @param skill - The skill that was requested
 	* @returns CallToolResult with guidance message
 	*/
+	/**
+	* Coerce toolArgs using the downstream tool's cached JSON Schema.
+	* Converts the schema to Zod and runs coerceArgs so that string-encoded
+	* objects/arrays are parsed before being forwarded to the downstream server.
+	*/
+	async coerceToolArgs(serverName, toolName, toolArgs) {
+		const jsonSchema = await this.definitionsCacheService.getToolSchema(serverName, toolName);
+		if (!jsonSchema) return toolArgs;
+		return (0, _agimon_ai_foundation_validator.coerceArgs)(toolArgs, (0, _agimon_ai_foundation_validator.jsonSchemaToZod)(jsonSchema));
+	}
 	executeSkill(skill) {
 		return { content: [{
 			type: "text",
@@ -3673,11 +3584,11 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 	* @param input - The tool/skill name and optional arguments
 	* @returns CallToolResult with execution output or error
 	*/
-	async execute(input) {
+	async execute(rawInput) {
 		try {
-			const { toolName: inputToolName, toolArgs = {} } = input;
-			if (inputToolName.startsWith(SKILL_PREFIX)) {
-				const skillName = inputToolName.slice(SKILL_PREFIX.length);
+			const { toolName: inputToolName, toolArgs = {} } = UseToolToolInputSchema.parse(rawInput);
+			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);
@@ -3704,7 +3615,8 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 					isError: true
 				};
 				const reqTimeout = this.clientManager.getServerRequestTimeout(serverName);
-				return await client.callTool(actualToolName, toolArgs, reqTimeout ? { timeout: reqTimeout } : void 0);
+				const coercedArgs = await this.coerceToolArgs(serverName, actualToolName, toolArgs);
+				return await client.callTool(actualToolName, coercedArgs, reqTimeout ? { timeout: reqTimeout } : void 0);
 			} catch (error) {
 				return {
 					content: [{
@@ -3714,7 +3626,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);
@@ -3741,7 +3658,8 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 				const targetServerName = matchingServers[0];
 				const client = await this.clientManager.ensureConnected(targetServerName);
 				const targetReqTimeout = this.clientManager.getServerRequestTimeout(targetServerName);
-				return await client.callTool(actualToolName, toolArgs, targetReqTimeout ? { timeout: targetReqTimeout } : void 0);
+				const coercedArgs = await this.coerceToolArgs(targetServerName, actualToolName, toolArgs);
+				return await client.callTool(actualToolName, coercedArgs, targetReqTimeout ? { timeout: targetReqTimeout } : void 0);
 			} catch (error) {
 				return {
 					content: [{
@@ -3762,7 +3680,6 @@ IMPORTANT: Only use tools discovered from describe_tools with id="${this.serverI
 		}
 	}
 };
-
 //#endregion
 //#region src/transports/http.ts
 /**
@@ -3904,13 +3821,13 @@ var AdminRateLimiter = class {
 * Parse JSON body from IncomingMessage
 */
 async function parseJsonBody$1(req) {
-	return new Promise((resolve$2, 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$2(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)}`));
 			}
@@ -3998,24 +3915,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,
@@ -4057,9 +3974,9 @@ var HttpTransportHandler = class {
 		const body = await parseJsonBody$1(req);
 		let transport;
 		if (sessionId && this.sessionManager.hasSession(sessionId)) transport = this.sessionManager.getSession(sessionId).transport;
-		else if (!sessionId && (0, __modelcontextprotocol_sdk_types_js.isInitializeRequest)(body)) {
+		else if (!sessionId && (0, _modelcontextprotocol_sdk_types_js.isInitializeRequest)(body)) {
 			const mcpServer = await this.serverFactory();
-			transport = new __modelcontextprotocol_sdk_server_streamableHttp_js.StreamableHTTPServerTransport({
+			transport = new _modelcontextprotocol_sdk_server_streamableHttp_js.StreamableHTTPServerTransport({
 				sessionIdGenerator: () => (0, node_crypto.randomUUID)(),
 				enableJsonResponse: true,
 				onsessioninitialized: (initializedSessionId) => {
@@ -4126,7 +4043,7 @@ var HttpTransportHandler = class {
 	}
 	async start() {
 		try {
-			const honoHandler = (0, __hono_node_server.getRequestListener)(this.honoApp.fetch);
+			const honoHandler = (0, _hono_node_server.getRequestListener)(this.honoApp.fetch);
 			const server = (0, node_http.createServer)(async (req, res) => {
 				if (new URL(req.url ?? "/", `http://${req.headers.host ?? this.config.host}`).pathname === "/mcp") await this.handleMcpRequest(req, res);
 				else honoHandler(req, res);
@@ -4171,7 +4088,6 @@ var HttpTransportHandler = class {
 		return this.config.host;
 	}
 };
-
 //#endregion
 //#region src/transports/sse.ts
 /**
@@ -4241,13 +4157,13 @@ var SseSessionManager = class {
 * Parse JSON body from IncomingMessage
 */
 async function parseJsonBody(req) {
-	return new Promise((resolve$2, 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$2(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)}`));
 			}
@@ -4290,7 +4206,7 @@ var SseTransportHandler = class {
 	async handleSseConnection(res) {
 		try {
 			const mcpServer = this.serverFactory();
-			const transport = new __modelcontextprotocol_sdk_server_sse_js.SSEServerTransport("/messages", res);
+			const transport = new _modelcontextprotocol_sdk_server_sse_js.SSEServerTransport("/messages", res);
 			this.sessionManager.setSession(transport.sessionId, transport, mcpServer);
 			res.on("close", () => {
 				const sessionId = transport.sessionId;
@@ -4331,9 +4247,9 @@ var SseTransportHandler = class {
 		}
 	}
 	async start() {
-		return new Promise((resolve$2, reject) => {
+		return new Promise((resolve, reject) => {
 			try {
-				const honoHandler = (0, __hono_node_server.getRequestListener)(this.honoApp.fetch);
+				const honoHandler = (0, _hono_node_server.getRequestListener)(this.honoApp.fetch);
 				const server = (0, node_http.createServer)(async (req, res) => {
 					const url = new URL(req.url ?? "/", `http://${req.headers.host ?? this.config.host}`);
 					const method = req.method?.toUpperCase();
@@ -4346,7 +4262,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$2();
+					resolve();
 				});
 				server.on("error", (error) => {
 					reject(error);
@@ -4358,7 +4274,7 @@ var SseTransportHandler = class {
 		});
 	}
 	async stop() {
-		return new Promise((resolve$2, reject) => {
+		return new Promise((resolve, reject) => {
 			if (this.server) {
 				const server = this.server;
 				(async () => {
@@ -4368,14 +4284,14 @@ var SseTransportHandler = class {
 							if (err) reject(err);
 							else {
 								this.server = null;
-								resolve$2();
+								resolve();
 							}
 						});
 					} catch (error) {
 						reject(error);
 					}
 				})();
-			} else resolve$2();
+			} else resolve();
 		});
 	}
 	getPort() {
@@ -4385,7 +4301,6 @@ var SseTransportHandler = class {
 		return this.config.host;
 	}
 };
-
 //#endregion
 //#region src/transports/stdio.ts
 /**
@@ -4401,7 +4316,7 @@ var StdioTransportHandler = class {
 		this.logger = logger;
 	}
 	async start() {
-		this.transport = new __modelcontextprotocol_sdk_server_stdio_js.StdioServerTransport();
+		this.transport = new _modelcontextprotocol_sdk_server_stdio_js.StdioServerTransport();
 		await this.server.connect(this.transport);
 		this.logger.info("@agimon-ai/mcp-proxy MCP server started on stdio");
 	}
@@ -4412,7 +4327,6 @@ var StdioTransportHandler = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/transports/stdio-http.ts
 /**
@@ -4474,7 +4388,7 @@ var StdioHttpTransportHandler = class {
 			this.httpClient = client;
 			this.stdioProxyServer = this.createProxyServer();
 			this.registerElicitationHandler(client);
-			this.stdioTransport = new __modelcontextprotocol_sdk_server_stdio_js.StdioServerTransport();
+			this.stdioTransport = new _modelcontextprotocol_sdk_server_stdio_js.StdioServerTransport();
 			await this.stdioProxyServer.connect(this.stdioTransport);
 			this.logger.info(`@agimon-ai/mcp-proxy MCP stdio proxy connected to ${this.endpoint.toString()}`);
 		} catch (error) {
@@ -4516,8 +4430,8 @@ var StdioHttpTransportHandler = class {
 		if (cleanupErrors.length > 0) throw new Error(`Failed to stop stdio-http proxy transport: ${cleanupErrors.join("; ")}`);
 	}
 	async createAndConnectClient() {
-		const httpClientTransport = new __modelcontextprotocol_sdk_client_streamableHttp_js.StreamableHTTPClientTransport(this.endpoint);
-		const client = new __modelcontextprotocol_sdk_client_index_js.Client({
+		const httpClientTransport = new _modelcontextprotocol_sdk_client_streamableHttp_js.StreamableHTTPClientTransport(this.endpoint);
+		const client = new _modelcontextprotocol_sdk_client_index_js.Client({
 			name: "@agimon-ai/mcp-proxy-stdio-http-proxy",
 			version: "0.1.0"
 		}, { capabilities: { elicitation: {} } });
@@ -4527,14 +4441,14 @@ var StdioHttpTransportHandler = class {
 	registerElicitationHandler(client) {
 		const proxyServer = this.stdioProxyServer;
 		if (!proxyServer) return;
-		client.setRequestHandler(__modelcontextprotocol_sdk_types_js.ElicitRequestSchema, async (request) => {
+		client.setRequestHandler(_modelcontextprotocol_sdk_types_js.ElicitRequestSchema, async (request) => {
 			return await proxyServer.elicitInput(request.params);
 		});
 	}
 	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$2) => setTimeout(resolve$2, delay));
+			await new Promise((resolve) => setTimeout(resolve, delay));
 			try {
 				await this.httpClient?.close().catch(() => void 0);
 				const client = await this.createAndConnectClient();
@@ -4561,7 +4475,7 @@ var StdioHttpTransportHandler = class {
 		}
 	}
 	createProxyServer() {
-		const proxyServer = new __modelcontextprotocol_sdk_server_index_js.Server({
+		const proxyServer = new _modelcontextprotocol_sdk_server_index_js.Server({
 			name: "@agimon-ai/mcp-proxy-stdio-http-proxy",
 			version: "0.1.0"
 		}, { capabilities: {
@@ -4569,14 +4483,14 @@ var StdioHttpTransportHandler = class {
 			resources: {},
 			prompts: {}
 		} });
-		proxyServer.setRequestHandler(__modelcontextprotocol_sdk_types_js.ListToolsRequestSchema, async () => {
+		proxyServer.setRequestHandler(_modelcontextprotocol_sdk_types_js.ListToolsRequestSchema, async () => {
 			try {
 				return await this.withReconnect(() => this.httpClient.listTools());
 			} catch (error) {
 				throw new Error(`Failed forwarding tools/list to HTTP backend: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		});
-		proxyServer.setRequestHandler(__modelcontextprotocol_sdk_types_js.CallToolRequestSchema, async (request) => {
+		proxyServer.setRequestHandler(_modelcontextprotocol_sdk_types_js.CallToolRequestSchema, async (request) => {
 			try {
 				return await this.withReconnect(() => this.httpClient.callTool({
 					name: request.params.name,
@@ -4586,28 +4500,28 @@ var StdioHttpTransportHandler = class {
 				throw new Error(`Failed forwarding tools/call (${request.params.name}) to HTTP backend: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		});
-		proxyServer.setRequestHandler(__modelcontextprotocol_sdk_types_js.ListResourcesRequestSchema, async () => {
+		proxyServer.setRequestHandler(_modelcontextprotocol_sdk_types_js.ListResourcesRequestSchema, async () => {
 			try {
 				return await this.withReconnect(() => this.httpClient.listResources());
 			} catch (error) {
 				throw new Error(`Failed forwarding resources/list to HTTP backend: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		});
-		proxyServer.setRequestHandler(__modelcontextprotocol_sdk_types_js.ReadResourceRequestSchema, async (request) => {
+		proxyServer.setRequestHandler(_modelcontextprotocol_sdk_types_js.ReadResourceRequestSchema, async (request) => {
 			try {
 				return await this.withReconnect(() => this.httpClient.readResource({ uri: request.params.uri }));
 			} catch (error) {
 				throw new Error(`Failed forwarding resources/read (${request.params.uri}) to HTTP backend: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		});
-		proxyServer.setRequestHandler(__modelcontextprotocol_sdk_types_js.ListPromptsRequestSchema, async () => {
+		proxyServer.setRequestHandler(_modelcontextprotocol_sdk_types_js.ListPromptsRequestSchema, async () => {
 			try {
 				return await this.withReconnect(() => this.httpClient.listPrompts());
 			} catch (error) {
 				throw new Error(`Failed forwarding prompts/list to HTTP backend: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		});
-		proxyServer.setRequestHandler(__modelcontextprotocol_sdk_types_js.GetPromptRequestSchema, async (request) => {
+		proxyServer.setRequestHandler(_modelcontextprotocol_sdk_types_js.GetPromptRequestSchema, async (request) => {
 			try {
 				return await this.withReconnect(() => this.httpClient.getPrompt({
 					name: request.params.name,
@@ -4620,7 +4534,6 @@ var StdioHttpTransportHandler = class {
 		return proxyServer;
 	}
 };
-
 //#endregion
 //#region src/container/index.ts
 /**
@@ -4652,13 +4565,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$3) => {
-			return new StdioTransportHandler(await createServer$3(), logger);
+		createStdioTransportHandler: async (createServer) => {
+			return new StdioTransportHandler(await createServer(), logger);
 		},
-		createSseTransportHandler: async (createServer$3, config) => {
-			return new SseTransportHandler(await createServer$3(), config, logger);
+		createSseTransportHandler: async (createServer, config) => {
+			return new SseTransportHandler(await createServer(), config, logger);
 		},
-		createHttpTransportHandler: (createServer$3, config, adminOptions) => new HttpTransportHandler(createServer$3, config, adminOptions, logger),
+		createHttpTransportHandler: (createServer, config, adminOptions) => new HttpTransportHandler(createServer, config, adminOptions, logger),
 		createStdioHttpTransportHandler: (endpoint) => new StdioHttpTransportHandler({ endpoint }, logger)
 	};
 }
@@ -4795,22 +4708,22 @@ async function createProxyContainer(options) {
 /**
 * Create a sessionless stdio transport handler from the shared server factory.
 */
-async function createStdioTransportHandler(createServer$3) {
-	const server = await createServer$3();
+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$3, config) {
-	const server = await createServer$3();
+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$3, config, adminOptions) {
-	return createProxyIoCContainer().createHttpTransportHandler(createServer$3, config, adminOptions);
+function createHttpTransportHandler(createServer, config, adminOptions) {
+	return createProxyIoCContainer().createHttpTransportHandler(createServer, config, adminOptions);
 }
 /**
 * Create a stdio-http transport handler from an endpoint URL.
@@ -4824,7 +4737,6 @@ function createStdioHttpTransportHandler(endpoint) {
 async function initializeSharedServices(options) {
 	return createProxyContainer(options);
 }
-
 //#endregion
 //#region src/server/index.ts
 /**
@@ -4951,7 +4863,7 @@ function buildProxyInstructions(serverDefinitions, mode, includeSkillsTool) {
 */
 async function createSessionServer(shared) {
 	const { clientManager, definitionsCacheService, skillService, describeTools, useTool: useToolWithCache, searchListTools, serverId, proxyMode } = shared;
-	const server = new __modelcontextprotocol_sdk_server_index_js.Server({
+	const server = new _modelcontextprotocol_sdk_server_index_js.Server({
 		name: "@agimon-ai/mcp-proxy",
 		version: "0.1.0"
 	}, {
@@ -4962,7 +4874,7 @@ async function createSessionServer(shared) {
 		},
 		instructions: buildProxyInstructions(await definitionsCacheService.getServerDefinitions(), proxyMode, await hasAnySkills(definitionsCacheService, skillService))
 	});
-	server.setRequestHandler(__modelcontextprotocol_sdk_types_js.ListToolsRequestSchema, async () => ({ tools: proxyMode === "flat" ? await (async () => {
+	server.setRequestHandler(_modelcontextprotocol_sdk_types_js.ListToolsRequestSchema, async () => ({ tools: proxyMode === "flat" ? await (async () => {
 		const currentServerDefinitions = await definitionsCacheService.getServerDefinitions();
 		const shouldIncludeSkillsTool = await hasAnySkills(definitionsCacheService, skillService);
 		return [...buildFlatToolDefinitions(currentServerDefinitions), ...shouldIncludeSkillsTool ? [buildSkillsDescribeDefinition(currentServerDefinitions, serverId)] : []];
@@ -4973,30 +4885,36 @@ async function createSessionServer(shared) {
 			useToolWithCache.getDefinition()
 		];
 	})() : [await describeTools.getDefinition(), useToolWithCache.getDefinition()] }));
-	server.setRequestHandler(__modelcontextprotocol_sdk_types_js.CallToolRequestSchema, async (request) => {
+	server.setRequestHandler(_modelcontextprotocol_sdk_types_js.CallToolRequestSchema, async (request) => {
 		const { name, arguments: args } = request.params;
-		if (name === DescribeToolsTool.TOOL_NAME) try {
-			return await describeTools.execute(args);
-		} catch (error) {
-			throw new Error(`Failed to execute ${name}: ${error instanceof Error ? error.message : String(error)}`);
-		}
-		if (name === UseToolTool.TOOL_NAME) try {
-			return await useToolWithCache.execute(args);
-		} catch (error) {
-			throw new Error(`Failed to execute ${name}: ${error instanceof Error ? error.message : String(error)}`);
-		}
-		if (name === SearchListToolsTool.TOOL_NAME && proxyMode === "search") try {
-			return await searchListTools.execute(args);
-		} catch (error) {
-			throw new Error(`Failed to execute ${name}: ${error instanceof Error ? error.message : String(error)}`);
-		}
+		const executeWithCoercion = async (tool, toolName) => {
+			const coerced = (0, _agimon_ai_foundation_validator.coerceArgs)(args ?? {}, tool.getInputSchema());
+			try {
+				return await tool.execute(coerced);
+			} catch (error) {
+				if (error instanceof zod.z.ZodError) return {
+					content: [{
+						type: "text",
+						text: (0, _agimon_ai_foundation_validator.formatZodError)(error, {
+							schemaName: toolName,
+							schema: tool.getInputSchema()
+						})
+					}],
+					isError: true
+				};
+				throw new Error(`Failed to execute ${toolName}: ${error instanceof Error ? error.message : String(error)}`);
+			}
+		};
+		if (name === DescribeToolsTool.TOOL_NAME) return await executeWithCoercion(describeTools, name);
+		if (name === UseToolTool.TOOL_NAME) return await executeWithCoercion(useToolWithCache, name);
+		if (name === SearchListToolsTool.TOOL_NAME && proxyMode === "search") return await executeWithCoercion(searchListTools, name);
 		if (proxyMode === "flat") return await useToolWithCache.execute({
 			toolName: name,
 			toolArgs: args || {}
 		});
 		throw new Error(`Unknown tool: ${name}`);
 	});
-	server.setRequestHandler(__modelcontextprotocol_sdk_types_js.ListResourcesRequestSchema, async () => {
+	server.setRequestHandler(_modelcontextprotocol_sdk_types_js.ListResourcesRequestSchema, async () => {
 		const currentServerDefinitions = await definitionsCacheService.getServerDefinitions();
 		const resourceToServers = /* @__PURE__ */ new Map();
 		for (const serverDefinition of currentServerDefinitions) for (const resource of serverDefinition.resources) {
@@ -5013,7 +4931,7 @@ async function createSessionServer(shared) {
 		}
 		return { resources };
 	});
-	server.setRequestHandler(__modelcontextprotocol_sdk_types_js.ReadResourceRequestSchema, async (request) => {
+	server.setRequestHandler(_modelcontextprotocol_sdk_types_js.ReadResourceRequestSchema, async (request) => {
 		const { uri } = request.params;
 		const { serverName, actualToolName: actualUri } = parseToolName(uri);
 		if (serverName) return await (await clientManager.ensureConnected(serverName)).readResource(actualUri);
@@ -5022,7 +4940,7 @@ async function createSessionServer(shared) {
 		if (matchingServers.length > 1) throw new Error(`Resource "${actualUri}" exists on multiple servers: ${matchingServers.join(", ")}. Use the prefixed format (e.g., "${matchingServers[0]}__${actualUri}") to specify which server to use.`);
 		return await (await clientManager.ensureConnected(matchingServers[0])).readResource(actualUri);
 	});
-	server.setRequestHandler(__modelcontextprotocol_sdk_types_js.ListPromptsRequestSchema, async () => {
+	server.setRequestHandler(_modelcontextprotocol_sdk_types_js.ListPromptsRequestSchema, async () => {
 		const currentServerDefinitions = await definitionsCacheService.getServerDefinitions();
 		const promptToServers = /* @__PURE__ */ new Map();
 		const serverPromptsMap = /* @__PURE__ */ new Map();
@@ -5047,7 +4965,7 @@ async function createSessionServer(shared) {
 		}
 		return { prompts: aggregatedPrompts };
 	});
-	server.setRequestHandler(__modelcontextprotocol_sdk_types_js.GetPromptRequestSchema, async (request) => {
+	server.setRequestHandler(_modelcontextprotocol_sdk_types_js.GetPromptRequestSchema, async (request) => {
 		const { name, arguments: args } = request.params;
 		const currentServerDefinitions = await definitionsCacheService.getServerDefinitions();
 		const { serverName, actualToolName: actualPromptName } = parseToolName(name);
@@ -5069,7 +4987,6 @@ async function createSessionServer(shared) {
 async function createServer(options) {
 	return createSessionServer(await createProxyContainer(options));
 }
-
 //#endregion
 //#region src/types/index.ts
 /**
@@ -5080,173 +4997,172 @@ const TRANSPORT_MODE = {
 	HTTP: "http",
 	SSE: "sse"
 };
-
 //#endregion
-Object.defineProperty(exports, 'ConfigFetcherService', {
-  enumerable: true,
-  get: function () {
-    return ConfigFetcherService;
-  }
+Object.defineProperty(exports, "ConfigFetcherService", {
+	enumerable: true,
+	get: function() {
+		return ConfigFetcherService;
+	}
 });
-Object.defineProperty(exports, 'DefinitionsCacheService', {
-  enumerable: true,
-  get: function () {
-    return DefinitionsCacheService;
-  }
+Object.defineProperty(exports, "DefinitionsCacheService", {
+	enumerable: true,
+	get: function() {
+		return DefinitionsCacheService;
+	}
 });
-Object.defineProperty(exports, 'DescribeToolsTool', {
-  enumerable: true,
-  get: function () {
-    return DescribeToolsTool;
-  }
+Object.defineProperty(exports, "DescribeToolsTool", {
+	enumerable: true,
+	get: function() {
+		return DescribeToolsTool;
+	}
 });
-Object.defineProperty(exports, 'HttpTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return HttpTransportHandler;
-  }
+Object.defineProperty(exports, "HttpTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return HttpTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'McpClientManagerService', {
-  enumerable: true,
-  get: function () {
-    return McpClientManagerService;
-  }
+Object.defineProperty(exports, "McpClientManagerService", {
+	enumerable: true,
+	get: function() {
+		return McpClientManagerService;
+	}
+});
+Object.defineProperty(exports, "RuntimeStateService", {
+	enumerable: true,
+	get: function() {
+		return RuntimeStateService;
+	}
 });
-Object.defineProperty(exports, 'RuntimeStateService', {
-  enumerable: true,
-  get: function () {
-    return RuntimeStateService;
-  }
+Object.defineProperty(exports, "SearchListToolsTool", {
+	enumerable: true,
+	get: function() {
+		return SearchListToolsTool;
+	}
 });
-Object.defineProperty(exports, 'SearchListToolsTool', {
-  enumerable: true,
-  get: function () {
-    return SearchListToolsTool;
-  }
+Object.defineProperty(exports, "SkillService", {
+	enumerable: true,
+	get: function() {
+		return SkillService;
+	}
 });
-Object.defineProperty(exports, 'SkillService', {
-  enumerable: true,
-  get: function () {
-    return SkillService;
-  }
+Object.defineProperty(exports, "SseTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return SseTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'SseTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return SseTransportHandler;
-  }
+Object.defineProperty(exports, "StdioHttpTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return StdioHttpTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'StdioHttpTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return StdioHttpTransportHandler;
-  }
+Object.defineProperty(exports, "StdioTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return StdioTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'StdioTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return StdioTransportHandler;
-  }
+Object.defineProperty(exports, "StopServerService", {
+	enumerable: true,
+	get: function() {
+		return StopServerService;
+	}
 });
-Object.defineProperty(exports, 'StopServerService', {
-  enumerable: true,
-  get: function () {
-    return StopServerService;
-  }
+Object.defineProperty(exports, "TRANSPORT_MODE", {
+	enumerable: true,
+	get: function() {
+		return TRANSPORT_MODE;
+	}
 });
-Object.defineProperty(exports, 'TRANSPORT_MODE', {
-  enumerable: true,
-  get: function () {
-    return TRANSPORT_MODE;
-  }
+Object.defineProperty(exports, "UseToolTool", {
+	enumerable: true,
+	get: function() {
+		return UseToolTool;
+	}
 });
-Object.defineProperty(exports, 'UseToolTool', {
-  enumerable: true,
-  get: function () {
-    return UseToolTool;
-  }
+Object.defineProperty(exports, "__toESM", {
+	enumerable: true,
+	get: function() {
+		return __toESM;
+	}
 });
-Object.defineProperty(exports, '__toESM', {
-  enumerable: true,
-  get: function () {
-    return __toESM;
-  }
+Object.defineProperty(exports, "createHttpTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return createHttpTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'createHttpTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return createHttpTransportHandler;
-  }
+Object.defineProperty(exports, "createProxyContainer", {
+	enumerable: true,
+	get: function() {
+		return createProxyContainer;
+	}
 });
-Object.defineProperty(exports, 'createProxyContainer', {
-  enumerable: true,
-  get: function () {
-    return createProxyContainer;
-  }
+Object.defineProperty(exports, "createProxyIoCContainer", {
+	enumerable: true,
+	get: function() {
+		return createProxyIoCContainer;
+	}
 });
-Object.defineProperty(exports, 'createProxyIoCContainer', {
-  enumerable: true,
-  get: function () {
-    return createProxyIoCContainer;
-  }
+Object.defineProperty(exports, "createProxyLogger", {
+	enumerable: true,
+	get: function() {
+		return createProxyLogger;
+	}
 });
-Object.defineProperty(exports, 'createProxyLogger', {
-  enumerable: true,
-  get: function () {
-    return createProxyLogger;
-  }
+Object.defineProperty(exports, "createServer", {
+	enumerable: true,
+	get: function() {
+		return createServer;
+	}
 });
-Object.defineProperty(exports, 'createServer', {
-  enumerable: true,
-  get: function () {
-    return createServer;
-  }
+Object.defineProperty(exports, "createSessionServer", {
+	enumerable: true,
+	get: function() {
+		return createSessionServer;
+	}
 });
-Object.defineProperty(exports, 'createSessionServer', {
-  enumerable: true,
-  get: function () {
-    return createSessionServer;
-  }
+Object.defineProperty(exports, "createSseTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return createSseTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'createSseTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return createSseTransportHandler;
-  }
+Object.defineProperty(exports, "createStdioHttpTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return createStdioHttpTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'createStdioHttpTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return createStdioHttpTransportHandler;
-  }
+Object.defineProperty(exports, "createStdioTransportHandler", {
+	enumerable: true,
+	get: function() {
+		return createStdioTransportHandler;
+	}
 });
-Object.defineProperty(exports, 'createStdioTransportHandler', {
-  enumerable: true,
-  get: function () {
-    return createStdioTransportHandler;
-  }
+Object.defineProperty(exports, "findConfigFile", {
+	enumerable: true,
+	get: function() {
+		return findConfigFile;
+	}
 });
-Object.defineProperty(exports, 'findConfigFile', {
-  enumerable: true,
-  get: function () {
-    return findConfigFile;
-  }
+Object.defineProperty(exports, "generateServerId", {
+	enumerable: true,
+	get: function() {
+		return generateServerId;
+	}
 });
-Object.defineProperty(exports, 'generateServerId', {
-  enumerable: true,
-  get: function () {
-    return generateServerId;
-  }
+Object.defineProperty(exports, "initializeSharedServices", {
+	enumerable: true,
+	get: function() {
+		return initializeSharedServices;
+	}
 });
-Object.defineProperty(exports, 'initializeSharedServices', {
-  enumerable: true,
-  get: function () {
-    return initializeSharedServices;
-  }
+Object.defineProperty(exports, "version", {
+	enumerable: true,
+	get: function() {
+		return version;
+	}
 });
-Object.defineProperty(exports, 'version', {
-  enumerable: true,
-  get: function () {
-    return version;
-  }
-});