squad-openclaw 2026.2.199 → 2026.2.1802

package/dist/index.js

@@ -991,73 +991,60 @@ function writeRelayState(state) {
 function toBase64Url(buf) {
   return buf.toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
-function loadOrCreateDeviceKeys() {
-  const keysPath = path5.join(os.homedir(), ".openclaw", "squad-relay-keys.json");
-  try {
-    const raw = fs5.readFileSync(keysPath, "utf-8");
-    const keys2 = JSON.parse(raw);
-    if (keys2.deviceId && keys2.publicKey && keys2.privateKey) {
-      return keys2;
-    }
-  } catch {
+function loadOrCreateRelayDeviceKeys() {
+  const state = readRelayState();
+  if (state.deviceKeys) {
+    return state.deviceKeys;
   }
   const { publicKey, privateKey } = crypto2.generateKeyPairSync("ed25519");
   const pubDer = publicKey.export({ type: "spki", format: "der" });
-  const privDer = privateKey.export({ type: "pkcs8", format: "der" });
   const rawPub = pubDer.subarray(pubDer.length - 32);
   const deviceId = crypto2.createHash("sha256").update(rawPub).digest("hex");
-  const pubB64 = toBase64Url(rawPub);
-  const privB64 = toBase64Url(privDer);
-  const keys = { deviceId, publicKey: pubB64, privateKey: privB64 };
-  const dir = path5.dirname(keysPath);
-  if (!fs5.existsSync(dir)) {
-    fs5.mkdirSync(dir, { recursive: true });
-  }
-  fs5.writeFileSync(keysPath, JSON.stringify(keys, null, 2), { mode: 384 });
-  console.log(`[relay-client] Generated new device keys: ${deviceId.substring(0, 12)}...`);
+  const publicKeyB64 = toBase64Url(rawPub);
+  const privateKeyPem = privateKey.export({ type: "pkcs8", format: "pem" });
+  const keys = { deviceId, publicKey: publicKeyB64, privateKeyPem };
+  writeRelayState({ ...state, deviceKeys: keys });
+  console.log(`[relay-client] Generated relay device identity: ${deviceId.substring(0, 12)}...`);
   return keys;
 }
-function ensureDevicePaired(keys) {
+function ensureDevicePaired(keys, operatorToken) {
   const stateDir = process.env.OPENCLAW_STATE_DIR || path5.join(os.homedir(), ".openclaw");
   const pairedPath = path5.join(stateDir, "devices", "paired.json");
   let paired = {};
   try {
-    const raw = fs5.readFileSync(pairedPath, "utf-8");
-    paired = JSON.parse(raw);
+    paired = JSON.parse(fs5.readFileSync(pairedPath, "utf-8"));
   } catch {
   }
-  if (paired[keys.deviceId]) {
-    return;
-  }
+  if (paired[keys.deviceId]) return;
   const now = Date.now();
+  const scopes = ["operator.admin", "operator.approvals", "operator.pairing"];
   paired[keys.deviceId] = {
     deviceId: keys.deviceId,
     publicKey: keys.publicKey,
     platform: process.platform,
     clientId: "cli",
-    clientMode: "ui",
+    clientMode: "backend",
     role: "operator",
     roles: ["operator"],
-    scopes: ["operator.admin", "operator.read", "operator.write"],
-    tokens: {},
+    scopes,
+    tokens: operatorToken ? {
+      operator: { token: operatorToken, role: "operator", scopes, createdAtMs: now, lastUsedAtMs: now }
+    } : {},
     createdAtMs: now,
     approvedAtMs: now,
     displayName: "squad-relay"
   };
   const dir = path5.dirname(pairedPath);
-  if (!fs5.existsSync(dir)) {
-    fs5.mkdirSync(dir, { recursive: true });
-  }
-  fs5.writeFileSync(pairedPath, JSON.stringify(paired, null, 2));
-  console.log(`[relay-client] Auto-registered device in gateway store: ${keys.deviceId.substring(0, 12)}...`);
+  if (!fs5.existsSync(dir)) fs5.mkdirSync(dir, { recursive: true });
+  fs5.writeFileSync(pairedPath, JSON.stringify(paired, null, 2), { mode: 384 });
+  console.log(`[relay-client] Device pairing entry created in paired.json`);
 }
 function signDeviceIdentity(keys, clientId, clientMode, role, scopes, token) {
   const signedAtMs = Date.now();
   const nonce = crypto2.randomBytes(16).toString("hex");
   const scopeStr = scopes.join(",");
   const payload = `v2|${keys.deviceId}|${clientId}|${clientMode}|${role}|${scopeStr}|${signedAtMs}|${token ?? ""}|${nonce}`;
-  const privDer = Buffer.from(keys.privateKey.replace(/-/g, "+").replace(/_/g, "/") + "==", "base64");
-  const privateKey = crypto2.createPrivateKey({ key: privDer, format: "der", type: "pkcs8" });
+  const privateKey = crypto2.createPrivateKey(keys.privateKeyPem);
   const signature = crypto2.sign(null, Buffer.from(payload), privateKey);
   return {
     id: keys.deviceId,
@@ -1090,8 +1077,8 @@ var RelayClient = class {
       roomId: config.roomId ?? state.roomId ?? null
     };
     this.pendingClaimToken = this.config.claimToken;
-    this.deviceKeys = loadOrCreateDeviceKeys();
-    ensureDevicePaired(this.deviceKeys);
+    this.deviceKeys = loadOrCreateRelayDeviceKeys();
+    ensureDevicePaired(this.deviceKeys, this.config.operatorToken);
   }
   /** Start connecting to the relay */
   start() {

package/package.json

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