@codingame/monaco-vscode-mcp-service-override 31.0.1 → 32.0.0

package/package.json

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

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

@@ -27,7 +27,7 @@ let AllowedMcpServersService = class AllowedMcpServersService extends Disposable
             query: `@id:${mcpAccessConfig}`
         }).toString());
         return (new MarkdownString(localize(
-            2042,
+            2054,
             "Model Context Protocol servers are disabled in the Editor. Please check your [settings]({0}).",
             settingsCommandLink
         )));

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

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

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

@@ -19,6 +19,7 @@ import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
 import { RemoteNativeMpcDiscovery } from '../common/discovery/nativeMcpRemoteDiscovery.js';
 import { PluginMcpDiscovery } from '../common/discovery/pluginMcpDiscovery.js';
 import { CursorWorkspaceMcpDiscoveryAdapter } from '../common/discovery/workspaceMcpDiscoveryAdapter.js';
+import { WorkspaceDotMcpDiscovery } from '../common/discovery/workspaceDotMcpDiscovery.js';
 import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { mcpServerSchema } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpContextKeysController } from '../common/mcpContextKeys.js';
@@ -39,15 +40,15 @@ import './mcpElicitationService.js';
 import { McpLanguageFeatures } from './mcpLanguageFeatures.js';
 import { McpConfigMigrationContribution } from './mcpMigration.js';
 import { McpResourceQuickAccess } from './mcpResourceQuickAccess.js';
-import { McpServerEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerEditor';
-import { McpServerEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/browser/mcpServerEditorInput';
-import { McpServersViewsContribution } from './mcpServersView.js';
+import { McpServerEditor } from './mcpServerEditor.js';
+import { McpServerEditorInput } from './mcpServerEditorInput.js';
 import { MCPContextsInitialisation } from './mcpWorkbenchService.js';
 
 mcpDiscoveryRegistry.register(( new SyncDescriptor(RemoteNativeMpcDiscovery)));
 mcpDiscoveryRegistry.register(( new SyncDescriptor(InstalledMcpServersDiscovery)));
 mcpDiscoveryRegistry.register(( new SyncDescriptor(ExtensionMcpDiscovery)));
 mcpDiscoveryRegistry.register(( new SyncDescriptor(CursorWorkspaceMcpDiscoveryAdapter)));
+mcpDiscoveryRegistry.register(( new SyncDescriptor(WorkspaceDotMcpDiscovery)));
 mcpDiscoveryRegistry.register(( new SyncDescriptor(PluginMcpDiscovery)));
 registerWorkbenchContribution2("mcpDiscovery", McpDiscovery, WorkbenchPhase.AfterRestored);
 registerWorkbenchContribution2("mcpContextKeys", McpContextKeysController, WorkbenchPhase.BlockRestore);
@@ -107,24 +108,19 @@ registerWorkbenchContribution2(
     McpConfigMigrationContribution,
     WorkbenchPhase.Eventually
 );
-registerWorkbenchContribution2(
-    McpServersViewsContribution.ID,
-    McpServersViewsContribution,
-    WorkbenchPhase.AfterRestored
-);
 const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(10524, "MCP Server"))),
+    EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(10836, "MCP Server"))),
     [( new SyncDescriptor(McpServerEditorInput))]
 );
 ( Registry.as(Extensions$1.Quickaccess)).registerQuickAccessProvider({
     ctor: McpResourceQuickAccess,
     prefix: McpResourceQuickAccess.PREFIX,
     when: ChatContextKeys.enabled,
-    placeholder: ( localize(10525, "Filter to an MCP resource")),
+    placeholder: ( localize(10837, "Filter to an MCP resource")),
     helpEntries: [{
-        description: ( localize(10526, "MCP Server Resources")),
+        description: ( localize(10838, "MCP Server Resources")),
         commandId: McpCommandIds.AddConfiguration
     }]
 });

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

