@mastra/mcp 0.3.5-alpha.0 → 0.3.5

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/mcp@0.3.5-alpha.0 build /home/runner/work/mastra/mastra/packages/mcp
+> @mastra/mcp@0.3.5-alpha.1 build /home/runner/work/mastra/mastra/packages/mcp
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.4.0
 TSC Build start
-TSC ⚡️ Build success in 9949ms
+TSC ⚡️ Build success in 10820ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.2
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.2
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 10541ms
+DTS ⚡️ Build success in 9756ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 6.91 KB
-ESM ⚡️ Build success in 503ms
-CJS dist/index.cjs 6.96 KB
-CJS ⚡️ Build success in 503ms
+CJS dist/index.cjs 7.27 KB
+CJS ⚡️ Build success in 594ms
+ESM dist/index.js 7.24 KB
+ESM ⚡️ Build success in 594ms

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @mastra/mcp
 
+## 0.3.5
+
+### Patch Changes
+
+- 2621e3f: Added MCP client timeout option used for tool calls.
+- Updated dependencies [6794797]
+- Updated dependencies [fb68a80]
+- Updated dependencies [b56a681]
+- Updated dependencies [248cb07]
+  - @mastra/core@0.6.4
+
+## 0.3.5-alpha.1
+
+### Patch Changes
+
+- 2621e3f: Added MCP client timeout option used for tool calls.
+- Updated dependencies [6794797]
+  - @mastra/core@0.6.4-alpha.1
+
 ## 0.3.5-alpha.0
 
 ### Patch Changes

package/README.md

@@ -38,6 +38,7 @@ const sseClient = new MastraMCPClient({
       headers: { Authorization: 'Bearer your-token' },
     },
   },
+  timeout: 60000, // optional timeout for tool calls in milliseconds
 });
 
 // Connect to the MCP server

package/dist/_tsup-dts-rollup.d.cts

