From eabf9a09dd9089f1f805c18ccc2b4f0ce0924d45 Mon Sep 17 00:00:00 2001
From: Nimrod Gutman <nimrod.g@singular.net>
Date: Mon, 26 Jan 2026 09:31:57 +0200
Subject: [PATCH] fix(node): reconnect stale gateway ws

---
 .../Sources/MoltbotKit/GatewayChannel.swift   | 28 +++++++++++++++++--
 .../MoltbotKit/GatewayNodeSession.swift       |  1 -
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayChannel.swift b/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayChannel.swift
index 0ead3021c..917689541 100644
--- a/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayChannel.swift
+++ b/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayChannel.swift
@@ -211,7 +211,22 @@ public actor GatewayChannelActor {
     }
 
     public func connect() async throws {
-        if self.connected, self.task?.state == .running { return }
+        if self.connected, self.task?.state == .running {
+            let staleStatus = self.staleConnectionStatus()
+            if staleStatus.isStale {
+                if let deltaMs = staleStatus.deltaMs {
+                    self.logger.error(
+                        "gateway ws stale; reconnecting deltaMs=\(Int(deltaMs)) thresholdMs=\(Int(staleStatus.thresholdMs))")
+                } else {
+                    self.logger.error(
+                        "gateway ws stale; reconnecting lastTick=missing thresholdMs=\(Int(staleStatus.thresholdMs))")
+                }
+                self.connected = false
+                self.task?.cancel(with: .goingAway, reason: nil)
+            } else {
+                return
+            }
+        }
         if self.isConnecting {
             try await withCheckedThrowingContinuation { cont in
                 self.connectWaiters.append(cont)
@@ -328,8 +343,8 @@ public actor GatewayChannelActor {
         } else if let password = self.password {
             params["auth"] = ProtoAnyCodable(["password": ProtoAnyCodable(password)])
         }
-        let signedAtMs = Int(Date().timeIntervalSince1970 * 1000)
         let connectNonce = try await self.waitForConnectChallenge()
+        let signedAtMs = Int(Date().timeIntervalSince1970 * 1000)
         let scopesValue = scopes.joined(separator: ",")
         var payloadParts = [
             connectNonce == nil ? "v1" : "v2",
@@ -554,6 +569,15 @@ public actor GatewayChannelActor {
         }
     }
 
+    private func staleConnectionStatus() -> (isStale: Bool, deltaMs: Double?, thresholdMs: Double) {
+        let thresholdMs = self.tickIntervalMs * 2
+        guard let lastTick else {
+            return (true, nil, thresholdMs)
+        }
+        let deltaMs = Date().timeIntervalSince(lastTick) * 1000
+        return (deltaMs > thresholdMs, deltaMs, thresholdMs)
+    }
+
     private func scheduleReconnect() async {
         guard self.shouldReconnect else { return }
         let delay = self.backoffMs / 1000
diff --git a/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayNodeSession.swift b/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayNodeSession.swift
index 570342ce4..3b0409953 100644
--- a/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayNodeSession.swift
+++ b/apps/shared/MoltbotKit/Sources/MoltbotKit/GatewayNodeSession.swift
@@ -107,7 +107,6 @@ public actor GatewayNodeSession {
 
         do {
             try await channel.connect()
-            await onConnected()
         } catch {
             await onDisconnected(error.localizedDescription)
             throw error