@agimon-ai/mcp-proxy 0.7.2 → 0.7.3

package/dist/cli.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const require_src = require('./src-BXEt-Hpg.cjs');
+const require_src = require('./src-Dp2m9_I_.cjs');
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
 let js_yaml = require("js-yaml");

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as DefinitionsCacheService, D as version, T as findConfigFile, b as RuntimeStateService, d as StdioHttpTransportHandler, f as StdioTransportHandler, m as HttpTransportHandler, n as createServer, o as createProxyIoCContainer, p as SseTransportHandler, r as createSessionServer, t as TRANSPORT_MODE, u as initializeSharedServices, w as generateServerId, y as StopServerService } from "./src-NZo_eM6U.mjs";
+import { C as DefinitionsCacheService, D as version, T as findConfigFile, b as RuntimeStateService, d as StdioHttpTransportHandler, f as StdioTransportHandler, m as HttpTransportHandler, n as createServer, o as createProxyIoCContainer, p as SseTransportHandler, r as createSessionServer, t as TRANSPORT_MODE, u as initializeSharedServices, w as generateServerId, y as StopServerService } from "./src-Y-cyyxaw.mjs";
 import { constants, existsSync, readFileSync } from "node:fs";
 import { access, writeFile } from "node:fs/promises";
 import yaml from "js-yaml";

package/dist/index.cjs

@@ -1,4 +1,4 @@
-const require_src = require('./src-BXEt-Hpg.cjs');
+const require_src = require('./src-Dp2m9_I_.cjs');
 
 exports.ConfigFetcherService = require_src.ConfigFetcherService;
 exports.DefinitionsCacheService = require_src.DefinitionsCacheService;

package/dist/index.d.cts

@@ -1,6 +1,7 @@
 import * as _modelcontextprotocol_sdk_server_index_js0 from "@modelcontextprotocol/sdk/server/index.js";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolResult, GetPromptResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { z } from "zod";
 import { NodeTelemetryHandle } from "@agimon-ai/log-sink-mcp";
 
 //#region src/types/index.d.ts
@@ -14,12 +15,7 @@ import { NodeTelemetryHandle } from "@agimon-ai/log-sink-mcp";
 interface ToolDefinition {
   name: string;
   description: string;
-  inputSchema: {
-    type: string;
-    properties: Record<string, unknown>;
-    required?: string[];
-    additionalProperties?: boolean;
-  };
+  inputSchema: Record<string, unknown>;
   _meta?: Record<string, unknown>;
 }
 /**
@@ -28,6 +24,7 @@ interface ToolDefinition {
  */
 interface Tool<TInput = unknown> {
   getDefinition(): ToolDefinition | Promise<ToolDefinition>;
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   execute(input: TInput): Promise<CallToolResult>;
 }
 /**
@@ -743,6 +740,7 @@ declare class DefinitionsCacheService {
   getDefinitions(): Promise<DefinitionsCacheFile>;
   getServerDefinitions(): Promise<CachedServerDefinition[]>;
   getServersForTool(toolName: string): Promise<string[]>;
+  getToolSchema(serverName: string, toolName: string): Promise<Record<string, unknown> | undefined>;
   getServersForResource(uri: string): Promise<string[]>;
   getPromptSkillByName(skillName: string): Promise<PromptSkillMatch | undefined>;
   getCachedFileSkills(): Promise<CachedFileSkillInfo[]>;
@@ -890,9 +888,10 @@ declare class StopServerService {
  * Input schema for the DescribeToolsTool
  * @property toolNames - Array of tool names to get detailed information about
  */
-interface DescribeToolsToolInput {
-  toolNames: string[];
-}
+declare const DescribeToolsToolInputSchema: z.ZodObject<{
+  toolNames: z.ZodArray<z.ZodString>;
+}, z.core.$strip>;
+type DescribeToolsToolInput = z.infer<typeof DescribeToolsToolInputSchema>;
 /**
  * DescribeToolsTool provides progressive disclosure of MCP tools and skills.
  *
@@ -998,6 +997,7 @@ declare class DescribeToolsTool implements Tool<DescribeToolsToolInput> {
    *
    * @returns Tool definition with description and input schema
    */
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   getDefinition(): Promise<ToolDefinition>;
   /**
    * Executes tool description lookup for the requested tool and skill names.
@@ -1010,22 +1010,24 @@ declare class DescribeToolsTool implements Tool<DescribeToolsToolInput> {
    * @param input - Object containing toolNames array
    * @returns CallToolResult with tool/skill descriptions or error
    */
