tokenmaxxing 1.164.0 → 1.166.0

package/DESIGN.md

@@ -40,7 +40,7 @@ It is a process manager only - spawn with inherited stdio (stdin through a relay
   - `wait-queue.json` - the claims of supervised sessions that are moving or waiting (`{sessionId, accountId, at, waitUntil}`), naming the account each relaunches on: placement counts a claimed session there, and at most eight sessions wait on one account; a session that arrives when every reset within `policy.maxWaitMs` is full waits for the next reset with room up to twice `policy.maxWaitMs` out, joining the least-crowded reset when the horizon is full.
   - `bin/claude` and `bin/codex` - the supervisors, beside the `tokenmaxxing` and `xx` entry points; `bin/pi` after `init --pi`.
   - `pi-stores/claude/<uuid8>/` and `pi-stores/codex/<uuid8>/` - one pi store per pooled account that has a pi login: the account's own pi grant in `auth.json`, everything else symlinked to the shared `~/.pi/agent` ([pi support](docs/content/docs/pi.mdx)).
-  - `sessions/<sid>.json`, `onboard/`, `hub-key`, `update.json`, `spawnrate.json`, `tokenmaxxing.log`, the codex `codex-onboard/`, `codex-respawn/`, and `codex-live/`, and the `grok-*` and `muse-*` state of the status-only grok and Muse Code pools: the full table is in [State directory layout](docs/content/docs/state-directory.mdx).
+  - `sessions/<sid>.json`, `onboard/`, `hub-key`, `update.json`, `spawnrate.json`, `tokenmaxxing.log`, the codex `codex-respawn/` and `codex-live/`, and the `grok-*` and `muse-*` state of the status-only grok and Muse Code pools: the full table is in [State directory layout](docs/content/docs/state-directory.mdx).
 - Per-account **credential stores** follow the platform's Claude Code store: macOS = a login-keychain item keyed by the store path (never plaintext on disk); Linux = a 0600 `.credentials.json` inside the 0700 store directory (the same plaintext model claude itself uses - its Linux build has no keyring path at all, binary-verified 2.1.205). One `credstore` facade dispatches on a `{kind: keychain|file}` target; call sites never branch on platform. tokenmaxxing writes a store once, at onboarding; Claude Code's own refresh is the only writer afterwards.
 
 - A periodic check job (`com.tokenmaxxing.check` launchd agent on macOS, `tokenmaxxing-check.timer` systemd user timer on Linux) running `tokenmaxxing check` once per tick (`policy.checkIntervalMs`, 60s by default): it runs the decision with no seat (nothing moves), folds fresh tees into the index, samples up to three accounts whose last sample attempt is oldest (the direct no-spend usage GET), deletes leftover atomic-write temp files under the state root, and on a Bun global install checks npm for a newer version once a day, so the cached figures every placement reads stay fresh.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.164.0",
+  "version": "1.166.0",
   "description": "Automatic Claude Code account switching: pool multiple accounts, start each session on its own account, and resume a session on a fresher account when quota fills.",
   "type": "module",
   "license": "MIT",

package/src/lib/claude.ts

@@ -1,4 +1,4 @@
-import { mkdirSync, readFileSync, rmSync } from "node:fs";
+import { readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { countBy } from "es-toolkit";
 import { z } from "zod";
@@ -9,6 +9,7 @@ import { activationHint, CHECK_JOB, ensurePathInRc, HUB_JOB, installSupervisor,
 import { withLock } from "./lock.ts";
 import { errorMessage, log } from "./log.ts";
 import { claudeTierLabel, describeIdentity, fetchTokenIdentity, isDeadCredential, InvalidGrantError } from "./oauth.ts";
+import { onboardHome } from "./onboard.ts";
 import { claudePool, env, paths, seatFromEnv, shortId, storeDirFor } from "./paths.ts";
 import { MAX_WAITERS_PER_ACCOUNT, pickBest, pickEarliestReset, pickWaitTarget, thresholdBars, type PickCtx } from "./picker.ts";
 import { deletePiStore } from "./piauth.ts";
@@ -232,11 +233,8 @@ function identityReady(cjPath: string): boolean {
 }
 
 async function login(): Promise<Harvest | null> {
-  const onboardDir = paths.onboardDir;
-  rmSync(onboardDir, { recursive: true, force: true });
-  mkdirSync(onboardDir, { recursive: true });
+  const onboardDir = await onboardHome("claude", (dir) => deleteItem(isolatedTarget(dir)));
   const iso = isolatedTarget(onboardDir);
-  await deleteItem(iso);
   const cjPath = join(onboardDir, ".claude.json");
   const real = resolveRealBin(CLAUDE_BIN);
 

package/src/lib/codex.ts

@@ -6,6 +6,7 @@ import { writeFileAtomic } from "./atomic.ts";
 import { CODEX_BIN, MAX_WRAP_DEPTH, WRAP_DEPTH_ENV, resolveRealBin, verifyRealBin } from "./claudebin.ts";
 import { codexIdentityOf, codexStoreUsable, deleteCodexStoreAuth, ensureCodexStoreHome, isCodexAccessExpiring, readCodexAuthAt, readCodexStoreAuth, writeCodexStoreAuth } from "./codexauth.ts";
 import { CodexInvalidGrantError, CodexRefreshFailedError, refreshCodexAuth } from "./codexoauth.ts";
+import { onboardHome } from "./onboard.ts";
 import { deletePiStore } from "./piauth.ts";
 import { PI_PRESENCE_PREFIX, livingPresences, seatCounts, writePresence } from "./presence.ts";
 import { CodexUsageReadError, codexLimitLabel, consumeCodexReset, fetchCodexUsage } from "./codexusage.ts";
@@ -139,8 +140,7 @@ async function prepareMove(target: Account): Promise<void> {
 
 async function login(): Promise<Harvest | null> {
   const real = resolveRealBin(CODEX_BIN);
-  const onboardDir = codexPaths.onboardDir;
-  rmSync(onboardDir, { recursive: true, force: true });
+  const onboardDir = await onboardHome("codex");
   writeFileAtomic(join(onboardDir, "config.toml"), 'cli_auth_credentials_store = "file"\n');
 
   const savedTermios = saveTermios();

package/src/lib/grok.ts

@@ -124,7 +124,6 @@ export const grok = statusOnlyProvider({
   binKey: "grokBin",
   storeDirFor: grokStoreDirFor,
   authJsonFor: grokAuthJsonFor,
-  onboardDir: grokPaths.onboardDir,
   homeEnv: "GROK_HOME",
   loginArgs: ["login"],
   onboardAuthRel: "auth.json",

package/src/lib/muse.ts

@@ -65,7 +65,6 @@ export const muse = statusOnlyProvider({
   binKey: "museBin",
   storeDirFor: museStoreDirFor,
   authJsonFor: museAuthJsonFor,
-  onboardDir: musePaths.onboardDir,
   homeEnv: "XDG_CONFIG_HOME",
   loginArgs: ["login"],
   onboardAuthRel: "muse/auth.json",

package/src/lib/onboard.ts

@@ -0,0 +1,22 @@
+import { mkdirSync, mkdtempSync, readdirSync, rmSync } from "node:fs";
+import { join } from "node:path";
+import { paths } from "./paths.ts";
+import { pidExists } from "./proc.ts";
+
+const POOLS = ["claude", "codex", "pi", "grok", "muse"] as const;
+
+export type OnboardPool = (typeof POOLS)[number];
+
+const HOME_NAME = new RegExp(`^(${POOLS.join("|")})-([1-9]\\d*)-`);
+
+export async function onboardHome(pool: OnboardPool, onStale?: (dir: string) => Promise<unknown>): Promise<string> {
+  mkdirSync(paths.onboardDir, { recursive: true, mode: 0o700 });
+  for (const name of readdirSync(paths.onboardDir)) {
+    const match = HOME_NAME.exec(name);
+    if (match && (match[1] !== pool || pidExists(Number(match[2])))) continue;
+    const dir = join(paths.onboardDir, name);
+    if (match) await onStale?.(dir);
+    rmSync(dir, { recursive: true, force: true });
+  }
+  return mkdtempSync(join(paths.onboardDir, `${pool}-${process.pid}-`));
+}

package/src/lib/paths.ts

@@ -72,7 +72,6 @@ export const codexPaths = {
   authJson: join(CODEX_HOME, "auth.json"),
   hooksJson: join(CODEX_HOME, "hooks.json"),
   storesDir: join(TM_HOME, "codex-stores"),
-  onboardDir: join(TM_HOME, "codex-onboard"),
   respawnDir: join(TM_HOME, "codex-respawn"),
   presenceDir: join(TM_HOME, "codex-live"),
 } as const;
@@ -100,7 +99,6 @@ export function expandTilde(p: string): string {
 export const piPaths = {
   home: resolve(expandTilde(env("PI_CODING_AGENT_DIR", join(HOME, ".pi", "agent")))),
   storesDir: join(TM_HOME, "pi-stores"),
-  onboardDir: join(TM_HOME, "pi-onboard"),
 } as const;
 
 export function piStoreDirFor(pool: PiPool, accountId: string): string {
@@ -116,7 +114,6 @@ const GROK_HOME_DEFAULT = join(HOME, ".grok");
 export const grokPaths = {
   home: env("GROK_HOME", GROK_HOME_DEFAULT),
   storesDir: join(TM_HOME, "grok-stores"),
-  onboardDir: join(TM_HOME, "grok-onboard"),
 } as const;
 
 export function grokStoreDirFor(accountId: string): string {
@@ -130,7 +127,6 @@ export function grokAuthJsonFor(accountId: string): string {
 export const musePaths = {
   authJson: join(env("XDG_CONFIG_HOME", join(HOME, ".config")), "muse", "auth.json"),
   storesDir: join(TM_HOME, "muse-stores"),
-  onboardDir: join(TM_HOME, "muse-onboard"),
 } as const;
 
 export function museStoreDirFor(accountId: string): string {

package/src/lib/pi.ts

@@ -7,7 +7,8 @@ import { codexSeatIdOf } from "./codexauth.ts";
 import { CHECK_JOB, installPiSupervisor, isBinDirAhead, jobHealthy, piSupervisorLink } from "./install.ts";
 import { errorMessage, log } from "./log.ts";
 import { fetchTokenIdentity } from "./oauth.ts";
-import { claudePool, piPaths, type PiPool } from "./paths.ts";
+import { onboardHome } from "./onboard.ts";
+import { claudePool, type PiPool } from "./paths.ts";
 import { linkSharedPiHome, piStoreUsable, readPiAuthAt, type PiOAuth } from "./piauth.ts";
 import { StoreUnusableError, type Provider } from "./provider.ts";
 import { loadAccounts, pinBinOverride } from "./state.ts";
@@ -51,8 +52,7 @@ async function identityOf(pool: PiPool, cred: PiOAuth): Promise<{ id: string; em
 
 export async function piLogin(pool: PiPool): Promise<PiLogin | null> {
   const real = resolveRealBin(PI_BIN);
-  const onboardDir = piPaths.onboardDir;
-  rmSync(onboardDir, { recursive: true, force: true });
+  const onboardDir = await onboardHome("pi");
   linkSharedPiHome(onboardDir);
   const authPath = join(onboardDir, "auth.json");
 

package/src/lib/sessions.ts

@@ -59,7 +59,7 @@ function listDir(dir: string, root: string): Dirent[] {
 }
 
 function tmpSweepDirs(root: string): string[] {
-  const dirs = [paths.home, paths.usageDir, paths.presenceDir, paths.respawnDir, sessionsDir(), paths.binDir, paths.apiKeysDir, codexPaths.presenceDir, codexPaths.respawnDir, codexPaths.onboardDir];
+  const dirs = [paths.home, paths.usageDir, paths.presenceDir, paths.respawnDir, sessionsDir(), paths.binDir, paths.apiKeysDir, codexPaths.presenceDir, codexPaths.respawnDir];
   for (const parent of SWEEP_PARENTS) {
     for (const child of listDir(parent, root)) {
       if (child.isDirectory()) dirs.push(join(parent, child.name));

package/src/lib/statusonly.ts

@@ -1,6 +1,7 @@
-import { mkdirSync, rmSync } from "node:fs";
+import { rmSync } from "node:fs";
 import { join } from "node:path";
 import { resolveRealBin, verifyRealBin } from "./claudebin.ts";
+import { onboardHome } from "./onboard.ts";
 import type { PoolPaths } from "./paths.ts";
 import type { Provider } from "./provider.ts";
 import { pinBinOverride, type Harvest } from "./state.ts";
@@ -17,7 +18,6 @@ export type StatusOnlySpec = {
   binKey: "grokBin" | "museBin";
   storeDirFor: (accountId: string) => string;
   authJsonFor: (accountId: string) => string;
-  onboardDir: string;
   homeEnv: string;
   loginArgs: string[];
   onboardAuthRel: string;
@@ -33,6 +33,11 @@ export type StatusOnlySpec = {
   samplePool: Provider["samplePool"];
 };
 
+// An entry with no identity (a Muse Code provider without an email) has no harvest; the first one that has one is pooled.
+function firstHarvest(entries: AuthEntry[]): Harvest | null {
+  return entries.find((e) => e.harvest)?.harvest ?? null;
+}
+
 export function statusOnlyProvider(spec: StatusOnlySpec): Provider {
   const bin = { name: spec.binName, key: spec.binKey, versionOk: spec.versionOk };
 
@@ -46,9 +51,7 @@ export function statusOnlyProvider(spec: StatusOnlySpec): Provider {
 
   async function login(): Promise<Harvest | null> {
     const real = resolveRealBin(bin);
-    const onboardDir = spec.onboardDir;
-    rmSync(onboardDir, { recursive: true, force: true });
-    mkdirSync(onboardDir, { recursive: true });
+    const onboardDir = await onboardHome(spec.name);
     const p = Bun.spawn([real, ...spec.loginArgs], {
       stdin: "inherit",
       stdout: "inherit",
@@ -57,12 +60,9 @@ export function statusOnlyProvider(spec: StatusOnlySpec): Provider {
     });
     await p.exited;
     try {
-      const first = p.exitCode === 0 ? spec.readAuth(join(onboardDir, spec.onboardAuthRel))[0] : undefined;
-      if (!first) {
-        console.error(c.red(`no ${spec.name} login landed in the isolated home - nothing added.`));
-        return null;
-      }
-      return first.harvest;
+      const harvest = p.exitCode === 0 ? firstHarvest(spec.readAuth(join(onboardDir, spec.onboardAuthRel))) : null;
+      if (!harvest) console.error(c.red(`no ${spec.name} login landed in the isolated home - nothing added.`));
+      return harvest;
     } finally {
       rmSync(onboardDir, { recursive: true, force: true });
     }
@@ -71,13 +71,11 @@ export function statusOnlyProvider(spec: StatusOnlySpec): Provider {
   async function importLive(): Promise<Harvest | null> {
     console.log(c.cyan(spec.importIntro));
     console.log();
-    const live = spec.readAuth(spec.liveAuthPath());
-    const first = live[0];
-    if (first) {
-      console.log(c.dim(spec.foundLive(live.length)));
-      if (first.harvest) return first.harvest;
-    }
-    return login();
+    const live = spec.readAuth(spec.liveAuthPath()).filter((e) => e.harvest);
+    const harvest = live[0]?.harvest;
+    if (!harvest) return login();
+    console.log(c.dim(spec.foundLive(live.length)));
+    return harvest;
   }
 
   function preflight(): void {