@@ -9,11 +9,13 @@ declare class MastraMCPClient extends MastraBase {
     name: string;
     private transport;
     private client;
-    constructor({ name, version, server, capabilities, }: {
+    private readonly timeout;
+    constructor({ name, version, server, capabilities, timeout, }: {
         name: string;
         server: MastraMCPServerDefinition;
         capabilities?: ClientCapabilities;
         version?: string;
+        timeout?: number;
     });
     private isConnected;
     connect(): Promise<void>;

package/dist/_tsup-dts-rollup.d.ts

@@ -9,11 +9,13 @@ declare class MastraMCPClient extends MastraBase {
     name: string;
     private transport;
     private client;
-    constructor({ name, version, server, capabilities, }: {
+    private readonly timeout;
+    constructor({ name, version, server, capabilities, timeout, }: {
         name: string;
         server: MastraMCPServerDefinition;
         capabilities?: ClientCapabilities;
         version?: string;
+        timeout?: number;
     });
     private isConnected;
     connect(): Promise<void>;

package/dist/index.cjs

@@ -6,6 +6,7 @@ var utils = require('@mastra/core/utils');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var sse_js = require('@modelcontextprotocol/sdk/client/sse.js');
 var stdio_js = require('@modelcontextprotocol/sdk/client/stdio.js');
+var protocol_js = require('@modelcontextprotocol/sdk/shared/protocol.js');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var exitHook = require('exit-hook');
 var uuid = require('uuid');
@@ -15,14 +16,17 @@ var MastraMCPClient = class extends base.MastraBase {
   name;
   transport;
   client;
+  timeout;
   constructor({
     name,
     version = "1.0.0",
     server,
-    capabilities = {}
+    capabilities = {},
+    timeout = protocol_js.DEFAULT_REQUEST_TIMEOUT_MSEC
   }) {
     super({ name: "MastraMCPClient" });
     this.name = name;
+    this.timeout = timeout;
     if (`url` in server) {
       this.transport = new sse_js.SSEClientTransport(server.url, {
         requestInit: server.requestInit,
@@ -93,10 +97,16 @@ ${e instanceof Error ? e.stack : JSON.stringify(e, null, 2)}`
         inputSchema: s,
         execute: async ({ context }) => {
           try {
-            const res = await this.client.callTool({
-              name: tool.name,
-              arguments: context
-            });
+            const res = await this.client.callTool(
+              {
+                name: tool.name,
+                arguments: context
+              },
+              types_js.CallToolResultSchema,
+              {
+                timeout: this.timeout
+              }
+            );
             return res;
           } catch (e) {
             console.log("Error calling tool", tool.name);

package/dist/index.js

@@ -4,7 +4,8 @@ import { jsonSchemaToModel } from '@mastra/core/utils';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StdioClientTransport, getDefaultEnvironment } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { ListResourcesResultSchema } from '@modelcontextprotocol/sdk/types.js';
+import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import { ListResourcesResultSchema, CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
 import { v5 } from 'uuid';
 
@@ -13,14 +14,17 @@ var MastraMCPClient = class extends MastraBase {
   name;
   transport;
   client;
+  timeout;
   constructor({
     name,
     version = "1.0.0",
     server,
-    capabilities = {}
+    capabilities = {},
+    timeout = DEFAULT_REQUEST_TIMEOUT_MSEC
   }) {
     super({ name: "MastraMCPClient" });
     this.name = name;
+    this.timeout = timeout;
     if (`url` in server) {
       this.transport = new SSEClientTransport(server.url, {
         requestInit: server.requestInit,
@@ -91,10 +95,16 @@ ${e instanceof Error ? e.stack : JSON.stringify(e, null, 2)}`
         inputSchema: s,
         execute: async ({ context }) => {
           try {
-            const res = await this.client.callTool({
-              name: tool.name,
-              arguments: context
-            });
+            const res = await this.client.callTool(
+              {
+                name: tool.name,
+                arguments: context
+              },
+              CallToolResultSchema,
+              {
+                timeout: this.timeout
+              }
+            );
             return res;
           } catch (e) {
             console.log("Error calling tool", tool.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.3.5-alpha.0",
+  "version": "0.3.5",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -26,7 +26,7 @@
     "date-fns": "^4.1.0",
     "exit-hook": "^4.0.0",
     "uuid": "^11.1.0",
-    "@mastra/core": "^0.6.4-alpha.0"
+    "@mastra/core": "^0.6.4"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^1.1.15",

package/src/client.ts

@@ -5,10 +5,11 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { getDefaultEnvironment, StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import type { StdioServerParameters } from '@modelcontextprotocol/sdk/client/stdio.js';
+import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { Protocol } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
 import type { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
-import { ListResourcesResultSchema } from '@modelcontextprotocol/sdk/types.js';
+import { CallToolResultSchema, ListResourcesResultSchema } from '@modelcontextprotocol/sdk/types.js';
 
 import { asyncExitHook, gracefulExit } from 'exit-hook';
 
@@ -22,19 +23,23 @@ export class MastraMCPClient extends MastraBase {
   name: string;
   private transport: Transport;
   private client: Client;
+  private readonly timeout: number;
   constructor({
     name,
     version = '1.0.0',
     server,
     capabilities = {},
+    timeout = DEFAULT_REQUEST_TIMEOUT_MSEC,
   }: {
     name: string;
     server: MastraMCPServerDefinition;
     capabilities?: ClientCapabilities;
     version?: string;
+    timeout?: number;
   }) {
     super({ name: 'MastraMCPClient' });
     this.name = name;
+    this.timeout = timeout;
 
     if (`url` in server) {
       this.transport = new SSEClientTransport(server.url, {
@@ -113,10 +118,16 @@ export class MastraMCPClient extends MastraBase {
         inputSchema: s,
         execute: async ({ context }) => {
           try {
-            const res = await this.client.callTool({
-              name: tool.name,
-              arguments: context,
-            });
+            const res = await this.client.callTool(
+              {
+                name: tool.name,
+                arguments: context,
+              },
+              CallToolResultSchema,
+              {
+                timeout: this.timeout,
+              },
+            );
 
             return res;
           } catch (e) {