tokenmaxxing 1.154.0 → 1.156.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.154.0",
+  "version": "1.156.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/entries/supervisor.ts

@@ -14,7 +14,7 @@ import { thresholdBars, usableAt } from "../lib/picker.ts";
 import { clearPresence } from "../lib/presence.ts";
 import { readLines } from "../lib/proc.ts";
 import { teeObservation } from "../lib/sample.ts";
-import { countdownWait, exitStatus, loopGuardTripped, raceMarkerOrExit, recordPresenceOrStop, relayStdout, runPassthrough, SEAT_POLL_MS, SEAT_RETRY_MS, type Say } from "../lib/supervise.ts";
+import { childStdout, countdownWait, exitStatus, loopGuardTripped, raceMarkerOrExit, recordPresenceOrStop, relayStdout, runPassthrough, SEAT_POLL_MS, SEAT_RETRY_MS, type Say } from "../lib/supervise.ts";
 import { saveTermios } from "../lib/tty.ts";
 import { liveSessionId, loadSessionFlags, pruneStaleSessions, saveSessionFlags, writeRespawnMarker } from "../lib/sessions.ts";
 import { loadAccounts, loadConfig, readJsonFile, releaseWaitClaim, writeUsage } from "../lib/state.ts";
@@ -584,7 +584,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
   let overriddenUntil = 0;
   let wanted: { accountId: string | null; apiKeyId: string | null } | null = null;
   let refused: string[] = [];
-  let drainStdout: (() => Promise<void>) | null = null;
+  let drainStdout: ((abandoned: () => boolean) => Promise<void>) | null = null;
   try {
   while (true) {
     rmSync(marker, { force: true });
@@ -593,6 +593,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
     const launched = await withLock(claudePool.lockFile, async () => {
       if (terminating) return null;
       const target = resolveLaunch(wanted, gate.launchedAt, model, refused);
+      if (target?.account && target.depletedUntil !== undefined) gate.overriddenUntil = Math.max(gate.overriddenUntil, target.depletedUntil);
       const picked = target?.account ?? null;
       const key = target?.apiKey ?? null;
       log("supervisor.launch", { sid, respawns, seat: picked?.id.slice(0, 8) ?? null, key: key?.id, args: launchArgs.join(" "), injected: firstLine !== null });
@@ -602,7 +603,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
       const extra: "pipe"[] = secret == null ? [] : ["pipe"];
       const scrubbed = scrubCredEnv(childEnv);
       const spawned = Bun.spawn([real, ...launchArgs], {
-        stdio: [relay === null ? "inherit" : "pipe", tee === null ? "inherit" : "pipe", "inherit", ...extra],
+        stdio: [relay === null ? "inherit" : "pipe", tee === null ? childStdout() : "pipe", "inherit", ...extra],
         env: {
           ...(picked ? { ...scrubbed, CLAUDE_SECURESTORAGE_CONFIG_DIR: storeDirFor(picked.id) } : key ? apiKeyEnv(scrubbed, key) : childEnv),
           TOKENMAXXING_SUPERVISED: "1",
@@ -615,7 +616,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
       });
       child = spawned;
       if (secret != null) sendApiKey(spawned, secret);
-      const drain = tee !== null && spawned.stdout instanceof ReadableStream ? relayStdout(spawned.stdout, tee) : null;
+      drainStdout = spawned.stdout instanceof ReadableStream ? relayStdout(spawned.stdout, tee ?? undefined) : null;
       if (relay !== null) relay.attach(spawned.stdin!, firstLine, pendingTranscript);
       firstLine = null;
       if (picked || key) {
@@ -631,7 +632,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
         });
       }
       releaseClaimLocked(sid);
-      return { child: spawned, seat: picked, key, drain, open };
+      return { child: spawned, seat: picked, key, drain: drainStdout, open };
     });
     if (launched == null) {
       await releaseClaim();
@@ -659,7 +660,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
         relay?.detach();
       },
     });
-    await drainStdout?.();
+    await drainStdout?.(() => terminating);
     drainStdout = null;
     await foldCost(sid, key?.id ?? null, restored);
 
