@p697/clawket 0.6.1 → 0.6.3

package/dist/index.js

@@ -5839,6 +5839,15 @@ var RELAY_CONTROL_PREFIX = "__clawket_relay_control__:";
 var BRIDGE_HEALTH_METHOD = "health";
 var BRIDGE_HEALTH_PARAMS = {};
 var DEFAULT_BRIDGE_HEALTH_PROBE_TIMEOUT_MS = 1e4;
+var TRACEABLE_RELAY_METHODS = /* @__PURE__ */ new Set([
+  "sessions.list",
+  "chat.history",
+  "last-heartbeat",
+  "model.current",
+  "models.list",
+  "agent.identity.get",
+  "agents.list"
+]);
 var HermesRelayRuntime = class {
   options;
   relaySocket = null;
@@ -5853,6 +5862,7 @@ var HermesRelayRuntime = class {
   bridgeStatusProbeInFlight = false;
   pendingBridgeMessages = [];
   bridgeHealthProbeSeq = 0;
+  relayMessageSeq = 0;
   pendingBridgeHealthProbe = null;
   snapshot;
   constructor(options) {
@@ -6010,6 +6020,7 @@ var HermesRelayRuntime = class {
     const text = normalizeText(data);
     if (text == null)
       return;
+    this.traceRelayFrame("relay_in", text);
     if (text.startsWith(RELAY_CONTROL_PREFIX)) {
       this.handleRelayControl(text);
       return;
@@ -6045,6 +6056,7 @@ var HermesRelayRuntime = class {
     const text = normalizeText(data);
     if (text == null)
       return;
+    this.traceRelayFrame("bridge_in", text);
     if (this.handleBridgeHealthProbeResponse(text)) {
       return;
     }
@@ -6055,6 +6067,9 @@ var HermesRelayRuntime = class {
   forwardOrQueueBridgeMessage(message) {
     const bridge = this.bridgeSocket;
     if (!bridge || bridge.readyState !== WebSocket2.OPEN) {
+      if (message.text !== void 0) {
+        this.traceRelayFrame("bridge_queue", message.text);
+      }
       if (this.pendingBridgeMessages.length < 256) {
         this.pendingBridgeMessages.push(message);
       }
@@ -6062,6 +6077,7 @@ var HermesRelayRuntime = class {
       return;
     }
     if (message.text !== void 0) {
+      this.traceRelayFrame("bridge_send", message.text);
       bridge.send(message.text);
       return;
     }
@@ -6078,12 +6094,44 @@ var HermesRelayRuntime = class {
       if (!next)
         break;
       if (next.text !== void 0) {
+        this.traceRelayFrame("bridge_flush", next.text);
         bridge.send(next.text);
       } else if (next.data) {
         bridge.send(next.data);
       }
     }
   }
+  traceRelayFrame(direction, text) {
+    const details = this.describeRelayFrame(text);
+    if (!details)
+      return;
+    this.log(`[trace] ${direction} seq=${++this.relayMessageSeq} ${details}`);
+  }
+  describeRelayFrame(text) {
+    if (text.startsWith(RELAY_CONTROL_PREFIX)) {
+      try {
+        const parsed = JSON.parse(text.slice(RELAY_CONTROL_PREFIX.length));
+        const event = typeof parsed?.event === "string" ? parsed.event : "unknown";
+        return `controlEvent=${event}`;
+      } catch {
+        return "controlEvent=invalid";
+      }
+    }
+    try {
+      const parsed = JSON.parse(text);
+      if (parsed?.type === "req" && typeof parsed.method === "string") {
+        if (!TRACEABLE_RELAY_METHODS.has(parsed.method))
+          return null;
+        return `frame=req id=${String(parsed.id ?? "")} method=${parsed.method}`;
+      }
+      if (parsed?.type === "res" && typeof parsed.id === "string") {
+        return `frame=res id=${parsed.id} ok=${parsed.ok === true ? "true" : "false"}`;
+      }
+      return null;
+    } catch {
+      return null;
+    }
+  }
   scheduleRelayReconnect() {
     if (this.stopped || this.reconnectTimer)
       return;
@@ -6152,9 +6200,8 @@ var HermesRelayRuntime = class {
       } else {
         const payload = await response.json();
         if (!payload?.hasBridge) {
-          this.log("bridge status probe reported hasBridge=false; restarting relay socket");
-          this.relaySocket?.close();
-          this.bridgeSocket?.close();
+          this.log("bridge status probe reported hasBridge=false; recycling relay socket");
+          this.recycleRelaySocket("bridge status probe reported hasBridge=false");
           return;
         }
       }
@@ -6244,6 +6291,26 @@ var HermesRelayRuntime = class {
     clearTimeout(this.pendingBridgeHealthProbe.timeout);
     this.pendingBridgeHealthProbe = null;
   }
+  recycleRelaySocket(reason) {
+    const relay = this.relaySocket;
+    if (!relay)
+      return;
+    this.relaySocket = null;
+    this.clearBridgeStatusProbe();
+    this.clearPendingBridgeHealthProbe();
+    this.updateSnapshot({
+      relayConnected: false,
+      bridgeConnected: this.bridgeSocket?.readyState === WebSocket2.OPEN,
+      lastError: reason
+    });
+    try {
+      relay.close();
+    } catch {
+    }
+    if (!this.stopped) {
+      this.scheduleRelayReconnect();
+    }
+  }
   isRelayOpen() {
     return this.relaySocket?.readyState === WebSocket2.OPEN;
   }
@@ -9249,6 +9316,7 @@ function decidePairServiceAction(paired, service) {
 }
 
 // apps/bridge-cli/src/index.ts
+var HERMES_SERVICE_WATCHDOG_INTERVAL_MS = 3e4;
 async function main() {
   const [, , command = "help", ...args] = process.argv;
   const isServiceMode = hasFlag(args, "--service");
@@ -9426,6 +9494,9 @@ async function main() {
       instanceId: config.instanceId,
       serviceMode: isServiceMode
     });
+    const hermesServiceWatchdog = isServiceMode ? startHermesServiceWatchdog((line) => {
+      emitRuntimeLine(`[hermes-service] ${line}`);
+    }) : null;
     if (isServiceMode) {
       await restoreHermesServiceRuntime((line) => {
         emitRuntimeLine(`[hermes-service] ${line}`);
@@ -9435,6 +9506,9 @@ async function main() {
       process.off("SIGINT", shutdown);
       process.off("SIGTERM", shutdown);
       await runtime.stop();
+      if (hermesServiceWatchdog) {
+        clearInterval(hermesServiceWatchdog);
+      }
       unregisterRuntimeProcess(process.pid);
       if (isServiceMode) {
         clearServiceState(process.pid);
@@ -10288,6 +10362,16 @@ async function keepHermesBridgeAlive(bridge) {
   });
 }
 async function restoreHermesServiceRuntime(log) {
+  await restoreHermesServiceRuntimeInternal(log, { silentIfHealthy: false });
+}
+function startHermesServiceWatchdog(log) {
+  const timer = setInterval(() => {
+    void restoreHermesServiceRuntimeInternal(log, { silentIfHealthy: true });
+  }, HERMES_SERVICE_WATCHDOG_INTERVAL_MS);
+  timer.unref?.();
+  return timer;
+}
+async function restoreHermesServiceRuntimeInternal(log, options) {
   const bridgeConfig = readHermesBridgeCliConfig();
   const relayConfig = readHermesRelayConfig();
   if (!bridgeConfig && !relayConfig) {
@@ -10302,9 +10386,11 @@ async function restoreHermesServiceRuntime(log) {
       config: bridgeConfig,
       replaceExisting: false
     });
-    log(
-      bridgePid == null ? "Hermes bridge runtime already running." : `Started Hermes bridge runtime (pid ${bridgePid}).`
-    );
+    if (bridgePid != null || !options.silentIfHealthy) {
+      log(
+        bridgePid == null ? "Hermes bridge runtime already running." : `Started Hermes bridge runtime (pid ${bridgePid}).`
+      );
+    }
   } catch (error) {
     log(`Hermes bridge restore failed: ${formatError3(error)}`);
     return;
@@ -10318,9 +10404,11 @@ async function restoreHermesServiceRuntime(log) {
       config: bridgeConfig,
       replaceExisting: false
     });
-    log(
-      relayPid == null ? "Hermes relay runtime already running." : `Started Hermes relay runtime (pid ${relayPid}).`
-    );
+    if (relayPid != null || !options.silentIfHealthy) {
+      log(
+        relayPid == null ? "Hermes relay runtime already running." : `Started Hermes relay runtime (pid ${relayPid}).`
+      );
+    }
   } catch (error) {
     log(`Hermes relay restore failed: ${formatError3(error)}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@p697/clawket",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "private": false,
   "type": "module",
   "license": "AGPL-3.0-only",