Merge pull request microsoft#250672 from microsoft/copilot/fix-250671

Tyriar · web-flow · commit 887037b90da6 · 2025-06-06T07:48:32.000-07:00
Add workbench.action.terminal.sendSignal command
diff --git a/src/vs/platform/terminal/common/terminal.ts b/src/vs/platform/terminal/common/terminal.ts
@@ -330,6 +330,7 @@ export interface IPtyService {
 	start(id: number): Promise<ITerminalLaunchError | { injectedArgs: string[] } | undefined>;
 	shutdown(id: number, immediate: boolean): Promise<void>;
 	input(id: number, data: string): Promise<void>;
+	sendSignal(id: number, signal: string): Promise<void>;
 	resize(id: number, cols: number, rows: number): Promise<void>;
 	clearBuffer(id: number): Promise<void>;
 	getInitialCwd(id: number): Promise<string>;
@@ -786,6 +787,7 @@ export interface ITerminalChildProcess {
 	 */
 	shutdown(immediate: boolean): void;
 	input(data: string): void;
+	sendSignal(signal: string): void;
 	processBinary(data: string): Promise<void>;
 	resize(cols: number, rows: number): void;
 	clearBuffer(): void | Promise<void>;
diff --git a/src/vs/platform/terminal/node/ptyHostService.ts b/src/vs/platform/terminal/node/ptyHostService.ts
@@ -248,6 +248,9 @@ export class PtyHostService extends Disposable implements IPtyHostService {
 	input(id: number, data: string): Promise<void> {
 		return this._proxy.input(id, data);
 	}
+	sendSignal(id: number, signal: string): Promise<void> {
+		return this._proxy.sendSignal(id, signal);
+	}
 	processBinary(id: number, data: string): Promise<void> {
 		return this._proxy.processBinary(id, data);
 	}
diff --git a/src/vs/platform/terminal/node/ptyService.ts b/src/vs/platform/terminal/node/ptyService.ts
@@ -422,6 +422,10 @@ export class PtyService extends Disposable implements IPtyService {
 		}
 	}
 	@traceRpc
+	async sendSignal(id: number, signal: string): Promise<void> {
+		return this._throwIfNoPty(id).sendSignal(signal);
+	}
+	@traceRpc
 	async processBinary(id: number, data: string): Promise<void> {
 		return this._throwIfNoPty(id).writeBinary(data);
 	}
@@ -856,6 +860,12 @@ class PersistentTerminalProcess extends Disposable {
 		}
 		return this._terminalProcess.input(data);
 	}
+	sendSignal(signal: string): void {
+		if (this._inReplay) {
+			return;
+		}
+		return this._terminalProcess.sendSignal(signal);
+	}
 	writeBinary(data: string): Promise<void> {
 		return this._terminalProcess.processBinary(data);
 	}
diff --git a/src/vs/platform/terminal/node/terminalProcess.ts b/src/vs/platform/terminal/node/terminalProcess.ts
@@ -469,6 +469,13 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		this._startWrite();
 	}
 
+	sendSignal(signal: string): void {
+		if (this._store.isDisposed || !this._ptyProcess) {
+			return;
+		}
+		this._ptyProcess.kill(signal);
+	}
+
 	async processBinary(data: string): Promise<void> {
 		this.input(data, true);
 	}
diff --git a/src/vs/server/node/remoteTerminalChannel.ts b/src/vs/server/node/remoteTerminalChannel.ts
@@ -128,6 +128,7 @@ export class RemoteTerminalChannel extends Disposable implements IServerChannel<
 
 			case RemoteTerminalChannelRequest.Start: return this._ptyHostService.start.apply(this._ptyHostService, args);
 			case RemoteTerminalChannelRequest.Input: return this._ptyHostService.input.apply(this._ptyHostService, args);
+			case RemoteTerminalChannelRequest.SendSignal: return this._ptyHostService.sendSignal.apply(this._ptyHostService, args);
 			case RemoteTerminalChannelRequest.AcknowledgeDataEvent: return this._ptyHostService.acknowledgeDataEvent.apply(this._ptyHostService, args);
 			case RemoteTerminalChannelRequest.Shutdown: return this._ptyHostService.shutdown.apply(this._ptyHostService, args);
 			case RemoteTerminalChannelRequest.Resize: return this._ptyHostService.resize.apply(this._ptyHostService, args);
