fix(macos): validate remote ports

2026-01-07 11:00:21 +00:00
parent a5b29623b8
commit 85e536f3ff
8 changed files with 193 additions and 45 deletions
--- a/apps/macos/Sources/Clawdbot/NodeMode/MacNodeModeCoordinator.swift
+++ b/apps/macos/Sources/Clawdbot/NodeMode/MacNodeModeCoordinator.swift
@@ -204,7 +204,11 @@ final class MacNodeModeCoordinator {

    static func remoteBridgePort() -> Int {
        let fallback = Int(Self.loopbackBridgePort() ?? 18790)
-        let base = ClawdbotConfigFile.remoteGatewayPort() ?? GatewayEnvironment.gatewayPort()
+        let settings = CommandResolver.connectionSettings()
+        let sshHost = CommandResolver.parseSSHTarget(settings.target)?.host ?? ""
+        let base =
+            ClawdbotConfigFile.remoteGatewayPort(matchingHost: sshHost) ??
+            GatewayEnvironment.gatewayPort()
        guard base > 0 else { return fallback }
        return Self.derivePort(base: base, offset: 1, fallback: fallback)
    }