@mastra/mcp 1.4.2 → 1.5.0-alpha.1

package/dist/index.js

@@ -425,6 +425,7 @@ var InternalMastraMCPClient = class extends MastraBase {
   sigTermHandler;
   sigHupHandler;
   _roots;
+  requireToolApproval;
   /** Provides access to resource operations (list, read, subscribe, etc.) */
   resources;
   /** Provides access to prompt operations (list, get, notifications) */
@@ -450,11 +451,15 @@ var InternalMastraMCPClient = class extends MastraBase {
     this.enableServerLogs = server.enableServerLogs ?? true;
     this.serverConfig = server;
     this.enableProgressTracking = !!server.enableProgressTracking;
+    this.requireToolApproval = server.requireToolApproval;
     this._roots = server.roots ?? [];
     const hasRoots = this._roots.length > 0 || !!capabilities.roots;
     const clientCapabilities = {
       ...capabilities,
-      elicitation: {},
+      // Merge elicitation capabilities instead of overwriting
+      elicitation: {
+        ...capabilities.elicitation ?? {}
+      },
       // Auto-enable roots capability if roots are provided
       ...hasRoots ? { roots: { listChanged: true, ...capabilities.roots ?? {} } } : {}
     };
@@ -896,6 +901,18 @@ var InternalMastraMCPClient = class extends MastraBase {
     for (const tool of tools) {
       this.log("debug", `Processing tool: ${tool.name}`);
       try {
+        let requireApproval;
+        let needsApprovalFn;
+        if (typeof this.requireToolApproval === "function") {
+          const serverApprovalFn = this.requireToolApproval;
+          const toolName = tool.name;
+          requireApproval = true;
+          needsApprovalFn = (args, ctx = {}) => {
+            return serverApprovalFn({ toolName, args, ...ctx });
+          };
+        } else if (this.requireToolApproval === true) {
+          requireApproval = true;
+        }
         const mastraTool = createTool({
           id: `${this.name}_${tool.name}`,
           description: tool.description || "",
@@ -904,6 +921,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           // already validates structuredContent against the tool's outputSchema using AJV.
           // Passing it here causes Zod to strip unrecognized keys from the CallToolResult
           // envelope, returning {} for tools without structuredContent.
+          requireApproval,
           mcpMetadata: {
             serverName: this.name,
             serverVersion: this.client.getServerVersion()?.version
@@ -963,6 +981,9 @@ var InternalMastraMCPClient = class extends MastraBase {
             });
           }
         });
+        if (needsApprovalFn) {
+          mastraTool.needsApprovalFn = needsApprovalFn;
+        }
         if (tool.name) {
           toolsRes[tool.name] = mastraTool;
         }
@@ -1800,7 +1821,8 @@ To fix this you have three different options:
     const mcpClient = new InternalMastraMCPClient({
       name,
       server: config,
-      timeout: config.timeout ?? this.defaultTimeout
+      timeout: config.timeout ?? this.defaultTimeout,
+      capabilities: config.capabilities
     });
     mcpClient.__setLogger(this.logger);
     this.mcpClientsById.set(name, mcpClient);
@@ -2040,7 +2062,7 @@ function createSimpleTokenProvider(accessToken, options) {
   });
 }
 
-// ../../node_modules/.pnpm/hono@4.12.8/node_modules/hono/dist/utils/stream.js
+// ../../node_modules/.pnpm/hono@4.12.12/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
   writer;
   encoder;
@@ -2117,7 +2139,7 @@ var StreamingApi = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.12.8/node_modules/hono/dist/helper/streaming/utils.js
+// ../../node_modules/.pnpm/hono@4.12.12/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
   const version = typeof Bun !== "undefined" ? Bun.version : void 0;
   if (version === void 0) {
@@ -2128,7 +2150,7 @@ var isOldBunVersion = () => {
   return result;
 };
 
-// ../../node_modules/.pnpm/hono@4.12.8/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.12.12/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1};
 var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) => {
@@ -2159,7 +2181,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.12.8/node_modules/hono/dist/helper/streaming/sse.js
+// ../../node_modules/.pnpm/hono@4.12.12/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);