@drakon-systems/multi-clawd 1.8.11 → 1.9.1

package/scripts/doctor.mjs

@@ -527,6 +527,14 @@ if (!pool) {
     "cli",
   );
   const poolId = pool.id ?? "clawd";
+  // v1.9: anthropic/* rungs are pooled when the direct route serves two accounts.
+  let directPooled = false;
+  try {
+    const dr = await importDist("direct-route.js", ["directRoutePools"], "cli");
+    directPooled = dr.directRoutePools(accounts, pluginConfig.directRoute);
+  } catch {
+    /* dist predates the direct route */
+  }
   // Session keys embed the operator's private channel id (e.g. a Telegram chat
   // id). Mask the id tail by default so doctor output is safe to paste into
   // issues/support threads; `--raw` (hoisted, shared with the login identities
@@ -536,7 +544,7 @@ if (!pool) {
     RAW ? surface : surface.replace(/^session (.+)$/, (_m, k) => `session ${maskSessionKey(k)}`);
 
   // ── case 1: config-level refs ──────────────────────────────────────────────
-  const findings = auditEffectiveChain(config, poolId);
+  const findings = auditEffectiveChain(config, poolId, { directPooled });
   const warns = findings.filter((f) => f.severity === "warn");
   const notes = findings.filter((f) => f.severity === "note");
   for (const f of warns) warn(`${f.surface}: ${f.ref} ${f.reason}`);
@@ -593,7 +601,7 @@ if (!pool) {
       if (read.skippedRows > 0) {
         warn(`${location.path}: ${read.skippedRows} session row(s) unparseable — those sessions were not audited`);
       }
-      const sessionFindings = auditSessionOverrides(read.entries, true);
+      const sessionFindings = auditSessionOverrides(read.entries, true, { directPooled });
       for (const f of sessionFindings) {
         warn(`${renderSurface(f.surface)}: ${f.ref} ${f.reason}`);
         sessionWarns++;
@@ -703,6 +711,113 @@ console.log("chain auth");
   }
 }
 
+
+// ── 8b. direct route — anthropic/* served by the pool's accounts (v1.9) ────
+//
+// Only when an account opts in with `direct`; otherwise this prints nothing,
+// so doctor output for CLI-only setups is unchanged. Everything is read
+// through OpenClaw's own CLI (auth list / order get / models status); token
+// files are shape-checked without ever printing their contents.
+if (accounts.some((a) => a && a.direct !== undefined && a.direct !== false)) {
+  console.log("direct route (anthropic/*)");
+  try {
+    const dr = await importDist("direct-route.js", ["collectDirectMembers"], "cli");
+    const rep = await importDist("direct-report.js", ["gatherDirectStatus", "parseProbeResults", "probeArgs"], "cli");
+    const run = await importDist("openclaw-runner.js", ["createOpenclawRunner"], "cli");
+    const shim = await importDist("shim-core.js", ["parseStoredState"], "cli");
+    const hc = await importDist("hermes-core.js", ["parseClaudeSetupToken"], "cli");
+    const directRoute = pluginConfig.directRoute ?? {};
+    const agents = Array.isArray(directRoute.agents) && directRoute.agents.length > 0 ? directRoute.agents : ["main"];
+    const runner = run.createOpenclawRunner(directRoute.openclawCommand ?? "openclaw");
+    const { members } = dr.collectDirectMembers(accounts, pool?.accounts ?? []);
+    // Credential sources, checked locally: present, private, setup-token shaped.
+    for (const m of members) {
+      if (m.source.kind !== "file") continue;
+      const path = expandHome(m.source.path);
+      try {
+        const mode = statSync(path).mode & 0o777;
+        hc.parseClaudeSetupToken(readFileSync(path, "utf8"));
+        if (mode & 0o077) warn(`${m.accountId}: direct token file ${path} is mode ${mode.toString(8)} — chmod 600 it`);
+        else ok(`${m.accountId}: direct token file present, 600, setup-token shaped`);
+      } catch (err) {
+        bad(`${m.accountId}: direct token file ${path} unusable — ${String(err?.message ?? err).slice(0, 160)}`);
+      }
+    }
+    const readHealth = (id) => {
+      try {
+        return shim.parseStoredState(readFileSync(join(STATE_DIR, `${id}.json`), "utf8"));
+      } catch {
+        return undefined;
+      }
+    };
+    for (const agentId of agents) {
+      const status = await rep.gatherDirectStatus({
+        accounts,
+        poolAccounts: pool?.accounts ?? [],
+        agentId,
+        runner,
+        readHealth,
+        healthOptions: {
+          utilizationThreshold: pool?.utilizationThreshold,
+          staleAfterMs: pool?.staleAfterMs,
+          rotateOnOverage: pool?.rotateOnOverage,
+        },
+        configOrder: Array.isArray(config?.auth?.order?.anthropic) ? config.auth.order.anthropic : undefined,
+        sticky: readJson(join(STATE_DIR, "direct-order.sticky.json")),
+        minDwellMs: pool?.minDwellMs,
+        nowMs: Date.now(),
+      });
+      if (!status) continue;
+      for (const p of status.explain.problems) bad(`${p.accountId}: asked for the direct route but cannot join it — ${p.reason}`);
+      for (const e of status.errors) warn(`agent ${agentId}: direct-route check partly SKIPPED — ${e}`);
+      for (const m of status.explain.members) {
+        const v = status.verdicts.find((x) => x.accountId === m.accountId)?.verdict ?? "no_data";
+        if (m.stored === false) {
+          bad(
+            m.adopted
+              ? `${m.accountId}: adopted profile ${m.profileId} is NOT stored for agent ${agentId} — store it yourself (openclaw models auth paste-token --provider anthropic --profile-id ${m.profileId}) or fix direct.profileId`
+              : `${m.accountId}: ${m.profileId} is NOT stored for agent ${agentId} — run \`multi-clawd direct sync\``,
+          );
+        }
+        else if (m.stored === true) ok(`${m.accountId}: ${m.profileId} stored for agent ${agentId} (health: ${v})`);
+        if (m.cooldownUntil && m.cooldownUntil > Date.now()) {
+          note(`${m.profileId} is cooling down (${m.cooldownReason ?? "cooldown"}) for ~${Math.ceil((m.cooldownUntil - Date.now()) / 60000)}m — OpenClaw skips it until then`);
+        }
+      }
+      if (directRoute.manageOrder === false) {
+        note(`agent ${agentId}: order management is off (directRoute.manageOrder: false)`);
+      } else if (status.pendingOrder) {
+        warn(
+          `agent ${agentId}: anthropic order is not in pool-health order yet — the gateway applies ${status.pendingOrder.join(" → ")} within a minute once this version is loaded (or run \`multi-clawd direct sync\`)`,
+        );
+      } else if (status.errors.length === 0) {
+        ok(`agent ${agentId}: anthropic order is in pool-health order (${(status.explain.order ?? []).join(" → ")})`);
+      }
+      const unmanaged = (status.explain.order ?? []).filter((id) => !status.explain.members.some((m) => m.profileId === id));
+      if (unmanaged.length > 0) {
+        note(`agent ${agentId}: ${unmanaged.join(", ")} not managed by multi-clawd — kept after the pool's accounts`);
+      }
+      // Live probe: one tiny call per stored managed profile.
+      if (args.has("--probe") && !args.has("--probe-pool")) {
+        const ids = status.explain.members.filter((m) => m.stored).map((m) => m.profileId);
+        if (ids.length > 0) {
+          const r = await runner(rep.probeArgs(agentId, ids), { timeoutMs: 180000 });
+          const results = r.code === 0 ? rep.parseProbeResults(r.stdout) : undefined;
+          if (!results) warn(`agent ${agentId}: direct-route probe returned nothing parseable (exit ${r.code})`);
+          for (const id of ids) {
+            const res = results?.find((x) => x.profileId === id);
+            if (!res) continue;
+            if (res.status === "ok") ok(`${id}: live probe answered via the direct API`);
+            else bad(`${id}: live probe ${res.status}${res.error ? ` — ${res.error}` : ""}`);
+          }
+        }
+      }
+    }
+  } catch (err) {
+    warn(`direct-route check SKIPPED — ${String(err?.message ?? err).split("\n")[0].slice(0, 160)}`);
+  }
+}
+
 // ── 9. watchdog ─────────────────────────────────────────────────────────────
 console.log("eviction watchdog");
 let watchdogFound = false;

package/scripts/setup.mjs

@@ -41,7 +41,7 @@ try {
   console.error("setup: built dist/ modules are missing — run `npm run build` first (source checkout) or reinstall the plugin.");
   process.exit(1);
 }
-const { buildMainAccount, buildSecondAccount, buildPool, validateSecondConfigDir, planFromExisting, mergeSetupIntoConfig, existingAccountDefaults, looksLikeSecretRef } = core;
+const { buildMainAccount, buildSecondAccount, buildPool, validateSecondConfigDir, planFromExisting, mergeSetupIntoConfig, existingAccountDefaults, looksLikeSecretRef, buildDirectSetting, canReuseCliTokenForDirect } = core;
 
 // Line-queued prompts: interactive AND pipe-safe. With piped stdin, readline
 // emits every buffered line immediately — a plain question() would capture one
@@ -210,6 +210,70 @@ if (accounts.length === 0 && state.accountIds.length === 0) {
   process.exit(0);
 }
 
+// ── direct route (v1.9, optional) ────────────────────────────────────────────
+// The gateway's own anthropic/* models call the Anthropic API directly with an
+// OpenClaw auth profile. Opting accounts in lets the pool steer those turns too
+// (by keeping the auth-profile order in pool-health order). Default NO: an
+// account without `direct` behaves exactly as before.
+let directConfigured = false;
+if (typeof buildDirectSetting === "function" &&
+    (await yes("\nAlso serve anthropic/* models (OpenClaw's direct Anthropic route) from these accounts?", false))) {
+  const byId = new Map(accounts.map((a) => [a.id, a]));
+  const existingAccounts = existing?.plugins?.entries?.["multi-clawd"]?.config?.accounts ?? [];
+  for (const id of [...new Set([...accounts.map((a) => a.id), ...state.accountIds])]) {
+    const current = { ...(existingAccounts.find((a) => a?.id === id) ?? {}), ...(byId.get(id) ?? {}) };
+    if (current.direct !== undefined) {
+      console.log(`  ${id}: already has a direct-route setting — kept.`);
+      continue;
+    }
+    if (!(await yes(`  Add "${id}" to the direct route?`, true))) continue;
+    let setting;
+    if (canReuseCliTokenForDirect(current) && (await yes(`    reuse ${id}'s existing setup-token for it?`, true))) {
+      setting = buildDirectSetting(current, { kind: "reuse" });
+    } else {
+      const how = current.configDir
+        ? `CLAUDE_CONFIG_DIR=${current.configDir} claude setup-token`
+        : "claude setup-token";
+      console.log(`
+    ${id} needs a setup-token of its own for the direct route — its Claude login
+    is a rotating grant that multi-clawd never copies. In your own terminal, run:
+
+        ${how}
+
+    signed in as ${id}'s account (NOT your other one), and store the printed token:
+      1) in your secret manager (RECOMMENDED — OpenClaw stores only the reference)
+      2) in a token file (chmod 600)
+      3) it is ALREADY stored in OpenClaw as an anthropic profile (give its id)
+      4) skip ${id} for now`);
+      const choice = await ask("    choice (1/2/3/4):", "1");
+      try {
+        if (choice === "1") {
+          const provider = await ask("    gateway secret provider name:", "onepassword");
+          const refId = await ask("    secret reference (e.g. op://Vault/Item/field):");
+          if (refId) setting = buildDirectSetting(current, { kind: "ref", ref: { source: "exec", provider, id: refId } });
+        } else if (choice === "2") {
+          setting = buildDirectSetting(current, { kind: "file", path: await ask("    token file path:", `~/.${id}-direct-token`) });
+        } else if (choice === "3") {
+          const profileId = await ask("    existing profile id (see `openclaw models auth list --provider anthropic`):");
+          if (profileId.startsWith("anthropic:")) setting = { profileId };
+          else console.log("    ✗ profile ids for this route start with anthropic: — skipped");
+        }
+      } catch (err) {
+        console.log(`    ✗ ${err.message} — skipped`);
+      }
+    }
+    if (!setting) {
+      console.log(`    ${id}: not added.`);
+      continue;
+    }
+    const planned = byId.get(id);
+    if (planned) planned.direct = setting;
+    else accounts.push({ id, direct: setting });
+    directConfigured = true;
+    console.log(`    ✅ ${id} will serve anthropic/* as profile ${setting.profileId ?? `anthropic:${id}`}`);
+  }
+}
+
 // ── pool ─────────────────────────────────────────────────────────────────────
 const poolMemberIds = [...new Set([...accounts.map((a) => a.id), ...state.accountIds])];
 let pool;
@@ -400,6 +464,15 @@ if (DRY_RUN || !wroteConfig) {
 }
 
 // ── next steps ───────────────────────────────────────────────────────────────
+if (directConfigured) {
+  console.log(`
+Direct route: store the profiles in OpenClaw and set the order now with
+
+  multi-clawd direct sync
+
+(refs are stored as SecretRefs — the token is never copied; the gateway then
+keeps the anthropic order in pool-health order on its own).`);
+}
 console.log(`
 Done. Finish with: