@drakon-systems/multi-clawd 1.9.3 → 1.9.4

package/README.md

@@ -375,7 +375,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.9.3/SETUP-AGENT.md
+> Read https://raw.githubusercontent.com/Drakon-Systems-Ltd/multi-clawd/v1.9.4/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.
 

package/dist/account-identity.js

@@ -1,10 +1,11 @@
-export function identityFilePath(account, io) {
-    const dir = !account.native && account.configDir ? io.expandHome(account.configDir) : io.defaultConfigDir;
-    if (!dir)
-        return undefined;
+export function identityFilePaths(account, io) {
     if (account.oauthTokenFile || account.oauthTokenRef)
-        return undefined;
-    return `${dir.replace(/\/+$/, "")}/.claude.json`;
+        return [];
+    const file = (dir) => `${dir.replace(/\/+$/, "")}/.claude.json`;
+    if (!account.native && account.configDir)
+        return [file(io.expandHome(account.configDir))];
+    const candidates = [io.homeDir ? file(io.homeDir) : undefined, io.defaultConfigDir ? file(io.defaultConfigDir) : undefined];
+    return [...new Set(candidates.filter((c) => Boolean(c)))];
 }
 export function formatPlan(oauthAccount) {
     const tier = typeof oauthAccount.organizationRateLimitTier === "string"
@@ -47,14 +48,15 @@ export function parseIdentityFile(text) {
         email: str("emailAddress"),
         organizationName: str("organizationName"),
         plan: formatPlan(account),
+        profileFetchedAt: typeof account.profileFetchedAt === "number" ? account.profileFetchedAt : undefined,
     };
     if (!identity.accountUuid && !identity.email)
         return undefined;
     return identity;
 }
 export function resolveAccountIdentity(account, io) {
-    const path = identityFilePath(account, io);
-    if (!path) {
+    const paths = identityFilePaths(account, io);
+    if (paths.length === 0) {
         return {
             accountId: account.id,
             status: "unknown",
@@ -63,28 +65,41 @@ export function resolveAccountIdentity(account, io) {
                 : "no config dir to read",
         };
     }
-    let text;
-    try {
-        text = io.readFile(path);
-    }
-    catch {
-        return {
-            accountId: account.id,
-            status: "unknown",
-            reason: `no readable ${path} — this account has never completed a login here`,
-            source: path,
-        };
-    }
-    const identity = parseIdentityFile(text);
-    if (!identity) {
-        return {
+    let best;
+    const problems = [];
+    for (const path of paths) {
+        let text;
+        try {
+            text = io.readFile(path);
+        }
+        catch {
+            problems.push(`no readable ${path}`);
+            continue;
+        }
+        const identity = parseIdentityFile(text);
+        if (!identity) {
+            problems.push(`${path} carries no oauthAccount record`);
+            continue;
+        }
+        const candidate = {
             accountId: account.id,
-            status: "unknown",
-            reason: `${path} carries no oauthAccount record`,
+            status: "resolved",
             source: path,
+            ...identity,
         };
+        if (!best || (candidate.profileFetchedAt ?? 0) > (best.profileFetchedAt ?? 0))
+            best = candidate;
     }
-    return { accountId: account.id, status: "resolved", source: path, ...identity };
+    if (best)
+        return best;
+    return {
+        accountId: account.id,
+        status: "unknown",
+        reason: problems.length === 1
+            ? `${problems[0]} — this account has never completed a login here`
+            : `${problems.join("; ")} — this account has never completed a login here`,
+        source: paths[0],
+    };
 }
 export function maskEmail(email) {
     const at = email.lastIndexOf("@");

package/dist/chain-audit.js

@@ -271,6 +271,8 @@ export function auditSessionOverrides(sessions, poolConfigured, opts = {}) {
         const source = entry.modelOverrideSource;
         if (typeof source !== "string" || source === "auto")
             continue;
+        if (source === "default" && !entry.modelOverride)
+            continue;
         const provider = entry.providerOverride ?? entry.modelProvider;
         const model = entry.modelOverride;
         if (!provider || !model) {

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "multi-clawd",
   "name": "multi-clawd",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "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.9.3",
+  "version": "1.9.4",
   "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",

package/scripts/doctor.mjs

@@ -288,13 +288,17 @@ const { summarizeWindowUsage, classifyAccountHealth } = await importDist("health
   "summarizeWindowUsage",
   "classifyAccountHealth",
 ]);
+// "cli", like the chain audits: resolving WHICH login backs an account is
+// doctor's own diagnostic, not a description of the running plugin's
+// behaviour. Asking the installed copy meant a fix to the resolver could not
+// take effect until the plugin itself was reinstalled — so the CLI reported a
+// bug it had already been taught not to make.
 const { resolveAccountIdentity, describeIdentity, findDuplicateLogins, maskEmail } =
-  await importDist("account-identity.js", [
-    "resolveAccountIdentity",
-    "describeIdentity",
-    "findDuplicateLogins",
-    "maskEmail",
-  ]);
+  await importDist(
+    "account-identity.js",
+    ["resolveAccountIdentity", "describeIdentity", "findDuplicateLogins", "maskEmail"],
+    "cli",
+  );
 const { decideStickySelection } = await importDist("sticky.js", ["decideStickySelection"]);
 const io = {
   readFile: (p) => readFileSync(expandHome(p), "utf8"),
@@ -322,6 +326,7 @@ const identityIo = {
   defaultConfigDir: process.env.CLAUDE_CONFIG_DIR
     ? expandHome(process.env.CLAUDE_CONFIG_DIR)
     : join(HOME, ".claude"),
+  homeDir: HOME,
 };
 const accounts = pluginConfig.accounts ?? [];
 const identities = [];
@@ -334,7 +339,7 @@ for (const account of accounts) {
   const identity = resolveAccountIdentity(account, identityIo);
   identities.push(identity);
   const source = account.native
-    ? `native login, ${identityIo.defaultConfigDir}`
+    ? `native login, ${identity.source ?? identityIo.defaultConfigDir}`
     : account.configDir
       ? `config dir ${account.configDir}`
       : account.oauthTokenFile