@codingame/monaco-vscode-api 20.5.0 → 21.0.1

package/vscode/src/vs/workbench/contrib/speech/common/speechService.js

@@ -3,16 +3,16 @@ import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { language } from '../../../../base/common/platform.js';
 
-const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(10300, "A speech provider is registered to the speech service.")) }));
+const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(10464, "A speech provider is registered to the speech service.")) }));
 const SpeechToTextInProgress = ( new RawContextKey(
     'speechToTextInProgress',
     false,
-    { type: 'boolean', description: ( localize(10301, "A speech-to-text session is in progress.")) }
+    { type: 'boolean', description: ( localize(10465, "A speech-to-text session is in progress.")) }
 ));
 const TextToSpeechInProgress = ( new RawContextKey(
     'textToSpeechInProgress',
     false,
-    { type: 'boolean', description: ( localize(10302, "A text-to-speech session is in progress.")) }
+    { type: 'boolean', description: ( localize(10466, "A text-to-speech session is in progress.")) }
 ));
 var SpeechToTextStatus;
 (function (SpeechToTextStatus) {
@@ -44,82 +44,82 @@ var AccessibilityVoiceSettingId;
 const SPEECH_LANGUAGE_CONFIG = AccessibilityVoiceSettingId.SpeechLanguage;
 const SPEECH_LANGUAGES = {
     ['da-DK']: {
-        name: ( localize(10303, "Danish (Denmark)"))
+        name: ( localize(10467, "Danish (Denmark)"))
     },
     ['de-DE']: {
-        name: ( localize(10304, "German (Germany)"))
+        name: ( localize(10468, "German (Germany)"))
     },
     ['en-AU']: {
-        name: ( localize(10305, "English (Australia)"))
+        name: ( localize(10469, "English (Australia)"))
     },
     ['en-CA']: {
-        name: ( localize(10306, "English (Canada)"))
+        name: ( localize(10470, "English (Canada)"))
     },
     ['en-GB']: {
-        name: ( localize(10307, "English (United Kingdom)"))
+        name: ( localize(10471, "English (United Kingdom)"))
     },
     ['en-IE']: {
-        name: ( localize(10308, "English (Ireland)"))
+        name: ( localize(10472, "English (Ireland)"))
     },
     ['en-IN']: {
-        name: ( localize(10309, "English (India)"))
+        name: ( localize(10473, "English (India)"))
     },
     ['en-NZ']: {
-        name: ( localize(10310, "English (New Zealand)"))
+        name: ( localize(10474, "English (New Zealand)"))
     },
     ['en-US']: {
-        name: ( localize(10311, "English (United States)"))
+        name: ( localize(10475, "English (United States)"))
     },
     ['es-ES']: {
-        name: ( localize(10312, "Spanish (Spain)"))
+        name: ( localize(10476, "Spanish (Spain)"))
     },
     ['es-MX']: {
-        name: ( localize(10313, "Spanish (Mexico)"))
+        name: ( localize(10477, "Spanish (Mexico)"))
     },
     ['fr-CA']: {
-        name: ( localize(10314, "French (Canada)"))
+        name: ( localize(10478, "French (Canada)"))
     },
     ['fr-FR']: {
-        name: ( localize(10315, "French (France)"))
+        name: ( localize(10479, "French (France)"))
     },
     ['hi-IN']: {
-        name: ( localize(10316, "Hindi (India)"))
+        name: ( localize(10480, "Hindi (India)"))
     },
     ['it-IT']: {
-        name: ( localize(10317, "Italian (Italy)"))
+        name: ( localize(10481, "Italian (Italy)"))
     },
     ['ja-JP']: {
-        name: ( localize(10318, "Japanese (Japan)"))
+        name: ( localize(10482, "Japanese (Japan)"))
     },
     ['ko-KR']: {
-        name: ( localize(10319, "Korean (South Korea)"))
+        name: ( localize(10483, "Korean (South Korea)"))
     },
     ['nl-NL']: {
-        name: ( localize(10320, "Dutch (Netherlands)"))
+        name: ( localize(10484, "Dutch (Netherlands)"))
     },
     ['pt-PT']: {
-        name: ( localize(10321, "Portuguese (Portugal)"))
+        name: ( localize(10485, "Portuguese (Portugal)"))
     },
     ['pt-BR']: {
-        name: ( localize(10322, "Portuguese (Brazil)"))
+        name: ( localize(10486, "Portuguese (Brazil)"))
     },
     ['ru-RU']: {
-        name: ( localize(10323, "Russian (Russia)"))
+        name: ( localize(10487, "Russian (Russia)"))
     },
     ['sv-SE']: {
-        name: ( localize(10324, "Swedish (Sweden)"))
+        name: ( localize(10488, "Swedish (Sweden)"))
     },
     ['tr-TR']: {
-        name: ( localize(10325, "Turkish (Türkiye)"))
+        name: ( localize(10489, "Turkish (Türkiye)"))
     },
     ['zh-CN']: {
-        name: ( localize(10326, "Chinese (Simplified, China)"))
+        name: ( localize(10490, "Chinese (Simplified, China)"))
     },
     ['zh-HK']: {
-        name: ( localize(10327, "Chinese (Traditional, Hong Kong)"))
+        name: ( localize(10491, "Chinese (Traditional, Hong Kong)"))
     },
     ['zh-TW']: {
-        name: ( localize(10328, "Chinese (Traditional, Taiwan)"))
+        name: ( localize(10492, "Chinese (Traditional, Taiwan)"))
     }
 };
 function speechLanguageConfigToLanguage(config, lang = language) {

package/vscode/src/vs/workbench/contrib/tasks/common/constants.js

@@ -3,7 +3,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 
-const rerunTaskIcon = registerIcon('rerun-task', Codicon.refresh, ( localize(10531, 'View icon of the rerun task.')));
+const rerunTaskIcon = registerIcon('rerun-task', Codicon.refresh, ( localize(10695, 'View icon of the rerun task.')));
 const RerunForActiveTerminalCommandId = 'workbench.action.tasks.rerunForActiveTerminal';
 const RerunAllRunningTasksCommandId = 'workbench.action.tasks.rerunAllRunningTasks';
 

package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js

@@ -13,7 +13,7 @@ const taskDefinitionSchema = {
         type: {
             type: 'string',
             description: ( localize(
-                10738,
+                10902,
                 'The actual task type. Please note that types starting with a \'$\' are reserved for internal usage.'
             ))
         },
@@ -25,7 +25,7 @@ const taskDefinitionSchema = {
         },
         properties: {
             type: 'object',
-            description: ( localize(10739, 'Additional properties of the task type')),
+            description: ( localize(10903, 'Additional properties of the task type')),
             additionalProperties: {
                 $ref: 'http://json-schema.org/draft-07/schema#'
             }
@@ -33,7 +33,7 @@ const taskDefinitionSchema = {
         when: {
             type: 'string',
             markdownDescription: ( localize(
-                10740,
+                10904,
                 'Condition which must be true to enable this type of task. Consider using `shellExecutionSupported`, `processExecutionSupported`, and `customExecutionSupported` as appropriate for this task definition. See the [API documentation](https://code.visualstudio.com/api/extension-guides/task-provider#when-clause) for more information.'
             )),
             default: ''
@@ -49,7 +49,7 @@ var Configuration;
         const taskType = isString(value.type) ? value.type : undefined;
         if (!taskType || taskType.length === 0) {
             messageCollector.error(( localize(
-                10741,
+                10905,
                 'The task type configuration is missing the required \'taskType\' property'
             )));
             return undefined;
@@ -81,7 +81,7 @@ const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint({
         }
     },
     jsonSchema: {
-        description: ( localize(10742, 'Contributes task kinds')),
+        description: ( localize(10906, 'Contributes task kinds')),
         type: 'array',
         items: taskDefinitionSchema
     }

package/vscode/src/vs/workbench/contrib/tasks/common/taskService.service.d.ts

@@ -2,9 +2,10 @@ import { Action } from "../../../../base/common/actions.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
+import { IMarkerData } from "../../../../platform/markers/common/markers.js";
 import { IWorkspace, IWorkspaceFolder } from "../../../../platform/workspace/common/workspace.js";
 import { ITaskEvent, Task, TaskRunSource, ConfiguringTask, ITaskIdentifier, TaskSorter, ContributedTask, CustomTask } from "./tasks.js";
-import { IProblemMatcherRunOptions, ITaskFilter, IWorkspaceFolderTaskResult, ITaskProvider } from "@codingame/monaco-vscode-ec8fe440-1fd1-523d-ad0f-c0f5a80cf451-common/vscode/vs/workbench/contrib/tasks/common/taskService";
+import { IProblemMatcherRunOptions, ITaskFilter, IWorkspaceFolderTaskResult, ITaskProvider } from "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/tasks/common/taskService";
 import { ITaskSummary, ITaskTerminateResponse, ITaskSystemInfo } from "@codingame/monaco-vscode-task-service-override/vscode/vs/workbench/contrib/tasks/common/taskSystem";
 export declare const ITaskService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITaskService>;
 export interface ITaskService {
@@ -32,7 +33,11 @@ export interface ITaskService {
     getWorkspaceTasks(runSource?: TaskRunSource): Promise<Map<string, IWorkspaceFolderTaskResult>>;
     getSavedTasks(type: "persistent" | "historical"): Promise<(Task | ConfiguringTask)[]>;
     removeRecentlyUsedTask(taskRecentlyUsedKey: string): void;
-    getTerminalForTask(task: Task): URI | undefined;
+    getTerminalsForTasks(tasks: Task | Task[]): URI[] | undefined;
+    getTaskProblems(instanceId: number): Map<string, {
+        resources: URI[];
+        markers: IMarkerData[];
+    }> | undefined;
     /**
     * @param alias The task's name, label or defined identifier.
     */

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

@@ -9,9 +9,9 @@ import { ConfigurationTarget } from '../../../../platform/configuration/common/c
 export { RerunAllRunningTasksCommandId, RerunForActiveTerminalCommandId, rerunTaskIcon } from './constants.js';
 
 const USER_TASKS_GROUP_KEY = 'settings';
-const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(10752, "Whether a task is currently running."))));
-const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(10753, "Whether the active terminal is a task terminal."))));
-const TASKS_CATEGORY = ( localize2(10754, "Tasks"));
+const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(10917, "Whether a task is currently running."))));
+const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(10918, "Whether the active terminal is a task terminal."))));
+const TASKS_CATEGORY = ( localize2(10919, "Tasks"));
 var ShellQuoting;
 (function (ShellQuoting) {
     ShellQuoting[ShellQuoting["Escape"] = 1] = "Escape";
@@ -782,7 +782,7 @@ var TaskDefinition;
                             break;
                         default:
                             reporter.error(( localize(
-                                10755,
+                                10920,
                                 'Error: the task identifier \'{0}\' is missing the required property \'{1}\'. The task identifier will be ignored.',
                                 JSON.stringify(external, undefined, 0),
                                 property

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts

@@ -13,7 +13,7 @@ import { IColorTheme } from "../../../../platform/theme/common/themeService.js";
 import { IWorkspaceFolder } from "../../../../platform/workspace/common/workspace.js";
 import { ITerminalStatusList } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminal/browser/terminalStatusList";
 import { XtermTerminal } from "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal";
-import { IRegisterContributedProfileArgs, ITerminalFont, ITerminalProcessInfo } from "@codingame/monaco-vscode-6883db80-c313-54eb-8fbc-5872c56b0326-common/vscode/vs/workbench/contrib/terminal/common/terminal";
+import { IRegisterContributedProfileArgs, ITerminalFont, ITerminalProcessInfo } from "@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminal";
 import type { IMarker, ITheme, Terminal as RawXtermTerminal, IBufferRange, IMarker as IXtermMarker } from "@xterm/xterm";
 import { ScrollPosition } from "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
@@ -23,6 +23,7 @@ import type { ICurrentPartialCommand } from "@codingame/monaco-vscode-88141f48-1
 import type { IMenu } from "../../../../platform/actions/common/actions.js";
 import type { Barrier } from "../../../../base/common/async.js";
 import type { IProgressState } from "@xterm/addon-progress";
+import type { IEditorOptions } from "../../../../platform/editor/common/editor.js";
 /**
  * A terminal contribution that gets created whenever a terminal is created. A contribution has
  * access to the process manager through the constructor and provides a method for when xterm.js has
@@ -233,6 +234,7 @@ export interface ICreateTerminalOptions {
 export interface TerminalEditorLocation {
     viewColumn: GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE;
     preserveFocus?: boolean;
+    auxiliary?: IEditorOptions["auxiliary"];
 }
 /**
  * An interface that indicates the implementer hosts terminal instances, exposing a common set of

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.d.ts

@@ -7,8 +7,9 @@ import { GroupIdentifier } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
 import { IEditableData } from "../../../common/views.js";
 import { SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE } from "../../../services/editor/common/editorService.js";
-import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, IRemoteTerminalAttachTarget, type ITerminalConfiguration, type ITerminalFont } from "@codingame/monaco-vscode-6883db80-c313-54eb-8fbc-5872c56b0326-common/vscode/vs/workbench/contrib/terminal/common/terminal";
+import { IStartExtensionTerminalRequest, ITerminalProcessExtHostProxy, IRemoteTerminalAttachTarget, type ITerminalConfiguration, type ITerminalFont } from "@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminal";
 import { ITerminalInstanceHost, ITerminalInstance, IDetachedTerminalInstance, TerminalConnectionState, ITerminalGroup, ICreateTerminalOptions, IDetachedXTermOptions, ITerminalLocationOptions, ITerminalServiceNativeDelegate, type IDeserializedTerminalEditorInput, type TerminalEditorLocation } from "./terminal.js";
+import { TerminalEditorInput } from "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput";
 import { IXtermCore } from "./xterm-private.js";
 export declare const ITerminalService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalService>;
 export interface ITerminalService extends ITerminalInstanceHost {
@@ -52,6 +53,12 @@ export interface ITerminalService extends ITerminalInstanceHost {
     */
     createTerminal(options?: ICreateTerminalOptions): Promise<ITerminalInstance>;
     /**
+    * Creates and focuses a terminal.
+    * @param options The options to create the terminal with, when not specified the default
+    * profile will be used at the default target.
+    */
+    createAndFocusTerminal(options?: ICreateTerminalOptions): Promise<ITerminalInstance>;
+    /**
     * Creates a detached xterm instance which is not attached to the DOM or
     * tracked as a terminal instance.
     * @params options The options to create the terminal with
@@ -146,7 +153,7 @@ export interface ITerminalEditorService extends ITerminalInstanceHost {
     revealActiveEditor(preserveFocus?: boolean): Promise<void>;
     resolveResource(instance: ITerminalInstance): URI;
     reviveInput(deserializedInput: IDeserializedTerminalEditorInput): EditorInput;
-    getInputFromResource(resource: URI): EditorInput;
+    getInputFromResource(resource: URI): TerminalEditorInput;
 }
 export declare const ITerminalGroupService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalGroupService>;
 /**
@@ -226,7 +233,7 @@ export interface ITerminalInstanceService {
     * @param launchConfig The shell launch config.
     * @param target The target of the terminal.
     */
-    createInstance(launchConfig: IShellLaunchConfig, target: TerminalLocation): ITerminalInstance;
+    createInstance(launchConfig: IShellLaunchConfig, target: TerminalLocation, editorOptions?: TerminalEditorLocation): ITerminalInstance;
     /**
     * Gets the registered backend for a remote authority (undefined = local). This is a convenience
     * method to avoid using the more verbose fetching from the registry.

package/vscode/src/vs/workbench/contrib/terminal/common/environmentVariable.d.ts

@@ -1,5 +1,5 @@
 import { EnvironmentVariableScope, IEnvironmentVariableCollection } from "@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/platform/terminal/common/environmentVariable";
-import { ITerminalStatus } from "@codingame/monaco-vscode-6883db80-c313-54eb-8fbc-5872c56b0326-common/vscode/vs/workbench/contrib/terminal/common/terminal";
+import { ITerminalStatus } from "@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminal";
 export interface IEnvironmentVariableCollectionWithPersistence extends IEnvironmentVariableCollection {
     readonly persistent: boolean;
 }

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

@@ -3,7 +3,7 @@ import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { OperatingSystem, IProcessEnvironment } from "../../../../base/common/platform.js";
 import { ThemeIcon } from "../../../../base/common/themables.js";
 import { IShellLaunchConfig, ITerminalProfile, TerminalIcon, type IExtensionTerminalProfile } from "../../../../platform/terminal/common/terminal.js";
-import { IShellLaunchConfigResolveOptions, type IRegisterContributedProfileArgs, type ITerminalProfileProvider } from "@codingame/monaco-vscode-6883db80-c313-54eb-8fbc-5872c56b0326-common/vscode/vs/workbench/contrib/terminal/common/terminal";
+import { IShellLaunchConfigResolveOptions, type IRegisterContributedProfileArgs, type ITerminalProfileProvider } from "@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminal";
 export declare const ITerminalProfileResolverService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalProfileResolverService>;
 export interface ITerminalProfileResolverService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix.service.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "../../../../../base/common/event.js";
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { ITerminalCommandSelector } from "../../../../../platform/terminal/common/terminal.js";
-import { ITerminalQuickFixProviderSelector, ITerminalQuickFixProvider } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix";
+import { ITerminalQuickFixProviderSelector, ITerminalQuickFixProvider } from "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminalContrib/quickFix/browser/quickFix";
 export declare const ITerminalQuickFixService: import("../../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalQuickFixService>;
 export interface ITerminalQuickFixService {
     onDidRegisterProvider: Event<ITerminalQuickFixProviderSelector>;

package/vscode/src/vs/workbench/contrib/testing/common/constants.d.ts

@@ -36,8 +36,10 @@ export declare enum TestCommandId {
     CoverageFilterToTestInEditor = "testing.coverageFilterToTestInEditor",
     CoverageLastRun = "testing.coverageLastRun",
     CoverageSelectedAction = "testing.coverageSelected",
+    CoverageToggleInExplorer = "testing.toggleCoverageInExplorer",
     CoverageToggleToolbar = "testing.coverageToggleToolbar",
     CoverageViewChangeSorting = "testing.coverageViewChangeSorting",
+    CoverageViewCollapseAll = "testing.coverageViewCollapseAll",
     DebugAction = "testing.debug",
     DebugAllAction = "testing.debugAll",
     DebugAtCursor = "testing.debugAtCursor",

package/vscode/src/vs/workbench/contrib/testing/common/constants.js

@@ -27,19 +27,19 @@ var TestExplorerViewSorting;
     TestExplorerViewSorting["ByDuration"] = "duration";
 })(TestExplorerViewSorting || (TestExplorerViewSorting = {}));
 const testStateNames = {
-    [TestResultState.Errored]: ( localize(11834, 'Errored')),
-    [TestResultState.Failed]: ( localize(11835, 'Failed')),
-    [TestResultState.Passed]: ( localize(11836, 'Passed')),
-    [TestResultState.Queued]: ( localize(11837, 'Queued')),
-    [TestResultState.Running]: ( localize(11838, 'Running')),
-    [TestResultState.Skipped]: ( localize(11839, 'Skipped')),
-    [TestResultState.Unset]: ( localize(11840, 'Not yet run')),
+    [TestResultState.Errored]: ( localize(12052, 'Errored')),
+    [TestResultState.Failed]: ( localize(12053, 'Failed')),
+    [TestResultState.Passed]: ( localize(12054, 'Passed')),
+    [TestResultState.Queued]: ( localize(12055, 'Queued')),
+    [TestResultState.Running]: ( localize(12056, 'Running')),
+    [TestResultState.Skipped]: ( localize(12057, 'Skipped')),
+    [TestResultState.Unset]: ( localize(12058, 'Not yet run')),
 };
-const labelForTestInState = (label, state) => ( localize(11841, '{0} ({1})', stripIcons(label), testStateNames[state]));
+const labelForTestInState = (label, state) => ( localize(12059, '{0} ({1})', stripIcons(label), testStateNames[state]));
 const testConfigurationGroupNames = {
-    [TestRunProfileBitset.Debug]: ( localize(11842, 'Debug')),
-    [TestRunProfileBitset.Run]: ( localize(11843, 'Run')),
-    [TestRunProfileBitset.Coverage]: ( localize(11844, 'Coverage')),
+    [TestRunProfileBitset.Debug]: ( localize(12060, 'Debug')),
+    [TestRunProfileBitset.Run]: ( localize(12061, 'Run')),
+    [TestRunProfileBitset.Coverage]: ( localize(12062, 'Coverage')),
 };
 var TestCommandId;
 (function (TestCommandId) {
@@ -57,8 +57,10 @@ var TestCommandId;
     TestCommandId["CoverageFilterToTestInEditor"] = "testing.coverageFilterToTestInEditor";
     TestCommandId["CoverageLastRun"] = "testing.coverageLastRun";
     TestCommandId["CoverageSelectedAction"] = "testing.coverageSelected";
+    TestCommandId["CoverageToggleInExplorer"] = "testing.toggleCoverageInExplorer";
     TestCommandId["CoverageToggleToolbar"] = "testing.coverageToggleToolbar";
     TestCommandId["CoverageViewChangeSorting"] = "testing.coverageViewChangeSorting";
+    TestCommandId["CoverageViewCollapseAll"] = "testing.coverageViewCollapseAll";
     TestCommandId["DebugAction"] = "testing.debug";
     TestCommandId["DebugAllAction"] = "testing.debugAll";
     TestCommandId["DebugAtCursor"] = "testing.debugAtCursor";

package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js

@@ -46,9 +46,9 @@ var TestRunProfileBitset;
     TestRunProfileBitset[TestRunProfileBitset["SupportsContinuousRun"] = 64] = "SupportsContinuousRun";
 })(TestRunProfileBitset || (TestRunProfileBitset = {}));
 const testProfileBitset = {
-    [TestRunProfileBitset.Run]: ( localize(11849, 'Run')),
-    [TestRunProfileBitset.Debug]: ( localize(11850, 'Debug')),
-    [TestRunProfileBitset.Coverage]: ( localize(11851, 'Coverage')),
+    [TestRunProfileBitset.Run]: ( localize(12067, 'Run')),
+    [TestRunProfileBitset.Debug]: ( localize(12068, 'Debug')),
+    [TestRunProfileBitset.Coverage]: ( localize(12069, 'Coverage')),
 };
 const testRunProfileBitsetList = [
     TestRunProfileBitset.Run,

package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.d.ts

@@ -8,29 +8,9 @@ import { ILogService } from "../../../../platform/log/common/log.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IWorkbenchContribution } from "../../../common/contributions.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
+import { IDefaultAccount } from "../../../../base/common/defaultAccount.js";
 import { IDefaultAccountService } from "./defaultAccount.service.js";
 export declare const DEFAULT_ACCOUNT_SIGN_IN_COMMAND = "workbench.actions.accounts.signIn";
-export interface IDefaultAccount {
-    readonly sessionId: string;
-    readonly enterprise: boolean;
-    readonly access_type_sku?: string;
-    readonly assigned_date?: string;
-    readonly can_signup_for_limited?: boolean;
-    readonly chat_enabled?: boolean;
-    readonly chat_preview_features_enabled?: boolean;
-    readonly mcp?: boolean;
-    readonly analytics_tracking_id?: string;
-    readonly limited_user_quotas?: {
-        readonly chat: number;
-        readonly completions: number;
-    };
-    readonly monthly_quotas?: {
-        readonly chat: number;
-        readonly completions: number;
-    };
-    readonly limited_user_reset_date?: string;
-    readonly chat_agent_enabled?: boolean;
-}
 export declare class DefaultAccountService extends Disposable implements IDefaultAccountService {
     _serviceBrand: undefined;
     private _defaultAccount;
@@ -66,5 +46,6 @@ export declare class DefaultAccountManagementContribution extends Disposable imp
     private scopesMatch;
     private getTokenEntitlements;
     private getChatEntitlements;
+    private getMcpRegistryProvider;
     private registerSignInAction;
 }

package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.js

@@ -48,7 +48,7 @@ class NullDefaultAccountService extends Disposable {
         if (!this.productService.defaultAccount) {
             return;
         }
-        const { authenticationProvider, tokenEntitlementUrl, chatEntitlementUrl } = this.productService.defaultAccount;
+        const { authenticationProvider, tokenEntitlementUrl, chatEntitlementUrl, mcpRegistryDataUrl } = this.productService.defaultAccount;
         await this.extensionService.whenInstalledExtensionsRegistered();
         const declaredProvider = this.authenticationService.declaredProviders.find(provider => provider.id === authenticationProvider.id);
         if (!declaredProvider) {
@@ -56,7 +56,7 @@ class NullDefaultAccountService extends Disposable {
             return;
         }
         this.registerSignInAction(authenticationProvider.id, declaredProvider.label, authenticationProvider.enterpriseProviderId, authenticationProvider.enterpriseProviderConfig, authenticationProvider.scopes);
-        this.setDefaultAccount(await this.getDefaultAccountFromAuthenticatedSessions(authenticationProvider.id, authenticationProvider.enterpriseProviderId, authenticationProvider.enterpriseProviderConfig, authenticationProvider.scopes, tokenEntitlementUrl, chatEntitlementUrl));
+        this.setDefaultAccount(await this.getDefaultAccountFromAuthenticatedSessions(authenticationProvider.id, authenticationProvider.enterpriseProviderId, authenticationProvider.enterpriseProviderConfig, authenticationProvider.scopes, tokenEntitlementUrl, chatEntitlementUrl, mcpRegistryDataUrl));
         this._register(this.authenticationService.onDidChangeSessions(async (e) => {
             if (e.providerId !== authenticationProvider.id && e.providerId !== authenticationProvider.enterpriseProviderId) {
                 return;
@@ -65,7 +65,7 @@ class NullDefaultAccountService extends Disposable {
                 this.setDefaultAccount(null);
                 return;
             }
-            this.setDefaultAccount(await this.getDefaultAccountFromAuthenticatedSessions(authenticationProvider.id, authenticationProvider.enterpriseProviderId, authenticationProvider.enterpriseProviderConfig, authenticationProvider.scopes, tokenEntitlementUrl, chatEntitlementUrl));
+            this.setDefaultAccount(await this.getDefaultAccountFromAuthenticatedSessions(authenticationProvider.id, authenticationProvider.enterpriseProviderId, authenticationProvider.enterpriseProviderConfig, authenticationProvider.scopes, tokenEntitlementUrl, chatEntitlementUrl, mcpRegistryDataUrl));
         }));
     }
     setDefaultAccount(account) {
@@ -89,7 +89,7 @@ class NullDefaultAccountService extends Disposable {
         this.logService.trace(`DefaultAccount#extractFromToken: ${JSON.stringify(Object.fromEntries(result))}`);
         return result;
     }
-    async getDefaultAccountFromAuthenticatedSessions(authProviderId, enterpriseAuthProviderId, enterpriseAuthProviderConfig, scopes, tokenEntitlementUrl, chatEntitlementUrl) {
+    async getDefaultAccountFromAuthenticatedSessions(authProviderId, enterpriseAuthProviderId, enterpriseAuthProviderConfig, scopes, tokenEntitlementUrl, chatEntitlementUrl, mcpRegistryDataUrl) {
         const id = this.configurationService.getValue(enterpriseAuthProviderConfig) === enterpriseAuthProviderId ? enterpriseAuthProviderId : authProviderId;
         const sessions = await this.authenticationService.getSessions(id, undefined, undefined, true);
         const session = sessions.find(s => this.scopesMatch(s.scopes, scopes));
@@ -98,13 +98,16 @@ class NullDefaultAccountService extends Disposable {
         }
         const [chatEntitlements, tokenEntitlements] = await Promise.all([
             this.getChatEntitlements(session.accessToken, chatEntitlementUrl),
-            this.getTokenEntitlements(session.accessToken, tokenEntitlementUrl)
+            this.getTokenEntitlements(session.accessToken, tokenEntitlementUrl),
         ]);
+        const mcpRegistryProvider = this.productService.quality !== 'stable' && tokenEntitlements.mcp && this.configurationService.getValue('chat.mcp.enterprise.registry.enabled') === true ? await this.getMcpRegistryProvider(session.accessToken, mcpRegistryDataUrl) : undefined;
         return {
             sessionId: session.id,
             enterprise: id === enterpriseAuthProviderId || session.account.label.includes('_'),
             ...chatEntitlements,
             ...tokenEntitlements,
+            mcpRegistryUrl: mcpRegistryProvider?.url,
+            mcpAccess: mcpRegistryProvider?.registry_access,
         };
     }
     scopesMatch(scopes, expectedScopes) {
@@ -163,13 +166,38 @@ class NullDefaultAccountService extends Disposable {
         }
         return {};
     }
+    async getMcpRegistryProvider(accessToken, mcpRegistryDataUrl) {
+        if (!mcpRegistryDataUrl) {
+            return undefined;
+        }
+        try {
+            const context = await this.requestService.request({
+                type: 'GET',
+                url: mcpRegistryDataUrl,
+                disableCache: true,
+                headers: {
+                    'Authorization': `Bearer ${accessToken}`
+                }
+            }, CancellationToken.None);
+            const data = await asJson(context);
+            if (data) {
+                this.logService.debug('Fetched MCP registry providers', data.mcp_registries);
+                return data.mcp_registries[0];
+            }
+            this.logService.error('Failed to fetch MCP registry providers', 'No data returned');
+        }
+        catch (error) {
+            this.logService.error('Failed to fetch MCP registry providers', getErrorMessage(error));
+        }
+        return undefined;
+    }
     registerSignInAction(authProviderId, authProviderLabel, enterpriseAuthProviderId, enterpriseAuthProviderConfig, scopes) {
         const that = this;
         this._register(registerAction2(class extends Action2 {
             constructor() {
                 super({
                     id: DEFAULT_ACCOUNT_SIGN_IN_COMMAND,
-                    title: ( localize(12722, "Sign in to {0}", authProviderLabel)),
+                    title: ( localize(12920, "Sign in to {0}", authProviderLabel)),
                 });
             }
             run() {

package/vscode/src/vs/workbench/services/accounts/common/defaultAccount.service.d.ts

@@ -1,5 +1,5 @@
+import { IDefaultAccount } from "../../../../base/common/defaultAccount.js";
 import { Event } from "../../../../base/common/event.js";
-import { IDefaultAccount } from "./defaultAccount.js";
 export declare const IDefaultAccountService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IDefaultAccountService>;
 export interface IDefaultAccountService {
     readonly _serviceBrand: undefined;

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

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ViewContainer } from "../../../common/views.js";
-import { IActivity } from "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common/vscode/vs/workbench/services/activity/common/activity";
+import { IActivity } from "@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common/vscode/vs/workbench/services/activity/common/activity";
 export declare const IActivityService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IActivityService>;
 export interface IActivityService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/assignment/common/assignmentService.service.d.ts

@@ -1,4 +1,4 @@
-import { IAssignmentService } from "@codingame/monaco-vscode-configuration-service-override/vscode/vs/platform/assignment/common/assignment";
+import { IAssignmentService } from "../../../../platform/assignment/common/assignment.js";
 export declare const IWorkbenchAssignmentService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkbenchAssignmentService>;
 export interface IWorkbenchAssignmentService extends IAssignmentService {
     getCurrentExperiments(): Promise<string[] | undefined>;

package/vscode/src/vs/workbench/services/authentication/browser/authenticationUsageService.service.d.ts

@@ -30,5 +30,5 @@ export interface IAuthenticationUsageService {
     * @param extensionId The id of the extension to add a usage for
     * @param extensionName The name of the extension to add a usage for
     */
-    addAccountUsage(providerId: string, accountName: string, scopes: ReadonlyArray<string>, extensionId: string, extensionName: string): void;
+    addAccountUsage(providerId: string, accountName: string, scopes: ReadonlyArray<string> | undefined, extensionId: string, extensionName: string): void;
 }