@mastra/mcp 1.17.1 → 1.17.2-alpha.0

package/dist/index.js

@@ -21210,20 +21210,53 @@ function extractModelTextFromToolContent(content) {
 /**
 * Non-enumerable metadata attached to structured tool execute results so
 * `toModelOutput` can read MCP `content` without changing the execute return shape.
+*
+* When a tool has an `outputSchema` and the server returns `structuredContent`,
+* `execute()` returns that structured value directly. The rest of the
+* CallToolResult envelope is preserved on non-enumerable symbols:
+* - {@link MCP_CALL_TOOL_CONTENT} holds the MCP `content` blocks (model-facing text).
+* - {@link MCP_CALL_TOOL_META} holds the result-level `_meta` (e.g. `ui.resourceUri`
+*   used by MCP Apps hosts), with `ui.serverId` stamped by the client.
+*
+* Read them with {@link getMcpCallToolContent} and {@link getMcpCallToolMeta}.
+* Note: scalar or `null` structured results cannot carry properties, so these
+* channels are only available when `structuredContent` is an object or array.
 */
 const MCP_CALL_TOOL_CONTENT = Symbol.for("mastra.mcp.callToolContent");
-function attachMcpCallToolContent(structuredContent, content) {
-	if (structuredContent !== null && typeof structuredContent === "object") Object.defineProperty(structuredContent, MCP_CALL_TOOL_CONTENT, {
-		value: content,
-		enumerable: false,
-		configurable: true
-	});
+/** Non-enumerable result-level `_meta` attached to structured tool execute results. */
+const MCP_CALL_TOOL_META = Symbol.for("mastra.mcp.callToolMeta");
+function attachMcpCallToolContent(structuredContent, content, _meta) {
+	if (structuredContent !== null && typeof structuredContent === "object") {
+		Object.defineProperty(structuredContent, MCP_CALL_TOOL_CONTENT, {
+			value: content,
+			enumerable: false,
+			configurable: true
+		});
+		if (_meta !== void 0) Object.defineProperty(structuredContent, MCP_CALL_TOOL_META, {
+			value: _meta,
+			enumerable: false,
+			configurable: true
+		});
+	}
 	return structuredContent;
 }
+/**
+* Read the MCP `content` blocks preserved on a structured tool execute result.
+* Returns `undefined` for scalar results or results without a hidden content channel.
+*/
 function getMcpCallToolContent(output) {
 	if (output === null || typeof output !== "object") return void 0;
 	return output[MCP_CALL_TOOL_CONTENT];
 }
+/**
+* Read the result-level `_meta` preserved on a structured tool execute result
+* (e.g. `_meta.ui.resourceUri` for MCP Apps detection). Returns `undefined` for
+* scalar results or results whose CallToolResult had no `_meta`.
+*/
+function getMcpCallToolMeta(output) {
+	if (output === null || typeof output !== "object") return void 0;
+	return output[MCP_CALL_TOOL_META];
+}
 function createStructuredToolToModelOutput() {
 	return (output) => {
 		const modelText = extractModelTextFromToolContent(getMcpCallToolContent(output));
@@ -22130,7 +22163,7 @@ var InternalMastraMCPClient = class extends MastraBase {
 								});
 							}
 							this.log("debug", `Tool executed successfully: ${tool.name}`);
-							if (res.structuredContent !== void 0) return attachMcpCallToolContent(res.structuredContent, res.content);
+							if (res.structuredContent !== void 0) return attachMcpCallToolContent(res.structuredContent, res.content, res._meta ? this.stampServerIdInMeta(res._meta) : void 0);
 							return res;
 						};
 						const failedTransport = this.transport;
@@ -27127,6 +27160,6 @@ function createIntrospectionValidator(introspectionEndpoint, clientCredentials)
 	};
 }
 //#endregion
-export { InMemoryOAuthStorage, InternalMastraMCPClient, MCPClient, MCPClientServerProxy, MCPOAuthClientProvider, MCPServer, MCP_CALL_TOOL_CONTENT, UnauthorizedError, auth, buildDiscoveryUrls, createIntrospectionValidator, createOAuthCallbackServer, createOAuthMiddleware, createSimpleTokenProvider, createStaticTokenValidator, discoverAuthorizationServerMetadata, discoverOAuthMetadata, discoverOAuthProtectedResourceMetadata, exchangeAuthorization, extractBearerToken, extractResourceMetadataUrl, generateProtectedResourceMetadata, generateWWWAuthenticateHeader, getCallbackUrlCandidates, parseErrorResponse, refreshAuthorization, registerClient, selectResourceURL, startAuthorization };
+export { InMemoryOAuthStorage, InternalMastraMCPClient, MCPClient, MCPClientServerProxy, MCPOAuthClientProvider, MCPServer, MCP_CALL_TOOL_CONTENT, MCP_CALL_TOOL_META, UnauthorizedError, auth, buildDiscoveryUrls, createIntrospectionValidator, createOAuthCallbackServer, createOAuthMiddleware, createSimpleTokenProvider, createStaticTokenValidator, discoverAuthorizationServerMetadata, discoverOAuthMetadata, discoverOAuthProtectedResourceMetadata, exchangeAuthorization, extractBearerToken, extractResourceMetadataUrl, generateProtectedResourceMetadata, generateWWWAuthenticateHeader, getCallbackUrlCandidates, getMcpCallToolContent, getMcpCallToolMeta, parseErrorResponse, refreshAuthorization, registerClient, selectResourceURL, startAuthorization };
 
 //# sourceMappingURL=index.js.map