@codingame/monaco-vscode-mcp-service-override 30.0.0 → 31.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "30.0.0",
+  "version": "31.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": "30.0.0"
+    "@codingame/monaco-vscode-api": "31.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(
-            2040,
+            2042,
             "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(2041, "No README available")));
+            return Promise.resolve(( localize(2043, "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(2042, "You can find information about this server [here]({0})", readmeUrl)))).value;
+            return ( new MarkdownString(( localize(2044, "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

@@ -115,16 +115,16 @@ registerWorkbenchContribution2(
 const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(10394, "MCP Server"))),
+    EditorPaneDescriptor.create(McpServerEditor, McpServerEditor.ID, ( localize(10524, "MCP Server"))),
     [( new SyncDescriptor(McpServerEditorInput))]
 );
 ( Registry.as(Extensions$1.Quickaccess)).registerQuickAccessProvider({
     ctor: McpResourceQuickAccess,
     prefix: McpResourceQuickAccess.PREFIX,
     when: ChatContextKeys.enabled,
-    placeholder: ( localize(10395, "Filter to an MCP resource")),
+    placeholder: ( localize(10525, "Filter to an MCP resource")),
     helpEntries: [{
-        description: ( localize(10396, "MCP Server Resources")),
+        description: ( localize(10526, "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(10397, "MCP Resources...")),
+            label: ( localize(10527, "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(10398, "Select MCP Resource...")),
+                    placeholder: ( localize(10528, "Select MCP Resource...")),
                     picks: (_query, token) => this._getResourcePicks(token, helper),
                     goBack: () => {
                         return helper.navigateBack();

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

@@ -79,13 +79,13 @@ class ListMcpServerCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ListServer,
-            title: ( localize2(10399, "List Servers")),
+            title: ( localize2(10529, "List Servers")),
             icon: Codicon.server,
             category,
             f1: true,
-            precondition: ( ChatContextKeys.Setup.hidden.negate()),
+            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: [{
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${mcpAutoStartConfig}`, McpAutoStartValue.Never)), McpContextKeys.hasUnknownTools)), McpContextKeys.hasServersWithErrors)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.lockedToCodingAgent.negate()), ( ChatContextKeys.Setup.hidden.negate()))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals(`config.${mcpAutoStartConfig}`, McpAutoStartValue.Never)), McpContextKeys.hasUnknownTools)), McpContextKeys.hasServersWithErrors)), ( ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent)), ( ChatContextKeys.lockedToCodingAgent.negate()), ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))))),
                 id: MenuId.ChatInput,
                 group: "navigation",
                 order: 101
@@ -101,7 +101,7 @@ class ListMcpServerCommand extends Action2 {
         const pick = quickInput.createQuickPick({
             useSeparators: true
         });
-        pick.placeholder = ( localize(10400, "Select an MCP Server"));
+        pick.placeholder = ( localize(10530, "Select an MCP Server"));
         mcpService.activateCollections();
         store.add(pick);
         store.add(autorun(reader => {
@@ -111,8 +111,8 @@ class ListMcpServerCommand extends Action2 {
             const firstRun = pick.items.length === 0;
             pick.items = [{
                 id: "$add",
-                label: ( localize(10401, "Add Server")),
-                description: ( localize(10402, "Add a new server configuration")),
+                label: ( localize(10531, "Add Server")),
+                description: ( localize(10532, "Add a new server configuration")),
                 alwaysShow: true,
                 iconClass: ThemeIcon.asClassName(Codicon.add)
             }, ...( Object.values(servers)).filter(s => s.length).flatMap(servers => [{
@@ -124,7 +124,7 @@ class ListMcpServerCommand extends Action2 {
                 return {
                     id: server.definition.id,
                     label: server.definition.label,
-                    description: disabled ? ( localize(10403, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
+                    description: disabled ? ( localize(10533, "Disabled")) : ( McpConnectionState.toString(server.connectionState.read(reader)))
                 };
             }))])];
             if (firstRun && pick.items.length > 3) {
@@ -161,7 +161,7 @@ class McpConfirmationServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptionsInConfirmation,
-            title: ( localize2(10404, "Server Options")),
+            title: ( localize2(10534, "Server Options")),
             category,
             icon: Codicon.settingsGear,
             f1: false,
@@ -192,7 +192,7 @@ class McpServerOptionsCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ServerOptions,
-            title: ( localize2(10404, "Server Options")),
+            title: ( localize2(10534, "Server Options")),
             category,
             f1: false
         });
@@ -216,20 +216,20 @@ class McpServerOptionsCommand extends Action2 {
         const serverState = server.connectionState.get();
         items.push({
             type: "separator",
-            label: ( localize(10405, "Status"))
+            label: ( localize(10535, "Status"))
         });
         if (McpConnectionState.canBeStarted(serverState.state)) {
             items.push({
-                label: ( localize(10406, "Start Server")),
+                label: ( localize(10536, "Start Server")),
                 action: "start"
             });
         } else {
             items.push({
-                label: ( localize(10407, "Stop Server")),
+                label: ( localize(10537, "Stop Server")),
                 action: "stop"
             });
             items.push({
-                label: ( localize(10408, "Restart Server")),
+                label: ( localize(10538, "Restart Server")),
                 action: "restart"
             });
         }
@@ -237,26 +237,26 @@ class McpServerOptionsCommand extends Action2 {
         const configTarget = serverDefinition?.presentation?.origin || collection?.presentation?.origin;
         if (configTarget) {
             items.push({
-                label: ( localize(10409, "Show Configuration")),
+                label: ( localize(10539, "Show Configuration")),
                 action: "config"
             });
         }
         items.push({
-            label: ( localize(10410, "Show Output")),
+            label: ( localize(10540, "Show Output")),
             action: "showOutput"
         });
         items.push({
             type: "separator",
-            label: ( localize(10411, "Sampling"))
+            label: ( localize(10541, "Sampling"))
         }, {
-            label: ( localize(10412, "Configure Model Access")),
-            description: ( localize(10413, "Set the models the server can use via MCP sampling")),
+            label: ( localize(10542, "Configure Model Access")),
+            description: ( localize(10543, "Set the models the server can use via MCP sampling")),
             action: "configSampling"
         });
         if (samplingService.hasLogs(server)) {
             items.push({
-                label: ( localize(10414, "Show Sampling Requests")),
-                description: ( localize(10415, "Show the sampling requests for this server")),
+                label: ( localize(10544, "Show Sampling Requests")),
+                description: ( localize(10545, "Show the sampling requests for this server")),
                 action: "samplingLog"
             });
         }
@@ -264,15 +264,15 @@ class McpServerOptionsCommand extends Action2 {
         if (capabilities === undefined || (capabilities & McpCapability.Resources)) {
             items.push({
                 type: "separator",
-                label: ( localize(10416, "Resources"))
+                label: ( localize(10546, "Resources"))
             });
             items.push({
-                label: ( localize(10417, "Browse Resources")),
+                label: ( localize(10547, "Browse Resources")),
                 action: "resources"
             });
         }
         const pick = await quickInputService.pick(items, {
-            placeHolder: ( localize(10418, "Select action for '{0}'", server.definition.label))
+            placeHolder: ( localize(10548, "Select action for '{0}'", server.definition.label))
         });
         if (!pick) {
             return;
@@ -320,7 +320,7 @@ class McpServerOptionsCommand extends Action2 {
             editorService.openEditor({
                 resource: undefined,
                 contents: samplingService.getLogText(server),
-                label: ( localize(10419, "MCP Sampling: {0}", server.definition.label))
+                label: ( localize(10549, "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(10420, "Disconnect Account")),
+                    label: ( localize(10550, "Disconnect Account")),
                     description: `(${accountName})`,
                     accountQuery
                 });
             } else {
                 result.push({
                     action: "signout",
-                    label: ( localize(10421, "Sign Out")),
+                    label: ( localize(10551, "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(10422, "Show server options for {0}", s.definition.label))
+                            tooltip: ( localize(10552, "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(
-                                10423,
+                                10553,
                                 "MCP server {0} has been updated and may have new tools available.",
                                 names
                             )) : ( localize(
-                                10424,
+                                10554,
                                 "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(10425, "MCP server {0} was unable to start successfully.", names)) : ( localize(
-                                10426,
+                            markdown = ( new MarkdownString(single ? ( localize(10555, "MCP server {0} was unable to start successfully.", names)) : ( localize(
+                                10556,
                                 "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(10427, "Automatically start MCP servers when sending a chat message"));
+                                const settingLabelStr = ( localize(10557, "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(10428, "New tools available ({0})", servers.length || 1);
+                            return localize(10558, "New tools available ({0})", servers.length || 1);
                         } else if (state === DisplayedState.Error) {
-                            return localize(10429, "Error loading {0} tool(s)", servers.length || 1);
+                            return localize(10559, "Error loading {0} tool(s)", servers.length || 1);
                         } else if (state === DisplayedState.Refreshing) {
-                            return localize(10430, "Discovering tools...");
+                            return localize(10560, "Discovering tools...");
                         } else {
                             return null;
                         }
@@ -607,10 +607,10 @@ class ResetMcpTrustCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetTrust,
-            title: ( localize2(10431, "Reset Trust")),
+            title: ( localize2(10561, "Reset Trust")),
             category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate())))
+            precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
         });
     }
     run(accessor) {
@@ -622,10 +622,10 @@ class ResetMcpCachedTools extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ResetCachedTools,
-            title: ( localize2(10432, "Reset Cached Tools")),
+            title: ( localize2(10562, "Reset Cached Tools")),
             category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate())))
+            precondition: ( ContextKeyExpr.and(McpContextKeys.toolsCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
         });
     }
     run(accessor) {
@@ -637,16 +637,16 @@ class AddConfigurationAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.AddConfiguration,
-            title: ( localize2(10433, "Add Server...")),
+            title: ( localize2(10563, "Add Server...")),
             metadata: {
-                description: ( localize2(10434, "Installs a new Model Context protocol to the mcp.json settings"))
+                description: ( localize2(10564, "Installs a new Model Context protocol to the mcp.json settings"))
             },
             category,
             f1: true,
-            precondition: ( ChatContextKeys.Setup.hidden.negate()),
+            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: {
                 id: MenuId.EditorContent,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.regex(ResourceContextKey.Path.key, /\.vscode[/\\]mcp\.json$/)), ( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), ( ChatContextKeys.Setup.hidden.negate())))
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.regex(ResourceContextKey.Path.key, /\.vscode[/\\]mcp\.json$/)), ( ActiveEditorContext.isEqualTo(TEXT_FILE_EDITOR_ID)), ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))))
             }
         });
     }
@@ -661,13 +661,13 @@ class InstallFromManifestAction extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.InstallFromManifest,
-            title: ( localize2(10435, "Install Server from Manifest...")),
+            title: ( localize2(10565, "Install Server from Manifest...")),
             metadata: {
-                description: ( localize2(10436, "Install an MCP server from a JSON manifest file"))
+                description: ( localize2(10566, "Install an MCP server from a JSON manifest file"))
             },
             category,
             f1: true,
-            precondition: ( ChatContextKeys.Setup.hidden.negate())
+            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
         });
     }
     async run(accessor) {
@@ -679,7 +679,7 @@ class RemoveStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RemoveStoredInput,
-            title: ( localize2(10432, "Reset Cached Tools")),
+            title: ( localize2(10562, "Reset Cached Tools")),
             category,
             f1: false
         });
@@ -692,7 +692,7 @@ class EditStoredInput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.EditStoredInput,
-            title: ( localize2(10437, "Edit Stored Input")),
+            title: ( localize2(10567, "Edit Stored Input")),
             category,
             f1: false
         });
@@ -706,7 +706,7 @@ class ShowConfiguration extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowConfiguration,
-            title: ( localize2(10438, "Show Configuration")),
+            title: ( localize2(10568, "Show Configuration")),
             category,
             f1: false
         });
@@ -736,7 +736,7 @@ class ShowOutput extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowOutput,
-            title: ( localize2(10439, "Show Output")),
+            title: ( localize2(10569, "Show Output")),
             category,
             f1: false
         });
@@ -749,7 +749,7 @@ class RestartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.RestartServer,
-            title: ( localize2(10440, "Restart Server")),
+            title: ( localize2(10570, "Restart Server")),
             category,
             f1: false
         });
@@ -768,7 +768,7 @@ class StartServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StartServer,
-            title: ( localize2(10441, "Start Server")),
+            title: ( localize2(10571, "Start Server")),
             category,
             f1: false
         });
@@ -793,7 +793,7 @@ class StopServer extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.StopServer,
-            title: ( localize2(10442, "Stop Server")),
+            title: ( localize2(10572, "Stop Server")),
             category,
             f1: false
         });
@@ -807,19 +807,19 @@ class McpBrowseCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.Browse,
-            title: ( localize2(10443, "MCP Servers")),
-            tooltip: ( localize2(10444, "Browse MCP Servers")),
+            title: ( localize2(10573, "MCP Servers")),
+            tooltip: ( localize2(10574, "Browse MCP Servers")),
             category,
             icon: Codicon.search,
-            precondition: ( ChatContextKeys.Setup.hidden.negate()),
+            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             menu: [{
                 id: extensionsFilterSubMenu,
                 group: "1_predefined",
                 order: 1,
-                when: ( ChatContextKeys.Setup.hidden.negate())
+                when: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
             }, {
                 id: MenuId.ViewTitle,
-                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", InstalledMcpServersViewId)), ( ChatContextKeys.Setup.hidden.negate()))),
+                when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", InstalledMcpServersViewId)), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
                 group: "navigation"
             }]
         });
@@ -831,18 +831,18 @@ class McpBrowseCommand extends Action2 {
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: McpCommandIds.Browse,
-        title: ( localize2(10445, "Browse MCP Servers")),
+        title: ( localize2(10575, "Browse MCP Servers")),
         category,
-        precondition: ( ChatContextKeys.Setup.hidden.negate())
+        precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
     }
 });
 class ShowInstalledMcpServersCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.ShowInstalled,
-            title: ( localize2(10446, "Show Installed Servers")),
+            title: ( localize2(10576, "Show Installed Servers")),
             category,
-            precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
+            precondition: ( ContextKeyExpr.and(HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             f1: true
         });
     }
@@ -858,7 +858,7 @@ class ShowInstalledMcpServersCommand extends Action2 {
 MenuRegistry.appendMenuItem(CHAT_CONFIG_MENU_ID, {
     command: {
         id: McpCommandIds.ShowInstalled,
-        title: ( localize2(10447, "MCP Servers"))
+        title: ( localize2(10577, "MCP Servers"))
     },
     when: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.equals("view", ChatViewId)))),
     order: 10,
@@ -883,10 +883,10 @@ class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenUserMcp,
-            title: ( localize2(10448, "Open User Configuration")),
+            title: ( localize2(10578, "Open User Configuration")),
             category,
             f1: true,
-            precondition: ( ChatContextKeys.Setup.hidden.negate())
+            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate())))
         });
     }
     getURI(accessor) {
@@ -898,10 +898,10 @@ class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
     constructor() {
         super({
             id: McpCommandIds.OpenRemoteUserMcp,
-            title: ( localize2(10449, "Open Remote User Configuration")),
+            title: ( localize2(10579, "Open Remote User Configuration")),
             category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( RemoteNameContext.notEqualsTo(""))))
+            precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( RemoteNameContext.notEqualsTo(""))))
         });
     }
     async getURI(accessor) {
@@ -915,10 +915,10 @@ class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceFolderMcp,
-            title: ( localize2(10450, "Open Workspace Folder MCP Configuration")),
+            title: ( localize2(10580, "Open Workspace Folder MCP Configuration")),
             category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkspaceFolderCountContext.notEqualsTo(0))))
+            precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( WorkspaceFolderCountContext.notEqualsTo(0))))
         });
     }
     async run(accessor) {
@@ -938,10 +938,10 @@ class OpenWorkspaceMcpResourceCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.OpenWorkspaceMcp,
-            title: ( localize2(10451, "Open Workspace MCP Configuration")),
+            title: ( localize2(10581, "Open Workspace MCP Configuration")),
             category,
             f1: true,
-            precondition: ( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( WorkbenchStateContext.isEqualTo("workspace"))))
+            precondition: ( ContextKeyExpr.and(( ContextKeyExpr.and(( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))), ( WorkbenchStateContext.isEqualTo("workspace"))))
         });
     }
     async run(accessor) {
@@ -959,9 +959,9 @@ class McpBrowseResourcesCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.BrowseResources,
-            title: ( localize2(10452, "Browse Resources...")),
+            title: ( localize2(10582, "Browse Resources...")),
             category,
-            precondition: ( ContextKeyExpr.and(McpContextKeys.serverCount.greater(0), ( ChatContextKeys.Setup.hidden.negate()))),
+            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(10453, "Configure SamplingModel")),
+            title: ( localize2(10583, "Configure SamplingModel")),
             category
         });
     }
@@ -1003,7 +1003,7 @@ class McpConfigureSamplingModels extends Action2 {
         );
         const picked = await quickInputService.pick(allItems, {
             placeHolder: ( localize(
-                10454,
+                10584,
                 "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(10455, "Start Prompting Server")),
+            title: ( localize2(10585, "Start Prompting Server")),
             category,
             f1: false
         });
@@ -1049,7 +1049,7 @@ class McpSkipCurrentAutostartCommand extends Action2 {
     constructor() {
         super({
             id: McpCommandIds.SkipCurrentAutostart,
-            title: ( localize2(10456, "Skip Current Autostart")),
+            title: ( localize2(10586, "Skip Current Autostart")),
             category,
             f1: false
         });