@linkclaw/clawpool 0.2.0 → 0.2.1

package/clawpool.ts

@@ -154,18 +154,58 @@ async function syncStatus(
   }
 }
 
-function openclawConfig(token: string): string {
-  return JSON.stringify({
+const HOST_OC_CONFIG = join(homedir(), ".openclaw", "openclaw.json");
+
+function loadHostOpenClawConfig(): Record<string, unknown> {
+  if (!existsSync(HOST_OC_CONFIG)) return {};
+  try {
+    const raw = require("fs").readFileSync(HOST_OC_CONFIG, "utf-8");
+    return JSON.parse(raw);
+  } catch {
+    return {};
+  }
+}
+
+function deepMerge(target: Record<string, unknown>, source: Record<string, unknown>): Record<string, unknown> {
+  const result = { ...target };
+  for (const key of Object.keys(source)) {
+    if (
+      source[key] &&
+      typeof source[key] === "object" &&
+      !Array.isArray(source[key]) &&
+      target[key] &&
+      typeof target[key] === "object" &&
+      !Array.isArray(target[key])
+    ) {
+      result[key] = deepMerge(
+        target[key] as Record<string, unknown>,
+        source[key] as Record<string, unknown>
+      );
+    } else {
+      result[key] = source[key];
+    }
+  }
+  return result;
+}
+
+function buildOpenClawConfig(token: string): string {
+  const hostConfig = loadHostOpenClawConfig();
+  // Gateway config is always overridden per-instance
+  const instanceOverrides: Record<string, unknown> = {
     gateway: {
       auth: { mode: "token", token },
       controlUi: { dangerouslyAllowHostHeaderOriginFallback: true },
     },
-  });
+  };
+  // Strip host gateway settings (we manage those), keep everything else
+  const { gateway: _gw, meta: _meta, ...hostSettings } = hostConfig;
+  const merged = deepMerge(hostSettings, instanceOverrides);
+  return JSON.stringify(merged);
 }
 
 function buildRunArgs(config: Config, inst: Instance): string[] {
-  const ocConfig = openclawConfig(inst.gateway_token);
-  // Init as root to fix volume permissions, write config, then drop to node user
+  const ocConfig = buildOpenClawConfig(inst.gateway_token);
+  // Always write config on start — merges host ~/.openclaw/openclaw.json with per-instance gateway auth
   const entrypoint = [
     "sh",
     "-c",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linkclaw/clawpool",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "bin": {
     "clawpool": "./clawpool.ts"