@codingame/monaco-vscode-mcp-service-override 26.2.2 → 27.0.0

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

@@ -0,0 +1,6 @@
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
+export declare class McpGatewayToolBrokerContribution implements IWorkbenchContribution {
+    constructor(remoteAgentService: IRemoteAgentService, mcpService: IMcpService);
+}

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

@@ -0,0 +1,15 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { McpGatewayToolBrokerChannelName } from '../../../../platform/mcp/common/mcpGateway.js';
+import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { McpGatewayToolBrokerChannel } from '../common/mcpGatewayToolBrokerChannel.js';
+
+let McpGatewayToolBrokerContribution = class McpGatewayToolBrokerContribution {
+    constructor(remoteAgentService, mcpService) {
+        remoteAgentService.getConnection()?.registerChannel(McpGatewayToolBrokerChannelName, ( new McpGatewayToolBrokerChannel(mcpService)));
+    }
+};
+McpGatewayToolBrokerContribution = ( __decorate([( __param(0, IRemoteAgentService)), ( __param(1, IMcpService))], McpGatewayToolBrokerContribution));
+
+export { McpGatewayToolBrokerContribution };

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

@@ -115,7 +115,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     diagnostics.push({
                         severity: MarkerSeverity.Warning,
                         message: ( localize(
-                            9363,
+                            10058,
                             "Variable `{0}` not found, did you mean ${{1}}?",
                             name,
                             getClosestMatchingVariable(name) + (arg ? `:${arg}` : "")
@@ -181,14 +181,14 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(error) " + ( localize(9364, "Error")),
+                        title: "$(error) " + ( localize(10059, "Error")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.RestartServer,
-                        title: ( localize(9365, "Restart")),
+                        title: ( localize(10060, "Restart")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -199,7 +199,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(9366, "Debug")),
+                            title: ( localize(10061, "Debug")),
                             arguments: [server.definition.id, {
                                 debug: true,
                                 autoTrustChanges: true
@@ -213,14 +213,14 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(loading~spin) " + ( localize(9367, "Starting")),
+                        title: "$(loading~spin) " + ( localize(10062, "Starting")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.StopServer,
-                        title: ( localize(9368, "Cancel")),
+                        title: ( localize(10063, "Cancel")),
                         arguments: [server.definition.id]
                     }
                 });
@@ -230,21 +230,21 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(check) " + ( localize(9369, "Running")),
+                        title: "$(check) " + ( localize(10064, "Running")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.StopServer,
-                        title: ( localize(9370, "Stop")),
+                        title: ( localize(10065, "Stop")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.RestartServer,
-                        title: ( localize(9365, "Restart")),
+                        title: ( localize(10060, "Restart")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -255,7 +255,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(9366, "Debug")),
+                            title: ( localize(10061, "Debug")),
                             arguments: [server.definition.id, {
                                 autoTrustChanges: true,
                                 debug: true
@@ -269,7 +269,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.StartServer,
-                        title: "$(debug-start) " + ( localize(9371, "Start")),
+                        title: "$(debug-start) " + ( localize(10066, "Start")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -280,7 +280,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartServer,
-                            title: ( localize(9366, "Debug")),
+                            title: ( localize(10061, "Debug")),
                             arguments: [server.definition.id, {
                                 autoTrustChanges: true,
                                 debug: true
@@ -296,7 +296,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: "",
-                            title: ( localize(9372, "{0} tools", toolCount))
+                            title: ( localize(10067, "{0} tools", toolCount))
                         }
                     });
                 }
@@ -306,7 +306,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartPromptForServer,
-                            title: ( localize(9373, "{0} prompts", promptCount)),
+                            title: ( localize(10068, "{0} prompts", promptCount)),
                             arguments: [server]
                         }
                     });
@@ -315,7 +315,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ServerOptions,
-                        title: ( localize(9374, "More...")),
+                        title: ( localize(10069, "More...")),
                         arguments: [server.definition.id]
                     }
                 });
@@ -390,15 +390,15 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         function pushAnnotation(savedId, offset, saved) {
             const tooltip = ( new MarkdownString([createMarkdownCommandLink({
                 id: McpCommandIds.EditStoredInput,
-                title: ( localize(9375, "Edit")),
+                title: ( localize(10070, "Edit")),
                 arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target]
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                title: ( localize(9376, "Clear")),
+                title: ( localize(10071, "Clear")),
                 arguments: [inConfig.scope, savedId]
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                title: ( localize(9377, "Clear All")),
+                title: ( localize(10072, "Clear All")),
                 arguments: [inConfig.scope]
             })].join(" | "), {
                 isTrusted: true

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

@@ -98,16 +98,16 @@ let McpConfigMigrationContribution = class McpConfigMigrationContribution extend
     }
     showMcpConfigErrorNotification(isRemote) {
         const message = isRemote ? ( localize(
-            9378,
+            10073,
             "MCP servers should no longer be configured in remote user settings. Use the dedicated MCP configuration instead."
         )) : ( localize(
-            9379,
+            10074,
             "MCP servers should no longer be configured in user settings. Use the dedicated MCP configuration instead."
         ));
-        const openConfigLabel = isRemote ? ( localize(9380, "Open Remote User MCP Configuration")) : ( localize(9381, "Open User MCP Configuration"));
+        const openConfigLabel = isRemote ? ( localize(10075, "Open Remote User MCP Configuration")) : ( localize(10076, "Open User MCP Configuration"));
         const commandId = isRemote ? McpCommandIds.OpenRemoteUserMcp : McpCommandIds.OpenUserMcp;
         this.notificationService.prompt(Severity.Error, message, [{
-            label: ( localize(9382, "Update Now")),
+            label: ( localize(10077, "Update Now")),
             run: async () => {
                 await this.migrateMcpConfig();
                 await this.commandService.executeCommand(commandId);

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

@@ -74,7 +74,7 @@ let McpResourcePickHelper = class McpResourcePickHelper extends Disposable {
                 id: resource.template.template,
                 label: resource.title || resource.name,
                 description: resource.description,
-                detail: ( localize(9398, "Resource template: {0}", resource.template.template)),
+                detail: ( localize(10093, "Resource template: {0}", resource.template.template)),
                 iconPath
             };
         }
@@ -221,7 +221,7 @@ let McpResourcePickHelper = class McpResourcePickHelper extends Disposable {
             return uri;
         }
         this._notificationService.warn(( localize(
-            9399,
+            10094,
             "The resource {0} was not found.",
             (McpResourceURI.toServer(uri).resourceURL.toString())
         )));
@@ -266,13 +266,13 @@ let McpResourcePickHelper = class McpResourcePickHelper extends Disposable {
             }
         }
         let placeholder = ( localize(
-            9400,
+            10095,
             "Value for ${0} in {1}",
             variable.name.toUpperCase(),
             rt.template.resolve(variablesWithPlaceholders).replaceAll("%24", "$")
         ));
         if (variable.optional) {
-            placeholder += " (" + ( localize(9401, "Optional")) + ")";
+            placeholder += " (" + ( localize(10096, "Optional")) + ")";
         }
         input.placeholder = placeholder;
         input.value = "";
@@ -292,7 +292,7 @@ let McpResourcePickHelper = class McpResourcePickHelper extends Disposable {
             } else if (variable.optional) {
                 items.unshift({
                     id: currentID,
-                    label: ( localize(9402, "<Empty>"))
+                    label: ( localize(10097, "<Empty>"))
                 });
             }
             input.items = items;
@@ -463,7 +463,7 @@ let AbstractMcpResourceAccessPick = class AbstractMcpResourceAccessPick {
         picker.keepScrollPosition = true;
         const store = ( new DisposableStore());
         const goBackId = "_goback_";
-        const attachButton = ( localize(9403, "Attach to chat"));
+        const attachButton = ( localize(10098, "Attach to chat"));
         const helper = store.add(this._instantiationService.createInstance(McpResourcePickHelper));
         if (this._scopeTo) {
             helper.explicitServers = [this._scopeTo];
@@ -491,7 +491,7 @@ let AbstractMcpResourceAccessPick = class AbstractMcpResourceAccessPick {
             if (helper.checkIfNestedResources()) {
                 const goBackItem = {
                     id: goBackId,
-                    label: ( localize(9404, "Go back ↩")),
+                    label: ( localize(10099, "Go back ↩")),
                     alwaysShow: true
                 };
                 items.push(goBackItem);
@@ -573,7 +573,7 @@ let McpResourceQuickPick = class McpResourceQuickPick extends AbstractMcpResourc
         const qp = store.add(this._quickInputService.createQuickPick({
             useSeparators: true
         }));
-        qp.placeholder = ( localize(9405, "Search for resources"));
+        qp.placeholder = ( localize(10100, "Search for resources"));
         store.add(this.applyToPick(qp, token));
         store.add(qp.onDidHide(() => store.dispose()));
         qp.show();

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

@@ -18,6 +18,7 @@ import { AbstractExtensionsListView } from "@codingame/monaco-vscode-api/vscode/
 import { IWorkbenchLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service";
 import { IMcpGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 export interface McpServerListViewOptions {
     showWelcome?: boolean;
 }
@@ -28,13 +29,15 @@ export declare class McpServersListView extends AbstractExtensionsListView<IWork
     protected readonly mcpGalleryManifestService: IMcpGalleryManifestService;
     private readonly layoutService;
     protected readonly markdownRendererService: IMarkdownRendererService;
+    private readonly logService;
     private list;
     private listContainer;
     private welcomeContainer;
     private bodyTemplate;
     private readonly contextMenuActionRunner;
+    private readonly modalNavigationDisposable;
     private input;
-    constructor(mpcViewOptions: McpServerListViewOptions, options: IViewletViewOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, themeService: IThemeService, hoverService: IHoverService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, dialogService: IDialogService, mcpWorkbenchService: IMcpWorkbenchService, mcpGalleryManifestService: IMcpGalleryManifestService, layoutService: IWorkbenchLayoutService, markdownRendererService: IMarkdownRendererService);
+    constructor(mpcViewOptions: McpServerListViewOptions, options: IViewletViewOptions, keybindingService: IKeybindingService, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, themeService: IThemeService, hoverService: IHoverService, configurationService: IConfigurationService, contextKeyService: IContextKeyService, viewDescriptorService: IViewDescriptorService, openerService: IOpenerService, dialogService: IDialogService, mcpWorkbenchService: IMcpWorkbenchService, mcpGalleryManifestService: IMcpGalleryManifestService, layoutService: IWorkbenchLayoutService, markdownRendererService: IMarkdownRendererService, logService: ILogService);
     protected renderBody(container: HTMLElement): void;
     private onContextMenu;
     protected layoutBody(height: number, width: number): void;

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

@@ -6,7 +6,7 @@ import { append, $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/d
 import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { createMarkdownCommandLink, MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
-import { DisposableStore, isDisposable, combinedDisposable, dispose, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore, isDisposable, combinedDisposable, dispose, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { PagedModel, DelayedPagedModel, IterativePagedModel } from '@codingame/monaco-vscode-api/vscode/vs/base/common/paging';
 import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -26,8 +26,8 @@ import { ViewContainerLocation, Extensions } from '@codingame/monaco-vscode-api/
 import { IViewDescriptorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views.service';
 import { McpServerContainers, McpServerEnablementState, InstalledMcpServersViewId, HasInstalledMcpServersContext, McpServersGalleryStatusContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
-import { getContextMenuActions, DropDownAction, McpServerStatusAction, InstallAction, InstallingLabelAction, ManageMcpServerAction } from './mcpServerActions.js';
-import { McpServerIconWidget, PublisherWidget, StarredWidget, McpServerScopeBadgeWidget, McpServerHoverWidget } from './mcpServerWidgets.js';
+import { getContextMenuActions, DropDownAction, McpServerStatusAction, InstallAction, InstallingLabelAction, ManageMcpServerAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerActions';
+import { McpServerIconWidget, PublisherWidget, StarredWidget, McpServerScopeBadgeWidget, McpServerHoverWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerWidgets';
 import { ActionRunner, Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { mcpGalleryServiceEnablementConfig, mcpGalleryServiceUrlConfig } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
@@ -43,12 +43,14 @@ import { AbstractExtensionsListView } from '@codingame/monaco-vscode-api/vscode/
 import { HoverPosition } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
-import { mcpServerIcon } from './mcpServerIcons.js';
+import { mcpServerIcon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerIcons';
 import { McpGalleryManifestStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest';
 import { IMcpGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service';
 import { ProductQualityContext } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkeys';
 import { SeverityIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/severityIcon/severityIcon';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { buildModalNavigationForPagedList } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsViewer';
 
 var McpServerRenderer_1;
 registerCss(mcpServersView);
@@ -69,7 +71,8 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
         mcpWorkbenchService,
         mcpGalleryManifestService,
         layoutService,
-        markdownRendererService
+        markdownRendererService,
+        logService
     ) {
         super(
             options,
@@ -89,10 +92,12 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
         this.mcpGalleryManifestService = mcpGalleryManifestService;
         this.layoutService = layoutService;
         this.markdownRendererService = markdownRendererService;
+        this.logService = logService;
         this.list = null;
         this.listContainer = null;
         this.welcomeContainer = null;
         this.contextMenuActionRunner = this._register(( new ActionRunner()));
+        this.modalNavigationDisposable = this._register(( new MutableDisposable()));
     }
     renderBody(container) {
         super.renderBody(container);
@@ -137,7 +142,7 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                         return mcpServer?.label ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(9475, "MCP Servers");
+                        return localize(10170, "MCP Servers");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles,
@@ -150,7 +155,20 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
             75,
             true
         )(options => {
-            this.mcpWorkbenchService.open(options.element, options.editorOptions);
+            this.mcpWorkbenchService.open(options.element, {
+                ...options.editorOptions,
+                modal: options.sideBySide ? undefined : buildModalNavigationForPagedList(
+                    options.element,
+                    () => this.list?.model,
+                    (serverA, serverB) => serverA.id === serverB.id,
+                    (server, modal) => this.mcpWorkbenchService.open(server, {
+                        pinned: false,
+                        modal
+                    }),
+                    this.modalNavigationDisposable,
+                    this.logService
+                )
+            });
         }));
         this._register(this.list.onContextMenu(e => this.onContextMenu(e), this));
         if (this.input) {
@@ -233,43 +251,43 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
         const iconElement = append(iconContainer, $("span"));
         iconElement.className = ThemeIcon.asClassName(mcpServerIcon);
         const title = append(welcomeContent, $(".mcp-welcome-title"));
-        title.textContent = ( localize(9476, "MCP Servers"));
+        title.textContent = ( localize(10171, "MCP Servers"));
         const settingsCommandLink = ( createMarkdownCommandLink({
             id: "workbench.action.openSettings",
             arguments: [`@id:${mcpGalleryServiceEnablementConfig}`],
             title: mcpGalleryServiceEnablementConfig,
-            tooltip: ( localize(9477, "Open Settings"))
+            tooltip: ( localize(10172, "Open Settings"))
         }).toString());
         const description = append(welcomeContent, $(".mcp-welcome-description"));
         const markdownResult = this._register(this.markdownRendererService.render(( new MarkdownString(( localize(
-            9478,
+            10173,
             "Browse and install [Model Context Protocol (MCP) servers](https://code.visualstudio.com/docs/copilot/customization/mcp-servers) directly from VS Code to extend agent mode with extra tools for connecting to databases, invoking APIs and performing specialized tasks."
         )), {
             isTrusted: {
                 enabledCommands: ["workbench.action.openSettings"]
             }
         })).appendMarkdown("\n\n").appendMarkdown(( localize(
-            9479,
+            10174,
             "This feature is currently in preview. You can disable it anytime using the setting {0}.",
             settingsCommandLink
         )))));
         description.appendChild(markdownResult.element);
         const buttonContainer = append(welcomeContent, $(".mcp-welcome-button-container"));
         const button = this._register(( new Button(buttonContainer, {
-            title: ( localize(9480, "Enable MCP Servers Marketplace")),
+            title: ( localize(10175, "Enable MCP Servers Marketplace")),
             ...defaultButtonStyles
         })));
-        button.label = ( localize(9480, "Enable MCP Servers Marketplace"));
+        button.label = ( localize(10175, "Enable MCP Servers Marketplace"));
         this._register(button.onDidClick(async () => {
             const {
                 result
             } = await this.dialogService.prompt({
                 type: "info",
-                message: ( localize(9481, "Enable MCP Servers Marketplace?")),
+                message: ( localize(10176, "Enable MCP Servers Marketplace?")),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            9479,
+                            10174,
                             "This feature is currently in preview. You can disable it anytime using the setting {0}.",
                             settingsCommandLink
                         )), {
@@ -278,10 +296,10 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                     }]
                 },
                 buttons: [{
-                    label: ( localize(9482, "Enable")),
+                    label: ( localize(10177, "Enable")),
                     run: () => true
                 }, {
-                    label: ( localize(9483, "Cancel")),
+                    label: ( localize(10178, "Cancel")),
                     run: () => false
                 }]
             });
@@ -301,7 +319,7 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                     this.bodyTemplate.messageBox.textContent = message.text;
                 } else if (count === 0) {
                     this.bodyTemplate.messageSeverityIcon.className = "";
-                    this.bodyTemplate.messageBox.textContent = ( localize(9484, "No MCP Servers found."));
+                    this.bodyTemplate.messageBox.textContent = ( localize(10179, "No MCP Servers found."));
                 }
                 if (this.bodyTemplate.messageBox.textContent) {
                     alert(this.bodyTemplate.messageBox.textContent);
@@ -381,7 +399,7 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
         return hasChanged ? mcpServers : undefined;
     }
 };
-McpServersListView = ( __decorate([( __param(2, IKeybindingService)), ( __param(3, IContextMenuService)), ( __param(4, IInstantiationService)), ( __param(5, IThemeService)), ( __param(6, IHoverService)), ( __param(7, IConfigurationService)), ( __param(8, IContextKeyService)), ( __param(9, IViewDescriptorService)), ( __param(10, IOpenerService)), ( __param(11, IDialogService)), ( __param(12, IMcpWorkbenchService)), ( __param(13, IMcpGalleryManifestService)), ( __param(14, IWorkbenchLayoutService)), ( __param(15, IMarkdownRendererService))], McpServersListView));
+McpServersListView = ( __decorate([( __param(2, IKeybindingService)), ( __param(3, IContextMenuService)), ( __param(4, IInstantiationService)), ( __param(5, IThemeService)), ( __param(6, IHoverService)), ( __param(7, IConfigurationService)), ( __param(8, IContextKeyService)), ( __param(9, IViewDescriptorService)), ( __param(10, IOpenerService)), ( __param(11, IDialogService)), ( __param(12, IMcpWorkbenchService)), ( __param(13, IMcpGalleryManifestService)), ( __param(14, IWorkbenchLayoutService)), ( __param(15, IMarkdownRendererService)), ( __param(16, ILogService))], McpServersListView));
 let McpServerRenderer = class McpServerRenderer {
     static {
         McpServerRenderer_1 = this;
@@ -515,7 +533,7 @@ class McpServersViewsContribution extends Disposable {
         super();
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledMcpServersViewId,
-            name: ( localize2(9485, "MCP Servers - Installed")),
+            name: ( localize2(10180, "MCP Servers - Installed")),
             ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
             weight: 40,
@@ -523,7 +541,7 @@ class McpServersViewsContribution extends Disposable {
             canToggleVisibility: true
         }, {
             id: "workbench.views.mcp.default.marketplace",
-            name: ( localize2(9486, "MCP Servers")),
+            name: ( localize2(10181, "MCP Servers")),
             ctorDescriptor: ( new SyncDescriptor(DefaultBrowseMcpServersView, [{}])),
             when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledMcpServersContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ContextKeyExpr.or(( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)), ( ProductQualityContext.notEqualsTo("stable")), ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)))))),
             weight: 40,
@@ -531,12 +549,12 @@ class McpServersViewsContribution extends Disposable {
             canToggleVisibility: true
         }, {
             id: "workbench.views.mcp.marketplace",
-            name: ( localize2(9486, "MCP Servers")),
+            name: ( localize2(10181, "MCP Servers")),
             ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{}])),
             when: ( ContextKeyExpr.and(SearchMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ContextKeyExpr.or(( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)), ( ProductQualityContext.notEqualsTo("stable")), ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`))))))
         }, {
             id: "workbench.views.mcp.default.welcomeView",
-            name: ( localize2(9486, "MCP Servers")),
+            name: ( localize2(10181, "MCP Servers")),
             ctorDescriptor: ( new SyncDescriptor(DefaultBrowseMcpServersView, [{
                 showWelcome: true
             }])),
@@ -546,7 +564,7 @@ class McpServersViewsContribution extends Disposable {
             canToggleVisibility: true
         }, {
             id: "workbench.views.mcp.welcomeView",
-            name: ( localize2(9486, "MCP Servers")),
+            name: ( localize2(10181, "MCP Servers")),
             ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{
                 showWelcome: true
             }])),

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

@@ -23,7 +23,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
-import { IWorkbenchLocalMcpServer, IWorkbencMcpServerInstallOptions } from "../../../services/mcp/common/mcpWorkbenchManagementService.js";
+import { IWorkbenchLocalMcpServer, IWorkbencMcpServerInstallOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService";
 import { IWorkbenchMcpManagementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { IMcpConfigPath, IWorkbenchMcpServer, McpServerInstallState, McpServerEnablementStatus } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";

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

@@ -25,16 +25,16 @@ import { IURLService } from '@codingame/monaco-vscode-api/vscode/vs/platform/url
 import { IUserDataProfilesService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { WORKSPACE_STANDALONE_CONFIGURATIONS, MCP_CONFIGURATION_KEY } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/configuration';
-import { ACTIVE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
+import { MODAL_GROUP, ACTIVE_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 { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { LocalMcpServerScope, USER_CONFIG_ID, REMOTE_USER_CONFIG_ID, WORKSPACE_CONFIG_ID, WORKSPACE_FOLDER_CONFIG_ID_PREFIX } from '../../../services/mcp/common/mcpWorkbenchManagementService.js';
+import { LocalMcpServerScope, USER_CONFIG_ID, REMOTE_USER_CONFIG_ID, WORKSPACE_CONFIG_ID, WORKSPACE_FOLDER_CONFIG_ID_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService';
 import { IWorkbenchMcpManagementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { mcpConfigurationSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpServerEnablementState, McpCollectionSortOrder, McpServerInstallState, McpServersGalleryStatusContext, HasInstalledMcpServersContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService, IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
-import { McpServerEditorInput } from './mcpServerEditorInput.js';
+import { McpServerEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerEditorInput';
 import { IMcpGalleryManifestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpGalleryManifest.service';
 import { IExtensionsWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions.service';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
@@ -442,7 +442,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             const existing = result.get(server.name);
             if (existing) {
                 this.logService.warn(( localize(
-                    9487,
+                    10182,
                     "Overwriting mcp server '{0}' from {1} with {2}.",
                     server.name,
                     server.mcpResource.path,
@@ -455,7 +455,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             const existing = result.get(server.name);
             if (existing) {
                 this.logService.warn(( localize(
-                    9487,
+                    10182,
                     "Overwriting mcp server '{0}' from {1} with {2}.",
                     server.name,
                     server.mcpResource.path,
@@ -468,7 +468,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
     }
     canInstall(mcpServer) {
         if (!(mcpServer instanceof McpWorkbenchServer)) {
-            return ( new MarkdownString()).appendText(( localize(9488, "The provided object is not an mcp server.")));
+            return ( new MarkdownString()).appendText(( localize(10183, "The provided object is not an mcp server.")));
         }
         if (mcpServer.gallery) {
             const result = this.mcpManagementService.canInstall(mcpServer.gallery);
@@ -485,7 +485,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             return result;
         }
         return ( new MarkdownString()).appendText(( localize(
-            9489,
+            10184,
             "Cannot install the '{0}' MCP Server because it is not available in this setup.",
             mcpServer.label
         )));
@@ -592,7 +592,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             id: USER_CONFIG_ID,
             key: "userLocalValue",
             target: ConfigurationTarget.USER_LOCAL,
-            label: ( localize(9490, "Global in {0}", this.productService.nameShort)),
+            label: ( localize(10185, "Global in {0}", this.productService.nameShort)),
             scope: StorageScope.PROFILE,
             order: McpCollectionSortOrder.User,
             uri: mcpResource,
@@ -747,10 +747,11 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
         await this.extensionsWorkbenchService.openSearch(`@mcp ${searchValue}`, preserveFoucs);
     }
     async open(extension, options) {
+        const useModal = this.configurationService.getValue("extensions.allowOpenInModalEditor");
         await this.editorService.openEditor(
             this.instantiationService.createInstance(McpServerEditorInput, extension),
             options,
-            ACTIVE_GROUP
+            useModal ? MODAL_GROUP : ACTIVE_GROUP
         );
     }
     getInstallState(extension) {
@@ -789,7 +790,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 message: {
                     severity: Severity.Warning,
                     text: ( new MarkdownString(( localize(
-                        9491,
+                        10186,
                         "This MCP Server is disabled because MCP servers are configured to be disabled in the Editor. Please check your [settings]({0}).",
                         settingsCommandLink
                     ))))
@@ -803,7 +804,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     message: {
                         severity: Severity.Warning,
                         text: ( new MarkdownString(( localize(
-                            9492,
+                            10187,
                             "This MCP Server is disabled because it is configured to be disabled in the Editor. Please check your [settings]({0}).",
                             settingsCommandLink
                         ))))
@@ -817,7 +818,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     message: {
                         severity: Severity.Warning,
                         text: ( new MarkdownString(( localize(
-                            9492,
+                            10187,
                             "This MCP Server is disabled because it is configured to be disabled in the Editor. Please check your [settings]({0}).",
                             settingsCommandLink
                         ))))