@codingame/monaco-vscode-mcp-service-override 20.5.0 → 21.0.1

package/index.js

@@ -22,6 +22,8 @@ import { McpElicitationService } from './vscode/src/vs/workbench/contrib/mcp/bro
 import { IWorkbenchMcpManagementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service';
 import { WorkbenchMcpManagementService } from './vscode/src/vs/workbench/services/mcp/browser/mcpWorkbenchManagementService.js';
 import { AllowedMcpServersService } from './vscode/src/vs/platform/mcp/common/allowedMcpServersService.js';
+import { IMcpGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service';
+import { WebMcpGalleryManifestService } from './vscode/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.js';
 
 function getServiceOverride() {
     return {
@@ -36,7 +38,8 @@ function getServiceOverride() {
         [IMcpSamplingService.toString()]: new SyncDescriptor(McpSamplingService, [], true),
         [IMcpElicitationService.toString()]: new SyncDescriptor(McpElicitationService, [], true),
         [IWorkbenchMcpManagementService.toString()]: new SyncDescriptor(WorkbenchMcpManagementService, [], true),
-        [IAllowedMcpServersService.toString()]: new SyncDescriptor(AllowedMcpServersService, [], true)
+        [IAllowedMcpServersService.toString()]: new SyncDescriptor(AllowedMcpServersService, [], true),
+        [IMcpGalleryManifestService.toString()]: new SyncDescriptor(WebMcpGalleryManifestService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "20.5.0",
+  "version": "21.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,20 +15,20 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "20.5.0",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "20.5.0",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.5.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.5.0",
-    "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common": "20.5.0",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.5.0",
-    "@codingame/monaco-vscode-api": "20.5.0",
-    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "20.5.0",
-    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "20.5.0",
-    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "20.5.0",
-    "@codingame/monaco-vscode-cf77987b-b1b7-5359-aaf8-a259c63d9f03-common": "20.5.0",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.5.0",
-    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "20.5.0",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "20.5.0"
+    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "21.0.1",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "21.0.1",
+    "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common": "21.0.1",
+    "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common": "21.0.1",
+    "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common": "21.0.1",
+    "@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common": "21.0.1",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "21.0.1",
+    "@codingame/monaco-vscode-api": "21.0.1",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "21.0.1",
+    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "21.0.1",
+    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "21.0.1",
+    "@codingame/monaco-vscode-cf77987b-b1b7-5359-aaf8-a259c63d9f03-common": "21.0.1",
+    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "21.0.1",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "21.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -6,7 +6,7 @@ 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';
+import { mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
 
 let AllowedMcpServersService = class AllowedMcpServersService extends Disposable {
     constructor(configurationService) {
@@ -15,21 +15,20 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
         this._onDidChangeAllowedMcpServers = this._register(( new Emitter()));
         this.onDidChangeAllowedMcpServers = this._onDidChangeAllowedMcpServers.event;
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(mcpEnabledConfig)) {
+            if (e.affectsConfiguration(mcpAccessConfig)) {
                 this._onDidChangeAllowedMcpServers.fire();
             }
         }));
     }
     isAllowed(mcpServer) {
-        const isEnabled = this.configurationService.getValue(mcpEnabledConfig) === true;
-        if (isEnabled) {
+        if (this.configurationService.getValue(mcpAccessConfig) !== McpAccessValue.None) {
             return true;
         }
         const settingsCommandLink = ( ( URI.parse(
-            `command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify({ query: `@id:${mcpEnabledConfig}` }))}`
+            `command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify({ query: `@id:${mcpAccessConfig}` }))}`
         )).toString());
         return (new MarkdownString(localize(
-            1966,
+            1970,
             "Model Context Protocol servers are disabled in the Editor. Please check your [settings]({0}).",
             settingsCommandLink
         )));

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

@@ -0,0 +1,15 @@
+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 { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
+import { IMcpGalleryManifest, McpGalleryManifestStatus } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest";
+import { IMcpGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service";
+export declare class McpGalleryManifestService extends Disposable implements IMcpGalleryManifestService {
+    protected readonly productService: IProductService;
+    readonly _serviceBrand: undefined;
+    readonly onDidChangeMcpGalleryManifest: Event<any>;
+    readonly onDidChangeMcpGalleryManifestStatus: Event<any>;
+    get mcpGalleryManifestStatus(): McpGalleryManifestStatus;
+    constructor(productService: IProductService);
+    getMcpGalleryManifest(): Promise<IMcpGalleryManifest | null>;
+    protected createMcpGalleryManifest(url: string): IMcpGalleryManifest;
+}

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

@@ -0,0 +1,52 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+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 { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
+import { McpGalleryManifestStatus, McpGalleryResourceType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest';
+
+let McpGalleryManifestService = class McpGalleryManifestService extends Disposable {
+    get mcpGalleryManifestStatus() {
+        return !!this.productService.mcpGallery?.serviceUrl ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
+    }
+    constructor(productService) {
+        super();
+        this.productService = productService;
+        this.onDidChangeMcpGalleryManifest = Event.None;
+        this.onDidChangeMcpGalleryManifestStatus = Event.None;
+    }
+    async getMcpGalleryManifest() {
+        if (!this.productService.mcpGallery) {
+            return null;
+        }
+        return this.createMcpGalleryManifest(this.productService.mcpGallery.serviceUrl);
+    }
+    createMcpGalleryManifest(url) {
+        url = url.endsWith('/') ? url.slice(0, -1) : url;
+        const isVSCodeGalleryUrl = this.productService.extensionsGallery?.mcpUrl === url;
+        const version = isVSCodeGalleryUrl ? undefined : 'v0';
+        const serversUrl = isVSCodeGalleryUrl ? url : `${url}/${version}/servers`;
+        const resources = [
+            {
+                id: serversUrl,
+                type: McpGalleryResourceType.McpQueryService
+            }
+        ];
+        if (!isVSCodeGalleryUrl) {
+            resources.push({
+                id: `${serversUrl}/{id}`,
+                type: McpGalleryResourceType.McpServerManifestUri
+            });
+        }
+        return {
+            version,
+            url,
+            resources
+        };
+    }
+};
+McpGalleryManifestService = ( __decorate([
+    ( __param(0, IProductService))
+], McpGalleryManifestService));
+
+export { McpGalleryManifestService };

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

@@ -1,27 +1,34 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
-import { IGalleryMcpServer, IMcpServerManifest, IQueryOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IGalleryMcpServer, IGalleryMcpServerConfiguration, IQueryOptions } 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 { IMcpGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service";
+import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
 export declare class McpGalleryService extends Disposable implements IMcpGalleryService {
-    private readonly configurationService;
     private readonly requestService;
     private readonly fileService;
     private readonly productService;
     private readonly logService;
+    private readonly mcpGalleryManifestService;
     _serviceBrand: undefined;
-    constructor(configurationService: IConfigurationService, requestService: IRequestService, fileService: IFileService, productService: IProductService, logService: ILogService);
+    constructor(requestService: IRequestService, fileService: IFileService, productService: IProductService, logService: ILogService, mcpGalleryManifestService: IMcpGalleryManifestService);
     isEnabled(): boolean;
-    query(options?: IQueryOptions, token?: CancellationToken): Promise<IGalleryMcpServer[]>;
-    getMcpServers(names: string[]): Promise<IGalleryMcpServer[]>;
-    getManifest(gallery: IGalleryMcpServer, token: CancellationToken): Promise<IMcpServerManifest>;
+    query(options?: IQueryOptions, token?: CancellationToken): Promise<IPager<IGalleryMcpServer>>;
+    getMcpServersFromGallery(urls: string[]): Promise<IGalleryMcpServer[]>;
+    getMcpServersFromVSCodeGallery(names: string[]): Promise<IGalleryMcpServer[]>;
+    getMcpServerConfiguration(gallery: IGalleryMcpServer, token: CancellationToken): Promise<IGalleryMcpServerConfiguration>;
     getReadme(gallery: IGalleryMcpServer, token: CancellationToken): Promise<string>;
     private toGalleryMcpServer;
-    private fetchGallery;
-    private getManifestUrl;
+    private toGalleryMcpServerConfiguration;
+    private queryGalleryMcpServers;
+    private queryRawGalleryMcpServers;
+    getMcpServer(mcpServerUrl: string): Promise<IGalleryMcpServer | undefined>;
+    private toIRawGalleryMcpServer;
+    private fetchMcpServersFromVSCodeGallery;
+    private getServerUrl;
     private getMcpGalleryUrl;
 }