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

package/dist/index.js

@@ -24796,6 +24796,8 @@ var MCPClientServerProxy = class extends 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 } : {}
 		})) };
@@ -26505,10 +26507,7 @@ var MCPServer = class extends 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 = {
@@ -26789,12 +26788,18 @@ var MCPServer = class extends 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 },
+			[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 {
@@ -26803,7 +26808,8 @@ var MCPServer = class extends MCPServerBase {
 			content: [{
 				type: "text",
 				text: JSON.stringify(structuredContent)
-			}]
+			}],
+			...meta
 		};
 	}
 	registerResourceHandlers(server) {
@@ -27148,17 +27154,15 @@ var MCPServer = class extends 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 MastraError({
+		const resource = this.appResourceList.find((r) => r.uri === uri);
+		if (html === void 0 || !resource) throw new MastraError({
 			id: "MCP_SERVER_RESOURCE_NOT_FOUND",
 			domain: ErrorDomain.MCP,
 			category: 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() {
@@ -27178,23 +27182,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?.[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[RESOURCE_URI_META_KEY];
-	if (ui?.resourceUri && !flat) return {
-		...meta,
-		[RESOURCE_URI_META_KEY]: ui.resourceUri
-	};
-	if (flat && !ui?.resourceUri) return {
+	return {
 		...meta,
 		ui: {
-			...ui ?? {},
-			resourceUri: flat
-		}
+			...ui,
+			resourceUri
+		},
+		[RESOURCE_URI_META_KEY]: resourceUri
 	};
-	return meta;
 }
 //#endregion
 //#region src/server/types.ts