npm - @codingame/monaco-vscode-api - Versions diffs - 31.0.1 → 32.0.1 - Mend

@codingame/monaco-vscode-api 31.0.1 → 32.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (928) hide show

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpServerActions.js CHANGED Viewed

@@ -230,7 +230,7 @@ let InstallAction = class InstallAction extends McpServerAction {
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(open, mcpWorkbenchService, telemetryService, mcpService) {
-        super("extensions.install", ( localize(10722, "Install")), InstallAction_1.CLASS, false);
+        super("extensions.install", ( localize(11047, "Install")), InstallAction_1.CLASS, false);
         this.open = open;
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.telemetryService = telemetryService;
@@ -256,7 +256,7 @@ let InstallAction = class InstallAction extends McpServerAction {
         if (this.open) {
             this.mcpWorkbenchService.open(this.mcpServer);
             alert(( localize(
-                10723,
+                11048,
                 "Installing MCP Server {0} started. An editor is now open with more details on this MCP Server",
                 this.mcpServer.label
             )));
@@ -289,7 +289,7 @@ let InstallInWorkspaceAction = class InstallInWorkspaceAction extends McpServerA
         telemetryService,
         mcpService
     ) {
-        super("extensions.installWorkspace", ( localize(10724, "Install in Workspace")), InstallAction.CLASS, false);
+        super("extensions.installWorkspace", ( localize(11049, "Install in Workspace")), InstallAction.CLASS, false);
         this.open = open;
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.workspaceService = workspaceService;
@@ -322,7 +322,7 @@ let InstallInWorkspaceAction = class InstallInWorkspaceAction extends McpServerA
                 preserveFocus: true
             });
             alert(( localize(
-                10723,
+                11048,
                 "Installing MCP Server {0} started. An editor is now open with more details on this MCP Server",
                 this.mcpServer.label
             )));
@@ -347,7 +347,7 @@ let InstallInWorkspaceAction = class InstallInWorkspaceAction extends McpServerA
             options.push({
                 target: folder,
                 label: folder.name,
-                description: ( localize(10725, "Workspace Folder"))
+                description: ( localize(11050, "Workspace Folder"))
             });
         }
         if (this.workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
@@ -358,14 +358,14 @@ let InstallInWorkspaceAction = class InstallInWorkspaceAction extends McpServerA
             }
             options.push({
                 target: ConfigurationTarget.WORKSPACE,
-                label: ( localize(10726, "Workspace"))
+                label: ( localize(11051, "Workspace"))
             });
         }
         if (options.length === 1) {
             return options[0].target;
         }
         const targetPick = await this.quickInputService.pick(options, {
-            title: ( localize(10727, "Choose where to install the MCP server"))
+            title: ( localize(11052, "Choose where to install the MCP server"))
         });
         return targetPick?.target;
     }
