mcp: update with icons added to resource templates (microsoft#269199)

Followup addition from modelcontextprotocol/modelcontextprotocol#1565

Author: connor4312

src/vs/workbench/contrib/mcp/browser/mcpResourceQuickAccess.ts

@@ -37,22 +37,24 @@ export class McpResourcePickHelper {
 	}
 
 	public static item(resource: IMcpResource | IMcpResourceTemplate): IQuickPickItem {
+		const icon = resource.icons.getUrl(22);
+		const iconPath = icon ? { dark: icon, light: icon } : undefined;
 		if (isMcpResourceTemplate(resource)) {
 			return {
 				id: resource.template.template,
 				label: resource.title || resource.name,
 				description: resource.description,
 				detail: localize('mcp.resource.template', 'Resource template: {0}', resource.template.template),
+				iconPath,
 			};
 		}
 
-		const icon = resource.icons.getUrl(22);
 		return {
 			id: resource.uri.toString(),
 			label: resource.title || resource.name,
 			description: resource.description,
 			detail: resource.mcpUri + (resource.sizeInBytes !== undefined ? ' (' + ByteSize.formatSize(resource.sizeInBytes) + ')' : ''),
-			iconPath: icon ? { dark: icon, light: icon } : undefined,
+			iconPath,
 		};
 	}
 

src/vs/workbench/contrib/mcp/common/mcpIcons.ts

@@ -25,6 +25,7 @@ interface IIcon {
 	sizes: { width: number; height: number }[];
 }
 
+export type ParsedMcpIcons = IIcon[];
 export type StoredMcpIcons = Dto<IIcon>[];
 
 
@@ -68,8 +69,8 @@ function validateIcon(icon: MCP.Icon, launch: McpServerLaunch, logger: ILogger):
 	return;
 }
 
-export function parseAndValidateMcpIcon(icons: MCP.Icons, launch: McpServerLaunch, logger: ILogger): StoredMcpIcons {
-	const result: StoredMcpIcons = [];
+export function parseAndValidateMcpIcon(icons: MCP.Icons, launch: McpServerLaunch, logger: ILogger): ParsedMcpIcons {
+	const result: ParsedMcpIcons = [];
 	for (const icon of icons.icons || []) {
 		const uri = validateIcon(icon, launch, logger);
 		if (!uri) {
@@ -92,9 +93,12 @@ export function parseAndValidateMcpIcon(icons: MCP.Icons, launch: McpServerLaunc
 }
 
 export class McpIcons implements IMcpIcons {
-
 	public static fromStored(icons: StoredMcpIcons | undefined) {
-		return new McpIcons(icons?.map(i => ({ src: URI.revive(i.src), sizes: i.sizes })) || []);
+		return McpIcons.fromParsed(icons?.map(i => ({ src: URI.revive(i.src), sizes: i.sizes })));
+	}
+
+	public static fromParsed(icons: ParsedMcpIcons | undefined) {
+		return new McpIcons(icons || []);
 	}
 
 	protected constructor(private readonly _icons: IIcon[]) { }

src/vs/workbench/contrib/mcp/common/mcpServer.ts

@@ -489,7 +489,7 @@ export class McpServer extends Disposable implements IMcpServer {
 		return new AsyncIterableProducer<IMcpResource[]>(async emitter => {
 			await McpServer.callOn(this, async (handler) => {
 				for await (const resource of handler.listResourcesIterable({}, cts.token)) {
-					emitter.emitOne(resource.map(r => new McpResource(this, r, McpIcons.fromStored(this._parseIcons(r)))));
+					emitter.emitOne(resource.map(r => new McpResource(this, r, McpIcons.fromParsed(this._parseIcons(r)))));
 					if (cts.token.isCancellationRequested) {
 						return;
 					}
@@ -501,7 +501,7 @@ export class McpServer extends Disposable implements IMcpServer {
 	public resourceTemplates(token?: CancellationToken): Promise<IMcpResourceTemplate[]> {
 		return McpServer.callOn(this, async (handler) => {
 			const templates = await handler.listResourceTemplates({}, token);
-			return templates.map(t => new McpResourceTemplate(this, t));
+			return templates.map(t => new McpResourceTemplate(this, t, McpIcons.fromParsed(this._parseIcons(t))));
 		}, token);
 	}
 
@@ -1074,6 +1074,7 @@ class McpResourceTemplate implements IMcpResourceTemplate {
 	constructor(
 		private readonly _server: McpServer,
 		private readonly _definition: MCP.ResourceTemplate,
+		public readonly icons: IMcpIcons,
 	) {
 		this.name = _definition.name;
 		this.description = _definition.description;

src/vs/workbench/contrib/mcp/common/mcpTypes.ts

@@ -356,6 +356,7 @@ export interface IMcpResourceTemplate {
 	readonly description?: string;
 	readonly mimeType?: string;
 	readonly template: UriTemplate;
+	readonly icons: IMcpIcons;
 
 	/** Gets string completions for the given template part. */
 	complete(templatePart: string, prefix: string, alreadyResolved: Record<string, string | string[]>, token: CancellationToken): Promise<string[]>;

src/vs/workbench/contrib/mcp/common/modelContextProtocol.ts

@@ -635,7 +635,7 @@ export namespace MCP {/* JSON-RPC types */
 	/**
 	 * A template description for resources available on the server.
 	 */
-	export interface ResourceTemplate extends BaseMetadata {
+	export interface ResourceTemplate extends BaseMetadata, Icons {
 		/**
 		 * A URI template (according to RFC 6570) that can be used to construct resource URIs.
 		 *