@silicaclaw/cli 2026.3.20-4 → 2026.3.20-6

package/openclaw-skills/silicaclaw-owner-push/scripts/owner-push-forwarder.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, resolve } from "node:path";
 import { spawn } from "node:child_process";
@@ -12,9 +12,11 @@ const OWNER_FORWARD_CMD = String(process.env.OPENCLAW_OWNER_FORWARD_CMD || "").t
 const STATE_PATH = resolve(
   String(process.env.OPENCLAW_OWNER_FORWARD_STATE_PATH || resolve(homedir(), ".openclaw", "workspace", "state", "silicaclaw-owner-push.json"))
 );
+const LOCK_PATH = `${STATE_PATH}.lock`;
 const LATEST_ONLY = String(process.env.OPENCLAW_FORWARD_LATEST_ONLY || "true").trim().toLowerCase() !== "false";
 const ONCE = process.argv.includes("--once");
 const VERBOSE = process.argv.includes("--verbose");
+let lockFd = null;
 
 function parseListEnv(name) {
   return String(process.env[name] || "")
@@ -89,6 +91,85 @@ function saveState(state) {
   writeFileSync(STATE_PATH, JSON.stringify(state, null, 2), "utf8");
 }
 
+function isPidRunning(pid) {
+  if (!pid || !Number.isFinite(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function releaseLock() {
+  if (lockFd !== null) {
+    try {
+      closeSync(lockFd);
+    } catch {
+      // ignore
+    }
+    try {
+      rmSync(LOCK_PATH, { force: true });
+    } catch {
+      // ignore
+    }
+    lockFd = null;
+  }
+}
+
+function acquireLock() {
+  mkdirSync(dirname(LOCK_PATH), { recursive: true });
+  try {
+    lockFd = openSync(LOCK_PATH, "wx");
+    writeFileSync(lockFd, JSON.stringify({
+      pid: process.pid,
+      started_at: new Date().toISOString(),
+      state_path: STATE_PATH,
+    }, null, 2), "utf8");
+    process.on("exit", releaseLock);
+    process.on("SIGINT", () => {
+      releaseLock();
+      process.exit(130);
+    });
+    process.on("SIGTERM", () => {
+      releaseLock();
+      process.exit(143);
+    });
+    return;
+  } catch {
+    // fall through
+  }
+
+  try {
+    const existing = JSON.parse(readFileSync(LOCK_PATH, "utf8"));
+    const existingPid = Number(existing?.pid || 0) || 0;
+    if (isPidRunning(existingPid)) {
+      throw new Error(`owner push forwarder already running (pid=${existingPid})`);
+    }
+  } catch (error) {
+    if (error instanceof Error && error.message.includes("already running")) {
+      throw error;
+    }
+  }
+
+  rmSync(LOCK_PATH, { force: true });
+  lockFd = openSync(LOCK_PATH, "wx");
+  writeFileSync(lockFd, JSON.stringify({
+    pid: process.pid,
+    started_at: new Date().toISOString(),
+    state_path: STATE_PATH,
+  }, null, 2), "utf8");
+  process.on("exit", releaseLock);
+  process.on("SIGINT", () => {
+    releaseLock();
+    process.exit(130);
+  });
+  process.on("SIGTERM", () => {
+    releaseLock();
+    process.exit(143);
+  });
+}
+
 function trimState(state) {
   const recentIds = Array.isArray(state.seen_ids) ? state.seen_ids.slice(-500) : [];
   const pushedEntries = Object.entries(state.pushed_at || {}).slice(-500);
@@ -253,10 +334,12 @@ async function pollOnce(state) {
 }
 
 async function main() {
+  acquireLock();
   const state = loadState();
   if (VERBOSE) {
     console.log(`SilicaClaw owner push watching ${API_BASE}`);
     console.log(`State file: ${STATE_PATH}`);
+    console.log(`Lock file: ${LOCK_PATH}`);
     console.log(`Latest-only mode: ${LATEST_ONLY ? "on" : "off"}`);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silicaclaw/cli",
-  "version": "2026.3.20-4",
+  "version": "2026.3.20-6",
   "private": false,
   "publishConfig": {
     "access": "public"

package/packages/network/dist/packages/network/src/relayPreview.d.ts

@@ -22,6 +22,10 @@ type RelayPeer = {
     last_seen_at: number;
     messages_seen: number;
     reconnect_attempts: number;
+    meta?: {
+        signal_queue_size?: number;
+        relay_queue_size?: number;
+    };
 };
 type RelayDiagnostics = {
     adapter: "relay-preview";

package/packages/network/dist/packages/network/src/relayPreview.js

@@ -109,7 +109,6 @@ class RelayPreviewAdapter {
         try {
             await this.joinRoom("start");
             this.started = true;
-            await this.refreshPeers();
             await this.pollOnce();
             this.scheduleNextPoll(this.pollIntervalMs);
             this.recordDiscovery("signaling_connected", { endpoint: this.activeEndpoint });
@@ -258,8 +257,10 @@ class RelayPreviewAdapter {
         const payload = await this.get(`/peers?room=${encodeURIComponent(this.room)}`);
         this.lastPeerRefreshAt = Date.now();
         this.stats.peers_refresh_succeeded += 1;
-        const peerIds = Array.isArray(payload?.peers) ? payload.peers : [];
-        this.updatePeersFromList(peerIds);
+        const peerItems = Array.isArray(payload?.peer_details) && payload.peer_details.length
+            ? payload.peer_details
+            : Array.isArray(payload?.peers) ? payload.peers : [];
+        this.updatePeersFromList(peerItems);
     }
     onEnvelope(envelope) {
         this.stats.received_total += 1;
@@ -340,9 +341,13 @@ class RelayPreviewAdapter {
     }
     async joinRoom(reason) {
         this.stats.join_attempted += 1;
-        await this.post("/join", { room: this.room, peer_id: this.peerId });
+        const payload = await this.post("/join", { room: this.room, peer_id: this.peerId });
         this.lastJoinAt = Date.now();
         this.stats.join_succeeded += 1;
+        if (Array.isArray(payload?.peers)) {
+            this.updatePeersFromList(payload.peers);
+            this.lastPeerRefreshAt = this.lastJoinAt;
+        }
         this.recordDiscovery("join_ok", { endpoint: this.activeEndpoint, detail: reason });
     }
     async maybeRefreshJoin(reason) {
@@ -407,13 +412,38 @@ class RelayPreviewAdapter {
         throw new Error(errors.join(" | "));
     }
     updatePeersFromList(values) {
-        const peerIds = values.map((value) => String(value || "").trim()).filter(Boolean);
+        const parsedPeers = [];
+        for (const value of values) {
+            if (typeof value === "string") {
+                const peerId = String(value || "").trim();
+                if (peerId) {
+                    parsedPeers.push({ peer_id: peerId });
+                }
+                continue;
+            }
+            if (value && typeof value === "object") {
+                const raw = value;
+                const peerId = String(raw.peer_id || "").trim();
+                if (!peerId) {
+                    continue;
+                }
+                parsedPeers.push({
+                    peer_id: peerId,
+                    meta: {
+                        signal_queue_size: Number(raw.signal_queue_size ?? 0),
+                        relay_queue_size: Number(raw.relay_queue_size ?? 0),
+                    },
+                });
+            }
+        }
+        const peerIds = parsedPeers.map((peer) => peer.peer_id);
         if (!peerIds.includes(this.peerId)) {
             void this.joinRoom("self_missing_from_peers").catch(() => { });
         }
         const now = Date.now();
         const next = new Map();
-        for (const peerId of peerIds) {
+        for (const peerInfo of parsedPeers) {
+            const peerId = peerInfo.peer_id;
             if (peerId === this.peerId)
                 continue;
             const existing = this.peers.get(peerId);
@@ -427,6 +457,7 @@ class RelayPreviewAdapter {
                 last_seen_at: now,
                 messages_seen: existing?.messages_seen ?? 0,
                 reconnect_attempts: existing?.reconnect_attempts ?? 0,
+                meta: peerInfo.meta || existing?.meta,
             });
         }
         for (const peerId of this.peers.keys()) {

package/packages/network/src/relayPreview.ts

@@ -34,6 +34,10 @@ type RelayPeer = {
   last_seen_at: number;
   messages_seen: number;
   reconnect_attempts: number;
+  meta?: {
+    signal_queue_size?: number;
+    relay_queue_size?: number;
+  };
 };
 
 type RelayDiagnostics = {
@@ -227,7 +231,6 @@ export class RelayPreviewAdapter implements NetworkAdapter {
     try {
       await this.joinRoom("start");
       this.started = true;
-      await this.refreshPeers();
       await this.pollOnce();
       this.scheduleNextPoll(this.pollIntervalMs);
       this.recordDiscovery("signaling_connected", { endpoint: this.activeEndpoint });
@@ -375,8 +378,10 @@ export class RelayPreviewAdapter implements NetworkAdapter {
     const payload = await this.get(`/peers?room=${encodeURIComponent(this.room)}`);
     this.lastPeerRefreshAt = Date.now();
     this.stats.peers_refresh_succeeded += 1;
-    const peerIds = Array.isArray(payload?.peers) ? payload.peers : [];
-    this.updatePeersFromList(peerIds);
+    const peerItems = Array.isArray(payload?.peer_details) && payload.peer_details.length
+      ? payload.peer_details
+      : Array.isArray(payload?.peers) ? payload.peers : [];
+    this.updatePeersFromList(peerItems);
   }
 
   private onEnvelope(envelope: unknown): void {
@@ -457,9 +462,13 @@ export class RelayPreviewAdapter implements NetworkAdapter {
 
   private async joinRoom(reason: string): Promise<void> {
     this.stats.join_attempted += 1;
-    await this.post("/join", { room: this.room, peer_id: this.peerId });
+    const payload = await this.post("/join", { room: this.room, peer_id: this.peerId });
     this.lastJoinAt = Date.now();
     this.stats.join_succeeded += 1;
+    if (Array.isArray(payload?.peers)) {
+      this.updatePeersFromList(payload.peers);
+      this.lastPeerRefreshAt = this.lastJoinAt;
+    }
     this.recordDiscovery("join_ok", { endpoint: this.activeEndpoint, detail: reason });
   }
 
@@ -528,13 +537,38 @@ export class RelayPreviewAdapter implements NetworkAdapter {
   }
 
   private updatePeersFromList(values: unknown[]): void {
-    const peerIds = values.map((value) => String(value || "").trim()).filter(Boolean);
+    const parsedPeers: Array<{ peer_id: string; meta?: RelayPeer["meta"] }> = [];
+    for (const value of values) {
+      if (typeof value === "string") {
+        const peerId = String(value || "").trim();
+        if (peerId) {
+          parsedPeers.push({ peer_id: peerId });
+        }
+        continue;
+      }
+      if (value && typeof value === "object") {
+        const raw = value as Record<string, unknown>;
+        const peerId = String(raw.peer_id || "").trim();
+        if (!peerId) {
+          continue;
+        }
+        parsedPeers.push({
+          peer_id: peerId,
+          meta: {
+            signal_queue_size: Number(raw.signal_queue_size ?? 0),
+            relay_queue_size: Number(raw.relay_queue_size ?? 0),
+          },
+        });
+      }
+    }
+    const peerIds = parsedPeers.map((peer) => peer.peer_id);
     if (!peerIds.includes(this.peerId)) {
       void this.joinRoom("self_missing_from_peers").catch(() => {});
     }
     const now = Date.now();
     const next = new Map<string, RelayPeer>();
-    for (const peerId of peerIds) {
+    for (const peerInfo of parsedPeers) {
+      const peerId = peerInfo.peer_id;
       if (peerId === this.peerId) continue;
       const existing = this.peers.get(peerId);
       if (!existing) {
@@ -547,6 +581,7 @@ export class RelayPreviewAdapter implements NetworkAdapter {
         last_seen_at: now,
         messages_seen: existing?.messages_seen ?? 0,
         reconnect_attempts: existing?.reconnect_attempts ?? 0,
+        meta: peerInfo.meta || existing?.meta,
       });
     }
     for (const peerId of this.peers.keys()) {