@remnic/plugin-openclaw 9.39.0 → 9.41.0

package/dist/index.js

@@ -5294,48 +5294,84 @@ import { Worker } from "worker_threads";
 import { expandTildePath } from "@remnic/core";
 var DEFAULT_HOST = "127.0.0.1";
 var DEFAULT_PORT = 4318;
+var LIVENESS_PATH = "/engram/v1/live";
 var LEGACY_HEALTH_PATH = "/engram/v1/health";
-var SYNC_HEALTH_TIMEOUT_MS = 2e3;
+var DEFAULT_DAEMON_HEALTH_TIMEOUT_MS = 1e4;
+function parseBridgeHealthTimeoutMs(value) {
+  if (value === void 0) return DEFAULT_DAEMON_HEALTH_TIMEOUT_MS;
+  const parsed = typeof value === "string" && value.trim() !== "" ? Number(value) : value;
+  if (typeof parsed !== "number" || !Number.isFinite(parsed) || !Number.isInteger(parsed) || parsed < 1 || parsed > 12e4) {
+    throw new Error(
+      `bridgeHealthTimeoutMs must be an integer in [1, 120000]; got ${String(value)}`
+    );
+  }
+  return parsed;
+}
+function parseOpenClawBridgeConfig(config) {
+  return {
+    healthTimeoutMs: parseBridgeHealthTimeoutMs(config.bridgeHealthTimeoutMs)
+  };
+}
+function runHealthWorker(request, data) {
+  const view = new Int32Array(data.state);
+  let completed = false;
+  function finish(ok) {
+    if (completed) return;
+    completed = true;
+    Atomics.store(view, 0, ok ? 1 : 2);
+    Atomics.notify(view, 0);
+  }
+  function probe(pathname, fallbackPath) {
+    const remainingMs = data.deadline - Date.now();
+    if (remainingMs <= 0) {
+      finish(false);
+      return;
+    }
+    let responseReceived = false;
+    try {
+      const headers = {};
+      if (data.token) headers.Authorization = `Bearer ${data.token}`;
+      const req = request(
+        {
+          hostname: data.host,
+          port: data.port,
+          path: pathname,
+          method: "GET",
+          timeout: remainingMs,
+          headers
+        },
+        (res) => {
+          responseReceived = true;
+          const statusCode = res.statusCode;
+          res.resume();
+          if (statusCode === 200) {
+            finish(true);
+          } else if (statusCode === 404 && fallbackPath) {
+            probe(fallbackPath, null);
+          } else {
+            finish(false);
+          }
+        }
+      );
+      req.on("error", () => {
+        if (!responseReceived) finish(false);
+      });
+      req.on("timeout", () => {
+        req.destroy();
+        if (!responseReceived) finish(false);
+      });
+      req.end();
+    } catch {
+      finish(false);
+    }
+  }
+  probe(data.path, data.fallbackPath);
+}
 var HEALTH_WORKER_SOURCE = `
 import { request } from "node:http";
 import { workerData } from "node:worker_threads";
-
-const view = new Int32Array(workerData.state);
-let completed = false;
-
-function finish(ok) {
-  if (completed) return;
-  completed = true;
-  Atomics.store(view, 0, ok ? 1 : 2);
-  Atomics.notify(view, 0);
-}
-
-try {
-  const headers = {};
-  if (workerData.token) headers.Authorization = "Bearer " + workerData.token;
-  const req = request(
-    {
-      hostname: workerData.host,
-      port: workerData.port,
-      path: workerData.path,
-      method: "GET",
-      timeout: workerData.timeoutMs,
-      headers,
-    },
-    (res) => {
-      finish(res.statusCode === 200);
-      res.resume();
-    },
-  );
-  req.on("error", () => finish(false));
-  req.on("timeout", () => {
-    req.destroy();
-    finish(false);
-  });
-  req.end();
-} catch {
-  finish(false);
-}
+const __name = (target) => target;
+(${runHealthWorker.toString()})(request, workerData);
 `;
 var LAUNCHD_SERVICE_PATHS = [
   ["Library", "LaunchAgents", "ai.remnic.daemon.plist"],
@@ -5402,8 +5438,9 @@ function coerceDaemonPort(value) {
   const parsed = typeof value === "string" && value.trim() !== "" ? Number(value.trim()) : value;
   return typeof parsed === "number" && Number.isInteger(parsed) && parsed > 0 && parsed <= 65535 ? parsed : void 0;
 }
-function checkDaemonHealthSync(host, port, timeoutMs = SYNC_HEALTH_TIMEOUT_MS) {
+function checkDaemonHealthSync(host, port, timeoutMs = DEFAULT_DAEMON_HEALTH_TIMEOUT_MS) {
   if (!host || !Number.isInteger(port) || port <= 0 || port > 65535) return false;
+  const deadline = Date.now() + timeoutMs;
   let worker;
   try {
     const state = new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT);
@@ -5414,14 +5451,15 @@ function checkDaemonHealthSync(host, port, timeoutMs = SYNC_HEALTH_TIMEOUT_MS) {
       workerData: {
         host,
         port,
-        path: LEGACY_HEALTH_PATH,
+        path: LIVENESS_PATH,
+        fallbackPath: LEGACY_HEALTH_PATH,
         token: loadDaemonAuth().token,
-        timeoutMs,
+        deadline,
         state
       }
     };
     worker = new Worker(workerUrl, workerOptions);
-    Atomics.wait(view, 0, 0, timeoutMs + 250);
+    Atomics.wait(view, 0, 0, Math.max(0, deadline - Date.now()));
     const status = Atomics.load(view, 0);
     if (status === 0) void worker.terminate();
     return status === 1;
@@ -5567,27 +5605,44 @@ function loadDaemonAuth() {
   }
   return { token: "", source: "no configured token" };
 }
-async function checkDaemonHealth(host, port) {
+async function checkDaemonHealth(host, port, timeoutMs = DEFAULT_DAEMON_HEALTH_TIMEOUT_MS) {
+  if (!host || !Number.isInteger(port) || port <= 0 || port > 65535) return false;
+  const deadline = Date.now() + timeoutMs;
   try {
     const { request } = await import("http");
     const token = loadDaemonAuth().token;
     const headers = {};
     if (token) headers["Authorization"] = `Bearer ${token}`;
-    return new Promise((resolve) => {
+    const probe = (requestPath) => new Promise((resolve) => {
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) {
+        resolve(void 0);
+        return;
+      }
+      let settled = false;
+      const finish = (statusCode) => {
+        if (settled) return;
+        settled = true;
+        resolve(statusCode);
+      };
       const req = request(
-        { hostname: host, port, path: LEGACY_HEALTH_PATH, method: "GET", timeout: 2e3, headers },
+        { hostname: host, port, path: requestPath, method: "GET", timeout: remainingMs, headers },
         (res) => {
-          resolve(res.statusCode === 200);
+          finish(res.statusCode);
           res.resume();
         }
       );
-      req.on("error", () => resolve(false));
+      req.on("error", () => finish(void 0));
       req.on("timeout", () => {
         req.destroy();
-        resolve(false);
+        finish(void 0);
       });
       req.end();
     });
+    const livenessStatus = await probe(LIVENESS_PATH);
+    if (livenessStatus === 200) return true;
+    if (livenessStatus !== 404) return false;
+    return await probe(LEGACY_HEALTH_PATH) === 200;
   } catch {
     return false;
   }
@@ -6231,7 +6286,21 @@ function maybeRegisterDelegateRuntime(api, options, deps = { checkHealth: checkD
     );
     return true;
   }
-  if (!deps.checkHealth(bridge.daemonHost, bridge.daemonPort)) {
+  let bridgeHealthTimeoutMs;
+  try {
+    bridgeHealthTimeoutMs = parseOpenClawBridgeConfig({
+      bridgeHealthTimeoutMs: options.bridgeHealthTimeoutMs
+    }).healthTimeoutMs;
+  } catch (err) {
+    log2.error(`${String(err)} \u2014 falling back to the embedded runtime`);
+    delegateEmbeddedFallbackApis.add(api);
+    return false;
+  }
+  if (!deps.checkHealth(
+    bridge.daemonHost,
+    bridge.daemonPort,
+    bridgeHealthTimeoutMs
+  )) {
     delegateEmbeddedFallbackApis.add(api);
     log2.error(
       `bridge mode delegate requested but no healthy daemon at ${bridge.daemonHost}:${bridge.daemonPort} \u2014 falling back to the embedded runtime`
@@ -7236,12 +7305,13 @@ var pluginDefinition = {
     const fileConfig = loadPluginConfigFromFile(serviceId);
     const openclawFlushPlanProcessingEnabled = resolveOpenClawFlushPlanProcessingEnabledFromConfig(fileConfig, api.pluginConfig);
     const runtimeSet = /* @__PURE__ */ new Set();
+    const rawPluginConfig = {
+      ...fileConfig,
+      ...api.pluginConfig
+    };
     const cfg = (0, config_exports.parseConfig)(
       {
-        ...fileConfig,
-        // File-backed fallback for runtimes that omit pluginConfig
-        ...api.pluginConfig,
-        // Runtime/plugin-supplied config must win
+        ...rawPluginConfig,
         gatewayConfig: api.config
         // Pass gateway config for fallback AI
       },
@@ -7293,9 +7363,8 @@ var pluginDefinition = {
     const delegateApi = api;
     const delegateHandled = maybeRegisterDelegateRuntime(delegateApi, {
       serviceId,
-      // cfg.bridgeMode is parseConfig's merged file+runtime passthrough, so
-      // file-config-only deployments activate delegate too (round-7 High).
       configBridgeMode: cfg.bridgeMode,
+      bridgeHealthTimeoutMs: rawPluginConfig.bridgeHealthTimeoutMs,
       passive: passiveMode,
       allowPromptInjection: coerceRawConfigBoolean(
         readPluginHooksPolicy(api.config, serviceId)?.allowPromptInjection