tokenmaxxing 1.108.0 → 1.110.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.108.0",
+  "version": "1.110.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/cli/seat.ts

@@ -6,18 +6,18 @@ import { emitError } from "./render.ts";
 const POOLS = {
   claude: {
     borrow: borrowClaudeSeat,
-    usage: "usage: tokenmaxxing seat <pid> - print the CLAUDE_SECURESTORAGE_CONFIG_DIR of one pooled claude account, lent to <pid> alone until it exits",
-    none: "no usable claude account (pool empty, every account lent to another borrower, or every account at a limit or flagged for reauthentication)",
+    usage: "usage: tokenmaxxing seat <pid> - print the CLAUDE_SECURESTORAGE_CONFIG_DIR of one pooled claude account, lent to <pid> until it exits and shared with host sessions and other borrowers",
+    none: "no usable claude account (pool empty, or every account at a limit or flagged for reauthentication)",
   },
   codex: {
     borrow: borrowCodexSeat,
-    usage: "usage: tokenmaxxing seat --codex <pid> - print the CODEX_HOME of one pooled account, reserved until <pid> exits",
-    none: "no usable codex account (pool empty, every account live in another session, or every account at a limit) - use the ambient codex login",
+    usage: "usage: tokenmaxxing seat --codex <pid> - print the CODEX_HOME of one pooled account, lent to <pid> until it exits and shared with codex sessions and other borrowers; codex processes that share one auth.json can lose a refresh race that signs the account out until `tokenmaxxing auth --codex` runs again",
+    none: "no usable codex account (pool empty, or every account at a limit, flagged for reauthentication, held by a pi session, or held by the supervised codex session this runs in) - use the ambient codex login",
   },
   "opencode-go": {
     borrow: borrowOpencodeGoSeat,
-    usage: "usage: tokenmaxxing seat --opencode-go <pid> - print the store directory of one pooled opencode-go key, whose auth.json is an opencode auth file, lent to <pid> alone until it exits",
-    none: "no usable opencode-go key (pool empty, every key lent to another borrower, or no store holds a usable key)",
+    usage: "usage: tokenmaxxing seat --opencode-go <pid> - print the store directory of one pooled opencode-go key, whose auth.json is an opencode auth file, lent to <pid> until it exits and shared with other borrowers",
+    none: "no usable opencode-go key (pool empty, or no store holds a usable key)",
   },
 };
 

package/src/entries/codexstophook.ts

@@ -4,14 +4,13 @@ import type { z } from "zod";
 import { codexPaths, optionalEnv } from "../lib/paths.ts";
 import { writeFileAtomic } from "../lib/atomic.ts";
 import { CODEX_BIN, MAX_WRAP_DEPTH, WRAP_DEPTH_ENV, resolveRealBin } from "../lib/claudebin.ts";
-import { codex, codexPickCtx } from "../lib/codex.ts";
+import { CODEX_SUPERVISOR_ID_ENV, codex, codexPickCtx } from "../lib/codex.ts";
 import { compactCodexThread } from "../lib/compact.ts";
 import { evaluateAndMaybeSwap } from "../lib/decide.ts";
 import { isExhausted } from "../lib/picker.ts";
 import { livingPresences } from "../lib/presence.ts";
 import { readStdin } from "../lib/proc.ts";
 import { loadAccounts, loadConfig } from "../lib/state.ts";
-import { CODEX_SUPERVISOR_ID_ENV } from "./codexsupervisor.ts";
 import { CodexRespawnMarkerSchema, CodexStopStdinSchema, JsonTextSchema } from "../lib/types.ts";
 import { errorMessage, log } from "../lib/log.ts";
 

package/src/entries/codexsupervisor.ts

@@ -7,7 +7,7 @@ import { codexPaths, codexPool } from "../lib/paths.ts";
 import { withLock } from "../lib/lock.ts";
 import { CODEX_BIN, UNMANAGED_ENV, WRAP_DEPTH_ENV, resolveRealBin, wrapDepth } from "../lib/claudebin.ts";
 import { codexStoreUsable, ensureCodexStoreHome } from "../lib/codexauth.ts";
