Inline Linux/macOS process-tree termination in client dispose path (#1761)

* Initial plan

* Inline process termination script and remove external shell dependency

* Address review feedback for termination script and test messaging

* Add pid validation guard for inline termination script

* Add typed serverProcess getter and remove any cast in shutdown-timeout test

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Author: Copilot

client-node-tests/src/integration.test.ts

@@ -89,6 +89,25 @@ function isFullDocumentDiagnosticReport(value: vsdiag.DocumentDiagnosticReport):
 	assert.ok(value.kind === vsdiag.DocumentDiagnosticReportKind.full);
 }
 
+function processExists(pid: number): boolean {
+	try {
+		process.kill(pid, 0);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+async function waitForProcessExit(pid: number, timeout: number): Promise<void> {
+	const start = Date.now();
+	while (processExists(pid)) {
+		if (Date.now() - start > timeout) {
+			throw new Error(`Process ${pid} did not exit within ${timeout} ms.`);
+		}
+		await new Promise((resolve) => setTimeout(resolve, 50));
+	}
+}
+
 interface FoldingRangeTestFeature {
 	getRegistration(documentSelector: lsclient.DocumentSelector | undefined, capability: undefined | lsclient.FoldingRangeOptions | (lsclient.FoldingRangeRegistrationOptions & lsclient.StaticRegistrationOptions)): [string | undefined, (lsclient.FoldingRangeRegistrationOptions & { documentSelector: lsclient.DocumentSelector }) | undefined];
 	getRegistrationOptions(documentSelector: lsclient.DocumentSelector | undefined, capability: undefined | lsclient.FoldingRangeOptions) : (lsclient.FoldingRangeRegistrationOptions & { documentSelector: lsclient.DocumentSelector }) | undefined;
@@ -2002,10 +2021,13 @@ suite('Server tests', () => {
 		const clientOptions: lsclient.LanguageClientOptions = {};
 		const client = new lsclient.LanguageClient('test svr', 'Test Language Server', serverOptions, clientOptions);
 		await client.start();
+		const serverPid = client.serverProcess?.pid;
+		assert.strictEqual(typeof serverPid, 'number');
 
 		await assert.rejects(async () => {
 			await client.stop(100);
 		}, /Stopping the server timed out/);
+		await waitForProcessExit(serverPid!, 10000);
 	});
 
 	test('Server can\'t be stopped right after start', async() => {

client/package.json

@@ -48,14 +48,14 @@
 	"scripts": {
 		"prepublishOnly": "echo \"⛔ Can only publish from a secure pipeline ⛔\" && node ../build/npm/fail",
 		"prepack": "npm run all:publish",
-		"compile": "tsc -b ./tsconfig.json && shx cp src/node/terminateProcess.sh lib/node/terminateProcess.sh",
+		"compile": "tsc -b ./tsconfig.json",
 		"compile:clean": "git clean -xfd . && npm install && npm run clean && npm run compile",
 		"watch": "tsc -b ./tsconfig.watch.json -w",
 		"lint": "eslint src",
 		"test": "cd ../client-node-tests && npm test && cd ../client",
 		"clean": "rimraf lib",
 		"all": "npm run clean && npm run compile && npm run lint && npm test",
-		"compile:publish": "tsc -b ./tsconfig.publish.json && shx cp src/node/terminateProcess.sh lib/node/terminateProcess.sh",
+		"compile:publish": "tsc -b ./tsconfig.publish.json",
 		"all:publish": "git clean -xfd . && npm install && npm run updateVSCodeVersion && npm run compile:publish && npm run lint && cd ../client-node-tests && npm run all:publish && cd ..",
 		"preversion": "npm test",
 		"updateVSCodeVersion": "node ./bin/updateVSCode.js",

client/src/node/main.ts

@@ -189,6 +189,10 @@ export class LanguageClient extends BaseLanguageClient {
 		return this._isInDebugMode;
 	}
 
+	public get serverProcess(): ChildProcess | undefined {
+		return this._serverProcess;
+	}
+
 	public async restart(): Promise<void> {
 		await this.stop();
 		// We are in debug mode. Wait a little before we restart

client/src/node/processes.ts

@@ -6,8 +6,6 @@
 import * as cp from 'child_process';
 import ChildProcess = cp.ChildProcess;
 
-import { join } from 'path';
-
 const isWindows = (process.platform === 'win32');
 const isMacintosh = (process.platform === 'darwin');
 const isLinux = (process.platform === 'linux');
@@ -30,8 +28,24 @@ export function terminate(process: ChildProcess & { pid: number }, cwd?: string)
 		}
 	} else if (isLinux || isMacintosh) {
 		try {
-			const cmd = join(__dirname, 'terminateProcess.sh');
-			const result = (<any>cp).spawnSync(cmd, [process.pid.toString()]);
+			const pid = process.pid.toString();
+			if (!/^\d+$/.test(pid)) {
+				return false;
+			}
+			const script = `
+terminateTree() {
+	for cpid in $(pgrep -P "$1"); do
+		terminateTree "$cpid"
+	done
+	kill -9 "$1" > /dev/null 2>&1
+}
+
+terminateTree "${pid}"
+`;
+			const result = (<any>cp).spawnSync('/bin/sh', [], {
+				input: script,
+				stdio: ['pipe', 'inherit', 'inherit']
+			});
 			return result.error ? false : true;
 		} catch (err) {
 			return false;
@@ -40,4 +54,4 @@ export function terminate(process: ChildProcess & { pid: number }, cwd?: string)
 		process.kill('SIGKILL');
 		return true;
 	}
-}
+}