@codingame/monaco-vscode-mcp-service-override 28.4.1 → 29.0.0

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

@@ -58,10 +58,11 @@ import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 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 { IMcpService, IMcpWorkbenchService, IMcpSamplingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { McpAddConfigurationCommand, McpInstallFromManifestCommand } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration';
 import { McpResourceQuickPick, McpResourceQuickAccess } from './mcpResourceQuickAccess.js';
 import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { isContributionDisabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import * as mcpServerAction from './media/mcpServerAction.css';
 import { openPanelChatAndGetWidget } from './openPanelChatAndGetWidget.js';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -78,7 +79,7 @@ class ListMcpServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ListServer,
-            title: ( localize2(10099, "List Servers")),
+            title: ( localize2(10334, "List Servers")),
             icon: Codicon.server,
             category,
             f1: true,
@@ -95,11 +96,12 @@ class ListMcpServerCommand extends Action2 {
         const mcpService = accessor.get(IMcpService);
         const commandService = accessor.get(ICommandService);
         const quickInput = accessor.get(IQuickInputService);
+        const mcpWorkbenchService = accessor.get(IMcpWorkbenchService);
         const store = ( new DisposableStore());
         const pick = quickInput.createQuickPick({
             useSeparators: true
         });
-        pick.placeholder = ( localize(10100, "Select an MCP Server"));
+        pick.placeholder = ( localize(10335, "Select an MCP Server"));
         mcpService.activateCollections();
         store.add(pick);
         store.add(autorun(reader => {
@@ -109,19 +111,22 @@ class ListMcpServerCommand extends Action2 {
             const firstRun = pick.items.length === 0;
             pick.items = [{
                 id: "$add",
-                label: ( localize(10101, "Add Server")),
-                description: ( localize(10102, "Add a new server configuration")),
+                label: ( localize(10336, "Add Server")),
+                description: ( localize(10337, "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 => ({
-                id: server.definition.id,
-                label: server.definition.label,
-                description: ( McpConnectionState.toString(server.connectionState.read(reader)))
-            })))])];
+            }, ...( servers.map(server => {
+                const disabled = isContributionDisabled(server.enablement.read(reader));
+                return {
+                    id: server.definition.id,
+                    label: server.definition.label,
+                    description: disabled ? ( localize(10338, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
+                };
+            }))])];
             if (firstRun && pick.items.length > 3) {
                 pick.activeItems = pick.items.slice(2, 3);
             }
@@ -140,7 +145,15 @@ class ListMcpServerCommand extends Action2 {
             ; else if (picked.id === "$add") {
             commandService.executeCommand(McpCommandIds.AddConfiguration);
         } else {
-            commandService.executeCommand(McpCommandIds.ServerOptions, picked.id);
+            const server = mcpService.servers.get().find(s => s.definition.id === picked.id);
+            if (server && isContributionDisabled(server.enablement.get())) {
+                const workbenchServer = mcpWorkbenchService.local.find(s => s.id === picked.id);
+                if (workbenchServer) {
+                    mcpWorkbenchService.open(workbenchServer);
+                }
+            } else {
+                commandService.executeCommand(McpCommandIds.ServerOptions, picked.id);
+            }
         }
     }
 }
@@ -148,7 +161,7 @@ class McpConfirmationServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptionsInConfirmation,
-            title: ( localize2(10103, "Server Options")),
+            title: ( localize2(10339, "Server Options")),
             category,
             icon: Codicon.settingsGear,
             f1: false,
@@ -179,7 +192,7 @@ class McpServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptions,
-            title: ( localize2(10103, "Server Options")),
+            title: ( localize2(10339, "Server Options")),
             category,
             f1: false
         });
