@codingame/monaco-vscode-mcp-service-override 36.2.7 → 37.0.0

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

@@ -33,7 +33,9 @@ import { IMcpDevModeDebugging } from './mcpDevMode.service.js';
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { IMcpSandboxService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpSandboxService.service';
 import { McpServerConnection } from './mcpServerConnection.js';
-import { LazyCollectionState, UserInteractionRequiredError, McpServerTrust, McpStartServerInteraction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { LazyCollectionState, UserInteractionRequiredError, McpServerTrust, McpStartServerInteraction, McpServerLaunch, McpCollectionProvenance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/copilotManagedSettings';
+import { isStrictPluginOnlyCustomizationEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/customizationLockdown';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorunSelfDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -76,7 +78,8 @@ let McpRegistry = class McpRegistry extends Disposable {
             if (this._mcpAccessValue.read(reader) === McpAccessValue.None) {
                 return [];
             }
-            return this._collections.read(reader);
+            const strictPluginOnly = this._strictPluginOnlyCustomization.read(reader);
+            return this._collections.read(reader).filter(collection => this.isCollectionAllowed(collection, strictPluginOnly));
         });
         this._workspaceStorage = ( new Lazy(() => this._register(
             this._instantiationService.createInstance(McpRegistryInputStorage, StorageScope.WORKSPACE, StorageTarget.USER)
@@ -98,7 +101,8 @@ let McpRegistry = class McpRegistry extends Disposable {
                     collections: []
                 };
             }
-            const collections = this._collections.read(reader);
+            const strictPluginOnly = this._strictPluginOnlyCustomization.read(reader);
+            const collections = this._collections.read(reader).filter(collection => this.isCollectionAllowed(collection, strictPluginOnly));
             const hasUnknown = ( collections.some(c => c.lazy && c.lazy.isCached === false));
             return hasUnknown ? {
                 state: LazyCollectionState.HasUnknown,
@@ -111,6 +115,11 @@ let McpRegistry = class McpRegistry extends Disposable {
         this._onDidChangeInputs = this._register(( new Emitter()));
         this.onDidChangeInputs = this._onDidChangeInputs.event;
         this._mcpAccessValue = observableConfigValue(mcpAccessConfig, McpAccessValue.All, configurationService);
+        this._strictPluginOnlyCustomization = observableConfigValue(
+            COPILOT_STRICT_PLUGIN_ONLY_CUSTOMIZATION_CONFIG,
+            undefined,
+            configurationService
+        );
     }
     registerDelegate(delegate) {
         const delegates = this._delegates.get().slice();
@@ -147,6 +156,12 @@ let McpRegistry = class McpRegistry extends Disposable {
     getServerDefinition(collectionRef, definitionRef) {
         const collectionObs = ( this._collections.map(cols => cols.find(c => c.id === collectionRef.id)));
         return ( collectionObs.map((collection, reader) => {
+            if (collection && !this.isCollectionAllowed(collection, this._strictPluginOnlyCustomization.read(reader))) {
+                return {
+                    collection: undefined,
+                    server: undefined
+                };
+            }
             const server = collection?.serverDefinitions.read(reader).find(s => s.id === definitionRef.id);
             return {
                 collection,
@@ -155,7 +170,10 @@ let McpRegistry = class McpRegistry extends Disposable {
         }));
     }
     async discoverCollections() {
-        const toDiscover = this._collections.get().filter(c => c.lazy && !c.lazy.isCached);
+        const strictPluginOnly = this._strictPluginOnlyCustomization.get();
+        const toDiscover = this._collections.get().filter(
+            c => this.isCollectionAllowed(c, strictPluginOnly) && c.lazy && !c.lazy.isCached
+        );
         this._ongoingLazyActivations.set(this._ongoingLazyActivations.get() + 1, undefined);
         await Promise.all(( toDiscover.map(c => c.lazy?.load()))).finally(() => {
             this._ongoingLazyActivations.set(this._ongoingLazyActivations.get() - 1, undefined);
@@ -227,7 +245,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             if (errorOnUserInteraction) {
                 throw ( new UserInteractionRequiredError("workspaceTrust"));
             } else if (!(await this._workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(12142, "This MCP server definition is defined in your workspace files."))
+                message: ( localize(13903, "This MCP server definition is defined in your workspace files."))
             }))) {
                 return false;
             }
@@ -305,7 +323,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             const originURI = r.definition.presentation?.origin?.uri || r.collection.presentation?.origin;
             let labelWithOrigin = originURI ? `[\`${r.definition.label}\`](${originURI})` : "`" + r.definition.label + "`";
             if (r.collection.source instanceof ExtensionIdentifier) {
-                labelWithOrigin += ` (${( localize(12143, "from {0}", r.collection.source.value))})`;
+                labelWithOrigin += ` (${( localize(13904, "from {0}", r.collection.source.value))})`;
             }
             return labelWithOrigin;
         }
@@ -315,12 +333,12 @@ let McpRegistry = class McpRegistry extends Disposable {
             const {
                 result
             } = await this._dialogService.prompt({
-                message: ( localize(12144, "Trust and run MCP server {0}?", def.definition.label)),
+                message: ( localize(13905, "Trust and run MCP server {0}?", def.definition.label)),
                 custom: {
                     icon: Codicon.shield,
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            12145,
+                            13906,
                             "The MCP server {0} was updated. MCP servers may add context to your chat session and lead to unexpected behavior. Do you want to trust and run this server?",
                             labelFor(def)
                         )))),
@@ -333,10 +351,10 @@ let McpRegistry = class McpRegistry extends Disposable {
                     }]
                 },
                 buttons: [{
-                    label: ( localize(12146, "Trust")),
+                    label: ( localize(13907, "Trust")),
                     run: () => true
                 }, {
-                    label: ( localize(12147, "Do not trust")),
+                    label: ( localize(13908, "Do not trust")),
                     run: () => false
                 }]
             });
@@ -346,12 +364,12 @@ let McpRegistry = class McpRegistry extends Disposable {
         const {
             result
         } = await this._dialogService.prompt({
-            message: ( localize(12148, "Trust and run {0} MCP servers?", definitions.length)),
+            message: ( localize(13909, "Trust and run {0} MCP servers?", definitions.length)),
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        12149,
+                        13910,
                         "Several updated MCP servers were discovered:\n\n{0}\n\n MCP servers may add context to your chat session and lead to unexpected behavior. Do you want to trust and run these server?",
                         list
                     )))),
@@ -364,13 +382,13 @@ let McpRegistry = class McpRegistry extends Disposable {
                 }]
             },
             buttons: [{
-                label: ( localize(12146, "Trust")),
+                label: ( localize(13907, "Trust")),
                 run: () => "all"
             }, {
-                label: ( localize(12150, "Pick Trusted")),
+                label: ( localize(13911, "Pick Trusted")),
                 run: () => "pick"
             }, {
-                label: ( localize(12147, "Do not trust")),
+                label: ( localize(13908, "Do not trust")),
                 run: () => "none"
             }]
         });
