@drakon-systems/multi-clawd 1.8.1 → 1.8.3

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.1/SETUP-AGENT.md
+> Read https://raw.githubusercontent.com/Drakon-Systems-Ltd/multi-clawd/v1.8.3/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.8.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:**
 
@@ -596,7 +603,7 @@ Three moves, all through the official plugin SDK (details in
    (`CLAUDE_CONFIG_DIR` + `CLAUDE_CODE_OAUTH_TOKEN`) into the child process
    env, after the host's ambient Claude credentials are stripped.
 
-## Known issue: idle backends can be evicted by OpenClaw core
+## Legacy issue: idle backend eviction on OpenClaw ≤ 2026.7.1
 
 On OpenClaw ≤ 2026.7.1, core's *scoped* harness activation can silently drop
 a plugin-registered CLI backend from the live registry: when an agent turn
@@ -608,9 +615,10 @@ list` (a separate cache) still lists its models. A common real-world trigger
 is an hourly heartbeat running on a model served by another harness.
 
 - Upstream bug: [openclaw#107408](https://github.com/openclaw/openclaw/issues/107408)
-- Upstream fix: [openclaw#107596](https://github.com/openclaw/openclaw/pull/107596)
+- Upstream fix: [openclaw#108110](https://github.com/openclaw/openclaw/pull/108110)
 
-**Until that lands:** a gateway restart always restores the backend (startup
+OpenClaw 2026.8.1 includes the fix. On affected older runtimes, a gateway
+restart always restores the backend (startup
 loads are full-scope), and backends that are in regular use effectively
 re-assert themselves. This repo ships a ready-made mitigation —
 `scripts/eviction-watchdog.mjs` — which tails the gateway log for the

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.** 42 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/index.js

@@ -1,6 +1,4 @@
-import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
-import { resolvePluginConfigObject, resolveLivePluginConfigObject, } from "openclaw/plugin-sdk/plugin-config-runtime";
-import { CLI_FRESH_WATCHDOG_DEFAULTS, CLI_RESUME_WATCHDOG_DEFAULTS, } from "openclaw/plugin-sdk/cli-backend";
+import { definePluginEntry, } from "openclaw/plugin-sdk/plugin-entry";
 import { homedir } from "node:os";
 import { mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
@@ -21,6 +19,16 @@ import { buildAccountChildEnv, tokenFileModeWarning, validateAccountTokenSources
 import { diffCatalogModels, formatNewModelNotice, } from "./model-currency.js";
 import { checkAccountCredential, createRefProbeTracker, } from "./login-health.js";
 import { execFileSync } from "node:child_process";
+const CLI_FRESH_WATCHDOG_DEFAULTS = {
+    noOutputTimeoutRatio: 0.8,
+    minMs: 180_000,
+    maxMs: 600_000,
+};
+const CLI_RESUME_WATCHDOG_DEFAULTS = {
+    noOutputTimeoutRatio: 0.3,
+    minMs: 60_000,
+    maxMs: 180_000,
+};
 const BASE_ARGS = [
     "-p",
     "--output-format",
@@ -34,7 +42,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",
@@ -44,6 +52,10 @@ const CLEAR_ENV = [
     "ANTHROPIC_OAUTH_TOKEN",
     "ANTHROPIC_UNIX_SOCKET",
     "CLAUDE_CONFIG_DIR",
+    "CLAUDE_CODE_AUTO_COMPACT_WINDOW",
+    "CLAUDE_CODE_DISABLE_1M_CONTEXT",
+    "CLAUDE_CODE_DISABLE_ADAPTIVE_THINKING",
+    "MAX_THINKING_TOKENS",
     "CLAUDE_CODE_API_KEY_FILE_DESCRIPTOR",
     "CLAUDE_CODE_ENTRYPOINT",
     "CLAUDE_CODE_OAUTH_REFRESH_TOKEN",
@@ -57,6 +69,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 === "~")
@@ -65,6 +93,18 @@ function expandHome(p) {
         return resolve(homedir(), p.slice(2));
     return resolve(p);
 }
+function pluginConfigFromRoot(root, pluginId) {
+    if (typeof root !== "object" || root === null)
+        return undefined;
+    const entries = root.plugins?.entries;
+    const entry = entries?.[pluginId];
+    if (typeof entry !== "object" || entry === null)
+        return undefined;
+    const config = entry.config;
+    return typeof config === "object" && config !== null && !Array.isArray(config)
+        ? config
+        : undefined;
+}
 let activeTokenResolver;
 let alertState = { alerts: [] };
 let loginProbeTimer;
@@ -336,7 +376,7 @@ function checkModelCurrency(catalogIds, chainRefs, poolId) {
     }
 }
 export function buildBackend(account, execMode) {
-    return {
+    const backend = {
         id: account.id,
         liveTest: {
             defaultModelRef: `${account.id}/${account.defaultModel ?? "claude-fable-5"}`,
@@ -356,6 +396,8 @@ export function buildBackend(account, execMode) {
             command: process.execPath,
             args: [SHIM_PATH, ...BASE_ARGS, ...permissionModeArgs(execMode)],
             resumeArgs: [SHIM_PATH, ...BASE_ARGS, ...permissionModeArgs(execMode), "--resume", "{sessionId}"],
+            forkArg: "--fork-session",
+            resumeAtArg: "--resume-session-at",
             output: "jsonl",
             liveSession: "claude-stdio",
             input: "stdin",
@@ -364,8 +406,9 @@ export function buildBackend(account, execMode) {
             modelAliases: { ...MODEL_ALIASES },
             imageArg: "@",
             imagePathScope: "workspace",
-            sessionArg: "--session-id",
+            sessionArgs: ["--session-id", "{sessionId}"],
             sessionMode: "always",
+            freshSessionRecovery: "invalidated-only",
             reseedFromRawTranscriptWhenUncompacted: true,
             sessionIdFields: ["session_id", "sessionId", "conversation_id", "conversationId"],
             systemPromptFileArg: "--append-system-prompt-file",
@@ -384,6 +427,8 @@ export function buildBackend(account, execMode) {
             return { env: await buildAccountEnv(account) };
         },
     };
+    Object.assign(backend.config, { sessionArg: "--session-id" });
+    return backend;
 }
 async function buildAccountEnv(account, resolver) {
     const token = await resolveTokenAsync(account, resolver);
@@ -418,12 +463,12 @@ export default definePluginEntry({
     name: "multi-clawd",
     description: "Register additional Claude Code logins as first-class OpenClaw CLI backends for cross-account failover.",
     register(api) {
-        const runtimeConfigLoader = (api.runtime?.config?.current
+        const runtimeConfigLoader = api.runtime?.config?.current
             ? () => api.runtime.config.current()
-            : undefined);
+            : undefined;
         const candidates = [
-            resolveLivePluginConfigObject(runtimeConfigLoader, "multi-clawd", api.pluginConfig),
-            resolvePluginConfigObject(api.config, "multi-clawd"),
+            pluginConfigFromRoot(runtimeConfigLoader?.(), "multi-clawd"),
+            pluginConfigFromRoot(api.config, "multi-clawd"),
             api.pluginConfig,
         ];
         const hasAccounts = (c) => Array.isArray(c?.accounts) &&

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "multi-clawd",
   "name": "multi-clawd",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "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.1",
+  "version": "1.8.3",
   "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.8.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"
@@ -72,7 +72,7 @@
     }
   },
   "devDependencies": {
-    "openclaw": "2026.7.1",
+    "openclaw": "2026.8.1",
     "typescript": "^5.9.0",
     "vitest": "^4.1.10"
   },

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