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

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

@@ -11,7 +11,7 @@ import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { groupBy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/collections';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { markdownCommandLink, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { createMarkdownCommandLink, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { DisposableStore, Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -28,38 +28,38 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { mcpAutoStartConfig, McpAutoStartValue } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
+import { mcpAutoStartConfig, McpAutoStartValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { defaultCheckboxStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { spinningLoading } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common/vscode/vs/workbench/browser/actions/workspaceCommands';
+import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/actions/workspaceCommands';
 import { ResourceContextKey, ActiveEditorContext, RemoteNameContext, WorkspaceFolderCountContext, WorkbenchStateContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { IAuthenticationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { IAuthenticationQueryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authenticationQuery.service';
-import { WORKSPACE_STANDALONE_CONFIGURATIONS, MCP_CONFIGURATION_KEY } from '@codingame/monaco-vscode-ce7c734f-7712-563c-9335-d7acb43306af-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { WORKSPACE_STANDALONE_CONFIGURATIONS, MCP_CONFIGURATION_KEY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/configuration';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IRemoteUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { CHAT_CONFIG_MENU_ID } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
-import { ChatViewId } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
+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 { 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 { VIEW_CONTAINER } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/browser/extensions.contribution';
+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';
-import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common/vscode/vs/workbench/contrib/files/common/files';
-import { McpCommandIds } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
+import { TEXT_FILE_EDITOR_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/files/common/files';
+import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpConnectionState, McpCapability, McpServerCacheState, LazyCollectionState, McpStartServerInteraction, InstalledMcpServersViewId, HasInstalledMcpServersContext, mcpPromptPrefix } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService, IMcpSamplingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
-import { McpAddConfigurationCommand } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration';
+import { McpAddConfigurationCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration';
 import { McpResourceQuickPick, McpResourceQuickAccess } from './mcpResourceQuickAccess.js';
 import * as mcpServerAction from './media/mcpServerAction.css';
 import { openPanelChatAndGetWidget } from './openPanelChatAndGetWidget.js';
@@ -77,7 +77,7 @@ class ListMcpServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ListServer,
-            title: ( localize2(8571, 'List Servers')),
+            title: ( localize2(8697, '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(8572, 'Select an MCP Server'));
+        pick.placeholder = ( localize(8698, '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(8573, 'Add Server')), description: ( localize(8574, 'Add a new server configuration')), alwaysShow: true, iconClass: ThemeIcon.asClassName(Codicon.add) },
+                { id: '$add', label: ( localize(8699, 'Add Server')), description: ( localize(8700, '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(8575, 'Server Options')),
+            title: ( localize2(8701, 'Server Options')),
             category,
             icon: Codicon.settingsGear,
             f1: false,
@@ -159,7 +159,7 @@ class McpConfirmationServerOptionsCommand extends Action2 {
                 accessor.get(ICommandService).executeCommand(McpCommandIds.ServerOptions, tool.source.definitionId);
             }
         }
-        else if (arg.kind === 'elicitation') {
+        else if (arg.kind === 'elicitation2') {
             if (arg.source?.type === 'mcp') {
                 accessor.get(ICommandService).executeCommand(McpCommandIds.ServerOptions, arg.source.definitionId);
             }
@@ -173,7 +173,7 @@ class McpServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptions,
-            title: ( localize2(8575, 'Server Options')),
+            title: ( localize2(8701, '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(8576, 'Status')) });
+        items.push({ type: 'separator', label: ( localize(8702, 'Status')) });
         if (McpConnectionState.canBeStarted(serverState.state)) {
             items.push({
-                label: ( localize(8577, 'Start Server')),
+                label: ( localize(8703, 'Start Server')),
                 action: 'start'
             });
         }
         else {
             items.push({
-                label: ( localize(8578, 'Stop Server')),
+                label: ( localize(8704, 'Stop Server')),
                 action: 'stop'
             });
             items.push({
-                label: ( localize(8579, 'Restart Server')),
+                label: ( localize(8705, '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(8580, 'Show Configuration')),
+                label: ( localize(8706, 'Show Configuration')),
                 action: 'config',
             });
         }
         items.push({
-            label: ( localize(8581, 'Show Output')),
+            label: ( localize(8707, 'Show Output')),
             action: 'showOutput'
         });
-        items.push({ type: 'separator', label: ( localize(8582, 'Sampling')) }, {
-            label: ( localize(8583, 'Configure Model Access')),
-            description: ( localize(8584, 'Set the models the server can use via MCP sampling')),
+        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')),
             action: 'configSampling'
         });
         if (samplingService.hasLogs(server)) {
             items.push({
-                label: ( localize(8585, 'Show Sampling Requests')),
-                description: ( localize(8586, 'Show the sampling requests for this server')),
+                label: ( localize(8711, 'Show Sampling Requests')),
+                description: ( localize(8712, '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(8587, 'Resources')) });
+            items.push({ type: 'separator', label: ( localize(8713, 'Resources')) });
             items.push({
-                label: ( localize(8588, 'Browse Resources')),
+                label: ( localize(8714, 'Browse Resources')),
                 action: 'resources',
             });
         }
         const pick = await quickInputService.pick(items, {
-            placeHolder: ( localize(8589, 'Select action for \'{0}\'', server.definition.label)),
+            placeHolder: ( localize(8715, '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(8590, 'MCP Sampling: {0}', server.definition.label)),
+                    label: ( localize(8716, '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(8591, 'Disconnect Account')),
+                    label: ( localize(8717, 'Disconnect Account')),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -312,7 +312,7 @@ class McpServerOptionsCommand extends Action2 {
             else {
                 result.push({
                     action: 'signout',
-                    label: ( localize(8592, 'Sign Out')),
+                    label: ( localize(8718, 'Sign Out')),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -455,7 +455,7 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                     return this.getLabelForState() || super.getTooltip();
                 }
                 getHoverContents({ state, servers } = displayedStateCurrent.get()) {
-                    const link = (s) => markdownCommandLink({
+                    const link = (s) => createMarkdownCommandLink({
                         title: s.definition.label,
                         id: McpCommandIds.ServerOptions,
                         arguments: [s.definition.id],
@@ -466,21 +466,21 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                     if (state === DisplayedState.NewTools) {
                         markdown = ( new MarkdownString(single
                             ? ( localize(
-                            8593,
+                            8719,
                             "MCP server {0} has been updated and may have new tools available.",
                             names
                         ))
                             : ( localize(
-                            8594,
+                            8720,
                             "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(8595, "MCP server {0} was unable to start successfully.", names))
+                            ? ( localize(8721, "MCP server {0} was unable to start successfully.", names))
                             : ( localize(
-                            8596,
+                            8722,
                             "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(8597, "Automatically start MCP servers when sending a chat message"));
+                            const settingLabelStr = ( localize(8723, "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(8598, "New tools available ({0})", servers.length || 1);
+                        return localize(8724, "New tools available ({0})", servers.length || 1);
                     }
                     else if (state === DisplayedState.Error) {
-                        return localize(8599, "Error loading {0} tool(s)", servers.length || 1);
+                        return localize(8725, "Error loading {0} tool(s)", servers.length || 1);
                     }
                     else if (state === DisplayedState.Refreshing) {
-                        return localize(8600, "Discovering tools...");
+                        return localize(8726, "Discovering tools...");
                     }
                     else {
                         return null;
@@ -560,10 +560,10 @@ class ResetMcpTrustCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetTrust,
-            title: ( localize2(8601, "Reset Trust")),
+            title: ( localize2(8727, "Reset Trust")),
             category,
             f1: true,
-            precondition: McpContextKeys.toolsCount.greater(0),
+            precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
         });
     }
     run(accessor) {
@@ -575,7 +575,7 @@ class ResetMcpCachedTools extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetCachedTools,
-            title: ( localize2(8602, "Reset Cached Tools")),
+            title: ( localize2(8728, "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(8603, "Add Server...")),
+            title: ( localize2(8729, "Add Server...")),
             metadata: {
-                description: ( localize2(8604, "Installs a new Model Context protocol to the mcp.json settings")),
+                description: ( localize2(8730, "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(8602, "Reset Cached Tools")),
+            title: ( localize2(8728, "Reset Cached Tools")),
             category,
             f1: false,
         });
@@ -627,7 +627,7 @@ class EditStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.EditStoredInput,
-            title: ( localize2(8605, "Edit Stored Input")),
+            title: ( localize2(8731, "Edit Stored Input")),
             category,
             f1: false,
         });
@@ -641,7 +641,7 @@ class ShowConfiguration extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowConfiguration,
-            title: ( localize2(8606, "Show Configuration")),
+            title: ( localize2(8732, "Show Configuration")),
             category,
             f1: false,
         });
@@ -670,7 +670,7 @@ class ShowOutput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowOutput,
-            title: ( localize2(8607, "Show Output")),
+            title: ( localize2(8733, "Show Output")),
             category,
             f1: false,
         });
@@ -683,7 +683,7 @@ class RestartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RestartServer,
-            title: ( localize2(8608, "Restart Server")),
+            title: ( localize2(8734, "Restart Server")),
             category,
             f1: false,
         });
@@ -699,7 +699,7 @@ class StartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartServer,
-            title: ( localize2(8609, "Start Server")),
+            title: ( localize2(8735, "Start Server")),
             category,
             f1: false,
         });
@@ -713,7 +713,7 @@ class StopServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StopServer,
-            title: ( localize2(8610, "Stop Server")),
+            title: ( localize2(8736, "Stop Server")),
             category,
             f1: false,
         });
@@ -727,8 +727,8 @@ class McpBrowseCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.Browse,
-            title: ( localize2(8611, "MCP Servers")),
-            tooltip: ( localize2(8612, "Browse MCP Servers")),
+            title: ( localize2(8737, "MCP Servers")),
+            tooltip: ( localize2(8738, "Browse MCP Servers")),
             category,
             icon: Codicon.search,
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
@@ -751,7 +751,7 @@ class McpBrowseCommand extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: McpCommandIds.Browse,
-        title: ( localize2(8613, "Browse MCP Servers")),
+        title: ( localize2(8739, "Browse MCP Servers")),
         category,
         precondition: ( ChatContextKeys.Setup.hidden.negate()),
     },
@@ -760,9 +760,9 @@ class ShowInstalledMcpServersCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowInstalled,
-            title: ( localize2(8614, "Show Installed Servers")),
+            title: ( localize2(8740, "Show Installed Servers")),
             category,
-            precondition: HasInstalledMcpServersContext,
+            precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
             f1: true,
         });
     }
@@ -778,7 +778,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
 MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
     command: {
         id: McpCommandIds.ShowInstalled,
-        title: ( localize2(8615, "MCP Servers"))
+        title: ( localize2(8741, "MCP Servers"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals('view', ChatViewId)))),
     order: 10,
@@ -799,7 +799,7 @@ class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenUserMcp,
-            title: ( localize2(8616, "Open User Configuration")),
+            title: ( localize2(8742, "Open User Configuration")),
             category,
             f1: true,
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
@@ -814,7 +814,7 @@ class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenRemoteUserMcp,
-            title: ( localize2(8617, "Open Remote User Configuration")),
+            title: ( localize2(8743, "Open Remote User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( RemoteNameContext.notEqualsTo(''))))
@@ -831,7 +831,7 @@ class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceFolderMcp,
-            title: ( localize2(8618, "Open Workspace Folder MCP Configuration")),
+            title: ( localize2(8744, "Open Workspace Folder MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkspaceFolderCountContext.notEqualsTo(0))))
@@ -852,7 +852,7 @@ class OpenWorkspaceMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceMcp,
-            title: ( localize2(8619, "Open Workspace MCP Configuration")),
+            title: ( localize2(8745, "Open Workspace MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkbenchStateContext.isEqualTo('workspace'))))
@@ -871,9 +871,9 @@ class McpBrowseResourcesCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.BrowseResources,
-            title: ( localize2(8620, "Browse Resources...")),
+            title: ( localize2(8746, "Browse Resources...")),
             category,
-            precondition: McpContextKeys.serverCount.greater(0),
+            precondition: ( ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
             f1: true,
         });
     }
@@ -890,7 +890,7 @@ class McpConfigureSamplingModels extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ConfigureSamplingModels,
-            title: ( localize2(8621, "Configure SamplingModel")),
+            title: ( localize2(8747, "Configure SamplingModel")),
             category,
         });
     }
@@ -914,7 +914,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(
-                8622,
+                8748,
                 'Pick the models {0} can access via MCP sampling',
                 server.definition.label
             )),
@@ -930,7 +930,7 @@ class McpStartPromptingServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartPromptForServer,
-            title: ( localize2(8623, "Start Prompting Server")),
+            title: ( localize2(8749, "Start Prompting Server")),
             category,
             f1: false,
         });
@@ -957,7 +957,7 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SkipCurrentAutostart,
-            title: ( localize2(8624, "Skip Current Autostart")),
+            title: ( localize2(8750, "Skip Current Autostart")),
             category,
             f1: false,
         });

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

@@ -4,7 +4,7 @@ import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
+import { mcpAccessConfig, McpAccessValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';

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

@@ -1,20 +1,26 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 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 { IMcpServer, IMcpToolCallContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
+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";
 export declare class McpElicitationService implements IMcpElicitationService {
     private readonly _notificationService;
     private readonly _quickInputService;
     private readonly _chatService;
+    private readonly _openerService;
     readonly _serviceBrand: undefined;
-    constructor(_notificationService: INotificationService, _quickInputService: IQuickInputService, _chatService: IChatService);
-    elicit(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequest["params"], token: CancellationToken): Promise<MCP.ElicitResult>;
-    private _doElicit;
+    constructor(_notificationService: INotificationService, _quickInputService: IQuickInputService, _chatService: IChatService, _openerService: IOpenerService);
+    elicit(server: IMcpServer, context: IMcpToolCallContext | undefined, elicitation: MCP.ElicitRequest["params"], token: CancellationToken): Promise<ElicitResult>;
+    private _elicitForm;
+    private _elicitUrl;
+    private _doElicitUrl;
+    private _doElicitForm;
     private _getFieldPlaceholder;
     private _handleEnumField;
+    private _handleMultiEnumField;
     private _handleInputField;
     private _validateInput;
     private _validateString;