@codingame/monaco-vscode-api 34.1.3 → 35.0.1

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.js

@@ -79,25 +79,31 @@ var ChatEntitlement;
     ChatEntitlement[ChatEntitlement["Enterprise"] = 9] = "Enterprise";
     ChatEntitlement[ChatEntitlement["Max"] = 11] = "Max";
 })(ChatEntitlement || (ChatEntitlement = {}));
+function chatRequiresSetup(context) {
+    return (
+    (!context.completed && !context.hasByokModels) || context.disabled || context.untrusted || context.entitlement === ChatEntitlement.Available ||
+    (
+    context.entitlement === ChatEntitlement.Unknown && !context.anonymous && !context.hasByokModels));
+}
 function isProUser(chatEntitlement) {
     return chatEntitlement === ChatEntitlement.EDU || chatEntitlement === ChatEntitlement.Pro || chatEntitlement === ChatEntitlement.ProPlus || chatEntitlement === ChatEntitlement.Max || chatEntitlement === ChatEntitlement.Business || chatEntitlement === ChatEntitlement.Enterprise;
 }
 function getChatPlanName(chatEntitlement) {
     switch (chatEntitlement) {
     case ChatEntitlement.EDU:
-        return localize(16720, "Copilot Student");
+        return localize(17383, "Copilot Student");
     case ChatEntitlement.Pro:
-        return localize(16721, "Copilot Pro");
+        return localize(17384, "Copilot Pro");
     case ChatEntitlement.ProPlus:
-        return localize(16722, "Copilot Pro+");
+        return localize(17385, "Copilot Pro+");
     case ChatEntitlement.Max:
-        return localize(16723, "Copilot Max");
+        return localize(17386, "Copilot Max");
     case ChatEntitlement.Business:
-        return localize(16724, "Copilot Business");
+        return localize(17387, "Copilot Business");
     case ChatEntitlement.Enterprise:
-        return localize(16725, "Copilot Enterprise");
+        return localize(17388, "Copilot Enterprise");
     default:
-        return localize(16726, "Copilot Free");
+        return localize(17389, "Copilot Free");
     }
 }
 const defaultChatAgent = {
@@ -256,9 +262,6 @@ let ChatEntitlementService = class ChatEntitlementService extends Disposable {
     get copilotTrackingId() {
         return this.context?.value.state.copilotTrackingId;
     }
-    get previewFeaturesDisabled() {
-        return this.contextKeyService.getContextKeyValue("github.copilot.previewFeaturesDisabled") === true;
-    }
     get clientByokEnabled() {
         return this.contextKeyService.getContextKeyValue("github.copilot.clientByokEnabled") === true;
     }
@@ -475,6 +478,7 @@ function parseQuotas(entitlementsData) {
         const overageSource = entitlementsData.quota_snapshots["premium_interactions"];
         quotas.additionalUsageEnabled = overageSource?.overage_permitted ?? false;
         quotas.additionalUsageCount = overageSource?.overage_count ?? 0;
+        quotas.additionalUsageEntitlement = overageSource?.overage_entitlement ?? 0;
     }
     return quotas;
 }
@@ -696,7 +700,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             "chatEntitlementService.signUpFree"
         );
         if (!response) {
-            const retry = await this.onUnknownSignUpError(( localize(16727, "No response received.")), "[chat entitlement] sign-up: no response");
+            const retry = await this.onUnknownSignUpError(( localize(17390, "No response received.")), "[chat entitlement] sign-up: no response");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 1
             };
@@ -719,7 +723,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
                     }
                 } catch (error) {}
             }