@@ -203,20 +216,20 @@ class McpServerOptionsCommand extends Action2 {
         const serverState = server.connectionState.get();
         items.push({
             type: "separator",
-            label: ( localize(10104, "Status"))
+            label: ( localize(10340, "Status"))
         });
         if (McpConnectionState.canBeStarted(serverState.state)) {
             items.push({
-                label: ( localize(10105, "Start Server")),
+                label: ( localize(10341, "Start Server")),
                 action: "start"
             });
         } else {
             items.push({
-                label: ( localize(10106, "Stop Server")),
+                label: ( localize(10342, "Stop Server")),
                 action: "stop"
             });
             items.push({
-                label: ( localize(10107, "Restart Server")),
+                label: ( localize(10343, "Restart Server")),
                 action: "restart"
             });
         }
@@ -224,26 +237,26 @@ class McpServerOptionsCommand extends Action2 {
         const configTarget = serverDefinition?.presentation?.origin || collection?.presentation?.origin;
         if (configTarget) {
             items.push({
-                label: ( localize(10108, "Show Configuration")),
+                label: ( localize(10344, "Show Configuration")),
                 action: "config"
             });
         }
         items.push({
-            label: ( localize(10109, "Show Output")),
+            label: ( localize(10345, "Show Output")),
             action: "showOutput"
         });
         items.push({
             type: "separator",
-            label: ( localize(10110, "Sampling"))
+            label: ( localize(10346, "Sampling"))
         }, {
-            label: ( localize(10111, "Configure Model Access")),
-            description: ( localize(10112, "Set the models the server can use via MCP sampling")),
+            label: ( localize(10347, "Configure Model Access")),
+            description: ( localize(10348, "Set the models the server can use via MCP sampling")),
             action: "configSampling"
         });
         if (samplingService.hasLogs(server)) {
             items.push({
-                label: ( localize(10113, "Show Sampling Requests")),
-                description: ( localize(10114, "Show the sampling requests for this server")),
+                label: ( localize(10349, "Show Sampling Requests")),
+                description: ( localize(10350, "Show the sampling requests for this server")),
                 action: "samplingLog"
             });
         }
@@ -251,15 +264,15 @@ class McpServerOptionsCommand extends Action2 {
         if (capabilities === undefined || (capabilities & McpCapability.Resources)) {
             items.push({
                 type: "separator",
-                label: ( localize(10115, "Resources"))
+                label: ( localize(10351, "Resources"))
             });
             items.push({
-                label: ( localize(10116, "Browse Resources")),
+                label: ( localize(10352, "Browse Resources")),
                 action: "resources"
             });
         }
         const pick = await quickInputService.pick(items, {
-            placeHolder: ( localize(10117, "Select action for '{0}'", server.definition.label))
+            placeHolder: ( localize(10353, "Select action for '{0}'", server.definition.label))
         });
         if (!pick) {
             return;
@@ -307,7 +320,7 @@ class McpServerOptionsCommand extends Action2 {
             editorService.openEditor({
                 resource: undefined,
                 contents: samplingService.getLogText(server),
-                label: ( localize(10118, "MCP Sampling: {0}", server.definition.label))
+                label: ( localize(10354, "MCP Sampling: {0}", server.definition.label))
             });
             break;
         default:
@@ -324,14 +337,14 @@ class McpServerOptionsCommand extends Action2 {
             if (accountQuery.entities().getEntityCount().total > 1) {
                 result.push({
                     action: "disconnect",
-                    label: ( localize(10119, "Disconnect Account")),
+                    label: ( localize(10355, "Disconnect Account")),
                     description: `(${accountName})`,
                     accountQuery
                 });
             } else {
                 result.push({
                     action: "signout",
-                    label: ( localize(10120, "Sign Out")),
+                    label: ( localize(10356, "Sign Out")),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -497,26 +510,27 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                         } = displayedStateCurrent.get()
                     ) {
                         const link = s => createMarkdownCommandLink({
-                            title: s.definition.label,
+                            text: s.definition.label,
                             id: McpCommandIds.ServerOptions,
-                            arguments: [s.definition.id]
+                            arguments: [s.definition.id],
+                            tooltip: ( localize(10357, "Show server options for {0}", s.definition.label))
                         });
                         const single = servers.length === 1;
                         const names = ( ( servers.map(s => isServer(s) ? link(s) : "`" + s.label + "`")).map(l => single ? l : `- ${l}`)).join("\n");
                         let markdown;
                         if (state === DisplayedState.NewTools) {
                             markdown = ( new MarkdownString(single ? ( localize(
-                                10121,
+                                10358,
                                 "MCP server {0} has been updated and may have new tools available.",
                                 names
                             )) : ( localize(
-                                10122,
+                                10359,
                                 "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(10123, "MCP server {0} was unable to start successfully.", names)) : ( localize(
-                                10124,
+                            markdown = ( new MarkdownString(single ? ( localize(10360, "MCP server {0} was unable to start successfully.", names)) : ( localize(
+                                10361,
                                 "Multiple MCP servers were unable to start successfully:\n\n{0}",
                                 names
                             ))));
@@ -543,7 +557,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(10125, "Automatically start MCP servers when sending a chat message"));
+                                const settingLabelStr = ( localize(10362, "Automatically start MCP servers when sending a chat message"));
                                 const checkbox = store.add(( new Checkbox(settingLabelStr, config.get() !== McpAutoStartValue.Never, {
                                     ...defaultCheckboxStyles
                                 })));
@@ -571,11 +585,11 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                         } = displayedStateCurrent.get()
                     ) {
                         if (state === DisplayedState.NewTools) {
-                            return localize(10126, "New tools available ({0})", servers.length || 1);
+                            return localize(10363, "New tools available ({0})", servers.length || 1);
                         } else if (state === DisplayedState.Error) {
-                            return localize(10127, "Error loading {0} tool(s)", servers.length || 1);
+                            return localize(10364, "Error loading {0} tool(s)", servers.length || 1);
                         } else if (state === DisplayedState.Refreshing) {
-                            return localize(10128, "Discovering tools...");
+                            return localize(10365, "Discovering tools...");
                         } else {
                             return null;
                         }
@@ -593,7 +607,7 @@ class ResetMcpTrustCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetTrust,
-            title: ( localize2(10129, "Reset Trust")),
+            title: ( localize2(10366, "Reset Trust")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate())))
@@ -608,7 +622,7 @@ class ResetMcpCachedTools extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetCachedTools,
-            title: ( localize2(10130, "Reset Cached Tools")),
+            title: ( localize2(10367, "Reset Cached Tools")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate())))
@@ -623,9 +637,9 @@ class AddConfigurationAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.AddConfiguration,
-            title: ( localize2(10131, "Add Server...")),
+            title: ( localize2(10368, "Add Server...")),
             metadata: {
-                description: ( localize2(10132, "Installs a new Model Context protocol to the mcp.json settings"))
+                description: ( localize2(10369, "Installs a new Model Context protocol to the mcp.json settings"))
             },
             category,
             f1: true,
@@ -647,9 +661,9 @@ class InstallFromManifestAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.InstallFromManifest,
-            title: ( localize2(10133, "Install Server from Manifest...")),
+            title: ( localize2(10370, "Install Server from Manifest...")),
             metadata: {
-                description: ( localize2(10134, "Install an MCP server from a JSON manifest file"))
+                description: ( localize2(10371, "Install an MCP server from a JSON manifest file"))
             },
             category,
             f1: true,
@@ -665,7 +679,7 @@ class RemoveStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RemoveStoredInput,
-            title: ( localize2(10130, "Reset Cached Tools")),
+            title: ( localize2(10367, "Reset Cached Tools")),
             category,
             f1: false
         });
@@ -678,7 +692,7 @@ class EditStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.EditStoredInput,
-            title: ( localize2(10135, "Edit Stored Input")),
+            title: ( localize2(10372, "Edit Stored Input")),
             category,
             f1: false
         });
@@ -692,7 +706,7 @@ class ShowConfiguration extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowConfiguration,
-            title: ( localize2(10136, "Show Configuration")),
+            title: ( localize2(10373, "Show Configuration")),
             category,
             f1: false
         });
@@ -722,7 +736,7 @@ class ShowOutput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowOutput,
-            title: ( localize2(10137, "Show Output")),
+            title: ( localize2(10374, "Show Output")),
             category,
             f1: false
         });
