tokenmaxxing 1.18.0 → 1.18.1

package/agent-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "tokenmaxxing",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Pool Claude Code and Codex logins, switch on pace pressure, and expose safe ops tools to agent clients.",
   "author": {
     "name": "anaclumos",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "description": "Automatic Claude Code account switching: pool multiple accounts and hot-swap when quota fills, resuming your session on the fresh account.",
   "type": "module",
   "license": "MIT",

package/src/cli/switch.ts

@@ -2,7 +2,7 @@ import { withLock } from "../lib/lock.ts";
 import { paths } from "../lib/paths.ts";
 import { loadAccounts, loadConfig, loadUsage } from "../lib/state.ts";
 import { readOAuthAccount } from "../lib/claudejson.ts";
-import { performSwap } from "../lib/swap.ts";
+import { isSkippableSwapError, performSwap } from "../lib/swap.ts";
 import { currentWins, effectiveBars, pickBest, pickEarliestReset, weeklyExpiry, type PickCtx } from "../lib/picker.ts";
 import { InvalidGrantError } from "../lib/oauth.ts";
 import { gatedFamilies } from "../lib/usage.ts";
@@ -66,14 +66,16 @@ export async function cmdSwitch(selector?: string, json = false): Promise<number
       currentAccountUuid: null,
       switchFamilies,
     });
+    const rejected = new Set<string>();
     while (true) {
       const cur = loadAccounts();
       const everyone = everyoneIn(cur.accounts);
+      const pool = cur.accounts.filter((a) => !rejected.has(a.accountUuid));
       const active =
         (claimed != null ? cur.accounts.find((a) => a.accountUuid === claimed) : null) ??
         cur.accounts.find((a) => a.accountUuid === cur.activeAccountUuid) ??
         null;
-      if (active != null && currentWins(active, cur.accounts, everyone)) {
+      if (active != null && currentWins(active, pool, everyone)) {
         if (drifted) return swapTo(active, "drift-reconciled");
         const expiry = weeklyExpiry(active, now);
         const why = Number.isFinite(expiry) ? ` (weekly ${fmtReset(expiry, now)})` : "";
@@ -85,60 +87,83 @@ export async function cmdSwitch(selector?: string, json = false): Promise<number
         });
         return 0;
       }
-      const best = pickBest(cur.accounts, { ...everyone, currentAccountUuid: active?.accountUuid ?? null });
+      const best = pickBest(pool, { ...everyone, currentAccountUuid: active?.accountUuid ?? null });
       if (!best) break;
       try {
         await performSwap(best);
       } catch (e) {
+        rejected.add(best.accountUuid);
         if (e instanceof InvalidGrantError) {
           deadGrants.push(best.label);
           if (!json) console.error(c.red(deadGrantMessage(best)));
           continue;
         }
+        if (isSkippableSwapError(e)) {
+          if (!json) console.error(c.yellow(`${best.label}: ${e instanceof Error ? e.message : String(e)} - skipped for this run`));
+          continue;
+        }
         throw e;
       }
       emit(`${c.green("↻")} switched to ${c.bold(best.label)}`, { switched: true, account: best.label, reason: "best" });
       return 0;
     }
 
