@codingame/monaco-vscode-mcp-service-override 19.1.4 → 20.0.1

package/index.js

@@ -13,15 +13,15 @@ import { AuthenticationMcpAccessService } from './vscode/src/vs/workbench/servic
 import { IAuthenticationMcpUsageService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service';
 import { AuthenticationMcpUsageService } from './vscode/src/vs/workbench/services/authentication/browser/authenticationMcpUsageService.js';
 import { McpWorkbenchService } from './vscode/src/vs/workbench/contrib/mcp/browser/mcpWorkbenchService.js';
-import { IMcpManagementService, IMcpGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
+import { IAllowedMcpServersService, IMcpGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
 import { McpGalleryService } from './vscode/src/vs/platform/mcp/common/mcpGalleryService.js';
-import { McpManagementService } from './vscode/src/vs/platform/mcp/common/mcpManagementService.js';
 import { McpSamplingService } from './vscode/src/vs/workbench/contrib/mcp/common/mcpSamplingService.js';
 import { IMcpResourceScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpResourceScannerService.service';
 import { McpResourceScannerService } from './vscode/src/vs/platform/mcp/common/mcpResourceScannerService.js';
 import { McpElicitationService } from './vscode/src/vs/workbench/contrib/mcp/browser/mcpElicitationService.js';
 import { IWorkbenchMcpManagementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service';
-import { WorkbenchMcpManagementService } from './vscode/src/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.js';
+import { WorkbenchMcpManagementService } from './vscode/src/vs/workbench/services/mcp/browser/mcpWorkbenchManagementService.js';
+import { AllowedMcpServersService } from './vscode/src/vs/platform/mcp/common/allowedMcpServersService.js';
 
 function getServiceOverride() {
     return {
@@ -33,10 +33,10 @@ function getServiceOverride() {
         [IAuthenticationMcpUsageService.toString()]: new SyncDescriptor(AuthenticationMcpUsageService, [], true),
         [IMcpWorkbenchService.toString()]: new SyncDescriptor(McpWorkbenchService, [], true),
         [IMcpGalleryService.toString()]: new SyncDescriptor(McpGalleryService, [], true),
-        [IMcpManagementService.toString()]: new SyncDescriptor(McpManagementService, [], true),
         [IMcpSamplingService.toString()]: new SyncDescriptor(McpSamplingService, [], true),
         [IMcpElicitationService.toString()]: new SyncDescriptor(McpElicitationService, [], true),
-        [IWorkbenchMcpManagementService.toString()]: new SyncDescriptor(WorkbenchMcpManagementService, [], true)
+        [IWorkbenchMcpManagementService.toString()]: new SyncDescriptor(WorkbenchMcpManagementService, [], true),
+        [IAllowedMcpServersService.toString()]: new SyncDescriptor(AllowedMcpServersService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "19.1.4",
+  "version": "20.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,19 +15,20 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "19.1.4",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "19.1.4",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "19.1.4",
-    "@codingame/monaco-vscode-516ccb00-d5b9-5317-baf0-fcc96e99669a-common": "19.1.4",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "19.1.4",
-    "@codingame/monaco-vscode-937ecbdf-94c7-5b16-aefa-ad78ae557a93-common": "19.1.4",
-    "@codingame/monaco-vscode-9911aec2-e4dd-5483-8369-9d695cc70d8a-common": "19.1.4",
-    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "19.1.4",
-    "@codingame/monaco-vscode-api": "19.1.4",
-    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "19.1.4",
-    "@codingame/monaco-vscode-cf77987b-b1b7-5359-aaf8-a259c63d9f03-common": "19.1.4",
-    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "19.1.4",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "19.1.4"
+    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "20.0.1",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "20.0.1",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.0.1",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.0.1",
+    "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common": "20.0.1",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.0.1",
+    "@codingame/monaco-vscode-api": "20.0.1",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "20.0.1",
+    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.0.1",
+    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "20.0.1",
+    "@codingame/monaco-vscode-cf77987b-b1b7-5359-aaf8-a259c63d9f03-common": "20.0.1",
+    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.0.1",
+    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "20.0.1",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "20.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/mcp/common/allowedMcpServersService.d.ts

@@ -0,0 +1,13 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IGalleryMcpServer, IInstallableMcpServer, ILocalMcpServer } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IAllowedMcpServersService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service";
+export declare class AllowedMcpServersService extends Disposable implements IAllowedMcpServersService {
+    private readonly configurationService;
+    _serviceBrand: undefined;
+    private _onDidChangeAllowedMcpServers;
+    readonly onDidChangeAllowedMcpServers: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    constructor(configurationService: IConfigurationService);
+    isAllowed(mcpServer: IGalleryMcpServer | ILocalMcpServer | IInstallableMcpServer): true | IMarkdownString;
+}

package/vscode/src/vs/platform/mcp/common/allowedMcpServersService.js

@@ -0,0 +1,42 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { mcpEnabledConfig } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
+
+let AllowedMcpServersService = class AllowedMcpServersService extends Disposable {
+    constructor(configurationService) {
+        super();
+        this.configurationService = configurationService;
+        this._onDidChangeAllowedMcpServers = this._register(( new Emitter()));
+        this.onDidChangeAllowedMcpServers = this._onDidChangeAllowedMcpServers.event;
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(mcpEnabledConfig)) {
+                this._onDidChangeAllowedMcpServers.fire();
+            }
+        }));
+    }
+    isAllowed(mcpServer) {
+        const isEnabled = this.configurationService.getValue(mcpEnabledConfig) === true;
+        if (isEnabled) {
+            return true;
+        }
+        const settingsCommandLink = ( ( URI.parse(
+            `command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify({ query: `@id:${mcpEnabledConfig}` }))}`
+        )).toString());
+        return (new MarkdownString(localize(
+            1966,
+            "Model Context Protocol servers are disabled in the Editor. Please check your [settings]({0}).",
+            settingsCommandLink
+        )));
+    }
+};
+AllowedMcpServersService = ( __decorate([
+    ( __param(0, IConfigurationService))
+], AllowedMcpServersService));
+
+export { AllowedMcpServersService };

package/vscode/src/vs/platform/mcp/common/mcpGalleryService.js

@@ -84,7 +84,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
     async getReadme(gallery, token) {
         const readmeUrl = gallery.readmeUrl;
         if (!readmeUrl) {
-            return Promise.resolve(( localize(1954, 'No README available')));
+            return Promise.resolve(( localize(1967, 'No README available')));
         }
         const uri = ( URI.parse(readmeUrl));
         if (uri.scheme === Schemas.file) {
@@ -97,7 +97,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
             }
         }
         if (uri.authority !== 'raw.githubusercontent.com') {
-            return ( new MarkdownString(( localize(1955, "You can find information about this server [here]({0})", readmeUrl)))).value;
+            return ( new MarkdownString(( localize(1968, "You can find information about this server [here]({0})", readmeUrl)))).value;
         }
         const context = await this.requestService.request({
             type: 'GET',
@@ -118,6 +118,22 @@ let McpGalleryService = class McpGalleryService extends Disposable {
                 publisher = domainParts[domainParts.length - 1];
             }
         }
+        let icon;
+        const mcpGalleryUrl = this.getMcpGalleryUrl();
+        if (mcpGalleryUrl && this.productService.extensionsGallery?.mcpUrl !== mcpGalleryUrl) {
+            if (item.iconUrl) {
+                icon = {
+                    light: item.iconUrl,
+                    dark: item.iconUrl
+                };
+            }
+            if (item.iconUrlLight && item.iconUrlDark) {
+                icon = {
+                    light: item.iconUrlLight,
+                    dark: item.iconUrlDark
+                };
+            }
+        }
         return {
             id: item.id ?? item.name,
             name: item.name,
@@ -128,6 +144,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
             lastUpdated: item.version_detail ? Date.parse(item.version_detail.release_date) : undefined,
             repositoryUrl: item.repository?.url,
             codicon: item.codicon,
+            icon,
             readmeUrl: item.readmeUrl,
             manifestUrl: this.getManifestUrl(item),
             packageTypes: item.package_types ?? [],

package/vscode/src/vs/platform/mcp/common/mcpManagementIpc.d.ts

@@ -1,10 +1,11 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IURITransformer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uriIpc";
 import { IChannel, IServerChannel } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
 import { DidUninstallMcpServerEvent, IGalleryMcpServer, ILocalMcpServer, IInstallableMcpServer, InstallMcpServerEvent, InstallMcpServerResult, InstallOptions, UninstallMcpServerEvent, UninstallOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IAllowedMcpServersService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service";
 import { IMcpManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service";
+import { AbstractMcpManagementService } from "./mcpManagementService.js";
 export declare class McpManagementChannel implements IServerChannel {
     private service;
     private getUriTransformer;
@@ -17,7 +18,7 @@ export declare class McpManagementChannel implements IServerChannel {
     listen(context: any, event: string): Event<any>;
     call(context: any, command: string, args?: any): Promise<any>;
 }
-export declare class McpManagementChannelClient extends Disposable implements IMcpManagementService {
+export declare class McpManagementChannelClient extends AbstractMcpManagementService implements IMcpManagementService {
     private readonly channel;
     readonly _serviceBrand: undefined;
     private readonly _onInstallMcpServer;
@@ -30,7 +31,7 @@ export declare class McpManagementChannelClient extends Disposable implements IM
     get onDidUninstallMcpServer(): Event<DidUninstallMcpServerEvent>;
     private readonly _onDidUpdateMcpServers;
     get onDidUpdateMcpServers(): Event<InstallMcpServerResult[]>;
-    constructor(channel: IChannel);
+    constructor(channel: IChannel, allowedMcpServersService: IAllowedMcpServersService);
     install(server: IInstallableMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
     installFromGallery(extension: IGalleryMcpServer, installOptions?: InstallOptions): Promise<ILocalMcpServer>;
     uninstall(extension: ILocalMcpServer, options?: UninstallOptions): Promise<void>;

package/vscode/src/vs/platform/mcp/common/mcpManagementIpc.js

@@ -1,9 +1,11 @@
 
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { DefaultURITransformer, transformAndReviveIncomingURIs } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uriIpc';
+import { IAllowedMcpServersService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
+import { AbstractMcpManagementService } from './mcpManagementService.js';
 
 function transformIncomingURI(uri, transformer) {
     return uri ? URI.revive(uri) : undefined;
@@ -14,14 +16,14 @@ function transformIncomingServer(mcpServer, transformer) {
     const transformed = transformAndReviveIncomingURIs({ ...mcpServer, ...{ manifest: undefined } }, transformer);
     return { ...transformed, ...{ manifest } };
 }
-class McpManagementChannelClient extends Disposable {
+let McpManagementChannelClient = class McpManagementChannelClient extends AbstractMcpManagementService {
     get onInstallMcpServer() { return this._onInstallMcpServer.event; }
     get onDidInstallMcpServers() { return this._onDidInstallMcpServers.event; }
     get onUninstallMcpServer() { return this._onUninstallMcpServer.event; }
     get onDidUninstallMcpServer() { return this._onDidUninstallMcpServer.event; }
     get onDidUpdateMcpServers() { return this._onDidUpdateMcpServers.event; }
-    constructor(channel) {
-        super();
+    constructor(channel, allowedMcpServersService) {
+        super(allowedMcpServersService);
         this.channel = channel;
         this._onInstallMcpServer = this._register(( new Emitter()));
         this._onDidInstallMcpServers = this._register(( new Emitter()));
@@ -54,6 +56,9 @@ class McpManagementChannelClient extends Disposable {
     updateMetadata(local, gallery, mcpResource) {
         return Promise.resolve(this.channel.call('updateMetadata', [local, gallery, mcpResource])).then(local => transformIncomingServer(local, null));
     }
-}
+};
+McpManagementChannelClient = ( __decorate([
+    ( __param(1, IAllowedMcpServersService))
+], McpManagementChannelClient));
 
 export { McpManagementChannelClient };

package/vscode/src/vs/platform/mcp/common/mcpManagementService.d.ts

@@ -1,4 +1,5 @@
-import { Emitter } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { Emitter, Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
+import { IMarkdownString } from "@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
@@ -8,9 +9,10 @@ import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IUserDataProfilesService } from "@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service";
 import { DidUninstallMcpServerEvent, IGalleryMcpServer, ILocalMcpServer, IMcpServerManifest, InstallMcpServerEvent, InstallMcpServerResult, PackageType, UninstallMcpServerEvent, InstallOptions, UninstallOptions, IInstallableMcpServer } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IAllowedMcpServersService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service";
 import { IMcpManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service";
 import { IMcpGalleryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service";
-import { IMcpServerVariable, IMcpServerConfiguration } from "./mcpPlatformTypes.js";
+import { IMcpServerVariable, IMcpServerConfiguration } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpPlatformTypes";
 import { McpResourceTarget } from "./mcpResourceScannerService.js";
 import { IMcpResourceScannerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpResourceScannerService.service";
 export interface ILocalMcpServerInfo {
@@ -33,7 +35,7 @@ export interface ILocalMcpServerInfo {
     location?: URI;
     licenseUrl?: string;
 }
-export declare abstract class AbstractMcpResourceManagementService extends Disposable implements IMcpManagementService {
+export declare abstract class AbstractMcpResourceManagementService extends Disposable {
     protected readonly mcpResource: URI;
     protected readonly target: McpResourceTarget;
     protected readonly mcpGalleryService: IMcpGalleryService;
@@ -46,15 +48,15 @@ export declare abstract class AbstractMcpResourceManagementService extends Dispo
     private readonly reloadConfigurationScheduler;
     private local;
     protected readonly _onInstallMcpServer: Emitter<InstallMcpServerEvent>;
-    readonly onInstallMcpServer: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<InstallMcpServerEvent>;
+    readonly onInstallMcpServer: Event<InstallMcpServerEvent>;
     protected readonly _onDidInstallMcpServers: Emitter<InstallMcpServerResult[]>;
-    get onDidInstallMcpServers(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<InstallMcpServerResult[]>;
+    get onDidInstallMcpServers(): Event<InstallMcpServerResult[]>;
     protected readonly _onDidUpdateMcpServers: Emitter<InstallMcpServerResult[]>;
-    get onDidUpdateMcpServers(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<InstallMcpServerResult[]>;
+    get onDidUpdateMcpServers(): Event<InstallMcpServerResult[]>;
     protected readonly _onUninstallMcpServer: Emitter<UninstallMcpServerEvent>;
-    get onUninstallMcpServer(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<UninstallMcpServerEvent>;
+    get onUninstallMcpServer(): Event<UninstallMcpServerEvent>;
     protected _onDidUninstallMcpServer: Emitter<DidUninstallMcpServerEvent>;
-    get onDidUninstallMcpServer(): import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<DidUninstallMcpServerEvent>;
+    get onDidUninstallMcpServer(): Event<DidUninstallMcpServerEvent>;
     constructor(mcpResource: URI, target: McpResourceTarget, mcpGalleryService: IMcpGalleryService, fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService, mcpResourceScannerService: IMcpResourceScannerService);
     private initialize;
     private populateLocalServers;
@@ -73,32 +75,49 @@ export declare abstract class AbstractMcpResourceManagementService extends Dispo
     abstract installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
     abstract updateMetadata(local: ILocalMcpServer, server: IGalleryMcpServer, profileLocation: URI): Promise<ILocalMcpServer>;
     protected abstract getLocalServerInfo(name: string, mcpServerConfig: IMcpServerConfiguration): Promise<ILocalMcpServerInfo | undefined>;
+    protected abstract installFromUri(uri: URI, options?: Omit<InstallOptions, "mcpResource">): Promise<ILocalMcpServer>;
 }
-export declare class McpUserResourceManagementService extends AbstractMcpResourceManagementService implements IMcpManagementService {
-    private readonly mcpLocation;
+export declare class McpUserResourceManagementService extends AbstractMcpResourceManagementService {
+    protected readonly mcpLocation: URI;
     constructor(mcpResource: URI, mcpGalleryService: IMcpGalleryService, fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService, mcpResourceScannerService: IMcpResourceScannerService, environmentService: IEnvironmentService);
     installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
     updateMetadata(local: ILocalMcpServer, gallery: IGalleryMcpServer): Promise<ILocalMcpServer>;
     private updateMetadataFromGallery;
     protected getLocalServerInfo(name: string, mcpServerConfig: IMcpServerConfiguration): Promise<ILocalMcpServerInfo | undefined>;
-    private getLocation;
+    protected getLocation(name: string, version?: string): URI;
+    protected installFromUri(uri: URI, options?: Omit<InstallOptions, "mcpResource">): Promise<ILocalMcpServer>;
 }
-export declare class McpManagementService extends Disposable implements IMcpManagementService {
-    private readonly userDataProfilesService;
-    private readonly instantiationService;
+export declare abstract class AbstractMcpManagementService extends Disposable implements IMcpManagementService {
+    protected readonly allowedMcpServersService: IAllowedMcpServersService;
     readonly _serviceBrand: undefined;
+    constructor(allowedMcpServersService: IAllowedMcpServersService);
+    canInstall(server: IGalleryMcpServer | IInstallableMcpServer): true | IMarkdownString;
+    abstract onInstallMcpServer: Event<InstallMcpServerEvent>;
+    abstract onDidInstallMcpServers: Event<readonly InstallMcpServerResult[]>;
+    abstract onDidUpdateMcpServers: Event<readonly InstallMcpServerResult[]>;
+    abstract onUninstallMcpServer: Event<UninstallMcpServerEvent>;
+    abstract onDidUninstallMcpServer: Event<DidUninstallMcpServerEvent>;
+    abstract getInstalled(mcpResource?: URI): Promise<ILocalMcpServer[]>;
+    abstract install(server: IInstallableMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
+    abstract installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
+    abstract updateMetadata(local: ILocalMcpServer, server: IGalleryMcpServer, profileLocation?: URI): Promise<ILocalMcpServer>;
+    abstract uninstall(server: ILocalMcpServer, options?: UninstallOptions): Promise<void>;
+}
+export declare class McpManagementService extends AbstractMcpManagementService implements IMcpManagementService {
+    private readonly userDataProfilesService;
+    protected readonly instantiationService: IInstantiationService;
     private readonly _onInstallMcpServer;
-    readonly onInstallMcpServer: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<InstallMcpServerEvent>;
+    readonly onInstallMcpServer: Event<InstallMcpServerEvent>;
     private readonly _onDidInstallMcpServers;
-    readonly onDidInstallMcpServers: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<readonly InstallMcpServerResult[]>;
+    readonly onDidInstallMcpServers: Event<readonly InstallMcpServerResult[]>;
     private readonly _onDidUpdateMcpServers;
-    readonly onDidUpdateMcpServers: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<readonly InstallMcpServerResult[]>;
+    readonly onDidUpdateMcpServers: Event<readonly InstallMcpServerResult[]>;
     private readonly _onUninstallMcpServer;
-    readonly onUninstallMcpServer: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<UninstallMcpServerEvent>;
+    readonly onUninstallMcpServer: Event<UninstallMcpServerEvent>;
     private readonly _onDidUninstallMcpServer;
-    readonly onDidUninstallMcpServer: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<DidUninstallMcpServerEvent>;
+    readonly onDidUninstallMcpServer: Event<DidUninstallMcpServerEvent>;
     private readonly mcpResourceManagementServices;
-    constructor(userDataProfilesService: IUserDataProfilesService, instantiationService: IInstantiationService);
+    constructor(allowedMcpServersService: IAllowedMcpServersService, userDataProfilesService: IUserDataProfilesService, instantiationService: IInstantiationService);
     private getMcpResourceManagementService;
     getInstalled(mcpResource?: URI): Promise<ILocalMcpServer[]>;
     install(server: IInstallableMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
@@ -106,4 +125,5 @@ export declare class McpManagementService extends Disposable implements IMcpMana
     installFromGallery(server: IGalleryMcpServer, options?: InstallOptions): Promise<ILocalMcpServer>;
     updateMetadata(local: ILocalMcpServer, gallery: IGalleryMcpServer, mcpResource?: URI): Promise<ILocalMcpServer>;
     dispose(): void;
+    protected createMcpResourceManagementService(mcpResource: URI): McpUserResourceManagementService;
 }

package/vscode/src/vs/platform/mcp/common/mcpManagementService.js

@@ -4,10 +4,12 @@ import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/co
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 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';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
@@ -16,8 +18,8 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { PackageType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
-import { IMcpGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
-import { McpServerType, McpServerVariableType } from './mcpPlatformTypes.js';
+import { IMcpGalleryService, IAllowedMcpServersService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
+import { McpServerType, McpServerVariableType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpPlatformTypes';
 import { IMcpResourceScannerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpResourceScannerService.service';
 
 let AbstractMcpResourceManagementService = class AbstractMcpResourceManagementService extends Disposable {
@@ -46,8 +48,12 @@ let AbstractMcpResourceManagementService = class AbstractMcpResourceManagementSe
     initialize() {
         if (!this.initializePromise) {
             this.initializePromise = (async () => {
-                this.local = await this.populateLocalServers();
-                this.startWatching();
+                try {
+                    this.local = await this.populateLocalServers();
+                }
+                finally {
+                    this.startWatching();
+                }
             })();
         }
         return this.initializePromise;
@@ -134,7 +140,6 @@ let AbstractMcpResourceManagementService = class AbstractMcpResourceManagementSe
             mcpResource: this.mcpResource,
             version: mcpServerInfo.version,
             location: mcpServerInfo.location,
-            id: mcpServerInfo.id,
             displayName: mcpServerInfo.displayName,
             description: mcpServerInfo.description,
             publisher: mcpServerInfo.publisher,
@@ -269,6 +274,12 @@ let AbstractMcpResourceManagementService = class AbstractMcpResourceManagementSe
             else if (serverPackage.registry_name === PackageType.DOCKER) {
                 args.push(serverPackage.version ? `${serverPackage.name}:${serverPackage.version}` : serverPackage.name);
             }
+            else if (serverPackage.registry_name === PackageType.NUGET) {
+                args.push(serverPackage.version ? `${serverPackage.name}@${serverPackage.version}` : serverPackage.name);
+            }
+            if (serverPackage.package_arguments && serverPackage.registry_name === PackageType.NUGET) {
+                args.push('--');
+            }
             for (const arg of serverPackage.package_arguments ?? []) {
                 const variables = arg.variables ? this.getVariables(arg.variables) : [];
                 if (arg.type === 'positional') {
@@ -311,6 +322,7 @@ let AbstractMcpResourceManagementService = class AbstractMcpResourceManagementSe
             case PackageType.NODE: return 'npx';
             case PackageType.DOCKER: return 'docker';
             case PackageType.PYTHON: return 'uvx';
+            case PackageType.NUGET: return 'dnx';
         }
         return packageType;
     }
@@ -430,6 +442,9 @@ let McpUserResourceManagementService = class McpUserResourceManagementService ex
         name = name.replace('/', '.');
         return this.uriIdentityService.extUri.joinPath(this.mcpLocation, version ? `${name}-${version}` : name);
     }
+    installFromUri(uri, options) {
+        throw ( new Error('Method not supported.'));
+    }
 };
 McpUserResourceManagementService = ( __decorate([
     ( __param(1, IMcpGalleryService)),
@@ -439,9 +454,29 @@ McpUserResourceManagementService = ( __decorate([
     ( __param(5, IMcpResourceScannerService)),
     ( __param(6, IEnvironmentService))
 ], McpUserResourceManagementService));
-let McpManagementService = class McpManagementService extends Disposable {
-    constructor(userDataProfilesService, instantiationService) {
+let AbstractMcpManagementService = class AbstractMcpManagementService extends Disposable {
+    constructor(allowedMcpServersService) {
         super();
+        this.allowedMcpServersService = allowedMcpServersService;
+    }
+    canInstall(server) {
+        const allowedToInstall = this.allowedMcpServersService.isAllowed(server);
+        if (allowedToInstall !== true) {
+            return (new MarkdownString(localize(
+                1969,
+                "This mcp server cannot be installed because {0}",
+                allowedToInstall.value
+            )));
+        }
+        return true;
+    }
+};
+AbstractMcpManagementService = ( __decorate([
+    ( __param(0, IAllowedMcpServersService))
+], AbstractMcpManagementService));
+let McpManagementService = class McpManagementService extends AbstractMcpManagementService {
+    constructor(allowedMcpServersService, userDataProfilesService, instantiationService) {
+        super(allowedMcpServersService);
         this.userDataProfilesService = userDataProfilesService;
         this.instantiationService = instantiationService;
         this._onInstallMcpServer = this._register(( new Emitter()));
@@ -460,7 +495,7 @@ let McpManagementService = class McpManagementService extends Disposable {
         let mcpResourceManagementService = this.mcpResourceManagementServices.get(mcpResource);
         if (!mcpResourceManagementService) {
             const disposables = ( new DisposableStore());
-            const service = disposables.add(this.instantiationService.createInstance(McpUserResourceManagementService, mcpResource));
+            const service = disposables.add(this.createMcpResourceManagementService(mcpResource));
             disposables.add(service.onInstallMcpServer(e => this._onInstallMcpServer.fire(e)));
             disposables.add(service.onDidInstallMcpServers(e => this._onDidInstallMcpServers.fire(e)));
             disposables.add(service.onDidUpdateMcpServers(e => this._onDidUpdateMcpServers.fire(e)));
@@ -494,10 +529,14 @@ let McpManagementService = class McpManagementService extends Disposable {
         this.mcpResourceManagementServices.clear();
         super.dispose();
     }
+    createMcpResourceManagementService(mcpResource) {
+        return this.instantiationService.createInstance(McpUserResourceManagementService, mcpResource);
+    }
 };
 McpManagementService = ( __decorate([
-    ( __param(0, IUserDataProfilesService)),
-    ( __param(1, IInstantiationService))
+    ( __param(0, IAllowedMcpServersService)),
+    ( __param(1, IUserDataProfilesService)),
+    ( __param(2, IInstantiationService))
 ], McpManagementService));
 
-export { AbstractMcpResourceManagementService, McpManagementService, McpUserResourceManagementService };
+export { AbstractMcpManagementService, AbstractMcpResourceManagementService, McpManagementService, McpUserResourceManagementService };

package/vscode/src/vs/platform/mcp/common/mcpResourceScannerService.d.ts

@@ -6,7 +6,7 @@ import { ConfigurationTarget } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IInstallableMcpServer } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
-import { IMcpServerConfiguration, IMcpServerVariable } from "./mcpPlatformTypes.js";
+import { IMcpServerConfiguration, IMcpServerVariable } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpPlatformTypes";
 import { IMcpResourceScannerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpResourceScannerService.service";
 export interface IScannedMcpServers {
     servers?: IStringDictionary<Mutable<IMcpServerConfiguration>>;

package/vscode/src/vs/platform/mcp/common/mcpResourceScannerService.js

@@ -11,7 +11,7 @@ import { toFileOperationResult, FileOperationResult } from '@codingame/monaco-vs
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { McpServerType } from './mcpPlatformTypes.js';
+import { McpServerType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpPlatformTypes';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 let McpResourceScannerService = class McpResourceScannerService extends Disposable {
@@ -57,7 +57,7 @@ let McpResourceScannerService = class McpResourceScannerService extends Disposab
             try {
                 const content = await this.fileService.readFile(mcpResource);
                 const errors = [];
-                const result = parse(( content.value.toString()), errors, { allowTrailingComma: true, allowEmptyContent: true });
+                const result = parse(( content.value.toString()), errors, { allowTrailingComma: true, allowEmptyContent: true }) || {};
                 if (errors.length > 0) {
                     throw ( new Error('Failed to parse scanned MCP servers: ' + errors.join(', ')));
                 }

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

@@ -20,6 +20,7 @@ import { mcpServerSchema } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7a
 import { McpContextKeysController } from '../common/mcpContextKeys.js';
 import '../common/mcpDevMode.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { McpLanguageModelToolContribution } from '../common/mcpLanguageModelToolContribution.js';
 import '../common/mcpRegistry.js';
 import { McpResourceFilesystem } from '../common/mcpResourceFilesystem.js';
 import '../common/mcpSamplingService.js';
@@ -44,6 +45,7 @@ registerWorkbenchContribution2('mcpDiscovery', McpDiscovery, WorkbenchPhase.Afte
 registerWorkbenchContribution2('mcpContextKeys', McpContextKeysController, WorkbenchPhase.BlockRestore);
 registerWorkbenchContribution2('mcpLanguageFeatures', McpLanguageFeatures, WorkbenchPhase.Eventually);
 registerWorkbenchContribution2('mcpResourceFilesystem', McpResourceFilesystem, WorkbenchPhase.BlockRestore);
+registerWorkbenchContribution2(McpLanguageModelToolContribution.ID, McpLanguageModelToolContribution, WorkbenchPhase.AfterRestored);
 registerAction2(ListMcpServerCommand);
 registerAction2(McpServerOptionsCommand);
 registerAction2(ResetMcpTrustCommand);
@@ -73,15 +75,15 @@ registerWorkbenchContribution2(McpConfigMigrationContribution.ID, McpConfigMigra
 registerWorkbenchContribution2(McpServersViewsContribution.ID, McpServersViewsContribution, WorkbenchPhase.AfterRestored);
 const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(7930, "MCP Server"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(8057, "MCP Server"))), [
     ( new SyncDescriptor(McpServerEditorInput))
 ]);
 ( Registry.as(Extensions$1.Quickaccess)).registerQuickAccessProvider({
     ctor: McpResourceQuickAccess,
     prefix: McpResourceQuickAccess.PREFIX,
-    placeholder: ( localize(7931, "Filter to an MCP resource")),
+    placeholder: ( localize(8058, "Filter to an MCP resource")),
     helpEntries: [{
-            description: ( localize(7932, "MCP Server Resources")),
+            description: ( localize(8059, "MCP Server Resources")),
             commandId: McpCommandIds.AddConfiguration
         }]
 });

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

@@ -30,10 +30,10 @@ let McpAddContextContribution = class McpAddContextContribution extends Disposab
     _registerAddContextMenu() {
         this._addContextMenu.value = this._chatContextPickService.registerChatContextItem({
             type: 'pickerPick',
-            label: ( localize(7933, "MCP Resources...")),
+            label: ( localize(8060, "MCP Resources...")),
             icon: Codicon.mcp,
             asPicker: () => ({
-                placeholder: ( localize(7934, "Select MCP Resource...")),
+                placeholder: ( localize(8061, "Select MCP Resource...")),
                 picks: (_query, token) => this._getResourcePicks(token),
             }),
         });

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpCommands.d.ts

@@ -4,6 +4,7 @@ import { IActionViewItemService } from "@codingame/monaco-vscode-api/vscode/vs/p
 import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { ConfigurationTarget } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { StorageScope } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
@@ -20,7 +21,7 @@ export declare class McpServerOptionsCommand extends Action2 {
     private _handleAuth;
 }
 export declare class MCPServerActionRendering extends Disposable implements IWorkbenchContribution {
-    constructor(actionViewItemService: IActionViewItemService, mcpService: IMcpService, instaService: IInstantiationService, commandService: ICommandService);
+    constructor(actionViewItemService: IActionViewItemService, mcpService: IMcpService, instaService: IInstantiationService, commandService: ICommandService, configurationService: IConfigurationService);
 }
 export declare class ResetMcpTrustCommand extends Action2 {
     constructor();