@mastra/mcp 1.12.1 → 1.13.0-alpha.0

package/dist/index.js

@@ -1,6 +1,7 @@
 import { AsyncLocalStorage } from 'async_hooks';
 import { createRequire } from 'module';
 import { MastraBase } from '@mastra/core/base';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { createTool, isValidationError } from '@mastra/core/tools';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
@@ -10,7 +11,6 @@ import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/p
 import { LoggingMessageNotificationSchema, ListRootsRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, EmptyResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, ProgressNotificationSchema, ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, McpError, ErrorCode, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, CallToolResultSchema, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
 import { createHash, randomUUID } from 'crypto';
-import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import equal from 'fast-deep-equal';
 import { MCPServerBase } from '@mastra/core/mcp';
 import { isStandardSchemaWithJSON, standardSchemaToJSONSchema } from '@mastra/core/schema';
@@ -424,6 +424,14 @@ var DATADOG_TRACER_TEST_SYMBOL = /* @__PURE__ */ Symbol.for("mastra.mcp.dd-trace
 function shouldDetachPersistentTransportRequest(init) {
   return (init?.method ?? "GET").toUpperCase() === "GET";
 }
+function extractToolErrorText(content) {
+  const fallback = "MCP tool execution failed";
+  if (!Array.isArray(content)) return fallback;
+  const text = content.filter((part) => {
+    return !!part && typeof part === "object" && part.type === "text";
+  }).map((part) => part.text).join("\n").trim();
+  return text || fallback;
+}
 function getDatadogScope() {
   const testTracer = globalThis[DATADOG_TRACER_TEST_SYMBOL];
   const tracer = testTracer ?? loadDatadogTracer();
@@ -505,6 +513,7 @@ var InternalMastraMCPClient = class extends MastraBase {
   serverInstructions;
   _roots;
   requireToolApproval;
+  onToolError;
   /** Provides access to resource operations (list, read, subscribe, etc.) */
   resources;
   /** Provides access to prompt operations (list, get, notifications) */
@@ -531,6 +540,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     this.serverConfig = server;
     this.enableProgressTracking = !!server.enableProgressTracking;
     this.requireToolApproval = server.requireToolApproval;
+    this.onToolError = server.onToolError ?? "throw";
     this._roots = server.roots ?? [];
     const hasRoots = this._roots.length > 0 || !!capabilities.roots;
     const clientCapabilities = {
@@ -1051,6 +1061,17 @@ var InternalMastraMCPClient = class extends MastraBase {
                     signal: context?.abortSignal
                   }
                 );
+                if (res.isError && this.onToolError === "throw") {
+                  const errorText = extractToolErrorText(res.content);
+                  this.log("debug", `Tool reported an error: ${tool.name}`, { error: errorText });
+                  throw new MastraError({
+                    id: "MCP_CLIENT_TOOL_EXECUTION_FAILED",
+                    domain: ErrorDomain.MCP,
+                    category: ErrorCategory.THIRD_PARTY,
+                    text: errorText,
+                    details: { toolName: tool.name, serverName: this.name }
+                  });
+                }
                 this.log("debug", `Tool executed successfully: ${tool.name}`);
                 if (res.structuredContent !== void 0) {
                   return res.structuredContent;