@mastra/mcp 2.0.0-alpha.4 → 2.0.0

package/dist/client/client.d.ts

@@ -167,6 +167,17 @@ export declare class InternalMastraMCPClient extends MastraBase {
      * @internal
      */
     connect(): Promise<boolean>;
+    /**
+     * Installs the process-exit and signal handlers that tear this client down when the
+     * host process goes away. Idempotent, so repeated connects add at most one of each.
+     */
+    private registerProcessHooks;
+    /**
+     * Removes whatever {@link registerProcessHooks} installed. Keyed on the handlers this
+     * client actually registered rather than on connection state, so a client that never
+     * reached a transport still releases its process listeners.
+     */
+    private unregisterProcessHooks;
     /**
      * Gets the stderr stream of the child process, if using stdio transport with `stderr: 'pipe'`.
      *

package/dist/client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,OAAO,KAAK,EAAmB,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAShE,OAAO,KAAK,EAEV,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACnB,2BAA2B,EAG3B,kBAAkB,EAMnB,MAAM,8BAA8B,CAAC;AAMtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,KAAK,EAGV,eAAe,EAEf,8BAA8B,EAG9B,6BAA6B,EAC9B,MAAM,SAAS,CAAC;AAIjB,YAAY,EACV,YAAY,EACZ,UAAU,EACV,UAAU,EACV,eAAe,EACf,eAAe,EACf,yBAAyB,EACzB,qBAAqB,EACrB,wBAAwB,EACxB,eAAe,EACf,sBAAsB,EACtB,8BAA8B,EAC9B,mBAAmB,EACnB,qBAAqB,EACrB,0BAA0B,EAC1B,6BAA6B,GAC9B,MAAM,SAAS,CAAC;AAoFjB;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,YAAY,CAAC;AA2D7D;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,eAA2C,CAAC;AAE9E,uFAAuF;AACvF,eAAO,MAAM,kBAAkB,eAAwC,CAAC;AAwBxE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAG9D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAGvF;AAuGD;;;;;;;;;;;GAWG;AACH,qBAAa,uBAAwB,SAAQ,UAAU;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,UAAU,CAAC,CAAa;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAe;IAC/C,OAAO,CAAC,sBAAsB,CAAU;IACxC,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAC7D,OAAO,CAAC,iBAAiB,CAAC,CAAa;IACvC,OAAO,CAAC,uBAAuB,CAAC,CAAa;IAC7C,OAAO,CAAC,UAAU,CAAC,CAAqB;IACxC,OAAO,CAAC,qBAAqB,CAAkD;IAC/E,OAAO,CAAC,mBAAmB,CAAC,CAAa;IACzC,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,aAAa,CAAC,CAAa;IACnC,OAAO,CAAC,kBAAkB,CAAC,CAAS;IACpC,8EAA8E;IAC9E,OAAO,CAAC,cAAc,CAAC,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,mBAAmB,CAAC,CAAsB;IAClD,OAAO,CAAC,0BAA0B,CAAC,CAA+B;IAElE,yEAAyE;IACzE,SAAgB,SAAS,EAAE,qBAAqB,CAAC;IACjD,sEAAsE;IACtE,SAAgB,OAAO,EAAE,mBAAmB,CAAC;IAC7C,6DAA6D;IAC7D,SAAgB,QAAQ,EAAE,qBAAqB,CAAC;IAEhD;;OAEG;IACH,YAAY,EAAE,IAAI,EAAE,OAAiB,EAAE,MAAM,EAAE,OAAsC,EAAE,EAAE,8BAA8B,EAuDtH;IAED;;OAEG;IACH,OAAO,CAAC,GAAG;IAkBX;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAUnB,OAAO,CAAC,aAAa;YAiBP,YAAY;YA6BZ,WAAW;IAgEzB;;;;;;;;OAQG;YACW,0BAA0B;IAsBxC;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAWhC;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAQjC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAMrB;;;;OAIG;IACH,IAAI,SAAS,IAAI,kBAAkB,GAAG,SAAS,CAE9C;IAED;;;;;;;;;OASG;IACG,UAAU,CAAC,iBAAiB,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAY1E;IAED,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,gBAAgB,CAA8B;IAEtD;;;;OAIG;IACH,OAAO,CAAC,oBAAoB,CAK1B;IACF,OAAO,CAAC,kBAAkB,CAAC,CAAkB;IAC7C,OAAO,CAAC,kBAAkB,CAAuC;IACjE,OAAO,CAAC,mBAAmB,CAAK;IAEhC;;;;;;OAMG;IACG,OAAO,qBAiFZ;IAED;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAsB5B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAe9B;;;;OAIG;IACH,IAAI,MAAM,IAAI,MAAM,GAAG,IAAI,CAK1B;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,qFAAqF;IACrF,IAAI,yBAAyB,IAAI,MAAM,GAAG,SAAS,CAElD;IAED,OAAO,CAAC,mBAAmB;IAQ3B,uGAAuG;IACvG,OAAO,CAAC,qBAAqB;IAS7B,IAAI,mBAAmB,IAAI,OAAO,CAEjC;IAED,IAAI,qBAAqB,IAAI,MAAM,CAElC;IAEK,UAAU,kBAsCf;IAED;;;;OAIG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CA8CpC;YAEa,8BAA8B;IA0BtC,aAAa,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAGlD;IAEK,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAG3D;IAEK,qBAAqB,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAGlE;IAED;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAG9C;IAED;;OAEG;IACG,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAMtG;IAED,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,kBAAkB;IAY1B,6EAA6E;IAC7E,OAAO,CAAC,yBAAyB;IAMjC;;;;;OAKG;YACW,yBAAyB;YA2BzB,uBAAuB;IAOrC,kGAAkG;YACpF,yBAAyB;IAKvC;;;OAGG;IACG,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlD;IAEK,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpD;YAEa,2BAA2B;IAYnC,uCAAuC,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhF;IAEK,qCAAqC,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAM9E;IAED,qCAAqC,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,GAAG,IAAI,CAItF;IAEK,yCAAyC,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAMlF;IAED,8BAA8B,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAI7D;YAEa,sBAAsB;IAUpC,OAAO,CAAC,kBAAkB;IAc1B;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB;IAY3B;;OAEG;IACG,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC,CAU9E;IAED,OAAO,CAAC,wBAAwB;IAmBhC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,UAAU,EAAE,EAAE;QAAE,UAAU,EAAE,6BAA6B,CAAA;KAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CA2B1G;IAEK,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAgB/D;IAED;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAsN9B,OAAO,CAAC,mBAAmB;CAQ5B"}

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-mcp
 description: Documentation for @mastra/mcp. Use when working with @mastra/mcp APIs, configuration, or implementation.
 metadata:
   package: "@mastra/mcp"
-  version: "2.0.0-alpha.4"
+  version: "2.0.0"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0",
   "package": "@mastra/mcp",
   "exports": {},
   "modules": {}

package/dist/docs/references/reference-tools-mcp-server.md

@@ -959,6 +959,14 @@ execute: async ({ items }, context) => {
 }
 ```
 
+## Tracing
+
+When the server is registered on a `Mastra` instance that has observability configured, every request it handles produces an `MCP_SERVER_REQUEST` root span: `tools/list`, `tools/call`, `resources/*`, and `prompts/*`. `executeTool()` produces the same span, so the Studio MCP server page is traced like an MCP client.
+
+The span is named after the method and target (for example `tools/call lookupOrder`). It stores the request params as input and the response as output, and records the server name and version, the negotiated protocol version, and the client name and version when the client reported them. A `tools/call` that returns `isError: true` fails the span. Agents and workflows exposed as tools attach their `AGENT_RUN` and `WORKFLOW_RUN` spans under it. A served tool doesn't get its own `TOOL_CALL` span. Tools an agent calls inside the request still do.
+
+A standalone `MCPServer` with no `mastra` instance produces no spans.
+
 ## Notification delivery
 
 Notification methods (`resources.notifyListChanged()`, `prompts.notifyListChanged()`, `toolActions.notifyListChanged()`, and `sendLoggingMessage()`) broadcast to every connected client across all transports: the stdio/SSE connection and each streamable HTTP session. `resources.notifyUpdated()` is the exception: it only notifies clients that subscribed to the resource URI via `resources/subscribe`. Subscriptions are tracked per session for streamable HTTP clients; legacy SSE clients share the main server instance and therefore share one subscription set. Clients using the stateless serverless mode can't receive notifications because each request uses a transient server instance.

package/dist/index.cjs

@@ -23272,21 +23272,23 @@ var InternalMastraMCPClient = class extends _mastra_core_base.MastraBase {
 	}
 	async connectStdio(command) {
 		this.log("debug", `Using Stdio transport for command: ${command}`);
+		const transport = new _modelcontextprotocol_client_stdio.StdioClientTransport({
+			command,
+			args: this.serverConfig.args,
+			env: this.buildStdioEnv(),
+			stderr: this.serverConfig.stderr,
+			cwd: this.serverConfig.cwd
+		});
 		try {
-			this.transport = new _modelcontextprotocol_client_stdio.StdioClientTransport({
-				command,
-				args: this.serverConfig.args,
-				env: this.buildStdioEnv(),
-				stderr: this.serverConfig.stderr,
-				cwd: this.serverConfig.cwd
-			});
-			await this.client.connect(this.transport, {
+			await this.client.connect(transport, {
 				timeout: this.serverConfig.timeout ?? this.timeout,
 				prior: this.priorDiscovery
 			});
+			this.transport = transport;
 			this.log("debug", `Successfully connected to MCP server via Stdio`);
 		} catch (e) {
 			this.log("error", e instanceof Error ? e.stack || e.message : JSON.stringify(e));
+			await transport.close().catch(() => {});
 			throw e;
 		}
 	}
@@ -23469,11 +23471,20 @@ var InternalMastraMCPClient = class extends _mastra_core_base.MastraBase {
 				this.clientConnectionOnClose = connectionOnClose;
 				this.client.onclose = connectionOnClose;
 			} catch (e) {
+				if (!this.transport) this.unregisterProcessHooks();
 				this.isConnected = null;
 				this.priorDiscovery = void 0;
 				reject(e);
 			}
 		});
+		this.registerProcessHooks();
+		return this.isConnected;
+	}
+	/**
+	* Installs the process-exit and signal handlers that tear this client down when the
+	* host process goes away. Idempotent, so repeated connects add at most one of each.
+	*/
+	registerProcessHooks() {
 		if (!this.exitHookUnsubscribe) this.exitHookUnsubscribe = (0, exit_hook.asyncExitHook)(async () => {
 			this.log("debug", `Disconnecting MCP server during exit`);
 			await this.disconnect();
@@ -23486,7 +23497,25 @@ var InternalMastraMCPClient = class extends _mastra_core_base.MastraBase {
 			this.sigHupHandler = () => (0, exit_hook.gracefulExit)();
 			process.on("SIGHUP", this.sigHupHandler);
 		}
-		return this.isConnected;
+	}
+	/**
+	* Removes whatever {@link registerProcessHooks} installed. Keyed on the handlers this
+	* client actually registered rather than on connection state, so a client that never
+	* reached a transport still releases its process listeners.
+	*/
+	unregisterProcessHooks() {
+		if (this.exitHookUnsubscribe) {
+			this.exitHookUnsubscribe();
+			this.exitHookUnsubscribe = void 0;
+		}
+		if (this.sigTermHandler) {
+			process.off("SIGTERM", this.sigTermHandler);
+			this.sigTermHandler = void 0;
+		}
+		if (this.sigHupHandler) {
+			process.off("SIGHUP", this.sigHupHandler);
+			this.sigHupHandler = void 0;
+		}
 	}
 	/**
 	* Gets the stderr stream of the child process, if using stdio transport with `stderr: 'pipe'`.
@@ -23531,6 +23560,7 @@ var InternalMastraMCPClient = class extends _mastra_core_base.MastraBase {
 		this.closePendingAuthTransport();
 		if (!this.transport) {
 			await this.detachStaleClientTransport();
+			this.unregisterProcessHooks();
 			this.log("debug", "Disconnect called but no transport was connected.");
 			return;
 		}
@@ -23548,18 +23578,7 @@ var InternalMastraMCPClient = class extends _mastra_core_base.MastraBase {
 			this.transport = void 0;
 			this.isConnected = null;
 			this.serverInstructions = void 0;
-			if (this.exitHookUnsubscribe) {
-				this.exitHookUnsubscribe();
-				this.exitHookUnsubscribe = void 0;
-			}
-			if (this.sigTermHandler) {
-				process.off("SIGTERM", this.sigTermHandler);
-				this.sigTermHandler = void 0;
-			}
-			if (this.sigHupHandler) {
-				process.off("SIGHUP", this.sigHupHandler);
-				this.sigHupHandler = void 0;
-			}
+			this.unregisterProcessHooks();
 		}
 	}
 	/**
@@ -26417,6 +26436,95 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 		this.registerPromptHandlers(server);
 		return server;
 	}
+	/**
+	* Registers `method` under an `MCP_SERVER_REQUEST` span, so every request the
+	* server answers is recorded — including the list and read methods that never
+	* reach a tool, and requests that fail before any work is done.
+	*/
+	setTracedHandler(server, method, handler) {
+		server.setRequestHandler(method, async (request, ctx) => {
+			const params = request.params;
+			let requestContext;
+			try {
+				requestContext = await toRequestContext(ctx, this.mapAuthInfoToUser);
+			} catch (error) {
+				this.startRequestSpan(method, params, {
+					server,
+					ctx
+				})?.error({ error });
+				throw error;
+			}
+			const requestSpan = this.startRequestSpan(method, params, {
+				server,
+				ctx,
+				requestContext
+			});
+			let reportedError;
+			return this.traceRequest(requestSpan, () => handler(request, ctx, {
+				requestSpan,
+				requestContext,
+				reportError: (error) => {
+					reportedError = error;
+				}
+			}), () => reportedError);
+		});
+	}
+	/**
+	* Opens the span for one served request. `connection` is absent for
+	* {@link executeTool}, which is called in-process and negotiates nothing.
+	*/
+	startRequestSpan(method, params, connection) {
+		const envelope = connection?.ctx?.mcpReq.envelope;
+		const protocolVersion = envelope?.[_modelcontextprotocol_server.PROTOCOL_VERSION_META_KEY] ?? connection?.server?.getNegotiatedProtocolVersion();
+		const client = envelope?.[_modelcontextprotocol_server.CLIENT_INFO_META_KEY] ?? connection?.server?.getClientVersion();
+		const target = params?.name ?? params?.uri;
+		const targetName = typeof target === "string" ? target : void 0;
+		return (0, _mastra_core_observability.getOrCreateSpan)({
+			type: _mastra_core_observability.SpanType.MCP_SERVER_REQUEST,
+			name: targetName ? `${method} ${targetName}` : method,
+			entityType: _mastra_core_observability.EntityType.MCP_SERVER,
+			entityId: this.id,
+			entityName: this.name,
+			input: params,
+			attributes: {
+				mcpMethod: method,
+				targetName,
+				mcpServer: this.name,
+				serverVersion: this.version,
+				mcpProtocolVersion: typeof protocolVersion === "string" ? protocolVersion : void 0,
+				clientName: client?.name,
+				clientVersion: client?.version
+			},
+			tracingContext: {},
+			requestContext: connection?.requestContext,
+			mastra: this.mastra
+		});
+	}
+	/**
+	* Runs `fn` under a request span. Only the protocol's own `isError` marks a
+	* failure; the rest of a result is opaque handler output that may legitimately
+	* carry any field. A thrown error ends the whole span tree and is rethrown.
+	*/
+	async traceRequest(requestSpan, fn, getReportedError) {
+		try {
+			const result = await fn();
+			const errorResult = result;
+			if (errorResult?.isError) requestSpan?.error({ error: getReportedError?.() ?? new _mastra_core_error.MastraError({
+				id: "MCP_SERVER_REQUEST_FAILED",
+				domain: _mastra_core_error.ErrorDomain.MCP,
+				category: _mastra_core_error.ErrorCategory.USER,
+				text: errorResult.content?.map((c) => c.text).filter(Boolean).join("\n")
+			}) });
+			else requestSpan?.end({ output: result });
+			return result;
+		} catch (error) {
+			requestSpan?.error({
+				error,
+				endTree: true
+			});
+			throw error;
+		}
+	}
 	/** Answers a suspended round: one keyed form derived from the handler's `resumeSchema`. */
 	async inputRequired(ctx, requestContext, suspension) {
 		const payload = suspension.suspendPayload;
@@ -26441,9 +26549,8 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 			})
 		});
 	}