@@ -461,7 +479,7 @@ let McpRegistry = class McpRegistry extends Disposable {
         } = definition.variableReplacement;
         const inputStorage = this._getInputStorageInConfigTarget(target);
         const [previouslyStored, withRemoteFilled] = await Promise.all([inputStorage.getMap(), delegate.substituteVariables(definition, launch)]);
-        const expr = ConfigurationResolverExpression.parse(withRemoteFilled);
+        const expr = ConfigurationResolverExpression.parse(McpServerLaunch.toSerialized(withRemoteFilled));
         for (const replacement of expr.unresolved()) {
             if (previouslyStored.hasOwnProperty(replacement.id)) {
                 expr.resolve(replacement, previouslyStored[replacement.id]);
@@ -475,7 +493,11 @@ let McpRegistry = class McpRegistry extends Disposable {
         }
         await this._configurationResolverService.resolveWithInteraction(folder, expr, section, undefined, target);
         await this._updateStorageWithExpressionInputs(inputStorage, expr);
-        return await this._configurationResolverService.resolveAsync(folder, expr);
+        const resolved = await this._configurationResolverService.resolveAsync(folder, expr);
+        return McpServerLaunch.fromSerialized(resolved);
+    }
+    isCollectionAllowed(collection, strictPluginOnly) {
+        return !isStrictPluginOnlyCustomizationEnabled(strictPluginOnly) || collection.provenance === McpCollectionProvenance.Plugin;
     }
     async resolveConnection(opts) {
         const {
@@ -486,10 +508,20 @@ let McpRegistry = class McpRegistry extends Disposable {
             debug
         } = opts;
         let collection = this._collections.get().find(c => c.id === collectionRef.id);
+        if (collection && !this.isCollectionAllowed(collection, this._strictPluginOnlyCustomization.get())) {
+            throw ( new Error(
+                `MCP collection ${collectionRef.id} is blocked by enterprise customization policy`
+            ));
+        }
         if (collection?.lazy) {
             await collection.lazy.load();
             collection = this._collections.get().find(c => c.id === collectionRef.id);
         }
+        if (collection && !this.isCollectionAllowed(collection, this._strictPluginOnlyCustomization.get())) {
+            throw ( new Error(
+                `MCP collection ${collectionRef.id} is blocked by enterprise customization policy`
+            ));
+        }
         const definition = collection?.serverDefinitions.get().find(s => s.id === definitionRef.id);
         if (!collection || !definition) {
             throw ( new Error(
@@ -533,14 +565,14 @@ let McpRegistry = class McpRegistry extends Disposable {
             }
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(12151, "Error starting {0}: {1}", definition.label, String(e))),
+                message: ( localize(13912, "Error starting {0}: {1}", definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [{
                         id: "mcp.launchError.openConfig",
                         class: undefined,
                         enabled: true,
                         tooltip: "",
-                        label: ( localize(12152, "Open Configuration")),
+                        label: ( localize(13913, "Open Configuration")),
                         run: () => this._editorService.openEditor({
                             resource: collection.presentation.origin,
                             options: {

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

@@ -41,7 +41,7 @@ let McpSamplingLog = class McpSamplingLog extends Disposable {
         }
         const parts = [];
         const total = record.bins.reduce((sum, value) => sum + value, 0);
-        parts.push(( localize(12153, "{0} total requests in the last 7 days.", total)));
+        parts.push(( localize(13914, "{0} total requests in the last 7 days.", total)));
         parts.push(this._formatRecentRequests(record));
         return parts.join("\n");
     }

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

@@ -131,11 +131,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                12154,
+                13915,
                 "Allow MCP tools from \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                12155,
+                13916,
                 "The MCP server \"{0}\" has issued a request to make a language model call. Do you want to allow it to make requests during chat?",
                 opts.server.definition.label
             )), this.allowButtons(opts.server, "allowedDuringChat"));
@@ -149,11 +149,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                12156,
+                13917,
                 "Allow MCP server \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                12157,
+                13918,
                 "The MCP server \"{0}\" has issued a request to make a language model call. Do you want to allow it to make requests, outside of tool calls during chat?",
                 opts.server.definition.label
             )), this.allowButtons(opts.server, "allowedOutsideChat"));
@@ -165,12 +165,12 @@ let McpSamplingService = class McpSamplingService extends Disposable {
             throw McpError.notAllowed();
         } else if (model === ModelMatch.NoMatchingModel) {
             const newlyPickedModels = opts.isDuringToolCall ? await this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server) : await this._notify(( localize(
-                12158,
+                13919,
                 "MCP server \"{0}\" triggered a language model request, but it has no allowlisted models.",
                 opts.server.definition.label
             )), {
-                [( localize(12159, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
-                [( localize(12160, "Cancel"))]: () => Promise.resolve(undefined)
+                [( localize(13920, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
+                [( localize(13921, "Cancel"))]: () => Promise.resolve(undefined)
             });
             if (newlyPickedModels) {
                 return this._getMatchingModel(opts);
@@ -181,19 +181,19 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     allowButtons(server, key) {
         return {
-            [( localize(12161, "Allow in this Session"))]: async () => {
+            [( localize(13922, "Allow in this Session"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, true);
                 return true;
             },
-            [( localize(12162, "Always"))]: async () => {
+            [( localize(13923, "Always"))]: async () => {
                 await this.updateConfig(server, c => c[key] = true);
                 return true;
             },
-            [( localize(12163, "Not Now"))]: async () => {
+            [( localize(13924, "Not Now"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, false);
                 return false;
             },
-            [( localize(12164, "Never"))]: async () => {
+            [( localize(13925, "Never"))]: async () => {
                 await this.updateConfig(server, c => c[key] = false);
                 return false;
             }

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

@@ -1,4 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ConfigurationTarget } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
@@ -13,6 +14,8 @@ export type SandboxConfigSuggestionResult = {
     message: string;
     sandboxConfig: IMcpSandboxConfiguration;
 };
+export declare function mcpDefaultCwdToFsPath(resource: URI, os: OperatingSystem): string;
+export declare function resolveMcpServerSandboxWorkingDirectory(cwd: string | undefined, defaultCwd: URI | undefined, userHome: URI | undefined, os: OperatingSystem): string | undefined;
 export declare class McpSandboxService extends Disposable implements IMcpSandboxService {
     private readonly _fileService;
     private readonly _environmentService;
@@ -37,6 +40,7 @@ export declare class McpSandboxService extends Disposable implements IMcpSandbox
     private _getSandboxEnvVariables;
     private _getSandboxCommandArgs;
     private _getRemoteEnv;
+    private _getUserHome;
     private _getOperatingSystem;
     private _getAppRoot;
     private _getTempDir;

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

@@ -1,8 +1,9 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { untildify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { Schemas, FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { win32, posix, dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { OperatingSystem, OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { arch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/process';
@@ -17,6 +18,27 @@ import { IMcpResourceScannerService } from '@codingame/monaco-vscode-api/vscode/
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { McpServerTransportType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 
+function mcpDefaultCwdToFsPath(resource, os) {
+    let value = resource.scheme === Schemas.file && resource.authority ? `//${resource.authority}${resource.path}` : resource.path;
+    if (os === OperatingSystem.Windows) {
+        if (/^\/[a-zA-Z]:/.test(value)) {
+            value = value.slice(1);
+        }
+        value = value.replace(/\//g, "\\");
+    }
+    return value;
+}
+function resolveMcpServerSandboxWorkingDirectory(cwd, defaultCwd, userHome, os) {
+    const targetDefaultCwd = defaultCwd ? mcpDefaultCwdToFsPath(defaultCwd, os) : undefined;
+    if (!cwd) {
+        return targetDefaultCwd;
+    }
+    const targetUserHome = userHome ? mcpDefaultCwdToFsPath(userHome, os) : undefined;
+    const expandedCwd = targetUserHome ? untildify(cwd, targetUserHome) : cwd;
+    const path = os === OperatingSystem.Windows ? win32 : posix;
+    const base = targetDefaultCwd ?? targetUserHome;
+    return base && !path.isAbsolute(expandedCwd) ? path.join(base, expandedCwd) : expandedCwd;
+}
 let McpSandboxService = class McpSandboxService extends Disposable {
     constructor(
         _fileService,
@@ -58,7 +80,13 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         }
         if (await this.isEnabled(serverDef, remoteAuthority)) {
             this._logService.trace(`McpSandboxService: Launching with config target ${configTarget}`);
-            const launchDetails = await this._resolveSandboxLaunchDetails(configTarget, remoteAuthority, launch.sandbox, launch.cwd);
+            const launchCwd = resolveMcpServerSandboxWorkingDirectory(
+                launch.cwd,
+                serverDef.defaultCwd,
+                await this._getUserHome(remoteAuthority),
+                await this._getOperatingSystem(remoteAuthority)
+            );
+            const launchDetails = await this._resolveSandboxLaunchDetails(configTarget, remoteAuthority, launch.sandbox, launchCwd);
             const quotedCommand = this._quoteShellArgument(launch.command);
             const quotedArgs = ( launch.args.map(arg => this._quoteShellArgument(arg)));
             const sandboxArgs = this._getSandboxCommandArgs(quotedCommand, quotedArgs, launchDetails.sandboxConfigPath);
@@ -103,11 +131,11 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         const suggestionLines = [];
         if (allowedDomainsList.length) {
             const shown = ( allowedDomainsList.map(domain => `"${domain}"`)).join(", ");
-            suggestionLines.push(( localize(12165, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
+            suggestionLines.push(( localize(13926, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
         }
         if (allowWriteList.length) {
             const shown = ( allowWriteList.map(path => `"${path}"`)).join(", ");
-            suggestionLines.push(( localize(12166, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
+            suggestionLines.push(( localize(13927, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
         }
         const sandboxConfig = {};
         if (allowedDomainsList.length) {
@@ -122,7 +150,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         }
         return {
             message: ( localize(
-                12167,
+                13928,
                 "The MCP server {0} reported potential sandbox blocks. VS Code found possible sandbox configuration updates:\n{1}",
                 serverLabel,
                 suggestionLines.join("\n")
@@ -309,6 +337,14 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         }
         return this._remoteEnvDetailsPromise;
     }
+    async _getUserHome(remoteAuthority) {
+        const remoteEnv = await this._getRemoteEnv(remoteAuthority);
+        if (remoteEnv) {
+            return remoteEnv.userHome;
+        }
+        const nativeEnv = this._environmentService;
+        return nativeEnv.userHome;
+    }
     async _getOperatingSystem(remoteAuthority) {
         const remoteEnv = await this._getRemoteEnv(remoteAuthority);
         if (remoteEnv) {
@@ -400,4 +436,4 @@ let McpSandboxService = class McpSandboxService extends Disposable {
 };
 McpSandboxService = ( __decorate([( __param(0, IFileService)), ( __param(1, IEnvironmentService)), ( __param(2, ILogService)), ( __param(3, IMcpResourceScannerService)), ( __param(4, IRemoteAgentService))], McpSandboxService));
 
-export { McpSandboxService };
+export { McpSandboxService, mcpDefaultCwdToFsPath, resolveMcpServerSandboxWorkingDirectory };

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

@@ -52,7 +52,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         this._state.set({
             state: McpConnectionState.Kind.Starting
         }, undefined);
-        this._logger.info(( localize(12183, "Starting server {0}", this.definition.label)));
+        this._logger.info(( localize(13944, "Starting server {0}", this.definition.label)));
         try {
             const launch = this._delegate.start(this._collection, this.definition, this.launchDefinition, {
                 errorOnUserInteraction: this._errorOnUserInteraction
@@ -89,7 +89,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         store.add(autorun(reader => {
             const state = launch.state.read(reader);
             this._state.set(state, undefined);
-            this._logger.info(( localize(12184, "Connection state: {0}", (McpConnectionState.toString(state)))));
+            this._logger.info(( localize(13945, "Connection state: {0}", (McpConnectionState.toString(state)))));
             if (state.state === McpConnectionState.Kind.Running && !didStart) {
                 didStart = true;
                 McpServerRequestHandler.create(this._instantiationService, {
@@ -128,7 +128,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         };
     }
     async stop() {
-        this._logger.info(( localize(12185, "Stopping server {0}", this.definition.label)));
+        this._logger.info(( localize(13946, "Stopping server {0}", this.definition.label)));
         this._launch.value?.object.stop();
         await this._waitForState(McpConnectionState.Kind.Stopped, McpConnectionState.Kind.Error);
     }

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -203,9 +204,11 @@ let McpService = class McpService extends Disposable {
                 object
             });
         }
-        transaction(tx => {
-            this._servers.set(nextServers, tx);
-        });
+        if (!equals(currentServers, nextServers)) {
+            transaction(tx => {
+                this._servers.set(nextServers, tx);
+            });
+        }
     }
     dispose() {
         this._servers.get().forEach(s => s.object.dispose());

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(17361, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(19114, "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(
-                17362,
+                19115,
                 "The MCP server '{0}' wants to access the {1} account '{2}'.",
                 mcpServerName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(17363, "&&Allow")),
+                label: ( localize(19116, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(17364, "&&Deny")),
+                label: ( localize(19117, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -246,17 +246,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             }
         });
         items.push({
-            label: ( localize(17365, "Sign in to another account"))
+            label: ( localize(19118, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            17366,
+            19119,
             "The MCP server '{0}' wants to access a {1} account",
             mcpServerName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            17367,
+            19120,
             "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(17368, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
+                title: ( localize(19121, "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(17369, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
+                title: ( localize(19122, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({