@@ -735,7 +749,7 @@ class RestartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RestartServer,
-            title: ( localize2(10138, "Restart Server")),
+            title: ( localize2(10375, "Restart Server")),
             category,
             f1: false
         });
@@ -754,7 +768,7 @@ class StartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartServer,
-            title: ( localize2(10139, "Start Server")),
+            title: ( localize2(10376, "Start Server")),
             category,
             f1: false
         });
@@ -779,7 +793,7 @@ class StopServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StopServer,
-            title: ( localize2(10140, "Stop Server")),
+            title: ( localize2(10377, "Stop Server")),
             category,
             f1: false
         });
@@ -793,8 +807,8 @@ class McpBrowseCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.Browse,
-            title: ( localize2(10141, "MCP Servers")),
-            tooltip: ( localize2(10142, "Browse MCP Servers")),
+            title: ( localize2(10378, "MCP Servers")),
+            tooltip: ( localize2(10379, "Browse MCP Servers")),
             category,
             icon: Codicon.search,
             precondition: ( ChatContextKeys.Setup.hidden.negate()),
@@ -817,7 +831,7 @@ class McpBrowseCommand extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: McpCommandIds.Browse,
-        title: ( localize2(10143, "Browse MCP Servers")),
+        title: ( localize2(10380, "Browse MCP Servers")),
         category,
         precondition: ( ChatContextKeys.Setup.hidden.negate())
     }