-  execute(input: DescribeToolsToolInput): Promise<CallToolResult>;
+  execute(rawInput: Record<string, unknown>): Promise<CallToolResult>;
 }
 //#endregion
 //#region src/tools/SearchListToolsTool.d.ts
-interface SearchListToolsToolInput {
-  capability?: string;
-  serverName?: string;
-}
+declare const SearchListToolsToolInputSchema: z.ZodObject<{
+  capability: z.ZodOptional<z.ZodString>;
+  serverName: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type SearchListToolsToolInput = z.infer<typeof SearchListToolsToolInputSchema>;
 declare class SearchListToolsTool implements Tool<SearchListToolsToolInput> {
   private readonly _clientManager;
   private readonly definitionsCacheService;
   static readonly TOOL_NAME = "list_tools";
   constructor(_clientManager: unknown, definitionsCacheService: DefinitionsCacheService);
   private formatToolName;
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   getDefinition(): Promise<ToolDefinition>;
-  execute(input: SearchListToolsToolInput): Promise<CallToolResult>;
+  execute(rawInput: Record<string, unknown>): Promise<CallToolResult>;
 }
 //#endregion
 //#region src/tools/UseToolTool.d.ts
@@ -1034,10 +1036,11 @@ declare class SearchListToolsTool implements Tool<SearchListToolsToolInput> {
  * @property toolName - Name of the tool or skill to execute
  * @property toolArgs - Arguments to pass to the tool (from describe_tools schema)
  */
-interface UseToolToolInput {
-  toolName: string;
-  toolArgs?: Record<string, unknown>;
-}
+declare const UseToolToolInputSchema: z.ZodObject<{
+  toolName: z.ZodString;
+  toolArgs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, z.core.$strip>;
+type UseToolToolInput = z.infer<typeof UseToolToolInputSchema>;
 /**
  * UseToolTool executes MCP tools and skills with proper error handling.
  *
@@ -1073,6 +1076,7 @@ declare class UseToolTool implements Tool<UseToolToolInput> {
    *
    * @returns The tool definition conforming to MCP spec
    */
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   getDefinition(): ToolDefinition;
   /**
    * Returns guidance message for skill invocation.
@@ -1084,6 +1088,12 @@ declare class UseToolTool implements Tool<UseToolToolInput> {
    * @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.
+   */
+  private coerceToolArgs;
   private executeSkill;
   /**
    * Finds a prompt-based skill by name from all connected MCP servers.
@@ -1115,7 +1125,7 @@ declare class UseToolTool implements Tool<UseToolToolInput> {
    * @param input - The tool/skill name and optional arguments
    * @returns CallToolResult with execution output or error
    */
-  execute(input: UseToolToolInput): Promise<CallToolResult>;
+  execute(rawInput: Record<string, unknown>): Promise<CallToolResult>;
 }
 //#endregion
 //#region src/transports/http.d.ts

package/dist/index.d.mts

@@ -15,12 +15,7 @@ import { NodeTelemetryHandle } from "@agimon-ai/log-sink-mcp";
 interface ToolDefinition {
   name: string;
   description: string;
-  inputSchema: {
-    type: string;
-    properties: Record<string, unknown>;
-    required?: string[];
-    additionalProperties?: boolean;
-  };
+  inputSchema: Record<string, unknown>;
   _meta?: Record<string, unknown>;
 }
 /**
@@ -29,6 +24,7 @@ interface ToolDefinition {
  */
 interface Tool<TInput = unknown> {
   getDefinition(): ToolDefinition | Promise<ToolDefinition>;
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   execute(input: TInput): Promise<CallToolResult>;
 }
 /**
@@ -744,6 +740,7 @@ declare class DefinitionsCacheService {
   getDefinitions(): Promise<DefinitionsCacheFile>;
   getServerDefinitions(): Promise<CachedServerDefinition[]>;
   getServersForTool(toolName: string): Promise<string[]>;
+  getToolSchema(serverName: string, toolName: string): Promise<Record<string, unknown> | undefined>;
   getServersForResource(uri: string): Promise<string[]>;
   getPromptSkillByName(skillName: string): Promise<PromptSkillMatch | undefined>;
   getCachedFileSkills(): Promise<CachedFileSkillInfo[]>;
@@ -891,9 +888,10 @@ declare class StopServerService {
  * Input schema for the DescribeToolsTool
  * @property toolNames - Array of tool names to get detailed information about
  */
-interface DescribeToolsToolInput {
-  toolNames: string[];
-}
+declare const DescribeToolsToolInputSchema: z.ZodObject<{
+  toolNames: z.ZodArray<z.ZodString>;
+}, z.core.$strip>;
+type DescribeToolsToolInput = z.infer<typeof DescribeToolsToolInputSchema>;
 /**
  * DescribeToolsTool provides progressive disclosure of MCP tools and skills.
  *
@@ -999,6 +997,7 @@ declare class DescribeToolsTool implements Tool<DescribeToolsToolInput> {
    *
    * @returns Tool definition with description and input schema
    */
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   getDefinition(): Promise<ToolDefinition>;
   /**
    * Executes tool description lookup for the requested tool and skill names.
@@ -1011,22 +1010,24 @@ declare class DescribeToolsTool implements Tool<DescribeToolsToolInput> {
    * @param input - Object containing toolNames array
    * @returns CallToolResult with tool/skill descriptions or error
    */
-  execute(input: DescribeToolsToolInput): Promise<CallToolResult>;
+  execute(rawInput: Record<string, unknown>): Promise<CallToolResult>;
 }
 //#endregion
 //#region src/tools/SearchListToolsTool.d.ts
-interface SearchListToolsToolInput {
-  capability?: string;
-  serverName?: string;
-}
+declare const SearchListToolsToolInputSchema: z.ZodObject<{
+  capability: z.ZodOptional<z.ZodString>;
+  serverName: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+type SearchListToolsToolInput = z.infer<typeof SearchListToolsToolInputSchema>;
 declare class SearchListToolsTool implements Tool<SearchListToolsToolInput> {
   private readonly _clientManager;
   private readonly definitionsCacheService;
   static readonly TOOL_NAME = "list_tools";
   constructor(_clientManager: unknown, definitionsCacheService: DefinitionsCacheService);
   private formatToolName;
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   getDefinition(): Promise<ToolDefinition>;
-  execute(input: SearchListToolsToolInput): Promise<CallToolResult>;
+  execute(rawInput: Record<string, unknown>): Promise<CallToolResult>;
 }
 //#endregion
 //#region src/tools/UseToolTool.d.ts
@@ -1035,10 +1036,11 @@ declare class SearchListToolsTool implements Tool<SearchListToolsToolInput> {
  * @property toolName - Name of the tool or skill to execute
  * @property toolArgs - Arguments to pass to the tool (from describe_tools schema)
  */
-interface UseToolToolInput {
-  toolName: string;
-  toolArgs?: Record<string, unknown>;
-}
+declare const UseToolToolInputSchema: z.ZodObject<{
+  toolName: z.ZodString;
+  toolArgs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+}, z.core.$strip>;
+type UseToolToolInput = z.infer<typeof UseToolToolInputSchema>;
 /**
  * UseToolTool executes MCP tools and skills with proper error handling.
  *
@@ -1074,6 +1076,7 @@ declare class UseToolTool implements Tool<UseToolToolInput> {
    *
    * @returns The tool definition conforming to MCP spec
    */
+  getInputSchema(): z.ZodObject<z.ZodRawShape>;
   getDefinition(): ToolDefinition;
   /**
    * Returns guidance message for skill invocation.
@@ -1085,6 +1088,12 @@ declare class UseToolTool implements Tool<UseToolToolInput> {
    * @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.
+   */
+  private coerceToolArgs;
   private executeSkill;
   /**
    * Finds a prompt-based skill by name from all connected MCP servers.
@@ -1116,7 +1125,7 @@ declare class UseToolTool implements Tool<UseToolToolInput> {
    * @param input - The tool/skill name and optional arguments
    * @returns CallToolResult with execution output or error
    */
-  execute(input: UseToolToolInput): Promise<CallToolResult>;
+  execute(rawInput: Record<string, unknown>): Promise<CallToolResult>;
 }
 //#endregion
 //#region src/transports/http.d.ts

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { C as DefinitionsCacheService, E as ConfigFetcherService, S as createProxyLogger, T as findConfigFile, _ as DescribeToolsTool, a as createProxyContainer, b as RuntimeStateService, c as createStdioHttpTransportHandler, d as StdioHttpTransportHandler, f as StdioTransportHandler, g as SearchListToolsTool, h as UseToolTool, i as createHttpTransportHandler, l as createStdioTransportHandler, m as HttpTransportHandler, n as createServer, p as SseTransportHandler, r as createSessionServer, s as createSseTransportHandler, t as TRANSPORT_MODE, u as initializeSharedServices, v as SkillService, w as generateServerId, x as McpClientManagerService, y as StopServerService } from "./src-NZo_eM6U.mjs";
+import { C as DefinitionsCacheService, E as ConfigFetcherService, S as createProxyLogger, T as findConfigFile, _ as DescribeToolsTool, a as createProxyContainer, b as RuntimeStateService, c as createStdioHttpTransportHandler, d as StdioHttpTransportHandler, f as StdioTransportHandler, g as SearchListToolsTool, h as UseToolTool, i as createHttpTransportHandler, l as createStdioTransportHandler, m as HttpTransportHandler, n as createServer, p as SseTransportHandler, r as createSessionServer, s as createSseTransportHandler, t as TRANSPORT_MODE, u as initializeSharedServices, v as SkillService, w as generateServerId, x as McpClientManagerService, y as StopServerService } from "./src-Y-cyyxaw.mjs";
 
 export { ConfigFetcherService, DefinitionsCacheService, DescribeToolsTool, HttpTransportHandler, McpClientManagerService, RuntimeStateService, SearchListToolsTool, SkillService, SseTransportHandler, StdioHttpTransportHandler, StdioTransportHandler, StopServerService, TRANSPORT_MODE, UseToolTool, createHttpTransportHandler, createProxyContainer, createProxyLogger, createServer, createSessionServer, createSseTransportHandler, createStdioHttpTransportHandler, createStdioTransportHandler, findConfigFile, generateServerId, initializeSharedServices };

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

@@ -25,13 +25,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
+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");
@@ -52,7 +53,7 @@ let __modelcontextprotocol_sdk_server_sse_js = require("@modelcontextprotocol/sd
 let __modelcontextprotocol_sdk_server_stdio_js = require("@modelcontextprotocol/sdk/server/stdio.js");
 
 //#region package.json
-var version = "0.7.1";
+var version = "0.7.2";
 
 //#endregion
 //#region src/utils/mcpConfigSchema.ts
@@ -1365,6 +1366,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);
 	}
@@ -1810,7 +1814,7 @@ 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`,
+			name: "@agimon-ai/mcp-proxy-client",
 			version: "0.1.0"
 		}, { capabilities: {} });
 		const mcpClient = new McpClient(serverName, config.transport, client, this.logger, {
@@ -2994,7 +2998,7 @@ 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 +3014,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
@@ -3266,25 +3275,15 @@ 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" })
 		};
 	}
 	/**
@@ -3298,9 +3297,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 { toolNames } = DescribeToolsToolInputSchema.parse(rawInput);
 			const serverDefinitions = await this.definitionsCacheService.getServerDefinitions();
 			if (!toolNames || toolNames.length === 0) return {
 				content: [{
@@ -3474,6 +3473,10 @@ function getUniqueSortedCapabilities(tools) {
 
 //#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 +3486,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 +3499,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();
@@ -3552,6 +3546,39 @@ var SearchListToolsTool = class SearchListToolsTool {
 //#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:
@@ -3591,6 +3618,9 @@ var UseToolTool = class UseToolTool {
 	*
 	* @returns The tool definition conforming to MCP spec
 	*/
+	getInputSchema() {
+		return UseToolToolInputSchema;
+	}
 	getDefinition() {
 		return {
 			name: UseToolTool.TOOL_NAME,
@@ -3600,22 +3630,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 +3643,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,9 +3698,9 @@ 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;
+			const { toolName: inputToolName, toolArgs = {} } = UseToolToolInputSchema.parse(rawInput);
 			if (inputToolName.startsWith(SKILL_PREFIX)) {
 				const skillName = inputToolName.slice(SKILL_PREFIX.length);
 				if (this.skillService) {
@@ -3704,7 +3729,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: [{
@@ -3741,7 +3767,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: [{
@@ -4975,21 +5002,27 @@ async function createSessionServer(shared) {
 	})() : [await describeTools.getDefinition(), useToolWithCache.getDefinition()] }));
 	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 || {}

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

@@ -1,9 +1,10 @@
+import { coerceArgs, formatZodError, jsonSchemaToZod } from "@agimon-ai/foundation-validator";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolRequestSchema, ElicitRequestSchema, GetPromptRequestSchema, ListPromptsRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema, ReadResourceRequestSchema, isInitializeRequest } from "@modelcontextprotocol/sdk/types.js";
+import { z } from "zod";
 import { existsSync } from "node:fs";
 import { access, mkdir, readFile, readdir, rm, stat, unlink, watch, writeFile } from "node:fs/promises";
 import yaml from "js-yaml";
-import { z } from "zod";
 import { createHash, randomBytes, randomUUID } from "node:crypto";
 import { homedir, tmpdir } from "node:os";
 import { dirname, isAbsolute, join, resolve } from "node:path";
@@ -24,7 +25,7 @@ import { SSEServerTransport } from "@modelcontextprotocol/sdk/server/sse.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 
 //#region package.json
-var version = "0.7.1";
+var version = "0.7.2";
 
 //#endregion
 //#region src/utils/mcpConfigSchema.ts
@@ -1337,6 +1338,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);
 	}
@@ -1782,7 +1786,7 @@ var McpClientManagerService = class {
 	async createConnection(serverName, config) {
 		const timeoutMs = config.timeout ?? DEFAULT_CONNECTION_TIMEOUT_MS;
 		const client = new Client({
-			name: `@agimon-ai/mcp-proxy-client`,
+			name: "@agimon-ai/mcp-proxy-client",
 			version: "0.1.0"
 		}, { capabilities: {} });
 		const mcpClient = new McpClient(serverName, config.transport, client, this.logger, {
@@ -2966,7 +2970,7 @@ 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
@@ -2982,6 +2986,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 = z.object({ toolNames: z.array(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
@@ -3238,25 +3247,15 @@ 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: z.toJSONSchema(DescribeToolsToolInputSchema, { reused: "inline" })
 		};
 	}
 	/**
@@ -3270,9 +3269,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 { toolNames } = DescribeToolsToolInputSchema.parse(rawInput);
 			const serverDefinitions = await this.definitionsCacheService.getServerDefinitions();
 			if (!toolNames || toolNames.length === 0) return {
 				content: [{
@@ -3446,6 +3445,10 @@ function getUniqueSortedCapabilities(tools) {
 
 //#endregion
 //#region src/tools/SearchListToolsTool.ts
+const SearchListToolsToolInputSchema = z.object({
+	capability: z.string().optional().describe("Optional capability filter. Matches explicit capability tags first, then server summaries, server names, tool names, and tool descriptions."),
+	serverName: z.string().optional().describe("Optional server name filter.")
+});
 var SearchListToolsTool = class SearchListToolsTool {
 	static TOOL_NAME = "list_tools";
 	constructor(_clientManager, definitionsCacheService) {
@@ -3455,6 +3458,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) => {
@@ -3465,23 +3471,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: 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();
@@ -3524,6 +3518,39 @@ var SearchListToolsTool = class SearchListToolsTool {
 //#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 = z.object({
+	toolName: z.string().min(1).describe("Name of the tool to execute"),
+	toolArgs: z.record(z.string(), 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:
@@ -3563,6 +3590,9 @@ var UseToolTool = class UseToolTool {
 	*
 	* @returns The tool definition conforming to MCP spec
 	*/
+	getInputSchema() {
+		return UseToolToolInputSchema;
+	}
 	getDefinition() {
 		return {
 			name: UseToolTool.TOOL_NAME,
@@ -3572,22 +3602,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: z.toJSONSchema(UseToolToolInputSchema, { reused: "inline" })
 		};
 	}
 	/**
@@ -3600,6 +3615,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 coerceArgs(toolArgs, jsonSchemaToZod(jsonSchema));
+	}
 	executeSkill(skill) {
 		return { content: [{
 			type: "text",
@@ -3645,9 +3670,9 @@ 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;
+			const { toolName: inputToolName, toolArgs = {} } = UseToolToolInputSchema.parse(rawInput);
 			if (inputToolName.startsWith(SKILL_PREFIX)) {
 				const skillName = inputToolName.slice(SKILL_PREFIX.length);
 				if (this.skillService) {
@@ -3676,7 +3701,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: [{
@@ -3713,7 +3739,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: [{
@@ -4947,21 +4974,27 @@ async function createSessionServer(shared) {
 	})() : [await describeTools.getDefinition(), useToolWithCache.getDefinition()] }));
 	server.setRequestHandler(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 = coerceArgs(args ?? {}, tool.getInputSchema());
+			try {
+				return await tool.execute(coerced);
+			} catch (error) {
+				if (error instanceof z.ZodError) return {
+					content: [{
+						type: "text",
+						text: 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 || {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agimon-ai/mcp-proxy",
   "description": "MCP proxy server package",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "license": "AGPL-3.0",
   "keywords": [
     "mcp",
@@ -27,10 +27,11 @@
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
     "liquidjs": "^10.21.0",
-    "zod": "^3.24.1",
+    "zod": "4.3.6",
     "@agimon-ai/foundation-process-registry": "0.5.2",
     "@agimon-ai/foundation-port-registry": "0.5.2",
-    "@agimon-ai/log-sink-mcp": "0.5.2"
+    "@agimon-ai/log-sink-mcp": "0.5.3",
+    "@agimon-ai/foundation-validator": "0.2.0"
   },
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",