Address review comments

Author: EhabY

src/remote/remote.ts

@@ -741,21 +741,24 @@ export class Remote {
 		featureSet: FeatureSet,
 	): vscode.Disposable {
 		return vscode.workspace.onDidChangeConfiguration((e) => {
-			if (e.affectsConfiguration("coder.proxyLogDirectory")) {
-				const newLogDir = this.getLogDir(featureSet);
-				if (newLogDir !== currentLogDir) {
-					vscode.window
-						.showInformationMessage(
-							"Log directory configuration changed. Reload window to apply.",
-							"Reload",
-						)
-						.then((action) => {
-							if (action === "Reload") {
-								vscode.commands.executeCommand("workbench.action.reloadWindow");
-							}
-						});
-				}
+			if (!e.affectsConfiguration("coder.proxyLogDirectory")) {
+				return;
 			}
+			const newLogDir = this.getLogDir(featureSet);
+			if (newLogDir === currentLogDir) {
+				return;
+			}
+
+			vscode.window
+				.showInformationMessage(
+					"Log directory configuration changed. Reload window to apply.",
+					"Reload",
+				)
+				.then((action) => {
+					if (action === "Reload") {
+						vscode.commands.executeCommand("workbench.action.reloadWindow");
+					}
+				});
 		});
 	}
 

src/remote/sshProcess.ts

@@ -135,8 +135,7 @@ export class SshProcessMonitor implements vscode.Disposable {
 
 	/**
 	 * Searches for the SSH process indefinitely until found or disposed.
-	 * Tries port-based discovery first (more accurate), falls back to hostname-based.
-	 * When found, starts monitoring.
+	 * Starts monitoring when it finds the process through the port.
 	 */
 	private async searchForProcess(): Promise<void> {
 		const { pollInterval, logger, sshHost } = this.options;

src/util.ts

@@ -14,12 +14,11 @@ export interface AuthorityParts {
 export const AuthorityPrefix = "coder-vscode";
 
 // Regex patterns to find the SSH port from Remote SSH extension logs.
-// `ms-vscode-remote.remote-ssh`: `-> socksPort <port> ->`
+// `ms-vscode-remote.remote-ssh`: `-> socksPort <port> ->` or `between local port <port>`
 // `codeium.windsurf-remote-openssh`, `jeanp413.open-remote-ssh`, `google.antigravity-remote-openssh`: `=> <port>(socks) =>`
-// Windows `ms-vscode-remote.remote-ssh`: `between local port <port>`
 // `anysphere.remote-ssh`: `Socks port: <port>`
 export const RemoteSSHLogPortRegex =
-	/(?:-> socksPort (\d+) ->|=> (\d+)\(socks\) =>|between local port (\d+)|Socks port: (\d+))/g;
+	/(?:-> socksPort (\d+) ->|between local port (\d+)|=> (\d+)\(socks\) =>|Socks port: (\d+))/g;
 
 /**
  * Given the contents of a Remote - SSH log file, find the most recent port
@@ -34,7 +33,11 @@ export function findPort(text: string): number | null {
 		return null;
 	}
 
+	// Get the last match, which is the most recent port.
 	const lastMatch = allMatches.at(-1)!;
+	// Each capture group corresponds to a different Remote SSH extension log format:
+	// [0] full match, [1] and [2] ms-vscode-remote.remote-ssh,
+	// [3] windsurf/open-remote-ssh/antigravity, [4] anysphere.remote-ssh
 	const portStr = lastMatch[1] || lastMatch[2] || lastMatch[3] || lastMatch[4];
 	if (!portStr) {
 		return null;

test/unit/util.test.ts

@@ -1,6 +1,11 @@
 import { describe, it, expect } from "vitest";
 
-import { countSubstring, parseRemoteAuthority, toSafeHost } from "@/util";
+import {
+	countSubstring,
+	findPort,
+	parseRemoteAuthority,
+	toSafeHost,
+} from "@/util";
 
 it("ignore unrelated authorities", () => {
 	const tests = [
@@ -124,3 +129,46 @@ describe("countSubstring", () => {
 		expect(countSubstring("aa", "aaaaaa")).toBe(3);
 	});
 });
+
+describe("findPort", () => {
+	it.each([[""], ["some random log text without ports"]])(
+		"returns null for <%s>",
+		(input) => {
+			expect(findPort(input)).toBe(null);
+		},
+	);
+
+	it.each([
+		[
+			"ms-vscode-remote.remote-ssh",
+			"[10:30:45] SSH established -> socksPort 12345 -> ready",
+			12345,
+		],
+		[
+			"ms-vscode-remote.remote-ssh[2]",
+			"Forwarding between local port 54321 and remote",
+			54321,
+		],
+		[
+			"windsurf/open-remote-ssh/antigravity",
+			"[INFO] Connection => 9999(socks) => target",
+			9999,
+		],
+		[
+			"anysphere.remote-ssh",
+			"[DEBUG] Initialized Socks port: 8888 proxy",
+			8888,
+		],
+	])("finds port from %s log format", (_name, input, expected) => {
+		expect(findPort(input)).toBe(expected);
+	});
+
+	it("returns most recent port when multiple matches exist", () => {
+		const log = `
+[10:30:00] Starting connection -> socksPort 1111 -> initialized
+[10:30:05] Reconnecting => 2222(socks) => retry
+[10:30:10] Final connection Socks port: 3333 established
+		`;
+		expect(findPort(log)).toBe(3333);
+	});
+});