@codingame/monaco-vscode-api 28.4.1 → 29.0.0

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

@@ -1,11 +1,23 @@
+import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
+/**
+ * A single server entry exposed by the gateway at the workbench layer.
+ */
+export interface IMcpGatewayResultServer {
+    readonly label: string;
+    readonly address: URI;
+}
 /**
  * Result of creating an MCP gateway, which is itself disposable.
  */
 export interface IMcpGatewayResult extends IDisposable {
     /**
-     * The address of the HTTP endpoint for this gateway.
+     * The servers currently exposed by this gateway.
      */
-    readonly address: URI;
+    readonly servers: readonly IMcpGatewayResultServer[];
+    /**
+     * Event that fires when the set of servers changes.
+     */
+    readonly onDidChangeServers: Event<readonly IMcpGatewayResultServer[]>;
 }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpServer.d.ts

@@ -24,6 +24,7 @@ import { McpServerRequestHandler } from "@codingame/monaco-vscode-mcp-service-ov
 import { IMcpIcons, IMcpPotentialSandboxBlock, IMcpPrompt, IMcpResource, IMcpResourceTemplate, IMcpServer, IMcpServerConnection, IMcpServerStartOpts, IMcpTool, IMcpToolCallContext, McpCapability, McpCollectionDefinition, McpCollectionReference, McpConnectionState, McpDefinitionReference, McpServerCacheState, McpServerDefinition, McpToolVisibility } from "./mcpTypes.js";
 import { IMcpElicitationService } from "./mcpTypes.service.js";
 import { IMcpSamplingService } from "./mcpTypes.service.js";