@@ -43,7 +43,7 @@ let McpAddContextContribution = class McpAddContextContribution extends Disposab
     _registerAddContextMenu() {
         this._addContextMenu.value = this._chatContextPickService.registerChatContextItem({
             type: "pickerPick",
-            label: ( localize(10527, "MCP Resources...")),
+            label: ( localize(10839, "MCP Resources...")),
             icon: Codicon.mcp,
             isEnabled(widget) {
                 return !!widget.attachmentCapabilities.supportsMCPAttachments;
@@ -51,7 +51,7 @@ let McpAddContextContribution = class McpAddContextContribution extends Disposab
             asPicker: () => {
                 const helper = this._instantiationService.createInstance(McpResourcePickHelper);
                 return {
-                    placeholder: ( localize(10528, "Select MCP Resource...")),
+                    placeholder: ( localize(10840, "Select MCP Resource...")),
                     picks: (_query, token) => this._getResourcePicks(token, helper),
                     goBack: () => {
                         return helper.navigateBack();

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

@@ -48,21 +48,20 @@ import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/con
 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/actions/chatContextKeys';
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { isContributionDisabled, ContributionEnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 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/tools/languageModelToolsService.service';
-import { VIEW_CONTAINER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensions.contribution';
-import { extensionsFilterSubMenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
+import { extensionsFilterSubMenu, VIEWLET_ID } 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-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, IMcpWorkbenchService, IMcpSamplingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { IMcpService, IMcpSamplingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { startServerAndWaitForLiveTools } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
 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';
@@ -79,7 +78,7 @@ class ListMcpServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ListServer,
-            title: ( localize2(10529, "List Servers")),
+            title: ( localize2(10841, "List Servers")),
             icon: Codicon.server,
             category,
             f1: true,
@@ -96,23 +95,23 @@ 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(10530, "Select an MCP Server"));
+        pick.placeholder = ( localize(10842, "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 servers = groupBy(
+                mcpService.servers.read(reader).slice().sort((a, b) => a.collection.order - b.collection.order),
+                s => s.collection.id
+            );
             const firstRun = pick.items.length === 0;
             pick.items = [{
                 id: "$add",
-                label: ( localize(10531, "Add Server")),
-                description: ( localize(10532, "Add a new server configuration")),
+                label: ( localize(10843, "Add Server")),
+                description: ( localize(10844, "Add a new server configuration")),
                 alwaysShow: true,
                 iconClass: ThemeIcon.asClassName(Codicon.add)
             }, ...( Object.values(servers)).filter(s => s.length).flatMap(servers => [{
@@ -124,7 +123,7 @@ class ListMcpServerCommand extends Action2 {
                 return {
                     id: server.definition.id,
                     label: server.definition.label,
-                    description: disabled ? ( localize(10533, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
+                    description: disabled ? ( localize(10845, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
                 };
             }))])];
             if (firstRun && pick.items.length > 3) {
@@ -145,15 +144,7 @@ class ListMcpServerCommand extends Action2 {
             ; else if (picked.id === "$add") {
             commandService.executeCommand(McpCommandIds.AddConfiguration);
         } else {
-            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);
-            }
+            commandService.executeCommand(McpCommandIds.ServerOptions, picked.id);
         }
     }
 }
@@ -161,7 +152,7 @@ class McpConfirmationServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptionsInConfirmation,
-            title: ( localize2(10534, "Server Options")),
+            title: ( localize2(10846, "Server Options")),
             category,
             icon: Codicon.settingsGear,
             f1: false,
@@ -192,7 +183,7 @@ class McpServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptions,
-            title: ( localize2(10534, "Server Options")),
+            title: ( localize2(10846, "Server Options")),
             category,
             f1: false
         });
@@ -214,22 +205,28 @@ class McpServerOptionsCommand extends Action2 {
         const serverDefinition = collection?.serverDefinitions.get().find(s => s.id === server.definition.id);
         const items = [];
         const serverState = server.connectionState.get();
+        const disabled = isContributionDisabled(server.enablement.get());
         items.push({
             type: "separator",
-            label: ( localize(10535, "Status"))
+            label: ( localize(10847, "Status"))
         });
-        if (McpConnectionState.canBeStarted(serverState.state)) {
+        if (disabled) {
+            items.push({
+                label: ( localize(10848, "Enable Server (Workspace)")),
+                action: "enable"
+            });
+        } else if (McpConnectionState.canBeStarted(serverState.state)) {
             items.push({
-                label: ( localize(10536, "Start Server")),
+                label: ( localize(10849, "Start Server")),
                 action: "start"
             });
         } else {
             items.push({
-                label: ( localize(10537, "Stop Server")),
+                label: ( localize(10850, "Stop Server")),
                 action: "stop"
             });
             items.push({
-                label: ( localize(10538, "Restart Server")),
+                label: ( localize(10851, "Restart Server")),
                 action: "restart"
             });
         }
@@ -237,26 +234,26 @@ class McpServerOptionsCommand extends Action2 {
         const configTarget = serverDefinition?.presentation?.origin || collection?.presentation?.origin;
         if (configTarget) {
             items.push({
-                label: ( localize(10539, "Show Configuration")),
+                label: ( localize(10852, "Show Configuration")),
                 action: "config"
             });
         }
         items.push({
-            label: ( localize(10540, "Show Output")),
+            label: ( localize(10853, "Show Output")),
             action: "showOutput"
         });
         items.push({
             type: "separator",
-            label: ( localize(10541, "Sampling"))
+            label: ( localize(10854, "Sampling"))
         }, {
-            label: ( localize(10542, "Configure Model Access")),
-            description: ( localize(10543, "Set the models the server can use via MCP sampling")),
+            label: ( localize(10855, "Configure Model Access")),
+            description: ( localize(10856, "Set the models the server can use via MCP sampling")),
             action: "configSampling"
         });
         if (samplingService.hasLogs(server)) {
             items.push({
-                label: ( localize(10544, "Show Sampling Requests")),
-                description: ( localize(10545, "Show the sampling requests for this server")),
+                label: ( localize(10857, "Show Sampling Requests")),
+                description: ( localize(10858, "Show the sampling requests for this server")),
                 action: "samplingLog"
             });
         }
@@ -264,20 +261,23 @@ class McpServerOptionsCommand extends Action2 {
         if (capabilities === undefined || (capabilities & McpCapability.Resources)) {
             items.push({
                 type: "separator",
-                label: ( localize(10546, "Resources"))
+                label: ( localize(10859, "Resources"))
             });
             items.push({
-                label: ( localize(10547, "Browse Resources")),
+                label: ( localize(10860, "Browse Resources")),
                 action: "resources"
             });
         }
         const pick = await quickInputService.pick(items, {
-            placeHolder: ( localize(10548, "Select action for '{0}'", server.definition.label))
+            placeHolder: ( localize(10861, "Select action for '{0}'", server.definition.label))
         });
         if (!pick) {
             return;
         }
         switch (pick.action) {
+        case "enable":
+            mcpService.enablementModel.setEnabled(server.definition.id, ContributionEnablementState.EnabledWorkspace);
+            break;
         case "start":
             await server.start({
                 promptType: "all-untrusted"
@@ -320,7 +320,7 @@ class McpServerOptionsCommand extends Action2 {
             editorService.openEditor({
                 resource: undefined,
                 contents: samplingService.getLogText(server),
-                label: ( localize(10549, "MCP Sampling: {0}", server.definition.label))
+                label: ( localize(10862, "MCP Sampling: {0}", server.definition.label))
             });
             break;
         default:
@@ -337,14 +337,14 @@ class McpServerOptionsCommand extends Action2 {
             if (accountQuery.entities().getEntityCount().total > 1) {
                 result.push({
                     action: "disconnect",
-                    label: ( localize(10550, "Disconnect Account")),
+                    label: ( localize(10863, "Disconnect Account")),
                     description: `(${accountName})`,
                     accountQuery
                 });
             } else {
                 result.push({
                     action: "signout",
-                    label: ( localize(10551, "Sign Out")),
+                    label: ( localize(10864, "Sign Out")),
                     description: `(${accountName})`,
                     accountQuery
                 });
@@ -513,24 +513,24 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                             text: s.definition.label,
                             id: McpCommandIds.ServerOptions,
                             arguments: [s.definition.id],
-                            tooltip: ( localize(10552, "Show server options for {0}", s.definition.label))
+                            tooltip: ( localize(10865, "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(
-                                10553,
+                                10866,
                                 "MCP server {0} has been updated and may have new tools available.",
                                 names
                             )) : ( localize(
-                                10554,
+                                10867,
                                 "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(10555, "MCP server {0} was unable to start successfully.", names)) : ( localize(
-                                10556,
+                            markdown = ( new MarkdownString(single ? ( localize(10868, "MCP server {0} was unable to start successfully.", names)) : ( localize(
+                                10869,
                                 "Multiple MCP servers were unable to start successfully:\n\n{0}",
                                 names
                             ))));
@@ -557,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(10557, "Automatically start MCP servers when sending a chat message"));
+                                const settingLabelStr = ( localize(10870, "Automatically start MCP servers when sending a chat message"));
                                 const checkbox = store.add(( new Checkbox(settingLabelStr, config.get() !== McpAutoStartValue.Never, {
                                     ...defaultCheckboxStyles
                                 })));
@@ -585,11 +585,11 @@ let MCPServerActionRendering = class MCPServerActionRendering extends Disposable
                         } = displayedStateCurrent.get()
                     ) {
                         if (state === DisplayedState.NewTools) {
-                            return localize(10558, "New tools available ({0})", servers.length || 1);
+                            return localize(10871, "New tools available ({0})", servers.length || 1);
                         } else if (state === DisplayedState.Error) {
-                            return localize(10559, "Error loading {0} tool(s)", servers.length || 1);
+                            return localize(10872, "Error loading {0} tool(s)", servers.length || 1);
                         } else if (state === DisplayedState.Refreshing) {
-                            return localize(10560, "Discovering tools...");
+                            return localize(10873, "Discovering tools...");
                         } else {
                             return null;
                         }
@@ -607,7 +607,7 @@ class ResetMcpTrustCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetTrust,
-            title: ( localize2(10561, "Reset Trust")),
+            title: ( localize2(10874, "Reset Trust")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
@@ -622,7 +622,7 @@ class ResetMcpCachedTools extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetCachedTools,
-            title: ( localize2(10562, "Reset Cached Tools")),
+            title: ( localize2(10875, "Reset Cached Tools")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
@@ -637,9 +637,9 @@ class AddConfigurationAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.AddConfiguration,
-            title: ( localize2(10563, "Add Server...")),
+            title: ( localize2(10876, "Add Server...")),
             metadata: {
-                description: ( localize2(10564, "Installs a new Model Context protocol to the mcp.json settings"))
+                description: ( localize2(10877, "Installs a new Model Context protocol to the mcp.json settings"))
             },
             category,
             f1: true,
@@ -661,9 +661,9 @@ class InstallFromManifestAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.InstallFromManifest,
-            title: ( localize2(10565, "Install Server from Manifest...")),
+            title: ( localize2(10878, "Install Server from Manifest...")),
             metadata: {
-                description: ( localize2(10566, "Install an MCP server from a JSON manifest file"))
+                description: ( localize2(10879, "Install an MCP server from a JSON manifest file"))
             },
             category,
             f1: true,
@@ -679,7 +679,7 @@ class RemoveStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RemoveStoredInput,
-            title: ( localize2(10562, "Reset Cached Tools")),
+            title: ( localize2(10875, "Reset Cached Tools")),
             category,
             f1: false
         });
@@ -692,7 +692,7 @@ class EditStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.EditStoredInput,
-            title: ( localize2(10567, "Edit Stored Input")),
+            title: ( localize2(10880, "Edit Stored Input")),
             category,
             f1: false
         });
@@ -706,7 +706,7 @@ class ShowConfiguration extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowConfiguration,
-            title: ( localize2(10568, "Show Configuration")),
+            title: ( localize2(10881, "Show Configuration")),
             category,
             f1: false
         });
@@ -736,7 +736,7 @@ class ShowOutput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowOutput,
-            title: ( localize2(10569, "Show Output")),
+            title: ( localize2(10882, "Show Output")),
             category,
             f1: false
         });
@@ -749,7 +749,7 @@ class RestartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RestartServer,
-            title: ( localize2(10570, "Restart Server")),
+            title: ( localize2(10883, "Restart Server")),
             category,
             f1: false
         });
@@ -768,7 +768,7 @@ class StartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartServer,
-            title: ( localize2(10571, "Start Server")),
+            title: ( localize2(10884, "Start Server")),
             category,
             f1: false
         });
@@ -793,7 +793,7 @@ class StopServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StopServer,
-            title: ( localize2(10572, "Stop Server")),
+            title: ( localize2(10885, "Stop Server")),
             category,
             f1: false
         });
@@ -807,8 +807,8 @@ class McpBrowseCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.Browse,
-            title: ( localize2(10573, "MCP Servers")),
-            tooltip: ( localize2(10574, "Browse MCP Servers")),
+            title: ( localize2(10886, "MCP Servers")),
+            tooltip: ( localize2(10887, "Browse MCP Servers")),
             category,
             icon: Codicon.search,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
@@ -831,7 +831,7 @@ class McpBrowseCommand extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: McpCommandIds.Browse,
-        title: ( localize2(10575, "Browse MCP Servers")),
+        title: ( localize2(10888, "Browse MCP Servers")),
         category,
         precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
     }
@@ -840,7 +840,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowInstalled,
-            title: ( localize2(10576, "Show Installed Servers")),
+            title: ( localize2(10889, "Show Installed Servers")),
             category,
             precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             f1: true
@@ -850,7 +850,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
         const viewsService = accessor.get(IViewsService);
         const view = await viewsService.openView(InstalledMcpServersViewId, true);
         if (!view) {
-            await viewsService.openViewContainer(VIEW_CONTAINER.id);
+            await viewsService.openViewContainer(VIEWLET_ID);
             await viewsService.openView(InstalledMcpServersViewId, true);
         }
     }
@@ -858,7 +858,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
 MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
     command: {
         id: McpCommandIds.ShowInstalled,
-        title: ( localize2(10577, "MCP Servers"))
+        title: ( localize2(10890, "MCP Servers"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)))),
     order: 10,
@@ -883,7 +883,7 @@ class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenUserMcp,
-            title: ( localize2(10578, "Open User Configuration")),
+            title: ( localize2(10891, "Open User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
@@ -898,7 +898,7 @@ class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenRemoteUserMcp,
-            title: ( localize2(10579, "Open Remote User Configuration")),
+            title: ( localize2(10892, "Open Remote User Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( RemoteNameContext.notEqualsTo(""))))
@@ -915,7 +915,7 @@ class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceFolderMcp,
-            title: ( localize2(10580, "Open Workspace Folder MCP Configuration")),
+            title: ( localize2(10893, "Open Workspace Folder MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( WorkspaceFolderCountContext.notEqualsTo(0))))
@@ -938,7 +938,7 @@ class OpenWorkspaceMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceMcp,
-            title: ( localize2(10581, "Open Workspace MCP Configuration")),
+            title: ( localize2(10894, "Open Workspace MCP Configuration")),
             category,
             f1: true,
             precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( WorkbenchStateContext.isEqualTo("workspace"))))
@@ -959,7 +959,7 @@ class McpBrowseResourcesCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.BrowseResources,
-            title: ( localize2(10582, "Browse Resources...")),
+            title: ( localize2(10895, "Browse Resources...")),
             category,
             precondition: ( ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             f1: true
@@ -977,7 +977,7 @@ class McpConfigureSamplingModels extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ConfigureSamplingModels,
-            title: ( localize2(10583, "Configure SamplingModel")),
+            title: ( localize2(10896, "Configure SamplingModel")),
             category
         });
     }
@@ -1003,7 +1003,7 @@ class McpConfigureSamplingModels extends Action2 {
         );
         const picked = await quickInputService.pick(allItems, {
             placeHolder: ( localize(
-                10584,
+                10897,
                 "Pick the models {0} can access via MCP sampling",
                 server.definition.label
             )),
@@ -1019,7 +1019,7 @@ class McpStartPromptingServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartPromptForServer,
-            title: ( localize2(10585, "Start Prompting Server")),
+            title: ( localize2(10898, "Start Prompting Server")),
             category,
             f1: false
         });
@@ -1049,7 +1049,7 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SkipCurrentAutostart,
-            title: ( localize2(10586, "Skip Current Autostart")),
+            title: ( localize2(10899, "Skip Current Autostart")),
             category,
             f1: false
         });