@mastra/mcp 2.2.0-alpha.1 → 2.2.0-alpha.2

package/dist/client/server-proxy.d.ts

@@ -56,6 +56,8 @@ export declare class MCPClientServerProxy extends MCPServerBase {
             uri: string;
             text?: string;
             blob?: string;
+            mimeType?: string;
+            _meta?: Record<string, unknown>;
         }>;
     }>;
     startStdio(): Promise<void>;

package/dist/client/server-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-proxy.d.ts","sourceRoot":"","sources":["../../src/client/server-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI5G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAExD,KAAK,QAAQ,GAAG;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,aAAa;IACrD,SAAkB,UAAU,EAAG,CAAC,CAAU;IAC1C,OAAO,CAAC,YAAY,CAAyC;IAC7D,OAAO,CAAC,YAAY,CAAwC;IAC5D,OAAO,CAAC,cAAc,CAAsC;IAE5D,YACE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7E,YAAY,EAAE,MAAM,OAAO,CAAC,uBAAuB,CAAC,EAUrD;IAED,4EAA4E;IAC5E,YAAY,CAAC,MAAM,EAAE,UAAU,MAE9B;YAEa,SAAS;IAOvB,OAAO,CAAC,aAAa;YAOP,aAAa;IAkBpB,eAAe,IAAI;QAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAG/E;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAIvF;IAEY,WAAW,CACtB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAM,GACxD,OAAO,CAAC,wBAAwB,CAAC,CAYnC;IAEY,aAAa,IAAI,OAAO,CAAC;QACpC,SAAS,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,WAAW,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAAE,CAAC,CAAC;KAC3H,CAAC,CAYD;IAEY,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAUlH;IAEY,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAEvC;IAEY,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAEtC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAEM,aAAa,IAAI,UAAU,CAWjC;IAEM,eAAe,IAAI,gBAAgB,CAMzC;CACF"}
+{"version":3,"file":"server-proxy.d.ts","sourceRoot":"","sources":["../../src/client/server-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,wBAAwB,EAAE,WAAW,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI5G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAExD,KAAK,QAAQ,GAAG;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,aAAa;IACrD,SAAkB,UAAU,EAAG,CAAC,CAAU;IAC1C,OAAO,CAAC,YAAY,CAAyC;IAC7D,OAAO,CAAC,YAAY,CAAwC;IAC5D,OAAO,CAAC,cAAc,CAAsC;IAE5D,YACE,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7E,YAAY,EAAE,MAAM,OAAO,CAAC,uBAAuB,CAAC,EAUrD;IAED,4EAA4E;IAC5E,YAAY,CAAC,MAAM,EAAE,UAAU,MAE9B;YAEa,SAAS;IAOvB,OAAO,CAAC,aAAa;YAOP,aAAa;IAkBpB,eAAe,IAAI;QAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAG/E;IAEM,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAIvF;IAEY,WAAW,CACtB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,OAAO,GAAE,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAM,GACxD,OAAO,CAAC,wBAAwB,CAAC,CAYnC;IAEY,aAAa,IAAI,OAAO,CAAC;QACpC,SAAS,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,WAAW,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAAE,CAAC,CAAC;KAC3H,CAAC,CAYD;IAEY,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAC9C,QAAQ,EAAE,KAAK,CAAC;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAAE,CAAC,CAAC;KACpH,CAAC,CAYD;IAEY,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAEvC;IAEY,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAEtC;IAEY,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAGlC;IAEM,aAAa,IAAI,UAAU,CAWjC;IAEM,eAAe,IAAI,gBAAgB,CAMzC;CACF"}

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.2.0-alpha.1"
+  version: "2.2.0-alpha.2"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

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

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

@@ -1395,7 +1395,7 @@ const server = new MCPServer({
 })
 ```
 
-Link a tool to its app resource by setting `mcp._meta.ui.resourceUri` in `createTool()` to the matching `ui://` URI. The server normalizes this metadata for older hosts when listing tools. Visit [MCP Apps](https://mastra.ai/docs/connections/mcp) for the full app bridge API and usage patterns.
+Link a tool to its app resource by setting `mcp._meta.ui.resourceUri` in `createTool()` to the matching `ui://` URI. The server normalizes this metadata for older hosts when listing tools, and returns the same link on successful tool call results. Visit [MCP Apps](https://mastra.ai/docs/connections/mcp) for the full app bridge API and usage patterns.
 
 ## Related information
 

package/dist/index.cjs

@@ -24817,6 +24817,8 @@ var MCPClientServerProxy = class extends _mastra_core_mcp.MCPServerBase {
 	async readResource(uri) {
 		return { contents: (await (await this.getClient()).resources.read(uri)).contents.map((c) => ({
 			uri: c.uri ?? uri,
+			...c.mimeType !== void 0 ? { mimeType: c.mimeType } : {},
+			...c._meta !== void 0 ? { _meta: c._meta } : {},
 			..."text" in c && c.text !== void 0 ? { text: c.text } : {},
 			..."blob" in c && c.blob !== void 0 ? { blob: c.blob } : {}
 		})) };
@@ -26526,10 +26528,7 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 		return validation.value;
 	}
 	hasUiMetadata() {
-		return Object.values(this.convertedTools).some((tool) => {
-			const meta = tool.mcp?._meta;
-			return Boolean(meta?.ui?.resourceUri);
-		});
+		return Object.values(this.convertedTools).some((tool) => Boolean(uiResourceUri(tool.mcp?._meta)));
 	}
 	capabilities() {
 		const capabilities = {
@@ -26810,12 +26809,18 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 			this.logger.warn(`Tool '${name}' rejected its input.`, { error: value.message });
 			return errorResult(value.message);
 		}
+		const resourceUri = uiResourceUri(tool.mcp?._meta);
+		const meta = resourceUri ? { _meta: {
+			ui: { resourceUri },
+			[_modelcontextprotocol_ext_apps.RESOURCE_URI_META_KEY]: resourceUri
+		} } : {};
 		if (!tool.outputSchema) return {
 			isError: false,
 			content: [{
 				type: "text",
 				text: typeof value === "string" ? value : JSON.stringify(value)
-			}]
+			}],
+			...meta
 		};
 		const structuredContent = value;
 		return {
@@ -26824,7 +26829,8 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 			content: [{
 				type: "text",
 				text: JSON.stringify(structuredContent)
-			}]
+			}],
+			...meta
 		};
 	}
 	registerResourceHandlers(server) {
@@ -27169,17 +27175,15 @@ var MCPServer = class extends _mastra_core_mcp.MCPServerBase {
 	/** Reads an `ui://` app resource; application resources require a protocol request. */
 	async readResource(uri) {
 		const html = this.appResourceHtml.get(uri);
-		if (html === void 0) throw new _mastra_core_error.MastraError({
+		const resource = this.appResourceList.find((r) => r.uri === uri);
+		if (html === void 0 || !resource) throw new _mastra_core_error.MastraError({
 			id: "MCP_SERVER_RESOURCE_NOT_FOUND",
 			domain: _mastra_core_error.ErrorDomain.MCP,
 			category: _mastra_core_error.ErrorCategory.USER,
 			text: `Resource '${uri}' not found; application resources are only readable through an MCP request`,
 			details: { uri }
 		});
-		return { contents: [{
-			uri,
-			text: html
-		}] };
+		return { contents: [this.resourceContents(resource, { text: html })] };
 	}
 	/** Lists `ui://` app resources; application resources require a protocol request. */
 	async listResources() {
@@ -27199,23 +27203,23 @@ function errorResult(text) {
 		isError: true
 	};
 }
-/** Keeps `_meta.ui.resourceUri` and the flat MCP Apps key in sync for older hosts. */
+/** The tool's MCP App URI; the nested key wins over the flat one, as in ext-apps' `getToolUiResourceUri`. */
+function uiResourceUri(meta) {
+	return (meta?.ui)?.resourceUri || meta?.[_modelcontextprotocol_ext_apps.RESOURCE_URI_META_KEY] || void 0;
+}
+/** Writes the tool's MCP App URI to both the nested and the flat key, so every host opens the same app. */
 function normalizeUiMeta(meta) {
-	if (!meta) return void 0;
+	const resourceUri = uiResourceUri(meta);
+	if (!meta || !resourceUri) return meta;
 	const ui = meta.ui;
-	const flat = meta[_modelcontextprotocol_ext_apps.RESOURCE_URI_META_KEY];
-	if (ui?.resourceUri && !flat) return {
-		...meta,
-		[_modelcontextprotocol_ext_apps.RESOURCE_URI_META_KEY]: ui.resourceUri
-	};
-	if (flat && !ui?.resourceUri) return {
+	return {
 		...meta,
 		ui: {
-			...ui ?? {},
-			resourceUri: flat
-		}
+			...ui,
+			resourceUri
+		},
+		[_modelcontextprotocol_ext_apps.RESOURCE_URI_META_KEY]: resourceUri
 	};
-	return meta;
 }
 //#endregion
 //#region src/server/types.ts