+import { ContributionEnablementState, IEnablementModel } from "../../chat/common/enablement.js";
 import { MCP } from "./modelContextProtocol.js";
 export type McpServerInstallData = {
     serverName: string;
@@ -179,7 +180,8 @@ export declare class McpServer extends Disposable implements IMcpServer {
     private _potentialSandboxBlockListener;
     /** Count of running tool calls, used to detect if sampling is during an LM call */
     runningToolCalls: Set<IMcpToolCallContext>;
-    constructor(initialCollection: McpCollectionDefinition, definition: McpDefinitionReference, explicitRoots: URI[] | undefined, _requiresExtensionActivation: boolean | undefined, _primitiveCache: McpServerMetadataCache, toolPrefix: string, _mcpRegistry: IMcpRegistry, workspacesService: IWorkspaceContextService, _extensionService: IExtensionService, _loggerService: ILoggerService, _outputService: IOutputService, _telemetryService: ITelemetryService, _commandService: ICommandService, _instantiationService: IInstantiationService, _dialogService: IDialogService, _notificationService: INotificationService, _openerService: IOpenerService, _samplingService: IMcpSamplingService, _elicitationService: IMcpElicitationService, _mcpSandboxService: IMcpSandboxService, environmentService: IWorkbenchEnvironmentService);
+    readonly enablement: IObservable<ContributionEnablementState>;
+    constructor(initialCollection: McpCollectionDefinition, definition: McpDefinitionReference, explicitRoots: URI[] | undefined, _requiresExtensionActivation: boolean | undefined, _primitiveCache: McpServerMetadataCache, toolPrefix: string, enablementModel: IEnablementModel, _mcpRegistry: IMcpRegistry, workspacesService: IWorkspaceContextService, _extensionService: IExtensionService, _loggerService: ILoggerService, _outputService: IOutputService, _telemetryService: ITelemetryService, _commandService: ICommandService, _instantiationService: IInstantiationService, _dialogService: IDialogService, _notificationService: INotificationService, _openerService: IOpenerService, _samplingService: IMcpSamplingService, _elicitationService: IMcpElicitationService, _mcpSandboxService: IMcpSandboxService, environmentService: IWorkbenchEnvironmentService);
     readDefinitions(): IObservable<{
         server: McpServerDefinition | undefined;
         collection: McpCollectionDefinition | undefined;

package/vscode/src/vs/workbench/contrib/mcp/common/mcpServer.js

@@ -41,12 +41,12 @@ import { McpConnectionState, McpConnectionFailedError, McpServerCacheState, McpS
 import { IMcpSamplingService, IMcpElicitationService } from './mcpTypes.service.js';
 import { MCP } from '../../../../platform/mcp/common/modelContextProtocol.js';
 import { UriTemplate } from './uriTemplate.js';
-import Severity$1 from '../../../../base/common/severity.js';
 import { observableValue, disposableObservableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
 import { autorun, autorunSelfDisposable } from '../../../../base/common/observableInternal/reactions/autorun.js';
 import { ObservablePromise } from '../../../../base/common/observableInternal/utils/promise.js';
+import Severity$1 from '../../../../base/common/severity.js';
 import { transaction } from '../../../../base/common/observableInternal/transaction.js';
 
 var McpServer_1;
@@ -210,6 +210,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         _requiresExtensionActivation,
         _primitiveCache,
         toolPrefix,
+        enablementModel,
         _mcpRegistry,
         workspacesService,
         _extensionService,
@@ -284,6 +285,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         this.runningToolCalls = ( new Set());
         this.collection = initialCollection;
         this._fullDefinitions = this._mcpRegistry.getServerDefinition(this.collection, this.definition);
+        this.enablement = derived(r => enablementModel.readEnabled(definition.id, r));
         this._loggerId = `mcpServer.${definition.id}`;
         this._logger = this._register(_loggerService.createLogger(this._loggerId, {
             hidden: true,
@@ -536,7 +538,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         if (cnx.definition.sandboxEnabled) {
             if (!this.showSandboxConfigSuggestionFromPotentialBlocks(cnx, this._potentialSandboxBlocks)) {
                 this._notificationService.warn(( localize(
-                    10455,
+                    10705,
                     "The MCP server {0} could not be started: {1}",
                     cnx.definition.label,
                     error.message
@@ -561,36 +563,36 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 break;
             }
             const options = [{
-                label: ( localize(10456, "Show Output")),
+                label: ( localize(10706, "Show Output")),
                 run: () => this.showOutput()
             }];
             if (cnx.definition.devMode?.debug?.type === "debugpy" && debug) {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    10457,
+                    10707,
                     "The command \"{0}\" was not found. You can specify the path to debugpy in the `dev.debug.debugpyPath` option.",
                     cnx.launchDefinition.command,
                     cnx.definition.label
                 )), [...options, {
-                    label: ( localize(10458, "View Docs")),
+                    label: ( localize(10708, "View Docs")),
                     run: () => this._openerService.open(( URI.parse("https://aka.ms/vscode-mcp-install/debugpy")))
                 }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(10459, "Install {0}", cnx.launchDefinition.command)),
+                    label: ( localize(10709, "Install {0}", cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink)))
                 });
             }
             this._notificationService.prompt(Severity$1.Error, ( localize(
-                10460,
+                10710,
                 "The command \"{0}\" needed to run {1} was not found.",
                 cnx.launchDefinition.command,
                 cnx.definition.label
             )), options);
         } else {
             this._notificationService.warn(( localize(
-                10455,
+                10705,
                 "The MCP server {0} could not be started: {1}",
                 cnx.definition.label,
                 error.message
@@ -620,20 +622,20 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         void this._dialogService.confirm({
             type: "warning",
             message: ( localize(
-                10461,
+                10711,
                 "Update sandbox configuration in mcp.json for {0}?",
                 cnx.definition.label
             )),
             detail: suggestion.message,
-            primaryButton: ( localize(10462, "Yes")),
-            cancelButton: ( localize(10463, "No"))
+            primaryButton: ( localize(10712, "Yes")),
+            cancelButton: ( localize(10713, "No"))
         }).then(async result => {
             if (!result.confirmed) {
                 return;
             }
             if (!mcpResource || configTarget === undefined) {
                 this._notificationService.warn(( localize(
-                    10464,
+                    10714,
                     "Couldn't determine where to update sandbox configuration for {0}.",
                     cnx.definition.label
                 )));
@@ -650,14 +652,14 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 if (updated) {
                     this._removePotentialSandboxBlocks(potentialBlocks);
                     this._notificationService.info(( localize(
-                        10465,
+                        10715,
                         "Updated sandbox configuration for {0} in mcp.json. Restart server.",
                         cnx.definition.label
                     )));
                 }
             } catch (e) {
                 this._notificationService.error(( localize(
-                    10466,
+                    10716,
                     "Failed to update sandbox configuration for {0}: {1}",
                     cnx.definition.label,
                     e instanceof Error ? e.message : String(e)
@@ -766,7 +768,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ("error" in result) {
-                error += ( localize(10467, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
+                error += ( localize(10717, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -896,7 +898,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         });
     }
 };
-McpServer = McpServer_1 = ( __decorate([( __param(6, IMcpRegistry)), ( __param(7, IWorkspaceContextService)), ( __param(8, IExtensionService)), ( __param(9, ILoggerService)), ( __param(10, IOutputService)), ( __param(11, ITelemetryService)), ( __param(12, ICommandService)), ( __param(13, IInstantiationService)), ( __param(14, IDialogService)), ( __param(15, INotificationService)), ( __param(16, IOpenerService)), ( __param(17, IMcpSamplingService)), ( __param(18, IMcpElicitationService)), ( __param(19, IMcpSandboxService)), ( __param(20, IWorkbenchEnvironmentService))], McpServer));
+McpServer = McpServer_1 = ( __decorate([( __param(7, IMcpRegistry)), ( __param(8, IWorkspaceContextService)), ( __param(9, IExtensionService)), ( __param(10, ILoggerService)), ( __param(11, IOutputService)), ( __param(12, ITelemetryService)), ( __param(13, ICommandService)), ( __param(14, IInstantiationService)), ( __param(15, IDialogService)), ( __param(16, INotificationService)), ( __param(17, IOpenerService)), ( __param(18, IMcpSamplingService)), ( __param(19, IMcpElicitationService)), ( __param(20, IMcpSandboxService)), ( __param(21, IWorkbenchEnvironmentService))], McpServer));
 class McpPrompt {
     constructor(_server, _definition) {
         this._server = _server;
@@ -1093,7 +1095,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity$1.Warning,
             message: ( localize(
-                10468,
+                10718,
                 "MCP server `{0}` has tools with invalid parameters which will be omitted.",
                 serverName
             )),
@@ -1103,7 +1105,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                     enabled: true,
                     id: "mcpBadSchema.show",
                     tooltip: "",
-                    label: ( localize(10469, "Show")),
+                    label: ( localize(10719, "Show")),
                     run: () => {
                         editorService.openEditor({
                             resource: undefined,

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.d.ts

@@ -10,11 +10,12 @@ import { ConfigurationTarget } from "../../../../platform/configuration/common/c
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IEditorOptions } from "../../../../platform/editor/common/editor.js";
 import { ExtensionIdentifier } from "../../../../platform/extensions/common/extensions.js";
-import { IGalleryMcpServer, IInstallableMcpServer, IGalleryMcpServerConfiguration } from "../../../../platform/mcp/common/mcpManagement.js";
+import { IGalleryMcpServer, IGalleryMcpServerConfiguration, IInstallableMcpServer } from "../../../../platform/mcp/common/mcpManagement.js";
 import { IMcpDevModeConfig, IMcpSandboxConfiguration, IMcpServerConfiguration } from "../../../../platform/mcp/common/mcpPlatformTypes.js";
 import { StorageScope } from "../../../../platform/storage/common/storage.js";
 import { IWorkspaceFolder, IWorkspaceFolderData } from "../../../../platform/workspace/common/workspace.js";
 import { IWorkbenchLocalMcpServer } from "../../../services/mcp/common/mcpWorkbenchManagementService.js";
+import { ContributionEnablementState } from "../../chat/common/enablement.js";
 import { ToolProgress } from "../../chat/common/tools/languageModelToolsService.js";
 import { McpServerRequestHandler } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/mcpServerRequestHandler";
 import { IMcpWorkbenchService } from "./mcpTypes.service.js";
@@ -233,6 +234,7 @@ export declare namespace McpServerTrust {
 export interface IMcpServer extends IDisposable {
     readonly collection: McpCollectionReference;
     readonly definition: McpDefinitionReference;
+    readonly enablement: IObservable<ContributionEnablementState>;
     readonly connection: IObservable<IMcpServerConnection | undefined>;
     readonly connectionState: IObservable<McpConnectionState>;
     readonly serverMetadata: IObservable<{
@@ -550,7 +552,9 @@ export interface IMcpServerEditorOptions extends IEditorOptions {
 export declare enum McpServerEnablementState {
     Disabled = 0,
     DisabledByAccess = 1,
-    Enabled = 2
+    DisabledProfile = 2,
+    DisabledWorkspace = 3,
+    Enabled = 4
 }
 export declare enum McpServerInstallState {
     Installing = 0,

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.js

@@ -182,13 +182,13 @@ var McpConnectionState;
     McpConnectionState.toString = s => {
         switch (s.state) {
         case Kind.Stopped:
-            return localize(10473, "Stopped");
+            return localize(10723, "Stopped");
         case Kind.Starting:
-            return localize(10474, "Starting");
+            return localize(10724, "Starting");
         case Kind.Running:
-            return localize(10475, "Running");
+            return localize(10725, "Running");
         case Kind.Error:
-            return localize(10476, "Error {0}", s.message);
+            return localize(10726, "Error {0}", s.message);
         default:
             assertNever();
         }
@@ -234,7 +234,9 @@ var McpServerEnablementState;
 (function(McpServerEnablementState) {
     McpServerEnablementState[McpServerEnablementState["Disabled"] = 0] = "Disabled";
     McpServerEnablementState[McpServerEnablementState["DisabledByAccess"] = 1] = "DisabledByAccess";
-    McpServerEnablementState[McpServerEnablementState["Enabled"] = 2] = "Enabled";
+    McpServerEnablementState[McpServerEnablementState["DisabledProfile"] = 2] = "DisabledProfile";
+    McpServerEnablementState[McpServerEnablementState["DisabledWorkspace"] = 3] = "DisabledWorkspace";
+    McpServerEnablementState[McpServerEnablementState["Enabled"] = 4] = "Enabled";
 })(McpServerEnablementState || (McpServerEnablementState = {}));
 var McpServerInstallState;
 (function(McpServerInstallState) {

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.service.d.ts

@@ -6,6 +6,7 @@ import { IIterativePager } from "../../../../base/common/paging.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IQueryOptions } from "../../../../platform/mcp/common/mcpManagement.js";
 import { IWorkbenchLocalMcpServer, IWorkbencMcpServerInstallOptions } from "../../../services/mcp/common/mcpWorkbenchManagementService.js";
+import { IEnablementModel } from "../../chat/common/enablement.js";
 import { IMcpServerSamplingConfiguration } from "./mcpConfiguration.js";
 import { IMcpServer, LazyCollectionState, McpCollectionDefinition, IAutostartResult, type IMcpConfigPath, type IMcpServerEditorOptions, type IWorkbenchMcpServer, type ISamplingOptions, type ISamplingResult, type ElicitResult, type IMcpToolCallContext } from "./mcpTypes.js";
 import { MCP } from "./modelContextProtocol.js";
@@ -13,6 +14,8 @@ export declare const IMcpService: import("../../../../platform/instantiation/com
 export interface IMcpService {
     _serviceBrand: undefined;
     readonly servers: IObservable<readonly IMcpServer[]>;
+    /** The enablement model for MCP servers. */
+    readonly enablementModel: IEnablementModel;
     /** Resets the cached tools. */
     resetCaches(): void;
     /** Resets trusted MCP servers. */

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -106,7 +106,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return localize(10522, "Merging: {0}", super.getName());
+        return localize(10772, "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {
@@ -190,13 +190,13 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([( __param(4, IInstantiatio
 function alertFocusedEditor(editor) {
     switch (editor) {
     case "input1":
-        alert(( localize(10523, "Incoming, Left Input")));
+        alert(( localize(10773, "Incoming, Left Input")));
         break;
     case "input2":
-        alert(( localize(10524, "Current, Right Input")));
+        alert(( localize(10774, "Current, Right Input")));
         break;
     case "result":
-        alert(( localize(10525, "Merge Result")));
+        alert(( localize(10775, "Merge Result")));
         break;
     }
 }

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -134,32 +134,32 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany ? ( localize(
-                10526,
+                10776,
                 "Do you want keep the merge result of {0} files?",
                 inputModels.length
             )) : ( localize(
-                10527,
+                10777,
                 "Do you want keep the merge result of {0}?",
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
             const hasUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
             const buttons = [{
-                label: hasUnhandledConflicts ? ( localize(10528, "&&Save With Conflicts")) : ( localize(10529, "&&Save")),
+                label: hasUnhandledConflicts ? ( localize(10778, "&&Save With Conflicts")) : ( localize(10779, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(10530, "Do&&n't Save")),
+                label: ( localize(10780, "Do&&n't Save")),
                 run: () => ConfirmResult.DONT_SAVE
             }];
             choice = (await this.dialogService.prompt({
                 type: Severity$1.Info,
                 message,
                 detail: hasUnhandledConflicts ? isMany ? ( localize(
-                    10531,
+                    10781,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 )) : ( localize(
-                    10532,
+                    10782,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                )) : isMany ? ( localize(10533, "The merge results will be lost if you don't save them.")) : ( localize(10534, "The merge result will be lost if you don't save it.")),
+                )) : isMany ? ( localize(10783, "The merge results will be lost if you don't save them.")) : ( localize(10784, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -184,12 +184,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const {
                 confirmed
             } = await this.dialogService.confirm({
-                message: ( localize(10535, "Do you want to accept the merge result?")),
+                message: ( localize(10785, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10536,
+                    10786,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10537, "&&Accept Merge"))
+                primaryButton: ( localize(10787, "&&Accept Merge"))
             });
             if (confirmed) {
                 await this.accept();
@@ -221,7 +221,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._languageService = _languageService;
     }
     static {
-        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(10538, "Before Resolving Conflicts In Merge Editor")));
+        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(10788, "Before Resolving Conflicts In Merge Editor")));
     }
     async createInputModel(args) {
         const store = ( new DisposableStore());
@@ -356,11 +356,11 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
         if (someDirty) {
             const message = isMany ? ( localize(
-                10539,
+                10789,
                 "Do you want to save the changes you made to {0} files?",
                 inputModels.length
             )) : ( localize(
-                10540,
+                10790,
                 "Do you want to save the changes you made to {0}?",
                 basename(inputModels[0].resultUri)
             ));
@@ -370,17 +370,17 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 type: Severity$1.Info,
                 message,
                 detail: someUnhandledConflicts ? isMany ? ( localize(
-                    10541,
+                    10791,
                     "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                 )) : ( localize(
-                    10542,
+                    10792,
                     "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                )) : isMany ? ( localize(10543, "Your changes will be lost if you don't save them.")) : ( localize(10544, "Your changes will be lost if you don't save them.")),
+                )) : isMany ? ( localize(10793, "Your changes will be lost if you don't save them.")) : ( localize(10794, "Your changes will be lost if you don't save them.")),
                 buttons: [{
-                    label: someUnhandledConflicts ? ( localize(10545, "&&Save with Conflicts")) : ( localize(10546, "&&Save")),
+                    label: someUnhandledConflicts ? ( localize(10795, "&&Save with Conflicts")) : ( localize(10796, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 }, {
-                    label: ( localize(10547, "Do&&n't Save")),
+                    label: ( localize(10797, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }],
                 cancelButton: {
@@ -393,15 +393,15 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 confirmed,
                 checkboxChecked
             } = await this._dialogService.confirm({
-                message: isMany ? ( localize(10548, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
-                    10549,
+                message: isMany ? ( localize(10798, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
+                    10799,
                     "Do you want to close the merge editor for {0}?",
                     basename(inputModels[0].resultUri)
                 )),
-                detail: someUnhandledConflicts ? isMany ? ( localize(10550, "The files contain unhandled conflicts.")) : ( localize(10551, "The file contains unhandled conflicts.")) : undefined,
-                primaryButton: someUnhandledConflicts ? ( localize(10552, "&&Close with Conflicts")) : ( localize(10553, "&&Close")),
+                detail: someUnhandledConflicts ? isMany ? ( localize(10800, "The files contain unhandled conflicts.")) : ( localize(10801, "The file contains unhandled conflicts.")) : undefined,
+                primaryButton: someUnhandledConflicts ? ( localize(10802, "&&Close with Conflicts")) : ( localize(10803, "&&Close")),
                 checkbox: {
-                    label: ( localize(10554, "Do not ask me again"))
+                    label: ( localize(10804, "Do not ask me again"))
                 }
             });
             if (checkboxChecked) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -14,9 +14,9 @@ import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapp
 import { TextModelDiffs, TextModelDiffState, TextModelDiffChangeReason } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from './modifiedBaseRange.js';
+import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { keepObserved } from '../../../../../base/common/observableInternal/utils/utils.js';
 import { waitForState } from '../../../../../base/common/observableInternal/utils/utilsCancellation.js';
-import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 import { transaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
@@ -403,7 +403,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: "setInputHandled",
-            label: ( localize(10555, "Set Input Handled")),
+            label: ( localize(10805, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -628,7 +628,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = "undoMarkAsHandled";
-        this.label = ( localize(10556, "Undo Mark As Handled"));
+        this.label = ( localize(10806, "Undo Mark As Handled"));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -4,35 +4,35 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 
 const ctxIsMergeEditor = ( new RawContextKey("isMergeEditor", false, {
     type: "boolean",
-    description: ( localize(10608, "The editor is a merge editor"))
+    description: ( localize(10858, "The editor is a merge editor"))
 }));
 const ctxIsMergeResultEditor = ( new RawContextKey("isMergeResultEditor", false, {
     type: "boolean",
-    description: ( localize(10609, "The editor is a the result editor of a merge editor."))
+    description: ( localize(10859, "The editor is a the result editor of a merge editor."))
 }));
 const ctxMergeEditorLayout = ( new RawContextKey("mergeEditorLayout", "mixed", {
     type: "string",
-    description: ( localize(10610, "The layout mode of a merge editor"))
+    description: ( localize(10860, "The layout mode of a merge editor"))
 }));
 const ctxMergeEditorShowBase = ( new RawContextKey("mergeEditorShowBase", false, {
     type: "boolean",
-    description: ( localize(10611, "If the merge editor shows the base version"))
+    description: ( localize(10861, "If the merge editor shows the base version"))
 }));
 const ctxMergeEditorShowBaseAtTop = ( new RawContextKey("mergeEditorShowBaseAtTop", false, {
     type: "boolean",
-    description: ( localize(10612, "If base should be shown at the top"))
+    description: ( localize(10862, "If base should be shown at the top"))
 }));
 const ctxMergeEditorShowNonConflictingChanges = ( new RawContextKey("mergeEditorShowNonConflictingChanges", false, {
     type: "boolean",
-    description: ( localize(10613, "If the merge editor shows non-conflicting changes"))
+    description: ( localize(10863, "If the merge editor shows non-conflicting changes"))
 }));
 const ctxMergeBaseUri = ( new RawContextKey("mergeEditorBaseUri", "", {
     type: "string",
-    description: ( localize(10614, "The uri of the baser of a merge editor"))
+    description: ( localize(10864, "The uri of the baser of a merge editor"))
 }));
 const ctxMergeResultUri = ( new RawContextKey("mergeEditorResultUri", "", {
     type: "string",
-    description: ( localize(10615, "The uri of the result of a merge editor"))
+    description: ( localize(10865, "The uri of the result of a merge editor"))
 }));
 const StorageCloseWithConflicts = "mergeEditorCloseWithConflicts";
 

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

@@ -20,7 +20,7 @@ registerAction2(class ConfigureMeteredConnectionAction extends Action2 {
     constructor() {
         super({
             id: ConfigureMeteredConnectionAction.ID,
-            title: ( localize2(10616, "Configure Metered Connection")),
+            title: ( localize2(10866, "Configure Metered Connection")),
             f1: true
         });
     }
@@ -30,22 +30,22 @@ registerAction2(class ConfigureMeteredConnectionAction extends Action2 {
         const currentValue = configurationService.getValue(METERED_CONNECTION_SETTING_KEY);
         const picks = [{
             value: "auto",
-            label: ( localize(10617, "Auto")),
-            description: ( localize(10618, "Detect metered connections automatically")),
+            label: ( localize(10867, "Auto")),
+            description: ( localize(10868, "Detect metered connections automatically")),
             picked: currentValue === "auto"
         }, {
             value: "on",
-            label: ( localize(10619, "On")),
-            description: ( localize(10620, "Always treat the connection as metered")),
+            label: ( localize(10869, "On")),
+            description: ( localize(10870, "Always treat the connection as metered")),
             picked: currentValue === "on"
         }, {
             value: "off",
-            label: ( localize(10621, "Off")),
-            description: ( localize(10622, "Never treat the connection as metered")),
+            label: ( localize(10871, "Off")),
+            description: ( localize(10872, "Never treat the connection as metered")),
             picked: currentValue === "off"
         }];
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(10623, "Select Metered Connection Mode")),
+            placeHolder: ( localize(10873, "Select Metered Connection Mode")),
             activeItem: picks.find(p => p.picked)
         });
         if (pick) {

package/vscode/src/vs/workbench/contrib/meteredConnection/browser/meteredConnectionStatus.js

@@ -42,16 +42,16 @@ let MeteredConnectionStatusContribution = class MeteredConnectionStatusContribut
     }
     getStatusBarEntry() {
         return {
-            name: ( localize(10624, "Metered Connection")),
+            name: ( localize(10874, "Metered Connection")),
             text: "$(radio-tower)",
-            ariaLabel: ( localize(10625, "Metered Connection Enabled")),
+            ariaLabel: ( localize(10875, "Metered Connection Enabled")),
             tooltip: ( localize(
-                10626,
+                10876,
                 "Metered connection enabled. Some automatic features like extension updates, Settings Sync, and automatic Git operations are paused to reduce data usage."
             )),
             command: {
                 id: "workbench.action.configureMeteredConnection",
-                title: ( localize(10627, "Configure"))
+                title: ( localize(10877, "Configure"))
             },
             showInAllWindows: true
         };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js

@@ -3,6 +3,6 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const MultiDiffEditorIcon = registerIcon("multi-diff-editor-label-icon", Codicon.diffMultiple, ( localize(10633, "Icon of the multi diff editor label.")));
+const MultiDiffEditorIcon = registerIcon("multi-diff-editor-label-icon", Codicon.diffMultiple, ( localize(10883, "Icon of the multi diff editor label.")));
 
 export { MultiDiffEditorIcon };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -26,10 +26,10 @@ import { MultiDiffEditorIcon } from './icons.contribution.js';
 import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
 import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverService.service.js';
 import { ObservableLazyPromise } from '../../../../base/common/observableInternal/utils/promise.js';
-import { mapObservableArrayCached, recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils/utils.js';
 import { observableFromValueWithChangeEvent, ValueWithChangeEventFromObservable } from '../../../../base/common/observableInternal/utils/valueWithChangeEvent.js';
 import { constObservable } from '../../../../base/common/observableInternal/observables/constObservable.js';
 import { derived } from '../../../../base/common/observableInternal/observables/derived.js';
+import { mapObservableArrayCached, recomputeInitiallyAndOnChange } from '../../../../base/common/observableInternal/utils/utils.js';
 import { autorun } from '../../../../base/common/observableInternal/reactions/autorun.js';
 import { observableValue } from '../../../../base/common/observableInternal/observables/observableValue.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/observables/observableFromEvent.js';
@@ -145,11 +145,11 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun(reader => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localize(10635, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(10885, "Multi Diff Editor"));
             if (resources && resources.length === 1) {
-                this._name = ( localize(10636, "{0} (1 file)", label));
+                this._name = ( localize(10886, "{0} (1 file)", label));
             } else if (resources) {
-                this._name = ( localize(10637, "{0} ({1} files)", label, resources.length));
+                this._name = ( localize(10887, "{0} ({1} files)", label, resources.length));
             } else {
                 this._name = label;
             }

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js

@@ -213,7 +213,7 @@ class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: "_workbench.openScmMultiDiffEditor",
-            title: ( localize2(10638, "Open Changes")),
+            title: ( localize2(10888, "Open Changes")),
             f1: false
         });
     }