-            const retry = await this.onUnknownSignUpError(( localize(16728, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
+            const retry = await this.onUnknownSignUpError(( localize(17391, "Unexpected status code {0}.", response.res.statusCode)), `[chat entitlement] sign-up: unexpected status code ${response.res.statusCode}`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: response.res.statusCode
             };
@@ -729,7 +733,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             responseText = await asText(response);
         } catch (error) {}
         if (!responseText) {
-            const retry = await this.onUnknownSignUpError(( localize(16729, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
+            const retry = await this.onUnknownSignUpError(( localize(17392, "Response has no contents.")), "[chat entitlement] sign-up: response has no content");
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 2
             };
@@ -739,7 +743,7 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             parsedResult = JSON.parse(responseText);
             this.logService.trace(`[chat entitlement] sign-up: response is ${responseText}`);
         } catch (err) {
-            const retry = await this.onUnknownSignUpError(( localize(16730, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
+            const retry = await this.onUnknownSignUpError(( localize(17393, "Invalid response contents.")), `[chat entitlement] sign-up: error parsing response (${err})`);
             return retry ? this.doSignUpFree(sessions) : {
                 errorCode: 3
             };
@@ -770,11 +774,11 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             } = await this.dialogService.confirm({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16731,
+                    17394,
                     "An error occurred while signing up for the GitHub Copilot Free plan. Would you like to try again?"
                 )),
                 detail,
-                primaryButton: ( localize(16732, "Retry"))
+                primaryButton: ( localize(17395, "Retry"))
             });
             return confirmed;
         }
@@ -786,15 +790,15 @@ let ChatEntitlementRequests = class ChatEntitlementRequests extends Disposable {
             this.dialogService.prompt({
                 type: Severity$1.Error,
                 message: ( localize(
-                    16733,
+                    17396,
                     "An error occurred while signing up for the GitHub Copilot Free plan."
                 )),
                 detail: logDetails,
                 buttons: [{
-                    label: ( localize(16734, "OK")),
+                    label: ( localize(17397, "OK")),
                     run: () => {}
                 }, {
-                    label: ( localize(16735, "Learn More")),
+                    label: ( localize(17398, "Learn More")),
                     run: () => this.openerService.open(( URI.parse(defaultChatAgent.upgradePlanUrl)))
                 }]
             });
@@ -1021,4 +1025,4 @@ let ChatEntitlementContext = class ChatEntitlementContext extends Disposable {
 };
 ChatEntitlementContext = ChatEntitlementContext_1 = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, IStorageService)), ( __param(2, ILogService)), ( __param(3, IConfigurationService)), ( __param(4, ITelemetryService))], ChatEntitlementContext));
 
-export { ChatEntitlement, ChatEntitlementContext, ChatEntitlementContextKeys, ChatEntitlementRequests, ChatEntitlementService, getChatPlanName, isProUser, parseQuotas };
+export { ChatEntitlement, ChatEntitlementContext, ChatEntitlementContextKeys, ChatEntitlementRequests, ChatEntitlementService, chatRequiresSetup, getChatPlanName, isProUser, parseQuotas };

package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.service.d.ts

