@mastra/mcp 1.0.1 → 1.0.2

package/dist/index.cjs

@@ -646,8 +646,8 @@ var InternalMastraMCPClient = class extends base.MastraBase {
    * @internal
    */
   async connect() {
-    if (await this.isConnected) {
-      return true;
+    if (this.isConnected) {
+      return this.isConnected;
     }
     this.isConnected = new Promise(async (resolve, reject) => {
       try {
@@ -733,16 +733,16 @@ var InternalMastraMCPClient = class extends base.MastraBase {
   }
   /**
    * Checks if an error indicates a session invalidation that requires reconnection.
-   * 
+   *
    * Common session-related errors include:
    * - "No valid session ID provided" (HTTP 400)
    * - "Server not initialized" (HTTP 400)
    * - "Not connected" (protocol state error)
    * - Connection refused errors
-   * 
+   *
    * @param error - The error to check
    * @returns true if the error indicates a session problem requiring reconnection
-   * 
+   *
    * @internal
    */
   isSessionError(error) {
@@ -754,13 +754,13 @@ var InternalMastraMCPClient = class extends base.MastraBase {
   }
   /**
    * Forces a reconnection to the MCP server by disconnecting and reconnecting.
-   * 
+   *
    * This is useful when the session becomes invalid (e.g., after server restart)
    * and the client needs to establish a fresh connection.
-   * 
+   *
    * @returns Promise resolving when reconnection is complete
    * @throws {Error} If reconnection fails
-   * 
+   *
    * @internal
    */
   async forceReconnect() {
@@ -975,6 +975,16 @@ var InternalMastraMCPClient = class extends base.MastraBase {
               if (res.structuredContent !== void 0) {
                 return res.structuredContent;
               }
+              if (tool.outputSchema && !res.isError) {
+                const content = res.content;
+                if (content && content.length === 1 && content[0].type === "text" && content[0].text !== void 0) {
+                  try {
+                    return JSON.parse(content[0].text);
+                  } catch {
+                    return content[0].text;
+                  }
+                }
+              }
               return res;
             };
             try {
@@ -2006,7 +2016,7 @@ function createSimpleTokenProvider(accessToken, options) {
   });
 }
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/stream.js
+// ../../node_modules/.pnpm/hono@4.11.9/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
   writer;
   encoder;
@@ -2083,7 +2093,7 @@ var StreamingApi = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/helper/streaming/utils.js
+// ../../node_modules/.pnpm/hono@4.11.9/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
   const version = typeof Bun !== "undefined" ? Bun.version : void 0;
   if (version === void 0) {
@@ -2094,7 +2104,7 @@ var isOldBunVersion = () => {
   return result;
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.11.9/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1};
 var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) => {
@@ -2125,7 +2135,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.11.7/node_modules/hono/dist/helper/streaming/sse.js
+// ../../node_modules/.pnpm/hono@4.11.9/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -2817,27 +2827,33 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
           ];
         }
         return response;
-      } catch (error) {
+      } catch (error$1) {
         const duration = Date.now() - startTime;
-        if (error instanceof zod.z.ZodError) {
+        if (error$1 instanceof zod.z.ZodError) {
           this.logger.warn("Invalid tool arguments", {
             tool: request.params.name,
-            errors: error.errors,
+            errors: error$1.errors,
             duration: `${duration}ms`
           });
           return {
             content: [
               {
                 type: "text",
-                text: `Invalid arguments: ${error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ")}`
+                text: `Invalid arguments: ${error$1.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ")}`
               }
             ],
             isError: true
           };
         }
-        this.logger.error(`Tool execution failed: ${request.params.name}`, { error });
+        this.logger.error(`Tool execution failed: ${request.params.name}`, { error: error$1 });
+        if (error$1 instanceof error.MastraError) {
+          return {
+            content: [{ type: "text", text: JSON.stringify(error$1.toJSON()) }],
+            isError: true
+          };
+        }
         return {
-          content: [{ type: "text", text: `Error: ${error instanceof Error ? error.message : String(error)}` }],
+          content: [{ type: "text", text: `Error: ${error$1 instanceof Error ? error$1.message : String(error$1)}` }],
           isError: true
         };
       }