@codingame/monaco-vscode-mcp-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.d.ts

@@ -1,9 +1,24 @@
+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";
 import { McpGalleryManifestService as McpGalleryManifestService } from "../../../../platform/mcp/common/mcpGalleryManifestService.js";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-export declare class WebMcpGalleryManifestService extends McpGalleryManifestService implements IMcpGalleryManifestService {
-    constructor(productService: IProductService, requestService: IRequestService, logService: ILogService, remoteAgentService: IRemoteAgentService);
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+export declare class WorkbenchMcpGalleryManifestService extends McpGalleryManifestService implements IMcpGalleryManifestService {
+    private readonly configurationService;
+    private mcpGalleryManifest;
+    private _onDidChangeMcpGalleryManifest;
+    readonly onDidChangeMcpGalleryManifest: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<IMcpGalleryManifest | null>;
+    private currentStatus;
+    get mcpGalleryManifestStatus(): McpGalleryManifestStatus;
+    private _onDidChangeMcpGalleryManifestStatus;
+    readonly onDidChangeMcpGalleryManifestStatus: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<McpGalleryManifestStatus>;
+    constructor(productService: IProductService, remoteAgentService: IRemoteAgentService, requestService: IRequestService, logService: ILogService, configurationService: IConfigurationService);
+    private initPromise;
+    getMcpGalleryManifest(): Promise<IMcpGalleryManifest | null>;
+    private doGetMcpGalleryManifest;
+    private getAndUpdateMcpGalleryManifest;
+    private update;
 }

package/vscode/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.js

@@ -1,16 +1,26 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { McpGalleryManifestStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest';
 import { McpGalleryManifestService } from '../../../../platform/mcp/common/mcpGalleryManifestService.js';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { IRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { mcpGalleryServiceUrlConfig } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 
-let WebMcpGalleryManifestService = class WebMcpGalleryManifestService extends McpGalleryManifestService {
-    constructor(productService, requestService, logService, remoteAgentService) {
+let WorkbenchMcpGalleryManifestService = class WorkbenchMcpGalleryManifestService extends McpGalleryManifestService {
+    get mcpGalleryManifestStatus() { return this.currentStatus; }
+    constructor(productService, remoteAgentService, requestService, logService, configurationService) {
         super(productService, requestService, logService);
+        this.configurationService = configurationService;
+        this.mcpGalleryManifest = null;
+        this._onDidChangeMcpGalleryManifest = this._register(( new Emitter()));
+        this.onDidChangeMcpGalleryManifest = this._onDidChangeMcpGalleryManifest.event;
+        this.currentStatus = McpGalleryManifestStatus.Unavailable;
+        this._onDidChangeMcpGalleryManifestStatus = this._register(( new Emitter()));
+        this.onDidChangeMcpGalleryManifestStatus = this._onDidChangeMcpGalleryManifestStatus.event;
         const remoteConnection = remoteAgentService.getConnection();
         if (remoteConnection) {
             const channel = remoteConnection.getChannel('mcpGalleryManifest');
@@ -20,12 +30,52 @@ let WebMcpGalleryManifestService = class WebMcpGalleryManifestService extends Mc
             });
         }
     }
+    async getMcpGalleryManifest() {
+        if (!this.initPromise) {
+            this.initPromise = this.doGetMcpGalleryManifest();
+        }
+        await this.initPromise;
+        return this.mcpGalleryManifest;
+    }
+    async doGetMcpGalleryManifest() {
+        await this.getAndUpdateMcpGalleryManifest();
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(mcpGalleryServiceUrlConfig) || e.affectsConfiguration('chat.mcp.gallery.version')) {
+                this.getAndUpdateMcpGalleryManifest();
+            }
+        }));
+    }
+    async getAndUpdateMcpGalleryManifest() {
+        const mcpGalleryConfig = this.configurationService.getValue('chat.mcp.gallery');
+        if (mcpGalleryConfig?.serviceUrl) {
+            this.update(await this.createMcpGalleryManifest(mcpGalleryConfig.serviceUrl, mcpGalleryConfig.version));
+        }
+        else {
+            this.update(await super.getMcpGalleryManifest());
+        }
+    }
+    update(manifest) {
+        if (this.mcpGalleryManifest?.url === manifest?.url && this.mcpGalleryManifest?.version === manifest?.version) {
+            return;
+        }
+        this.mcpGalleryManifest = manifest;
+        if (this.mcpGalleryManifest) {
+            this.logService.info('MCP Registry configured:', this.mcpGalleryManifest.url);
+        }
+        else {
+            this.logService.info('No MCP Registry configured');
+        }
+        this.currentStatus = this.mcpGalleryManifest ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
+        this._onDidChangeMcpGalleryManifest.fire(this.mcpGalleryManifest);
+        this._onDidChangeMcpGalleryManifestStatus.fire(this.currentStatus);
+    }
 };
-WebMcpGalleryManifestService = ( __decorate([
+WorkbenchMcpGalleryManifestService = ( __decorate([
     ( __param(0, IProductService)),
-    ( __param(1, IRequestService)),
-    ( __param(2, ILogService)),
-    ( __param(3, IRemoteAgentService))
-], WebMcpGalleryManifestService));
+    ( __param(1, IRemoteAgentService)),
+    ( __param(2, IRequestService)),
+    ( __param(3, ILogService)),
+    ( __param(4, IConfigurationService))
+], WorkbenchMcpGalleryManifestService));
 
-export { WebMcpGalleryManifestService };
+export { WorkbenchMcpGalleryManifestService };

package/vscode/src/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.d.ts

@@ -1,4 +1,4 @@
-import { ILocalMcpServer, IGalleryMcpServer, InstallOptions, InstallMcpServerEvent, UninstallMcpServerEvent, DidUninstallMcpServerEvent, InstallMcpServerResult, IInstallableMcpServer } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement";
+import { ILocalMcpServer, IGalleryMcpServer, InstallOptions, InstallMcpServerEvent, UninstallMcpServerEvent, DidUninstallMcpServerEvent, InstallMcpServerResult, IInstallableMcpServer } from "@codingame/monaco-vscode-api/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 { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";

package/vscode/src/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.js

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { RegistryType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
+import { RegistryType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import { IAllowedMcpServersService, IMcpGalleryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
@@ -10,7 +10,7 @@ import { IMcpResourceScannerService } from '@codingame/monaco-vscode-api/vscode/
 import { isWorkspaceFolder } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { WORKSPACE_STANDALONE_CONFIGURATIONS, MCP_CONFIGURATION_KEY } from '@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { WORKSPACE_STANDALONE_CONFIGURATIONS, MCP_CONFIGURATION_KEY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/configuration';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';