@codingame/monaco-vscode-mcp-service-override 22.1.9 → 23.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "22.1.9",
+  "version": "23.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,21 +15,20 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "22.1.9",
-    "@codingame/monaco-vscode-37b3b402-09f5-5f69-89ef-ce30559f63cc-common": "22.1.9",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "22.1.9",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "22.1.9",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.9",
-    "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common": "22.1.9",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
-    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "22.1.9",
-    "@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common": "22.1.9",
-    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "22.1.9",
-    "@codingame/monaco-vscode-cf77987b-b1b7-5359-aaf8-a259c63d9f03-common": "22.1.9",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "22.1.9",
-    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "22.1.9",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "22.1.9"
+    "@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common": "23.0.1",
+    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "23.0.1",
+    "@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common": "23.0.1",
+    "@codingame/monaco-vscode-2eda793f-4b5b-58e8-83c5-1bfd3bad15f1-common": "23.0.1",
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.1",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "23.0.1",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.0.1",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.1",
+    "@codingame/monaco-vscode-7b19b93e-7a49-5c48-81f5-091a64f468d2-common": "23.0.1",
+    "@codingame/monaco-vscode-api": "23.0.1",
+    "@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common": "23.0.1",
+    "@codingame/monaco-vscode-cf77987b-b1b7-5359-aaf8-a259c63d9f03-common": "23.0.1",
+    "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common": "23.0.1",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "23.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -25,7 +25,7 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
         }
         const settingsCommandLink = ( createCommandUri('workbench.action.openSettings', { query: `@id:${mcpAccessConfig}` }).toString());
         return (new MarkdownString(localize(
-            1972,
+            1981,
             "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

@@ -1,15 +1,22 @@
 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 { 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 { 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 {
     private readonly productService;
+    private readonly requestService;
+    protected readonly logService: ILogService;
     readonly _serviceBrand: undefined;
     readonly onDidChangeMcpGalleryManifest: Event<any>;
     readonly onDidChangeMcpGalleryManifestStatus: Event<any>;
+    private readonly versionByUrl;
     get mcpGalleryManifestStatus(): McpGalleryManifestStatus;
-    constructor(productService: IProductService);
+    constructor(productService: IProductService, requestService: IRequestService, logService: ILogService);
     getMcpGalleryManifest(): Promise<IMcpGalleryManifest | null>;
-    protected createMcpGalleryManifest(url: string): IMcpGalleryManifest;
+    protected createMcpGalleryManifest(url: string, version?: string): Promise<IMcpGalleryManifest>;
+    private getVersion;
+    private checkVersion;
 }

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

@@ -1,30 +1,47 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 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 { 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 { isSuccess } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request';
+import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
 import { McpGalleryManifestStatus, McpGalleryResourceType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest';
 
+const SUPPORTED_VERSIONS = [
+    'v0.1',
+    'v0',
+];
 let McpGalleryManifestService = class McpGalleryManifestService extends Disposable {
     get mcpGalleryManifestStatus() {
         return !!this.productService.mcpGallery?.serviceUrl ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
     }
-    constructor(productService) {
+    constructor(productService, requestService, logService) {
         super();
         this.productService = productService;
+        this.requestService = requestService;
+        this.logService = logService;
         this.onDidChangeMcpGalleryManifest = Event.None;
         this.onDidChangeMcpGalleryManifestStatus = Event.None;
+        this.versionByUrl = ( new Map());
     }
     async getMcpGalleryManifest() {
         if (!this.productService.mcpGallery) {
             return null;
         }
-        return this.createMcpGalleryManifest(this.productService.mcpGallery.serviceUrl);
+        return this.createMcpGalleryManifest(this.productService.mcpGallery.serviceUrl, SUPPORTED_VERSIONS[0]);
     }
-    createMcpGalleryManifest(url) {
+    async createMcpGalleryManifest(url, version) {
         url = url.endsWith('/') ? url.slice(0, -1) : url;
+        if (!version) {
+            let versionPromise = this.versionByUrl.get(url);
+            if (!versionPromise) {
+                this.versionByUrl.set(url, versionPromise = this.getVersion(url));
+            }
+            version = await versionPromise;
+        }
         const isProductGalleryUrl = this.productService.mcpGallery?.serviceUrl === url;
-        const version = 'v0';
         const serversUrl = `${url}/${version}/servers`;
         const resources = [
             {
@@ -32,15 +49,15 @@ let McpGalleryManifestService = class McpGalleryManifestService extends Disposab
                 type: McpGalleryResourceType.McpServersQueryService
             },
             {
-                id: `${serversUrl}/{id}`,
-                type: McpGalleryResourceType.McpServerResourceUri
+                id: `${serversUrl}/{name}/versions/{version}`,
+                type: McpGalleryResourceType.McpServerVersionUri
+            },
+            {
+                id: `${serversUrl}/{name}/versions/latest`,
+                type: McpGalleryResourceType.McpServerLatestVersionUri
             }
         ];
         if (isProductGalleryUrl) {
-            resources.push({
-                id: `${serversUrl}/search`,
-                type: McpGalleryResourceType.McpServersSearchService
-            });
             resources.push({
                 id: `${serversUrl}/by-name/{name}`,
                 type: McpGalleryResourceType.McpServerNamedResourceUri
@@ -74,15 +91,47 @@ let McpGalleryManifestService = class McpGalleryManifestService extends Disposab
                 type: McpGalleryResourceType.ReportUri
             });
         }
+        if (version === 'v0') {
+            resources.push({
+                id: `${serversUrl}/{id}`,
+                type: McpGalleryResourceType.McpServerIdUri
+            });
+        }
         return {
             version,
             url,
             resources
         };
     }
+    async getVersion(url) {
+        for (const version of SUPPORTED_VERSIONS) {
+            if (await this.checkVersion(url, version)) {
+                return version;
+            }
+        }
+        return SUPPORTED_VERSIONS[0];
+    }
+    async checkVersion(url, version) {
+        try {
+            const context = await this.requestService.request({
+                type: 'GET',
+                url: `${url}/${version}/servers?limit=1`,
+            }, CancellationToken.None);
+            if (isSuccess(context)) {
+                return true;
+            }
+            this.logService.info(`The service at ${url} does not support version ${version}. Service returned status ${context.res.statusCode}.`);
+        }
+        catch (error) {
+            this.logService.error(error);
+        }
+        return false;
+    }
 };
 McpGalleryManifestService = ( __decorate([
-    ( __param(0, IProductService))
+    ( __param(0, IProductService)),
+    ( __param(1, IRequestService)),
+    ( __param(2, ILogService))
 ], McpGalleryManifestService));
 
 export { McpGalleryManifestService };

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

@@ -3,11 +3,11 @@ import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/l
 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 { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
-import { IGalleryMcpServer, IGalleryMcpServerConfiguration, IQueryOptions } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { IGalleryMcpServer, 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 { IMcpGalleryManifest } 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";
-import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
+import { IIterativePager } from "@codingame/monaco-vscode-2eda793f-4b5b-58e8-83c5-1bfd3bad15f1-common/vscode/vs/base/common/paging";
 export declare class McpGalleryService extends Disposable implements IMcpGalleryService {
     private readonly requestService;
     private readonly fileService;
@@ -17,21 +17,23 @@ export declare class McpGalleryService extends Disposable implements IMcpGallery
     private galleryMcpServerDataSerializers;
     constructor(requestService: IRequestService, fileService: IFileService, logService: ILogService, mcpGalleryManifestService: IMcpGalleryManifestService);
     isEnabled(): boolean;
-    query(options?: IQueryOptions, token?: CancellationToken): Promise<IPager<IGalleryMcpServer>>;
-    getMcpServersFromGallery(urls: string[]): Promise<IGalleryMcpServer[]>;
-    getMcpServerConfiguration(gallery: IGalleryMcpServer, token: CancellationToken): Promise<IGalleryMcpServerConfiguration>;
+    query(options?: IQueryOptions, token?: CancellationToken): Promise<IIterativePager<IGalleryMcpServer>>;
+    getMcpServersFromGallery(infos: {
+        name: string;
+        id?: string;
+    }[]): Promise<IGalleryMcpServer[]>;
+    private getMcpServerByName;
     getReadme(gallery: IGalleryMcpServer, token: CancellationToken): Promise<string>;
     private toGalleryMcpServer;
-    private toGalleryMcpServerConfiguration;
     private queryGalleryMcpServers;
     private queryRawGalleryMcpServers;
     getMcpServer(mcpServerUrl: string, mcpGalleryManifest?: IMcpGalleryManifest | null): Promise<IGalleryMcpServer | undefined>;
-    getMcpServerByName(name: string): Promise<IGalleryMcpServer | undefined>;
     private serializeMcpServer;
     private serializeMcpServersResult;
-    private getServerUrl;
+    private getSerializer;
     private getNamedServerUrl;
-    private getSearchUrl;
+    private getServerIdUrl;
+    private getLatestServerVersionUrl;
     private getWebUrl;
     private getPublisherUrl;
     private getMcpGalleryUrl;