@@ -8,7 +8,6 @@ export interface IChatEntitlementService {
     readonly onDidChangeEntitlement: Event<void>;
     readonly entitlement: ChatEntitlement;
     readonly entitlementObs: IObservable<ChatEntitlement>;
-    readonly previewFeaturesDisabled: boolean;
     readonly clientByokEnabled: boolean;
     readonly hasByokModels: boolean;
     readonly organisations: string[] | undefined;

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js

@@ -2,18 +2,18 @@
 import { localize } from '../../../../nls.js';
 
 const idDescription = ( localize(
-    16788,
+    17451,
     "The input's id is used to associate an input with a variable of the form ${input:id}."
 ));
-const typeDescription = ( localize(16789, "The type of user input prompt to use."));
-const descriptionDescription = ( localize(16790, "The description is shown when the user is prompted for input."));
-const defaultDescription = ( localize(16791, "The default value for the input."));
+const typeDescription = ( localize(17452, "The type of user input prompt to use."));
+const descriptionDescription = ( localize(17453, "The description is shown when the user is prompted for input."));
+const defaultDescription = ( localize(17454, "The default value for the input."));
 const inputsSchema = {
     definitions: {
         inputs: {
             type: "array",
             description: ( localize(
-                16792,
+                17455,
                 "User inputs. Used for defining user input prompts, such as free string input or a choice from several options."
             )),
             items: {
@@ -31,7 +31,7 @@ const inputsSchema = {
                             description: typeDescription,
                             enum: ["promptString"],
                             enumDescriptions: [( localize(
-                                16793,
+                                17456,
                                 "The 'promptString' type opens an input box to ask the user for input."
                             ))]
                         },
@@ -46,7 +46,7 @@ const inputsSchema = {
                         password: {
                             type: "boolean",
                             description: ( localize(
-                                16794,
+                                17457,
                                 "Controls if a password input is shown. Password input hides the typed text."
                             ))
                         }
@@ -64,7 +64,7 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["pickString"],
-                            enumDescriptions: [( localize(16795, "The 'pickString' type shows a selection list."))]
+                            enumDescriptions: [( localize(17458, "The 'pickString' type shows a selection list."))]
                         },
                         description: {
                             type: "string",
@@ -76,7 +76,7 @@ const inputsSchema = {
                         },
                         options: {
                             type: "array",
-                            description: ( localize(16796, "An array of strings that defines the options for a quick pick.")),
+                            description: ( localize(17459, "An array of strings that defines the options for a quick pick.")),
                             items: {
                                 oneOf: [{
                                     type: "string"
@@ -87,11 +87,11 @@ const inputsSchema = {
                                     properties: {
                                         label: {
                                             type: "string",
-                                            description: ( localize(16797, "Label for the option."))
+                                            description: ( localize(17460, "Label for the option."))
                                         },
                                         value: {
                                             type: "string",
-                                            description: ( localize(16798, "Value for the option."))
+                                            description: ( localize(17461, "Value for the option."))
                                         }
                                     }
                                 }]
@@ -111,22 +111,22 @@ const inputsSchema = {
                             type: "string",
                             description: typeDescription,
                             enum: ["command"],
-                            enumDescriptions: [( localize(16799, "The 'command' type executes a command."))]
+                            enumDescriptions: [( localize(17462, "The 'command' type executes a command."))]
                         },
                         command: {
                             type: "string",
-                            description: ( localize(16800, "The command to execute for this input variable."))
+                            description: ( localize(17463, "The command to execute for this input variable."))
                         },
                         args: {
                             oneOf: [{
                                 type: "object",
-                                description: ( localize(16801, "Optional arguments passed to the command."))
+                                description: ( localize(17464, "Optional arguments passed to the command."))
                             }, {
                                 type: "array",
-                                description: ( localize(16801, "Optional arguments passed to the command."))
+                                description: ( localize(17464, "Optional arguments passed to the command."))
                             }, {
                                 type: "string",
-                                description: ( localize(16801, "Optional arguments passed to the command."))
+                                description: ( localize(17464, "Optional arguments passed to the command."))
                             }]
                         }
                     }

package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js

@@ -4,7 +4,7 @@ import { localize } from '../../../../nls.js';
 function applyDeprecatedVariableMessage(schema) {
     schema.pattern = schema.pattern || "^(?!.*\\$\\{(env|config|command)\\.)";
     schema.patternErrorMessage = schema.patternErrorMessage || ( localize(
-        16802,
+        17465,
         "'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead."
     ));
 }

package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js

@@ -85,7 +85,7 @@ class AbstractVariableResolverService {
                 return normalizeDriveLetter(filePath);
             }
             throw ( new VariableError(variableKind, ( localize(
-                16803,
+                17466,
                 "Variable {0} can not be resolved. Please open an editor.",
                 replacement.id
             ))));
@@ -99,7 +99,7 @@ class AbstractVariableResolverService {
                 }
             }
             throw ( new VariableError(variableKind, ( localize(
-                16804,
+                17467,
                 "Variable {0}: can not find workspace folder of '{1}'.",
                 replacement.id,
                 basename(filePath)
@@ -112,7 +112,7 @@ class AbstractVariableResolverService {
                     return folder;
                 }
                 throw ( new VariableError(variableKind, ( localize(
-                    16805,
+                    17468,
                     "Variable {0} can not be resolved. No such folder '{1}'.",
                     variableKind,
                     argument
@@ -123,13 +123,13 @@ class AbstractVariableResolverService {
             }
             if (this._context.getWorkspaceFolderCount() > 1) {
                 throw ( new VariableError(variableKind, ( localize(
-                    16806,
+                    17469,
                     "Variable {0} can not be resolved in a multi folder workspace. Scope this variable using ':' and a workspace folder name.",
                     variableKind
                 ))));
             }
             throw ( new VariableError(variableKind, ( localize(
-                16807,
+                17470,
                 "Variable {0} can not be resolved. Please open a folder.",
                 variableKind
             ))));
@@ -146,7 +146,7 @@ class AbstractVariableResolverService {
                 return "";
             }
             throw ( new VariableError(VariableKind.Env, ( localize(
-                16808,
+                17471,
                 "Variable {0} can not be resolved because no environment variable name is given.",
                 replacement.id
             ))));
@@ -155,7 +155,7 @@ class AbstractVariableResolverService {
                 const config = this._context.getConfigurationValue(folderUri, argument);
                 if (isUndefinedOrNull(config)) {
                     throw ( new VariableError(VariableKind.Config, ( localize(
-                        16809,
+                        17472,
                         "Variable {0} can not be resolved because setting '{1}' not found.",
                         replacement.id,
                         argument
@@ -163,7 +163,7 @@ class AbstractVariableResolverService {
                 }
                 if (isObject(config)) {
                     throw ( new VariableError(VariableKind.Config, ( localize(
-                        16810,
+                        17473,
                         "Variable {0} can not be resolved because '{1}' is a structured value.",
                         replacement.id,
                         argument
@@ -172,7 +172,7 @@ class AbstractVariableResolverService {
                 return config;
             }
             throw ( new VariableError(VariableKind.Config, ( localize(
-                16811,
+                17474,
                 "Variable {0} can not be resolved because no settings name is given.",
                 replacement.id
             ))));
@@ -191,7 +191,7 @@ class AbstractVariableResolverService {
                 const ext = await this._context.getExtension(argument);
                 if (!ext) {
                     throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                        16812,
+                        17475,
                         "Variable {0} can not be resolved because the extension {1} is not installed.",
                         replacement.id,
                         argument
@@ -200,7 +200,7 @@ class AbstractVariableResolverService {
                 return this.fsPath(ext.extensionLocation);
             }
             throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                16813,
+                17476,
                 "Variable {0} can not be resolved because no extension name is given.",
                 replacement.id
             ))));
@@ -232,7 +232,7 @@ class AbstractVariableResolverService {
                         return environment.userHome;
                     }
                     throw ( new VariableError(VariableKind.UserHome, ( localize(
-                        16814,
+                        17477,
                         "Variable {0} can not be resolved. UserHome path is not defined",
                         replacement.id
                     ))));
@@ -243,7 +243,7 @@ class AbstractVariableResolverService {
                             return lineNumber;
                         }
                         throw ( new VariableError(VariableKind.LineNumber, ( localize(
-                            16815,
+                            17478,
                             "Variable {0} can not be resolved. Make sure to have a line selected in the active editor.",
                             replacement.id
                         ))));
@@ -255,7 +255,7 @@ class AbstractVariableResolverService {
                             return columnNumber;
                         }
                         throw ( new Error(( localize(
-                            16816,
+                            17479,
                             "Variable {0} can not be resolved. Make sure to have a column selected in the active editor.",
                             replacement.id
                         ))));
@@ -267,7 +267,7 @@ class AbstractVariableResolverService {
                             return selectedText;
                         }
                         throw ( new VariableError(VariableKind.SelectedText, ( localize(
-                            16817,
+                            17480,
                             "Variable {0} can not be resolved. Make sure to have some text selected in the active editor.",
                             replacement.id
                         ))));
@@ -352,7 +352,7 @@ class AbstractVariableResolverService {
                 return v;
             }
             throw ( new VariableError(variableKind, ( localize(
-                16818,
+                17481,
                 "Variable {0} can not be resolved because the command has no value.",
                 match
             ))));

package/vscode/src/vs/workbench/services/editor/common/editorGroupFinder.js

@@ -5,7 +5,7 @@ import { isEditorInputWithOptions, isEditorInput, EditorInputCapabilities } from
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { preferredSideBySideGroupDirection, GroupsOrder } from './editorGroupsService.js';
 import { IEditorGroupsService } from './editorGroupsService.service.js';
-import { MODAL_GROUP, SIDE_GROUP, AUX_WINDOW_GROUP } from './editorService.js';
+import { USE_MODAL_EDITOR_SETTING, MODAL_GROUP, SIDE_GROUP, AUX_WINDOW_GROUP } from './editorService.js';
 
 function findGroup(accessor, editor, preferredGroup) {
     const editorGroupService = accessor.get(IEditorGroupsService);
@@ -20,7 +20,7 @@ function findGroup(accessor, editor, preferredGroup) {
 }
 function handleGroupResult(group, editor, preferredGroup, editorGroupService, configurationService) {
     const modalEditorPart = editorGroupService.activeModalEditorPart;
-    const modalEditorMode = configurationService.getValue("workbench.editor.useModal");
+    const modalEditorMode = configurationService.getValue(USE_MODAL_EDITOR_SETTING);
     const editorInput = isEditorInputWithOptions(editor) ? editor.editor : isEditorInput(editor) ? editor : undefined;
     const requiresModal = editorInput instanceof EditorInput && editorInput.hasCapability(EditorInputCapabilities.RequiresModal) && modalEditorMode !== "off";
     if (modalEditorPart && preferredGroup !== MODAL_GROUP && modalEditorMode !== "all" && !requiresModal) {
@@ -50,7 +50,7 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
     let group;
     const editor = isEditorInputWithOptions(input) ? input.editor : input;
     const options = input.options;
-    if (isEditorInput(editor) && editor.hasCapability(EditorInputCapabilities.RequiresModal) && configurationService.getValue("workbench.editor.useModal") !== "off") {
+    if (isEditorInput(editor) && editor.hasCapability(EditorInputCapabilities.RequiresModal) && configurationService.getValue(USE_MODAL_EDITOR_SETTING) !== "off") {
         group = editorGroupService.createModalEditorPart(options?.modal).then(part => part.activeGroup);
     }
     else if (preferredGroup && typeof preferredGroup !== "number") {
@@ -72,7 +72,7 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
     else if (preferredGroup === AUX_WINDOW_GROUP) {
         group = editorGroupService.createAuxiliaryEditorPart(options?.auxiliary).then(group => group.activeGroup);
     }
-    else if (preferredGroup === MODAL_GROUP && configurationService.getValue("workbench.editor.useModal") !== "off") {
+    else if (preferredGroup === MODAL_GROUP && configurationService.getValue(USE_MODAL_EDITOR_SETTING) !== "off") {
         group = editorGroupService.createModalEditorPart(options?.modal).then(part => part.activeGroup);
     }
     else if (!options || typeof options.index !== "number") {
@@ -106,7 +106,7 @@ function doFindGroup(input, preferredGroup, editorGroupService, configurationSer
             }
         }
     }
-    if (!group && configurationService.getValue("workbench.editor.useModal") === "all") {
+    if (!group && configurationService.getValue(USE_MODAL_EDITOR_SETTING) === "all") {
         group = editorGroupService.createModalEditorPart(options?.modal).then(part => part.activeGroup);
     }
     if (!group) {

package/vscode/src/vs/workbench/services/editor/common/editorResolverService.d.ts

@@ -12,10 +12,23 @@ export type EditorAssociations = readonly EditorAssociation[];
 export declare const editorsAssociationsSettingId = "workbench.editorAssociations";
 export declare const diffEditorsAssociationsSettingId = "workbench.diffEditorAssociations";
 /**
- * Default value for `workbench.editorAssociations` in the Agents window.
+ * Setting that controls whether the Markdown editor is the default editor for
+ * `*.md` files in the Agents window. Gated behind an experiment so it can be
+ * rolled out gradually. Defaults to off.
+ */
+export declare const markdownDefaultEditorAgentsWindowSettingId = "workbench.editor.markdownDefaultEditorInAgentsWindow";
+/**
+ * Builds the default value for `workbench.editorAssociations` in the Agents window.
  * Shared so that dynamic re-registrations of the setting preserve the override.
+ *
+ * Each editor association can be toggled independently. Passing `undefined`
+ * leaves the association at its enabled default, so the static registration
+ * ends up with all defaults registered. Pass `false` to fall back to the
+ * markdown preview editor for `*.md` files.
  */
-export declare const editorsAssociationsAgentsWindowDefault: Readonly<Record<string, string>>;
+export declare function editorsAssociationsAgentsWindowDefault(options?: {
+    markdownDefaultEditor?: boolean;
+}): Record<string, string>;
 export interface IEditorType {
     readonly id: string;
     readonly displayName: string;

package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js

@@ -10,30 +10,45 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 
 const editorsAssociationsSettingId = "workbench.editorAssociations";
 const diffEditorsAssociationsSettingId = "workbench.diffEditorAssociations";
-const editorsAssociationsAgentsWindowDefault = ( Object.freeze({
-    "*.md": "vscode.markdown.preview.editor"
-}));
+const markdownDefaultEditorAgentsWindowSettingId = "workbench.editor.markdownDefaultEditorInAgentsWindow";
+function editorsAssociationsAgentsWindowDefault(options) {
+    return {
+        "*.md": options?.markdownDefaultEditor === true ? "vscode.markdown.editor" : "vscode.markdown.preview.editor"
+    };
+}
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 const editorAssociationsConfigurationNode = {
     ...workbenchConfigurationNodeBase,
     properties: {
+        [markdownDefaultEditorAgentsWindowSettingId]: {
+            type: "boolean",
+            default: false,
+            tags: ["experimental"],
+            experiment: {
+                mode: "startup"
+            },
+            markdownDescription: ( localize(
+                17537,
+                "Controls whether the Markdown editor is used as the default editor for Markdown files in the Agents window."
+            ))
+        },
         [editorsAssociationsSettingId]: {
             type: "object",
             markdownDescription: ( localize(
-                16874,
+                17538,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
             )),
             additionalProperties: {
                 type: "string"
             },
             agentsWindow: {
-                default: editorsAssociationsAgentsWindowDefault
+                default: editorsAssociationsAgentsWindowDefault()
             }
         },
         [diffEditorsAssociationsSettingId]: {
             type: "object",
             markdownDescription: ( localize(
-                16875,
+                17539,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors for diff views (for example `\"*.md\": \"vscode.markdown.preview.editor\"`). These override `workbench.editorAssociations` for diffs."
             )),
             additionalProperties: {
@@ -95,4 +110,4 @@ function globMatchesResource(globPattern, resource) {
     });
 }
 
-export { RegisteredEditorPriority, ResolvedStatus, diffEditorsAssociationsSettingId, editorsAssociationsAgentsWindowDefault, editorsAssociationsSettingId, globMatchesResource, priorityToRank, toRegisteredEditorPriorityInfo };
+export { RegisteredEditorPriority, ResolvedStatus, diffEditorsAssociationsSettingId, editorsAssociationsAgentsWindowDefault, editorsAssociationsSettingId, globMatchesResource, markdownDefaultEditorAgentsWindowSettingId, priorityToRank, toRegisteredEditorPriorityInfo };

package/vscode/src/vs/workbench/services/editor/common/editorService.d.ts

@@ -22,6 +22,17 @@ export type AUX_WINDOW_GROUP_TYPE = typeof AUX_WINDOW_GROUP;
  */
 export declare const MODAL_GROUP = -4;
 export type MODAL_GROUP_TYPE = typeof MODAL_GROUP;
+/**
+ * Setting that controls whether editors open in a modal editor part.
+ */
+export declare const USE_MODAL_EDITOR_SETTING = "workbench.editor.useModal";
+/**
+ * Possible values for the `workbench.editor.useModal` setting:
+ * - `'off'`: never open editors modal (user opt-out, honored over `RequiresModal`)
+ * - `'some'`: open modal only for editors that request it (e.g. `RequiresModal`)
+ * - `'all'`: open all editors modal (the default in the Agents window)
+ */
+export type UseModalEditorMode = "off" | "some" | "all";
 export type PreferredGroup = IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE | MODAL_GROUP_TYPE;
 export declare function isPreferredGroup(obj: unknown): obj is PreferredGroup;
 export interface ISaveEditorsOptions extends ISaveOptions {

package/vscode/src/vs/workbench/services/editor/common/editorService.js

@@ -5,9 +5,10 @@ const ACTIVE_GROUP = -1;
 const SIDE_GROUP = -2;
 const AUX_WINDOW_GROUP = -3;
 const MODAL_GROUP = -4;
+const USE_MODAL_EDITOR_SETTING = 'workbench.editor.useModal';
 function isPreferredGroup(obj) {
     const candidate = obj;
     return typeof obj === 'number' || isEditorGroup(candidate);
 }
 
-export { ACTIVE_GROUP, AUX_WINDOW_GROUP, MODAL_GROUP, SIDE_GROUP, isPreferredGroup };
+export { ACTIVE_GROUP, AUX_WINDOW_GROUP, MODAL_GROUP, SIDE_GROUP, USE_MODAL_EDITOR_SETTING, isPreferredGroup };

package/vscode/src/vs/workbench/services/extensionManagement/common/extensionsIcons.js

@@ -15,13 +15,13 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
 const extensionDefaultIcon = registerIcon("extension-default-icon", Codicon.extensionsLarge, ( localize(
-    16962,
+    17626,
     "Icon used for the default extension in the extensions view and editor."
 )));
 const verifiedPublisherIcon = registerIcon("extensions-verified-publisher", Codicon.verifiedFilled, ( localize(
-    16963,
+    17627,
     "Icon used for the verified extension publisher in the extensions view and editor."
 )));
-const extensionVerifiedPublisherIconColor = registerColor("extensionIcon.verifiedForeground", textLinkForeground, ( localize(16964, "The icon color for extension verified publisher.")), false);
+const extensionVerifiedPublisherIconColor = registerColor("extensionIcon.verifiedForeground", textLinkForeground, ( localize(17628, "The icon color for extension verified publisher.")), false);
 
 export { extensionDefaultIcon, extensionVerifiedPublisherIconColor, verifiedPublisherIcon };

package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js

@@ -84,11 +84,11 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const workspaceOrFolders = isRecommended ? await this.pickWorkspaceOrFolders(
             recommendedWorksapceFolders,
             isWorkspaceRecommended ? workspace : undefined,
-            ( localize(16965, "Remove extension recommendation from"))
+            ( localize(17629, "Remove extension recommendation from"))
         ) : await this.pickWorkspaceOrFolders(
             workspace.folders,
             workspace.configuration ? workspace : undefined,
-            ( localize(16966, "Add extension recommendation to"))
+            ( localize(17630, "Add extension recommendation to"))
         );
         for (const workspaceOrWorkspaceFolder of workspaceOrFolders) {
             if (isWorkspace(workspaceOrWorkspaceFolder)) {
@@ -124,11 +124,11 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const workspaceOrFolders = isUnwanted ? await this.pickWorkspaceOrFolders(
             unWantedWorksapceFolders,
             isWorkspaceUnwanted ? workspace : undefined,
-            ( localize(16965, "Remove extension recommendation from"))
+            ( localize(17629, "Remove extension recommendation from"))
         ) : await this.pickWorkspaceOrFolders(
             workspace.folders,
             workspace.configuration ? workspace : undefined,
-            ( localize(16966, "Add extension recommendation to"))
+            ( localize(17630, "Add extension recommendation to"))
         );
         for (const workspaceOrWorkspaceFolder of workspaceOrFolders) {
             if (isWorkspace(workspaceOrWorkspaceFolder)) {
@@ -313,7 +313,7 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
         const folderPicks = ( workspaceFolders.map(workspaceFolder => {
             return {
                 label: workspaceFolder.name,
-                description: ( localize(16967, "Workspace Folder")),
+                description: ( localize(17631, "Workspace Folder")),
                 workspaceOrFolder: workspaceFolder,
                 iconClasses: getIconClasses(
                     this.modelService,
@@ -328,7 +328,7 @@ let WorkspaceExtensionsConfigService = class WorkspaceExtensionsConfigService ex
                 type: "separator"
             });
             folderPicks.push({
-                label: ( localize(16968, "Workspace")),
+                label: ( localize(17632, "Workspace")),
                 workspaceOrFolder: workspace
             });
         }