@codingame/monaco-vscode-mcp-service-override 24.3.0 → 25.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "24.3.0",
+  "version": "25.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.3.0"
+    "@codingame/monaco-vscode-api": "25.0.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -25,7 +25,7 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
         }
         const settingsCommandLink = ( createCommandUri('workbench.action.openSettings', { query: `@id:${mcpAccessConfig}` }).toString());
         return (new MarkdownString(localize(
-            1993,
+            2000,
             "Model Context Protocol servers are disabled in the Editor. Please check your [settings]({0}).",
             settingsCommandLink
         )));

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

@@ -408,7 +408,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
     async getReadme(gallery, token) {
         const readmeUrl = gallery.readmeUrl;
         if (!readmeUrl) {
-            return Promise.resolve(( localize(1994, 'No README available')));
+            return Promise.resolve(( localize(2001, 'No README available')));
         }
         const uri = ( URI.parse(readmeUrl));
         if (uri.scheme === Schemas.file) {
@@ -421,7 +421,7 @@ let McpGalleryService = class McpGalleryService extends Disposable {
             }
         }
         if (uri.authority !== 'raw.githubusercontent.com') {
-            return ( new MarkdownString(( localize(1995, "You can find information about this server [here]({0})", readmeUrl)))).value;
+            return ( new MarkdownString(( localize(2002, "You can find information about this server [here]({0})", readmeUrl)))).value;
         }
         const context = await this.requestService.request({
             type: 'GET',

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

@@ -501,7 +501,7 @@ let AbstractMcpManagementService = class AbstractMcpManagementService extends Ab
         const allowedToInstall = this.allowedMcpServersService.isAllowed(server);
         if (allowedToInstall !== true) {
             return (new MarkdownString(localize(
-                1996,
+                2003,
                 "This mcp server cannot be installed because {0}",
                 allowedToInstall.value
             )));

package/vscode/src/vs/workbench/contrib/mcp/browser/mcp.contribution.js

@@ -78,15 +78,15 @@ registerWorkbenchContribution2(McpConfigMigrationContribution.ID, McpConfigMigra
 registerWorkbenchContribution2(McpServersViewsContribution.ID, McpServersViewsContribution, WorkbenchPhase.AfterRestored);
 const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(8692, "MCP Server"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(8717, "MCP Server"))), [
     ( new SyncDescriptor(McpServerEditorInput))
 ]);
 ( Registry.as(Extensions$1.Quickaccess)).registerQuickAccessProvider({
     ctor: McpResourceQuickAccess,
     prefix: McpResourceQuickAccess.PREFIX,
-    placeholder: ( localize(8693, "Filter to an MCP resource")),
+    placeholder: ( localize(8718, "Filter to an MCP resource")),
     helpEntries: [{
-            description: ( localize(8694, "MCP Server Resources")),
+            description: ( localize(8719, "MCP Server Resources")),
             commandId: McpCommandIds.AddConfiguration
         }]
 });

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

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
+import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service";
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 export declare class McpAddContextContribution extends Disposable implements IWorkbenchContribution {
     private readonly _chatContextPickService;

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpAddContextContribution.js

@@ -5,7 +5,7 @@ import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vsco
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
+import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/attachments/chatContextPickService.service';
 import { McpCapability } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { McpResourcePickHelper } from './mcpResourceQuickAccess.js';
@@ -45,7 +45,7 @@ let McpAddContextContribution = class McpAddContextContribution extends Disposab
     _registerAddContextMenu() {
         this._addContextMenu.value = this._chatContextPickService.registerChatContextItem({
             type: 'pickerPick',
-            label: ( localize(8695, "MCP Resources...")),
+            label: ( localize(8720, "MCP Resources...")),
             icon: Codicon.mcp,
             isEnabled(widget) {
                 return !!widget.attachmentCapabilities.supportsMCPAttachments;
@@ -53,7 +53,7 @@ let McpAddContextContribution = class McpAddContextContribution extends Disposab
             asPicker: () => {
                 const helper = this._instantiationService.createInstance(McpResourcePickHelper);
                 return {
-                    placeholder: ( localize(8696, "Select MCP Resource...")),
+                    placeholder: ( localize(8721, "Select MCP Resource...")),
                     picks: (_query, token) => this._getResourcePicks(token, helper),
                     goBack: () => {
                         return helper.navigateBack();

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

@@ -8,7 +8,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService, ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { StorageScope } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { IChatElicitationRequest, IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
+import { IChatElicitationRequest, IChatToolInvocation } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService";
 import { IMcpServer, IMcpServerStartOpts } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 export declare class ListMcpServerCommand extends Action2 {
@@ -62,7 +62,7 @@ export declare class RestartServer extends Action2 {
 }
 export declare class StartServer extends Action2 {
     constructor();
-    run(accessor: ServicesAccessor, serverId: string, opts?: IMcpServerStartOpts): Promise<void>;
+    run(accessor: ServicesAccessor, serverId: string | undefined, opts?: IMcpServerStartOpts): Promise<void>;
 }
 export declare class StopServer extends Action2 {
     constructor();

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpCommands.js

@@ -46,10 +46,10 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { VIEW_CONTAINER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensions.contribution';
 import { extensionsFilterSubMenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
@@ -77,7 +77,7 @@ class ListMcpServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ListServer,
-            title: ( localize2(8697, 'List Servers')),
+            title: ( localize2(8722, 'List Servers')),
             icon: Codicon.server,
             category,
             f1: true,
@@ -96,14 +96,14 @@ class ListMcpServerCommand extends Action2 {
         const quickInput = accessor.get(IQuickInputService);
         const store = ( new DisposableStore());
         const pick = quickInput.createQuickPick({ useSeparators: true });
-        pick.placeholder = ( localize(8698, 'Select an MCP Server'));
+        pick.placeholder = ( localize(8723, 'Select an MCP Server'));
         mcpService.activateCollections();
         store.add(pick);
         store.add(autorun(reader => {
             const servers = groupBy(mcpService.servers.read(reader).slice().sort((a, b) => (a.collection.presentation?.order || 0) - (b.collection.presentation?.order || 0)), s => s.collection.id);
             const firstRun = pick.items.length === 0;
             pick.items = [
-                { id: '$add', label: ( localize(8699, 'Add Server')), description: ( localize(8700, 'Add a new server configuration')), alwaysShow: true, iconClass: ThemeIcon.asClassName(Codicon.add) },
+                { id: '$add', label: ( localize(8724, 'Add Server')), description: ( localize(8725, 'Add a new server configuration')), alwaysShow: true, iconClass: ThemeIcon.asClassName(Codicon.add) },
                 ...( Object.values(servers)).filter(s => s.length).flatMap((servers) => [
                     { type: 'separator', label: servers[0].collection.label, id: servers[0].collection.id },
                     ...( servers.map(server => ({
@@ -140,7 +140,7 @@ class McpConfirmationServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptionsInConfirmation,
-            title: ( localize2(8701, 'Server Options')),
+            title: ( localize2(8726, 'Server Options')),
             category,
             icon: Codicon.settingsGear,
             f1: false,
@@ -173,7 +173,7 @@ class McpServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptions,
-            title: ( localize2(8701, 'Server Options')),
+            title: ( localize2(8726, 'Server Options')),
             category,
             f1: false,
         });
@@ -195,20 +195,20 @@ class McpServerOptionsCommand extends Action2 {
         const serverDefinition = collection?.serverDefinitions.get().find(s => s.id === server.definition.id);
         const items = [];
         const serverState = server.connectionState.get();
-        items.push({ type: 'separator', label: ( localize(8702, 'Status')) });
+        items.push({ type: 'separator', label: ( localize(8727, 'Status')) });
         if (McpConnectionState.canBeStarted(serverState.state)) {
             items.push({
-                label: ( localize(8703, 'Start Server')),
+                label: ( localize(8728, 'Start Server')),
                 action: 'start'
             });
         }
         else {
             items.push({
-                label: ( localize(8704, 'Stop Server')),
+                label: ( localize(8729, 'Stop Server')),
                 action: 'stop'
             });
             items.push({
-                label: ( localize(8705, 'Restart Server')),
+                label: ( localize(8730, 'Restart Server')),
                 action: 'restart'
             });
         }
@@ -216,36 +216,36 @@ class McpServerOptionsCommand extends Action2 {
         const configTarget = serverDefinition?.presentation?.origin || collection?.presentation?.origin;
         if (configTarget) {
             items.push({
-                label: ( localize(8706, 'Show Configuration')),
+                label: ( localize(8731, 'Show Configuration')),
                 action: 'config',
             });
         }
         items.push({
-            label: ( localize(8707, 'Show Output')),
+            label: ( localize(8732, 'Show Output')),
             action: 'showOutput'
         });
-        items.push({ type: 'separator', label: ( localize(8708, 'Sampling')) }, {
-            label: ( localize(8709, 'Configure Model Access')),
-            description: ( localize(8710, 'Set the models the server can use via MCP sampling')),
+        items.push({ type: 'separator', label: ( localize(8733, 'Sampling')) }, {
+            label: ( localize(8734, 'Configure Model Access')),
+            description: ( localize(8735, 'Set the models the server can use via MCP sampling')),
             action: 'configSampling'
         });
         if (samplingService.hasLogs(server)) {
             items.push({
-                label: ( localize(8711, 'Show Sampling Requests')),
-                description: ( localize(8712, 'Show the sampling requests for this server')),
+                label: ( localize(8736, 'Show Sampling Requests')),
+                description: ( localize(8737, 'Show the sampling requests for this server')),
                 action: 'samplingLog',
             });
         }
         const capabilities = server.capabilities.get();
         if (capabilities === undefined || (capabilities & McpCapability.Resources)) {
-            items.push({ type: 'separator', label: ( localize(8713, 'Resources')) });
+            items.push({ type: 'separator', label: ( localize(8738, 'Resources')) });
             items.push({
-                label: ( localize(8714, 'Browse Resources')),
+                label: ( localize(8739, 'Browse Resources')),
                 action: 'resources',
             });
         }
         const pick = await quickInputService.pick(items, {
-            placeHolder: ( localize(8715, 'Select action for \'{0}\'', server.definition.label)),
+            placeHolder: ( localize(8740, 'Select action for \'{0}\'', server.definition.label)),
         });
         if (!pick) {
             return;
@@ -287,7 +287,7 @@ class McpServerOptionsCommand extends Action2 {
                 editorService.openEditor({
                     resource: undefined,
                     contents: samplingService.getLogText(server),
-                    label: ( localize(8716, 'MCP Sampling: {0}', server.definition.label)),
+                    label: ( localize(8741, 'MCP Sampling: {0}', server.definition.label)),
                 });
                 break;
             default:
@@ -304,7 +304,7 @@ class McpServerOptionsCommand extends Action2 {
             if (accountQuery.entities().getEntityCount().total > 1) {
                 result.push({
                     action: 'disconnect',
-                    label: ( localize(8717, 'Disconnect Account')),
+                    label: ( localize(8742, 'Disconnect Account')),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -312,7 +312,7 @@ class McpServerOptionsCommand extends Action2 {
             else {
                 result.push({
                     action: 'signout',
-                    label: ( localize(8718, 'Sign Out')),
+                    label: ( localize(8743, 'Sign Out')),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -466,21 +466,21 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                     if (state === DisplayedState.NewTools) {
                         markdown = ( new MarkdownString(single
                             ? ( localize(
-                            8719,
+                            8744,
                             "MCP server {0} has been updated and may have new tools available.",
                             names
                         ))
                             : ( localize(
-                            8720,
+                            8745,
                             "MCP servers have been updated and may have new tools available:\n\n{0}",
                             names
                         ))));
                     }
                     else if (state === DisplayedState.Error) {
                         markdown = ( new MarkdownString(single
-                            ? ( localize(8721, "MCP server {0} was unable to start successfully.", names))
+                            ? ( localize(8746, "MCP server {0} was unable to start successfully.", names))
                             : ( localize(
-                            8722,
+                            8747,
                             "Multiple MCP servers were unable to start successfully:\n\n{0}",
                             names
                         ))));
@@ -508,7 +508,7 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                             const divider = $('hr.mcp-hover-divider');
                             container.appendChild(divider);
                             const checkboxContainer = $('div.mcp-hover-setting');
-                            const settingLabelStr = ( localize(8723, "Automatically start MCP servers when sending a chat message"));
+                            const settingLabelStr = ( localize(8748, "Automatically start MCP servers when sending a chat message"));
                             const checkbox = store.add(( new Checkbox(
                                 settingLabelStr,
                                 config.get() !== McpAutoStartValue.Never,
@@ -533,13 +533,13 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                 }
                 getLabelForState({ state, servers } = displayedStateCurrent.get()) {
                     if (state === DisplayedState.NewTools) {
-                        return localize(8724, "New tools available ({0})", servers.length || 1);
+                        return localize(8749, "New tools available ({0})", servers.length || 1);
                     }
                     else if (state === DisplayedState.Error) {
-                        return localize(8725, "Error loading {0} tool(s)", servers.length || 1);
+                        return localize(8750, "Error loading {0} tool(s)", servers.length || 1);
                     }
                     else if (state === DisplayedState.Refreshing) {
-                        return localize(8726, "Discovering tools...");
+                        return localize(8751, "Discovering tools...");
                     }
                     else {
                         return null;
@@ -560,7 +560,7 @@ class ResetMcpTrustCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetTrust,
-            title: ( localize2(8727, "Reset Trust")),
+            title: ( localize2(8752, "Reset Trust")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
@@ -575,7 +575,7 @@ class ResetMcpCachedTools extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetCachedTools,
-            title: ( localize2(8728, "Reset Cached Tools")),
+            title: ( localize2(8753, "Reset Cached Tools")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
@@ -590,9 +590,9 @@ class AddConfigurationAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.AddConfiguration,
-            title: ( localize2(8729, "Add Server...")),
+            title: ( localize2(8754, "Add Server...")),
             metadata: {
-                description: ( localize2(8730, "Installs a new Model Context protocol to the mcp.json settings")),
+                description: ( localize2(8755, "Installs a new Model Context protocol to the mcp.json settings")),
             },
             category,
             f1: true,
@@ -614,7 +614,7 @@ class RemoveStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RemoveStoredInput,
-            title: ( localize2(8728, "Reset Cached Tools")),
+            title: ( localize2(8753, "Reset Cached Tools")),
             category,
             f1: false,
         });
@@ -627,7 +627,7 @@ class EditStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.EditStoredInput,
-            title: ( localize2(8731, "Edit Stored Input")),
+            title: ( localize2(8756, "Edit Stored Input")),
             category,
             f1: false,
         });
@@ -641,7 +641,7 @@ class ShowConfiguration extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowConfiguration,
-            title: ( localize2(8732, "Show Configuration")),
+            title: ( localize2(8757, "Show Configuration")),
             category,
             f1: false,
         });
@@ -670,7 +670,7 @@ class ShowOutput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowOutput,
-            title: ( localize2(8733, "Show Output")),
+            title: ( localize2(8758, "Show Output")),
             category,
             f1: false,
         });
@@ -683,7 +683,7 @@ class RestartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RestartServer,
-            title: ( localize2(8734, "Restart Server")),
+            title: ( localize2(8759, "Restart Server")),
             category,
             f1: false,
         });
@@ -699,21 +699,24 @@ class StartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartServer,
-            title: ( localize2(8735, "Start Server")),
+            title: ( localize2(8760, "Start Server")),
             category,
             f1: false,
         });
     }
     async run(accessor, serverId, opts) {
-        const s = accessor.get(IMcpService).servers.get().find(s => s.definition.id === serverId);
-        await s?.start({ promptType: 'all-untrusted', ...opts });
+        let servers = accessor.get(IMcpService).servers.get();
+        if (serverId !== undefined) {
+            servers = servers.filter(s => s.definition.id === serverId);
+        }
+        await Promise.all(( servers.map(s => s.start({ promptType: 'all-untrusted', ...opts }))));
     }
 }
 class StopServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StopServer,
-            title: ( localize2(8736, "Stop Server")),
+            title: ( localize2(8761, "Stop Server")),
             category,
             f1: false,
         });
@@ -727,8 +730,8 @@ class McpBrowseCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.Browse,
-            title: ( localize2(8737, "MCP Servers")),
-            tooltip: ( localize2(8738, "Browse MCP Servers")),
+            title: ( localize2(8762, "MCP Servers")),
+            tooltip: ( localize2(8763, "Browse MCP Servers")),
             category,
             icon: Codicon.search,
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
@@ -751,7 +754,7 @@ class McpBrowseCommand extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: McpCommandIds.Browse,
-        title: ( localize2(8739, "Browse MCP Servers")),
+        title: ( localize2(8764, "Browse MCP Servers")),
         category,
         precondition: ( ChatContextKeys.Setup.hidden.negate()),
     },
@@ -760,7 +763,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowInstalled,
-            title: ( localize2(8740, "Show Installed Servers")),
+            title: ( localize2(8765, "Show Installed Servers")),
             category,
             precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
             f1: true,
@@ -778,7 +781,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
 MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
     command: {
         id: McpCommandIds.ShowInstalled,
-        title: ( localize2(8741, "MCP Servers"))
+        title: ( localize2(8766, "MCP Servers"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals('view', ChatViewId)))),
     order: 10,
@@ -799,7 +802,7 @@ class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenUserMcp,
-            title: ( localize2(8742, "Open User Configuration")),
+            title: ( localize2(8767, "Open User Configuration")),
             category,
             f1: true,
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
@@ -814,7 +817,7 @@ class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenRemoteUserMcp,
-            title: ( localize2(8743, "Open Remote User Configuration")),
+            title: ( localize2(8768, "Open Remote User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( RemoteNameContext.notEqualsTo(''))))
@@ -831,7 +834,7 @@ class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceFolderMcp,
-            title: ( localize2(8744, "Open Workspace Folder MCP Configuration")),
+            title: ( localize2(8769, "Open Workspace Folder MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkspaceFolderCountContext.notEqualsTo(0))))
@@ -852,7 +855,7 @@ class OpenWorkspaceMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceMcp,
-            title: ( localize2(8745, "Open Workspace MCP Configuration")),
+            title: ( localize2(8770, "Open Workspace MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkbenchStateContext.isEqualTo('workspace'))))
@@ -871,7 +874,7 @@ class McpBrowseResourcesCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.BrowseResources,
-            title: ( localize2(8746, "Browse Resources...")),
+            title: ( localize2(8771, "Browse Resources...")),
             category,
             precondition: ( ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
             f1: true,
@@ -890,7 +893,7 @@ class McpConfigureSamplingModels extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ConfigureSamplingModels,
-            title: ( localize2(8747, "Configure SamplingModel")),
+            title: ( localize2(8772, "Configure SamplingModel")),
             category,
         });
     }
@@ -914,7 +917,7 @@ class McpConfigureSamplingModels extends Action2 {
         allItems.sort((a, b) => (b.picked ? 1 : 0) - (a.picked ? 1 : 0) || a.label.localeCompare(b.label));
         const picked = await quickInputService.pick(allItems, {
             placeHolder: ( localize(
-                8748,
+                8773,
                 'Pick the models {0} can access via MCP sampling',
                 server.definition.label
             )),
@@ -930,7 +933,7 @@ class McpStartPromptingServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartPromptForServer,
-            title: ( localize2(8749, "Start Prompting Server")),
+            title: ( localize2(8774, "Start Prompting Server")),
             category,
             f1: false,
         });
@@ -957,7 +960,7 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SkipCurrentAutostart,
-            title: ( localize2(8750, "Skip Current Autostart")),
+            title: ( localize2(8775, "Skip Current Autostart")),
             category,
             f1: false,
         });

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

@@ -2,7 +2,7 @@ import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/c
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { ElicitResult, IMcpServer, IMcpToolCallContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 import { IMcpElicitationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 import { MCP } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/modelContextProtocol";