in testing copilot edit agent, start wip #241772

src/vs/platform/extensions/common/extensionsApiProposals.ts

@@ -361,6 +361,9 @@ const _allApiProposals = {
 	terminalShellType: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
 	},
+	terminalTaskStatus: {
+		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalTaskStatus.d.ts',
+	},
 	testObserver: {
 		proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
 	},

src/vs/workbench/api/browser/mainThreadTask.ts

@@ -29,7 +29,8 @@ import { ExtHostContext, MainThreadTaskShape, ExtHostTaskShape, MainContext } fr
 import {
 	ITaskDefinitionDTO, ITaskExecutionDTO, IProcessExecutionOptionsDTO, ITaskPresentationOptionsDTO,
 	IProcessExecutionDTO, IShellExecutionDTO, IShellExecutionOptionsDTO, ICustomExecutionDTO, ITaskDTO, ITaskSourceDTO, ITaskHandleDTO, ITaskFilterDTO, ITaskProcessStartedDTO, ITaskProcessEndedDTO, ITaskSystemInfoDTO,
-	IRunOptionsDTO, ITaskGroupDTO
+	IRunOptionsDTO, ITaskGroupDTO,
+	TaskTerminalStatusDTO
 } from '../common/shared/tasks.js';
 import { IConfigurationResolverService } from '../../services/configurationResolver/common/configurationResolver.js';
 import { ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
@@ -455,6 +456,8 @@ export class MainThreadTask extends Disposable implements MainThreadTaskShape {
 			} else if (event.kind === TaskEventKind.End) {
 				this._proxy.$OnDidEndTask(TaskExecutionDTO.from(task.getTaskExecution()));
 			}
+			//TODO@meganrogge fix
+			this._proxy.$onDidChangeTaskTerminalStatus(TaskTerminalStatusDTO.from({ terminalId: 1, status: event.kind.toString() }));
 		}));
 	}
 
@@ -735,5 +738,4 @@ export class MainThreadTask extends Disposable implements MainThreadTaskShape {
 	async $registerSupportedExecutions(custom?: boolean, shell?: boolean, process?: boolean): Promise<void> {
 		return this._taskService.registerSupportedExecutions(custom, shell, process);
 	}
-
 }

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -1355,6 +1355,11 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			},
 			onDidEndTaskProcess: (listeners, thisArgs?, disposables?) => {
 				return _asExtensionEvent(extHostTask.onDidEndTaskProcess)(listeners, thisArgs, disposables);
+			},
+			onDidChangeTaskStatus: (listeners, thisArgs?, disposables?) => {
+				// TODO@meganrogge
+				// checkProposedApiEnabled(extension, 'taskTerminalStatus');
+				return _asExtensionEvent(extHostTask.onDidChangeTaskTerminalStatus)(listeners, thisArgs, disposables);
 			}
 		};
 

src/vs/workbench/api/common/extHost.protocol.ts

@@ -2552,6 +2552,7 @@ export interface ExtHostTaskShape {
 	$onDidStartTaskProcess(value: tasks.ITaskProcessStartedDTO): void;
 	$onDidEndTaskProcess(value: tasks.ITaskProcessEndedDTO): void;
 	$OnDidEndTask(execution: tasks.ITaskExecutionDTO): void;
+	$onDidChangeTaskTerminalStatus(status: tasks.ITaskTerminalStatusDTO): void;
 	$resolveVariables(workspaceFolder: UriComponents, toResolve: { process?: { name: string; cwd?: string }; variables: string[] }): Promise<{ process?: string; variables: { [key: string]: string } }>;
 	$jsonTasksSupported(): Promise<boolean>;
 	$findExecutable(command: string, cwd?: string, paths?: string[]): Promise<string | undefined>;

src/vs/workbench/api/common/extHostTask.ts

@@ -29,6 +29,7 @@ import { IExtHostApiDeprecationService } from './extHostApiDeprecationService.js
 import { USER_TASKS_GROUP_KEY } from '../../contrib/tasks/common/tasks.js';
 import { ErrorNoTelemetry, NotSupportedError } from '../../../base/common/errors.js';
 import { asArray } from '../../../base/common/arrays.js';
+import { ITaskTerminalStatusDTO } from './shared/tasks.js';
 
 export interface IExtHostTask extends ExtHostTaskShape {
 
@@ -39,6 +40,7 @@ export interface IExtHostTask extends ExtHostTaskShape {
 	onDidEndTask: Event<vscode.TaskEndEvent>;
 	onDidStartTaskProcess: Event<vscode.TaskProcessStartEvent>;
 	onDidEndTaskProcess: Event<vscode.TaskProcessEndEvent>;
+	onDidChangeTaskTerminalStatus: Event<vscode.TaskTerminalStatus>;  // Fixed the event type back to Event<TaskTerminalStatus>
 
 	registerTaskProvider(extension: IExtensionDescription, type: string, provider: vscode.TaskProvider): vscode.Disposable;
 	registerTaskSystem(scheme: string, info: tasks.ITaskSystemInfoDTO): void;
@@ -406,6 +408,7 @@ export abstract class ExtHostTaskBase implements ExtHostTaskShape, IExtHostTask
 
 	protected readonly _onDidTaskProcessStarted: Emitter<vscode.TaskProcessStartEvent> = new Emitter<vscode.TaskProcessStartEvent>();
 	protected readonly _onDidTaskProcessEnded: Emitter<vscode.TaskProcessEndEvent> = new Emitter<vscode.TaskProcessEndEvent>();
+	protected readonly _onDidChangeTaskTerminalStatus: Emitter<vscode.TaskTerminalStatus> = new Emitter<vscode.TaskTerminalStatus>();
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
@@ -540,6 +543,17 @@ export abstract class ExtHostTaskBase implements ExtHostTaskShape, IExtHostTask
 		});
 	}
 
