tokenmaxxing 1.99.0 → 1.101.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.99.0",
+  "version": "1.101.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/stopfailurehook.ts

@@ -4,7 +4,7 @@ import { evaluateAndMaybeSwap } from "../lib/decide.ts";
 import { readStdin } from "../lib/proc.ts";
 import { adoptLiveSession, refusedAccounts, supervisedSession, writeRespawnMarker } from "../lib/sessions.ts";
 import { loadConfig } from "../lib/state.ts";
-import { classifyEnforcedLimit, findEnforcedRow, parseErrorBody, readTranscriptTail, type TranscriptRow } from "../lib/usage.ts";
+import { classifyEnforcedLimit, ENFORCED_ERRORS, findEnforcedRow, parseErrorBody, readTranscriptTail, type TranscriptRow } from "../lib/usage.ts";
 import { paths } from "../lib/paths.ts";
 import { JsonTextSchema, type EnforcedLimit } from "../lib/types.ts";
 import { errorMessage, log } from "../lib/log.ts";
@@ -20,10 +20,10 @@ const StopFailureStdin = z.looseObject({
 const ROW_WAIT_MS = 3_000;
 const ROW_POLL_MS = 200;
 
-async function awaitEnforcedRow(input: { transcriptPath: string; lastAssistantMessage: string | undefined; now: number }): Promise<TranscriptRow | null> {
+async function awaitEnforcedRow(input: { transcriptPath: string; error: string; lastAssistantMessage: string | undefined; now: number }): Promise<TranscriptRow | null> {
   const deadline = Date.now() + ROW_WAIT_MS;
   while (true) {
-    const row = findEnforcedRow({ rows: await readTranscriptTail(input.transcriptPath), lastAssistantMessage: input.lastAssistantMessage, now: input.now });
+    const row = findEnforcedRow({ rows: await readTranscriptTail(input.transcriptPath), error: input.error, lastAssistantMessage: input.lastAssistantMessage, now: input.now });
     if (row || Date.now() >= deadline) return row;
     await Bun.sleep(ROW_POLL_MS);
   }
@@ -36,7 +36,8 @@ export async function runStopFailureHook(): Promise<number> {
   const now = Date.now();
   const parsed = StopFailureStdin.safeParse(JsonTextSchema.safeParse(await readStdin()).data);
   const stdin = parsed.success ? parsed.data : {};
-  if (stdin.error !== undefined && stdin.error !== "rate_limit") return 0;
+  const error = stdin.error ?? "rate_limit";
+  if (!ENFORCED_ERRORS.includes(error)) return 0;
 
   const stdinSid = stdin.session_id;
   const mainLoop = stdin.agent_id === undefined;
@@ -51,7 +52,7 @@ export async function runStopFailureHook(): Promise<number> {
     const canRespawn = session != null && mainLoop;
     const cfg = loadConfig();
     const row = stdin.transcript_path
-      ? await awaitEnforcedRow({ transcriptPath: stdin.transcript_path, lastAssistantMessage: stdin.last_assistant_message, now })
+      ? await awaitEnforcedRow({ transcriptPath: stdin.transcript_path, error, lastAssistantMessage: stdin.last_assistant_message, now })
       : null;
     const limit = row ? classifyEnforcedLimit(row, cfg.policy.switchModels) : null;
 

package/src/lib/compact.ts

@@ -1,6 +1,5 @@
 import { statSync } from "node:fs";
 import type { Subprocess } from "bun";
-import { delay } from "es-toolkit";
 import { z } from "zod";
 import pkg from "../../package.json" with { type: "json" };
 import { errorMessage, log } from "./log.ts";
@@ -26,7 +25,7 @@ export async function compactClaudeSession(input: { real: string; sid: string; t
   });
   input.onSpawn(p);
   const reads = Promise.all([p.stdout.text(), p.stderr.text()]);
-  const settled = await Promise.race([reads, p.exited.then(() => delay(PIPE_GRACE_MS)).then(() => null)]);
+  const settled = await Promise.race([reads, p.exited.then(() => Bun.sleep(PIPE_GRACE_MS)).then(() => null)]);
   await p.exited;
   const appended = await Bun.file(input.transcript).slice(offset).text();
   if (appended.split("\n").some((line) => CompactBoundarySchema.safeParse(JsonTextSchema.safeParse(line).data).success)) return { ok: true };

package/src/lib/decide.ts

@@ -38,6 +38,7 @@ function modelKindCovered(limit: EnforcedLimit, account: Account, now: number, w
 }
 
 function enforcedWall(limit: EnforcedLimit, account: Account, now: number): number {
+  if (limit.kind === "org") return now + FIVE_HOURS_MS;
   const { family } = limit;
   const familyReset =
     family == null

package/src/lib/lock.ts

@@ -1,7 +1,6 @@
 import { closeSync, mkdirSync, openSync } from "node:fs";
 import { dirname } from "node:path";
 import { dlopen, FFIType, read } from "bun:ffi";
-import { delay } from "es-toolkit";
 
 const LOCK_EX = 2;
 const LOCK_NB = 4;
@@ -43,7 +42,7 @@ export async function acquireLock(lockPath: string): Promise<{ release: () => vo
       if (errno !== EAGAIN && errno !== EINTR) {
         throw new Error(`flock LOCK_EX|LOCK_NB failed on ${lockPath} (errno ${errno})`);
       }
-      await delay(RETRY_MS);
+      await Bun.sleep(RETRY_MS);
     }
   } catch (e) {
     closeSync(fd);

package/src/lib/settings.ts

@@ -5,6 +5,7 @@ import { paths } from "./paths.ts";
 import { writeFileAtomic } from "./atomic.ts";
 import { readJsonFile } from "./state.ts";
 import { JsonTextSchema } from "./types.ts";
+import { ENFORCED_ERRORS } from "./usage.ts";
 
 export function installedBin(): string {
   return join(paths.binDir, "tokenmaxxing");
@@ -29,7 +30,7 @@ const SUBCMD = {
   sessionStart: "__session-start",
 } as const;
 
-const STOP_FAILURE_MATCHER = "rate_limit";
+const STOP_FAILURE_MATCHER = ENFORCED_ERRORS.join("|");
 
 function readSettings(): Settings {
   if (!existsSync(paths.claudeSettings)) return {};

package/src/lib/types.ts

@@ -84,7 +84,7 @@ export type AccountsIndex = z.infer<typeof AccountsIndexSchema>;
 
 export type EnforcedLimit = {
   account: string;
-  kind: "session" | "weekly" | "model" | "credits";
+  kind: "session" | "weekly" | "model" | "credits" | "org";
   family: string | null;
   resetsAt: number | null;
   blind: boolean;

package/src/lib/usage.ts

@@ -86,11 +86,13 @@ export function transcriptRowText(row: TranscriptRow): string {
 
 const ROW_RECENCY_MS = 60_000;
 
-export function findEnforcedRow(input: { rows: TranscriptRow[]; lastAssistantMessage: string | undefined; now: number }): TranscriptRow | null {
-  const { rows, lastAssistantMessage, now } = input;
+export const ENFORCED_ERRORS = ["rate_limit", "oauth_org_not_allowed"];
+
+export function findEnforcedRow(input: { rows: TranscriptRow[]; error: string; lastAssistantMessage: string | undefined; now: number }): TranscriptRow | null {
+  const { rows, error, lastAssistantMessage, now } = input;
   for (let i = rows.length - 1; i >= 0; i--) {
     const row = rows[i]!;
-    if (row.isApiErrorMessage !== true || row.error !== "rate_limit") continue;
+    if (row.isApiErrorMessage !== true || row.error !== error) continue;
     const ts = row.timestamp ? Date.parse(row.timestamp) : Number.NaN;
     const byContent = lastAssistantMessage != null && lastAssistantMessage !== "" && transcriptRowText(row) === lastAssistantMessage;
     const byRecency = Number.isFinite(ts) && Math.abs(now - ts) <= ROW_RECENCY_MS;
@@ -103,7 +105,8 @@ export type EnforcedClass =
   | { kind: "session"; resetsAt: number | null }
   | { kind: "weekly"; resetsAt: number | null }
   | { kind: "model"; family: string; resetsAt: number | null }
-  | { kind: "credits"; family: string; resetsAt: null };
+  | { kind: "credits"; family: string; resetsAt: null }
+  | { kind: "org"; resetsAt: null };
 
 const ErrorBodySchema = z.looseObject({
   error: z.looseObject({ type: z.string().optional(), details: z.looseObject({ error_code: z.string().optional() }).optional() }).optional(),
@@ -120,6 +123,7 @@ export function parseErrorBody(errorDetails: string | undefined): z.infer<typeof
 }
 
 export function classifyEnforcedLimit(row: TranscriptRow, switchModels: string[]): EnforcedClass | null {
+  if (row.error === "oauth_org_not_allowed") return { kind: "org", resetsAt: null };
   if (row.apiError === "model_requires_usage_credits") return { kind: "credits", family: CREDITS_FAMILY, resetsAt: null };
   const q = row.quotaLimits;
   if (!q) return null;