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

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

@@ -27,8 +27,8 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 
 const noneItem = {
     id: undefined,
-    label: ( localize(10520, "None")),
-    description: ( localize(10521, "No selection")),
+    label: ( localize(10650, "None")),
+    description: ( localize(10651, "No selection")),
     alwaysShow: true
 };
 function isFormElicitation(params) {
@@ -117,11 +117,11 @@ let McpElicitationService = class McpElicitationService {
             }
             const handle = this._notificationService.notify({
                 message: elicitation.message,
-                source: ( localize(10522, "MCP Server ({0})", server.definition.label)),
+                source: ( localize(10652, "MCP Server ({0})", server.definition.label)),
                 severity: Severity.Info,
                 actions: {
-                    primary: [store.add(( new Action("mcp.elicit.give", ( localize(10523, "Respond")), undefined, true, () => resolve(this._doElicitForm(elicitation, token)))))],
-                    secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10524, "Cancel")), undefined, true, () => resolve({
+                    primary: [store.add(( new Action("mcp.elicit.give", ( localize(10653, "Respond")), undefined, true, () => resolve(this._doElicitForm(elicitation, token)))))],
+                    secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10654, "Cancel")), undefined, true, () => resolve({
                         action: "decline"
                     }))))]
                 }
@@ -163,7 +163,7 @@ let McpElicitationService = class McpElicitationService {
             if (chatModel instanceof ChatModel) {
                 const request = chatModel.getRequests().at(-1);
                 if (request) {
-                    const part = ( new ChatElicitationRequestPart(( localize(10525, "Authorization Required")), ( new MarkdownString()).appendText(elicitation.message).appendMarkdown("\n\n" + ( localize(10526, "Open this URL?"))).appendCodeblock("", elicitation.url), ( localize(10527, "{0} (MCP Server)", server.definition.label)), ( localize(10528, "Open {0}", ( URI.parse(elicitation.url)).authority)), ( localize(10529, "Cancel")), async () => {
+                    const part = ( new ChatElicitationRequestPart(( localize(10655, "Authorization Required")), ( new MarkdownString()).appendText(elicitation.message).appendMarkdown("\n\n" + ( localize(10656, "Open this URL?"))).appendCodeblock("", elicitation.url), ( localize(10657, "{0} (MCP Server)", server.definition.label)), ( localize(10658, "Open {0}", ( URI.parse(elicitation.url)).authority)), ( localize(10659, "Cancel")), async () => {
                         const result = await this._doElicitUrl(elicitation, token);
                         resolve(result);
                         completePromise.then(() => part.hide());
@@ -178,12 +178,12 @@ let McpElicitationService = class McpElicitationService {
                 }
             } else {
                 const handle = this._notificationService.notify({
-                    message: elicitation.message + " " + ( localize(10530, "This will open {0}", elicitation.url)),
-                    source: ( localize(10522, "MCP Server ({0})", server.definition.label)),
+                    message: elicitation.message + " " + ( localize(10660, "This will open {0}", elicitation.url)),
+                    source: ( localize(10652, "MCP Server ({0})", server.definition.label)),
                     severity: Severity.Info,
                     actions: {
-                        primary: [store.add(( new Action("mcp.elicit.url.open2", ( localize(10531, "Open URL")), undefined, true, () => resolve(this._doElicitUrl(elicitation, token)))))],
-                        secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10524, "Cancel")), undefined, true, () => resolve({
+                        primary: [store.add(( new Action("mcp.elicit.url.open2", ( localize(10661, "Open URL")), undefined, true, () => resolve(this._doElicitUrl(elicitation, token)))))],
+                        secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10654, "Cancel")), undefined, true, () => resolve({
                             action: "decline"
                         }))))]
                     }
@@ -325,7 +325,7 @@ let McpElicitationService = class McpElicitationService {
     _getFieldPlaceholder(schema, required) {
         let placeholder = schema.description || "";
         if (!required) {
-            placeholder = placeholder ? `${placeholder} (${( localize(10532, "Optional"))})` : ( localize(10532, "Optional"));
+            placeholder = placeholder ? `${placeholder} (${( localize(10662, "Optional"))})` : ( localize(10662, "Optional"));
         }
         return placeholder;
     }
@@ -434,7 +434,7 @@ let McpElicitationService = class McpElicitationService {
                     items.push({
                         id: "$default",
                         label: `${schema.default}`,
-                        description: ( localize(10533, "Default value"))
+                        description: ( localize(10663, "Default value"))
                     });
                 }
             }
@@ -503,13 +503,13 @@ let McpElicitationService = class McpElicitationService {
         if (schema.minLength && value.length < schema.minLength) {
             return {
                 isValid: false,
-                message: ( localize(10534, "Minimum length is {0}", schema.minLength))
+                message: ( localize(10664, "Minimum length is {0}", schema.minLength))
             };
         }
         if (schema.maxLength && value.length > schema.maxLength) {
             return {
                 isValid: false,
-                message: ( localize(10535, "Maximum length is {0}", schema.maxLength))
+                message: ( localize(10665, "Maximum length is {0}", schema.maxLength))
             };
         }
         if (schema.format) {
@@ -530,7 +530,7 @@ let McpElicitationService = class McpElicitationService {
                 isValid: true
             } : {
                 isValid: false,
-                message: ( localize(10536, "Please enter a valid email address"))
+                message: ( localize(10666, "Please enter a valid email address"))
             };
         case "uri":
             if (URL.canParse(value)) {
@@ -540,7 +540,7 @@ let McpElicitationService = class McpElicitationService {
             } else {
                 return {
                     isValid: false,
-                    message: ( localize(10537, "Please enter a valid URI"))
+                    message: ( localize(10667, "Please enter a valid URI"))
                 };
             }
         case "date":
@@ -549,7 +549,7 @@ let McpElicitationService = class McpElicitationService {
                 if (!dateRegex.test(value)) {
                     return {
                         isValid: false,
-                        message: ( localize(10538, "Please enter a valid date (YYYY-MM-DD)"))
+                        message: ( localize(10668, "Please enter a valid date (YYYY-MM-DD)"))
                     };
                 }
                 const date = ( new Date(value));
@@ -557,7 +557,7 @@ let McpElicitationService = class McpElicitationService {
                     isValid: true
                 } : {
                     isValid: false,
-                    message: ( localize(10538, "Please enter a valid date (YYYY-MM-DD)"))
+                    message: ( localize(10668, "Please enter a valid date (YYYY-MM-DD)"))
                 };
             }
         case "date-time":
@@ -567,7 +567,7 @@ let McpElicitationService = class McpElicitationService {
                     isValid: true
                 } : {
                     isValid: false,
-                    message: ( localize(10539, "Please enter a valid date-time"))
+                    message: ( localize(10669, "Please enter a valid date-time"))
                 };
             }
         default:
@@ -581,25 +581,25 @@ let McpElicitationService = class McpElicitationService {
         if (isNaN(parsed)) {
             return {
                 isValid: false,
-                message: ( localize(10540, "Please enter a valid number"))
+                message: ( localize(10670, "Please enter a valid number"))
             };
         }
         if (schema.type === "integer" && !Number.isInteger(parsed)) {
             return {
                 isValid: false,
-                message: ( localize(10541, "Please enter a valid integer"))
+                message: ( localize(10671, "Please enter a valid integer"))
             };
         }
         if (schema.minimum !== undefined && parsed < schema.minimum) {
             return {
                 isValid: false,
-                message: ( localize(10542, "Minimum value is {0}", schema.minimum))
+                message: ( localize(10672, "Minimum value is {0}", schema.minimum))
             };
         }
         if (schema.maximum !== undefined && parsed > schema.maximum) {
             return {
                 isValid: false,
-                message: ( localize(10543, "Maximum value is {0}", schema.maximum))
+                message: ( localize(10673, "Maximum value is {0}", schema.maximum))
             };
         }
         return {
@@ -628,11 +628,11 @@ let McpElicitationService = class McpElicitationService {
                     allowFreeformInput: false,
                     options: [{
                         id: "true",
-                        label: ( localize(10544, "True")),
+                        label: ( localize(10674, "True")),
                         value: "true"
                     }, {
                         id: "false",
-                        label: ( localize(10545, "False")),
+                        label: ( localize(10675, "False")),
                         value: "false"
                     }],
                     defaultValue: schema.default !== undefined ? String(schema.default) : undefined

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

@@ -1,3 +1,4 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 import { IMcpGatewayResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpGatewayService";
@@ -16,5 +17,5 @@ export declare class BrowserMcpGatewayService implements IWorkbenchMcpGatewaySer
     private readonly _logService;
     readonly _serviceBrand: undefined;
     constructor(_remoteAgentService: IRemoteAgentService, _logService: ILogService);
-    createGateway(inRemote: boolean): Promise<IMcpGatewayResult | undefined>;
+    createGateway(inRemote: boolean, chatSessionResource?: URI): Promise<IMcpGatewayResult | undefined>;
 }

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

@@ -2,7 +2,6 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { ProxyChannel } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { McpGatewayChannelName } from '../../../../platform/mcp/common/mcpGateway.js';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
@@ -12,7 +11,7 @@ let BrowserMcpGatewayService = class BrowserMcpGatewayService {
         this._remoteAgentService = _remoteAgentService;
         this._logService = _logService;
     }
-    async createGateway(inRemote) {
+    async createGateway(inRemote, chatSessionResource) {
         this._logService.debug(
             `[McpGateway][BrowserWorkbench] createGateway requested (inRemote=${inRemote})`
         );
@@ -31,8 +30,9 @@ let BrowserMcpGatewayService = class BrowserMcpGatewayService {
         }
         this._logService.info("[McpGateway][BrowserWorkbench] Creating remote gateway via remote server");
         return connection.withChannel(McpGatewayChannelName, async channel => {
-            const service = ProxyChannel.toService(channel);
-            const info = await service.createGateway(undefined);
+            const info = await channel.call("createGateway", chatSessionResource ? {
+                chatSessionResource: ( chatSessionResource.toString())
+            } : undefined);
             const servers = reviveServers(info.servers);
             this._logService.info(
                 `[McpGateway][BrowserWorkbench] Remote gateway created with ${servers.length} server(s)`
@@ -48,7 +48,12 @@ let BrowserMcpGatewayService = class BrowserMcpGatewayService {
                     this._logService.info(
                         `[McpGateway][BrowserWorkbench] Disposing remote gateway: ${info.gatewayId}`
                     );
-                    service.disposeGateway(info.gatewayId);
+                    void channel.call("disposeGateway", info.gatewayId).then(undefined, error => {
+                        this._logService.warn(
+                            `[McpGateway][BrowserWorkbench] Failed to dispose remote gateway: ${info.gatewayId}`,
+                            error
+                        );
+                    });
                 }
             };
         });

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(
-                            10546,
+                            10676,
                             "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(10547, "Error")),
+                        title: "$(error) " + ( localize(10677, "Error")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.RestartServer,
-                        title: ( localize(10548, "Restart")),
+                        title: ( localize(10678, "Restart")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -199,7 +199,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(10549, "Debug")),
+                            title: ( localize(10679, "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(10550, "Starting")),
+                        title: "$(loading~spin) " + ( localize(10680, "Starting")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.StopServer,
-                        title: ( localize(10551, "Cancel")),
+                        title: ( localize(10681, "Cancel")),
                         arguments: [server.definition.id]
                     }
                 });
@@ -230,21 +230,21 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(check) " + ( localize(10552, "Running")),
+                        title: "$(check) " + ( localize(10682, "Running")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.StopServer,
-                        title: ( localize(10553, "Stop")),
+                        title: ( localize(10683, "Stop")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.RestartServer,
-                        title: ( localize(10548, "Restart")),
+                        title: ( localize(10678, "Restart")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -255,7 +255,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(10549, "Debug")),
+                            title: ( localize(10679, "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(10554, "Start")),
+                        title: "$(debug-start) " + ( localize(10684, "Start")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -280,7 +280,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartServer,
-                            title: ( localize(10549, "Debug")),
+                            title: ( localize(10679, "Debug")),
                             arguments: [server.definition.id, {
                                 autoTrustChanges: true,
                                 debug: true
@@ -296,7 +296,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: "",
-                            title: ( localize(10555, "{0} tools", toolCount))
+                            title: ( localize(10685, "{0} tools", toolCount))
                         }
                     });
                 }
@@ -306,7 +306,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartPromptForServer,
-                            title: ( localize(10556, "{0} prompts", promptCount)),
+                            title: ( localize(10686, "{0} prompts", promptCount)),
                             arguments: [server]
                         }
                     });
@@ -315,7 +315,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ServerOptions,
-                        title: ( localize(10557, "More...")),
+                        title: ( localize(10687, "More...")),
                         arguments: [server.definition.id]
                     }
                 });
@@ -390,19 +390,19 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         function pushAnnotation(savedId, offset, saved) {
             const tooltip = ( new MarkdownString([createMarkdownCommandLink({
                 id: McpCommandIds.EditStoredInput,
-                text: ( localize(10558, "Edit")),
+                text: ( localize(10688, "Edit")),
                 arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target],
-                tooltip: ( localize(10559, "Edit saved value"))
+                tooltip: ( localize(10689, "Edit saved value"))
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                text: ( localize(10560, "Clear")),
+                text: ( localize(10690, "Clear")),
                 arguments: [inConfig.scope, savedId],
-                tooltip: ( localize(10561, "Clear saved value"))
+                tooltip: ( localize(10691, "Clear saved value"))
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                text: ( localize(10562, "Clear All")),
+                text: ( localize(10692, "Clear All")),
                 arguments: [inConfig.scope],
-                tooltip: ( localize(10563, "Clear all saved values"))
+                tooltip: ( localize(10693, "Clear all saved values"))
             })].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(
-            10564,
+            10694,
             "MCP servers should no longer be configured in remote user settings. Use the dedicated MCP configuration instead."
         )) : ( localize(
-            10565,
+            10695,
             "MCP servers should no longer be configured in user settings. Use the dedicated MCP configuration instead."
         ));
-        const openConfigLabel = isRemote ? ( localize(10566, "Open Remote User MCP Configuration")) : ( localize(10567, "Open User MCP Configuration"));
+        const openConfigLabel = isRemote ? ( localize(10696, "Open Remote User MCP Configuration")) : ( localize(10697, "Open User MCP Configuration"));
         const commandId = isRemote ? McpCommandIds.OpenRemoteUserMcp : McpCommandIds.OpenUserMcp;
         this.notificationService.prompt(Severity.Error, message, [{
-            label: ( localize(10568, "Update Now")),
+            label: ( localize(10698, "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(10584, "Resource template: {0}", resource.template.template)),
+                detail: ( localize(10714, "Resource template: {0}", resource.template.template)),
                 iconPath
             };
         }
@@ -221,7 +221,7 @@ let McpResourcePickHelper = class McpResourcePickHelper extends Disposable {
             return uri;
         }
         this._notificationService.warn(( localize(
-            10585,
+            10715,
             "The resource {0} was not found.",
             (McpResourceURI.toServer(uri).resourceURL.toString())
         )));
@@ -266,13 +266,13 @@ let McpResourcePickHelper = class McpResourcePickHelper extends Disposable {
             }
         }
         let placeholder = ( localize(
-            10586,
+            10716,
             "Value for ${0} in {1}",
             variable.name.toUpperCase(),
             rt.template.resolve(variablesWithPlaceholders).replaceAll("%24", "$")
         ));
         if (variable.optional) {
-            placeholder += " (" + ( localize(10587, "Optional")) + ")";
+            placeholder += " (" + ( localize(10717, "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(10588, "<Empty>"))
+                    label: ( localize(10718, "<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(10589, "Attach to chat"));
+        const attachButton = ( localize(10719, "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(10590, "Go back ↩")),
+                    label: ( localize(10720, "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(10591, "Search for resources"));
+        qp.placeholder = ( localize(10721, "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.js

@@ -142,7 +142,7 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                         return mcpServer?.label ?? "";
                     },
                     getWidgetAriaLabel() {
-                        return localize(10669, "MCP Servers");
+                        return localize(10799, "MCP Servers");
                     }
                 },
                 overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles,
@@ -251,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(10670, "MCP Servers"));
+        title.textContent = ( localize(10800, "MCP Servers"));
         const settingsCommandLink = ( createMarkdownCommandLink({
             id: "workbench.action.openSettings",
             arguments: [`@id:${mcpGalleryServiceEnablementConfig}`],
             text: mcpGalleryServiceEnablementConfig,
-            tooltip: ( localize(10671, "Open Settings"))
+            tooltip: ( localize(10801, "Open Settings"))
         }).toString());
         const description = append(welcomeContent, $(".mcp-welcome-description"));
         const markdownResult = this._register(this.markdownRendererService.render(( new MarkdownString(( localize(
-            10672,
+            10802,
             "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(
-            10673,
+            10803,
             "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(10674, "Enable MCP Servers Marketplace")),
+            title: ( localize(10804, "Enable MCP Servers Marketplace")),
             ...defaultButtonStyles
         })));
-        button.label = ( localize(10674, "Enable MCP Servers Marketplace"));
+        button.label = ( localize(10804, "Enable MCP Servers Marketplace"));
         this._register(button.onDidClick(async () => {
             const {
                 result
             } = await this.dialogService.prompt({
                 type: "info",
-                message: ( localize(10675, "Enable MCP Servers Marketplace?")),
+                message: ( localize(10805, "Enable MCP Servers Marketplace?")),
                 custom: {
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            10673,
+                            10803,
                             "This feature is currently in preview. You can disable it anytime using the setting {0}.",
                             settingsCommandLink
                         )), {
@@ -296,10 +296,10 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                     }]
                 },
                 buttons: [{
-                    label: ( localize(10676, "Enable")),
+                    label: ( localize(10806, "Enable")),
                     run: () => true
                 }, {
-                    label: ( localize(10677, "Cancel")),
+                    label: ( localize(10807, "Cancel")),
                     run: () => false
                 }]
             });
@@ -319,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(10678, "No MCP Servers found."));
+                    this.bodyTemplate.messageBox.textContent = ( localize(10808, "No MCP Servers found."));
                 }
                 if (this.bodyTemplate.messageBox.textContent) {
                     alert(this.bodyTemplate.messageBox.textContent);
@@ -533,42 +533,42 @@ class McpServersViewsContribution extends Disposable {
         super();
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([{
             id: InstalledMcpServersViewId,
-            name: ( localize2(10679, "MCP Servers - Installed")),
+            name: ( localize2(10809, "MCP Servers - Installed")),
             ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{}])),
-            when: ( ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
+            when: ( ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()))),
             weight: 40,
             order: 4,
             canToggleVisibility: true
         }, {
             id: "workbench.views.mcp.default.marketplace",
-            name: ( localize2(10680, "MCP Servers")),
+            name: ( localize2(10810, "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}`)))))),
+            when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledMcpServersContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ContextKeyExpr.or(( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)), ( ProductQualityContext.notEqualsTo("stable")), ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)))))),
             weight: 40,
             order: 4,
             canToggleVisibility: true
         }, {
             id: "workbench.views.mcp.marketplace",
-            name: ( localize2(10680, "MCP Servers")),
+            name: ( localize2(10810, "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}`))))))
+            when: ( ContextKeyExpr.and(SearchMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.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(10680, "MCP Servers")),
+            name: ( localize2(10810, "MCP Servers")),
             ctorDescriptor: ( new SyncDescriptor(DefaultBrowseMcpServersView, [{
                 showWelcome: true
             }])),
-            when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledMcpServersContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)).negate()), ( ProductQualityContext.isEqualTo("stable")), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)).negate()))),
+            when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledMcpServersContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)).negate()), ( ProductQualityContext.isEqualTo("stable")), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)).negate()))),
             weight: 40,
             order: 4,
             canToggleVisibility: true
         }, {
             id: "workbench.views.mcp.welcomeView",
-            name: ( localize2(10680, "MCP Servers")),
+            name: ( localize2(10810, "MCP Servers")),
             ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{
                 showWelcome: true
             }])),
-            when: ( ContextKeyExpr.and(SearchMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)).negate()), ( ProductQualityContext.isEqualTo("stable")), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)).negate())))
+            when: ( ContextKeyExpr.and(SearchMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( ChatContextKeys.Setup.disabledInWorkspace.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)).negate()), ( ProductQualityContext.isEqualTo("stable")), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)).negate())))
         }], VIEW_CONTAINER);
     }
 }

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

@@ -120,7 +120,7 @@ export declare class McpWorkbenchService extends Disposable implements IMcpWorkb
     private handleMcpInstallUri;
     private handleMcpServerUrl;
     private handleMcpServerByName;
-    openSearch(searchValue: string, preserveFoucs?: boolean): Promise<void>;
+    openSearch(searchValue: string, preserveFocus?: boolean): Promise<void>;
     open(extension: IWorkbenchMcpServer, options?: IEditorOptions): Promise<void>;
     private getInstallState;
     private getRuntimeStatus;