-	async serverRequest(ctx, method, name, args, resumeSchema) {
+	async serverRequest(ctx, requestContext, method, name, args, resumeSchema) {
 		const argsHash = hashArguments(args);
-		const requestContext = await toRequestContext(ctx, this.mapAuthInfoToUser);
 		const continuation = readContinuation(ctx, requestContext, {
 			method,
 			name,
@@ -26469,11 +26576,10 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 		};
 	}
 	registerToolHandlers(server) {
-		server.setRequestHandler("tools/list", async (_request, ctx) => {
-			const requestContext = await toRequestContext(ctx, this.mapAuthInfoToUser);
-			return { tools: (await this.authorizedToolEntries(requestContext)).map(([name, tool]) => this.toMCPTool(name, tool)) };
+		this.setTracedHandler(server, "tools/list", async (_request, _ctx, trace) => {
+			return { tools: (await this.authorizedToolEntries(trace.requestContext)).map(([name, tool]) => this.toMCPTool(name, tool)) };
 		});
-		server.setRequestHandler("tools/call", async (request, ctx) => {
+		this.setTracedHandler(server, "tools/call", async (request, ctx, trace) => {
 			const name = request.params.name;
 			const tool = this.convertedTools[name];
 			if (!tool) {
@@ -26482,43 +26588,25 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 			}
 			const args = request.params.arguments ?? {};
 			const argsHash = hashArguments(args);
-			const requestContext = await toRequestContext(ctx, this.mapAuthInfoToUser);
+			const requestContext = trace.requestContext;
 			const continuation = readContinuation(ctx, requestContext, {
 				method: "tools/call",
 				name,
 				argsHash
 			});
 			const mcp = toToolExecutionContext(ctx, this.name);
-			const span = (0, _mastra_core_observability.getOrCreateSpan)({
-				type: _mastra_core_observability.SpanType.TOOL_CALL,
-				name: `tool: '${name}'`,
-				input: args,
-				entityType: _mastra_core_observability.EntityType.TOOL,
-				entityId: name,
-				entityName: name,
-				attributes: {
-					toolType: "tool",
-					toolDescription: tool.description
-				},
-				requestContext,
-				mastra: this.mastra
-			});
 			const startedAt = Date.now();
 			try {
 				await this.enforceToolExecutionFGA(name, requestContext);
-				if (continuation && continuation.outcome !== "accept") {
-					span?.end({ attributes: { success: false } });
-					return errorResult(`Tool '${name}' was ${continuation.outcome === "decline" ? "declined" : "cancelled"}`);
-				}
+				if (continuation && continuation.outcome !== "accept") return errorResult(`Tool '${name}' was ${continuation.outcome === "decline" ? "declined" : "cancelled"}`);
 				const execution = await this.runTool(name, tool, args, {
 					requestContext,
 					mcp,
-					tracingContext: { currentSpan: span },
+					tracingContext: { currentSpan: trace.requestSpan },
 					resumeData: continuation?.resumeData,
 					suspendPayload: continuation?.suspendPayload
 				});
 				if (execution.status === "suspended") {
-					span?.end({ attributes: { success: true } });
 					this.logger.debug(`Tool '${name}' requires client input.`);
 					return this.inputRequired(ctx, requestContext, {
 						method: "tools/call",
@@ -26530,17 +26618,9 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 					});
 				}
 				const result = this.toCallToolResult(name, tool, execution.output);
-				span?.end({
-					output: execution.output,
-					attributes: { success: !result.isError }
-				});
 				this.logger.info(`Tool '${name}' finished in ${Date.now() - startedAt}ms.`);
 				return result;
 			} catch (error) {
-				span?.error({
-					error,
-					attributes: { success: false }
-				});
 				if (error instanceof _modelcontextprotocol_server.ProtocolError) throw error;
 				this.logger.error("Tool execution failed", {
 					tool: name,
@@ -26552,6 +26632,7 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 					category: _mastra_core_error.ErrorCategory.USER,
 					details: { toolName: name }
 				}, error);
+				trace.reportError(mastraError);
 				return errorResult(JSON.stringify(mastraError.toJSON()));
 			}
 		});
@@ -26567,6 +26648,7 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 		const output = await tool.execute(args, {
 			toolCallId: "",
 			messages: [],
+			skipToolSpan: true,
 			requestContext: options.requestContext,
 			tracingContext: options.tracingContext,
 			abortSignal: options.mcp?.extra.signal,
@@ -26620,19 +26702,19 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 		const options = this.resourceOptions;
 		const hasAppResources = this.appResourceList.length > 0;
 		if (!options && !hasAppResources) return;
-		const listResources = async (ctx) => [...this.appResourceList, ...await options?.listResources({
+		const listResources = async (ctx, requestContext) => [...this.appResourceList, ...await options?.listResources({
 			extra: toToolExecutionContext(ctx, this.name).extra,
-			requestContext: await toRequestContext(ctx, this.mapAuthInfoToUser)
+			requestContext
 		}) ?? []];
-		server.setRequestHandler("resources/list", async (_request, ctx) => ({ resources: await listResources(ctx) }));
-		server.setRequestHandler("resources/read", async (request, ctx) => {
+		this.setTracedHandler(server, "resources/list", async (_request, ctx, trace) => ({ resources: await listResources(ctx, trace.requestContext) }));
+		this.setTracedHandler(server, "resources/read", async (request, ctx, trace) => {
 			const uri = request.params.uri;
-			const resource = (await listResources(ctx)).find((r) => r.uri === uri);
+			const resource = (await listResources(ctx, trace.requestContext)).find((r) => r.uri === uri);
 			if (!resource) throw new _modelcontextprotocol_server.ProtocolError(_modelcontextprotocol_server.ProtocolErrorCode.InvalidParams, `Resource not found: ${uri}`);
 			const html = this.appResourceHtml.get(uri);
 			if (html !== void 0) return { contents: [this.resourceContents(resource, { text: html })] };
 			if (!options) throw new _modelcontextprotocol_server.ProtocolError(_modelcontextprotocol_server.ProtocolErrorCode.InvalidParams, `Resource not found: ${uri}`);
-			const { request: serverRequest, continuation, suspended, argsHash } = await this.serverRequest(ctx, "resources/read", uri, {}, options.resumeSchema);
+			const { request: serverRequest, continuation, suspended, argsHash } = await this.serverRequest(ctx, trace.requestContext, "resources/read", uri, {}, options.resumeSchema);
 			if (continuation && continuation.outcome !== "accept") throw new _modelcontextprotocol_server.ProtocolError(_modelcontextprotocol_server.ProtocolErrorCode.InvalidParams, `Reading '${uri}' was ${continuation.outcome}ed`);
 			const result = await options.getResourceContent({
 				uri,
@@ -26650,9 +26732,9 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 			if (result === void 0) throw new Error(`Resource '${uri}' returned no content`);
 			return { contents: (Array.isArray(result) ? result : [result]).map((content) => this.resourceContents(resource, content)) };
 		});
-		if (options?.resourceTemplates) server.setRequestHandler("resources/templates/list", async (_request, ctx) => ({ resourceTemplates: await options.resourceTemplates({
+		if (options?.resourceTemplates) this.setTracedHandler(server, "resources/templates/list", async (_request, ctx, trace) => ({ resourceTemplates: await options.resourceTemplates({
 			extra: toToolExecutionContext(ctx, this.name).extra,
-			requestContext: await toRequestContext(ctx, this.mapAuthInfoToUser)
+			requestContext: trace.requestContext
 		}) }));
 	}
 	resourceContents(resource, content) {
@@ -26674,22 +26756,22 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 	registerPromptHandlers(server) {
 		const options = this.promptOptions;
 		if (!options) return;
-		const listPrompts = async (ctx) => {
+		const listPrompts = async (ctx, requestContext) => {
 			const prompts = await options.listPrompts({
 				extra: toToolExecutionContext(ctx, this.name).extra,
-				requestContext: await toRequestContext(ctx, this.mapAuthInfoToUser)
+				requestContext
 			});
 			for (const prompt of prompts) _modelcontextprotocol_core.PromptSchema.parse(prompt);
 			return prompts;
 		};
-		server.setRequestHandler("prompts/list", async (_request, ctx) => ({ prompts: await listPrompts(ctx) }));
+		this.setTracedHandler(server, "prompts/list", async (_request, ctx, trace) => ({ prompts: await listPrompts(ctx, trace.requestContext) }));
 		if (!options.getPromptMessages) return;
-		server.setRequestHandler("prompts/get", async (request, ctx) => {
+		this.setTracedHandler(server, "prompts/get", async (request, ctx, trace) => {
 			const { name, arguments: args } = request.params;
-			const prompt = (await listPrompts(ctx)).find((p) => p.name === name);
+			const prompt = (await listPrompts(ctx, trace.requestContext)).find((p) => p.name === name);
 			if (!prompt) throw new _modelcontextprotocol_server.ProtocolError(_modelcontextprotocol_server.ProtocolErrorCode.InvalidParams, `Prompt "${name}" not found`);
 			for (const arg of prompt.arguments ?? []) if (arg.required && (args?.[arg.name] === void 0 || args?.[arg.name] === null)) throw new _modelcontextprotocol_server.ProtocolError(_modelcontextprotocol_server.ProtocolErrorCode.InvalidParams, `Missing required argument: ${arg.name}`);
-			const { request: serverRequest, continuation, suspended, argsHash } = await this.serverRequest(ctx, "prompts/get", name, args ?? {}, options.resumeSchema);
+			const { request: serverRequest, continuation, suspended, argsHash } = await this.serverRequest(ctx, trace.requestContext, "prompts/get", name, args ?? {}, options.resumeSchema);
 			if (continuation && continuation.outcome !== "accept") throw new _modelcontextprotocol_server.ProtocolError(_modelcontextprotocol_server.ProtocolErrorCode.InvalidParams, `Prompt "${name}" was ${continuation.outcome}ed`);
 			const messages = await options.getPromptMessages({
 				name,
@@ -26902,52 +26984,58 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 	* arguments with `resumeData` and `suspendPayload`.
 	*/
 	async executeTool(toolId, args, executionContext = {}) {
-		const tool = this.convertedTools[toolId];
-		if (!tool) {
-			this.logger.warn("Unknown tool requested", {
-				tool: toolId,
-				server: this.name
-			});
-			throw new _mastra_core_error.MastraError({
-				id: "MCP_SERVER_TOOL_EXECUTE_PREPARATION_FAILED",
-				domain: _mastra_core_error.ErrorDomain.MCP,
-				category: _mastra_core_error.ErrorCategory.USER,
-				text: `Unknown tool: ${toolId}`,
-				details: { toolId }
-			});
-		}
 		const requestContext = executionContext.requestContext ?? new _mastra_core_request_context.RequestContext();
-		await this.enforceToolExecutionFGA(toolId, requestContext);
-		try {
-			const execution = await this.runTool(toolId, tool, args, {
-				requestContext,
-				tracingContext: { currentSpan: void 0 },
-				resumeData: executionContext.resumeData,
-				suspendPayload: executionContext.suspendPayload
-			});
-			if (execution.status === "completed" && (0, _mastra_core_tools.isValidationError)(execution.output)) throw new _mastra_core_error.MastraError({
-				id: "MCP_SERVER_TOOL_INVALID_INPUT",
-				domain: _mastra_core_error.ErrorDomain.MCP,
-				category: _mastra_core_error.ErrorCategory.USER,
-				text: execution.output.message,
-				details: { toolId }
-			});
-			this.logger.info("Tool executed successfully", { tool: toolId });
-			return execution;
-		} catch (error) {
-			if (error instanceof _mastra_core_error.MastraError && error.id === "MCP_SERVER_TOOL_INVALID_INPUT") throw error;
-			const mastraError = new _mastra_core_error.MastraError({
-				id: "MCP_SERVER_TOOL_EXECUTE_FAILED",
-				domain: _mastra_core_error.ErrorDomain.MCP,
-				category: _mastra_core_error.ErrorCategory.USER,
-				details: {
-					toolId,
-					args: JSON.stringify(args)
-				}
-			}, error);
-			this.logger.trackException(mastraError);
-			throw mastraError;
-		}
+		const requestSpan = this.startRequestSpan("tools/call", {
+			name: toolId,
+			arguments: args
+		}, { requestContext });
+		return this.traceRequest(requestSpan, async () => {
+			const tool = this.convertedTools[toolId];
+			if (!tool) {
+				this.logger.warn("Unknown tool requested", {
+					tool: toolId,
+					server: this.name
+				});
+				throw new _mastra_core_error.MastraError({
+					id: "MCP_SERVER_TOOL_EXECUTE_PREPARATION_FAILED",
+					domain: _mastra_core_error.ErrorDomain.MCP,
+					category: _mastra_core_error.ErrorCategory.USER,
+					text: `Unknown tool: ${toolId}`,
+					details: { toolId }
+				});
+			}
+			await this.enforceToolExecutionFGA(toolId, requestContext);
+			try {
+				const execution = await this.runTool(toolId, tool, args, {
+					requestContext,
+					tracingContext: { currentSpan: requestSpan },
+					resumeData: executionContext.resumeData,
+					suspendPayload: executionContext.suspendPayload
+				});
+				if (execution.status === "completed" && (0, _mastra_core_tools.isValidationError)(execution.output)) throw new _mastra_core_error.MastraError({
+					id: "MCP_SERVER_TOOL_INVALID_INPUT",
+					domain: _mastra_core_error.ErrorDomain.MCP,
+					category: _mastra_core_error.ErrorCategory.USER,
+					text: execution.output.message,
+					details: { toolId }
+				});
+				this.logger.info("Tool executed successfully", { tool: toolId });
+				return execution;
+			} catch (error) {
+				if (error instanceof _mastra_core_error.MastraError && error.id === "MCP_SERVER_TOOL_INVALID_INPUT") throw error;
+				const mastraError = new _mastra_core_error.MastraError({
+					id: "MCP_SERVER_TOOL_EXECUTE_FAILED",
+					domain: _mastra_core_error.ErrorDomain.MCP,
+					category: _mastra_core_error.ErrorCategory.USER,
+					details: {
+						toolId,
+						args: JSON.stringify(args)
+					}
+				}, error);
+				this.logger.trackException(mastraError);
+				throw mastraError;
+			}
+		});
 	}
 	/** Reads an `ui://` app resource; application resources require a protocol request. */
 	async readResource(uri) {