tokenmaxxing 0.15.0 → 0.16.0

package/README.md

@@ -45,7 +45,7 @@ claude                  # use claude as always
 | `tokenmaxxing watch [seconds]` | live status: re-render every N seconds (default 120, floor 30; never pings) |
 | `tokenmaxxing config` | effective config with sources; `get`/`set`/`unset` dotted keys, `tidy` prunes unknown keys |
 | `tokenmaxxing doctor` | verify the supervisor + settings entries survived |
-| `tokenmaxxing rename <sel> <label>` / `rm <sel>` | manage the pool |
+| `tokenmaxxing rename [--codex] <sel> <label>` / `rm <sel>` | manage the pool (`--codex` targets the codex pool: one email can hold both a claude and a codex account) |
 | `tokenmaxxing uninstall` | remove supervisor + settings entries (accounts/credentials kept) |
 
 ## How switching decides

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "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/add.ts

@@ -15,7 +15,7 @@ import { withLock } from "../lib/lock.ts";
 import { loadAccounts, saveAccounts } from "../lib/state.ts";
 import { credItemFor, paths } from "../lib/paths.ts";
 import { CredentialBlobSchema, OAuthAccountSchema, type Account } from "../lib/types.ts";
-import { c, count } from "./render.ts";
+import { c, claudeTierLabel, count } from "./render.ts";
 
 /** True once `/login` has written a usable identity into the onboard dir. */
 function identityReady(cjPath: string): boolean {
@@ -115,6 +115,7 @@ export async function cmdAdd(): Promise<number> {
       oauthAccount,
       addedAt: existing?.addedAt ?? new Date().toISOString(),
       subscriptionType: blob.claudeAiOauth.subscriptionType,
+      rateLimitTier: blob.claudeAiOauth.rateLimitTier,
       needsReauth: false,
       lastUsage: sampled ? { fiveHour: sampled.session, sevenDay: sampled.weekAll } : existing?.lastUsage,
       lastPerModel: sampled && Object.keys(sampled.perModel).length > 0 ? sampled.perModel : existing?.lastPerModel,
@@ -130,6 +131,6 @@ export async function cmdAdd(): Promise<number> {
 
   console.log();
   const usageNote = sampled ? ` (session ${sampled.session.usedPercentage}% / week ${sampled.weekAll.usedPercentage}%)` : "";
-  console.log(`${c.green("✓")} added ${c.bold(account.email)} (${account.subscriptionType ?? "?"})${usageNote} → pool now has ${count({ n: poolSize, noun: "account" })}`);
+  console.log(`${c.green("✓")} added ${c.bold(account.email)} (${claudeTierLabel(account) ?? "?"})${usageNote} → pool now has ${count({ n: poolSize, noun: "account" })}`);
   return 0;
 }

package/src/cli/init.ts

@@ -10,7 +10,7 @@ import { installSupervisor, shellRcPath, ensurePathInRc, timerActivationHint, ty
 import { resolveVerifiedClaude } from "../lib/claudebin.ts";
 import { credItemFor, paths } from "../lib/paths.ts";
 import { CredentialBlobSchema, type Account } from "../lib/types.ts";
-import { c } from "./render.ts";
+import { c, claudeTierLabel } from "./render.ts";
 
 /** Put the supervisor bin dir on PATH via the user's shell rc (idempotent).
  *  Falls back to the manual instruction when the shell is unknown. */
@@ -121,6 +121,7 @@ export async function cmdInit(): Promise<number> {
     oauthAccount,
     addedAt: existing?.addedAt ?? new Date().toISOString(),
     subscriptionType: blob.claudeAiOauth.subscriptionType,
+    rateLimitTier: blob.claudeAiOauth.rateLimitTier,
     needsReauth: false,
   };
   if (existing) Object.assign(existing, account);
@@ -134,7 +135,7 @@ export async function cmdInit(): Promise<number> {
 
   const out = installSupervisor();
 
-  console.log(`${c.green("✓")} imported current account → ${c.bold(account.email)} (${account.subscriptionType ?? "?"})`);
+  console.log(`${c.green("✓")} imported current account → ${c.bold(account.email)} (${claudeTierLabel(account) ?? "?"})`);
   console.log(`${c.green("✓")} installed ${c.bold("claude")} supervisor + statusLine/Stop/SessionStart hooks`);
   reportTimer(out);
   if (!out.pathAhead) {

package/src/cli/ls.ts

@@ -3,7 +3,7 @@
 import { loadAccounts } from "../lib/state.ts";
 import { loadCodexAccounts } from "../lib/codexstate.ts";
 import { liveCodexAccountId } from "../lib/codexsample.ts";
-import { c } from "./render.ts";
+import { c, claudeTierLabel } from "./render.ts";
 
 export function cmdLs(): number {
   const idx = loadAccounts();
@@ -19,7 +19,7 @@ export function cmdLs(): number {
     const tag = flags.length ? ` ${flags.join(" ")}` : "";
     const label = a.label || a.email;
     console.log(`${marker} ${c.bold(label)}${tag}`);
-    console.log(`  ${c.dim(`org ${a.organizationUuid.slice(0, 8)}, ${a.subscriptionType ?? "?"}, uuid ${a.accountUuid.slice(0, 8)}`)}`);
+    console.log(`  ${c.dim(`org ${a.organizationUuid.slice(0, 8)}, ${claudeTierLabel(a) ?? "?"}, uuid ${a.accountUuid.slice(0, 8)}`)}`);
   }
 
   const codex = loadCodexAccounts();

package/src/cli/rename.ts

@@ -1,12 +1,16 @@
-// `tokenmaxxing rename <selector> <new-label>` - relabel a pooled account.
+// `tokenmaxxing rename [--codex] <selector> <new-label>` - relabel a pooled
+// account. The pools are separate namespaces and one email can hold both a
+// claude and a codex account, so the codex pool is targeted explicitly via
+// `--codex` (mirroring `switch --codex`), never by searching both pools.
 
 import { withLock } from "../lib/lock.ts";
-import { paths } from "../lib/paths.ts";
+import { codexPaths, paths } from "../lib/paths.ts";
 import { loadAccounts, saveAccounts } from "../lib/state.ts";
+import { loadCodexAccounts, saveCodexAccounts } from "../lib/codexstate.ts";
 import { c } from "./render.ts";
-import type { Account } from "../lib/types.ts";
+import type { Account, CodexAccount } from "../lib/types.ts";
 
-/** Resolve an account by email, label, or accountUuid prefix. */
+/** Resolve a claude account by email, label, or accountUuid prefix. */
 export function findAccount(accounts: Account[], selector: string): Account | undefined {
   const s = selector.toLowerCase();
   return (
@@ -16,17 +20,47 @@ export function findAccount(accounts: Account[], selector: string): Account | un
   );
 }
 
-export async function cmdRename(selector?: string, newLabel?: string): Promise<number> {
+/** Resolve a codex account by email, label, or accountId prefix. */
+export function findCodexAccount(accounts: CodexAccount[], selector: string): CodexAccount | undefined {
+  const s = selector.toLowerCase();
+  return (
+    accounts.find((a) => a.email?.toLowerCase() === s) ??
+    accounts.find((a) => a.label.toLowerCase() === s) ??
+    accounts.find((a) => a.accountId.toLowerCase().startsWith(s))
+  );
+}
+
+async function renameCodexAccount(input: { selector: string; newLabel: string }): Promise<number> {
+  // under the codex flock: a concurrent codex swap's index write must not be clobbered.
+  return withLock(codexPaths.lockFile, async () => {
+    const index = loadCodexAccounts();
+    const account = findCodexAccount(index.accounts, input.selector);
+    if (!account) {
+      console.error(c.red(`no codex account matches "${input.selector}"`));
+      return 1;
+    }
+    const old = account.label;
+    account.label = input.newLabel;
+    saveCodexAccounts({ index });
+    console.log(`renamed codex account ${c.dim(old)} → ${c.bold(input.newLabel)}`);
+    return 0;
+  });
+}
+
+export async function cmdRename(argv: string[]): Promise<number> {
+  const codex = argv.includes("--codex");
+  const [selector, newLabel] = argv.filter((a) => a !== "--codex");
   if (!selector || !newLabel) {
-    console.error("usage: tokenmaxxing rename <email|label|uuid> <new-label>");
+    console.error("usage: tokenmaxxing rename [--codex] <email|label|id> <new-label>");
     return 2;
   }
+  if (codex) return renameCodexAccount({ selector, newLabel });
   // under the flock: a concurrent swap's index write must not be clobbered.
   return withLock(paths.lockFile, async () => {
     const idx = loadAccounts();
     const a = findAccount(idx.accounts, selector);
     if (!a) {
-      console.error(c.red(`no account matches "${selector}"`));
+      console.error(c.red(`no claude account matches "${selector}" (codex accounts rename via --codex)`));
       return 1;
     }
     const old = a.label;

package/src/cli/render.ts

@@ -18,6 +18,19 @@ export function makeColors(enabled: boolean) {
 
 export const c = makeColors(!process.env.NO_COLOR && !!process.stdout.isTTY);
 
+/** Plan label for a claude account, e.g. "max 20x": subscription name plus the
+ *  multiplier segment of the rate-limit tier id ("default_claude_max_20x").
+ *  Structural, never exact-string: the multiplier is any <digits>x segment, so
+ *  tiers without one (e.g. "default_claude_zero") fall back to the bare
+ *  subscription name, and an absent blob field falls back to null (unmeasured
+ *  must not look like a tier). */
+export function claudeTierLabel(input: { subscriptionType?: string; rateLimitTier?: string }): string | null {
+  const segments = input.rateLimitTier?.split("_") ?? [];
+  const multiplier = segments.find((seg) => seg.length > 1 && seg.endsWith("x") && Number.isInteger(Number(seg.slice(0, -1))));
+  if (input.subscriptionType == null) return multiplier ?? null;
+  return multiplier ? `${input.subscriptionType} ${multiplier}` : input.subscriptionType;
+}
+
 /** "1 account" / "3 accounts": counted nouns always pluralize properly. */
 export function count(input: { n: number; noun: string }): string {
   return `${input.n} ${input.noun}${input.n === 1 ? "" : "s"}`;

package/src/cli/status.ts

@@ -21,8 +21,8 @@ import { effectiveBars, isExhausted, nextWeeklyReset } from "../lib/picker.ts";
 import { loadCodexAccounts, saveCodexAccounts } from "../lib/codexstate.ts";
 import { liveCodexAccountId, sampleCodexAccount, type CodexSampleOutcome } from "../lib/codexsample.ts";
 import { isCodexExhausted } from "../lib/codexpick.ts";
-import { isSessionWindow } from "../lib/codexusage.ts";
-import { bar, c, count, fmtAgo, fmtReset } from "./render.ts";
+import { codexLimitLabel, isSessionWindow } from "../lib/codexusage.ts";
+import { bar, c, claudeTierLabel, count, fmtAgo, fmtReset } from "./render.ts";
 import type { FullUsage } from "../lib/usage.ts";
 import type { Config, CodexWindow, UsageWindow } from "../lib/types.ts";
 
@@ -48,10 +48,15 @@ export async function cmdStatus(force = false, preRender?: () => void): Promise<
     idx = loadAccounts();
     const live = loadUsage();
     const modelUsage = loadModelUsage();
-    const activeOrg = readOAuthAccount()?.organizationUuid ?? null;
+    const liveOAuth = readOAuthAccount();
+    const activeOrg = liveOAuth?.organizationUuid ?? null;
     await Promise.all(
       idx.accounts.map(async (a) => {
         const isActive = a.accountUuid === idx.activeAccountUuid && activeOrg === a.organizationUuid;
+        // The tee path never opens the credential blob, so the active account's
+        // tier comes from the live oauthAccount instead - it names this very org
+        // (uuid-matched above), so the tier is attributed to its own identity.
+        if (isActive && liveOAuth?.organizationRateLimitTier != null) a.rateLimitTier = liveOAuth.organizationRateLimitTier;
         // Active account: prefer the free statusLine push (usage.json) so we never
         // poll its own token, which is busy exactly when it matters. per-model
         // comes from model-usage.json (also statusLine-driven).
@@ -126,12 +131,15 @@ export async function cmdStatus(force = false, preRender?: () => void): Promise<
     if (isExhausted(a, { now, thresholds: effectiveBars(cfg), currentAccountUuid: idx.activeAccountUuid, switchFamilies: cfg.policy.switchModels }))
       badges.push(c.yellow("exhausted"));
 
-    console.log(`${marker} ${c.bold(a.label || a.email)} ${badges.join(" ")}`);
+    const tier = claudeTierLabel(a);
+    console.log(`${marker} ${c.bold(a.label || a.email)}${tier ? ` ${c.dim(tier)}` : ""}${badges.length ? ` ${badges.join(" ")}` : ""}`);
+    // Chart label convention (user rule 2026-07-17): everything lowercase,
+    // model names short ("fable", "spark").
     if (aggregate) {
       row("5h", aggregate.fiveHour, false);
       row("week", aggregate.sevenDay, true);
     }
-    if (perModel) for (const [name, w] of Object.entries(perModel)) row(name, w, true);
+    if (perModel) for (const [name, w] of Object.entries(perModel)) row(name.toLowerCase(), w, true);
     if (failed && outcome && !outcome.ok) {
       const cached = aggregate || perModel ? `cached${a.lastUsageAt != null ? ` ${fmtAgo(a.lastUsageAt, now)}` : ""}, ` : "";
       console.log(`    ${c.yellow(`${cached}live sample failed`)}: ${c.dim(outcome.reason)}`);
@@ -199,13 +207,13 @@ async function renderCodexSection(input: {
     if (active) badges.push(c.green("active"));
     if (account.needsReauth) badges.push(c.red("needs-reauth"));
     if (isCodexExhausted({ account, thresholds: effectiveBars(cfg), now })) badges.push(c.yellow("exhausted"));
-    console.log(`${marker} ${c.bold(account.label)} ${account.planType ? c.dim(account.planType) : ""} ${badges.join(" ")}`);
+    console.log(`${marker} ${c.bold(account.label)}${account.planType ? ` ${c.dim(account.planType)}` : ""}${badges.length ? ` ${badges.join(" ")}` : ""}`);
 
     const usage = account.lastUsage;
     if (usage) {
       for (const window of usage.aggregate) row(windowLabel(window), window, !isSessionWindow({ window }));
       for (const [name, windows] of Object.entries(usage.perLimit)) {
-        for (const window of windows) row(name, window, !isSessionWindow({ window }));
+        for (const window of windows) row(codexLimitLabel({ limitName: name }), window, !isSessionWindow({ window }));
       }
     }
     const outcome = outcomes.get(account.accountId);

package/src/lib/codexusage.ts

@@ -14,6 +14,7 @@ import { z } from "zod";
 import { http, safeErrorDetail } from "./http.ts";
 import { CodexUsageSchema, type CodexAuthJson, type CodexUsage, type CodexWindow } from "./types.ts";
 import { codexIdentityOf } from "./codexauth.ts";
+import { familyTokens } from "./usage.ts";
 
 const EnvOverrideSchema = z.string().min(1).optional().catch(undefined);
 const USAGE_URL = EnvOverrideSchema.parse(process.env.TOKENMAXXING_CODEX_USAGE_URL) ?? "https://chatgpt.com/backend-api/wham/usage";
@@ -114,6 +115,15 @@ export async function fetchCodexUsage(input: { auth: CodexAuthJson }): Promise<C
   });
 }
 
+/** Quota-chart label for an additional_rate_limits row: the model family,
+ *  lowercase ("GPT-5.3-Codex-Spark" -> "spark"). Wire names are versioned, so
+ *  the label is derived structurally (last non-numeric token), never by exact
+ *  string (user rule 2026-07-17: chart names are lowercase, e.g. "spark"). */
+export function codexLimitLabel(input: { limitName: string }): string {
+  const tokens = familyTokens(input.limitName).filter((t) => Number.isNaN(Number(t)));
+  return tokens.at(-1) ?? input.limitName.trim().toLowerCase();
+}
+
 const SESSION_WINDOW_MAX_S = 6 * 3600;
 
 /** A window's screening bar: short windows (5h-class) screen at the session

package/src/lib/sample.ts

@@ -49,6 +49,14 @@ async function identityMismatch(creds: OAuthCreds, account: Account): Promise<st
   return `credential actually belongs to ${org.organization_name} (org ${org.organization_uuid.slice(0, 8)})`;
 }
 
+/** Stamp the blob's plan fields onto the account (caller persists). Runs only
+ *  after the identity check passed, so a drifted credential can never write
+ *  another account's tier. Absent blob fields keep the last-known values. */
+function refreshPlanFields(account: Account, creds: OAuthCreds): void {
+  if (creds.subscriptionType != null) account.subscriptionType = creds.subscriptionType;
+  if (creds.rateLimitTier != null) account.rateLimitTier = creds.rateLimitTier;
+}
+
 /**
  * Live-sample `account`'s `/usage` in isolation. On a dead refresh token or a
  * mislabeled credential it sets `account.needsReauth` in place (the caller
@@ -89,6 +97,7 @@ export async function probeParkedUsage(account: Account, opts: { ping?: boolean
     account.needsReauth = true;
     return { ok: false, reason: `${mismatch} - this account's own credential is gone; re-auth with \`tokenmaxxing add\`` };
   }
+  refreshPlanFields(account, creds);
 
   const dir = join(paths.sampleDir, credItemFor(account.accountUuid));
   rmSync(dir, { recursive: true, force: true });
@@ -149,6 +158,7 @@ export async function probeActiveUsage(account: Account, opts: { ping?: boolean
 
   const mismatch = await identityMismatch(creds, account);
   if (mismatch) return { ok: false, reason: `live ${mismatch} - active label drifted; run \`tokenmaxxing switch\`` };
+  refreshPlanFields(account, creds);
 
   const pingError = opts.ping ? await pingSession() : null;
   const usage = await probeUsage();

package/src/lib/types.ts

@@ -36,6 +36,9 @@ export const OAuthAccountSchema = z.looseObject({
   seatTier: z.string().nullish(),
   billingType: z.string().nullish(),
   displayName: z.string().nullish(),
+  /** rate-limit tier id ("default_claude_max_20x"), same value the credential
+   *  blob carries; claude fills it in on profile fetch (live-verified 2.1.211). */
+  organizationRateLimitTier: z.string().nullish(),
 });
 export type OAuthAccount = z.infer<typeof OAuthAccountSchema>;
 
@@ -90,6 +93,10 @@ export const AccountSchema = z.object({
   lastUsageAt: z.number().optional(),
   needsReauth: z.boolean().optional(),
   subscriptionType: z.string().optional(),
+  /** the blob's rate-limit tier id (e.g. "default_claude_max_20x"): the only
+   *  field that distinguishes max 5x from max 20x (subscriptionType is just
+   *  "max" for both). Refreshed on every verified sample. */
+  rateLimitTier: z.string().optional(),
 });
 export type Account = z.infer<typeof AccountSchema>;
 

package/src/main.ts

@@ -44,7 +44,7 @@ function printHelp(): void {
   ${c.cyan("tokenmaxxing watch")} [seconds]  live status: re-render every N seconds (default 120, never pings)
   ${c.cyan("tokenmaxxing config")} [get|set|unset|tidy]  inspect and edit config.json (bare = effective config with sources)
   ${c.cyan("tokenmaxxing doctor")}     verify the install is intact
-  ${c.cyan("tokenmaxxing rename")} <sel> <label>
+  ${c.cyan("tokenmaxxing rename")} [--codex] <sel> <label>
   ${c.cyan("tokenmaxxing rm")} <sel>
   ${c.cyan("tokenmaxxing uninstall")}  remove supervisor + settings entries
 
@@ -85,7 +85,7 @@ async function main(): Promise<number> {
     case "watch": return cmdWatch(args[1]);
     case "doctor": return cmdDoctor();
     case "rm": return cmdRm(args[1]);
-    case "rename": return cmdRename(args[1], args[2]);
+    case "rename": return cmdRename(args.slice(1));
     case "uninstall":
       uninstallSupervisor();
       console.log("removed supervisor wrapper + settings entries (accounts/credentials kept)");