@codingame/monaco-vscode-api 21.5.1 → 22.0.0

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

@@ -1,6 +1,6 @@
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
+import { IMultiDiffSourceResolver, IResolvedMultiDiffSource } from "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService";
 export declare const IMultiDiffSourceResolverService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMultiDiffSourceResolverService>;
 export interface IMultiDiffSourceResolverService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/contrib/scm/common/history.d.ts

@@ -16,7 +16,9 @@ export interface ISCMHistoryProvider {
     provideHistoryItemRefs(historyItemsRefs?: string[], token?: CancellationToken): Promise<ISCMHistoryItemRef[] | undefined>;
     provideHistoryItems(options: ISCMHistoryOptions, token?: CancellationToken): Promise<ISCMHistoryItem[] | undefined>;
     provideHistoryItemChanges(historyItemId: string, historyItemParentId: string | undefined, token?: CancellationToken): Promise<ISCMHistoryItemChange[] | undefined>;
+    resolveHistoryItem(historyItemId: string, token?: CancellationToken): Promise<ISCMHistoryItem | undefined>;
     resolveHistoryItemChatContext(historyItemId: string, token?: CancellationToken): Promise<string | undefined>;
+    resolveHistoryItemChangeRangeChatContext(historyItemId: string, historyItemParentId: string, path: string, token?: CancellationToken): Promise<string | undefined>;
     resolveHistoryItemRefsCommonAncestor(historyItemRefs: string[], token?: CancellationToken): Promise<string | undefined>;
 }
 export interface ISCMHistoryOptions {

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js

@@ -27,7 +27,7 @@ class SnippetCompletion {
     constructor(snippet, range) {
         this.snippet = snippet;
         this.label = { label: snippet.prefix, description: snippet.name };
-        this.detail = ( localize(10445, "{0} ({1})", snippet.description || snippet.name, snippet.source));
+        this.detail = ( localize(10536, "{0} ({1})", snippet.description || snippet.name, snippet.source));
         this.insertText = snippet.codeSnippet;
         this.extensionId = snippet.extensionId;
         this.range = range;
@@ -121,14 +121,14 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
             let to = i + 1;
             for (; to < suggestions.length && item.label === suggestions[to].label; to++) {
                 suggestions[to].label.label = ( localize(
-                    10446,
+                    10537,
                     "{0}, {1}",
                     suggestions[to].label.label,
                     suggestions[to].snippet.name
                 ));
             }
             if (to > i + 1) {
-                suggestions[i].label.label = ( localize(10446, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
+                suggestions[i].label.label = ( localize(10537, "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name));
                 i = to;
             }
         }

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js

@@ -207,14 +207,14 @@ class SnippetFile {
             source = this._extension.displayName || this._extension.name;
         }
         else if (this.source === SnippetSource.Workspace) {
-            source = ( localize(10462, "Workspace Snippet"));
+            source = ( localize(10553, "Workspace Snippet"));
         }
         else {
             if (this.isGlobalSnippets) {
-                source = ( localize(10463, "Global User Snippet"));
+                source = ( localize(10554, "Global User Snippet"));
             }
             else {
-                source = ( localize(10464, "User Snippet"));
+                source = ( localize(10555, "User Snippet"));
             }
         }
         for (const _prefix of Iterable.wrap(prefix)) {

package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js

@@ -34,7 +34,7 @@ var snippetExt;
     function toValidSnippet(extension, snippet, languageService) {
         if (isFalsyOrWhitespace(snippet.path)) {
             extension.collector.error(( localize(
-                10465,
+                10556,
                 "Expected string in `contributes.{0}.path`. Provided value: {1}",
                 extension.description.name,
                 String(snippet.path)
@@ -43,7 +43,7 @@ var snippetExt;
         }
         if (isFalsyOrWhitespace(snippet.language) && !snippet.path.endsWith('.code-snippets')) {
             extension.collector.error(( localize(
-                10466,
+                10557,
                 "When omitting the language, the value of `contributes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}",
                 extension.description.name,
                 String(snippet.path)
@@ -52,7 +52,7 @@ var snippetExt;
         }
         if (!isFalsyOrWhitespace(snippet.language) && !languageService.isRegisteredLanguageId(snippet.language)) {
             extension.collector.error(( localize(
-                10467,
+                10558,
                 "Unknown language in `contributes.{0}.language`. Provided value: {1}",
                 extension.description.name,
                 String(snippet.language)
@@ -63,7 +63,7 @@ var snippetExt;
         const snippetLocation = joinPath(extensionLocation, snippet.path);
         if (!isEqualOrParent(snippetLocation, extensionLocation)) {
             extension.collector.error(( localize(
-                10468,
+                10559,
                 "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
                 extension.description.name,
                 snippetLocation.path,
@@ -78,7 +78,7 @@ var snippetExt;
     }
     snippetExt.toValidSnippet = toValidSnippet;
     snippetExt.snippetsContribution = {
-        description: ( localize(10469, 'Contributes snippets.')),
+        description: ( localize(10560, 'Contributes snippets.')),
         type: 'array',
         defaultSnippets: [{ body: [{ language: '', path: '' }] }],
         items: {
@@ -86,12 +86,12 @@ var snippetExt;
             defaultSnippets: [{ body: { language: '${1:id}', path: './snippets/${2:id}.json.' } }],
             properties: {
                 language: {
-                    description: ( localize(10470, 'Language identifier for which this snippet is contributed to.')),
+                    description: ( localize(10561, 'Language identifier for which this snippet is contributed to.')),
                     type: 'string'
                 },
                 path: {
                     description: ( localize(
-                        10471,
+                        10562,
                         'Path of the snippets file. The path is relative to the extension folder and typically starts with \'./snippets/\'.'
                     )),
                     type: 'string'
@@ -336,14 +336,14 @@ let SnippetsService = class SnippetsService {
                             file.load().then(file => {
                                 if (( file.data.some(snippet => snippet.isBogous))) {
                                     extension.collector.warn(( localize(
-                                        10472,
+                                        10563,
                                         "One or more snippets from the extension '{0}' very likely confuse snippet-variables and snippet-placeholders (see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax for more details)",
                                         extension.description.name
                                     )));
                                 }
                             }, err => {
                                 extension.collector.warn(( localize(
-                                    10473,
+                                    10564,
                                     "The snippet file \"{0}\" could not be read.",
                                     (file.location.toString())
                                 )));

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(10477, "A speech provider is registered to the speech service.")) }));
+const HasSpeechProvider = ( new RawContextKey('hasSpeechProvider', false, { type: 'boolean', description: ( localize(10568, "A speech provider is registered to the speech service.")) }));
 const SpeechToTextInProgress = ( new RawContextKey(
     'speechToTextInProgress',
     false,
-    { type: 'boolean', description: ( localize(10478, "A speech-to-text session is in progress.")) }
+    { type: 'boolean', description: ( localize(10569, "A speech-to-text session is in progress.")) }
 ));
 const TextToSpeechInProgress = ( new RawContextKey(
     'textToSpeechInProgress',
     false,
-    { type: 'boolean', description: ( localize(10479, "A text-to-speech session is in progress.")) }
+    { type: 'boolean', description: ( localize(10570, "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(10480, "Danish (Denmark)"))
+        name: ( localize(10571, "Danish (Denmark)"))
     },
     ['de-DE']: {
-        name: ( localize(10481, "German (Germany)"))
+        name: ( localize(10572, "German (Germany)"))
     },
     ['en-AU']: {
-        name: ( localize(10482, "English (Australia)"))
+        name: ( localize(10573, "English (Australia)"))
     },
     ['en-CA']: {
-        name: ( localize(10483, "English (Canada)"))
+        name: ( localize(10574, "English (Canada)"))
     },
     ['en-GB']: {
-        name: ( localize(10484, "English (United Kingdom)"))
+        name: ( localize(10575, "English (United Kingdom)"))
     },
     ['en-IE']: {
-        name: ( localize(10485, "English (Ireland)"))
+        name: ( localize(10576, "English (Ireland)"))
     },
     ['en-IN']: {
-        name: ( localize(10486, "English (India)"))
+        name: ( localize(10577, "English (India)"))
     },
     ['en-NZ']: {
-        name: ( localize(10487, "English (New Zealand)"))
+        name: ( localize(10578, "English (New Zealand)"))
     },
     ['en-US']: {
-        name: ( localize(10488, "English (United States)"))
+        name: ( localize(10579, "English (United States)"))
     },
     ['es-ES']: {
-        name: ( localize(10489, "Spanish (Spain)"))
+        name: ( localize(10580, "Spanish (Spain)"))
     },
     ['es-MX']: {
-        name: ( localize(10490, "Spanish (Mexico)"))
+        name: ( localize(10581, "Spanish (Mexico)"))
     },
     ['fr-CA']: {
-        name: ( localize(10491, "French (Canada)"))
+        name: ( localize(10582, "French (Canada)"))
     },
     ['fr-FR']: {
-        name: ( localize(10492, "French (France)"))
+        name: ( localize(10583, "French (France)"))
     },
     ['hi-IN']: {
-        name: ( localize(10493, "Hindi (India)"))
+        name: ( localize(10584, "Hindi (India)"))
     },
     ['it-IT']: {
-        name: ( localize(10494, "Italian (Italy)"))
+        name: ( localize(10585, "Italian (Italy)"))
     },
     ['ja-JP']: {
-        name: ( localize(10495, "Japanese (Japan)"))
+        name: ( localize(10586, "Japanese (Japan)"))
     },
     ['ko-KR']: {
-        name: ( localize(10496, "Korean (South Korea)"))
+        name: ( localize(10587, "Korean (South Korea)"))
     },
     ['nl-NL']: {
-        name: ( localize(10497, "Dutch (Netherlands)"))
+        name: ( localize(10588, "Dutch (Netherlands)"))
     },
     ['pt-PT']: {
-        name: ( localize(10498, "Portuguese (Portugal)"))
+        name: ( localize(10589, "Portuguese (Portugal)"))
     },
     ['pt-BR']: {
-        name: ( localize(10499, "Portuguese (Brazil)"))
+        name: ( localize(10590, "Portuguese (Brazil)"))
     },
     ['ru-RU']: {
-        name: ( localize(10500, "Russian (Russia)"))
+        name: ( localize(10591, "Russian (Russia)"))
     },
     ['sv-SE']: {
-        name: ( localize(10501, "Swedish (Sweden)"))
+        name: ( localize(10592, "Swedish (Sweden)"))
     },
     ['tr-TR']: {
-        name: ( localize(10502, "Turkish (Türkiye)"))
+        name: ( localize(10593, "Turkish (Türkiye)"))
     },
     ['zh-CN']: {
-        name: ( localize(10503, "Chinese (Simplified, China)"))
+        name: ( localize(10594, "Chinese (Simplified, China)"))
     },
     ['zh-HK']: {
-        name: ( localize(10504, "Chinese (Traditional, Hong Kong)"))
+        name: ( localize(10595, "Chinese (Traditional, Hong Kong)"))
     },
     ['zh-TW']: {
-        name: ( localize(10505, "Chinese (Traditional, Taiwan)"))
+        name: ( localize(10596, "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(10708, 'View icon of the rerun task.')));
+const rerunTaskIcon = registerIcon('rerun-task', Codicon.refresh, ( localize(10805, '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(
-                10915,
+                11013,
                 '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(10916, 'Additional properties of the task type')),
+            description: ( localize(11014, '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(
-                10917,
+                11015,
                 '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(
-                10918,
+                11016,
                 'The task type configuration is missing the required \'taskType\' property'
             )));
             return undefined;
@@ -73,15 +73,15 @@ var Configuration;
 })(Configuration || (Configuration = {}));
 const taskDefinitionsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'taskDefinitions',
-    activationEventsGenerator: (contributions, result) => {
+    activationEventsGenerator: function* (contributions) {
         for (const task of contributions) {
             if (task.type) {
-                result.push(`onTaskType:${task.type}`);
+                yield `onTaskType:${task.type}`;
             }
         }
     },
     jsonSchema: {
-        description: ( localize(10919, 'Contributes task kinds')),
+        description: ( localize(11017, 'Contributes task kinds')),
         type: 'array',
         items: taskDefinitionSchema
     }

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

@@ -17,7 +17,7 @@ export interface ITaskService {
     onDidReconnectToTasks: Event<void>;
     supportsMultipleTaskExecutions: boolean;
     configureAction(): Action;
-    run(task: Task | undefined, options?: IProblemMatcherRunOptions): Promise<ITaskSummary | undefined>;
+    run(task: Task | undefined, options?: IProblemMatcherRunOptions, runSource?: TaskRunSource): Promise<ITaskSummary | undefined>;
     inTerminal(): boolean;
     getActiveTasks(): Promise<Task[]>;
     getBusyTasks(): Promise<Task[]>;

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

@@ -180,6 +180,10 @@ export interface IPresentationOptions {
      * Controls whether the terminal that the task runs in is closed when the task completes.
      */
     close?: boolean;
+    /**
+     * Controls whether to preserve the task name in the terminal after task completion.
+     */
+    preserveTerminalName?: boolean;
 }
 export declare namespace PresentationOptions {
     const defaults: IPresentationOptions;
@@ -615,6 +619,12 @@ export interface ITaskProcessEndedEvent extends ITaskCommon {
     kind: TaskEventKind.ProcessEnded;
     terminalId: number | undefined;
     exitCode?: number;
+    durationMs?: number;
+}
+export interface ITaskInactiveEvent extends ITaskCommon {
+    kind: TaskEventKind.Inactive;
+    terminalId: number | undefined;
+    durationMs: number | undefined;
 }
 export interface ITaskTerminatedEvent extends ITaskCommon {
     kind: TaskEventKind.Terminated;
@@ -640,12 +650,14 @@ export declare enum TaskRunSource {
     User = 1,
     FolderOpen = 2,
     ConfigurationChange = 3,
-    Reconnect = 4
+    Reconnect = 4,
+    ChatAgent = 5
 }
 export declare namespace TaskEvent {
     function start(task: Task, terminalId: number, resolvedVariables: Map<string, string>): ITaskStartedEvent;
     function processStarted(task: Task, terminalId: number, processId: number): ITaskProcessStartedEvent;
-    function processEnded(task: Task, terminalId: number | undefined, exitCode: number | undefined): ITaskProcessEndedEvent;
+    function processEnded(task: Task, terminalId: number | undefined, exitCode: number | undefined, durationMs?: number): ITaskProcessEndedEvent;
+    function inactive(task: Task, terminalId?: number, durationMs?: number): ITaskInactiveEvent;
     function terminated(task: Task, terminalId: number, exitReason: TerminalExitReason | undefined): ITaskTerminatedEvent;
     function general(kind: TaskEventKind.AcquiredInput | TaskEventKind.DependsOnStarted | TaskEventKind.Active | TaskEventKind.Inactive | TaskEventKind.End | TaskEventKind.ProblemMatcherStarted | TaskEventKind.ProblemMatcherFoundErrors, task: Task, terminalId?: number): ITaskGeneralEvent;
     function problemMatcherEnded(task: Task, hasErrors: boolean, terminalId?: number): ITaskProblemMatcherEndedEvent;
@@ -666,7 +678,8 @@ export declare enum TaskSettingId {
     QuickOpenShowAll = "task.quickOpen.showAll",
     AllowAutomaticTasks = "task.allowAutomaticTasks",
     Reconnection = "task.reconnection",
-    VerboseLogging = "task.verboseLogging"
+    VerboseLogging = "task.verboseLogging",
+    NotifyWindowOnTaskCompletion = "task.notifyWindowOnTaskCompletion"
 }
 export declare enum TasksSchemaProperties {
     Tasks = "tasks",

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(10930, "Whether a task is currently running."))));
-const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(10931, "Whether the active terminal is a task terminal."))));
-const TASKS_CATEGORY = ( localize2(10932, "Tasks"));
+const TASK_RUNNING_STATE = ( new RawContextKey('taskRunning', false, ( localize(11028, "Whether a task is currently running."))));
+const TASK_TERMINAL_ACTIVE = ( new RawContextKey('taskTerminalActive', false, ( localize(11029, "Whether the active terminal is a task terminal."))));
+const TASKS_CATEGORY = ( localize2(11030, "Tasks"));
 var ShellQuoting;
 (function (ShellQuoting) {
     ShellQuoting[ShellQuoting["Escape"] = 1] = "Escape";
@@ -107,7 +107,7 @@ var PanelKind;
 var PresentationOptions;
 (function (PresentationOptions) {
     PresentationOptions.defaults = {
-        echo: true, reveal: RevealKind.Always, revealProblems: RevealProblemKind.Never, focus: false, panel: PanelKind.Shared, showReuseMessage: true, clear: false
+        echo: true, reveal: RevealKind.Always, revealProblems: RevealProblemKind.Never, focus: false, panel: PanelKind.Shared, showReuseMessage: true, clear: false, preserveTerminalName: false
     };
 })(PresentationOptions || (PresentationOptions = {}));
 var RuntimeType;
@@ -624,6 +624,7 @@ var TaskRunSource;
     TaskRunSource[TaskRunSource["FolderOpen"] = 2] = "FolderOpen";
     TaskRunSource[TaskRunSource["ConfigurationChange"] = 3] = "ConfigurationChange";
     TaskRunSource[TaskRunSource["Reconnect"] = 4] = "Reconnect";
+    TaskRunSource[TaskRunSource["ChatAgent"] = 5] = "ChatAgent";
 })(TaskRunSource || (TaskRunSource = {}));
 var TaskEvent;
 (function (TaskEvent) {
@@ -654,15 +655,25 @@ var TaskEvent;
         };
     }
     TaskEvent.processStarted = processStarted;
-    function processEnded(task, terminalId, exitCode) {
+    function processEnded(task, terminalId, exitCode, durationMs) {
         return {
             ...common(task),
             kind: TaskEventKind.ProcessEnded,
             terminalId,
             exitCode,
+            durationMs,
         };
     }
     TaskEvent.processEnded = processEnded;
+    function inactive(task, terminalId, durationMs) {
+        return {
+            ...common(task),
+            kind: TaskEventKind.Inactive,
+            terminalId,
+            durationMs,
+        };
+    }
+    TaskEvent.inactive = inactive;
     function terminated(task, terminalId, exitReason) {
         return {
             ...common(task),
@@ -732,6 +743,7 @@ var TaskSettingId;
     TaskSettingId["AllowAutomaticTasks"] = "task.allowAutomaticTasks";
     TaskSettingId["Reconnection"] = "task.reconnection";
     TaskSettingId["VerboseLogging"] = "task.verboseLogging";
+    TaskSettingId["NotifyWindowOnTaskCompletion"] = "task.notifyWindowOnTaskCompletion";
 })(TaskSettingId || (TaskSettingId = {}));
 var TasksSchemaProperties;
 (function (TasksSchemaProperties) {
@@ -782,7 +794,7 @@ var TaskDefinition;
                             break;
                         default:
                             reporter.error(( localize(
-                                10933,
+                                11031,
                                 '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.service.d.ts

@@ -2,7 +2,7 @@ import { Orientation } from "../../../../base/browser/ui/sash/sash.js";
 import { Event, DynamicListEventMultiplexer, IDynamicListEventMultiplexer } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
 import { TerminalCapability, ITerminalCapabilityImplMap } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
-import { TerminalLocation, ITerminalBackend, ITerminalLaunchError, type IShellLaunchConfig, type ITerminalProfile } from "../../../../platform/terminal/common/terminal.js";
+import { ITerminalBackend, ITerminalLaunchError, TerminalLocation, type IShellLaunchConfig, type ITerminalProfile } from "../../../../platform/terminal/common/terminal.js";
 import { GroupIdentifier } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
 import { IEditableData } from "../../../common/views.js";
@@ -18,7 +18,6 @@ export interface ITerminalService extends ITerminalInstanceHost {
     readonly instances: readonly ITerminalInstance[];
     /** Gets detached terminal instances created via {@link createDetachedXterm}. */
     readonly detachedInstances: Iterable<IDetachedTerminalInstance>;
-    readonly defaultLocation: TerminalLocation;
     readonly isProcessSupportRegistered: boolean;
     readonly connectionState: TerminalConnectionState;
     readonly whenConnected: Promise<void>;
@@ -68,7 +67,6 @@ export interface ITerminalService extends ITerminalInstanceHost {
     * Creates a raw terminal instance, this should not be used outside of the terminal part.
     */
     getInstanceFromId(terminalId: number): ITerminalInstance | undefined;
-    getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
     /**
     * An owner of terminals might be created after reconnection has occurred,
     * so store them to be requested/adopted later
@@ -93,16 +91,11 @@ export interface ITerminalService extends ITerminalInstanceHost {
     setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
     requestStartExtensionTerminal(proxy: ITerminalProcessExtHostProxy, cols: number, rows: number): Promise<ITerminalLaunchError | undefined>;
     isAttachedToTerminal(remoteTerm: IRemoteTerminalAttachTarget): boolean;
-    getEditableData(instance: ITerminalInstance): IEditableData | undefined;
-    setEditable(instance: ITerminalInstance, data: IEditableData | null): void;
-    isEditable(instance: ITerminalInstance | undefined): boolean;
     safeDisposeTerminal(instance: ITerminalInstance): Promise<void>;
     getDefaultInstanceHost(): ITerminalInstanceHost;
     getInstanceHost(target: ITerminalLocationOptions | undefined): Promise<ITerminalInstanceHost>;
     resolveLocation(location?: ITerminalLocationOptions): Promise<TerminalLocation | undefined>;
     setNativeDelegate(nativeCalls: ITerminalServiceNativeDelegate): void;
-    getEditingTerminal(): ITerminalInstance | undefined;
-    setEditingTerminal(instance: ITerminalInstance | undefined): void;
     /**
     * Creates an instance event listener that listens to all instances, dynamically adding new
     * instances and removing old instances as needed.
@@ -131,6 +124,10 @@ export interface ITerminalConfigurationService {
     */
     readonly config: Readonly<ITerminalConfiguration>;
     /**
+    * The default location for terminals.
+    */
+    readonly defaultLocation: TerminalLocation;
+    /**
     * Fires when something within the terminal configuration changes.
     */
     readonly onConfigChanged: Event<void>;
@@ -155,6 +152,43 @@ export interface ITerminalEditorService extends ITerminalInstanceHost {
     reviveInput(deserializedInput: IDeserializedTerminalEditorInput): EditorInput;
     getInputFromResource(resource: URI): TerminalEditorInput;
 }
+export declare const ITerminalEditingService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalEditingService>;
+/**
+* A service responsible for managing terminal editing state and functionality. This includes
+* tracking which terminal is currently being edited and managing editable data associated with
+* terminal instances.
+*/
+export interface ITerminalEditingService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Get the editable data for a terminal instance.
+    * @param instance The terminal instance.
+    * @returns The editable data if the instance is editable, undefined otherwise.
+    */
+    getEditableData(instance: ITerminalInstance): IEditableData | undefined;
+    /**
+    * Set the editable data for a terminal instance.
+    * @param instance The terminal instance.
+    * @param data The editable data to set, or null to clear.
+    */
+    setEditable(instance: ITerminalInstance, data: IEditableData | null): void;
+    /**
+    * Check if a terminal instance is currently editable.
+    * @param instance The terminal instance to check.
+    * @returns True if the instance is editable, false otherwise.
+    */
+    isEditable(instance: ITerminalInstance | undefined): boolean;
+    /**
+    * Get the terminal instance that is currently being edited.
+    * @returns The terminal instance being edited, or undefined if none.
+    */
+    getEditingTerminal(): ITerminalInstance | undefined;
+    /**
+    * Set the terminal instance that is currently being edited.
+    * @param instance The terminal instance to set as editing, or undefined to clear.
+    */
+    setEditingTerminal(instance: ITerminalInstance | undefined): void;
+}
 export declare const ITerminalGroupService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ITerminalGroupService>;
 /**
 * This service is responsible for managing terminal groups, that is the terminals that are hosted

package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.js

@@ -4,7 +4,8 @@ import { createDecorator } from '../../../../platform/instantiation/common/insta
 const ITerminalService = ( createDecorator('terminalService'));
 const ITerminalConfigurationService = ( createDecorator('terminalConfigurationService'));
 const ITerminalEditorService = ( createDecorator('terminalEditorService'));
+const ITerminalEditingService = ( createDecorator('terminalEditingService'));
 const ITerminalGroupService = ( createDecorator('terminalGroupService'));
 const ITerminalInstanceService = ( createDecorator('terminalInstanceService'));
 
-export { ITerminalConfigurationService, ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService };
+export { ITerminalConfigurationService, ITerminalEditingService, ITerminalEditorService, ITerminalGroupService, ITerminalInstanceService, ITerminalService };

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

@@ -86,6 +86,7 @@ export declare enum TestCommandId {
     TestingViewAsListAction = "testing.viewAsList",
     TestingViewAsTreeAction = "testing.viewAsTree",
     ToggleContinousRunForTest = "testing.toggleContinuousRunForTest",
+    ToggleResultsViewLayoutAction = "testing.toggleResultsViewLayout",
     ToggleInlineTestOutput = "testing.toggleInlineTestOutput",
     UnhideAllTestsAction = "testing.unhideAllTests",
     UnhideTestAction = "testing.unhideTest"

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(12065, 'Errored')),
-    [TestResultState.Failed]: ( localize(12066, 'Failed')),
-    [TestResultState.Passed]: ( localize(12067, 'Passed')),
-    [TestResultState.Queued]: ( localize(12068, 'Queued')),
-    [TestResultState.Running]: ( localize(12069, 'Running')),
-    [TestResultState.Skipped]: ( localize(12070, 'Skipped')),
-    [TestResultState.Unset]: ( localize(12071, 'Not yet run')),
+    [TestResultState.Errored]: ( localize(12182, 'Errored')),
+    [TestResultState.Failed]: ( localize(12183, 'Failed')),
+    [TestResultState.Passed]: ( localize(12184, 'Passed')),
+    [TestResultState.Queued]: ( localize(12185, 'Queued')),
+    [TestResultState.Running]: ( localize(12186, 'Running')),
+    [TestResultState.Skipped]: ( localize(12187, 'Skipped')),
+    [TestResultState.Unset]: ( localize(12188, 'Not yet run')),
 };
-const labelForTestInState = (label, state) => ( localize(12072, '{0} ({1})', stripIcons(label), testStateNames[state]));
+const labelForTestInState = (label, state) => ( localize(12189, '{0} ({1})', stripIcons(label), testStateNames[state]));
 const testConfigurationGroupNames = {
-    [TestRunProfileBitset.Debug]: ( localize(12073, 'Debug')),
-    [TestRunProfileBitset.Run]: ( localize(12074, 'Run')),
-    [TestRunProfileBitset.Coverage]: ( localize(12075, 'Coverage')),
+    [TestRunProfileBitset.Debug]: ( localize(12190, 'Debug')),
+    [TestRunProfileBitset.Run]: ( localize(12191, 'Run')),
+    [TestRunProfileBitset.Coverage]: ( localize(12192, 'Coverage')),
 };
 var TestCommandId;
 (function (TestCommandId) {
@@ -107,6 +107,7 @@ var TestCommandId;
     TestCommandId["TestingViewAsListAction"] = "testing.viewAsList";
     TestCommandId["TestingViewAsTreeAction"] = "testing.viewAsTree";
     TestCommandId["ToggleContinousRunForTest"] = "testing.toggleContinuousRunForTest";
+    TestCommandId["ToggleResultsViewLayoutAction"] = "testing.toggleResultsViewLayout";
     TestCommandId["ToggleInlineTestOutput"] = "testing.toggleInlineTestOutput";
     TestCommandId["UnhideAllTestsAction"] = "testing.unhideAllTests";
     TestCommandId["UnhideTestAction"] = "testing.unhideTest";

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(12080, 'Run')),
-    [TestRunProfileBitset.Debug]: ( localize(12081, 'Debug')),
-    [TestRunProfileBitset.Coverage]: ( localize(12082, 'Coverage')),
+    [TestRunProfileBitset.Run]: ( localize(12197, 'Run')),
+    [TestRunProfileBitset.Debug]: ( localize(12198, 'Debug')),
+    [TestRunProfileBitset.Coverage]: ( localize(12199, 'Coverage')),
 };
 const testRunProfileBitsetList = [
     TestRunProfileBitset.Run,