wip #236972

Author: meganrogge

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

@@ -453,6 +453,10 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		return this.inTerminal();
 	}
 
+	public async getTaskForTerminal(instanceId: number): Promise<Task | undefined> {
+		return this._taskSystem?.getTaskForTerminal(instanceId);
+	}
+
 	private async _registerCommands(): Promise<void> {
 		CommandsRegistry.registerCommand({
 			id: 'workbench.action.tasks.runTask',

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

@@ -1823,6 +1823,16 @@ export class TerminalTaskSystem extends Disposable implements ITaskSystem {
 		return 'other';
 	}
 
+	public getTaskForTerminal(instanceId: number): Task | undefined {
+		for (const key in this._activeTasks) {
+			const activeTask = this._activeTasks[key];
+			if (activeTask.terminal?.instanceId === instanceId) {
+				return activeTask.task;
+			}
+		}
+		return undefined;
+	}
+
 	private _appendOutput(output: string): void {
 		const outputChannel = this._outputService.getChannel(this._outputChannelId);
 		outputChannel?.append(output);

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

@@ -77,6 +77,7 @@ export interface ITaskService {
 	getBusyTasks(): Promise<Task[]>;
 	terminate(task: Task): Promise<ITaskTerminateResponse>;
 	tasks(filter?: ITaskFilter): Promise<Task[]>;
+	getTaskForTerminal(instanceId: number): Promise<Task | undefined>;
 	/**
 	 * Gets tasks currently known to the task system. Unlike {@link tasks},
 	 * this does not activate extensions or prompt for workspace trust.

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

@@ -116,4 +116,5 @@ export interface ITaskSystem {
 	revealTask(task: Task): boolean;
 	customExecutionComplete(task: Task, result: number): Promise<void>;
 	isTaskVisible(task: Task): boolean;
+	getTaskForTerminal(instanceId: number): Task | undefined;
 }

src/vs/workbench/contrib/terminal/browser/terminalActions.ts

@@ -62,6 +62,7 @@ import { editorGroupToColumn } from '../../../services/editor/common/editorGroup
 import { InstanceContext } from './terminalContextMenu.js';
 import { AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { TerminalTabList } from './terminalTabsList.js';
+import { ITaskService } from '../../tasks/common/taskService.js';
 
 export const switchTerminalActionViewItemSeparator = '\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500';
 export const switchTerminalShowTabsTitle = localize('showTerminalTabs', "Show Tabs");
@@ -1434,6 +1435,24 @@ export function registerTerminalActions() {
 			}
 		}
 	});
+
+	registerTerminalAction({
+		id: TerminalCommandId.RerunTaskTerminal,
+		title: localize2('workbench.action.terminal.rerunTaskTerminal', 'Rerun Task Terminal'),
+		precondition: sharedWhenClause.terminalAvailable,
+		run: async (c, accessor, args) => {
+			const terminalService = accessor.get(ITerminalService);
+			const taskSystem = accessor.get(ITaskService);
+			const instance = terminalService.activeInstance;
+
+			if (instance) {
+				const task = await taskSystem.getTaskForTerminal(instance.instanceId);
+				if (task) {
+					await taskSystem.run(task);
+				}
+			}
+		}
+	});
 }
 
 interface IRemoteTerminalPick extends IQuickPickItem {

src/vs/workbench/contrib/terminal/common/terminal.ts

@@ -480,6 +480,7 @@ export const enum TerminalCommandId {
 	ShowEnvironmentContributions = 'workbench.action.terminal.showEnvironmentContributions',
 	StartVoice = 'workbench.action.terminal.startVoice',
 	StopVoice = 'workbench.action.terminal.stopVoice',
+	RerunTaskTerminal = 'workbench.action.terminal.rerunTaskTerminal',
 }
 
 export const DEFAULT_COMMANDS_TO_SKIP_SHELL: string[] = [