@@ -826,7 +840,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowInstalled,
-            title: ( localize2(10144, "Show Installed Servers")),
+            title: ( localize2(10381, "Show Installed Servers")),
             category,
             precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
             f1: true
@@ -844,7 +858,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
 MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
     command: {
         id: McpCommandIds.ShowInstalled,
-        title: ( localize2(10145, "MCP Servers"))
+        title: ( localize2(10382, "MCP Servers"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)))),
     order: 10,
@@ -869,7 +883,7 @@ class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenUserMcp,
-            title: ( localize2(10146, "Open User Configuration")),
+            title: ( localize2(10383, "Open User Configuration")),
             category,
             f1: true,
             precondition: ( ChatContextKeys.Setup.hidden.negate())
@@ -884,7 +898,7 @@ class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenRemoteUserMcp,
-            title: ( localize2(10147, "Open Remote User Configuration")),
+            title: ( localize2(10384, "Open Remote User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( RemoteNameContext.notEqualsTo(""))))
@@ -901,7 +915,7 @@ class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceFolderMcp,
-            title: ( localize2(10148, "Open Workspace Folder MCP Configuration")),
+            title: ( localize2(10385, "Open Workspace Folder MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkspaceFolderCountContext.notEqualsTo(0))))
@@ -924,7 +938,7 @@ class OpenWorkspaceMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceMcp,
-            title: ( localize2(10149, "Open Workspace MCP Configuration")),
+            title: ( localize2(10386, "Open Workspace MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkbenchStateContext.isEqualTo("workspace"))))
@@ -945,7 +959,7 @@ class McpBrowseResourcesCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.BrowseResources,
-            title: ( localize2(10150, "Browse Resources...")),
+            title: ( localize2(10387, "Browse Resources...")),
             category,
             precondition: ( ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
             f1: true
@@ -963,7 +977,7 @@ class McpConfigureSamplingModels extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ConfigureSamplingModels,
-            title: ( localize2(10151, "Configure SamplingModel")),
+            title: ( localize2(10388, "Configure SamplingModel")),
             category
         });
     }
@@ -989,7 +1003,7 @@ class McpConfigureSamplingModels extends Action2 {
         );
         const picked = await quickInputService.pick(allItems, {
             placeHolder: ( localize(
-                10152,
+                10389,
                 "Pick the models {0} can access via MCP sampling",
                 server.definition.label
             )),
@@ -1005,7 +1019,7 @@ class McpStartPromptingServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartPromptForServer,
-            title: ( localize2(10153, "Start Prompting Server")),
+            title: ( localize2(10390, "Start Prompting Server")),
             category,
             f1: false
         });
@@ -1035,7 +1049,7 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SkipCurrentAutostart,
-            title: ( localize2(10154, "Skip Current Autostart")),
+            title: ( localize2(10391, "Skip Current Autostart")),
             category,
             f1: false
         });

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

@@ -26,4 +26,15 @@ export declare class McpElicitationService implements IMcpElicitationService {
     private _validateString;
     private _validateStringFormat;
     private _validateNumber;
+    /**
+     * Converts an MCP elicitation schema into IChatQuestion[] for the carousel UI.
+     * Returns the questions and a map from question ID to schema property name.
+     */
+    private _convertSchemaToQuestions;
+    /**
+     * Converts carousel answers (keyed by question ID) back into the
+     * MCP ElicitResult content format (keyed by schema property names),
+     * coercing types as needed.
+     */
+    private _convertCarouselAnswersToElicitResult;
 }