+	public get onDidChangeTaskTerminalStatus(): Event<vscode.TaskTerminalStatus> {
+		return this._onDidChangeTaskTerminalStatus.event;
+	}
+
+	public async $onDidChangeTaskTerminalStatus(value: ITaskTerminalStatusDTO): Promise<void> {
+		this._onDidChangeTaskTerminalStatus.fire({
+			terminalId: value.terminalId,
+			status: value.status
+		});
+	}
+
 	protected abstract provideTasksInternal(validTypes: { [key: string]: boolean }, taskIdPromises: Promise<void>[], handler: HandlerData, value: vscode.Task[] | null | undefined): { tasks: tasks.ITaskDTO[]; extension: IExtensionDescription };
 
 	public $provideTasks(handle: number, validTypes: { [key: string]: boolean }): Promise<tasks.ITaskSetDTO> {

src/vs/workbench/api/common/shared/tasks.ts

@@ -137,3 +137,29 @@ export interface ITaskSystemInfoDTO {
 	authority: string;
 	platform: string;
 }
+
+export interface ITaskTerminalStatus {
+	terminalId: number;
+	status: string;
+}
+
+export interface ITaskTerminalStatusDTO {
+	terminalId: number;
+	status: string;
+}
+
+export namespace TaskTerminalStatusDTO {
+	export function from(value: ITaskTerminalStatus): ITaskTerminalStatusDTO {
+		return {
+			terminalId: value.terminalId,
+			status: value.status
+		};
+	}
+
+	export function to(value: ITaskTerminalStatusDTO): ITaskTerminalStatus {
+		return {
+			terminalId: value.terminalId,
+			status: value.status
+		};
+	}
+}

src/vs/workbench/api/node/extHostTask.ts

@@ -27,6 +27,7 @@ import { homedir } from 'os';
 import { IExtHostVariableResolverProvider } from '../common/extHostVariableResolverService.js';
 
 export class ExtHostTask extends ExtHostTaskBase {
+
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
 		@IExtHostInitDataService initData: IExtHostInitDataService,

src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts

@@ -48,7 +48,7 @@ import { ITerminalGroupService, ITerminalService } from '../../terminal/browser/
 import { ITerminalProfileResolverService } from '../../terminal/common/terminal.js';
 
 import { ConfiguringTask, ContributedTask, CustomTask, ExecutionEngine, InMemoryTask, ITaskEvent, ITaskIdentifier, ITaskSet, JsonSchemaVersion, KeyedTaskIdentifier, RuntimeType, Task, TASK_RUNNING_STATE, TaskDefinition, TaskEventKind, TaskGroup, TaskRunSource, TaskSettingId, TaskSorter, TaskSourceKind, TasksSchemaProperties, USER_TASKS_GROUP_KEY } from '../common/tasks.js';
-import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
+import { CustomExecutionSupportedContext, ICustomizationProperties, IProblemMatcherRunOptions, ITaskFilter, ITaskProvider, ITaskService, ITaskTerminalStatus, IWorkspaceFolderTaskResult, ProcessExecutionSupportedContext, ServerlessWebContext, ShellExecutionSupportedContext, TaskCommandsRegistered, TaskExecutionSupportedContext } from '../common/taskService.js';
 import { ITaskExecuteResult, ITaskResolver, ITaskSummary, ITaskSystem, ITaskSystemInfo, ITaskTerminateResponse, TaskError, TaskErrors, TaskExecuteKind } from '../common/taskSystem.js';
 import { getTemplates as getTaskTemplates } from '../common/taskTemplates.js';
 
@@ -237,6 +237,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 	public get isReconnected(): boolean { return this._tasksReconnected; }
 	private _onDidChangeTaskProviders = this._register(new Emitter<void>());
 	public onDidChangeTaskProviders = this._onDidChangeTaskProviders.event;
+	private _onDidChangeTaskTerminalStatus: Emitter<ITaskTerminalStatus> = new Emitter<ITaskTerminalStatus>();
+	public readonly onDidChangeTaskTerminalStatus: Event<ITaskTerminalStatus> = this._onDidChangeTaskTerminalStatus.event;
 
 	private _activatedTaskProviders: Set<string> = new Set();
 

src/vs/workbench/contrib/tasks/common/taskService.ts

@@ -108,3 +108,8 @@ export interface ITaskService {
 
 	extensionCallbackTaskComplete(task: Task, result: number | undefined): Promise<void>;
 }
+
+export interface ITaskTerminalStatus {
+	terminalId: number;
+	status: string;
+}

src/vscode-dts/vscode.proposed.terminalTaskStatus.d.ts

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+
+declare module 'vscode' {
+	export interface TaskTerminalStatus {
+		terminalId: number;
+		status: string;
+	}
+	export namespace tasks {
+
+		/**
+		 * An event that is emitted when the status of a terminal task changes.
+		 */
+		export const onDidChangeTaskStatus: Event<TaskTerminalStatus>;
+	}
+
+}