Address rest of comments

Author: EhabY

src/remote/sshProcess.ts

@@ -28,8 +28,10 @@ export interface SshProcessMonitorOptions {
 	networkInfoPath: string;
 	proxyLogDir?: string;
 	logger: Logger;
-	// Poll interval for SSH process and file discovery
-	pollInterval?: number;
+	// Initial poll interval for SSH process and file discovery (ms)
+	discoveryPollIntervalMs?: number;
+	// Maximum backoff interval for process and file discovery (ms)
+	maxDiscoveryBackoffMs?: number;
 	// Poll interval for network info updates
 	networkPollInterval?: number;
 	// For port-based SSH process discovery
@@ -72,7 +74,8 @@ export class SshProcessMonitor implements vscode.Disposable {
 		this.options = {
 			...options,
 			proxyLogDir: options.proxyLogDir,
-			pollInterval: options.pollInterval ?? 1000,
+			discoveryPollIntervalMs: options.discoveryPollIntervalMs ?? 1000,
+			maxDiscoveryBackoffMs: options.maxDiscoveryBackoffMs ?? 30_000,
 			// Matches the SSH update interval
 			networkPollInterval: options.networkPollInterval ?? 3000,
 		};
@@ -138,8 +141,10 @@ export class SshProcessMonitor implements vscode.Disposable {
 	 * Starts monitoring when it finds the process through the port.
 	 */
 	private async searchForProcess(): Promise<void> {
-		const { pollInterval, logger, sshHost } = this.options;
+		const { discoveryPollIntervalMs, maxDiscoveryBackoffMs, logger, sshHost } =
+			this.options;
 		let attempt = 0;
+		let currentBackoff = discoveryPollIntervalMs;
 
 		while (!this.disposed) {
 			attempt++;
@@ -157,7 +162,8 @@ export class SshProcessMonitor implements vscode.Disposable {
 				return;
 			}
 
-			await this.delay(pollInterval);
+			await this.delay(currentBackoff);
+			currentBackoff = Math.min(currentBackoff * 2, maxDiscoveryBackoffMs);
 		}
 	}
 
@@ -172,13 +178,14 @@ export class SshProcessMonitor implements vscode.Disposable {
 			const logPath = await findRemoteSshLogPath(
 				codeLogDir,
 				remoteSshExtensionId,
+				logger,
 			);
 			if (!logPath) {
 				return undefined;
 			}
 
 			const logContent = await fs.readFile(logPath, "utf8");
-			this.options.logger.debug(`Read Remote SSH log file: ${logPath}`);
+			this.options.logger.debug(`Read Remote SSH log file:`, logPath);
 
 			const port = findPort(logContent);
 			if (!port) {
@@ -234,11 +241,18 @@ export class SshProcessMonitor implements vscode.Disposable {
 	 * Polls until found or PID changes.
 	 */
 	private async searchForLogFile(): Promise<void> {
-		const { proxyLogDir: logDir, logger, pollInterval } = this.options;
+		const {
+			proxyLogDir: logDir,
+			logger,
+			discoveryPollIntervalMs,
+			maxDiscoveryBackoffMs,
+		} = this.options;
 		if (!logDir) {
 			return;
 		}
 
+		let currentBackoff = discoveryPollIntervalMs;
+
 		const targetPid = this.currentPid;
 		while (!this.disposed && this.currentPid === targetPid) {
 			try {
@@ -262,7 +276,8 @@ export class SshProcessMonitor implements vscode.Disposable {
 				logger.debug(`Could not read log directory: ${logDir}`);
 			}
 
-			await this.delay(pollInterval);
+			await this.delay(currentBackoff);
+			currentBackoff = Math.min(currentBackoff * 2, maxDiscoveryBackoffMs);
 		}
 	}
 
@@ -376,10 +391,13 @@ export class SshProcessMonitor implements vscode.Disposable {
 
 /**
  * Finds the Remote SSH extension's log file path.
+ * Tries extension-specific folder first (Cursor, Windsurf, Antigravity),
+ * then output_logging_ fallback (MS VS Code).
  */
 async function findRemoteSshLogPath(
 	codeLogDir: string,
 	extensionId: string,
+	logger: Logger,
 ): Promise<string | undefined> {
 	const logsParentDir = path.dirname(codeLogDir);
 
@@ -394,8 +412,12 @@ async function findRemoteSshLogPath(
 		if (remoteSsh) {
 			return path.join(extensionLogDir, remoteSsh);
 		}
+		// Folder exists but no Remote SSH log yet
+		logger.debug(
+			`Extension log folder exists but no Remote SSH log found: ${extensionLogDir}`,
+		);
 	} catch {
-		// Extension-specific folder doesn't exist, try fallback
+		// Extension-specific folder doesn't exist - expected for MS VS Code, try fallback
 	}
 
 	try {
@@ -411,9 +433,14 @@ async function findRemoteSshLogPath(
 			if (remoteSSHLog) {
 				return path.join(outputPath, remoteSSHLog);
 			}
+			logger.debug(
+				`Output logging folder exists but no Remote SSH log found: ${outputPath}`,
+			);
+		} else {
+			logger.debug(`No output_logging_ folders found in: ${logsParentDir}`);
 		}
 	} catch {
-		// output_logging folder doesn't exist
+		logger.debug(`Could not read logs parent directory: ${logsParentDir}`);
 	}
 
 	return undefined;

test/unit/remote/sshProcess.test.ts

@@ -30,7 +30,7 @@ describe("SshProcessMonitor", () => {
 
 		// Default: process found immediately
 		vi.mocked(find).mockResolvedValue([
-			{ pid: 999, name: "ssh", cmd: "ssh host" },
+			{ pid: 999, ppid: 1, name: "ssh", cmd: "ssh host" },
 		]);
 	});
 
@@ -66,7 +66,9 @@ describe("SshProcessMonitor", () => {
 			vi.mocked(find)
 				.mockResolvedValueOnce([])
 				.mockResolvedValueOnce([])
-				.mockResolvedValueOnce([{ pid: 888, name: "ssh", cmd: "ssh host" }]);
+				.mockResolvedValueOnce([
+					{ pid: 888, ppid: 1, name: "ssh", cmd: "ssh host" },
+				]);
 
 			const monitor = createMonitor({ codeLogDir: "/logs/window1" });
 			const pid = await waitForEvent(monitor.onPidChange);
@@ -80,7 +82,7 @@ describe("SshProcessMonitor", () => {
 			vol.fromJSON({});
 
 			vi.mocked(find).mockResolvedValue([
-				{ pid: 777, name: "ssh", cmd: "ssh host" },
+				{ pid: 777, ppid: 1, name: "ssh", cmd: "ssh host" },
 			]);
 
 			const monitor = createMonitor({ codeLogDir: "/logs/window1" });
@@ -116,8 +118,8 @@ describe("SshProcessMonitor", () => {
 
 			// First search finds PID 999, after reconnect finds PID 888
 			vi.mocked(find)
-				.mockResolvedValueOnce([{ pid: 999, name: "ssh", cmd: "ssh" }])
-				.mockResolvedValue([{ pid: 888, name: "ssh", cmd: "ssh" }]);
+				.mockResolvedValueOnce([{ pid: 999, ppid: 1, name: "ssh", cmd: "ssh" }])
+				.mockResolvedValue([{ pid: 888, ppid: 1, name: "ssh", cmd: "ssh" }]);
 
 			const monitor = createMonitor({
 				codeLogDir: "/logs/window1",
@@ -158,7 +160,7 @@ describe("SshProcessMonitor", () => {
 
 			// Always returns the same PID
 			vi.mocked(find).mockResolvedValue([
-				{ pid: 999, name: "ssh", cmd: "ssh" },
+				{ pid: 999, ppid: 1, name: "ssh", cmd: "ssh" },
 			]);
 
 			const monitor = createMonitor({
@@ -395,7 +397,8 @@ describe("SshProcessMonitor", () => {
 			codeLogDir: "/logs/window1",
 			remoteSshExtensionId: "ms-vscode-remote.remote-ssh",
 			logger: createMockLogger(),
-			pollInterval: 10,
+			discoveryPollIntervalMs: 10,
+			maxDiscoveryBackoffMs: 100,
 			networkPollInterval: 10,
 			...overrides,
 		});