@mastra/mcp 0.10.10 → 0.10.11

package/dist/index.js

@@ -1537,9 +1537,24 @@ var MCPServer = class extends MCPServerBase {
           this.logger.warn(`CallTool: Invalid tool arguments for '${request.params.name}'`, {
             errors: validation.error
           });
+          let errorMessages = "Validation failed";
+          if ("errors" in validation.error && Array.isArray(validation.error.errors)) {
+            errorMessages = validation.error.errors.map((e) => `- ${e.path?.join(".") || "root"}: ${e.message}`).join("\n");
+          } else if (validation.error instanceof Error) {
+            errorMessages = validation.error.message;
+          }
           return {
-            content: [{ type: "text", text: `Invalid tool arguments: ${JSON.stringify(validation.error)}` }],
+            content: [
+              {
+                type: "text",
+                text: `Tool validation failed. Please fix the following errors and try again:
+${errorMessages}
+
+Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
+              }
+            ],
             isError: true
+            // Set to true so the LLM sees the error and can self-correct
           };
         }
         if (!tool.execute) {
@@ -1554,7 +1569,7 @@ var MCPServer = class extends MCPServerBase {
             return this.handleElicitationRequest(request2, serverInstance);
           }
         };
-        const result = await tool.execute(validation?.value, {
+        const result = await tool.execute(validation?.value ?? request.params.arguments ?? {}, {
           messages: [],
           toolCallId: "",
           elicitation: sessionElicitation,
@@ -2492,11 +2507,18 @@ var MCPServer = class extends MCPServerBase {
       if (tool.parameters instanceof z.ZodType && typeof tool.parameters.safeParse === "function") {
         const validation = tool.parameters.safeParse(args ?? {});
         if (!validation.success) {
-          const errorMessages = validation.error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ");
+          const errorMessages = validation.error.errors.map((e) => `- ${e.path?.join(".") || "root"}: ${e.message}`).join("\n");
           this.logger.warn(`ExecuteTool: Invalid tool arguments for '${toolId}': ${errorMessages}`, {
             errors: validation.error.format()
           });
-          throw new z.ZodError(validation.error.issues);
+          return {
+            error: true,
+            message: `Tool validation failed. Please fix the following errors and try again:
+${errorMessages}
+
+Provided arguments: ${JSON.stringify(args, null, 2)}`,
+            validationErrors: validation.error.format()
+          };
         }
         validatedArgs = validation.data;
       } else {