-    const fresh = loadAccounts();
-    const earliest = pickEarliestReset(fresh.accounts, everyoneIn(fresh.accounts));
-    const reauth = fresh.accounts.filter((a) => a.needsReauth).map((a) => a.label);
-    if (!earliest) {
-      if (reauth.length > 0) {
-        return fail(`no switchable account - reauth needed (run \`tokenmaxxing auth --all\`): ${reauth.join(", ")}`, {
-          paint: c.yellow,
-          extra: { reauthNeeded: reauth },
+    while (true) {
+      const fresh = loadAccounts();
+      const pool = fresh.accounts.filter((a) => !rejected.has(a.accountUuid));
+      const earliest = pickEarliestReset(pool, everyoneIn(fresh.accounts));
+      const reauth = fresh.accounts.filter((a) => a.needsReauth).map((a) => a.label);
+      if (!earliest) {
+        if (reauth.length > 0) {
+          return fail(`no switchable account - reauth needed (run \`tokenmaxxing auth --all\`): ${reauth.join(", ")}`, {
+            paint: c.yellow,
+            extra: { reauthNeeded: reauth },
+          });
+        }
+        const freshActive = fresh.accounts.find((a) => a.accountUuid === fresh.activeAccountUuid) ?? null;
+        if (drifted && freshActive) return swapTo(freshActive, "drift-reconciled");
+        emit(c.yellow("all accounts at their limit with unknown reset times (unparsed reset clocks? see tokenmaxxing.log) - staying put"), {
+          switched: false,
+          account: freshActive?.label ?? null,
+          reason: "unknown-resets",
+        });
+        return 0;
+      }
+      const reauthNote = reauth.length ? ` - re-auth needed: ${reauth.join(", ")}` : "";
+      const availableAt = earliest.availableAt > now ? earliest.availableAt : null;
+      if (earliest.account.accountUuid === fresh.activeAccountUuid && !drifted) {
+        const msg = availableAt == null
+          ? `staying on ${c.bold(earliest.account.label)} - no usable switch target${reauthNote}`
+          : `all accounts at limit - staying on ${c.bold(earliest.account.label)} (${fmtReset(availableAt, now)})${reauthNote}`;
+        emit(c.yellow(msg), {
+          switched: false,
+          account: earliest.account.label,
+          reason: availableAt == null ? "no-target" : "all-at-limit",
+          availableAt,
+          reauthNeeded: reauth,
         });
+        return 0;
+      }
+      try {
+        await performSwap(earliest.account);
+      } catch (e) {
+        rejected.add(earliest.account.accountUuid);
+        if (e instanceof InvalidGrantError) {
+          deadGrants.push(earliest.account.label);
+          if (!json) console.error(c.red(deadGrantMessage(earliest.account)));
+          continue;
+        }
+        if (isSkippableSwapError(e)) {
+          if (!json) console.error(c.yellow(`${earliest.account.label}: ${e instanceof Error ? e.message : String(e)} - skipped for this run`));
+          continue;
+        }
+        throw e;
+      }
+      emit(`${c.green("↻")} switched to ${c.bold(earliest.account.label)}`, { switched: true, account: earliest.account.label, reason: "earliest-reset", availableAt, reauthNeeded: reauth });
+      if (availableAt != null && !json) {
+        console.log(c.yellow(`all accounts at limit - ${c.bold(earliest.account.label)} recovers soonest (${fmtReset(availableAt, now)})${reauthNote}`));
       }
-      const freshActive = fresh.accounts.find((a) => a.accountUuid === fresh.activeAccountUuid) ?? null;
-      if (drifted && freshActive) return swapTo(freshActive, "drift-reconciled");
-      emit(c.yellow("all accounts at their limit with unknown reset times (unparsed reset clocks? see tokenmaxxing.log) - staying put"), {
-        switched: false,
-        account: freshActive?.label ?? null,
-        reason: "unknown-resets",
-      });
-      return 0;
-    }
-    const reauthNote = reauth.length ? ` - re-auth needed: ${reauth.join(", ")}` : "";
-    const availableAt = earliest.availableAt > now ? earliest.availableAt : null;
-    if (earliest.account.accountUuid === fresh.activeAccountUuid && !drifted) {
-      const msg = availableAt == null
-        ? `staying on ${c.bold(earliest.account.label)} - no usable switch target${reauthNote}`
-        : `all accounts at limit - staying on ${c.bold(earliest.account.label)} (${fmtReset(availableAt, now)})${reauthNote}`;
-      emit(c.yellow(msg), {
-        switched: false,
-        account: earliest.account.label,
-        reason: availableAt == null ? "no-target" : "all-at-limit",
-        availableAt,
-        reauthNeeded: reauth,
-      });
       return 0;
     }
-    const code = await swapTo(earliest.account, "earliest-reset", { availableAt, reauthNeeded: reauth });
-    if (code === 0 && availableAt != null && !json) {
-      console.log(c.yellow(`all accounts at limit - ${c.bold(earliest.account.label)} recovers soonest (${fmtReset(availableAt, now)})${reauthNote}`));
-    }
-    return code;
   });
 }

package/src/lib/decide.ts

@@ -209,7 +209,7 @@ export async function evaluateAndMaybeSwap(now = Date.now(), anticipatory = fals
         const cur = loadAccounts();
         const active = seatOf(cur);
         const pool = usable(cur.accounts);
-        const ctxAll = { now, thresholds: barsOf(pool), currentAccountUuid: null, switchFamilies, holdMargin };
+        const ctxAll = { now, thresholds: barsOf(cur.accounts), currentAccountUuid: null, switchFamilies, holdMargin };
         if (currentWins(active, pool, ctxAll)) {
           return { swapped: false, account: null, reason: "current-best" };
         }
@@ -231,7 +231,7 @@ export async function evaluateAndMaybeSwap(now = Date.now(), anticipatory = fals
       const cur = loadAccounts();
       const seat = seatOf(cur);
       const pool = usable(cur.accounts);
-      const thresholds = barsOf(pool);
+      const thresholds = barsOf(cur.accounts);
       if (!enforced2 && seat && !seat.needsReauth && !isExhausted(seat, { now, thresholds, currentAccountUuid: null, switchFamilies })) return greedy(0);
       const best = pickBest(pool, { now, thresholds, currentAccountUuid: seat?.accountUuid ?? null, switchFamilies });
       if (!best) break;

package/src/lib/oauth.ts

@@ -29,11 +29,19 @@ export class RefreshRejectedError extends Error {
   }
 }
 
+export class IdentityUnavailableError extends Error {
+  constructor(public readonly status: number | null, public readonly detail: string) {
+    super(status == null ? `profile endpoint unreachable: ${detail}` : `identity check failed (HTTP ${status}): ${detail}`);
+    this.name = "IdentityUnavailableError";
+  }
+}
+
 export function isDeadCredential(creds: OAuthCreds): boolean {
   return creds.refreshToken === "" || creds.accessToken === "";
 }
 
 export async function refreshCredential(creds: OAuthCreds, now = Date.now()): Promise<OAuthCreds> {
+  if (isDeadCredential(creds)) throw new InvalidGrantError("credential was cleared after a failed refresh");
   const scope = (creds.scopes?.length ? creds.scopes : DEFAULT_SCOPES).join(" ");
   const body = {
     grant_type: "refresh_token",
@@ -93,14 +101,19 @@ export async function fetchTokenIdentity(accessToken: string): Promise<TokenIden
       headers: { Authorization: `Bearer ${accessToken}`, "Content-Type": "application/json" },
     });
   } catch (e) {
-    throw new Error(`profile endpoint unreachable: ${e instanceof Error ? e.message : String(e)}`);
+    throw new IdentityUnavailableError(null, e instanceof Error ? e.message : String(e));
   }
-  const text = await res.text();
-  if (!res.ok) throw new Error(`identity check failed (HTTP ${res.status}): ${safeErrorDetail({ text })}`);
+  let text: string;
+  try {
+    text = await res.text();
+  } catch (e) {
+    throw new IdentityUnavailableError(res.status, `profile response body unreadable: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  if (!res.ok) throw new IdentityUnavailableError(res.status, safeErrorDetail({ text }));
   const parsed = ProfileResponseSchema.safeParse((() => {
     try { return JSON.parse(text); } catch { return null; }
   })());
-  if (!parsed.success) throw new Error(`profile endpoint returned an unrecognized body (${text.length} bytes, withheld)`);
+  if (!parsed.success) throw new IdentityUnavailableError(res.status, `profile endpoint returned an unrecognized body (${text.length} bytes, withheld)`);
   return TokenIdentitySchema.parse({
     accountUuid: parsed.data.account.uuid,
     email: parsed.data.account.email ?? null,

package/src/lib/sample.ts

@@ -4,9 +4,12 @@ import { z } from "zod";
 import { readItem, writeItem, deleteItem, liveTarget, parkedTarget, isolatedTarget, claudeAiOauthOnly, mergeIntoLive } from "./credstore.ts";
 import { credItemFor, paths } from "./paths.ts";
 import { withClaudeRefreshLock } from "./claudelock.ts";
-import { refreshCredential, isAccessTokenExpiring, isDeadCredential, fetchTokenIdentity, describeIdentity, InvalidGrantError } from "./oauth.ts";
+import { refreshCredential, isAccessTokenExpiring, isDeadCredential, fetchTokenIdentity, describeIdentity, IdentityUnavailableError, InvalidGrantError } from "./oauth.ts";
 import { FullUsageSchema, pingSession, probeUsage } from "./usage.ts";
-import { CredentialBlobSchema, type Account, type OAuthCreds, type TokenIdentity } from "./types.ts";
+import { loadAccounts } from "./state.ts";
+import { keepRotatedPair } from "./swap.ts";
+import { log } from "./log.ts";
+import { CredentialBlobSchema, TokenIdentitySchema, type Account, type OAuthCreds, type TokenIdentity } from "./types.ts";
 
 const SampleOutcomeSchema = z.discriminatedUnion("ok", [
   z.object({ ok: z.literal(true), usage: FullUsageSchema, pingError: z.string().optional(), pingRejected: z.boolean().optional() }),
@@ -16,8 +19,8 @@ export type SampleOutcome = z.infer<typeof SampleOutcomeSchema>;
 
 const IdentityCheckSchema = z.discriminatedUnion("status", [
   z.object({ status: z.literal("match") }),
-  z.object({ status: z.literal("mismatch"), reason: z.string() }),
-  z.object({ status: z.literal("unavailable"), reason: z.string() }),
+  z.object({ status: z.literal("mismatch"), reason: z.string(), owner: TokenIdentitySchema }),
+  z.object({ status: z.literal("unavailable"), reason: z.string(), stale: z.boolean() }),
 ]);
 type IdentityCheck = z.infer<typeof IdentityCheckSchema>;
 
@@ -26,10 +29,14 @@ async function checkIdentity(creds: OAuthCreds, account: Account): Promise<Ident
   try {
     identity = await fetchTokenIdentity(creds.accessToken);
   } catch (e) {
-    return { status: "unavailable", reason: `credential identity check failed: ${e instanceof Error ? e.message : String(e)}` };
+    return {
+      status: "unavailable",
+      reason: `credential identity check failed: ${e instanceof Error ? e.message : String(e)}`,
+      stale: e instanceof IdentityUnavailableError && e.status === 401,
+    };
   }
   if (identity.accountUuid === account.accountUuid) return { status: "match" };
-  return { status: "mismatch", reason: `credential actually belongs to ${describeIdentity(identity)}` };
+  return { status: "mismatch", reason: `credential actually belongs to ${describeIdentity(identity)}`, owner: identity };
 }
 
 function refreshPlanFields(account: Account, creds: OAuthCreds): void {
@@ -54,6 +61,8 @@ export async function probeParkedUsage(account: Account, opts: { ping?: boolean
   }
 
   const liveRaw = await readItem(liveTarget());
+  let liveAccount: string | null = null;
+  let liveToken: string | null = null;
   if (liveRaw != null) {
     let liveCreds: OAuthCreds;
     try {
@@ -62,7 +71,7 @@ export async function probeParkedUsage(account: Account, opts: { ping?: boolean
       return { ok: false, reason: `cannot read the live credential (${(e instanceof Error ? e.message : String(e)).slice(0, 80)}) - refusing to sample a possibly-live account` };
     }
     if (!isDeadCredential(liveCreds)) {
-      let liveAccount: string;
+      liveToken = liveCreds.accessToken;
       try {
         liveAccount = (await fetchTokenIdentity(liveCreds.accessToken)).accountUuid;
       } catch (e) {
@@ -74,28 +83,64 @@ export async function probeParkedUsage(account: Account, opts: { ping?: boolean
     }
   }
 
+  const relocate = async (owner: TokenIdentity): Promise<string> => {
+    const pooled = loadAccounts().accounts.find((a) => a.accountUuid === owner.accountUuid) ?? null;
+    if (pooled == null || pooled.accountUuid === liveAccount) return "was left in place";
+    await writeItem(parkedTarget(pooled.keychainItem), JSON.stringify({ claudeAiOauth: creds }));
+    log("swap.parked_relocated", { account: pooled.accountUuid.slice(0, 8) });
+    return "was copied to that account's slot";
+  };
+
   if (isAccessTokenExpiring(creds, 300_000)) {
     const owner = await checkIdentity(creds, account);
     if (owner.status === "mismatch") {
+      const kept = await relocate(owner.owner);
       account.needsReauth = true;
-      return { ok: false, reason: `${owner.reason} - refusing to spend another account's grant; re-auth with \`tokenmaxxing auth\`` };
+      return { ok: false, reason: `${owner.reason} - refusing to spend another account's grant; the pair ${kept}; re-auth with \`tokenmaxxing auth\`` };
     }
-    try {
-      creds = await refreshCredential(creds);
-      await writeItem(backup, JSON.stringify({ claudeAiOauth: creds }));
-    } catch (e) {
-      if (e instanceof InvalidGrantError) {
-        account.needsReauth = true;
-        return { ok: false, reason: "refresh token dead - re-auth with `tokenmaxxing auth`" };
+    if (owner.status === "unavailable" && !owner.stale) {
+      return { ok: false, reason: `${owner.reason} - refusing to refresh a parked credential whose owner cannot be verified` };
+    }
+    const rotate = async (): Promise<{ fresh: OAuthCreds } | { failed: SampleOutcome }> => {
+      try {
+        return { fresh: await refreshCredential(creds) };
+      } catch (e) {
+        if (e instanceof InvalidGrantError) {
+          account.needsReauth = true;
+          return { failed: { ok: false, reason: "refresh token dead - re-auth with `tokenmaxxing auth`" } };
+        }
+        return { failed: { ok: false, reason: `token refresh failed: ${e instanceof Error ? e.message : String(e)}` } };
+      }
+    };
+    let result: { fresh: OAuthCreds } | { failed: SampleOutcome };
+    if (owner.status === "match") {
+      result = await rotate();
+    } else {
+      try {
+        result = await withClaudeRefreshLock(async (lock) => {
+          const rotated = await rotate();
+          if ("failed" in rotated) return rotated;
+          const verified = await checkIdentity(rotated.fresh, account);
+          if (verified.status !== "mismatch") return rotated;
+          const trueOwner = loadAccounts().accounts.find((a) => a.accountUuid === verified.owner.accountUuid) ?? null;
+          const kept = await keepRotatedPair({ fresh: rotated.fresh, owner: trueOwner, fallback: account, liveOwnerUuid: liveAccount, expectedLiveToken: liveToken, lock });
+          account.needsReauth = true;
+          return { failed: { ok: false, reason: `${verified.reason}, whose grant this refresh rotated - the rotated token ${kept}; re-auth with \`tokenmaxxing auth\`` } };
+        });
+      } catch (e) {
+        return { ok: false, reason: `cannot arbitrate a stale parked credential: ${e instanceof Error ? e.message : String(e)}` };
       }
-      return { ok: false, reason: `token refresh failed: ${e instanceof Error ? e.message : String(e)}` };
     }
+    if ("failed" in result) return result.failed;
+    creds = result.fresh;
+    await writeItem(backup, JSON.stringify({ claudeAiOauth: creds }));
   }
 
   const identity = await checkIdentity(creds, account);
   if (identity.status === "mismatch") {
+    const kept = await relocate(identity.owner);
     account.needsReauth = true;
-    return { ok: false, reason: `${identity.reason} - this account's own credential is gone; re-auth with \`tokenmaxxing auth\`` };
+    return { ok: false, reason: `${identity.reason} - this account's own credential is gone; the pair ${kept}; re-auth with \`tokenmaxxing auth\`` };
   }
   if (identity.status === "unavailable") {
     return { ok: false, reason: identity.reason };

package/src/lib/swap.ts

@@ -1,11 +1,11 @@
 import { clearDepletedWait, clearNextCheck, clearUsageSnapshots, loadAccounts, saveAccounts, saveLastSwapAt } from "./state.ts";
 import { readItem, writeItem, liveTarget, parkedTarget, claudeAiOauthOnly, mergeIntoLive } from "./credstore.ts";
-import { refreshCredential, isAccessTokenExpiring, isDeadCredential, fetchTokenIdentity, describeIdentity, InvalidGrantError, RefreshRejectedError } from "./oauth.ts";
+import { refreshCredential, isAccessTokenExpiring, isDeadCredential, fetchTokenIdentity, describeIdentity, IdentityUnavailableError, InvalidGrantError, RefreshRejectedError } from "./oauth.ts";
 import { swapOAuthAccount } from "./claudejson.ts";
 import { withClaudeRefreshLock } from "./claudelock.ts";
 import { log } from "./log.ts";
 import { pickBest, type PickCtx } from "./picker.ts";
-import { CredentialBlobSchema, type Account, type OAuthCreds } from "./types.ts";
+import { CredentialBlobSchema, type Account, type OAuthCreds, type TokenIdentity } from "./types.ts";
 
 function parseBlob(raw: string) {
   return CredentialBlobSchema.parse(JSON.parse(raw));
@@ -44,7 +44,12 @@ export async function performSwap(target: Account): Promise<void> {
       }
     }
     if (liveCreds != null) {
-      const identity = await fetchTokenIdentity(liveCreds.accessToken);
+      let identity: TokenIdentity;
+      try {
+        identity = await fetchTokenIdentity(liveCreds.accessToken);
+      } catch (e) {
+        throw new Error(`cannot resolve the live credential's owner (${e instanceof Error ? e.message : String(e)}) - refusing to swap over it; the next check retries`);
+      }
       liveOwner = idx.accounts.find((a) => a.accountUuid === identity.accountUuid) ?? null;
       if (!liveOwner) {
         throw new Error(
@@ -73,16 +78,51 @@ export async function performSwap(target: Account): Promise<void> {
       return new InvalidGrantError(detail);
     };
     if (isDeadCredential(parked)) throw markDead("parked credential was cleared after a failed refresh - re-auth with `tokenmaxxing auth`");
-    const parkedOwner = await fetchTokenIdentity(parked.accessToken).catch(() => null);
-    if (parkedOwner != null && parkedOwner.accountUuid !== target.accountUuid) {
-      throw markDead(`parked credential belongs to ${describeIdentity(parkedOwner)} - refusing to spend another account's grant; re-auth with \`tokenmaxxing auth ${target.label}\``);
-    }
+    let parkedOwner: TokenIdentity | null = null;
     try {
-      fresh = await refreshCredential(parked);
+      parkedOwner = await fetchTokenIdentity(parked.accessToken);
     } catch (e) {
-      if (e instanceof InvalidGrantError) throw markDead(e.detail);
-      if (e instanceof RefreshRejectedError) log("swap.refresh_rejected", { account: target.accountUuid.slice(0, 8), status: e.status, detail: e.detail });
-      throw e;
+      if (!(e instanceof IdentityUnavailableError && e.status === 401)) throw e;
+      log("swap.parked_token_stale", { account: target.accountUuid.slice(0, 8) });
+    }
+    if (parkedOwner != null && parkedOwner.accountUuid !== target.accountUuid) {
+      const owner = idx.accounts.find((a) => a.accountUuid === parkedOwner.accountUuid) ?? null;
+      let kept = "was left in place";
+      if (owner != null && owner.accountUuid !== liveOwner?.accountUuid) {
+        await writeItem(parkedTarget(owner.keychainItem), JSON.stringify({ claudeAiOauth: parked }));
+        log("swap.parked_relocated", { account: owner.accountUuid.slice(0, 8) });
+        kept = "was copied to that account's slot";
+      }
+      throw markDead(`parked credential belongs to ${describeIdentity(parkedOwner)} - refusing to spend another account's grant; the pair ${kept}; re-auth with \`tokenmaxxing auth ${target.label}\``);
+    }
+    const refreshParked = async (): Promise<OAuthCreds> => {
+      try {
+        return await refreshCredential(parked);
+      } catch (e) {
+        if (e instanceof InvalidGrantError) throw markDead(e.detail);
+        if (e instanceof RefreshRejectedError) log("swap.refresh_rejected", { account: target.accountUuid.slice(0, 8), status: e.status, detail: e.detail });
+        throw e;
+      }
+    };
+    if (parkedOwner != null) {
+      fresh = await refreshParked();
+    } else {
+      fresh = await withClaudeRefreshLock(async (lock) => {
+        const rotated = await refreshParked();
+        let freshOwner: TokenIdentity;
+        try {
+          freshOwner = await fetchTokenIdentity(rotated.accessToken);
+        } catch (e) {
+          await writeItem(parkedTarget(target.keychainItem), JSON.stringify({ claudeAiOauth: rotated }));
+          throw new Error(`refreshed the parked credential but cannot verify its owner (${e instanceof Error ? e.message : String(e)}) - kept the rotated token parked; the next check retries`);
+        }
+        if (freshOwner.accountUuid !== target.accountUuid) {
+          const owner = idx.accounts.find((a) => a.accountUuid === freshOwner.accountUuid) ?? null;
+          const kept = await keepRotatedPair({ fresh: rotated, owner, fallback: target, liveOwnerUuid: liveOwner?.accountUuid ?? null, expectedLiveToken, lock });
+          throw markDead(`parked credential belongs to ${describeIdentity(freshOwner)}, whose grant this refresh rotated - the rotated token ${kept}; re-auth with \`tokenmaxxing auth ${target.label}\``);
+        }
+        return rotated;
+      });
     }
     await writeItem(parkedTarget(target.keychainItem), JSON.stringify({ claudeAiOauth: fresh }));
   }
@@ -117,8 +157,43 @@ export async function performSwap(target: Account): Promise<void> {
   log("swap.done", { account: target.accountUuid.slice(0, 8), email: target.email });
 }
 
+export async function keepRotatedPair(input: {
+  fresh: OAuthCreds;
+  owner: Account | null;
+  fallback: Account;
+  liveOwnerUuid: string | null;
+  expectedLiveToken: string | null;
+  lock: { compromised: () => boolean };
+}): Promise<string> {
+  const { fresh, owner } = input;
+  if (owner == null) {
+    await writeItem(parkedTarget(input.fallback.keychainItem), JSON.stringify({ claudeAiOauth: fresh }));
+    log("swap.rotated_kept_in_stamped_slot", { account: input.fallback.accountUuid.slice(0, 8) });
+    return "was kept in this account's stamped slot because its owner is not in the pool";
+  }
+  const park = async (): Promise<void> => {
+    await writeItem(parkedTarget(owner.keychainItem), JSON.stringify({ claudeAiOauth: fresh }));
+    log("swap.rotated_parked_rescued", { account: owner.accountUuid.slice(0, 8) });
+  };
+  if (input.liveOwnerUuid !== owner.accountUuid) {
+    await park();
+    return "was parked under that account";
+  }
+  try {
+    const currentLive = await readItem(liveTarget());
+    if (input.lock.compromised()) throw new Error("refresh lock compromised");
+    if (currentLive == null || parseBlob(currentLive).claudeAiOauth.accessToken !== input.expectedLiveToken) throw new Error("live credential changed while unlocked");
+    await writeItem(liveTarget(), mergeIntoLive(currentLive, fresh));
+    log("swap.rotated_live_rescued", { account: owner.accountUuid.slice(0, 8) });
+    return "was installed into the live store so that account's sessions continue";
+  } catch (e) {
+    await park();
+    return `was parked under that account (${e instanceof Error ? e.message : String(e)})`;
+  }
+}
+
 export function isSkippableSwapError(e: unknown): boolean {
-  return e instanceof InvalidGrantError || e instanceof RefreshRejectedError;
+  return e instanceof InvalidGrantError || e instanceof RefreshRejectedError || e instanceof IdentityUnavailableError;
 }
 
 export async function chooseAndSwap(ctx: PickCtx, exclude: ReadonlySet<string> = new Set()): Promise<Account | null> {