-import { borrowCodexSeat, codexPickCtx, pickCodexSeat } from "../lib/codex.ts";
+import { CODEX_SUPERVISOR_ID_ENV, borrowCodexSeat, codexPickCtx, pickCodexSeat } from "../lib/codex.ts";
 import { clearPresence, livingPresences } from "../lib/presence.ts";
 import { isExhausted } from "../lib/picker.ts";
 import { exitStatus, loopGuardTripped, raceMarkerOrExit, recordPresenceOrStop, runPassthrough } from "../lib/supervise.ts";
@@ -16,8 +16,6 @@ import { loadAccounts, readJsonFile } from "../lib/state.ts";
 import { CodexRespawnMarkerSchema, type Account } from "../lib/types.ts";
 import { errorMessage, log } from "../lib/log.ts";
 
-export const CODEX_SUPERVISOR_ID_ENV = "TOKENMAXXING_CODEX_SUPERVISOR_ID";
-
 const NONINTERACTIVE_SUBCMDS = new Set([
   "exec", "e", "review", "login", "logout", "mcp", "plugin", "mcp-server", "app-server",
   "remote-control", "app", "completion", "update", "doctor", "sandbox", "debug",

package/src/entries/pisupervisor.ts

@@ -12,7 +12,7 @@ import { claudePool, codexPaths, expandTilde, optionalEnv, paths, piPaths, type
 import { pickPiSeat, piMovers } from "../lib/pi.ts";
 import { ensurePiStoreHome, piStoreUsable } from "../lib/piauth.ts";
 import { thresholdBars, usableAt } from "../lib/picker.ts";
-import { clearPresence, livingPresences } from "../lib/presence.ts";
+import { PI_PRESENCE_PREFIX, clearPresence, livingPresences } from "../lib/presence.ts";
 import { teeObservation } from "../lib/sample.ts";
 import { countdownWait, exitStatus, loopGuardTripped, raceMarkerOrExit, recordPresenceOrStop, runPassthrough, SEAT_POLL_MS, SEAT_RETRY_MS } from "../lib/supervise.ts";
 import { saveTermios } from "../lib/tty.ts";
@@ -327,7 +327,7 @@ export async function runPiSupervisor(argv: string[]): Promise<number> {
   if (launch == null) return runPassthrough({ real, argv, env: childEnv, onSpawn: (p) => { child = p; } });
   const { args, pool, dirs, sid } = launch;
 
-  const id = `pi-${crypto.randomUUID()}`;
+  const id = `${PI_PRESENCE_PREFIX}${crypto.randomUUID()}`;
   const mover = piMovers[pool];
   const presenceDir = pool === "claude" ? paths.presenceDir : codexPaths.presenceDir;
   const releaseClaim = async (): Promise<void> => {

package/src/lib/claude.ts

@@ -163,8 +163,7 @@ export async function borrowClaudeSeat(pid: number): Promise<SeatBorrow> {
       }
       return { store: storeDirFor(heldAccount.id), id: heldAccount.id, reused: true };
     }
-    const lent = new Set(living.filter((p) => p.id.startsWith("seat-")).map((p) => p.accountId));
-    const open = idx.accounts.filter((a) => a.needsReauth !== true && !lent.has(a.id));
+    const open = idx.accounts.filter((a) => a.needsReauth !== true);
     const usable = await Promise.all(open.map(storeUsable));
     const ctx: PickCtx = { now: Date.now(), thresholds: bars, currentId: null, families: gatedFamilies(null, cfg.policy.switchModels), seats: presence() };
     const picked = pickBest(open.filter((_, i) => usable[i]), ctx);

package/src/lib/codex.ts

@@ -1,17 +1,18 @@
 import { existsSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
+import { countBy } from "es-toolkit";
 import { z } from "zod";
 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 { deletePiStore } from "./piauth.ts";
-import { livingPresences, seatCounts, writePresence } from "./presence.ts";
+import { PI_PRESENCE_PREFIX, livingPresences, seatCounts, writePresence } from "./presence.ts";
 import { CodexUsageReadError, codexLimitLabel, fetchCodexUsage } from "./codexusage.ts";
 import { codexSupervisorLink, ensurePathInRc, installCodexSupervisor, managedShellRcSkipLines, shellRcPath } from "./install.ts";
 import { withLock } from "./lock.ts";
 import { errorMessage, log } from "./log.ts";
-import { codexPaths, codexPool, codexSeatFromEnv } from "./paths.ts";
+import { codexPaths, codexPool, codexSeatFromEnv, optionalEnv } from "./paths.ts";
 import { isExhausted, pickBest, pickEarliestReset, thresholdBars, type PickCtx } from "./picker.ts";
 import { StoreUnusableError, type Observation, type Provider, type SampleReport, type SeatBorrow } from "./provider.ts";
 import { loadAccounts, loadConfig, pinBinOverride, saveAccounts, type Harvest } from "./state.ts";
@@ -19,6 +20,8 @@ import { restoreTermios, saveTermios } from "./tty.ts";
 import type { Account, CodexAuthJson, CodexUsage, Config } from "./types.ts";
 import { c } from "../cli/render.ts";
 
+export const CODEX_SUPERVISOR_ID_ENV = "TOKENMAXXING_CODEX_SUPERVISOR_ID";
+
 function liveId(): string | null {
   return codexSeatFromEnv(loadAccounts(codexPool).accounts.map((a) => a.id));
 }
@@ -251,7 +254,8 @@ export async function borrowCodexSeat(pid: number): Promise<SeatBorrow> {
   const granted = await withLock(codexPool.lockFile, (): SeatBorrow => {
     const ctx = codexPickCtx(now, null);
     const idx = loadAccounts(codexPool);
-    const held = livingPresences(codexPaths.presenceDir).find((p) => p.id === seatId);
+    const living = livingPresences(codexPaths.presenceDir);
+    const held = living.find((p) => p.id === seatId);
     const heldAccount = held ? (idx.accounts.find((x) => x.id === held.accountId) ?? null) : null;
     if (heldAccount) {
       if (heldAccount.needsReauth === true) {
@@ -262,11 +266,14 @@ export async function borrowCodexSeat(pid: number): Promise<SeatBorrow> {
       }
       return { store: ensureCodexStoreHome(heldAccount.id), id: heldAccount.id, reused: true };
     }
-    const present = seatCounts(codexPaths.presenceDir);
+    const parent = optionalEnv(CODEX_SUPERVISOR_ID_ENV);
+    const closed = new Set(living.filter((p) => p.id === parent || p.id.startsWith(PI_PRESENCE_PREFIX)).map((p) => p.accountId));
+    const lent = countBy(living, (p) => p.accountId);
     const usable = idx.accounts.filter(
-      (a) => a.needsReauth !== true && !isExhausted(a, ctx) && !present.has(a.id) && codexStoreUsable(a.id)
+      (a) => !closed.has(a.id) && a.needsReauth !== true && !isExhausted(a, ctx) && codexStoreUsable(a.id)
     );
-    const picked = pickBest(usable, ctx);
+    const fewest = Math.min(...usable.map((a) => lent[a.id] ?? 0));
+    const picked = pickBest(usable.filter((a) => (lent[a.id] ?? 0) === fewest), ctx);
     if (!picked) return null;
     const store = ensureCodexStoreHome(picked.id);
     writePresence({ dir: codexPaths.presenceDir, id: seatId, accountId: picked.id, pid });

package/src/lib/opencodego.ts

@@ -1,4 +1,5 @@
 import { join } from "node:path";
+import { countBy, minBy } from "es-toolkit";
 import { z } from "zod";
 import { writeFileAtomic } from "./atomic.ts";
 import { env, HOME, opencodeGoAuthJsonFor, opencodeGoPaths, opencodeGoPool, opencodeGoStoreDirFor } from "./paths.ts";
@@ -63,10 +64,9 @@ export async function borrowOpencodeGoSeat(pid: number): Promise<SeatBorrow> {
       }
       return { store: opencodeGoStoreDirFor(heldAccount.id), id: heldAccount.id, reused: true };
     }
-    const lent = new Set(living.map((p) => p.accountId));
-    const open = accounts.filter((a) => !lent.has(a.id));
-    const usable = await Promise.all(open.map(opencodeGo.storeUsable));
-    const picked = open.find((_, i) => usable[i]);
+    const lent = countBy(living, (p) => p.accountId);
+    const usable = await Promise.all(accounts.map(opencodeGo.storeUsable));
+    const picked = minBy(accounts.filter((_, i) => usable[i]), (a) => lent[a.id] ?? 0);
     if (!picked) return null;
     writePresence({ dir: opencodeGoPaths.presenceDir, id: seatId, accountId: picked.id, pid });
     return { store: opencodeGoStoreDirFor(picked.id), id: picked.id, reused: false };

package/src/lib/picker.ts

@@ -122,6 +122,7 @@ const swapPreference = (ctx: PickCtx) => [
   (a: Account) => -pacePressure(a, ctx),
   (a: Account) => weeklyExpiry(a, ctx.now),
   (a: Account) => weeklyWindow(a)?.usedPercentage ?? 101,
+  ...(ctx.seats == null ? [] : [(a: Account) => ctx.seats?.get(a.id) ?? 0]),
 ];
 
 export function pickBest(accounts: Account[], ctx: PickCtx): Account | null {

package/src/lib/presence.ts

@@ -7,6 +7,8 @@ import { pidExists, pidStartTime } from "./proc.ts";
 import { readJsonFile } from "./state.ts";
 import { ErrnoSchema, JsonTextSchema } from "./types.ts";
 
+export const PI_PRESENCE_PREFIX = "pi-";
+
 const PresenceSchema = z.object({
   accountId: z.string(),
   pid: z.number(),

package/src/main.ts

@@ -60,9 +60,9 @@ function printHelp(): void {
   ${c.cyan("tokenmaxxing doctor")}     verify the install is intact
   ${c.cyan("tokenmaxxing rename")} [--codex | --grok | --opencode-go] <sel> <label>
   ${c.cyan("tokenmaxxing rm")} [--codex | --grok | --opencode-go] <sel>
-  ${c.cyan("tokenmaxxing seat")} <pid>  lend one pooled Claude account to an unattended consumer until <pid> exits: prints the store directory to set as CLAUDE_SECURESTORAGE_CONFIG_DIR (the directory itself, as its owner, never a copy of its credential); host sessions keep using the account, other borrowers do not; exit 1 = none usable
-  ${c.cyan("tokenmaxxing seat --codex")} <pid>  borrow one pooled codex account for an unattended consumer (plugin, script): prints the CODEX_HOME to set, reserved until <pid> exits; exit 1 = none usable, fall back to the ambient login
-  ${c.cyan("tokenmaxxing seat --opencode-go")} <pid>  lend one pooled opencode-go key to an unattended consumer until <pid> exits: prints the store directory, whose auth.json is an opencode auth file (mount it at $XDG_DATA_HOME/opencode/auth.json, then run a model such as opencode-go/mimo-v2.6-pro); other borrowers do not get the key; exit 1 = none usable
+  ${c.cyan("tokenmaxxing seat")} <pid>  lend one pooled Claude account to an unattended consumer until <pid> exits: prints the store directory to set as CLAUDE_SECURESTORAGE_CONFIG_DIR (the directory itself, as its owner, never a copy of its credential); host sessions and other borrowers share the account; exit 1 = none usable
+  ${c.cyan("tokenmaxxing seat --codex")} <pid>  borrow one pooled codex account for an unattended consumer (plugin, script): prints the CODEX_HOME to set, lent to <pid> until it exits; codex sessions and other borrowers share the account, and a refresh race between them can sign it out until auth --codex runs again; exit 1 = none usable, fall back to the ambient login
+  ${c.cyan("tokenmaxxing seat --opencode-go")} <pid>  lend one pooled opencode-go key to an unattended consumer until <pid> exits: prints the store directory, whose auth.json is an opencode auth file (mount it at $XDG_DATA_HOME/opencode/auth.json, then run a model such as opencode-go/mimo-v2.6-pro); other borrowers share the key; exit 1 = none usable
   ${c.cyan("tokenmaxxing serve")}      serve the CLIProxyAPI-compatible usage API on http://localhost:<hub.port> (default 8317) so a dashboard such as T3 Code's "Add a CLIProxyAPI hub" shows every pooled Claude and Codex account's quota; the management key is the contents of hub-key in the state directory
   ${c.cyan("tokenmaxxing uninstall")} [--yes]  print the targets, then remove supervisor + settings entries (refused without ${c.cyan("--yes")} when HOME is the login home)