fix #90668: [Bug]: macOS node mode can silently self-reconnect in a healthy direct gateway session

clawsweeper[bot] · clawsweeper[bot] · commit 1496eac8c16e · 2026-06-06T02:23:06.000Z
diff --git a/apps/macos/Sources/OpenClaw/NodeMode/MacNodeModeCoordinator.swift b/apps/macos/Sources/OpenClaw/NodeMode/MacNodeModeCoordinator.swift
@@ -22,11 +22,7 @@ struct MacNodeGatewayTLSSessionCache {
     private var cachedKey: Key?
     private var cachedBox: WebSocketSessionBox?
 
-    mutating func sessionBox(url: URL, params: GatewayTLSParams?) -> WebSocketSessionBox? {
-        guard let params else {
-            self.invalidate()
-            return nil
-        }
+    mutating func sessionBox(url: URL, params: GatewayTLSParams) -> WebSocketSessionBox {
         let key = Key(url: url, params: params)
         if let cachedKey = self.cachedKey, cachedKey == key, let cachedBox = self.cachedBox {
             return cachedBox
@@ -316,11 +312,15 @@ final class MacNodeModeCoordinator {
         }
         let stableID = Self.tlsPinStoreKey(for: url)
         let stored = GatewayTLSStore.loadFingerprint(stableID: stableID)
-        let params = Self.tlsParams(
+        guard let params = Self.tlsParams(
             for: url,
             connectionMode: connectionMode,
             root: OpenClawConfigFile.loadDict(),
             storedFingerprint: stored)
+        else {
+            self.tlsSessionCache.invalidate()
+            return nil
+        }
         return self.tlsSessionCache.sessionBox(url: url, params: params)
     }
 }
diff --git a/apps/macos/Tests/OpenClawIPCTests/MacNodeModeCoordinatorTests.swift b/apps/macos/Tests/OpenClawIPCTests/MacNodeModeCoordinatorTests.swift
@@ -98,8 +98,8 @@ struct MacNodeModeCoordinatorTests {
             root: ["gateway": ["remote": ["tlsFingerprint": "sha256:configured"]]],
             storedFingerprint: "stored"))
 
-        let first = try #require(cache.sessionBox(url: url, params: params))
-        let second = try #require(cache.sessionBox(url: url, params: params))
+        let first = cache.sessionBox(url: url, params: params)
+        let second = cache.sessionBox(url: url, params: params)
 
         #expect(ObjectIdentifier(first.session) == ObjectIdentifier(second.session))
     }
@@ -118,8 +118,8 @@ struct MacNodeModeCoordinatorTests {
             root: ["gateway": ["remote": ["tlsFingerprint": "sha256:rotated"]]],
             storedFingerprint: "stored"))
 
-        let first = try #require(cache.sessionBox(url: url, params: firstParams))
-        let second = try #require(cache.sessionBox(url: url, params: secondParams))
+        let first = cache.sessionBox(url: url, params: firstParams)
+        let second = cache.sessionBox(url: url, params: secondParams)
 
         #expect(ObjectIdentifier(first.session) != ObjectIdentifier(second.session))
     }