@@ -389,7 +389,7 @@ let InstallInRemoteAction = class InstallInRemoteAction extends McpServerAction
         labelService,
         mcpService
     ) {
-        super("extensions.installRemote", ( localize(10728, "Install (Remote)")), InstallAction.CLASS, false);
+        super("extensions.installRemote", ( localize(11053, "Install (Remote)")), InstallAction.CLASS, false);
         this.open = open;
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.environmentService = environmentService;
@@ -397,7 +397,7 @@ let InstallInRemoteAction = class InstallInRemoteAction extends McpServerAction
         this.labelService = labelService;
         this.mcpService = mcpService;
         const remoteLabel = this.labelService.getHostLabel(Schemas.vscodeRemote, this.environmentService.remoteAuthority);
-        this.label = ( localize(10729, "Install in {0}", remoteLabel));
+        this.label = ( localize(11054, "Install in {0}", remoteLabel));
         this.update();
     }
     update() {
@@ -429,7 +429,7 @@ let InstallInRemoteAction = class InstallInRemoteAction extends McpServerAction
         if (this.open) {
             this.mcpWorkbenchService.open(this.mcpServer);
             alert(( localize(
-                10723,
+                11048,
                 "Installing MCP Server {0} started. An editor is now open with more details on this MCP Server",
                 this.mcpServer.label
             )));
@@ -448,7 +448,7 @@ let InstallInRemoteAction = class InstallInRemoteAction extends McpServerAction
 InstallInRemoteAction = InstallInRemoteAction_1 = ( __decorate([( __param(1, IMcpWorkbenchService)), ( __param(2, IWorkbenchEnvironmentService)), ( __param(3, ITelemetryService)), ( __param(4, ILabelService)), ( __param(5, IMcpService))], InstallInRemoteAction));
 class InstallingLabelAction extends McpServerAction {
     static {
-        this.LABEL = ( localize(10730, "Installing"));
+        this.LABEL = ( localize(11055, "Installing"));
     }
     static {
         this.CLASS = `${McpServerAction.LABEL_ACTION_CLASS} install installing`;
@@ -476,7 +476,7 @@ let UninstallAction = class UninstallAction extends McpServerAction {
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpWorkbenchService) {
-        super("extensions.uninstall", ( localize(10731, "Uninstall")), UninstallAction_1.CLASS, false);
+        super("extensions.uninstall", ( localize(11056, "Uninstall")), UninstallAction_1.CLASS, false);
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.update();
     }
@@ -495,7 +495,7 @@ let UninstallAction = class UninstallAction extends McpServerAction {
         }
         this.class = UninstallAction_1.CLASS;
         this.enabled = true;
-        this.label = ( localize(10731, "Uninstall"));
+        this.label = ( localize(11056, "Uninstall"));
     }
     async run() {
         if (!this.mcpServer) {
@@ -513,9 +513,9 @@ let EnableMcpServerGloballyAction = class EnableMcpServerGloballyAction extends
         this.ID = "mcpServer.enableGlobally";
     }
     constructor(mcpService) {
-        super(EnableMcpServerGloballyAction_1.ID, ( localize(10732, "Enable")), McpServerAction.LABEL_ACTION_CLASS);
+        super(EnableMcpServerGloballyAction_1.ID, ( localize(11057, "Enable")), McpServerAction.LABEL_ACTION_CLASS);
         this.mcpService = mcpService;
-        this.tooltip = ( localize(10733, "Enable this MCP server"));
+        this.tooltip = ( localize(11058, "Enable this MCP server"));
         this.update();
     }
     update() {
@@ -546,10 +546,10 @@ let EnableMcpServerForWorkspaceAction = class EnableMcpServerForWorkspaceAction
         this.ID = "mcpServer.enableForWorkspace";
     }
     constructor(mcpService, workspaceService) {
-        super(EnableMcpServerForWorkspaceAction_1.ID, ( localize(10734, "Enable (Workspace)")), McpServerAction.LABEL_ACTION_CLASS);
+        super(EnableMcpServerForWorkspaceAction_1.ID, ( localize(11059, "Enable (Workspace)")), McpServerAction.LABEL_ACTION_CLASS);
         this.mcpService = mcpService;
         this.workspaceService = workspaceService;
-        this.tooltip = ( localize(10735, "Enable this MCP server only in this workspace"));
+        this.tooltip = ( localize(11060, "Enable this MCP server only in this workspace"));
         this.update();
     }
     update() {
@@ -583,9 +583,9 @@ let DisableMcpServerGloballyAction = class DisableMcpServerGloballyAction extend
         this.ID = "mcpServer.disableGlobally";
     }
     constructor(mcpService) {
-        super(DisableMcpServerGloballyAction_1.ID, ( localize(10736, "Disable")), McpServerAction.LABEL_ACTION_CLASS);
+        super(DisableMcpServerGloballyAction_1.ID, ( localize(11061, "Disable")), McpServerAction.LABEL_ACTION_CLASS);
         this.mcpService = mcpService;
-        this.tooltip = ( localize(10737, "Disable this MCP server"));
+        this.tooltip = ( localize(11062, "Disable this MCP server"));
         this.update();
     }
     update() {
@@ -616,10 +616,10 @@ let DisableMcpServerForWorkspaceAction = class DisableMcpServerForWorkspaceActio
         this.ID = "mcpServer.disableForWorkspace";
     }
     constructor(mcpService, workspaceService) {
-        super(DisableMcpServerForWorkspaceAction_1.ID, ( localize(10738, "Disable (Workspace)")), McpServerAction.LABEL_ACTION_CLASS);
+        super(DisableMcpServerForWorkspaceAction_1.ID, ( localize(11063, "Disable (Workspace)")), McpServerAction.LABEL_ACTION_CLASS);
         this.mcpService = mcpService;
         this.workspaceService = workspaceService;
-        this.tooltip = ( localize(10739, "Disable this MCP server only in this workspace"));
+        this.tooltip = ( localize(11064, "Disable this MCP server only in this workspace"));
         this.update();
     }
     update() {
@@ -738,7 +738,7 @@ let ManageMcpServerAction = class ManageMcpServerAction extends DropDownAction {
     constructor(isEditorAction, instantiationService) {
         super(ManageMcpServerAction_1.ID, "", "", true, instantiationService);
         this.isEditorAction = isEditorAction;
-        this.tooltip = ( localize(10740, "Manage"));
+        this.tooltip = ( localize(11065, "Manage"));
         this.update();
     }
     async run() {
@@ -773,7 +773,7 @@ let StartServerAction = class StartServerAction extends McpServerAction {
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService) {
-        super("extensions.start", ( localize(10741, "Start Server")), StartServerAction_1.CLASS, false);
+        super("extensions.start", ( localize(11066, "Start Server")), StartServerAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.update();
     }
@@ -790,7 +790,7 @@ let StartServerAction = class StartServerAction extends McpServerAction {
         }
         this.class = StartServerAction_1.CLASS;
         this.enabled = true;
-        this.label = ( localize(10741, "Start Server"));
+        this.label = ( localize(11066, "Start Server"));
     }
     async run() {
         const server = this.getServer();
@@ -824,7 +824,7 @@ let StopServerAction = class StopServerAction extends McpServerAction {
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService) {
-        super("extensions.stop", ( localize(10742, "Stop Server")), StopServerAction_1.CLASS, false);
+        super("extensions.stop", ( localize(11067, "Stop Server")), StopServerAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.update();
     }
@@ -841,7 +841,7 @@ let StopServerAction = class StopServerAction extends McpServerAction {
         }
         this.class = StopServerAction_1.CLASS;
         this.enabled = true;
-        this.label = ( localize(10742, "Stop Server"));
+        this.label = ( localize(11067, "Stop Server"));
     }
     async run() {
         const server = this.getServer();
@@ -872,7 +872,7 @@ let RestartServerAction = class RestartServerAction extends McpServerAction {
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService) {
-        super("extensions.restart", ( localize(10743, "Restart Server")), RestartServerAction_1.CLASS, false);
+        super("extensions.restart", ( localize(11068, "Restart Server")), RestartServerAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.update();
     }
@@ -889,7 +889,7 @@ let RestartServerAction = class RestartServerAction extends McpServerAction {
         }
         this.class = RestartServerAction_1.CLASS;
         this.enabled = true;
-        this.label = ( localize(10743, "Restart Server"));
+        this.label = ( localize(11068, "Restart Server"));
     }
     async run() {
         const server = this.getServer();
@@ -924,13 +924,13 @@ let AuthServerAction = class AuthServerAction extends McpServerAction {
         this.HIDE = `${this.CLASS} hide`;
     }
     static {
-        this.SIGN_OUT = ( localize(10744, "Sign Out"));
+        this.SIGN_OUT = ( localize(11069, "Sign Out"));
     }
     static {
-        this.DISCONNECT = ( localize(10745, "Disconnect Account"));
+        this.DISCONNECT = ( localize(11070, "Disconnect Account"));
     }
     constructor(mcpService, _authenticationQueryService, _authenticationService) {
-        super("extensions.restart", ( localize(10743, "Restart Server")), RestartServerAction.CLASS, false);
+        super("extensions.restart", ( localize(11068, "Restart Server")), RestartServerAction.CLASS, false);
         this.mcpService = mcpService;
         this._authenticationQueryService = _authenticationQueryService;
         this._authenticationService = _authenticationService;
@@ -1026,7 +1026,7 @@ let ShowServerOutputAction = class ShowServerOutputAction extends McpServerActio
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService) {
-        super("extensions.output", ( localize(10746, "Show Output")), ShowServerOutputAction_1.CLASS, false);
+        super("extensions.output", ( localize(11071, "Show Output")), ShowServerOutputAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.update();
     }
@@ -1039,7 +1039,7 @@ let ShowServerOutputAction = class ShowServerOutputAction extends McpServerActio
         }
         this.class = ShowServerOutputAction_1.CLASS;
         this.enabled = true;
-        this.label = ( localize(10746, "Show Output"));
+        this.label = ( localize(11071, "Show Output"));
     }
     async run() {
         const server = this.getServer();
@@ -1070,7 +1070,7 @@ let ShowServerConfigurationAction = class ShowServerConfigurationAction extends
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpWorkbenchService) {
-        super("extensions.config", ( localize(10747, "Show Configuration")), ShowServerConfigurationAction_1.CLASS, false);
+        super("extensions.config", ( localize(11072, "Show Configuration")), ShowServerConfigurationAction_1.CLASS, false);
         this.mcpWorkbenchService = mcpWorkbenchService;
         this.update();
     }
@@ -1104,7 +1104,7 @@ let ShowServerJsonConfigurationAction = class ShowServerJsonConfigurationAction
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService, mcpRegistry, editorService) {
-        super("extensions.jsonConfig", ( localize(10748, "Show Configuration (JSON)")), ShowServerJsonConfigurationAction_1.CLASS, false);
+        super("extensions.jsonConfig", ( localize(11073, "Show Configuration (JSON)")), ShowServerJsonConfigurationAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.mcpRegistry = mcpRegistry;
         this.editorService = editorService;
@@ -1160,7 +1160,7 @@ let ConfigureModelAccessAction = class ConfigureModelAccessAction extends McpSer
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService, commandService) {
-        super("extensions.config", ( localize(10749, "Configure Model Access")), ConfigureModelAccessAction_1.CLASS, false);
+        super("extensions.config", ( localize(11074, "Configure Model Access")), ConfigureModelAccessAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.commandService = commandService;
         this.update();
@@ -1174,7 +1174,7 @@ let ConfigureModelAccessAction = class ConfigureModelAccessAction extends McpSer
         }
         this.class = ConfigureModelAccessAction_1.CLASS;
         this.enabled = true;
-        this.label = ( localize(10749, "Configure Model Access"));
+        this.label = ( localize(11074, "Configure Model Access"));
     }
     async run() {
         const server = this.getServer();
@@ -1205,7 +1205,7 @@ let ShowSamplingRequestsAction = class ShowSamplingRequestsAction extends McpSer
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService, samplingService, editorService) {
-        super("extensions.config", ( localize(10750, "Show Sampling Requests")), ShowSamplingRequestsAction_1.CLASS, false);
+        super("extensions.config", ( localize(11075, "Show Sampling Requests")), ShowSamplingRequestsAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.samplingService = samplingService;
         this.editorService = editorService;
@@ -1235,7 +1235,7 @@ let ShowSamplingRequestsAction = class ShowSamplingRequestsAction extends McpSer
         this.editorService.openEditor({
             resource: undefined,
             contents: this.samplingService.getLogText(server),
-            label: ( localize(10751, "MCP Sampling: {0}", server.definition.label))
+            label: ( localize(11076, "MCP Sampling: {0}", server.definition.label))
         });
     }
     getServer() {
@@ -1260,7 +1260,7 @@ let BrowseResourcesAction = class BrowseResourcesAction extends McpServerAction
         this.HIDE = `${this.CLASS} hide`;
     }
     constructor(mcpService, commandService) {
-        super("extensions.config", ( localize(10752, "Browse Resources")), BrowseResourcesAction_1.CLASS, false);
+        super("extensions.config", ( localize(11077, "Browse Resources")), BrowseResourcesAction_1.CLASS, false);
         this.mcpService = mcpService;
         this.commandService = commandService;
         this.update();

package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfiguration.d.ts CHANGED Viewed

@@ -18,6 +18,11 @@ export declare const discoverySourceSettingsLabel: Record<DiscoverySource, strin
 export declare const mcpConfigurationSection = "mcp";
 export declare const mcpDiscoverySection = "chat.mcp.discovery.enabled";
 export declare const mcpServerSamplingSection = "chat.mcp.serverSampling";
+export declare const mcpServerCollisionBehaviorSection = "chat.mcp.collisionBehavior";
+export declare enum McpCollisionBehavior {
+    Disable = "disable",
+    Suffix = "suffix"
+}
 export interface IMcpServerSamplingConfiguration {
     allowedDuringChat?: boolean;
     allowedOutsideChat?: boolean;

package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfiguration.js CHANGED Viewed

@@ -24,20 +24,26 @@ const allDiscoverySources = ( Object.keys({
     [DiscoverySource.CursorWorkspace]: true
 }));
 const discoverySourceLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(10824, "Claude Desktop")),
-    [DiscoverySource.Windsurf]: ( localize(10825, "Windsurf")),
-    [DiscoverySource.CursorGlobal]: ( localize(10826, "Cursor (Global)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(10827, "Cursor (Workspace)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(11151, "Claude Desktop")),
+    [DiscoverySource.Windsurf]: ( localize(11152, "Windsurf")),
+    [DiscoverySource.CursorGlobal]: ( localize(11153, "Cursor (Global)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(11154, "Cursor (Workspace)"))
 };
 const discoverySourceSettingsLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(10828, "Claude Desktop configuration (`claude_desktop_config.json`)")),
-    [DiscoverySource.Windsurf]: ( localize(10829, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
-    [DiscoverySource.CursorGlobal]: ( localize(10830, "Cursor global configuration (`~/.cursor/mcp.json`)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(10831, "Cursor workspace configuration (`.cursor/mcp.json`)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(11155, "Claude Desktop configuration (`claude_desktop_config.json`)")),
+    [DiscoverySource.Windsurf]: ( localize(11156, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
+    [DiscoverySource.CursorGlobal]: ( localize(11157, "Cursor global configuration (`~/.cursor/mcp.json`)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(11158, "Cursor workspace configuration (`.cursor/mcp.json`)"))
 };
 const mcpConfigurationSection = "mcp";
 const mcpDiscoverySection = "chat.mcp.discovery.enabled";
 const mcpServerSamplingSection = "chat.mcp.serverSampling";
+const mcpServerCollisionBehaviorSection = "chat.mcp.collisionBehavior";
+var McpCollisionBehavior;
+(function(McpCollisionBehavior) {
+    McpCollisionBehavior["Disable"] = "disable";
+    McpCollisionBehavior["Suffix"] = "suffix";
+})(McpCollisionBehavior || (McpCollisionBehavior = {}));
 const mcpSchemaExampleServers = {
     "mcp-server-time": {
         command: "python",
@@ -55,7 +61,7 @@ const mcpDevModeProps = stdio => ({
     dev: {
         type: "object",
         markdownDescription: ( localize(
-            10832,
+            11159,
             "Enabled development mode for the server. When present, the server will be started eagerly and output will be included in its output. Properties inside the `dev` object can configure additional behavior."
         )),
         examples: [{
@@ -67,7 +73,7 @@ const mcpDevModeProps = stdio => ({
         properties: {
             watch: {
                 description: ( localize(
-                    10833,
+                    11160,
                     "A glob pattern or list of glob patterns relative to the workspace folder to watch. The MCP server will be restarted when these files change."
                 )),
                 examples: ["src/**/*.ts"],
@@ -83,7 +89,7 @@ const mcpDevModeProps = stdio => ({
             ...(stdio && {
                 debug: {
                     markdownDescription: ( localize(
-                        10834,
+                        11161,
                         "If set, debugs the MCP server using the given runtime as it's started."
                     )),
                     oneOf: [{
@@ -93,7 +99,7 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["node"],
-                                description: ( localize(10835, "Debug the MCP server using Node.js."))
+                                description: ( localize(11162, "Debug the MCP server using Node.js."))
                             }
                         },
                         additionalProperties: false
@@ -104,11 +110,11 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["debugpy"],
-                                description: ( localize(10836, "Debug the MCP server using Python and debugpy."))
+                                description: ( localize(11163, "Debug the MCP server using Python and debugpy."))
                             },
                             debugpyPath: {
                                 type: "string",
-                                description: ( localize(10837, "Path to the debugpy executable."))
+                                description: ( localize(11164, "Path to the debugpy executable."))
                             }
                         },
                         additionalProperties: false
@@ -126,39 +132,39 @@ const mcpStdioServerSchema = {
         type: {
             type: "string",
             enum: ["stdio"],
-            description: ( localize(10838, "The type of the server."))
+            description: ( localize(11165, "The type of the server."))
         },
         sandboxEnabled: {
             type: "boolean",
             default: false,
-            description: ( localize(10839, "Whether to run the server in a sandboxed environment."))
+            description: ( localize(11166, "Whether to run the server in a sandboxed environment."))
         },
         command: {
             type: "string",
-            description: ( localize(10840, "The command to run the server."))
+            description: ( localize(11167, "The command to run the server."))
         },
         cwd: {
             type: "string",
             description: ( localize(
-                10841,
+                11168,
                 "The working directory for the server command. Defaults to the workspace folder when run in a workspace."
             )),
             examples: ["${workspaceFolder}"]
         },
         args: {
             type: "array",
-            description: ( localize(10842, "Arguments passed to the server.")),
+            description: ( localize(11169, "Arguments passed to the server.")),
             items: {
                 type: "string"
             }
         },
         envFile: {
             type: "string",
-            description: ( localize(10843, "Path to a file containing environment variables for the server.")),
+            description: ( localize(11170, "Path to a file containing environment variables for the server.")),
             examples: ["${workspaceFolder}/.env"]
         },
         env: {
-            description: ( localize(10844, "Environment variables passed to the server.")),
+            description: ( localize(11171, "Environment variables passed to the server.")),
             additionalProperties: {
                 anyOf: [{
                     type: "null"
@@ -175,27 +181,27 @@ const mcpStdioServerSchema = {
 const mcpServerSchema = {
     id: mcpSchemaId,
     type: "object",
-    title: ( localize(10845, "Model Context Protocol Servers")),
+    title: ( localize(11172, "Model Context Protocol Servers")),
     allowTrailingCommas: true,
     allowComments: true,
     additionalProperties: false,
     properties: {
         sandbox: {
             description: ( localize(
-                10846,
+                11173,
                 "Sandbox config that determines file system and network access. Sandboxing is enabled when sandboxEnabled property is set at the server level on Mac OS and Linux only."
             )),
             type: "object",
             additionalProperties: false,
             properties: {
                 network: {
-                    description: ( localize(10847, "Network access settings for the sandboxed server.")),
+                    description: ( localize(11174, "Network access settings for the sandboxed server.")),
                     type: "object",
                     additionalProperties: false,
                     properties: {
                         allowedDomains: {
                             description: ( localize(
-                                10848,
+                                11175,
                                 "List of domains that the server is allowed to access. Wildcards are supported, e.g. `*.example.com`."
                             )),
                             type: "array",
@@ -206,7 +212,7 @@ const mcpServerSchema = {
                         },
                         deniedDomains: {
                             description: ( localize(
-                                10849,
+                                11176,
                                 "List of domains that the server is not allowed to access. e.g. `invalid.example.com`."
                             )),
                             type: "array",
@@ -219,7 +225,7 @@ const mcpServerSchema = {
                 },
                 filesystem: {
                     description: ( localize(
-                        10850,
+                        11177,
                         "Filesystem access settings for the sandboxed server. Glob patterns are supported for Mac OS only."
                     )),
                     type: "object",
@@ -227,7 +233,7 @@ const mcpServerSchema = {
                     properties: {
                         denyRead: {
                             description: ( localize(
-                                10851,
+                                11178,
                                 "List of file paths that the server is not allowed to read. By default, all files are allowed to be read. e.g. `~/src/secrets`."
                             )),
                             type: "array",
@@ -238,7 +244,7 @@ const mcpServerSchema = {
                         },
                         allowWrite: {
                             description: ( localize(
-                                10852,
+                                11179,
                                 "List of file paths that the server is allowed to write to. e.g. `~/src/`."
                             )),
                             type: "array",
@@ -249,7 +255,7 @@ const mcpServerSchema = {
                         },
                         denyWrite: {
                             description: ( localize(
-                                10853,
+                                11180,
                                 "List of file paths that the server is not allowed to write to. e.g. `~/src/auth/`."
                             )),
                             type: "array",
@@ -274,32 +280,32 @@ const mcpServerSchema = {
                         type: {
                             type: "string",
                             enum: ["http", "sse"],
-                            description: ( localize(10838, "The type of the server."))
+                            description: ( localize(11165, "The type of the server."))
                         },
                         url: {
                             type: "string",
                             format: "uri",
                             pattern: "^https?:\\/\\/.+",
-                            patternErrorMessage: ( localize(10854, "The URL must start with 'http://' or 'https://'.")),
-                            description: ( localize(10855, "The URL of the Streamable HTTP or SSE endpoint."))
+                            patternErrorMessage: ( localize(11181, "The URL must start with 'http://' or 'https://'.")),
+                            description: ( localize(11182, "The URL of the Streamable HTTP or SSE endpoint."))
                         },
                         headers: {
                             type: "object",
-                            description: ( localize(10856, "Additional headers sent to the server.")),
+                            description: ( localize(11183, "Additional headers sent to the server.")),
                             additionalProperties: {
                                 type: "string"
                             }
                         },
                         oauth: {
                             type: "object",
-                            description: ( localize(10857, "OAuth configuration for authenticating with the server.")),
+                            description: ( localize(11184, "OAuth configuration for authenticating with the server.")),
                             additionalProperties: false,
                             minProperties: 1,
                             properties: {
                                 clientId: {
                                     type: "string",
                                     minLength: 1,
-                                    description: ( localize(10858, "The OAuth client ID to use when authenticating with the server."))
+                                    description: ( localize(11185, "The OAuth client ID to use when authenticating with the server."))
                                 }
                             }
                         },
@@ -322,7 +328,7 @@ const mcpContributionPoint = {
     },
     jsonSchema: {
         description: ( localize(
-            10859,
+            11186,
             "Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpServerDefinitionProvider`."
         )),
         type: "array",
@@ -343,15 +349,15 @@ const mcpContributionPoint = {
             }],
             properties: {
                 id: {
-                    description: ( localize(10860, "Unique ID for the collection.")),
+                    description: ( localize(11187, "Unique ID for the collection.")),
                     type: "string"
                 },
                 label: {
-                    description: ( localize(10861, "Display name for the collection.")),
+                    description: ( localize(11188, "Display name for the collection.")),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(10862, "Condition which must be true to enable this collection.")),
+                    description: ( localize(11189, "Condition which must be true to enable this collection.")),
                     type: "string"
                 }
             }
@@ -368,7 +374,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
     }
     render(manifest) {
         const mcpServerDefinitionProviders = manifest.contributes?.mcpServerDefinitionProviders ?? [];
-        const headers = [( localize(10863, "ID")), ( localize(10864, "Name"))];
+        const headers = [( localize(11190, "ID")), ( localize(11191, "Name"))];
         const rows = ( mcpServerDefinitionProviders.map(mcpServerDefinitionProvider => {
             return [( new MarkdownString()).appendMarkdown(`\`${mcpServerDefinitionProvider.id}\``), mcpServerDefinitionProvider.label];
         }));
@@ -383,11 +389,11 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: mcpConfigurationSection,
-    label: ( localize(10865, "MCP Servers")),
+    label: ( localize(11192, "MCP Servers")),
     access: {
         canToggle: false
     },
     renderer: ( new SyncDescriptor(McpServerDefinitionsProviderRenderer))
 });
-export { DiscoverySource, allDiscoverySources, discoverySourceLabel, discoverySourceSettingsLabel, mcpActivationEvent, mcpConfigurationSection, mcpContributionPoint, mcpDiscoverySection, mcpSchemaExampleServers, mcpServerSamplingSection, mcpServerSchema, mcpStdioServerSchema };
+export { DiscoverySource, McpCollisionBehavior, allDiscoverySources, discoverySourceLabel, discoverySourceSettingsLabel, mcpActivationEvent, mcpConfigurationSection, mcpContributionPoint, mcpDiscoverySection, mcpSchemaExampleServers, mcpServerCollisionBehaviorSection, mcpServerSamplingSection, mcpServerSchema, mcpStdioServerSchema };