@mastra/mcp 0.10.4-alpha.0 → 0.10.4

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/mcp@0.10.4-alpha.0 build /home/runner/work/mastra/mastra/packages/mcp
+> @mastra/mcp@0.10.4-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.5.0
 TSC Build start
-TSC ⚡️ Build success in 20174ms
+TSC ⚡️ Build success in 20537ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 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.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 20211ms
+DTS ⚡️ Build success in 21141ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 71.81 KB
-ESM ⚡️ Build success in 1802ms
-CJS dist/index.cjs 71.95 KB
-CJS ⚡️ Build success in 1784ms
+ESM dist/index.js 71.61 KB
+ESM ⚡️ Build success in 1942ms
+CJS dist/index.cjs 71.73 KB
+CJS ⚡️ Build success in 1942ms

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @mastra/mcp
 
+## 0.10.4
+
+### Patch Changes
+
+- 63f6b7d: dependencies updates:
+  - Updated dependency [`@modelcontextprotocol/sdk@^1.12.1` ↗︎](https://www.npmjs.com/package/@modelcontextprotocol/sdk/v/1.12.1) (from `^1.10.2`, in `dependencies`)
+  - Updated dependency [`hono@^4.7.11` ↗︎](https://www.npmjs.com/package/hono/v/4.7.11) (from `^4.7.4`, in `dependencies`)
+- 36f1c36: MCP Client and Server streamable http fixes
+- bd1674f: Change how connection promise works for client connection
+- 69f76f7: Fix Agents as tools when building mastra mcp server
+- Updated dependencies [63f6b7d]
+- Updated dependencies [12a95fc]
+- Updated dependencies [4b0f8a6]
+- Updated dependencies [51264a5]
+- Updated dependencies [8e6f677]
+- Updated dependencies [d70c420]
+- Updated dependencies [ee9af57]
+- Updated dependencies [36f1c36]
+- Updated dependencies [2a16996]
+- Updated dependencies [10d352e]
+- Updated dependencies [9589624]
+- Updated dependencies [53d3c37]
+- Updated dependencies [751c894]
+- Updated dependencies [577ce3a]
+- Updated dependencies [9260b3a]
+  - @mastra/core@0.10.6
+
+## 0.10.4-alpha.1
+
+### Patch Changes
+
+- bd1674f: Change how connection promise works for client connection
+- 69f76f7: Fix Agents as tools when building mastra mcp server
+
 ## 0.10.4-alpha.0
 
 ### Patch Changes

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

@@ -1,4 +1,4 @@
-import { Agent } from '@mastra/core/agent';
+import type { Agent } from '@mastra/core/agent';
 import type { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
 import type { ConvertedTool } from '@mastra/core/mcp';
 import type { GetPromptResult } from '@modelcontextprotocol/sdk/types.js';
@@ -86,7 +86,7 @@ export declare class InternalMastraMCPClient extends MastraBase {
     private connectStdio;
     private connectHttp;
     private isConnected;
-    connect(): Promise<void>;
+    connect(): Promise<boolean>;
     /**
      * Get the current session ID if using the Streamable HTTP transport.
      * Returns undefined if not connected or not using Streamable HTTP.

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

@@ -1,4 +1,4 @@
-import { Agent } from '@mastra/core/agent';
+import type { Agent } from '@mastra/core/agent';
 import type { ClientCapabilities } from '@modelcontextprotocol/sdk/types.js';
 import type { ConvertedTool } from '@mastra/core/mcp';
 import type { GetPromptResult } from '@modelcontextprotocol/sdk/types.js';
@@ -86,7 +86,7 @@ export declare class InternalMastraMCPClient extends MastraBase {
     private connectStdio;
     private connectHttp;
     private isConnected;
-    connect(): Promise<void>;
+    connect(): Promise<boolean>;
     /**
      * Get the current session ID if using the Streamable HTTP transport.
      * Returns undefined if not connected or not using Streamable HTTP.

package/dist/index.cjs

@@ -16,7 +16,6 @@ var equal = require('fast-deep-equal');
 var uuid = require('uuid');
 var crypto$1 = require('crypto');
 var core = require('@mastra/core');
-var agent = require('@mastra/core/agent');
 var mcp = require('@mastra/core/mcp');
 var runtimeContext = require('@mastra/core/runtime-context');
 var index_js = require('@modelcontextprotocol/sdk/server/index.js');
@@ -332,42 +331,33 @@ var InternalMastraMCPClient = class extends base.MastraBase {
   }
   isConnected = null;
   async connect() {
-    let res = () => {
-    };
-    let rej = () => {
-    };
-    if (this.isConnected === null) {
-      this.log("debug", `Creating new isConnected promise`);
-      this.isConnected = new Promise((resolve, reject) => {
-        res = resolve;
-        rej = reject;
-      });
-    } else if (await this.isConnected) {
-      this.log("debug", `MCP server already connected`);
-      return;
+    if (await this.isConnected) {
+      return true;
     }
-    const { command, url } = this.serverConfig;
-    if (command) {
-      await this.connectStdio(command).catch((e) => {
-        rej(e);
-      });
-    } else if (url) {
-      await this.connectHttp(url).catch((e) => {
-        rej(e);
-      });
-    } else {
-      rej(false);
-      throw new Error("Server configuration must include either a command or a url.");
-    }
-    res(true);
-    const originalOnClose = this.client.onclose;
-    this.client.onclose = () => {
-      this.log("debug", `MCP server connection closed`);
-      rej(false);
-      if (typeof originalOnClose === `function`) {
-        originalOnClose();
+    this.isConnected = new Promise(async (resolve, reject) => {
+      try {
+        const { command, url } = this.serverConfig;
+        if (command) {
+          await this.connectStdio(command);
+        } else if (url) {
+          await this.connectHttp(url);
+        } else {
+          throw new Error("Server configuration must include either a command or a url.");
+        }
+        resolve(true);
+        const originalOnClose = this.client.onclose;
+        this.client.onclose = () => {
+          this.log("debug", `MCP server connection closed`);
+          this.isConnected = null;
+          if (typeof originalOnClose === "function") {
+            originalOnClose();
+          }
+        };
+      } catch (e) {
+        this.isConnected = null;
+        reject(e);
       }
-    };
+    });
     exitHook.asyncExitHook(
       async () => {
         this.log("debug", `Disconnecting MCP server during exit`);
@@ -377,6 +367,7 @@ var InternalMastraMCPClient = class extends base.MastraBase {
     );
     process.on("SIGTERM", () => exitHook.gracefulExit());
     this.log("debug", `Successfully connected to MCP server`);
+    return this.isConnected;
   }
   /**
    * Get the current session ID if using the Streamable HTTP transport.
@@ -1089,15 +1080,15 @@ var MCPServer = class extends mcp.MCPServerBase {
       return agentTools;
     }
     for (const agentKey in agentsConfig) {
-      const agent$1 = agentsConfig[agentKey];
-      if (!agent$1 || !(agent$1 instanceof agent.Agent)) {
+      const agent = agentsConfig[agentKey];
+      if (!agent || !("generate" in agent)) {
         this.logger.warn(`Agent instance for '${agentKey}' is invalid or missing a generate function. Skipping.`);
         continue;
       }
-      const agentDescription = agent$1.getDescription();
+      const agentDescription = agent.getDescription();
       if (!agentDescription) {
         throw new Error(
-          `Agent '${agent$1.name}' (key: '${agentKey}') must have a non-empty description to be used in an MCPServer.`
+          `Agent '${agent.name}' (key: '${agentKey}') must have a non-empty description to be used in an MCPServer.`
         );
       }
       const agentToolName = `ask_${agentKey}`;
@@ -1109,19 +1100,19 @@ var MCPServer = class extends mcp.MCPServerBase {
       }
       const agentToolDefinition = core.createTool({
         id: agentToolName,
-        description: `Ask agent '${agent$1.name}' a question. Agent description: ${agentDescription}`,
+        description: `Ask agent '${agent.name}' a question. Agent description: ${agentDescription}`,
         inputSchema: zod.z.object({
           message: zod.z.string().describe("The question or input for the agent.")
         }),
         execute: async ({ context, runtimeContext }) => {
           this.logger.debug(
-            `Executing agent tool '${agentToolName}' for agent '${agent$1.name}' with message: "${context.message}"`
+            `Executing agent tool '${agentToolName}' for agent '${agent.name}' with message: "${context.message}"`
           );
           try {
-            const response = await agent$1.generate(context.message, { runtimeContext });
+            const response = await agent.generate(context.message, { runtimeContext });
             return response;
           } catch (error) {
-            this.logger.error(`Error executing agent tool '${agentToolName}' for agent '${agent$1.name}':`, error);
+            this.logger.error(`Error executing agent tool '${agentToolName}' for agent '${agent.name}':`, error);
             throw error;
           }
         }
@@ -1141,7 +1132,7 @@ var MCPServer = class extends mcp.MCPServerBase {
         execute: coreTool.execute,
         toolType: "agent"
       };
-      this.logger.info(`Registered agent '${agent$1.name}' (key: '${agentKey}') as tool: '${agentToolName}'`);
+      this.logger.info(`Registered agent '${agent.name}' (key: '${agentKey}') as tool: '${agentToolName}'`);
     }
     return agentTools;
   }

package/dist/index.js

@@ -14,7 +14,6 @@ import equal from 'fast-deep-equal';
 import { v5 } from 'uuid';
 import { randomUUID } from 'crypto';
 import { createTool, makeCoreTool } from '@mastra/core';
-import { Agent } from '@mastra/core/agent';
 import { MCPServerBase } from '@mastra/core/mcp';
 import { RuntimeContext } from '@mastra/core/runtime-context';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
@@ -326,42 +325,33 @@ var InternalMastraMCPClient = class extends MastraBase {
   }
   isConnected = null;
   async connect() {
-    let res = () => {
-    };
-    let rej = () => {
-    };
-    if (this.isConnected === null) {
-      this.log("debug", `Creating new isConnected promise`);
-      this.isConnected = new Promise((resolve, reject) => {
-        res = resolve;
-        rej = reject;
-      });
-    } else if (await this.isConnected) {
-      this.log("debug", `MCP server already connected`);
-      return;
+    if (await this.isConnected) {
+      return true;
     }
-    const { command, url } = this.serverConfig;
-    if (command) {
-      await this.connectStdio(command).catch((e) => {
-        rej(e);
-      });
-    } else if (url) {
-      await this.connectHttp(url).catch((e) => {
-        rej(e);
-      });
-    } else {
-      rej(false);
-      throw new Error("Server configuration must include either a command or a url.");
-    }
-    res(true);
-    const originalOnClose = this.client.onclose;
-    this.client.onclose = () => {
-      this.log("debug", `MCP server connection closed`);
-      rej(false);
-      if (typeof originalOnClose === `function`) {
-        originalOnClose();
+    this.isConnected = new Promise(async (resolve, reject) => {
+      try {
+        const { command, url } = this.serverConfig;
+        if (command) {
+          await this.connectStdio(command);
+        } else if (url) {
+          await this.connectHttp(url);
+        } else {
+          throw new Error("Server configuration must include either a command or a url.");
+        }
+        resolve(true);
+        const originalOnClose = this.client.onclose;
+        this.client.onclose = () => {
+          this.log("debug", `MCP server connection closed`);
+          this.isConnected = null;
+          if (typeof originalOnClose === "function") {
+            originalOnClose();
+          }
+        };
+      } catch (e) {
+        this.isConnected = null;
+        reject(e);
       }
-    };
+    });
     asyncExitHook(
       async () => {
         this.log("debug", `Disconnecting MCP server during exit`);
@@ -371,6 +361,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     );
     process.on("SIGTERM", () => gracefulExit());
     this.log("debug", `Successfully connected to MCP server`);
+    return this.isConnected;
   }
   /**
    * Get the current session ID if using the Streamable HTTP transport.
@@ -1084,7 +1075,7 @@ var MCPServer = class extends MCPServerBase {
     }
     for (const agentKey in agentsConfig) {
       const agent = agentsConfig[agentKey];
-      if (!agent || !(agent instanceof Agent)) {
+      if (!agent || !("generate" in agent)) {
         this.logger.warn(`Agent instance for '${agentKey}' is invalid or missing a generate function. Skipping.`);
         continue;
       }

package/integration-tests/node_modules/.bin/mastra

@@ -0,0 +1,21 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*)
+        if command -v cygpath > /dev/null 2>&1; then
+            basedir=`cygpath -w "$basedir"`
+        fi
+    ;;
+esac
+
+if [ -z "$NODE_PATH" ]; then
+  export NODE_PATH="/home/runner/work/mastra/mastra/packages/cli/dist/node_modules:/home/runner/work/mastra/mastra/packages/cli/node_modules:/home/runner/work/mastra/mastra/packages/node_modules:/home/runner/work/mastra/mastra/node_modules:/home/runner/work/mastra/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
+else
+  export NODE_PATH="/home/runner/work/mastra/mastra/packages/cli/dist/node_modules:/home/runner/work/mastra/mastra/packages/cli/node_modules:/home/runner/work/mastra/mastra/packages/node_modules:/home/runner/work/mastra/mastra/node_modules:/home/runner/work/mastra/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
+fi
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../mastra/dist/index.js" "$@"
+else
+  exec node  "$basedir/../mastra/dist/index.js" "$@"
+fi

package/integration-tests/node_modules/.bin/vitest

@@ -10,9 +10,9 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_693b2e3fc65baebd9dc5fe66abed9401/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_693b2e3fc65baebd9dc5fe66abed9401/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_3e45f0297eeb1f6a4ee30770ed0f557b/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_3e45f0297eeb1f6a4ee30770ed0f557b/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_693b2e3fc65baebd9dc5fe66abed9401/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_693b2e3fc65baebd9dc5fe66abed9401/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_3e45f0297eeb1f6a4ee30770ed0f557b/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.3_@edge-runtime+vm@3.2.0_@types+debug@4.1.12_@types+node@20.19.0_@vitest+ui@_3e45f0297eeb1f6a4ee30770ed0f557b/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../vitest/vitest.mjs" "$@"

package/integration-tests/package.json

@@ -7,8 +7,8 @@
     "dev": "mastra dev"
   },
   "dependencies": {
-    "@ai-sdk/openai": "^1.3.21",
-    "@ai-sdk/react": "^1.2.11",
+    "@ai-sdk/openai": "^1.3.22",
+    "@ai-sdk/react": "^1.2.12",
     "@mastra/client-js": "workspace:*",
     "@mastra/mcp": "workspace:*",
     "dotenv": "^16.5.0",
@@ -21,7 +21,7 @@
     "get-port": "^7.1.0",
     "mastra": "workspace:*",
     "typescript": "^5.8.2",
-    "vitest": "^3.2.2"
+    "vitest": "^3.2.3"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.0-alpha.0"

package/integration-tests/src/server.test.ts

@@ -1,9 +1,9 @@
 import { spawn } from 'node:child_process';
-import { createServer } from 'node:http';
 import { MCPClient } from '@mastra/mcp';
 import { describe, it, expect, beforeAll, afterAll, vi } from 'vitest';
 import { ServerInfo } from '@mastra/core/mcp';
 import getPort from 'get-port';
+import path from 'node:path';
 
 vi.setConfig({ testTimeout: 20000, hookTimeout: 20000 });
 
@@ -17,10 +17,19 @@ describe('MCPServer through Mastra HTTP Integration (Subprocess)', () => {
   beforeAll(async () => {
     port = await getPort();
 
-    mastraServer = spawn('pnpm', ['mastra', 'dev', '--port', port.toString()], {
-      stdio: 'pipe',
-      detached: true, // Run in a new process group so we can kill it and children
-    });
+    mastraServer = spawn(
+      'pnpm',
+      [
+        path.resolve(import.meta.dirname, `..`, `..`, `..`, `cli`, `dist`, `index.js`),
+        'dev',
+        '--port',
+        port.toString(),
+      ],
+      {
+        stdio: 'pipe',
+        detached: true, // Run in a new process group so we can kill it and children
+      },
+    );
 
     // Wait for server to be ready
     await new Promise<void>((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.10.4-alpha.0",
+  "version": "0.10.4",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -50,8 +50,8 @@
     "vitest": "^3.2.3",
     "zod": "^3.25.57",
     "zod-to-json-schema": "^3.24.5",
-    "@internal/lint": "0.0.12",
-    "@mastra/core": "0.10.6-alpha.0"
+    "@internal/lint": "0.0.13",
+    "@mastra/core": "0.10.6"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

package/src/client/client.ts

@@ -274,44 +274,42 @@ export class InternalMastraMCPClient extends MastraBase {
   private isConnected: Promise<boolean> | null = null;
 
   async connect() {
-    let res: (value: boolean) => void = () => {};
-    let rej: (reason?: any) => void = () => {};
-
-    if (this.isConnected === null) {
-      this.log('debug', `Creating new isConnected promise`);
-      this.isConnected = new Promise<boolean>((resolve, reject) => {
-        res = resolve;
-        rej = reject;
-      });
-    } else if (await this.isConnected) {
-      this.log('debug', `MCP server already connected`);
-      return;
+    // If a connection attempt is in progress, wait for it.
+    if (await this.isConnected) {
+      return true;
     }
 
-    const { command, url } = this.serverConfig;
-
-    if (command) {
-      await this.connectStdio(command).catch(e => {
-        rej(e);
-      });
-    } else if (url) {
-      await this.connectHttp(url).catch(e => {
-        rej(e);
-      });
-    } else {
-      rej(false);
-      throw new Error('Server configuration must include either a command or a url.');
-    }
+    // Start new connection attempt.
+    this.isConnected = new Promise<boolean>(async (resolve, reject) => {
+      try {
+        const { command, url } = this.serverConfig;
+
+        if (command) {
+          await this.connectStdio(command);
+        } else if (url) {
+          await this.connectHttp(url);
+        } else {
+          throw new Error('Server configuration must include either a command or a url.');
+        }
 
-    res(true);
-    const originalOnClose = this.client.onclose;
-    this.client.onclose = () => {
-      this.log('debug', `MCP server connection closed`);
-      rej(false);
-      if (typeof originalOnClose === `function`) {
-        originalOnClose();
+        resolve(true);
+
+        // Set up disconnect handler to reset state.
+        const originalOnClose = this.client.onclose;
+        this.client.onclose = () => {
+          this.log('debug', `MCP server connection closed`);
+          this.isConnected = null;
+          if (typeof originalOnClose === 'function') {
+            originalOnClose();
+          }
+        };
+
+      } catch (e) {
+        this.isConnected = null;
+        reject(e);
       }
-    };
+    });
+
     asyncExitHook(
       async () => {
         this.log('debug', `Disconnecting MCP server during exit`);
@@ -322,6 +320,7 @@ export class InternalMastraMCPClient extends MastraBase {
 
     process.on('SIGTERM', () => gracefulExit());
     this.log('debug', `Successfully connected to MCP server`);
+    return this.isConnected;
   }
 
   /**

package/src/server/server.ts

@@ -2,8 +2,7 @@ import { randomUUID } from 'node:crypto';
 import type * as http from 'node:http';
 import type { InternalCoreTool } from '@mastra/core';
 import { createTool, makeCoreTool } from '@mastra/core';
-import type { ToolsInput } from '@mastra/core/agent';
-import { Agent } from '@mastra/core/agent';
+import type { ToolsInput, Agent } from '@mastra/core/agent';
 import { MCPServerBase } from '@mastra/core/mcp';
 import type {
   MCPServerConfig,
@@ -187,7 +186,7 @@ export class MCPServer extends MCPServerBase {
 
     for (const agentKey in agentsConfig) {
       const agent = agentsConfig[agentKey];
-      if (!agent || !(agent instanceof Agent)) {
+      if (!agent || !('generate' in agent)) {
         this.logger.warn(`Agent instance for '${agentKey}' is invalid or missing a generate function. Skipping.`);
         continue;
       }