@codingame/monaco-vscode-mcp-service-override 31.0.0 → 32.0.0

package/vscode/src/vs/workbench/contrib/mcp/common/mcpService.d.ts

@@ -1,11 +1,12 @@
 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 { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IObservable, IReader, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { EnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
+import { ContributionEnablementState, EnablementModel, IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
+import { McpCollisionBehavior } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpServerMetadataCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpServer";
 import { IAutostartResult, IMcpServer, McpCollectionDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
@@ -23,7 +24,7 @@ export declare class McpService extends Disposable implements IMcpService {
         state: import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes").LazyCollectionState;
         collections: McpCollectionDefinition[];
     }>;
-    readonly enablementModel: EnablementModel;
+    readonly enablementModel: McpCollisionEnablementModel;
     protected readonly userCache: McpServerMetadataCache;
     protected readonly workspaceCache: McpServerMetadataCache;
     constructor(_instantiationService: IInstantiationService, _mcpRegistry: IMcpRegistry, _logService: ILogService, configurationService: IConfigurationService, storageService: IStorageService);
@@ -37,3 +38,27 @@ export declare class McpService extends Disposable implements IMcpService {
     updateCollectedServers(): void;
     dispose(): void;
 }
+/**
+ * Wraps an {@link EnablementModel} with collision-aware defaults and
+ * mutual-exclusion logic for MCP servers with the same label.
+ *
+ * When collision behavior is `disable`:
+ * - Servers whose label collides with a higher-priority server are disabled
+ *   by default (unless the user has explicitly toggled them).
+ * - Enabling a colliding server disables all other servers with the same label.
+ *
+ * When collision behavior is `suffix`, delegates everything unchanged.
+ */
+export declare class McpCollisionEnablementModel implements IEnablementModel {
+    private readonly _base;
+    /**
+     * For each server definition ID, the list of all definition IDs that share
+     * the same (case-insensitive) label, in priority order (lowest collection
+     * order first). Empty when collision behavior is `suffix`.
+     */
+    private readonly _collisionGroups;
+    constructor(_base: EnablementModel, registry: IMcpRegistry, collisionBehavior: IObservable<McpCollisionBehavior>);
+    readEnabled(key: string, reader?: IReader): ContributionEnablementState;
+    setEnabled(key: string, state: ContributionEnablementState, tx?: ITransaction): void;
+    remove(key: string): void;
+}

package/vscode/src/vs/workbench/contrib/mcp/common/mcpService.js

@@ -8,9 +8,11 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { mcpAutoStartConfig, McpAutoStartValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { EnablementModel, isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
+import { EnablementModel, isContributionEnabled, ContributionEnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
+import { mcpServerCollisionBehaviorSection, McpCollisionBehavior } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerMetadataCache, McpServer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpServer';
 import { IAutostartResult, McpConnectionState, McpServerCacheState, McpStartServerInteraction, UserInteractionRequiredError, McpServerDefinition, McpToolName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
@@ -18,6 +20,7 @@ import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vsc
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/transaction';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 
 let McpService = class McpService extends Disposable {
     get lazyCollectionState() {
@@ -38,7 +41,13 @@ let McpService = class McpService extends Disposable {
         this._currentAutoStarts = ( new Set());
         this._servers = observableValue(this, []);
         this.servers = ( this._servers.map(servers => ( servers.map(s => s.object))));
-        this.enablementModel = this._register(( new EnablementModel("mcp.enablement", storageService)));
+        const baseEnablement = this._register(( new EnablementModel("mcp.enablement", storageService)));
+        const collisionBehavior = observableConfigValue(
+            mcpServerCollisionBehaviorSection,
+            McpCollisionBehavior.Disable,
+            configurationService
+        );
+        this.enablementModel = ( new McpCollisionEnablementModel(baseEnablement, this._mcpRegistry, collisionBehavior));
         this.userCache = this._register(
             _instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE)
         );
@@ -225,5 +234,81 @@ class McpPrefixGenerator {
         return toolPrefix;
     }
 }
+class McpCollisionEnablementModel {
+    constructor(_base, registry, collisionBehavior) {
+        this._base = _base;
+        this._collisionGroups = derived(reader => {
+            if (collisionBehavior.read(reader) !== McpCollisionBehavior.Disable) {
+                return ( new Map());
+            }
+            const collections = registry.collections.read(reader);
+            const labelToIds = ( new Map());
+            for (const collection of collections) {
+                for (const server of collection.serverDefinitions.read(reader)) {
+                    const key = server.label.toLowerCase();
+                    let ids = labelToIds.get(key);
+                    if (!ids) {
+                        ids = [];
+                        labelToIds.set(key, ids);
+                    }
+                    ids.push(server.id);
+                }
+            }
+            const groups = ( new Map());
+            for (const ids of ( labelToIds.values())) {
+                if (ids.length < 2) {
+                    continue;
+                }
+                for (const id of ids) {
+                    groups.set(id, ids);
+                }
+            }
+            return groups;
+        });
+    }
+    readEnabled(key, reader) {
+        const baseState = this._base.readEnabled(key, reader);
+        if (!isContributionEnabled(baseState)) {
+            return baseState;
+        }
+        const group = this._collisionGroups.read(reader).get(key);
+        if (!group) {
+            return baseState;
+        }
+        for (const otherId of group) {
+            if (otherId === key) {
+                return baseState;
+            }
+            if (isContributionEnabled(this._base.readEnabled(otherId, reader))) {
+                return ContributionEnablementState.DisabledProfile;
+            }
+        }
+        return baseState;
+    }
+    setEnabled(key, state, tx) {
+        const isEnabling = state === ContributionEnablementState.EnabledProfile || state === ContributionEnablementState.EnabledWorkspace;
+        const group = isEnabling ? this._collisionGroups.get().get(key) : undefined;
+        if (!group) {
+            this._base.setEnabled(key, state, tx);
+            return;
+        }
+        const updateGroup = innerTx => {
+            this._base.setEnabled(key, state, innerTx);
+            for (const otherId of group) {
+                if (otherId !== key) {
+                    this._base.setEnabled(otherId, ContributionEnablementState.DisabledWorkspace, innerTx);
+                }
+            }
+        };
+        if (tx) {
+            updateGroup(tx);
+        } else {
+            transaction(innerTx => updateGroup(innerTx));
+        }
+    }
+    remove(key) {
+        this._base.remove(key);
+    }
+}
 
-export { McpService };
+export { McpCollisionEnablementModel, McpService };

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpService.js

@@ -120,7 +120,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(16022, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(16328, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({
                 badge
             });
@@ -194,17 +194,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
         } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                16023,
+                16329,
                 "The MCP server '{0}' wants to access the {1} account '{2}'.",
                 mcpServerName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(16024, "&&Allow")),
+                label: ( localize(16330, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(16025, "&&Deny")),
+                label: ( localize(16331, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -246,17 +246,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             }
         });
         items.push({
-            label: ( localize(16026, "Sign in to another account"))
+            label: ( localize(16332, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            16027,
+            16333,
             "The MCP server '{0}' wants to access a {1} account",
             mcpServerName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            16028,
+            16334,
             "Select an account for '{0}' to use or Esc to cancel",
             mcpServerName
         ));
@@ -336,7 +336,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             group: "3_accessRequests",
             command: {
                 id: `${providerId}${mcpServerId}Access`,
-                title: ( localize(16029, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
+                title: ( localize(16335, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -380,7 +380,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             group: "2_signInRequests",
             command: {
                 id: commandId,
-                title: ( localize(16030, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
+                title: ( localize(16336, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({

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

@@ -1,59 +0,0 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IPagedModel } from "@codingame/monaco-vscode-api/vscode/vs/base/common/paging";
-import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
-import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
-import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
-import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
-import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { IViewletViewOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/views/viewsViewlet";
-import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service";
-import { IWorkbenchMcpServer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
-import { IMcpWorkbenchService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
-import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { AbstractExtensionsListView } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsViews";
-import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
-import { IMcpGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service";
-import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-export interface McpServerListViewOptions {
-    showWelcome?: boolean;
-}
-export declare class McpServersListView extends AbstractExtensionsListView<IWorkbenchMcpServer> {
-    private readonly mpcViewOptions;
-    private readonly dialogService;
-    private readonly mcpWorkbenchService;
-    protected readonly mcpGalleryManifestService: IMcpGalleryManifestService;
-    private readonly layoutService;
-    protected readonly markdownRendererService: IMarkdownRendererService;
-    private readonly logService;
-    private list;
-    private listContainer;
-    private welcomeContainer;
-    private bodyTemplate;
-    private readonly contextMenuActionRunner;
-    private readonly modalNavigationDisposable;
-    private input;
-    constructor(mpcViewOptions: McpServerListViewOptions, options: IViewletViewOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, themeService: IThemeService, hoverService: IHoverService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, dialogService: IDialogService, mcpWorkbenchService: IMcpWorkbenchService, mcpGalleryManifestService: IMcpGalleryManifestService, layoutService: IWorkbenchLayoutService, markdownRendererService: IMarkdownRendererService, logService: ILogService);
-    protected renderBody(container: HTMLElement): void;
-    private onContextMenu;
-    protected layoutBody(height: number, width: number): void;
-    show(query: string): Promise<IPagedModel<IWorkbenchMcpServer>>;
-    private renderInput;
-    private showWelcomeContent;
-    private createWelcomeContent;
-    private updateBody;
-    private query;
-    private mergeChangedMcpServers;
-}
-export declare class DefaultBrowseMcpServersView extends McpServersListView {
-    protected renderBody(container: HTMLElement): void;
-    show(): Promise<IPagedModel<IWorkbenchMcpServer>>;
-}
-export declare class McpServersViewsContribution extends Disposable implements IWorkbenchContribution {
-    static ID: string;
-    constructor();
-}