diff --git a/src/vs/workbench/api/common/extHostTerminalService.ts b/src/vs/workbench/api/common/extHostTerminalService.ts
@@ -334,6 +334,11 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {
 		this._pty.handleInput?.(data);
 	}
 
+	sendSignal(signal: string): void {
+		// Extension owned terminals don't support sending signals directly to processes
+		// This could be extended in the future if the pseudoterminal API is enhanced
+	}
+
 	resize(cols: number, rows: number): void {
 		this._pty.setDimensions?.({ columns: cols, rows });
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/remotePty.ts b/src/vs/workbench/contrib/terminal/browser/remotePty.ts
@@ -65,6 +65,16 @@ export class RemotePty extends BasePty implements ITerminalChildProcess {
 		});
 	}
 
+	sendSignal(signal: string): void {
+		if (this._inReplay) {
+			return;
+		}
+
+		this._startBarrier.wait().then(_ => {
+			this._remoteTerminalChannel.sendSignal(this.id, signal);
+		});
+	}
+
 	processBinary(e: string): Promise<void> {
 		return this._remoteTerminalChannel.processBinary(this.id, e);
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.ts b/src/vs/workbench/contrib/terminal/browser/terminal.ts
@@ -899,6 +899,13 @@ export interface ITerminalInstance extends IBaseTerminalInstance {
 	 */
 	sendText(text: string, shouldExecute: boolean, bracketedPasteMode?: boolean): Promise<void>;
 
+	/**
+	 * Sends a signal to the terminal instance's process.
+	 *
+	 * @param signal The signal to send (e.g., 'SIGTERM', 'SIGINT', 'SIGKILL').
+	 */
+	sendSignal(signal: string): Promise<void>;
+
 	/**
 	 * Sends a path to the terminal instance, preparing it as needed based on the detected shell
 	 * running within the terminal. The text is written to the stdin of the underlying pty process
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalActions.ts b/src/vs/workbench/contrib/terminal/browser/terminalActions.ts
@@ -25,7 +25,7 @@ import { ILabelService } from '../../../../platform/label/common/label.js';
 import { IListService } from '../../../../platform/list/browser/listService.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IPickOptions, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
+import { IPickOptions, IQuickInputService, IQuickPickItem, QuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { ITerminalProfile, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalSettingId } from '../../../../platform/terminal/common/terminal.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
 import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
@@ -166,6 +166,56 @@ export const terminalSendSequenceCommand = async (accessor: ServicesAccessor, ar
 	instance.sendText(resolvedText, false);
 };
 
+export const terminalSendSignalCommand = async (accessor: ServicesAccessor, args: unknown) => {
+	const quickInputService = accessor.get(IQuickInputService);
+	const instance = accessor.get(ITerminalService).activeInstance;
+	if (!instance) {
+		return;
+	}
+
+	let signal = isObject(args) && 'signal' in args ? toOptionalString(args.signal) : undefined;
+
+	if (!signal) {
+		const signalOptions: QuickPickItem[] = [
+			{ label: 'SIGINT', description: localize('SIGINT', 'Interrupt process (Ctrl+C)') },
+			{ label: 'SIGTERM', description: localize('SIGTERM', 'Terminate process gracefully') },
+			{ label: 'SIGKILL', description: localize('SIGKILL', 'Force kill process') },
+			{ label: 'SIGSTOP', description: localize('SIGSTOP', 'Stop process') },
+			{ label: 'SIGCONT', description: localize('SIGCONT', 'Continue process') },
+			{ label: 'SIGHUP', description: localize('SIGHUP', 'Hangup') },
+			{ label: 'SIGQUIT', description: localize('SIGQUIT', 'Quit process') },
+			{ label: 'SIGUSR1', description: localize('SIGUSR1', 'User-defined signal 1') },
+			{ label: 'SIGUSR2', description: localize('SIGUSR2', 'User-defined signal 2') },
+			{ type: 'separator' },
+			{ label: localize('manualSignal', 'Manually enter signal') }
+		];
+
+		const selected = await quickInputService.pick(signalOptions, {
+			placeHolder: localize('selectSignal', 'Select signal to send to terminal process')
+		});
+
+		if (!selected) {
+			return;
+		}
+
+		if (selected.label === localize('manualSignal', 'Manually enter signal')) {
+			const inputSignal = await quickInputService.input({
+				prompt: localize('enterSignal', 'Enter signal name (e.g., SIGTERM, SIGKILL)'),
+			});
+
+			if (!inputSignal) {
+				return;
+			}
+
+			signal = inputSignal;
+		} else {
+			signal = selected.label;
+		}
+	}
+
+	await instance.sendSignal(signal);
+};
+
 export class TerminalLaunchHelpAction extends Action {
 
 	constructor(
@@ -1005,6 +1055,29 @@ export function registerTerminalActions() {
 		run: (c, accessor, args) => terminalSendSequenceCommand(accessor, args)
 	});
 
+	registerTerminalAction({
+		id: TerminalCommandId.SendSignal,
+		title: terminalStrings.sendSignal,
+		f1: !isWindows,
+		metadata: {
+			description: terminalStrings.sendSignal.value,
+			args: [{
+				name: 'args',
+				schema: {
+					type: 'object',
+					required: ['signal'],
+					properties: {
+						signal: {
+							description: localize('sendSignal', "The signal to send to the terminal process (e.g., 'SIGTERM', 'SIGINT', 'SIGKILL')"),
+							type: 'string'
+						}
+					},
+				}
+			}]
+		},
+		run: (c, accessor, args) => terminalSendSignalCommand(accessor, args)
+	});
+
 	registerTerminalAction({
 		id: TerminalCommandId.NewWithCwd,
 		title: terminalStrings.newWithCwd,
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts b/src/vs/workbench/contrib/terminal/browser/terminalInstance.ts
@@ -1317,6 +1317,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {
 		}
 	}
 
+	async sendSignal(signal: string): Promise<void> {
+		this._logService.debug('sending signal (vscode)', signal);
+		await this._processManager.sendSignal(signal);
+	}
+
 	async sendPath(originalPath: string | URI, shouldExecute: boolean): Promise<void> {
 		return this.sendText(await this.preparePathForShell(originalPath), shouldExecute);
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.ts
@@ -120,6 +120,10 @@ export class TerminalProcessExtHostProxy extends Disposable implements ITerminal
 		this._onInput.fire(data);
 	}
 
+	sendSignal(signal: string): void {
+		// No-op - Extension terminals don't have direct process access
+	}
+
 	resize(cols: number, rows: number): void {
 		this._onResize.fire({ cols, rows });
 	}
diff --git a/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts b/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.ts
@@ -609,6 +609,13 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
 		}
 	}
 
+	async sendSignal(signal: string): Promise<void> {
+		await this.ptyProcessReady;
+		if (this._process) {
+			this._process.sendSignal(signal);
+		}
+	}
+
 	async processBinary(data: string): Promise<void> {
 		await this.ptyProcessReady;
 		this._dataFilter.disableSeamlessRelaunch();
diff --git a/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts b/src/vs/workbench/contrib/terminal/common/remote/remoteTerminalChannel.ts
@@ -216,6 +216,9 @@ export class RemoteTerminalChannelClient implements IPtyHostController {
 	input(id: number, data: string): Promise<void> {
 		return this._channel.call(RemoteTerminalChannelRequest.Input, [id, data]);
 	}
+	sendSignal(id: number, signal: string): Promise<void> {
+		return this._channel.call(RemoteTerminalChannelRequest.SendSignal, [id, signal]);
+	}
 	acknowledgeDataEvent(id: number, charCount: number): Promise<void> {
 		return this._channel.call(RemoteTerminalChannelRequest.AcknowledgeDataEvent, [id, charCount]);
 	}
diff --git a/src/vs/workbench/contrib/terminal/common/remote/terminal.ts b/src/vs/workbench/contrib/terminal/common/remote/terminal.ts
@@ -69,6 +69,7 @@ export const enum RemoteTerminalChannelRequest {
 	AcceptPtyHostResolvedVariables = '$acceptPtyHostResolvedVariables',
 	Start = '$start',
 	Input = '$input',
+	SendSignal = '$sendSignal',
 	AcknowledgeDataEvent = '$acknowledgeDataEvent',
 	Shutdown = '$shutdown',
 	Resize = '$resize',
diff --git a/src/vs/workbench/contrib/terminal/common/terminal.ts b/src/vs/workbench/contrib/terminal/common/terminal.ts
@@ -296,6 +296,7 @@ export interface ITerminalProcessManager extends IDisposable, ITerminalProcessIn
 	createProcess(shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number): Promise<ITerminalLaunchError | { injectedArgs: string[] } | undefined>;
 	relaunch(shellLaunchConfig: IShellLaunchConfig, cols: number, rows: number, reset: boolean): Promise<ITerminalLaunchError | { injectedArgs: string[] } | undefined>;
 	write(data: string): Promise<void>;
+	sendSignal(signal: string): Promise<void>;
 	setDimensions(cols: number, rows: number): Promise<void>;
 	setDimensions(cols: number, rows: number, sync: false): Promise<void>;
 	setDimensions(cols: number, rows: number, sync: true): void;
@@ -473,6 +474,7 @@ export const enum TerminalCommandId {
 	SelectToPreviousLine = 'workbench.action.terminal.selectToPreviousLine',
 	SelectToNextLine = 'workbench.action.terminal.selectToNextLine',
 	SendSequence = 'workbench.action.terminal.sendSequence',
+	SendSignal = 'workbench.action.terminal.sendSignal',
 	AttachToSession = 'workbench.action.terminal.attachToSession',
 	DetachSession = 'workbench.action.terminal.detachSession',
 	MoveToEditor = 'workbench.action.terminal.moveToEditor',
diff --git a/src/vs/workbench/contrib/terminal/common/terminalStrings.ts b/src/vs/workbench/contrib/terminal/common/terminalStrings.ts
@@ -37,6 +37,7 @@ export const terminalStrings = {
 	toggleSizeToContentWidth: localize2('workbench.action.terminal.sizeToContentWidthInstance', "Toggle Size to Content Width"),
 	focusHover: localize2('workbench.action.terminal.focusHover', "Focus Hover"),
 	sendSequence: localize2('workbench.action.terminal.sendSequence', "Send Custom Sequence to Terminal"),
+	sendSignal: localize2('workbench.action.terminal.sendSignal', "Send Signal"),
 	newWithCwd: localize2('workbench.action.terminal.newWithCwd', "Create New Terminal Starting in a Custom Working Directory"),
 	renameWithArgs: localize2('workbench.action.terminal.renameWithArg', "Rename the Currently Active Terminal"),
 	scrollToPreviousCommand: localize2('workbench.action.terminal.scrollToPreviousCommand', "Scroll to Previous Command"),
diff --git a/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts b/src/vs/workbench/contrib/terminal/electron-sandbox/localPty.ts
@@ -45,6 +45,13 @@ export class LocalPty extends BasePty implements ITerminalChildProcess {
 		this._proxy.input(this.id, data);
 	}
 
+	sendSignal(signal: string): void {
+		if (this._inReplay) {
+			return;
+		}
+		this._proxy.sendSignal(this.id, signal);
+	}
+
 	resize(cols: number, rows: number): void {
 		if (this._inReplay || this._lastDimensions.cols === cols && this._lastDimensions.rows === rows) {
 			return;
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalInstance.test.ts
@@ -83,6 +83,7 @@ class TestTerminalChildProcess extends Disposable implements ITerminalChildProce
 	async start(): Promise<undefined> { return undefined; }
 	shutdown(immediate: boolean): void { }
 	input(data: string): void { }
+	sendSignal(signal: string): void { }
 	resize(cols: number, rows: number): void { }
 	clearBuffer(): void { }
 	acknowledgeDataEvent(charCount: number): void { }
diff --git a/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalProcessManager.test.ts
@@ -39,6 +39,7 @@ class TestTerminalChildProcess implements ITerminalChildProcess {
 	async start(): Promise<undefined> { return undefined; }
 	shutdown(immediate: boolean): void { }
 	input(data: string): void { }
+	sendSignal(signal: string): void { }
 	resize(cols: number, rows: number): void { }
 	clearBuffer(): void { }
 	acknowledgeDataEvent(charCount: number): void { }
diff --git a/src/vs/workbench/services/terminal/common/embedderTerminalService.ts b/src/vs/workbench/services/terminal/common/embedderTerminalService.ts
@@ -118,6 +118,9 @@ class EmbedderTerminalProcess extends Disposable implements ITerminalChildProces
 	input(): void {
 		// not supported
 	}
+	sendSignal(): void {
+		// not supported
+	}
 	async processBinary(): Promise<void> {
 		// not supported
 	}

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,9 @@ export class PtyHostService extends Disposable implements IPtyHostService {`
`248`	`248`	`input(id: number, data: string): Promise<void> {`
`249`	`249`	`return this._proxy.input(id, data);`
`250`	`250`	`}`
	`251`	`+ sendSignal(id: number, signal: string): Promise<void> {`
	`252`	`+ return this._proxy.sendSignal(id, signal);`
	`253`	`+ }`
`251`	`254`	`processBinary(id: number, data: string): Promise<void> {`
`252`	`255`	`return this._proxy.processBinary(id, data);`
`253`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -422,6 +422,10 @@ export class PtyService extends Disposable implements IPtyService {`
`422`	`422`	`}`
`423`	`423`	`}`
`424`	`424`	`@traceRpc`
	`425`	`+ async sendSignal(id: number, signal: string): Promise<void> {`
	`426`	`+ return this._throwIfNoPty(id).sendSignal(signal);`
	`427`	`+ }`
	`428`	`+ @traceRpc`
`425`	`429`	`async processBinary(id: number, data: string): Promise<void> {`
`426`	`430`	`return this._throwIfNoPty(id).writeBinary(data);`
`427`	`431`	`}`
`@@ -856,6 +860,12 @@ class PersistentTerminalProcess extends Disposable {`
`856`	`860`	`}`
`857`	`861`	`return this._terminalProcess.input(data);`
`858`	`862`	`}`
	`863`	`+ sendSignal(signal: string): void {`
	`864`	`+ if (this._inReplay) {`
	`865`	`+ return;`
	`866`	`+ }`
	`867`	`+ return this._terminalProcess.sendSignal(signal);`
	`868`	`+ }`
`859`	`869`	`writeBinary(data: string): Promise<void> {`
`860`	`870`	`return this._terminalProcess.processBinary(data);`
`861`	`871`	`}`
Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,13 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess`
`469`	`469`	`this._startWrite();`
`470`	`470`	`}`
`471`	`471`
	`472`	`+ sendSignal(signal: string): void {`
	`473`	`+ if (this._store.isDisposed \|\| !this._ptyProcess) {`
	`474`	`+ return;`
	`475`	`+ }`
	`476`	`+ this._ptyProcess.kill(signal);`
	`477`	`+ }`
	`478`	`+`
`472`	`479`	`async processBinary(data: string): Promise<void> {`
`473`	`480`	`this.input(data, true);`
`474`	`481`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,11 @@ class ExtHostPseudoterminal implements ITerminalChildProcess {`
`334`	`334`	`this._pty.handleInput?.(data);`
`335`	`335`	`}`
`336`	`336`
	`337`	`+ sendSignal(signal: string): void {`
	`338`	`+ // Extension owned terminals don't support sending signals directly to processes`
	`339`	`+ // This could be extended in the future if the pseudoterminal API is enhanced`
	`340`	`+ }`
	`341`	`+`
`337`	`342`	`resize(cols: number, rows: number): void {`
`338`	`343`	`this._pty.setDimensions?.({ columns: cols, rows });`
`339`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1317,6 +1317,11 @@ export class TerminalInstance extends Disposable implements ITerminalInstance {`
`1317`	`1317`	`}`
`1318`	`1318`	`}`
`1319`	`1319`
	`1320`	`+ async sendSignal(signal: string): Promise<void> {`
	`1321`	`+ this._logService.debug('sending signal (vscode)', signal);`
	`1322`	`+ await this._processManager.sendSignal(signal);`
	`1323`	`+ }`
	`1324`	`+`
`1320`	`1325`	`async sendPath(originalPath: string \| URI, shouldExecute: boolean): Promise<void> {`
`1321`	`1326`	`return this.sendText(await this.preparePathForShell(originalPath), shouldExecute);`
`1322`	`1327`	`}`