@@ -729,7 +730,7 @@ export async function runSupervisor(argv: string[]): Promise<number> {
     return exitStatus(proc);
   }
   } catch (e) {
-    await drainStdout?.();
+    await drainStdout?.(() => terminating);
     const msg = errorMessage(e);
     const text = msg.startsWith("tokenmaxxing:") ? msg : `tokenmaxxing: ${msg}`;
     say(`\n\x1b[31m${text}\x1b[0m\n`, text);

package/src/lib/claude.ts

@@ -10,7 +10,7 @@ import { withLock } from "./lock.ts";
 import { errorMessage, log } from "./log.ts";
 import { claudeTierLabel, describeIdentity, fetchTokenIdentity, isDeadCredential, InvalidGrantError } from "./oauth.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 { MAX_WAITERS_PER_ACCOUNT, pickBest, pickEarliestReset, pickWaitTarget, thresholdBars, type EarliestReset, type PickCtx } from "./picker.ts";
 import { deletePiStore } from "./piauth.ts";
 import { livingPresences, writePresence } from "./presence.ts";
 import { StoreUnusableError, type Observation, type Provider, type ResetClaim, type SampleReport, type SeatBorrow } from "./provider.ts";
@@ -139,7 +139,7 @@ async function storeUsable(a: Account): Promise<boolean> {
   }
 }
 
-function seatContext(now: number, model: ModelInfo | null, eligible: (a: Account) => boolean): { candidates: Account[]; ctx: PickCtx; fallback: () => Account | null } {
+function seatContext(now: number, model: ModelInfo | null, eligible: (a: Account) => boolean): { candidates: Account[]; ctx: PickCtx; fallback: () => EarliestReset | null } {
   const cfg = loadConfig();
   const bars = thresholdBars(cfg);
   const idx = loadAccounts(claudePool);
@@ -150,18 +150,17 @@ function seatContext(now: number, model: ModelInfo | null, eligible: (a: Account
   const ctx: PickCtx = { now, thresholds: bars, currentId: null, families: gatedFamilies(model, cfg.policy.switchModels), seats };
   const candidates = idx.accounts.filter(eligible);
   const fallback = () =>
-    pickWaitTarget(candidates, ctx, seats, MAX_WAITERS_PER_ACCOUNT, now + cfg.policy.maxWaitMs, now + 2 * cfg.policy.maxWaitMs)?.account ??
-    pickEarliestReset(candidates, ctx)?.account ??
-    null;
+    pickWaitTarget(candidates, ctx, seats, MAX_WAITERS_PER_ACCOUNT, now + cfg.policy.maxWaitMs, now + 2 * cfg.policy.maxWaitMs) ??
+    pickEarliestReset(candidates, ctx);
   return { candidates, ctx, fallback };
 }
 
 export function pickSeat(now: number, model: ModelInfo | null, eligible: (a: Account) => boolean = () => true): Account | null {
   const { candidates, ctx, fallback } = seatContext(now, model, eligible);
-  return pickBest(candidates, ctx) ?? fallback();
+  return pickBest(candidates, ctx) ?? fallback()?.account ?? null;
 }
 
-export type LaunchTarget = { account: Account; apiKey: null } | { account: null; apiKey: ApiKey };
+export type LaunchTarget = { account: Account; apiKey: null; depletedUntil?: number } | { account: null; apiKey: ApiKey };
 
 export function pickLaunch(now: number, model: ModelInfo | null, refused: readonly string[] = []): LaunchTarget | null {
   const { candidates, ctx, fallback } = seatContext(now, model, (a) => !refused.includes(a.id));
@@ -169,8 +168,8 @@ export function pickLaunch(now: number, model: ModelInfo | null, refused: readon
   if (best) return { account: best, apiKey: null };
   const key = launchApiKey();
   if (key) return { account: null, apiKey: key };
-  const account = fallback();
-  return account ? { account, apiKey: null } : null;
+  const wait = fallback();
+  return wait ? { account: wait.account, apiKey: null, depletedUntil: wait.availableAt } : null;
 }
 
 export async function borrowClaudeSeat(pid: number, named?: string): Promise<SeatBorrow | { invalid: string }> {

package/src/lib/supervise.ts

@@ -117,7 +117,7 @@ export function relayStdout(source: ReadableStream<Uint8Array>, onLine?: (line:
     });
   return async (abandoned = () => false) => {
     const exitedAt = Date.now();
-    while (!ended && (blocked ? !abandoned() : Date.now() - Math.max(readAt, exitedAt) < STDOUT_QUIET_MS)) await Bun.sleep(50);
+    while (!ended && !abandoned() && (blocked || Date.now() - Math.max(readAt, exitedAt) < STDOUT_QUIET_MS)) await Bun.sleep(50);
   };
 }