tokenmaxxing 1.71.0 → 1.72.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokenmaxxing",
-  "version": "1.71.0",
+  "version": "1.72.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",
@@ -19,7 +19,7 @@
     "DESIGN.md"
   ],
   "engines": {
-    "bun": ">=1.3.6"
+    "bun": ">=1.3.7"
   },
   "os": [
     "darwin",

package/src/cli/status.ts

@@ -138,35 +138,6 @@ const NOTE_INDENT = "    ";
 type Note = { paint: (s: string) => string; text: string };
 type Card = { lines: string[]; notes: Note[] };
 
-function splitToWidth(token: string, width: number): string[] {
-  const parts: string[] = [];
-  let part = "";
-  for (const ch of token) {
-    if (part !== "" && Bun.stringWidth(part + ch) > width) {
-      parts.push(part);
-      part = "";
-    }
-    part += ch;
-  }
-  if (part !== "") parts.push(part);
-  return parts;
-}
-
-function wrapWords(text: string, width: number): string[] {
-  const out: string[] = [];
-  let line = "";
-  for (const word of text.split(" ").flatMap((token) => splitToWidth(token, width))) {
-    if (line !== "" && Bun.stringWidth(`${line} ${word}`) > width) {
-      out.push(line);
-      line = word;
-    } else {
-      line = line === "" ? word : `${line} ${word}`;
-    }
-  }
-  if (line !== "") out.push(line);
-  return out;
-}
-
 function renderGrid(cards: Card[]): void {
   const bodyWidth = Math.max(...cards.flatMap((card) => card.lines.map((line) => Bun.stringWidth(line))));
   const termWidth = process.stdout.isTTY ? process.stdout.columns : Number.POSITIVE_INFINITY;
@@ -174,7 +145,7 @@ function renderGrid(cards: Card[]): void {
   const cellWidth = columns === 1 ? termWidth : Math.floor((termWidth + CARD_GAP) / columns) - CARD_GAP;
   const blocks = cards.map((card) => [
     ...card.lines,
-    ...card.notes.flatMap((note) => wrapWords(note.text, cellWidth - NOTE_INDENT.length).map((line) => `${NOTE_INDENT}${note.paint(line)}`)),
+    ...card.notes.flatMap((note) => Bun.wrapAnsi(note.text, cellWidth - NOTE_INDENT.length, { hard: true }).split("\n").map((line) => `${NOTE_INDENT}${note.paint(line)}`)),
   ]);
   const width = Math.max(...blocks.flat().map((line) => Bun.stringWidth(line)));
   for (const rowBlocks of chunk(blocks, columns)) {

package/src/lib/claudebin.ts

@@ -93,14 +93,14 @@ export function resolveRealClaude(): string {
 
 export function verifyRealClaude(bin: string): string | null {
   const env = { ...process.env, [WRAP_DEPTH_ENV]: String(MAX_WRAP_DEPTH), TOKENMAXXING_PROBE: "1" };
-  let p: ReturnType<typeof Bun.spawnSync>;
+  let p;
   try {
     p = Bun.spawnSync([bin, "--version"], { env, stdout: "pipe", stderr: "pipe", timeout: 15_000, killSignal: "SIGKILL" });
   } catch (e) {
     return errorMessage(e);
   }
-  const outText = (p.stdout?.toString() ?? "").trim();
-  const err = (p.stderr?.toString() ?? "").trim();
+  const outText = p.stdout.toString().trim();
+  const err = p.stderr.toString().trim();
   if (p.exitCode === 0) {
     if (/claude/i.test(outText)) return null;
     return `--version output does not identify claude: "${outText.slice(0, 80)}"`;

package/src/lib/codexbin.ts

@@ -38,14 +38,14 @@ export function resolveRealCodex(): string {
 
 export function verifyRealCodex(input: { bin: string }): string | null {
   const env = { ...process.env, [WRAP_DEPTH_ENV]: String(MAX_WRAP_DEPTH), TOKENMAXXING_PROBE: "1" };
-  let p: ReturnType<typeof Bun.spawnSync>;
+  let p;
   try {
     p = Bun.spawnSync([input.bin, "--version"], { env, stdout: "pipe", stderr: "pipe", timeout: 15_000, killSignal: "SIGKILL" });
   } catch (e) {
     return errorMessage(e);
   }
-  const outText = (p.stdout?.toString() ?? "").trim();
-  const err = (p.stderr?.toString() ?? "").trim();
+  const outText = p.stdout.toString().trim();
+  const err = p.stderr.toString().trim();
   if (p.exitCode === 0) {
     if (outText.toLowerCase().includes("codex")) return null;
     return `--version output does not identify codex: "${outText.slice(0, 80)}"`;

package/src/lib/install.ts

@@ -1,4 +1,5 @@
 import { accessSync, appendFileSync, constants, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, statSync } from "node:fs";
+import { userInfo } from "node:os";
 import { basename, dirname, join, resolve } from "node:path";
 import { escape } from "es-toolkit";
 import { z } from "zod";
@@ -215,9 +216,8 @@ function launchdPlist(label: string): string {
   return join(paths.launchdAgentsDir, `${label}.plist`);
 }
 
-function launchdDomain(): string | null {
-  const uid = process.getuid?.();
-  return uid == null ? null : `gui/${uid}`;
+function launchdDomain(): string {
+  return `gui/${userInfo().uid}`;
 }
 
 function run(cmd: string[]): boolean {
@@ -258,7 +258,6 @@ ${launchdEnv()}  <key>StandardOutPath</key><string>/dev/null</string>
       0o644,
     );
     const domain = launchdDomain();
-    if (domain == null) return false;
     run(["launchctl", "bootout", `${domain}/${LAUNCHD_LABEL}`]);
     return run(["launchctl", "bootstrap", domain, plist]) || checkTimerHealthy();
   }
@@ -313,8 +312,7 @@ export function hubActivationHint(): string {
 export function checkTimerHealthy(): boolean {
   if (skipImperativeTimer()) return true;
   if (process.platform === "darwin") {
-    const domain = launchdDomain();
-    return existsSync(launchdPlist(LAUNCHD_LABEL)) && domain != null && run(["launchctl", "print", `${domain}/${LAUNCHD_LABEL}`]);
+    return existsSync(launchdPlist(LAUNCHD_LABEL)) && run(["launchctl", "print", `${launchdDomain()}/${LAUNCHD_LABEL}`]);
   }
   return (
     existsSync(join(paths.systemdUserDir, "tokenmaxxing-check.timer")) &&
@@ -325,8 +323,7 @@ export function checkTimerHealthy(): boolean {
 export function hubServiceHealthy(): boolean {
   if (skipImperativeHub()) return true;
   if (process.platform === "darwin") {
-    const domain = launchdDomain();
-    return existsSync(launchdPlist(LAUNCHD_HUB_LABEL)) && domain != null && run(["launchctl", "print", `${domain}/${LAUNCHD_HUB_LABEL}`]);
+    return existsSync(launchdPlist(LAUNCHD_HUB_LABEL)) && run(["launchctl", "print", `${launchdDomain()}/${LAUNCHD_HUB_LABEL}`]);
   }
   return existsSync(join(paths.systemdUserDir, HUB_UNIT)) && run(["systemctl", "--user", "is-active", "--quiet", HUB_UNIT]);
 }
@@ -346,10 +343,8 @@ export function hubDeactivationHint(): string {
 }
 
 function launchdJobLoaded(label: string): "loaded" | "not-loaded" | "unavailable" {
-  const domain = launchdDomain();
-  if (domain == null) return "unavailable";
   try {
-    const { exitCode } = Bun.spawnSync(["launchctl", "print", `${domain}/${label}`], { stdout: "ignore", stderr: "ignore", timeout: 10_000 });
+    const { exitCode } = Bun.spawnSync(["launchctl", "print", `${launchdDomain()}/${label}`], { stdout: "ignore", stderr: "ignore", timeout: 10_000 });
     if (exitCode === 0) return "loaded";
     return exitCode === 113 ? "not-loaded" : "unavailable";
   } catch {
@@ -387,9 +382,8 @@ function uninstallCheckTimer(live: boolean): UnitOutcome {
     return "removed";
   }
   if (process.platform === "darwin") {
-    const domain = launchdDomain();
     const loaded = launchdJobLoaded(LAUNCHD_LABEL);
-    const deactivated = loaded === "loaded" && domain != null ? run(["launchctl", "bootout", `${domain}/${LAUNCHD_LABEL}`]) : loaded === "not-loaded";
+    const deactivated = loaded === "loaded" ? run(["launchctl", "bootout", `${launchdDomain()}/${LAUNCHD_LABEL}`]) : loaded === "not-loaded";
     removeTimerUnits();
     return deactivated ? "removed" : "still-loaded";
   }
@@ -423,7 +417,6 @@ ${launchdEnv()}  <key>StandardOutPath</key><string>/dev/null</string>
       0o644,
     );
     const domain = launchdDomain();
-    if (domain == null) return false;
     run(["launchctl", "bootout", `${domain}/${LAUNCHD_HUB_LABEL}`]);
     return run(["launchctl", "bootstrap", domain, plist]) || hubServiceHealthy();
   }
@@ -463,9 +456,8 @@ function uninstallHubService(live: boolean): UnitOutcome {
     return "removed";
   }
   if (process.platform === "darwin") {
-    const domain = launchdDomain();
     const loaded = launchdJobLoaded(LAUNCHD_HUB_LABEL);
-    const deactivated = loaded === "loaded" && domain != null ? run(["launchctl", "bootout", `${domain}/${LAUNCHD_HUB_LABEL}`]) : loaded === "not-loaded";
+    const deactivated = loaded === "loaded" ? run(["launchctl", "bootout", `${launchdDomain()}/${LAUNCHD_HUB_LABEL}`]) : loaded === "not-loaded";
     removeHubUnits();
     return deactivated ? "removed" : "still-loaded";
   }
@@ -562,7 +554,7 @@ export function removePathFromRc(rc: string): boolean {
 export type UninstallOutcome = { timer: UnitOutcome; hub: UnitOutcome; pathLineRemoved: boolean };
 
 export function loginHome(): string {
-  const cmd = process.platform === "darwin" ? ["id", "-P"] : ["getent", "passwd", String(process.getuid?.() ?? "")];
+  const cmd = process.platform === "darwin" ? ["id", "-P"] : ["getent", "passwd", String(userInfo().uid)];
   const proc = Bun.spawnSync(cmd, { stdout: "pipe", stderr: "ignore", timeout: 10_000 });
   const home = proc.stdout.toString().trim().split(":").at(-2);
   if (proc.exitCode !== 0 || home == null || home === "") throw new Error(`cannot read the login home: ${cmd.join(" ")} failed`);
@@ -576,11 +568,11 @@ export function onLoginHome(): boolean {
 export function uninstallTargets(live: boolean): string[] {
   const timer =
     process.platform === "darwin"
-      ? `${launchdPlist(LAUNCHD_LABEL)}${live ? ` (and launchctl bootout gui/${process.getuid?.() ?? "?"}/${LAUNCHD_LABEL})` : ""}`
+      ? `${launchdPlist(LAUNCHD_LABEL)}${live ? ` (and launchctl bootout ${launchdDomain()}/${LAUNCHD_LABEL})` : ""}`
       : `${join(paths.systemdUserDir, "tokenmaxxing-check.timer")} and .service${live ? " (and systemctl --user disable --now tokenmaxxing-check.timer)" : ""}`;
   const hub =
     process.platform === "darwin"
-      ? `${launchdPlist(LAUNCHD_HUB_LABEL)}${live ? ` (and launchctl bootout gui/${process.getuid?.() ?? "?"}/${LAUNCHD_HUB_LABEL})` : ""}`
+      ? `${launchdPlist(LAUNCHD_HUB_LABEL)}${live ? ` (and launchctl bootout ${launchdDomain()}/${LAUNCHD_HUB_LABEL})` : ""}`
       : `${join(paths.systemdUserDir, HUB_UNIT)}${live ? ` (and systemctl --user disable --now ${HUB_UNIT})` : ""}`;
   const rc = shellRcPath();
   return [

package/src/lib/statusonly.ts

@@ -104,7 +104,7 @@ export function statusOnlyProvider(spec: StatusOnlySpec): Provider {
   function preflight(): void {
     const real = resolveBin();
     const p = Bun.spawnSync([real, "--version"], { stdout: "pipe", stderr: "pipe", timeout: 15_000 });
-    if (p.exitCode !== 0 || !spec.versionOk(p.stdout?.toString() ?? "")) {
+    if (p.exitCode !== 0 || !spec.versionOk(p.stdout.toString())) {
       throw new Error(`${spec.binName} binary failed verification: ${real}`);
     }
     pinBinOverride({ key: spec.binKey, bin: real });

package/src/lib/tty.ts

@@ -1,6 +1,6 @@
 export function saveTermios(): string | null {
   const p = Bun.spawnSync(["/bin/sh", "-c", "stty -g </dev/tty"]);
-  const s = p.stdout?.toString().trim();
+  const s = p.stdout.toString().trim();
   return s && p.exitCode === 0 ? s : null;
 }