@codingame/monaco-vscode-mcp-service-override 21.5.1 → 22.0.0

package/package.json

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

package/vscode/src/vs/base/common/uriTransformer.d.ts

@@ -0,0 +1,2 @@
+import { IURITransformer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uriIpc";
+export declare function createURITransformer(remoteAuthority: string): IURITransformer;

package/vscode/src/vs/base/common/uriTransformer.js

@@ -0,0 +1,39 @@
+
+import { URITransformer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uriIpc';
+
+function createRawURITransformer(remoteAuthority) {
+    return {
+        transformIncoming: (uri) => {
+            if (uri.scheme === 'vscode-remote') {
+                return { scheme: 'file', path: uri.path, query: uri.query, fragment: uri.fragment };
+            }
+            if (uri.scheme === 'file') {
+                return { scheme: 'vscode-local', path: uri.path, query: uri.query, fragment: uri.fragment };
+            }
+            return uri;
+        },
+        transformOutgoing: (uri) => {
+            if (uri.scheme === 'file') {
+                return { scheme: 'vscode-remote', authority: remoteAuthority, path: uri.path, query: uri.query, fragment: uri.fragment };
+            }
+            if (uri.scheme === 'vscode-local') {
+                return { scheme: 'file', path: uri.path, query: uri.query, fragment: uri.fragment };
+            }
+            return uri;
+        },
+        transformOutgoingScheme: (scheme) => {
+            if (scheme === 'file') {
+                return 'vscode-remote';
+            }
+            else if (scheme === 'vscode-local') {
+                return 'file';
+            }
+            return scheme;
+        }
+    };
+}
+function createURITransformer(remoteAuthority) {
+    return ( new URITransformer(createRawURITransformer(remoteAuthority)));
+}
+
+export { createURITransformer };

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

@@ -1,9 +1,8 @@
 
 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 { createCommandUri, 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 { mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
@@ -24,11 +23,9 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
         if (this.configurationService.getValue(mcpAccessConfig) !== McpAccessValue.None) {
             return true;
         }
-        const settingsCommandLink = ( ( URI.parse(
-            `command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify({ query: `@id:${mcpAccessConfig}` }))}`
-        )).toString());
+        const settingsCommandLink = ( createCommandUri('workbench.action.openSettings', { query: `@id:${mcpAccessConfig}` }).toString());
         return (new MarkdownString(localize(
-            1970,
+            1972,
             "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

@@ -4,7 +4,7 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 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;
+    private readonly productService;
     readonly _serviceBrand: undefined;
     readonly onDidChangeMcpGalleryManifest: Event<any>;
     readonly onDidChangeMcpGalleryManifestStatus: Event<any>;

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

@@ -23,19 +23,55 @@ let McpGalleryManifestService = class McpGalleryManifestService extends Disposab
     }
     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 isProductGalleryUrl = this.productService.mcpGallery?.serviceUrl === url;
+        const version = 'v0';
+        const serversUrl = `${url}/${version}/servers`;
         const resources = [
             {
                 id: serversUrl,
-                type: McpGalleryResourceType.McpQueryService
+                type: McpGalleryResourceType.McpServersQueryService
+            },
+            {
+                id: `${serversUrl}/{id}`,
+                type: McpGalleryResourceType.McpServerResourceUri
             }
         ];
-        if (!isVSCodeGalleryUrl) {
+        if (isProductGalleryUrl) {
             resources.push({
-                id: `${serversUrl}/{id}`,
-                type: McpGalleryResourceType.McpServerManifestUri
+                id: `${serversUrl}/search`,
+                type: McpGalleryResourceType.McpServersSearchService
+            });
+            resources.push({
+                id: `${serversUrl}/by-name/{name}`,
+                type: McpGalleryResourceType.McpServerNamedResourceUri
+            });
+            resources.push({
+                id: this.productService.mcpGallery.itemWebUrl,
+                type: McpGalleryResourceType.McpServerWebUri
+            });
+            resources.push({
+                id: this.productService.mcpGallery.publisherUrl,
+                type: McpGalleryResourceType.PublisherUriTemplate
+            });
+            resources.push({
+                id: this.productService.mcpGallery.supportUrl,
+                type: McpGalleryResourceType.ContactSupportUri
+            });
+            resources.push({
+                id: this.productService.mcpGallery.supportUrl,
+                type: McpGalleryResourceType.ContactSupportUri
+            });
+            resources.push({
+                id: this.productService.mcpGallery.privacyPolicyUrl,
+                type: McpGalleryResourceType.PrivacyPolicyUri
+            });
+            resources.push({
+                id: this.productService.mcpGallery.termsOfServiceUrl,
+                type: McpGalleryResourceType.TermsOfServiceUri
+            });
+            resources.push({
+                id: this.productService.mcpGallery.reportUrl,
+                type: McpGalleryResourceType.ReportUri
             });
         }
         return {

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

@@ -2,33 +2,37 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 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, 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 { 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";
 export declare class McpGalleryService extends Disposable implements IMcpGalleryService {
     private readonly requestService;
     private readonly fileService;
-    private readonly productService;
     private readonly logService;
     private readonly mcpGalleryManifestService;
     _serviceBrand: undefined;
-    constructor(requestService: IRequestService, fileService: IFileService, productService: IProductService, logService: ILogService, mcpGalleryManifestService: IMcpGalleryManifestService);
+    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[]>;
-    getMcpServersFromVSCodeGallery(names: string[]): Promise<IGalleryMcpServer[]>;
     getMcpServerConfiguration(gallery: IGalleryMcpServer, token: CancellationToken): Promise<IGalleryMcpServerConfiguration>;
     getReadme(gallery: IGalleryMcpServer, token: CancellationToken): Promise<string>;
     private toGalleryMcpServer;
     private toGalleryMcpServerConfiguration;
     private queryGalleryMcpServers;
     private queryRawGalleryMcpServers;
-    getMcpServer(mcpServerUrl: string): Promise<IGalleryMcpServer | undefined>;
-    private toIRawGalleryMcpServer;
-    private fetchMcpServersFromVSCodeGallery;
+    getMcpServer(mcpServerUrl: string, mcpGalleryManifest?: IMcpGalleryManifest | null): Promise<IGalleryMcpServer | undefined>;
+    getMcpServerByName(name: string): Promise<IGalleryMcpServer | undefined>;
+    private serializeMcpServer;
+    private serializeMcpServersResult;
     private getServerUrl;
+    private getNamedServerUrl;
+    private getSearchUrl;
+    private getWebUrl;
+    private getPublisherUrl;
     private getMcpGalleryUrl;
 }