tokenmaxxing 1.101.0 → 1.103.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.101.0",
+  "version": "1.103.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/codex.ts

@@ -1,5 +1,6 @@
 import { existsSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
+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";
@@ -189,11 +190,13 @@ async function importLive(): Promise<Harvest | null> {
   return login();
 }
 
+const CodexStoreModeSchema = z.looseObject({ cli_auth_credentials_store: z.string().optional() });
+
 function storePinnedAwayFromFile(): boolean {
   const configToml = `${codexPaths.home}/config.toml`;
   if (!existsSync(configToml)) return false;
-  const config = Bun.TOML.parse(readFileSync(configToml, "utf8"));
-  return "cli_auth_credentials_store" in config && config.cli_auth_credentials_store !== "file";
+  const store = CodexStoreModeSchema.parse(Bun.TOML.parse(readFileSync(configToml, "utf8"))).cli_auth_credentials_store;
+  return store !== undefined && store !== "file";
 }
 
 function preflight(): void {

package/src/lib/grok.ts

@@ -1,4 +1,3 @@
-import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
 import { writeFileAtomic } from "./atomic.ts";
@@ -6,9 +5,9 @@ import { fetchGrokUsage, GrokUsageReadError, type GrokUsage } from "./grokusage.
 import { errorMessage } from "./log.ts";
 import { grokAuthJsonFor, grokPaths, grokPool, grokSeatFromEnv, grokStoreDirFor } from "./paths.ts";
 import type { Provider, SampleReport } from "./provider.ts";
-import { loadAccounts, type Harvest } from "./state.ts";
+import { loadAccounts, readJsonFile, type Harvest } from "./state.ts";
 import { statusOnlyProvider, type AuthEntry } from "./statusonly.ts";
-import { InstantSchema, type Account } from "./types.ts";
+import { ErrnoSchema, InstantSchema, type Account } from "./types.ts";
 import { c } from "../cli/render.ts";
 
 const GrokAuthEntrySchema = z.looseObject({
@@ -37,16 +36,15 @@ function harvestOf(id: string, key: string, entry: GrokAuthEntry): Harvest {
 }
 
 function readMap(path: string): [string, GrokAuthEntry][] {
-  let raw: unknown;
+  let map: Record<string, unknown>;
   try {
-    raw = JSON.parse(readFileSync(path, "utf8"));
-  } catch {
-    return [];
+    map = readJsonFile(path, z.record(z.string(), z.unknown()));
+  } catch (e) {
+    if (ErrnoSchema.safeParse(e).data?.code === "ENOENT") return [];
+    throw e;
   }
-  const map = z.record(z.string(), z.unknown()).safeParse(raw);
-  if (!map.success) return [];
   const out: [string, GrokAuthEntry][] = [];
-  for (const [key, value] of Object.entries(map.data)) {
+  for (const [key, value] of Object.entries(map)) {
     const parsed = GrokAuthEntrySchema.safeParse(value);
     if (!parsed.success) continue;
     out.push([key, parsed.data]);

package/src/lib/opencodego.ts

@@ -1,11 +1,11 @@
-import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
 import { writeFileAtomic } from "./atomic.ts";
 import { env, HOME, opencodeGoAuthJsonFor, opencodeGoPaths, opencodeGoPool, opencodeGoStoreDirFor } from "./paths.ts";
 import type { Provider } from "./provider.ts";
-import { type Harvest } from "./state.ts";
+import { readJsonFile, type Harvest } from "./state.ts";
 import { statusOnlyProvider, type AuthEntry } from "./statusonly.ts";
+import { ErrnoSchema } from "./types.ts";
 import { c } from "../cli/render.ts";
 
 const OpencodeAuthEntrySchema = z.looseObject({ type: z.string(), key: z.string().optional() });
@@ -35,15 +35,14 @@ function harvestOf(key: string): Harvest {
 }
 
 function readAuth(path: string): AuthEntry[] {
-  let raw: unknown;
+  let map: z.infer<typeof OpencodeAuthFileSchema>;
   try {
-    raw = JSON.parse(readFileSync(path, "utf8"));
-  } catch {
-    return [];
+    map = readJsonFile(path, OpencodeAuthFileSchema);
+  } catch (e) {
+    if (ErrnoSchema.safeParse(e).data?.code === "ENOENT") return [];
+    throw e;
   }
-  const map = OpencodeAuthFileSchema.safeParse(raw);
-  if (!map.success) return [];
-  const entry = OpencodeAuthEntrySchema.safeParse(map.data["opencode-go"]);
+  const entry = OpencodeAuthEntrySchema.safeParse(map["opencode-go"]);
   if (!entry.success || entry.data.type !== "api" || !entry.data.key) return [];
   return [{ id: idOfKey(entry.data.key), usable: true, harvest: harvestOf(entry.data.key) }];
 }