@codingame/monaco-vscode-mcp-service-override 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpWorkbenchService.js

@@ -5,6 +5,7 @@ import { MarkdownString, createCommandUri } from '@codingame/monaco-vscode-api/v
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { isObject, isString, isBoolean, isStringArray, isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
@@ -14,7 +15,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
+import { mcpAccessConfig, McpGalleryResolveStatus, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import { IMcpGalleryService, IAllowedMcpServersService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { McpServerType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes';
@@ -40,10 +41,153 @@ import { IMcpGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
-import { Queue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { ThrottledDelayer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { runOnChange } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/runOnChange';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
+function parseMcpInstallUriPayload(query) {
+    let parsed;
+    try {
+        parsed = JSON.parse(decodeURIComponent(query));
+    } catch {
+        return undefined;
+    }
+    if (!isObject(parsed)) {
+        return undefined;
+    }
+    const payload = parsed;
+    if (!isString(payload.name) || !payload.name) {
+        return undefined;
+    }
+    const config = sanitizeMcpServerConfiguration(payload);
+    if (!config) {
+        return undefined;
+    }
+    return {
+        name: payload.name,
+        config,
+        inputs: Array.isArray(payload.inputs) ? payload.inputs : undefined
+    };
+}
+function sanitizeMcpServerConfiguration(payload) {
+    const type = payload.type === McpServerType.LOCAL || payload.type === McpServerType.REMOTE ? payload.type : isString(payload.command) ? McpServerType.LOCAL : McpServerType.REMOTE;
+    const dev = sanitizeMcpDevModeConfig(payload.dev);
+    const common = {
+        ...(isString(payload.version) ? {
+            version: payload.version
+        } : {}),
+        ...(isBoolean(payload.gallery) || isString(payload.gallery) ? {
+            gallery: payload.gallery
+        } : {}),
+        ...(dev ? {
+            dev
+        } : {})
+    };
+    if (type === McpServerType.LOCAL) {
+        if (!isString(payload.command)) {
+            return undefined;
+        }
+        const env = sanitizeMcpEnvironment(payload.env);
+        return {
+            type,
+            command: payload.command,
+            ...common,
+            ...(isStringArray(payload.args) ? {
+                args: payload.args
+            } : {}),
+            ...(env ? {
+                env
+            } : {}),
+            ...(isString(payload.envFile) ? {
+                envFile: payload.envFile
+            } : {}),
+            ...(isString(payload.cwd) ? {
+                cwd: payload.cwd
+            } : {}),
+            ...(isBoolean(payload.sandboxEnabled) ? {
+                sandboxEnabled: payload.sandboxEnabled
+            } : {})
+        };
+    }
+    if (!isString(payload.url)) {
+        return undefined;
+    }
+    const headers = sanitizeStringRecord(payload.headers);
+    const oauth = sanitizeMcpOAuthConfiguration(payload.oauth);
+    return {
+        type,
+        url: payload.url,
+        ...common,
+        ...(payload.transport === "http" || payload.transport === "sse" ? {
+            transport: payload.transport
+        } : {}),
+        ...(headers ? {
+            headers
+        } : {}),
+        ...(oauth ? {
+            oauth
+        } : {})
+    };
+}
+function sanitizeMcpDevModeConfig(value) {
+    if (!isObject(value)) {
+        return undefined;
+    }
+    const payload = value;
+    const debug = sanitizeMcpDevModeDebugConfiguration(payload.debug);
+    if (!isString(payload.watch) && !isStringArray(payload.watch) && !debug) {
+        return undefined;
+    }
+    return {
+        ...(isString(payload.watch) || isStringArray(payload.watch) ? {
+            watch: payload.watch
+        } : {}),
+        ...(debug ? {
+            debug
+        } : {})
+    };
+}
+function sanitizeMcpDevModeDebugConfiguration(value) {
+    if (!isObject(value)) {
+        return undefined;
+    }
+    const payload = value;
+    if (payload.type === "node") {
+        return {
+            type: "node"
+        };
+    }
+    if (payload.type === "debugpy") {
+        return {
+            type: "debugpy",
+            ...(isString(payload.debugpyPath) ? {
+                debugpyPath: payload.debugpyPath
+            } : {})
+        };
+    }
+    return undefined;
+}
+function sanitizeMcpEnvironment(value) {
+    return sanitizeRecord(value, entry => entry === null || isString(entry) || isNumber(entry));
+}
+function sanitizeStringRecord(value) {
+    return sanitizeRecord(value, isString);
+}
+function sanitizeRecord(value, isValidValue) {
+    if (!isObject(value)) {
+        return undefined;
+    }
+    return Object.fromEntries(Object.entries(value).filter(entry => isValidValue(entry[1])));
+}
+function sanitizeMcpOAuthConfiguration(value) {
+    if (!isObject(value)) {
+        return undefined;
+    }
+    const payload = value;
+    return isString(payload.clientId) ? {
+        clientId: payload.clientId
+    } : undefined;
+}
 let McpWorkbenchServer = class McpWorkbenchServer {
     constructor(
         installStateProvider,
@@ -178,6 +322,12 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         this.installing = [];
         this.uninstalling = [];
         this._local = [];
+        this.registrySyncGeneration = 0;
+        this.registryGeneration = 0;
+        this.localQueryGeneration = 0;
+        this.profileChangeGeneration = 0;
+        this.gallerySourceGenerations = ( new WeakMap());
+        this.registrySyncDelayer = this._register(( new ThrottledDelayer(0)));
         this._onChange = this._register(( new Emitter()));
         this.onChange = this._onChange.event;
         this._onReset = this._register(( new Emitter()));
@@ -194,16 +344,16 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         this._register(
             this.mcpManagementService.onDidChangeProfile(e => this.onDidChangeProfile())
         );
-        this.queryLocal().then(() => {
+        this.whenInitialLocalMcpServersLoaded = this.queryLocal().then(() => {
             if (this._store.isDisposed) {
                 return;
             }
-            const queue = this._register(( new Queue()));
-            this._register(
-                mcpGalleryManifestService.onDidChangeMcpGalleryManifest(e => queue.queue(() => this.syncInstalledMcpServers()))
-            );
-            queue.queue(() => this.syncInstalledMcpServers());
-        });
+            this._register(mcpGalleryManifestService.onDidChangeMcpGalleryManifest(() => {
+                this.invalidateRegistryVerification();
+                this.scheduleRegistrySync();
+            }));
+            this.scheduleRegistrySync();
+        }, error => this.logService.error(error));
         urlService.registerHandler(this);
         this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(mcpAccessConfig)) {
@@ -226,9 +376,23 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         }));
     }
     async onDidChangeProfile() {
-        await this.queryLocal();
-        this._onChange.fire(undefined);
+        const profileChangeGeneration = ++this.profileChangeGeneration;
+        const generation = ++this.localQueryGeneration;
+        this.invalidateRegistryVerification();
+        await this.queryLocalForGeneration(generation);
+        if (profileChangeGeneration !== this.profileChangeGeneration) {
+            return;
+        }
         this._onReset.fire();
+        this.scheduleRegistrySync();
+    }
+    invalidateRegistryVerification() {
+        this.registryGeneration++;
+        this.registrySyncGeneration++;
+        for (const server of this._local) {
+            server.gallery = undefined;
+        }
+        this._onChange.fire(undefined);
     }
     areSameMcpServers(a, b) {
         if (a === b) {
@@ -250,17 +414,18 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         }
     }
     onDidInstallMcpServers(e) {
-        const servers = [];
+        let needsRegistrySync = false;
         for (const {
             local,
-            source,
-            name
+            name,
+            source
         } of e) {
             let server = this.installing.find(
                 server => server.local && local ? this.areSameMcpServers(server.local, local) : server.name === name
             );
             this.installing = server ? this.installing.filter(e => e !== server) : this.installing;
             if (local) {
+                const trustedGallery = this.getTrustedGallerySource(source) ?? this.getTrustedGallerySource(server?.gallery);
                 if (server) {
                     server.local = local;
                 } else {
@@ -269,23 +434,23 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                         e => this.getInstallState(e),
                         e => this.getRuntimeStatus(e),
                         local,
-                        source,
+                        undefined,
                         undefined
                     );
                 }
-                if (!local.galleryUrl) {
-                    server.gallery = undefined;
-                }
+                server.gallery = trustedGallery?.name === local.name ? trustedGallery : undefined;
+                needsRegistrySync = true;
                 this._local = this._local.filter(server => !this.areSameMcpServers(server.local, local));
                 this.addServer(server);
             }
             this._onChange.fire(server);
         }
-        if (( servers.some(server => server.local?.galleryUrl && !server.gallery))) {
-            this.syncInstalledMcpServers();
+        if (needsRegistrySync) {
+            this.scheduleRegistrySync();
         }
     }
     onDidUpdateMcpServers(e) {
+        let needsRegistrySync = false;
         for (const result of e) {
             if (!result.local) {
                 continue;
@@ -301,61 +466,89 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     e => this.getInstallState(e),
                     e => this.getRuntimeStatus(e),
                     result.local,
-                    result.source,
+                    undefined,
                     undefined
                 );
                 this.addServer(server);
             }
+            const trustedGallery = this.getTrustedGallerySource(result.source) ?? this.getTrustedGallerySource(server.gallery);
+            server.gallery = trustedGallery?.name === result.local.name ? trustedGallery : undefined;
+            needsRegistrySync = true;
             this._onChange.fire(server);
         }
+        if (needsRegistrySync) {
+            this.scheduleRegistrySync();
+        }
     }
-    fromGallery(gallery) {
+    fromGallery(gallery, registryGeneration) {
+        this.rememberGallerySource(gallery, registryGeneration);
         for (const local of this._local) {
             if (local.name === gallery.name) {
-                local.gallery = gallery;
                 return local;
             }
         }
         return undefined;
     }
-    async syncInstalledMcpServers() {
-        const infos = [];
-        for (const installed of this.local) {
-            if (installed.local?.source !== "gallery") {
-                continue;
-            }
-            if (installed.local.galleryUrl) {
-                infos.push({
-                    name: installed.local.name,
-                    id: installed.local.galleryId
+    scheduleRegistrySync() {
+        const generation = ++this.registrySyncGeneration;
+        void this.registrySyncDelayer.trigger(() => this.syncInstalledMcpServers(generation)).catch(error => this.logService.error(error));
+    }
+    async syncInstalledMcpServers(generation) {
+        if (!this.mcpGalleryService.isEnabled()) {
+            return;
+        }
+        const servers = this.local.flatMap(server => server.local ? [{
+            server,
+            local: server.local
+        }] : []);
+        const infosByName = ( new Map());
+        for (const {
+            local
+        } of servers) {
+            const existing = infosByName.get(local.name);
+            if (!existing || (!existing.id && local.galleryId)) {
+                infosByName.set(local.name, {
+                    name: local.name,
+                    id: local.galleryId
                 });
             }
         }
-        if (infos.length) {
-            const galleryServers = await this.mcpGalleryService.getMcpServersFromGallery(infos);
-            await this.syncInstalledMcpServersWithGallery(galleryServers);
+        const infos = [...( infosByName.values())];
+        if (!infos.length) {
+            return;
+        }
+        const resolved = await this.mcpGalleryService.resolveMcpServersFromGallery(infos);
+        if (generation !== this.registrySyncGeneration) {
+            return;
         }
+        this.syncInstalledMcpServersWithGallery(resolved, servers, generation);
     }
-    async syncInstalledMcpServersWithGallery(gallery) {
-        const galleryMap = ( new Map(( gallery.map(server => [server.name, server]))));
-        for (const mcpServer of this.local) {
-            if (!mcpServer.local) {
+    syncInstalledMcpServersWithGallery(resolved, servers, generation) {
+        for (const {
+            server: mcpServer,
+            local
+        } of servers) {
+            if (generation !== this.registrySyncGeneration || !this._local.includes(mcpServer) || mcpServer.local !== local) {
                 continue;
             }
-            const key = mcpServer.local.name;
-            const gallery = key ? galleryMap.get(key) : undefined;
-            if (!gallery || gallery.galleryUrl !== mcpServer.local.galleryUrl) {
+            const result = resolved.get(local.name);
+            if (!result || result.status === McpGalleryResolveStatus.Failed) {
+                continue;
+            }
+            if (result.status === McpGalleryResolveStatus.NotFound) {
                 if (mcpServer.gallery) {
                     mcpServer.gallery = undefined;
                     this._onChange.fire(mcpServer);
                 }
                 continue;
             }
+            const gallery = result.server;
+            const changed = mcpServer.gallery !== gallery;
+            this.rememberGallerySource(gallery);
             mcpServer.gallery = gallery;
-            if (!mcpServer.local.manifest) {
-                mcpServer.local = await this.mcpManagementService.updateMetadata(mcpServer.local, gallery);
+            if (changed) {
+                this._onChange.fire(mcpServer);
             }
-            this._onChange.fire(mcpServer);
         }
     }
     async queryGallery(options, token) {
@@ -371,10 +564,11 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 })
             };
         }
+        const registryGeneration = this.registryGeneration;
         const pager = await this.mcpGalleryService.query(options, token);
         const mapPage = page => ({
             items: ( page.items.map(
-                gallery => this.fromGallery(gallery) ?? this.instantiationService.createInstance(
+                gallery => this.fromGallery(gallery, registryGeneration) ?? this.instantiationService.createInstance(
                     McpWorkbenchServer,
                     e => this.getInstallState(e),
                     e => this.getRuntimeStatus(e),
@@ -394,7 +588,14 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         };
     }
     async queryLocal() {
+        await this.queryLocalForGeneration(++this.localQueryGeneration);
+        return [...this.local];
+    }
+    async queryLocalForGeneration(generation) {
         const installed = await this.mcpManagementService.getInstalled();
+        if (generation !== this.localQueryGeneration) {
+            return false;
+        }
         this._local = this.sort(( installed.map(i => {
             const existing = this._local.find(local => local.id === i.id);
             const local = existing ?? this.instantiationService.createInstance(
@@ -409,7 +610,15 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             return local;
         })));
         this._onChange.fire(undefined);
-        return [...this.local];
+        return true;
+    }
+    rememberGallerySource(gallery, registryGeneration = this.registryGeneration) {
+        if (registryGeneration === this.registryGeneration) {
+            this.gallerySourceGenerations.set(gallery, registryGeneration);
+        }
+    }
+    getTrustedGallerySource(gallery) {
+        return gallery && this.gallerySourceGenerations.get(gallery) === this.registryGeneration ? gallery : undefined;
     }
     addServer(server) {
         this._local.push(server);
@@ -418,13 +627,12 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
     sort(local) {
         return local.sort((a, b) => {
             if (a.name === b.name) {
-                if (!a.runtimeStatus || a.runtimeStatus.state === McpServerEnablementState.Enabled) {
-                    return -1;
+                const aEnabled = !a.runtimeStatus || a.runtimeStatus.state === McpServerEnablementState.Enabled;
+                const bEnabled = !b.runtimeStatus || b.runtimeStatus.state === McpServerEnablementState.Enabled;
+                if (aEnabled !== bEnabled) {
+                    return aEnabled ? -1 : 1;
                 }
-                if (!b.runtimeStatus || b.runtimeStatus.state === McpServerEnablementState.Enabled) {
-                    return 1;
-                }
-                return 0;
+                return a.id.localeCompare(b.id);
             }
             return a.name.localeCompare(b.name);
         });
@@ -450,7 +658,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             const existing = result.get(server.name);
             if (existing) {
                 this.logService.warn(( localize(
-                    12076,
+                    14052,
                     "Overwriting mcp server '{0}' from {1} with {2}.",
                     server.name,
                     server.mcpResource.path,
@@ -463,7 +671,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             const existing = result.get(server.name);
             if (existing) {
                 this.logService.warn(( localize(
-                    12076,
+                    14052,
                     "Overwriting mcp server '{0}' from {1} with {2}.",
                     server.name,
                     server.mcpResource.path,
@@ -476,7 +684,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
     }
     canInstall(mcpServer) {
         if (!(mcpServer instanceof McpWorkbenchServer)) {
-            return ( new MarkdownString()).appendText(( localize(12077, "The provided object is not an mcp server.")));
+            return ( new MarkdownString()).appendText(( localize(14053, "The provided object is not an mcp server.")));
         }
         if (mcpServer.gallery) {
             const result = this.mcpManagementService.canInstall(mcpServer.gallery);
@@ -493,7 +701,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             return result;
         }
         return ( new MarkdownString()).appendText(( localize(
-            12078,
+            14054,
             "Cannot install the '{0}' MCP Server because it is not available in this setup.",
             mcpServer.label
         )));
@@ -600,7 +808,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             id: USER_CONFIG_ID,
             key: "userLocalValue",
             target: ConfigurationTarget.USER_LOCAL,
-            label: ( localize(12079, "Global in {0}", this.productService.nameShort)),
+            label: ( localize(14055, "Global in {0}", this.productService.nameShort)),
             scope: StorageScope.PROFILE,
             order: McpCollectionSortOrder.User,
             uri: mcpResource,
@@ -676,24 +884,24 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         return false;
     }
     async handleMcpInstallUri(uri) {
-        let parsed;
-        try {
-            parsed = JSON.parse(decodeURIComponent(uri.query));
-        } catch (e) {
+        const parsed = parseMcpInstallUriPayload(uri.query);
+        if (!parsed) {
             return false;
         }
         try {
             const {
                 name,
                 inputs,
-                ...config
+                config
             } = parsed;
             if (config.gallery && this.mcpGalleryService.isEnabled()) {
                 try {
+                    const registryGeneration = this.registryGeneration;
                     const [galleryServer] = await this.mcpGalleryService.getMcpServersFromGallery([{
                         name
                     }]);
                     if (galleryServer) {
+                        this.rememberGallerySource(galleryServer, registryGeneration);
                         const local = this.local.find(e => e.name === galleryServer.name) ?? this.instantiationService.createInstance(
                             McpWorkbenchServer,
                             e => this.getInstallState(e),
@@ -712,9 +920,6 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     );
                 }
             }
-            if (config.type === undefined) {
-                config.type = parsed.command ? McpServerType.LOCAL : McpServerType.REMOTE;
-            }
             this.open(this.instantiationService.createInstance(
                 McpWorkbenchServer,
                 e => this.getInstallState(e),
@@ -753,6 +958,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
     }
     async handleMcpServerByName(name) {
         try {
+            const registryGeneration = this.registryGeneration;
             const [gallery] = await this.mcpGalleryService.getMcpServersFromGallery([{
                 name
             }]);
@@ -760,6 +966,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 this.logService.info(`MCP server '${name}' not found`);
                 return true;
             }
+            this.rememberGallerySource(gallery, registryGeneration);
             const local = this.local.find(e => e.name === gallery.name) ?? this.instantiationService.createInstance(
                 McpWorkbenchServer,
                 e => this.getInstallState(e),
@@ -812,7 +1019,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 state: McpServerEnablementState.DisabledProfile,
                 message: {
                     severity: Severity.Info,
-                    text: ( new MarkdownString(( localize(12080, "This MCP server is disabled."))))
+                    text: ( new MarkdownString(( localize(14056, "This MCP server is disabled."))))
                 }
             };
         }
@@ -821,7 +1028,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 state: McpServerEnablementState.DisabledWorkspace,
                 message: {
                     severity: Severity.Info,
-                    text: ( new MarkdownString(( localize(12081, "This MCP server is disabled for this workspace."))))
+                    text: ( new MarkdownString(( localize(14057, "This MCP server is disabled for this workspace."))))
                 }
             };
         }
@@ -841,7 +1048,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 message: {
                     severity: Severity.Warning,
                     text: ( new MarkdownString(( localize(
-                        12082,
+                        14058,
                         "This MCP Server is disabled because MCP servers are configured to be disabled in the Editor. Please check your [settings]({0}).",
                         settingsCommandLink
                     ))))
@@ -855,7 +1062,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     message: {
                         severity: Severity.Warning,
                         text: ( new MarkdownString(( localize(
-                            12083,
+                            14059,
                             "This MCP Server is disabled because it is configured to be disabled in the Editor. Please check your [settings]({0}).",
                             settingsCommandLink
                         ))))
@@ -869,7 +1076,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     message: {
                         severity: Severity.Warning,
                         text: ( new MarkdownString(( localize(
-                            12083,
+                            14059,
                             "This MCP Server is disabled because it is configured to be disabled in the Editor. Please check your [settings]({0}).",
                             settingsCommandLink
                         ))))

package/vscode/src/vs/workbench/contrib/mcp/browser/media/mcpServersView.css

@@ -29,7 +29,7 @@
 		.mcp-welcome-title {
 			font-size: 24px;
 			margin-top: 5px;
-			font-weight: 500;
+			font-weight: var(--vscode-fontWeight-semiBold);
 			line-height: normal;
 		}
 

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.js

@@ -13,7 +13,7 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { mcpContributionPoint, mcpActivationEvent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpServerDefinition, extensionPrefixedIdentifier, McpCollectionSortOrder, McpServerTrust } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { McpServerDefinition, extensionPrefixedIdentifier, McpCollectionSortOrder, McpServerTrust, McpCollectionProvenance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
 var ExtensionMcpDiscovery_1;
@@ -97,6 +97,7 @@ let ExtensionMcpDiscovery = ExtensionMcpDiscovery_1 = class ExtensionMcpDiscover
         const serverDefs = this.cachedServers.hasOwnProperty(id) ? this.cachedServers[id].servers : undefined;
         const dispo = this._mcpRegistry.registerCollection({
             id,
+            provenance: McpCollectionProvenance.Extension,
             label: coll.label,
             remoteAuthority: null,
             trustBehavior: McpServerTrust.Kind.Trusted,
@@ -142,20 +143,20 @@ let ExtensionMcpDiscovery = ExtensionMcpDiscovery_1 = class ExtensionMcpDiscover
     }
     static _validate(user) {
         if (!Array.isArray(user.value)) {
-            user.collector.error(( localize(12084, "Expected an array of MCP collections")));
+            user.collector.error(( localize(14060, "Expected an array of MCP collections")));
             return false;
         }
         for (const contribution of user.value) {
             if (typeof contribution.id !== "string" || isFalsyOrWhitespace(contribution.id)) {
-                user.collector.error(( localize(12085, "Expected 'id' to be a non-empty string.")));
+                user.collector.error(( localize(14061, "Expected 'id' to be a non-empty string.")));
                 return false;
             }
             if (typeof contribution.label !== "string" || isFalsyOrWhitespace(contribution.label)) {
-                user.collector.error(( localize(12086, "Expected 'label' to be a non-empty string.")));
+                user.collector.error(( localize(14062, "Expected 'label' to be a non-empty string.")));
                 return false;
             }
             if (contribution.when !== undefined && (typeof contribution.when !== "string" || isFalsyOrWhitespace(contribution.when))) {
-                user.collector.error(( localize(12087, "Expected 'when' to be a non-empty string.")));
+                user.collector.error(( localize(14063, "Expected 'when' to be a non-empty string.")));
                 return false;
             }
         }