@codingame/monaco-vscode-mcp-service-override 37.2.0 → 37.3.0

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

@@ -29,7 +29,7 @@ import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vsco
 import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
 import { AUX_WINDOW_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { IMcpDevModeDebugging } from './mcpDevMode.service.js';
+import { IMcpDevModeDebugging } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpDevMode.service';
 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';
@@ -139,7 +139,7 @@ let McpRegistry = class McpRegistry extends Disposable {
         if (toReplace && !toReplace.lazy) {
             return Disposable.None;
         } else if (toReplace) {
-            this._collections.set(( currentCollections.map(c => c === toReplace ? collection : c)), undefined);
+            this._collections.set(currentCollections.map(c => c === toReplace ? collection : c), undefined);
         } else {
             this._collections.set(
                 [...currentCollections, collection].sort((a, b) => a.order - b.order),
@@ -154,8 +154,8 @@ 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) => {
+        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,
@@ -167,7 +167,7 @@ let McpRegistry = class McpRegistry extends Disposable {
                 collection,
                 server
             };
-        }));
+        });
     }
     async discoverCollections() {
         const strictPluginOnly = this._strictPluginOnlyCustomization.get();
@@ -175,7 +175,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             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(() => {
+        await Promise.all(toDiscover.map(c => c.lazy?.load())).finally(() => {
             this._ongoingLazyActivations.set(this._ongoingLazyActivations.get() - 1, undefined);
         });
         const found = [];
@@ -245,7 +245,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             if (errorOnUserInteraction) {
                 throw ( new UserInteractionRequiredError("workspaceTrust"));
             } else if (!(await this._workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(14120, "This MCP server definition is defined in your workspace files."))
+                message: ( localize(16259, "This MCP server definition is defined in your workspace files."))
             }))) {
                 return false;
             }
@@ -308,7 +308,7 @@ let McpRegistry = class McpRegistry extends Disposable {
                     return;
                 }
                 reader.dispose();
-                interaction.choice ??= this._promptForTrustOpenDialog(( [...( map.values())].map(v => v.s === "waiting" ? v : undefined)).filter(isDefined));
+                interaction.choice ??= this._promptForTrustOpenDialog([...( map.values())].map(v => v.s === "waiting" ? v : undefined).filter(isDefined));
                 resolve(interaction.choice);
             });
         }));
