@drakon-systems/multi-clawd 1.8.0 → 1.8.2

package/README.md

@@ -73,7 +73,10 @@ multi-clawd hermes sync --profile work --strategy least_used
 multi-clawd hermes doctor --config ~/configs/openclaw.json
 ```
 
-Validated against Hermes Agent **0.19.1**.
+Validated against Hermes Agent **0.20.6**. The bridge/core/CLI integration
+tests exercise that installed release's real Python APIs in isolated temporary
+homes; on machines without a compatible Hermes install, those integration tests
+skip while the no-Hermes CLI safety tests still run.
 
 ### Only stable setup tokens are imported
 
@@ -94,7 +97,7 @@ Everything else is refused, on purpose:
   on that source instead of duplicating the grant.
 - **`configDir` logins are not importable, and Hermes cannot be pointed at
   them either.** The same single-use-refresh-token problem applies, and unlike
-  a native login there is no Hermes-side fallback: as of Hermes Agent 0.19.1,
+  a native login there is no Hermes-side fallback: as of Hermes Agent 0.20.6,
   its `claude_code` credential source reads only the native path above, never
   an arbitrary `configDir`. A `configDir` account can only reach Hermes' pool
   by getting its own `oauthTokenFile` (a `claude setup-token`, same as above),
@@ -364,7 +367,7 @@ openclaw plugins install (Get-Location).Path
 **Or let your agent install it.** Running an OpenClaw assistant or Claude
 Code on the target machine already? Paste it this and go make coffee:
 
-> Read https://raw.githubusercontent.com/Drakon-Systems-Ltd/multi-clawd/v1.8.0/SETUP-AGENT.md
+> Read https://raw.githubusercontent.com/Drakon-Systems-Ltd/multi-clawd/v1.8.2/SETUP-AGENT.md
 > and follow it to set up multi-clawd on this machine. I own a second
 > Claude account — ask me when you need me to log in.
 
@@ -377,7 +380,11 @@ happens to say today. Swap the tag if you want a different release, but
 prefer a tag over a branch.
 
 **Requirements:** OpenClaw ≥ 2026.6, the `claude` CLI on `PATH`, and a
-second Claude subscription you own.
+second Claude subscription you own. The current plugin SDK contract and runtime
+registration path are tested against OpenClaw **2026.7.1**. The standalone
+`multi-clawd` CLI and Hermes commands do not require the optional OpenClaw peer
+to be resolvable; plugin loading and OpenClaw-backed commands still require the
+host-provided peer.
 
 **Upgrading:**
 

package/SECURITY.md

@@ -30,9 +30,10 @@ credit you (unless you'd rather we didn't), and note it in the CHANGELOG.
   `oauthTokenFile`, multi-clawd warns (once per process) when the file is
   readable beyond your own user account. It warns rather than refuses: the
   credential still works, and the fix is yours to make — `chmod 600`.
-- **Host credentials are stripped from child processes.** 22 Claude/Anthropic
-  environment variables are cleared before each launch, so one account's
-  credential cannot bleed into another account's session.
+- **Host credentials are stripped from child processes.** 38 Claude/Anthropic
+  environment variables covering authentication, runtime, and telemetry are
+  cleared before each launch, so one account's credential cannot bleed into
+  another account's session.
 - **State files are written `0600`,** atomically (temp file + rename), and
   contain rate-limit telemetry only — never credentials.
 

package/dist/credential-state.js

@@ -0,0 +1,30 @@
+import { readFileSync, writeFileSync, mkdirSync, renameSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join } from "node:path";
+import { parseStoredState, mergeHealthStates, clearCredentialFailure, } from "./shim-core.js";
+export function healthStateFile(accountId) {
+    return join(homedir(), ".openclaw", "state", "multi-clawd", `${accountId}.json`);
+}
+export function clearAccountCredentialFailure(accountId) {
+    const file = healthStateFile(accountId);
+    let state;
+    try {
+        state = parseStoredState(readFileSync(file, "utf8")) ?? { accountId, windows: {} };
+    }
+    catch {
+        return false;
+    }
+    if (state.credential?.status !== "failed")
+        return false;
+    const cleared = mergeHealthStates(state, clearCredentialFailure(state, Date.now()), Date.now());
+    try {
+        mkdirSync(dirname(file), { recursive: true });
+        const tmp = `${file}.tmp-${process.pid}`;
+        writeFileSync(tmp, JSON.stringify(cleared, null, 2), { mode: 0o600 });
+        renameSync(tmp, file);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/index.js

@@ -11,10 +11,12 @@ import { resolveExecMode, permissionModeArgs } from "./exec-policy.js";
 import { resolveBaseModelIds } from "./catalog-source.js";
 import { allCredentialFailed, classifyAccountHealth } from "./health.js";
 import { decideStickySelection } from "./sticky.js";
-import { clearCredentialFailure, mergeHealthStates, parseStoredState, recordCredentialFailure, } from "./shim-core.js";
+import { mergeHealthStates, parseStoredState, recordCredentialFailure, } from "./shim-core.js";
 import { createTokenRefResolver, isSecretRefShape, } from "./token-resolution.js";
 import { resolveSecretRefValues } from "openclaw/plugin-sdk/secret-ref-runtime";
 import { addAlert, alertKeysWithPrefix, clearAlert, pendingAlertText, } from "./alerts.js";
+import { healthStateFile, clearAccountCredentialFailure } from "./credential-state.js";
+export { healthStateFile, clearAccountCredentialFailure };
 import { buildAccountChildEnv, tokenFileModeWarning, validateAccountTokenSources, } from "./account-env.js";
 import { diffCatalogModels, formatNewModelNotice, } from "./model-currency.js";
 import { checkAccountCredential, createRefProbeTracker, } from "./login-health.js";
@@ -32,7 +34,7 @@ const BASE_ARGS = [
     "--disallowedTools",
     "ScheduleWakeup,CronCreate,Bash(run_in_background:true),Monitor",
 ];
-const CLEAR_ENV = [
+export const CLEAR_ENV = [
     "ANTHROPIC_API_KEY",
     "ANTHROPIC_API_KEY_OLD",
     "ANTHROPIC_API_TOKEN",
@@ -55,6 +57,22 @@ const CLEAR_ENV = [
     "CLAUDE_CODE_USE_BEDROCK",
     "CLAUDE_CODE_USE_FOUNDRY",
     "CLAUDE_CODE_USE_VERTEX",
+    "OTEL_EXPORTER_OTLP_ENDPOINT",
+    "OTEL_EXPORTER_OTLP_HEADERS",
+    "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT",
+    "OTEL_EXPORTER_OTLP_LOGS_HEADERS",
+    "OTEL_EXPORTER_OTLP_LOGS_PROTOCOL",
+    "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT",
+    "OTEL_EXPORTER_OTLP_METRICS_HEADERS",
+    "OTEL_EXPORTER_OTLP_METRICS_PROTOCOL",
+    "OTEL_EXPORTER_OTLP_PROTOCOL",
+    "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT",
+    "OTEL_EXPORTER_OTLP_TRACES_HEADERS",
+    "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL",
+    "OTEL_LOGS_EXPORTER",
+    "OTEL_METRICS_EXPORTER",
+    "OTEL_SDK_DISABLED",
+    "OTEL_TRACES_EXPORTER",
 ];
 function expandHome(p) {
     if (p === "~")
@@ -285,9 +303,6 @@ function buildRuntimeModel(account, modelId) {
     };
 }
 const SHIM_PATH = fileURLToPath(new URL("./shim.js", import.meta.url));
-export function healthStateFile(accountId) {
-    return join(homedir(), ".openclaw", "state", "multi-clawd", `${accountId}.json`);
-}
 function knownModelsFile() {
     return join(homedir(), ".openclaw", "state", "multi-clawd", "known-models.json");
 }
@@ -500,32 +515,6 @@ function readHealthState(accountId) {
         return undefined;
     }
 }
-export function clearAccountCredentialFailure(accountId) {
-    const file = healthStateFile(accountId);
-    let state;
-    try {
-        state = parseStoredState(readFileSync(file, "utf8")) ?? {
-            accountId,
-            windows: {},
-        };
-    }
-    catch {
-        return false;
-    }
-    if (state.credential?.status !== "failed")
-        return false;
-    const cleared = mergeHealthStates(state, clearCredentialFailure(state, Date.now()), Date.now());
-    try {
-        mkdirSync(dirname(file), { recursive: true });
-        const tmp = `${file}.tmp-${process.pid}`;
-        writeFileSync(tmp, JSON.stringify(cleared, null, 2), { mode: 0o600 });
-        renameSync(tmp, file);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 function readStickyEntry(file) {
     try {
         const parsed = JSON.parse(readFileSync(file, "utf8"));

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "multi-clawd",
   "name": "multi-clawd",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Register additional Claude Code logins (Max/Pro accounts) as first-class OpenClaw CLI backends for cross-account failover, keeping the full skills/MCP harness on every account.",
   "cliBackends": [
     "claw1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drakon-systems/multi-clawd",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "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. Also imports those accounts' setup tokens into Hermes Agent's Anthropic credential pool.",
   "type": "module",
   "license": "MIT",
@@ -21,7 +21,7 @@
   ],
   "openclaw": {
     "build": {
-      "openclawVersion": "2026.6.11"
+      "openclawVersion": "2026.7.1"
     },
     "extensions": [
       "./src/index.ts"
@@ -36,7 +36,7 @@
   },
   "main": "./dist/index.js",
   "bin": {
-    "multi-clawd": "./scripts/cli.mjs"
+    "multi-clawd": "scripts/cli.mjs"
   },
   "publishConfig": {
     "access": "public"

package/scripts/cli.mjs

@@ -16,7 +16,7 @@
  * has to remember `--pin --force`.
  */
 import { execFileSync, spawnSync } from "node:child_process";
-import { readFileSync } from "node:fs";
+import { readFileSync, existsSync as existsSyncEarly } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import readline from "node:readline/promises";
@@ -92,6 +92,34 @@ async function askYes(question, dflt = true) {
 }
 
 /** This package's own version (the CLI half). */
+/**
+ * Why a `dist/` import failed, in the user's terms.
+ *
+ * The bare "reinstall the package" message was wrong in the one case that
+ * actually happens: this CLI installs globally, `openclaw` is a peerDependency,
+ * and on a box where the peer is not resolvable from this directory a perfectly
+ * complete build still throws ERR_MODULE_NOT_FOUND. Reinstalling cannot fix
+ * that, so "reinstall the package" sends people in circles — it did, on a Mac,
+ * 18 Aug 2026. Check the file exists first, then report the real cause.
+ */
+function distFailure(cmd, mod, err) {
+  const path = resolve(__dirname, "..", "dist", mod);
+  if (!existsSyncEarly(path)) {
+    return `${cmd}: built dist/${mod} is missing — reinstall the package.`;
+  }
+  const missingPeer = /Cannot find package '([^']+)'/.exec(String(err?.message ?? ""));
+  if (missingPeer) {
+    const peer = missingPeer[1];
+    return [
+      `${cmd}: dist/${mod} is present but cannot load — the "${peer}" package is not`,
+      `resolvable from this install (${resolve(__dirname, "..")}).`,
+      `Install "${peer}" globally alongside this CLI, or run the CLI with npx from a`,
+      `directory where "${peer}" resolves.`,
+    ].join("\n  ");
+  }
+  return `${cmd}: dist/${mod} failed to load — ${err?.message ?? err}`;
+}
+
 function cliVersion() {
   return JSON.parse(readFileSync(resolve(__dirname, "..", "package.json"), "utf8")).version;
 }
@@ -134,8 +162,8 @@ async function chain(args = []) {
   let ca;
   try {
     ca = await import(resolve(__dirname, "..", "dist", "chain-audit.js"));
-  } catch {
-    console.error("chain: built dist/ is missing — reinstall the package.");
+  } catch (err) {
+    console.error(distFailure("chain", "chain-audit.js", err));
     process.exit(1);
   }
 
@@ -227,8 +255,8 @@ async function update() {
   let uc;
   try {
     uc = await import(resolve(__dirname, "..", "dist", "update-core.js"));
-  } catch {
-    console.error("update: built dist/ is missing — reinstall the package.");
+  } catch (err) {
+    console.error(distFailure("update", "update-core.js", err));
     process.exit(1);
   }
   console.log(`\n${BOLD}🦞 multi-clawd update${RESET}\n`);
@@ -391,8 +419,8 @@ async function explain() {
     ec = await import(resolve(__dirname, "..", "dist", "explain-core.js"));
     health = await import(resolve(__dirname, "..", "dist", "health.js"));
     shim = await import(resolve(__dirname, "..", "dist", "shim-core.js"));
-  } catch {
-    console.error("explain: built dist/ is missing — reinstall the package.");
+  } catch (err) {
+    console.error(distFailure("explain", "explain-core.js", err));
     process.exit(1);
   }
   let config = {};
@@ -465,9 +493,12 @@ async function login() {
   try {
     lp = await import(resolve(__dirname, "..", "dist", "login-plan.js"));
     ec = await import(resolve(__dirname, "..", "dist", "explain-core.js"));
-    idx = await import(resolve(__dirname, "..", "dist", "index.js"));
-  } catch {
-    console.error("login: built dist/ is missing — reinstall the package.");
+    // credential-state.js, NOT index.js: this is the one call login needs from
+    // the plugin side, and index.js drags in the `openclaw` peer, which is not
+    // resolvable from a global CLI install on every machine.
+    idx = await import(resolve(__dirname, "..", "dist", "credential-state.js"));
+  } catch (err) {
+    console.error(distFailure("login", "login-plan.js", err));
     process.exit(1);
   }
   let config = {};

package/scripts/hermes_bridge.py

@@ -10,7 +10,7 @@ grant (a native or config-dir ``.credentials.json``) is single-use on refresh,
 so duplicating one into a second store guarantees that one of the copies dies.
 For a *native* login that copy is unnecessary anyway: Hermes' own
 ``claude_code`` credential source already reads that exact file directly. A
-*config-dir* login has no such fallback — as of Hermes Agent 0.19.1,
+*config-dir* login has no such fallback — as of Hermes Agent 0.20.6,
 ``claude_code`` only reads the native path, never an arbitrary config dir — so
 it can only reach this bridge via its own setup token, never a duplicated
 grant. Requests carrying refresh tokens or expiries are refused outright.
@@ -60,6 +60,24 @@ ACCOUNT_ID_ALPHABET = frozenset("abcdefghijklmnopqrstuvwxyz0123456789_-")
 # Cleared whenever a managed row is written: a setup token never expires on a
 # schedule, so a stale expiry copied from an older row would quarantine it.
 STALE_EXPIRY_FIELDS = ("expires_at", "expires_at_ms", "last_refresh")
+# Hermes' own runtime bookkeeping (agent/credential_pool.py PooledCredential).
+# Cleared ONLY when the access token itself changes: Hermes' selection
+# (CredentialPool._available_entries) skips an entry whose last_status is
+# "exhausted" or "dead" until last_error_reset_at passes, which can be hours
+# or days out. A rotated-in token proves the row is being actively managed
+# again, so carrying the old verdict forward would leave a freshly-rotated
+# credential unselectable until that window lapses on its own. A
+# metadata-only update (label/priority) with the SAME token is not evidence
+# of anything — Hermes' own telemetry for a healthy pool must survive it
+# untouched.
+STATUS_FIELDS = (
+    "last_status",
+    "last_status_at",
+    "last_error_code",
+    "last_error_reason",
+    "last_error_message",
+    "last_error_reset_at",
+)
 # Mirrors src/hermes-core.ts's parseClaudeSetupToken: ASCII-only, and shaped
 # like the current `sk-ant-oat01-...` setup-token family. The version digits
 # are intentionally unconstrained beyond "two or more" so a future
@@ -443,7 +461,12 @@ def merge_credential(existing: dict[str, Any], credential: DesiredCredential) ->
     Expiry fields are cleared: a setup token carries no expiry, and a value left
     over from an older row would make Hermes treat a perfectly good credential
     as expired.
+
+    Status fields are cleared too, but only when the access token actually
+    changed — see STATUS_FIELDS. A metadata-only update (same token) preserves
+    them exactly.
     """
+    token_rotated = existing.get("access_token") != credential.access_token
     updated = copy.deepcopy(existing)
     updated.update(
         {
@@ -458,6 +481,9 @@ def merge_credential(existing: dict[str, Any], credential: DesiredCredential) ->
     updated.pop("refresh_token", None)
     for field in STALE_EXPIRY_FIELDS:
         updated.pop(field, None)
+    if token_rotated:
+        for field in STATUS_FIELDS:
+            updated.pop(field, None)
     return updated