squad-openclaw 2026.2.1807 → 2026.2.1810

package/dist/index.js

@@ -1041,9 +1041,9 @@ function ensureDevicePaired(keys, operatorToken) {
   console.log(`[relay-client] Device pairing entry created in paired.json`);
   return true;
 }
-function signDeviceIdentity(keys, clientId, clientMode, role, scopes, token) {
+function signDeviceIdentity(keys, clientId, clientMode, role, scopes, token, challengeNonce) {
   const signedAtMs = Date.now();
-  const nonce = crypto2.randomBytes(16).toString("hex");
+  const nonce = challengeNonce || crypto2.randomBytes(16).toString("hex");
   const scopeStr = scopes.join(",");
   const payload = `v2|${keys.deviceId}|${clientId}|${clientMode}|${role}|${scopeStr}|${signedAtMs}|${token ?? ""}|${nonce}`;
   const privateKey = crypto2.createPrivateKey(keys.privateKeyPem);
@@ -1078,7 +1078,7 @@ var RelayClient = class {
       claimToken: config.claimToken ?? state.claimToken ?? null,
       roomId: config.roomId ?? state.roomId ?? null
     };
-    this.pendingClaimToken = this.config.claimToken;
+    this.pendingClaimToken = this.config.roomId ? null : this.config.claimToken;
     this.deviceKeys = loadOrCreateRelayDeviceKeys();
     const newEntry = ensureDevicePaired(this.deviceKeys, this.config.operatorToken);
     if (newEntry) {
@@ -1265,6 +1265,12 @@ var RelayClient = class {
       }
       return;
     }
+    if (typeof msg.type === "string" && msg.type.startsWith("relay.")) {
+      if (msg.type === "relay.e2e.exchange" && msg.publicKey) {
+        this.handleE2EExchange(userId, msg.publicKey);
+      }
+      return;
+    }
     let conn = this.userConnections.get(userId);
     if (!conn || conn.localWs.readyState !== NodeWebSocket.OPEN) {
       this.createUserConnection(userId);
@@ -1272,24 +1278,12 @@ var RelayClient = class {
       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.challengeNonce) {
+        console.log(`[relay-client] Connect request for ${userId} deferred \u2014 waiting for challenge nonce`);
+        conn.pendingConnect = msg;
+        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
-      );
-      msg.params = params;
-      conn.connectHandshakeComplete = false;
-      console.log(`[relay-client] Injected device identity for user ${userId}: ${this.deviceKeys.deviceId.substring(0, 12)}...`);
+      this.injectDeviceIdentity(conn, msg);
     }
     if (conn.localWs.readyState === NodeWebSocket.CONNECTING) {
       conn.localWs.once("open", () => {
@@ -1299,6 +1293,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);
@@ -1315,7 +1331,9 @@ var RelayClient = class {
       localWs,
       userId,
       e2e: null,
-      connectHandshakeComplete: false
+      connectHandshakeComplete: false,
+      challengeNonce: null,
+      pendingConnect: null
     };
     this.userConnections.set(userId, conn);
     localWs.on("open", () => {
@@ -1350,6 +1368,22 @@ var RelayClient = class {
     const conn = this.userConnections.get(userId);
     if (!conn) return;
     const parsed = msg;
+    if (parsed.type === "event" && parsed.event === "connect.challenge") {
+      const payload = parsed.payload;
+      if (payload?.nonce) {
+        conn.challengeNonce = payload.nonce;
+        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) {
       conn.connectHandshakeComplete = true;
     }
@@ -1439,9 +1473,40 @@ function startRelayClient(api, relayUrl) {
 
 // src/index.ts
 function squadAppPlugin(api) {
+  const toolExecutors = /* @__PURE__ */ new Map();
+  const origRegisterTool = api.registerTool.bind(api);
+  api.registerTool = (toolDef) => {
+    if (toolDef.name && typeof toolDef.execute === "function") {
+      toolExecutors.set(toolDef.name, toolDef.execute);
+    }
+    return origRegisterTool(toolDef);
+  };
   registerEntityTools(api);
   registerFilesystemTools(api);
   registerVersionMethods(api);
+  api.registerGatewayMethod(
+    "tools.invoke",
+    async ({ params, respond }) => {
+      const tool = params?.tool;
+      const args = params?.args ?? {};
+      if (!tool) {
+        respond(false, { errorMessage: "Missing 'tool' parameter" });
+        return;
+      }
+      const executeFn = toolExecutors.get(tool);
+      if (!executeFn) {
+        respond(false, { errorMessage: `Unknown tool: ${tool}` });
+        return;
+      }
+      try {
+        const result = await executeFn(`ws-${Date.now()}`, args);
+        respond(true, result);
+      } catch (err2) {
+        const msg = err2 instanceof Error ? err2.message : String(err2);
+        respond(false, { errorMessage: msg });
+      }
+    }
+  );
   const relayEnabled = api.pluginConfig?.["relay.enabled"] ?? true;
   if (relayEnabled) {
     const relayUrl = api.pluginConfig?.["relay.url"] || "wss://relay.squad.ceo";

package/package.json

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