@@ -323,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(14121, "from {0}", r.collection.source.value))})`;
+                labelWithOrigin += ` (${( localize(16260, "from {0}", r.collection.source.value))})`;
             }
             return labelWithOrigin;
         }
@@ -333,12 +333,12 @@ let McpRegistry = class McpRegistry extends Disposable {
             const {
                 result
             } = await this._dialogService.prompt({
-                message: ( localize(14122, "Trust and run MCP server {0}?", def.definition.label)),
+                message: ( localize(16261, "Trust and run MCP server {0}?", def.definition.label)),
                 custom: {
                     icon: Codicon.shield,
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            14123,
+                            16262,
                             "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)
                         )))),
@@ -351,25 +351,25 @@ let McpRegistry = class McpRegistry extends Disposable {
                     }]
                 },
                 buttons: [{
-                    label: ( localize(14124, "Trust")),
+                    label: ( localize(16263, "Trust")),
                     run: () => true
                 }, {
-                    label: ( localize(14125, "Do not trust")),
+                    label: ( localize(16264, "Do not trust")),
                     run: () => false
                 }]
             });
             return result === undefined ? undefined : (result ? [def.definition.id] : []);
         }
-        const list = ( definitions.map(d => `- ${labelFor(d)}`)).join("\n");
+        const list = definitions.map(d => `- ${labelFor(d)}`).join("\n");
         const {
             result
         } = await this._dialogService.prompt({
-            message: ( localize(14126, "Trust and run {0} MCP servers?", definitions.length)),
+            message: ( localize(16265, "Trust and run {0} MCP servers?", definitions.length)),
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        14127,
+                        16266,
                         "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
                     )))),
@@ -382,20 +382,20 @@ let McpRegistry = class McpRegistry extends Disposable {
                 }]
             },
             buttons: [{
-                label: ( localize(14124, "Trust")),
+                label: ( localize(16263, "Trust")),
                 run: () => "all"
             }, {
-                label: ( localize(14128, "Pick Trusted")),
+                label: ( localize(16267, "Pick Trusted")),
                 run: () => "pick"
             }, {
-                label: ( localize(14125, "Do not trust")),
+                label: ( localize(16264, "Do not trust")),
                 run: () => "none"
             }]
         });
         if (result === undefined) {
             return undefined;
         } else if (result === "all") {
-            return ( definitions.map(d => d.definition.id));
+            return definitions.map(d => d.definition.id);
         } else if (result === "none") {
             return [];
         }
@@ -407,7 +407,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             useSeparators: false
         }));
         picker.canSelectMany = true;
-        picker.items = ( definitions.map((
+        picker.items = definitions.map((
             {
                 definition,
                 collection
@@ -435,7 +435,7 @@ let McpRegistry = class McpRegistry extends Disposable {
                 picked: false,
                 buttons
             };
-        }));
+        });
         picker.placeholder = "Select MCP servers to trust";
         picker.ignoreFocusOut = true;
         store.add(picker.onDidTriggerItemButton(e => {
@@ -445,7 +445,7 @@ let McpRegistry = class McpRegistry extends Disposable {
         }));
         return ( new Promise(resolve => {
             store.add(picker.onDidAccept(() => {
-                resolve(( picker.selectedItems.map(item => item.definitonId)));
+                resolve(picker.selectedItems.map(item => item.definitonId));
                 picker.hide();
             }));
             store.add(picker.onDidHide(() => {
@@ -565,14 +565,14 @@ let McpRegistry = class McpRegistry extends Disposable {
             }
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(14129, "Error starting {0}: {1}", definition.label, String(e))),
+                message: ( localize(16268, "Error starting {0}: {1}", definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [{
                         id: "mcp.launchError.openConfig",
                         class: undefined,
                         enabled: true,
                         tooltip: "",
-                        label: ( localize(14130, "Open Configuration")),
+                        label: ( localize(16269, "Open Configuration")),
                         run: () => this._editorService.openEditor({
                             resource: collection.presentation.origin,
                             options: {

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

@@ -44,7 +44,7 @@ let McpResourceFilesystem = class McpResourceFilesystem extends Disposable {
         return this._readFile(resource);
     }
     readFileStream(resource, opts, token) {
-        const stream = newWriteableStream(data => VSBuffer.concat(( data.map(data => VSBuffer.wrap(data)))).buffer);
+        const stream = newWriteableStream(data => VSBuffer.concat(data.map(data => VSBuffer.wrap(data))).buffer);
         this._readFile(resource, token).then(data => {
             if (opts.position) {
                 data = data.slice(opts.position);

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(14131, "{0} total requests in the last 7 days.", total)));
+        parts.push(( localize(16270, "{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

@@ -55,8 +55,8 @@ let McpSamplingService = class McpSamplingService extends Disposable {
         this._logs = this._register(instaService.createInstance(McpSamplingLog));
     }
     async sample(opts, token = CancellationToken.None) {
-        const messages = ( opts.params.messages.map(message => {
-            const content = ( asArray(message.content).map(part => part.type === "text" ? {
+        const messages = opts.params.messages.map(message => {
+            const content = asArray(message.content).map(part => part.type === "text" ? {
                 type: "text",
                 value: part.text
             } : part.type === "image" || part.type === "audio" ? {
@@ -65,7 +65,7 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                     mimeType: part.mimeType,
                     data: decodeBase64(part.data)
                 }
-            } : undefined)).filter(isDefined);
+            } : undefined).filter(isDefined);
             if (!content.length) {
                 return undefined;
             }
@@ -73,7 +73,7 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 role: message.role === "assistant" ? ChatMessageRole.Assistant : ChatMessageRole.User,
                 content
             };
-        })).filter(isDefined);
+        }).filter(isDefined);
         if (opts.params.systemPrompt) {
             messages.unshift({
                 role: ChatMessageRole.System,
@@ -131,11 +131,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                14132,
+                16271,
                 "Allow MCP tools from \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                14133,
+                16272,
                 "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(
-                14134,
+                16273,
                 "Allow MCP server \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                14135,
+                16274,
                 "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(
-                14136,
+                16275,
                 "MCP server \"{0}\" triggered a language model request, but it has no allowlisted models.",
                 opts.server.definition.label
             )), {
-                [( localize(14137, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
-                [( localize(14138, "Cancel"))]: () => Promise.resolve(undefined)
+                [( localize(16276, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
+                [( localize(16277, "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(14139, "Allow in this Session"))]: async () => {
+            [( localize(16278, "Allow in this Session"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, true);
                 return true;
             },
-            [( localize(14140, "Always"))]: async () => {
+            [( localize(16279, "Always"))]: async () => {
                 await this.updateConfig(server, c => c[key] = true);
                 return true;
             },
-            [( localize(14141, "Not Now"))]: async () => {
+            [( localize(16280, "Not Now"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, false);
                 return false;
             },
-            [( localize(14142, "Never"))]: async () => {
+            [( localize(16281, "Never"))]: async () => {
                 await this.updateConfig(server, c => c[key] = false);
                 return false;
             }
@@ -205,10 +205,10 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 type: "question",
                 title: title,
                 message,
-                buttons: ( Object.entries(buttons).map(([label, run]) => ({
+                buttons: Object.entries(buttons).map(([label, run]) => ({
                     label,
                     run
-                })))
+                }))
             });
             return await result.result;
         } else {
@@ -217,10 +217,14 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     async _notify(message, buttons) {
         return await ( new Promise(resolve => {
-            const handle = this._notificationService.prompt(Severity.Info, message, ( Object.entries(buttons).map(([label, action]) => ({
-                label,
-                run: () => resolve(action())
-            }))));
+            const handle = this._notificationService.prompt(
+                Severity.Info,
+                message,
+                Object.entries(buttons).map(([label, action]) => ({
+                    label,
+                    run: () => resolve(action())
+                }))
+            );
             Event.once(handle.onDidClose)(() => resolve(undefined));
         }));
     }
@@ -247,18 +251,18 @@ let McpSamplingService = class McpSamplingService extends Disposable {
         return foundModelIds[0];
     }
     _getDefaultModels() {
-        const candidates = ( this._languageModelsService.getLanguageModelIds().map(m => {
+        const candidates = this._languageModelsService.getLanguageModelIds().map(m => {
             const model = this._languageModelsService.lookupLanguageModel(m);
             return model && !model.multiplierNumeric && !model.targetChatSessionType ? {
                 model,
                 id: m
             } : undefined;
-        })).filter(isDefined);
+        }).filter(isDefined);
         const someDefault = candidates.findIndex(c => ( ( Object.values(c.model.isDefaultForLocation)).some(Boolean)));
         if (someDefault !== -1) {
             [candidates[0], candidates[someDefault]] = [candidates[someDefault], candidates[0]];
         }
-        return ( candidates.map(c => c.id));
+        return candidates.map(c => c.id);
     }
     _configKey(server) {
         return `${server.collection.label}: ${server.definition.label}`;

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

@@ -88,7 +88,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
             );
             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 quotedArgs = launch.args.map(arg => this._quoteShellArgument(arg));
             const sandboxArgs = this._getSandboxCommandArgs(quotedCommand, quotedArgs, launchDetails.sandboxConfigPath);
             const sandboxEnv = await this._getSandboxEnvVariables(launch.env, launchDetails.tempDir, launchDetails.rgPath, remoteAuthority);
             if (launchDetails.srtPath) {
@@ -130,12 +130,12 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         const allowedDomainsList = suggestions.allowedDomains;
         const suggestionLines = [];
         if (allowedDomainsList.length) {
-            const shown = ( allowedDomainsList.map(domain => `"${domain}"`)).join(", ");
-            suggestionLines.push(( localize(14143, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
+            const shown = allowedDomainsList.map(domain => `"${domain}"`).join(", ");
+            suggestionLines.push(( localize(16282, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
         }
         if (allowWriteList.length) {
-            const shown = ( allowWriteList.map(path => `"${path}"`)).join(", ");
-            suggestionLines.push(( localize(14144, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
+            const shown = allowWriteList.map(path => `"${path}"`).join(", ");
+            suggestionLines.push(( localize(16283, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
         }
         const sandboxConfig = {};
         if (allowedDomainsList.length) {
@@ -150,7 +150,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         }
         return {
             message: ( localize(
-                14145,
+                16284,
                 "The MCP server {0} reported potential sandbox blocks. VS Code found possible sandbox configuration updates:\n{1}",
                 serverLabel,
                 suggestionLines.join("\n")

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(14161, "Starting server {0}", this.definition.label)));
+        this._logger.info(( localize(16300, "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(14162, "Connection state: {0}", (McpConnectionState.toString(state)))));
+            this._logger.info(( localize(16301, "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(14163, "Stopping server {0}", this.definition.label)));
+        this._logger.info(( localize(16302, "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/mcpServerRequestHandler.js

@@ -569,7 +569,7 @@ class McpTask extends Disposable {
                 });
             }, pollInterval));
         }));
-        const lastStatus = ( this._lastTaskState.map(task => task.status));
+        const lastStatus = this._lastTaskState.map(task => task.status);
         store.add(autorun(reader => {
             const status = lastStatus.read(reader);
             if (status === "failed") {

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

@@ -41,7 +41,7 @@ let McpService = class McpService extends Disposable {
         this.configurationService = configurationService;
         this._currentAutoStarts = ( new Set());
         this._servers = observableValue(this, []);
-        this.servers = ( this._servers.map(servers => ( servers.map(s => s.object))));
+        this.servers = this._servers.map(servers => servers.map(s => s.object));
         this._prefixGenerator = ( new McpPrefixGenerator());
         const baseEnablement = this._register(( new EnablementModel("mcp.enablement", storageService)));
         const collisionBehavior = observableConfigValue(
@@ -119,11 +119,11 @@ let McpService = class McpService extends Disposable {
         const requiringInteraction = [];
         const update = () => state.set({
             working: todo.size > 0,
-            starting: ( [...todo].map(t => t.definition)),
+            starting: [...todo].map(t => t.definition),
             serversRequiringInteraction: requiringInteraction
         }, undefined);
         update();
-        await Promise.all(( [...todo].map(async (server, i) => {
+        await Promise.all([...todo].map(async (server, i) => {
             try {
                 await startServerAndWaitForLiveTools(server, {
                     interaction,
@@ -143,7 +143,7 @@ let McpService = class McpService extends Disposable {
                     update();
                 }
             }
-        })));
+        }));
     }
     resetCaches() {
         this.userCache.reset();
@@ -158,15 +158,17 @@ let McpService = class McpService extends Disposable {
     async _activateCollections() {
         const collections = await this._mcpRegistry.discoverCollections();
         this.updateCollectedServers();
-        return ( new Set(( collections.map(c => c.id))));
+        return ( new Set(collections.map(c => c.id)));
     }
     updateCollectedServers() {
-        const definitions = this._mcpRegistry.collections.get().flatMap(collectionDefinition => ( collectionDefinition.serverDefinitions.get().map(serverDefinition => {
-            return {
-                serverDefinition,
-                collectionDefinition
-            };
-        })));
+        const definitions = this._mcpRegistry.collections.get().flatMap(
+            collectionDefinition => collectionDefinition.serverDefinitions.get().map(serverDefinition => {
+                return {
+                    serverDefinition,
+                    collectionDefinition
+                };
+            })
+        );
         const nextDefinitions = ( new Set(definitions));
         const currentServers = this._servers.get();
         const nextServers = [];

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

@@ -6,7 +6,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import { registerSingleton, InstantiationType } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
@@ -18,7 +18,7 @@ import { IAuthenticationMcpUsageService } from '@codingame/monaco-vscode-api/vsc
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
-import { IAuthenticationMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 const SCOPESLIST_SEPARATOR = " ";
@@ -120,7 +120,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(19422, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(21565, "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(
-                19423,
+                21566,
                 "The MCP server '{0}' wants to access the {1} account '{2}'.",
                 mcpServerName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(19424, "&&Allow")),
+                label: ( localize(21567, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(19425, "&&Deny")),
+                label: ( localize(21568, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -230,13 +230,13 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
         const quickPick = disposables.add(this.quickInputService.createQuickPick());
         quickPick.ignoreFocusOut = true;
         const accountsWithSessions = ( new Set());
-        const items = (
+        const items =
         availableSessions.filter(session => !( accountsWithSessions.has(session.account.label)) && accountsWithSessions.add(session.account.label)).map(session => {
             return {
                 label: session.account.label,
                 session: session
             };
-        }));
+        });
         allAccounts.forEach(account => {
             if (!( accountsWithSessions.has(account.label))) {
                 items.push({
@@ -246,17 +246,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             }
         });
         items.push({
-            label: ( localize(19426, "Sign in to another account"))
+            label: ( localize(21569, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            19427,
+            21570,
             "The MCP server '{0}' wants to access a {1} account",
             mcpServerName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            19428,
+            21571,
             "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(19429, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
+                title: ( localize(21572, "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(19430, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
+                title: ( localize(21573, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({
@@ -418,10 +418,5 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
     }
 };
 AuthenticationMcpService = ( __decorate([( __param(0, IActivityService)), ( __param(1, IStorageService)), ( __param(2, IDialogService)), ( __param(3, IQuickInputService)), ( __param(4, IProductService)), ( __param(5, IAuthenticationService)), ( __param(6, IAuthenticationMcpUsageService)), ( __param(7, IAuthenticationMcpAccessService))], AuthenticationMcpService));
-( registerSingleton(
-    IAuthenticationMcpService,
-    AuthenticationMcpService,
-    InstantiationType.Delayed
-));
 
 export { AuthenticationMcpService };

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

@@ -35,7 +35,9 @@ let AuthenticationMcpUsageService = class AuthenticationMcpUsageService extends
         );
     }
     async initializeUsageCache() {
-        await this._queue.queue(() => Promise.all(( this._authenticationService.getProviderIds().map(providerId => this._addToCache(providerId)))));
+        await this._queue.queue(() => Promise.all(
+            this._authenticationService.getProviderIds().map(providerId => this._addToCache(providerId))
+        ));
     }
     async hasUsedAuth(mcpServerId) {
         await this._queue.whenIdle();

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

@@ -1,6 +0,0 @@
-import { McpServerDefinition, McpServerLaunch } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
-export interface IMcpDevModeDebugging {
-    readonly _serviceBrand: undefined;
-    transform(definition: McpServerDefinition, launch: McpServerLaunch): Promise<McpServerLaunch>;
-}
-export declare const IMcpDevModeDebugging: import("@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation").ServiceIdentifier<IMcpDevModeDebugging>;

package/vscode/src/vs/workbench/contrib/mcp/common/mcpDevMode.service.js

@@ -1,6 +0,0 @@
-
-import { createDecorator } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-
-const IMcpDevModeDebugging = ( createDecorator("mcpDevModeDebugging"));
-
-export { IMcpDevModeDebugging };