@mastra/mcp 1.7.0 → 1.8.0-alpha.1

package/dist/index.js

@@ -965,18 +965,25 @@ var InternalMastraMCPClient = class extends MastraBase {
       try {
         let requireApproval;
         let needsApprovalFn;
+        const annotations = tool.annotations;
         if (typeof this.requireToolApproval === "function") {
           const serverApprovalFn = this.requireToolApproval;
           const toolName = tool.name;
           requireApproval = true;
           needsApprovalFn = (args, ctx = {}) => {
-            return serverApprovalFn({ toolName, args, ...ctx });
+            return serverApprovalFn({ toolName, args, ...ctx, annotations });
           };
         } else if (this.requireToolApproval === true) {
           requireApproval = true;
         }
         const rawMeta = tool._meta;
         const toolMeta = rawMeta ? this.stampServerIdInMeta(rawMeta) : void 0;
+        const mcpToolProps = toolMeta || annotations ? {
+          mcp: {
+            ...toolMeta ? { _meta: toolMeta } : {},
+            ...annotations ? { annotations } : {}
+          }
+        } : {};
         const mastraTool = createTool({
           id: `${this.name}_${tool.name}`,
           description: tool.description || "",
@@ -984,7 +991,9 @@ var InternalMastraMCPClient = class extends MastraBase {
           strict: getMastraToolStrictMeta(toolMeta),
           // Preserve the full _meta from the remote MCP server (including ui.resourceUri
           // for MCP Apps) so downstream consumers (e.g. Studio) can detect app tools.
-          ...toolMeta ? { mcp: { _meta: toolMeta } } : {},
+          // Also propagate MCP tool annotations so listTools() / listToolsets() consumers
+          // can read them via `tool.mcp.annotations`.
+          ...mcpToolProps,
           // Don't pass outputSchema to createTool — the MCP SDK's Client.callTool()
           // already validates structuredContent against the tool's outputSchema using AJV.
           // Passing it here causes Zod to strip unrecognized keys from the CallToolResult
@@ -2307,7 +2316,7 @@ function createSimpleTokenProvider(accessToken, options) {
   });
 }
 
-// ../../node_modules/.pnpm/hono@4.12.14/node_modules/hono/dist/utils/stream.js
+// ../../node_modules/.pnpm/hono@4.12.18/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
   writer;
   encoder;
@@ -2384,7 +2393,7 @@ var StreamingApi = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.12.14/node_modules/hono/dist/helper/streaming/utils.js
+// ../../node_modules/.pnpm/hono@4.12.18/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
   const version = typeof Bun !== "undefined" ? Bun.version : void 0;
   if (version === void 0) {
@@ -2395,7 +2404,7 @@ var isOldBunVersion = () => {
   return result;
 };
 
-// ../../node_modules/.pnpm/hono@4.12.14/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.12.18/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1};
 var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) => {
@@ -2426,7 +2435,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.12.14/node_modules/hono/dist/helper/streaming/sse.js
+// ../../node_modules/.pnpm/hono@4.12.18/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -4179,6 +4188,10 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
   }) {
     try {
       this.logger.debug("Received SSE connection");
+      if (this.sseTransport) {
+        await this.sseTransport.close?.();
+        this.sseTransport = void 0;
+      }
       this.sseTransport = new SSEServerTransport(messagePath, res);
       await this.server.connect(this.sseTransport);
       this.server.onclose = async () => {