squad-openclaw 2026.2.1809 → 2026.2.1811

package/dist/index.js

@@ -1257,9 +1257,9 @@ var RelayClient = class {
     const msg = innerMsg;
     if (msg.type === "event" && typeof msg.event === "string" && msg.event.startsWith("relay.")) {
       if (msg.event === "relay.user.connected") {
-        console.log(`[relay-client] User ${userId} connected via relay \u2014 creating local WS`);
         const existing = this.userConnections.get(userId);
-        if (!existing || existing.localWs.readyState !== NodeWebSocket.OPEN) {
+        if (!existing || existing.localWs.readyState >= NodeWebSocket.CLOSING) {
+          console.log(`[relay-client] User ${userId} connected via relay \u2014 creating local WS`);
           this.createUserConnection(userId);
         }
       }
@@ -1272,31 +1272,24 @@ var RelayClient = class {
       return;
     }
     let conn = this.userConnections.get(userId);
-    if (!conn || conn.localWs.readyState !== NodeWebSocket.OPEN) {
+    if (!conn || conn.localWs.readyState >= NodeWebSocket.CLOSING) {
       this.createUserConnection(userId);
       conn = this.userConnections.get(userId);
       if (!conn) return;
     }
     if (msg.type === "req" && msg.method === "connect") {
-      const params = msg.params ?? {};
-      if (this.config.operatorToken) {
-        params.auth = { token: this.config.operatorToken };
+      if (conn.connectHandshakeComplete) {
+        console.log(`[relay-client] New connect from ${userId} \u2014 creating fresh local WS for handshake`);
+        this.createUserConnection(userId);
+        conn = this.userConnections.get(userId);
+        if (!conn) return;
       }
-      const client = params.client ?? {};
-      const role = params.role ?? "operator";
-      const scopes = params.scopes ?? [];
-      params.device = signDeviceIdentity(
-        this.deviceKeys,
-        client.id ?? "cli",
-        client.mode ?? "ui",
-        role,
-        scopes,
-        this.config.operatorToken,
-        conn.challengeNonce
-      );
-      msg.params = params;
-      conn.connectHandshakeComplete = false;
-      console.log(`[relay-client] Injected device identity for user ${userId}: ${this.deviceKeys.deviceId.substring(0, 12)}...`);
+      if (!conn.challengeNonce) {
+        console.log(`[relay-client] Connect request for ${userId} deferred \u2014 waiting for challenge nonce`);
+        conn.pendingConnect = msg;
+        return;
+      }
+      this.injectDeviceIdentity(conn, msg);
     }
     if (conn.localWs.readyState === NodeWebSocket.CONNECTING) {
       conn.localWs.once("open", () => {
@@ -1306,6 +1299,28 @@ var RelayClient = class {
     }
     conn.localWs.send(JSON.stringify(msg));
   }
+  /** Inject auth token and device identity into a connect request */
+  injectDeviceIdentity(conn, msg) {
+    const params = msg.params ?? {};
+    if (this.config.operatorToken) {
+      params.auth = { token: this.config.operatorToken };
+    }
+    const client = params.client ?? {};
+    const role = params.role ?? "operator";
+    const scopes = params.scopes ?? [];
+    params.device = signDeviceIdentity(
+      this.deviceKeys,
+      client.id ?? "cli",
+      client.mode ?? "ui",
+      role,
+      scopes,
+      this.config.operatorToken,
+      conn.challengeNonce
+    );
+    msg.params = params;
+    conn.connectHandshakeComplete = false;
+    console.log(`[relay-client] Injected device identity for ${conn.userId}: nonce=${conn.challengeNonce?.substring(0, 12)}...`);
+  }
   /** Create a local WS connection to the gateway for a specific user */
   createUserConnection(userId) {
     const existing = this.userConnections.get(userId);
@@ -1323,7 +1338,8 @@ var RelayClient = class {
       userId,
       e2e: null,
       connectHandshakeComplete: false,
-      challengeNonce: null
+      challengeNonce: null,
+      pendingConnect: null
     };
     this.userConnections.set(userId, conn);
     localWs.on("open", () => {
@@ -1362,7 +1378,16 @@ var RelayClient = class {
       const payload = parsed.payload;
       if (payload?.nonce) {
         conn.challengeNonce = payload.nonce;
-        console.log(`[relay-client] Captured challenge nonce for user ${userId}`);
+        console.log(`[relay-client] Captured challenge nonce for ${userId}: ${conn.challengeNonce.substring(0, 12)}...`);
+        if (conn.pendingConnect) {
+          const pending = conn.pendingConnect;
+          conn.pendingConnect = null;
+          console.log(`[relay-client] Flushing deferred connect for ${userId}`);
+          this.injectDeviceIdentity(conn, pending);
+          if (conn.localWs.readyState === NodeWebSocket.OPEN) {
+            conn.localWs.send(JSON.stringify(pending));
+          }
+        }
       }
     }
     if (parsed.type === "res" && parsed.id === "connect-1" && parsed.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squad-openclaw",
-  "version": "2026.2.1809",
+  "version": "2026.2.1811",
   "description": "Entity registry, filesystem tools, and version management plugin for OpenClaw gateway",
   "type": "module",
   "main": "./dist/index.js",