fix: improve SSH process discovery and sleep/wake recovery (#846)

- Detect SSH port changes in the Remote SSH log to reset discovery
backoff after sleep/wake.
- Re-register the label formatter when the SSH PID changes.
- Bump `find-process` to 2.1.1: uses `ss` -> `netstat` -> `lsof` on
Linux, `netstat` -> `lsof` on macOS, fixing systems where `netstat` was
unavailable and the SSH PID could not be resolved (broke network info
display and log viewing).

Closes #845

Author: EhabY

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+### Fixed
+
+- SSH connections now recover faster after laptop sleep/wake by detecting port changes
+  and re-registering the label formatter.
+- SSH process discovery now uses `ss` -> `netstat` -> `lsof` on Linux
+  and `netstat` -> `lsof` on macOS, fixing systems where `netstat` was unavailable
+  and the SSH PID could not be resolved, which broke network info display and log viewing.
+
 ## [v1.14.1-pre](https://github.com/coder/vscode-coder/releases/tag/v1.14.1-pre) 2026-03-16
 
 ### Added

package.json

@@ -507,7 +507,7 @@
 		"axios": "1.13.6",
 		"date-fns": "catalog:",
 		"eventsource": "^4.1.0",
-		"find-process": "^2.1.0",
+		"find-process": "^2.1.1",
 		"jsonc-parser": "^3.3.1",
 		"openpgp": "^6.3.0",
 		"pretty-bytes": "^7.1.0",

pnpm-lock.yaml

@@ -232,6 +232,7 @@ export class CliManager {
 	): Promise<boolean> {
 		const choice = await vscodeProposed.window.showErrorMessage(
 			`${reason}. Run version ${version} anyway?`,
+			{ modal: true, useCustom: true },
 			"Run",
 		);
 		return choice === "Run";

src/core/cliManager.ts

@@ -512,20 +512,27 @@ export class Remote {
 
 			this.commands.workspaceLogPath = sshMonitor.getLogFilePath();
 
+			const reregisterLabelFormatter = () => {
+				labelFormatterDisposable.dispose();
+				labelFormatterDisposable = this.registerLabelFormatter(
+					remoteAuthority,
+					workspace.owner_name,
+					workspace.name,
+					agent.name,
+				);
+			};
+
 			disposables.push(
 				sshMonitor.onLogFilePathChange((newPath) => {
 					this.commands.workspaceLogPath = newPath;
 				}),
+				// Re-register label formatter when SSH process reconnects after sleep/wake
+				sshMonitor.onPidChange(() => {
+					reregisterLabelFormatter();
+				}),
 				// Register the label formatter again because SSH overrides it!
 				vscode.extensions.onDidChange(() => {
-					// Dispose previous label formatter
-					labelFormatterDisposable.dispose();
-					labelFormatterDisposable = this.registerLabelFormatter(
-						remoteAuthority,
-						workspace.owner_name,
-						workspace.name,
-						agent.name,
-					);
+					reregisterLabelFormatter();
 				}),
 				...(await this.createAgentMetadataStatusBar(agent, workspaceClient)),
 			);

src/remote/remote.ts

@@ -279,6 +279,7 @@ export class SshProcessMonitor implements vscode.Disposable {
 			this.options;
 		let attempt = 0;
 		let currentBackoff = discoveryPollIntervalMs;
+		let lastFoundPort: number | undefined;
 
 		while (!this.disposed) {
 			attempt++;
@@ -289,9 +290,25 @@ export class SshProcessMonitor implements vscode.Disposable {
 				);
 			}
 
-			const pidByPort = await this.findSshProcessByPort();
-			if (pidByPort !== undefined) {
-				this.setCurrentPid(pidByPort);
+			const { pid, port } = await this.findSshProcessByPort();
+
+			// Track port changes to reset backoff after VS Code reconnection
+			const portChanged =
+				lastFoundPort !== undefined &&
+				port !== undefined &&
+				port !== lastFoundPort;
+			if (portChanged) {
+				logger.debug(
+					`SSH port changed in log file: ${lastFoundPort} -> ${port}`,
+				);
+				currentBackoff = discoveryPollIntervalMs;
+			}
+			if (port !== undefined) {
+				lastFoundPort = port;
+			}
+
+			if (pid !== undefined) {
+				this.setCurrentPid(pid);
 				this.startMonitoring();
 				return;
 			}
@@ -305,7 +322,10 @@ export class SshProcessMonitor implements vscode.Disposable {
 	 * Finds SSH process by parsing the Remote SSH extension's log to get the port.
 	 * This is more accurate as each VS Code window has a unique port.
 	 */
-	private async findSshProcessByPort(): Promise<number | undefined> {
+	private async findSshProcessByPort(): Promise<{
+		pid?: number;
+		port?: number;
+	}> {
 		const { codeLogDir, remoteSshExtensionId, logger } = this.options;
 
 		try {
@@ -315,27 +335,31 @@ export class SshProcessMonitor implements vscode.Disposable {
 				logger,
 			);
 			if (!logPath) {
-				return undefined;
+				logger.debug("No Remote SSH log file found");
+				return {};
 			}
 
 			const logContent = await fs.readFile(logPath, "utf8");
-			this.options.logger.debug(`Read Remote SSH log file:`, logPath);
+			logger.debug(`Read Remote SSH log file:`, logPath);
 
 			const port = findPort(logContent);
 			if (!port) {
-				return undefined;
+				logger.debug(`No SSH port found in log file: ${logPath}`);
+				return {};
 			}
-			this.options.logger.debug(`Found SSH port ${port} in log file`);
+
+			logger.debug(`Found SSH port ${port} in log file`);
 
 			const processes = await find("port", port);
 			if (processes.length === 0) {
-				return undefined;
+				logger.debug(`No process found listening on port ${port}`);
+				return { port };
 			}
 
-			return processes[0].pid;
+			return { pid: processes[0].pid, port };
 		} catch (error) {
 			logger.debug("SSH process search failed", error);
-			return undefined;
+			return {};
 		}
 	}
 
@@ -579,6 +603,7 @@ async function findRemoteSshLogPath(
 
 		if (outputDirs.length > 0) {
 			const outputPath = path.join(logsParentDir, outputDirs[0]);
+			logger.debug(`Using Remote SSH log directory: ${outputPath}`);
 			const remoteSshLog = await findSshLogInDir(outputPath);
 			if (remoteSshLog) {
 				return remoteSshLog;

src/remote/sshProcess.ts

@@ -36,6 +36,7 @@ describe("SshProcessMonitor", () => {
 	});
 
 	afterEach(() => {
+		vi.useRealTimers();
 		for (const m of activeMonitors) {
 			m.dispose();
 		}
@@ -204,6 +205,58 @@ describe("SshProcessMonitor", () => {
 			expect(pids).toContain(888);
 		});
 
+		it("resets backoff when port changes in log file", async () => {
+			vi.useFakeTimers();
+
+			vol.fromJSON({
+				"/logs/ms-vscode-remote.remote-ssh/1-Remote - SSH.log":
+					"-> socksPort 11111 ->",
+			});
+			vi.mocked(find).mockResolvedValue([]);
+
+			const pollInterval = 100;
+			const logger = createMockLogger();
+			const monitor = createMonitor({
+				codeLogDir: "/logs/window1",
+				discoveryPollIntervalMs: pollInterval,
+				maxDiscoveryBackoffMs: 10_000,
+				logger,
+			});
+
+			const pids: Array<number | undefined> = [];
+			monitor.onPidChange((pid) => pids.push(pid));
+
+			// Backoff doubles each iteration: 100, 200, 400, 800, 1600, ...
+			// Total after 5 iterations = pollInterval * (2^5 - 1) = 3100ms
+			const fiveIterationsMs = pollInterval * (2 ** 5 - 1);
+			await vi.advanceTimersByTimeAsync(fiveIterationsMs - 1);
+			expect(logger.debug).toHaveBeenCalledWith(
+				"No process found listening on port 11111",
+			);
+
+			// Change port, simulates VS Code reconnection after sleep/wake
+			vol.fromJSON({
+				"/logs/ms-vscode-remote.remote-ssh/1-Remote - SSH.log":
+					"-> socksPort 22222 ->",
+			});
+
+			// Trigger next iteration: detects port change, resets backoff, no pid
+			await vi.advanceTimersByTimeAsync(1);
+			expect(logger.debug).toHaveBeenCalledWith(
+				"SSH port changed in log file: 11111 -> 22222",
+			);
+
+			// Process becomes available
+			vi.mocked(find).mockResolvedValue([
+				{ pid: 555, ppid: 1, name: "ssh", cmd: "ssh" },
+			]);
+
+			// With reset backoff, process found within 2 poll intervals.
+			// Without reset, backoff would be pollInterval * 2^5 = 3200ms.
+			await vi.advanceTimersByTimeAsync(pollInterval * 2);
+			expect(pids).toContain(555);
+		});
+
 		it("does not fire event when same process is found after stale check", async () => {
 			vol.fromJSON({
 				"/logs/ms-vscode-remote.remote-ssh/1-Remote - SSH.log":