tokenmaxxing 1.62.0 → 1.63.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.62.0",
+  "version": "1.63.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

@@ -8,7 +8,7 @@ import { ensurePathInRc, installSupervisor, managedShellRcSkipLines, shellRcPath
 import { withLock } from "./lock.ts";
 import { errorMessage, log } from "./log.ts";
 import { claudeTierLabel, describeIdentity, fetchTokenIdentity, isDeadCredential, InvalidGrantError } from "./oauth.ts";
-import { claudePool, env, paths, sampleDirFor, seatFromEnv, storeDirFor } from "./paths.ts";
+import { claudePool, env, paths, seatFromEnv, storeDirFor } from "./paths.ts";
 import { pickBest, pickEarliestReset, thresholdBars, type PickCtx } from "./picker.ts";
 import { seatCounts } from "./presence.ts";
 import type { Observation, Provider, SampleReport } from "./provider.ts";
@@ -138,7 +138,6 @@ async function removeCredentials(a: Account): Promise<void> {
   await deleteItem(storeTarget(a.id));
   rmSync(storeDirFor(a.id), { recursive: true, force: true });
   rmSync(`${storeDirFor(a.id)}.lock`, { recursive: true, force: true });
-  for (const dir of [sampleDirFor(a.id), sampleDirFor(a.id, "-tick")]) rmSync(dir, { recursive: true, force: true });
   clearUsageSnapshot(a.id);
   const setupTokens = loadSetupTokens();
   if (setupTokens.tokens.some((t) => t.accountUuid === a.id)) {

package/src/lib/paths.ts

@@ -26,10 +26,10 @@ export const paths = {
   supervisorLink: join(TM_HOME, "bin", "claude"),
   logFile: join(TM_HOME, "tokenmaxxing.log"),
   onboardDir: join(TM_HOME, "onboard"),
-  sampleDir: join(TM_HOME, "sample"),
   storesDir: join(TM_HOME, "stores"),
   setupTokensJson: join(TM_HOME, "setup-tokens.json"),
   setupTokenDir: join(TM_HOME, "setup-token"),
+  cloudDir: join(TM_HOME, "cloud"),
   cloudSessionsJson: join(TM_HOME, "cloud", "sessions.json"),
   cloudWalledJson: join(TM_HOME, "cloud", "walled.json"),
   cloudLockFile: join(TM_HOME, "cloud", "lock"),
@@ -139,10 +139,6 @@ export function storeDirFor(accountId: string): string {
   return join(paths.storesDir, shortId(accountId));
 }
 
-export function sampleDirFor(accountId: string, suffix = ""): string {
-  return join(paths.sampleDir, `${shortId(accountId)}${suffix}`);
-}
-
 export function usageJsonFor(accountId: string): string {
   return join(paths.usageDir, `${shortId(accountId)}.json`);
 }

package/src/lib/sessions.ts

@@ -1,7 +1,8 @@
-import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync } from "node:fs";
-import { join } from "node:path";
+import { existsSync, mkdirSync, readdirSync, readFileSync, realpathSync, rmSync, statSync, type Dirent } from "node:fs";
+import { join, sep } from "node:path";
 import { z } from "zod";
-import { paths } from "./paths.ts";
+import { errorMessage, log } from "./log.ts";
+import { codexPaths, grokPaths, opencodeGoPaths, paths } from "./paths.ts";
 import { writeFileAtomic } from "./atomic.ts";
 import type { RespawnMarkerSchema } from "./types.ts";
 
@@ -9,12 +10,14 @@ const SessionSchema = z.object({ flags: z.array(z.string()), cwd: z.string() });
 
 const SESSION_RETENTION_MS = 30 * 24 * 3600 * 1000;
 
+const sessionsDir = (): string => join(paths.home, "sessions");
+
 function sessionFile(sid: string): string {
-  return join(paths.home, "sessions", `${sid}.json`);
+  return join(sessionsDir(), `${sid}.json`);
 }
 
 export function saveSessionFlags(sid: string, flags: string[], cwd: string): void {
-  mkdirSync(join(paths.home, "sessions"), { recursive: true });
+  mkdirSync(sessionsDir(), { recursive: true });
   writeFileAtomic(sessionFile(sid), JSON.stringify({ flags, cwd }));
 }
 
@@ -24,23 +27,79 @@ export function loadSessionFlags(sid: string): string[] | null {
   return SessionSchema.parse(JSON.parse(readFileSync(f, "utf8"))).flags;
 }
 
-const DEAD_STATE_FILES = ["model-usage.json", "accounts.json.v1-backup", "codex-accounts.json.v1-backup"];
+const DEAD_STATE_ENTRIES = [
+  "model-usage.json",
+  "accounts.json.v1-backup",
+  "codex-accounts.json.v1-backup",
+  "nextcheck.json",
+  "usage.json",
+  "lastswap.json",
+  "depleted.json",
+  "codex-lastswap.json",
+  "creds",
+  "codex-creds",
+  "codex-reconcile",
+  "sample",
+];
+
+const TMP_MARKER = ".tmp.";
+const TMP_GRACE_MS = 3600 * 1000;
+
+const STORE_PARENTS = [paths.storesDir, codexPaths.storesDir, grokPaths.storesDir, opencodeGoPaths.storesDir];
+
+function listDir(dir: string, root: string): Dirent[] {
+  if (!existsSync(dir)) return [];
+  try {
+    const resolved = realpathSync(dir);
+    if (resolved !== root && !resolved.startsWith(root + sep)) return [];
+    return readdirSync(dir, { withFileTypes: true });
+  } catch (e) {
+    log("state.sweep_unreadable", { dir, err: errorMessage(e) });
+    return [];
+  }
+}
+
+function tmpSweepDirs(root: string): string[] {
+  const dirs = [paths.home, paths.usageDir, paths.presenceDir, paths.respawnDir, sessionsDir(), paths.binDir, paths.cloudDir, codexPaths.presenceDir, codexPaths.respawnDir, codexPaths.onboardDir];
+  for (const parent of STORE_PARENTS) {
+    for (const child of listDir(parent, root)) {
+      if (child.isDirectory()) dirs.push(join(parent, child.name));
+    }
+  }
+  return dirs;
+}
 
-function pruneDeadState(): void {
-  for (const name of DEAD_STATE_FILES) {
+function pruneDeadState(now: number, root: string): void {
+  for (const name of DEAD_STATE_ENTRIES) {
     try {
-      rmSync(join(paths.home, name), { force: true });
-    } catch {
+      rmSync(join(paths.home, name), { recursive: true, force: true });
+    } catch (e) {
+      log("state.dead_entry_failed", { name, err: errorMessage(e) });
+    }
+  }
+  for (const dir of tmpSweepDirs(root)) {
+    for (const f of listDir(dir, root)) {
+      if (!f.isFile() || !f.name.includes(TMP_MARKER)) continue;
+      const p = join(dir, f.name);
+      try {
+        if (now - statSync(p).mtimeMs > TMP_GRACE_MS) rmSync(p, { force: true });
+      } catch {
+      }
     }
   }
 }
 
 export function pruneStaleSessions(now: number): void {
-  pruneDeadState();
-  const dir = join(paths.home, "sessions");
-  if (!existsSync(dir)) return;
-  for (const f of readdirSync(dir)) {
-    const p = join(dir, f);
+  let root: string;
+  try {
+    root = realpathSync(paths.home);
+  } catch {
+    return;
+  }
+  pruneDeadState(now, root);
+  const dir = sessionsDir();
+  for (const f of listDir(dir, root)) {
+    const p = join(dir, f.name);
     try {
       if (now - statSync(p).mtimeMs > SESSION_RETENTION_MS) rmSync(p, { force: true });
     } catch {