@drakon-systems/multi-clawd 1.2.0 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drakon-systems/multi-clawd",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Multi-account Claude Code failover for OpenClaw — register additional Claude (Max/Pro) logins as first-class CLI backends and keep the full skills/MCP harness across every account.",
   "type": "module",
   "license": "MIT",

package/scripts/_shared.mjs

@@ -0,0 +1,48 @@
+/**
+ * Shared helpers for the CLI scripts (cli.mjs, setup.mjs).
+ *
+ * resolveWatchdogScript exists because of a real footgun: run via `npx`, a
+ * script's __dirname is the EPHEMERAL npx cache — pointing a scheduled unit
+ * there breaks on the next cache clean. The watchdog target must be the
+ * INSTALLED plugin's copy whenever one exists; the __dirname sibling is only
+ * correct for a source checkout with no install.
+ */
+import { existsSync, readdirSync, statSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+/** Where the plugin is installed: path install wins, else newest npm-project install. */
+export function resolveInstallDir() {
+  const HOME = homedir();
+  const extDir = join(HOME, ".openclaw", "extensions", "multi-clawd");
+  if (existsSync(join(extDir, "openclaw.plugin.json"))) return extDir;
+  const projects = join(HOME, ".openclaw", "npm", "projects");
+  let best;
+  let bestM = -1;
+  try {
+    for (const p of readdirSync(projects)) {
+      if (!p.startsWith("drakon-systems-multi-clawd-")) continue;
+      const dir = join(projects, p, "node_modules", "@drakon-systems", "multi-clawd");
+      const manifest = join(dir, "openclaw.plugin.json");
+      if (!existsSync(manifest)) continue;
+      const m = statSync(manifest).mtimeMs;
+      if (m > bestM) {
+        bestM = m;
+        best = dir;
+      }
+    }
+  } catch {
+    /* no npm projects dir */
+  }
+  return best;
+}
+
+/** The watchdog script a scheduled unit should point at. */
+export function resolveWatchdogScript(fallbackDir) {
+  const inst = resolveInstallDir();
+  if (inst) {
+    const p = join(inst, "scripts", "eviction-watchdog.mjs");
+    if (existsSync(p)) return p;
+  }
+  return join(fallbackDir, "eviction-watchdog.mjs");
+}

package/scripts/cli.mjs

@@ -15,15 +15,13 @@
  * has to remember `--pin --force`.
  */
 import { execFileSync, spawnSync } from "node:child_process";
-import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
-import { homedir } from "node:os";
+import { readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import readline from "node:readline/promises";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PKG = "@drakon-systems/multi-clawd";
-const HOME = homedir();
 const BOLD = process.stdout.isTTY ? "\x1b[1m" : "";
 const DIM = process.stdout.isTTY ? "\x1b[2m" : "";
 const RESET = process.stdout.isTTY ? "\x1b[0m" : "";
@@ -44,30 +42,7 @@ Run via npx (${DIM}npx ${PKG} <command>${RESET}) or install globally
 `);
 }
 
-/** Same resolution as the doctor: path install wins, else newest npm-project install. */
-function resolveInstallDir() {
-  const extDir = join(HOME, ".openclaw", "extensions", "multi-clawd");
-  if (existsSync(join(extDir, "openclaw.plugin.json"))) return extDir;
-  const projects = join(HOME, ".openclaw", "npm", "projects");
-  let best;
-  let bestM = -1;
-  try {
-    for (const p of readdirSync(projects)) {
-      if (!p.startsWith("drakon-systems-multi-clawd-")) continue;
-      const dir = join(projects, p, "node_modules", "@drakon-systems", "multi-clawd");
-      const manifest = join(dir, "openclaw.plugin.json");
-      if (!existsSync(manifest)) continue;
-      const m = statSync(manifest).mtimeMs;
-      if (m > bestM) {
-        bestM = m;
-        best = dir;
-      }
-    }
-  } catch {
-    /* no npm projects dir */
-  }
-  return best;
-}
+const { resolveInstallDir } = await import(join(__dirname, "_shared.mjs"));
 
 function installedVersion() {
   const dir = resolveInstallDir();
@@ -155,7 +130,7 @@ async function update() {
   console.log(`\n${BOLD}  health check${RESET}`);
   const doc = spawnSync(process.execPath, [join(__dirname, "doctor.mjs")], { stdio: "inherit" });
   if (doc.status !== 0) {
-    console.log(`\n  ⚠ doctor found problems — if it flagged the watchdog, run ${BOLD}multi-clawd setup${RESET} to repair it.`);
+    console.log(`\n  ⚠ doctor found problems — if it flagged the watchdog, run ${BOLD}npx ${PKG} setup${RESET} to repair it.`);
     process.exit(doc.status ?? 1);
   }
   console.log(`\n  ✅ done — now on v${installedVersion() ?? "?"}`);

package/scripts/setup.mjs

@@ -229,7 +229,10 @@ async function watchdogStep() {
     console.log("  (auto-scheduling not supported on this platform — see README for manual setup)");
     return;
   }
-  const scriptPath = join(__dirname, "eviction-watchdog.mjs");
+  // Install-aware: under npx, __dirname is the EPHEMERAL npx cache — the unit
+  // must point at the installed plugin's copy whenever one exists.
+  const { resolveWatchdogScript } = await import(resolve(__dirname, "_shared.mjs"));
+  const scriptPath = resolveWatchdogScript(__dirname);
   const scanDir =
     platform === "darwin"
       ? join(homedir(), "Library", "LaunchAgents")