tokenmaxxing 1.70.0 → 1.72.0

package/package.json

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

@@ -1,10 +1,10 @@
-import { observeCodex } from "../lib/codex.ts";
+import { codexPickCtx, observeCodex } from "../lib/codex.ts";
 import { codexStoreUsable, ensureCodexStoreHome } from "../lib/codexauth.ts";
 import { withLock } from "../lib/lock.ts";
 import { log } from "../lib/log.ts";
 import { codexPaths, codexPool } from "../lib/paths.ts";
-import { livingPresences, writePresence } from "../lib/presence.ts";
-import { isExhausted, pickBest, thresholdBars, type PickCtx } from "../lib/picker.ts";
+import { livingPresences, seatCounts, writePresence } from "../lib/presence.ts";
+import { isExhausted, pickBest } from "../lib/picker.ts";
 import { loadAccounts, loadConfig } from "../lib/state.ts";
 import { emitError } from "./render.ts";
 
@@ -23,10 +23,9 @@ export async function cmdSeat(pidRaw: string | undefined, extra: string[]): Prom
       .map((a) => observeCodex(a, cfg, now, { probe: true, refresh: false })),
   );
   const granted = await withLock(codexPool.lockFile, (): { store: string; id: string; reused: boolean } | { denied: string } | null => {
-    const ctx: PickCtx = { now, thresholds: thresholdBars(loadConfig()), currentId: null, families: null, seats: null };
+    const ctx = codexPickCtx(now, null);
     const idx = loadAccounts(codexPool);
-    const living = livingPresences(codexPaths.presenceDir);
-    const held = living.find((p) => p.id === seatId);
+    const held = livingPresences(codexPaths.presenceDir).find((p) => p.id === seatId);
     const heldAccount = held ? (idx.accounts.find((x) => x.id === held.accountId) ?? null) : null;
     if (heldAccount) {
       if (heldAccount.needsReauth === true) {
@@ -37,8 +36,7 @@ export async function cmdSeat(pidRaw: string | undefined, extra: string[]): Prom
       }
       return { store: ensureCodexStoreHome(heldAccount.id), id: heldAccount.id, reused: true };
     }
-    const present = new Map<string, number>();
-    for (const p of living) present.set(p.accountId, (present.get(p.accountId) ?? 0) + 1);
+    const present = seatCounts(codexPaths.presenceDir);
     const usable = idx.accounts.filter(
       (a) => a.needsReauth !== true && !isExhausted(a, ctx) && !present.has(a.id) && codexStoreUsable(a.id)
     );

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/claude.ts

@@ -11,7 +11,7 @@ import { claudeTierLabel, describeIdentity, fetchTokenIdentity, isDeadCredential
 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";
+import { StoreUnusableError, type Observation, type Provider, type SampleReport } from "./provider.ts";
 import { foldTee, sampleAccountUsage, teeObservation, usageBlockedUntil } from "./sample.ts";
 import { clearUsageSnapshot, loadAccounts, loadConfig, loadUsageSnapshot, pinBinOverride, saveAccounts, type Harvest } from "./state.ts";
 import { saveTermios, restoreTermios } from "./tty.ts";
@@ -19,13 +19,6 @@ import { fetchUsageDirect, gatedFamilies, mergeWindows, modelFromFlag, scrubCred
 import { CredentialBlobSchema, JsonTextSchema, OAuthAccountSchema, type Account, type Config, type ModelInfo } from "./types.ts";
 import { c } from "../cli/render.ts";
 
-class StoreUnusableError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "StoreUnusableError";
-  }
-}
-
 function liveId(): string | null {
   return seatFromEnv(loadAccounts(claudePool).accounts.map((a) => a.id));
 }

package/src/lib/claudebin.ts

@@ -36,7 +36,7 @@ export function wrapperEntryRateTripped(now: number): boolean {
   return entries.length > WRAP_RATE_MAX;
 }
 
-function realpathOrNull(p: string): string | null {
+export function realpathOrNull(p: string): string | null {
   try {
     return realpathSync(p);
   } catch {
@@ -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/codex.ts

@@ -12,19 +12,12 @@ import { withLock } from "./lock.ts";
 import { errorMessage, log } from "./log.ts";
 import { codexPaths, codexPool, codexSeatFromEnv } from "./paths.ts";
 import { isExhausted, pickBest, pickEarliestReset, thresholdBars, type PickCtx } from "./picker.ts";
-import type { Observation, Provider, SampleReport } from "./provider.ts";
+import { StoreUnusableError, type Observation, type Provider, type SampleReport } from "./provider.ts";
 import { loadAccounts, loadConfig, pinBinOverride, saveAccounts, type Harvest } from "./state.ts";
 import { restoreTermios, saveTermios } from "./tty.ts";
 import type { Account, CodexAuthJson, CodexUsage, Config } from "./types.ts";
 import { c } from "../cli/render.ts";
 
-class StoreUnusableError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "StoreUnusableError";
-  }
-}
-
 function liveId(): string | null {
   return codexSeatFromEnv(loadAccounts(codexPool).accounts.map((a) => a.id));
 }

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/compact.ts

@@ -1,7 +1,6 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
 import { delay } from "es-toolkit";
 import { z } from "zod";
+import pkg from "../../package.json" with { type: "json" };
 import { errorMessage, log } from "./log.ts";
 import { readLines } from "./proc.ts";
 import { JsonTextSchema } from "./types.ts";
@@ -20,7 +19,7 @@ export async function compactClaudeSession(input: { real: string; sid: string; e
     timeout: CLAUDE_COMPACT_KILL_MS,
     killSignal: "SIGKILL",
   });
-  const reads = Promise.all([new Response(p.stdout).text(), new Response(p.stderr).text()]);
+  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)]);
   await p.exited;
   if (settled === null) return { ok: false, reason: "output pipes still open after child exit (leaked descendant)" };
@@ -48,9 +47,6 @@ const INIT_ID = 1;
 const RESUME_ID = 2;
 const COMPACT_ID = 3;
 
-const packageVersion = (): string =>
-  z.object({ version: z.string().min(1) }).parse(JSON.parse(readFileSync(join(import.meta.dir, "..", "..", "package.json"), "utf8"))).version;
-
 export async function compactCodexThread(input: { real: string; threadId: string; env: Record<string, string | undefined> }): Promise<CompactOutcome> {
   const p = Bun.spawn([input.real, "app-server"], {
     env: input.env,
@@ -64,7 +60,7 @@ export async function compactCodexThread(input: { real: string; threadId: string
     p.stdin.write(`${JSON.stringify(msg)}\n`);
     p.stdin.flush();
   };
-  const stderrText = new Response(p.stderr).text();
+  const stderrText = p.stderr.text();
 
   const outcome = await new Promise<CompactOutcome>((resolve) => {
     let finished = false;
@@ -109,7 +105,7 @@ export async function compactCodexThread(input: { real: string; threadId: string
       const err = (await stderrText).trim().slice(0, 200);
       finish({ ok: false, reason: p.exitCode === null ? `app-server killed after ${CODEX_COMPACT_KILL_MS / 1000}s` : `app-server exited ${p.exitCode}: ${err}` });
     })().catch((e) => finish({ ok: false, reason: errorMessage(e) }));
-    send({ id: INIT_ID, method: "initialize", params: { clientInfo: { name: "tokenmaxxing", version: packageVersion() } } });
+    send({ id: INIT_ID, method: "initialize", params: { clientInfo: { name: "tokenmaxxing", version: pkg.version } } });
   });
 
   try {

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";
@@ -171,7 +172,7 @@ export function codexStopHookGroupIndex(): number | null {
   } catch {
     return null;
   }
-  const idx = parsed.hooks.Stop.findIndex((group) => group.hooks.some((hook) => (hook.command ?? "").includes(CODEX_STOP_HOOK_SUBCOMMAND)));
+  const idx = parsed.hooks.Stop.findIndex((group) => group.hooks.some((hook) => isOurHookCommand(hook.command ?? "", CODEX_STOP_HOOK_SUBCOMMAND)));
   return idx >= 0 ? idx : null;
 }
 
@@ -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/keychain.ts

@@ -16,7 +16,7 @@ export async function readItem(t: KeychainTarget): Promise<string | null> {
     stdout: "pipe",
     stderr: "pipe",
   });
-  const [out, err] = await Promise.all([new Response(p.stdout).text(), new Response(p.stderr).text()]);
+  const [out, err] = await Promise.all([p.stdout.text(), p.stderr.text()]);
   await p.exited;
   if (p.exitCode === 44) return null;
   if (p.exitCode !== 0) {
@@ -38,7 +38,7 @@ async function writeViaInteractive(encodedLine: Uint8Array): Promise<void> {
     stdout: "ignore",
     stderr: "pipe",
   });
-  const err = await new Response(p.stderr).text();
+  const err = await p.stderr.text();
   await p.exited;
   if (p.exitCode !== 0) throw new Error(`keychain write (interactive) failed (exit ${p.exitCode}): ${err.trim()}`);
 }
@@ -48,7 +48,7 @@ async function writeViaArgv(t: KeychainTarget, secret: string): Promise<void> {
     stdout: "ignore",
     stderr: "pipe",
   });
-  const err = await new Response(p.stderr).text();
+  const err = await p.stderr.text();
   await p.exited;
   if (p.exitCode !== 0) throw new Error(`keychain write (argv) failed (exit ${p.exitCode}): ${err.trim()}`);
 }

package/src/lib/opencodego.ts

@@ -1,9 +1,8 @@
 import { mkdirSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
 import { z } from "zod";
 import { writeFileAtomic } from "./atomic.ts";
-import { opencodeGoAuthJsonFor, opencodeGoPaths, opencodeGoPool, opencodeGoStoreDirFor } from "./paths.ts";
+import { env, HOME, opencodeGoAuthJsonFor, opencodeGoPaths, opencodeGoPool, opencodeGoStoreDirFor } from "./paths.ts";
 import type { Provider } from "./provider.ts";
 import { type Harvest } from "./state.ts";
 import { statusOnlyProvider, type AuthEntry } from "./statusonly.ts";
@@ -12,12 +11,8 @@ import { c } from "../cli/render.ts";
 const OpencodeAuthEntrySchema = z.looseObject({ type: z.string(), key: z.string().optional() });
 const OpencodeAuthFileSchema = z.record(z.string(), z.unknown());
 
-function dataHome(): string {
-  return process.env.XDG_DATA_HOME && process.env.XDG_DATA_HOME.length > 0 ? process.env.XDG_DATA_HOME : join(homedir(), ".local", "share");
-}
-
 function liveAuthPath(): string {
-  return join(dataHome(), "opencode", "auth.json");
+  return join(env("XDG_DATA_HOME", join(HOME, ".local", "share")), "opencode", "auth.json");
 }
 
 function idOfKey(key: string): string {

package/src/lib/provider.ts

@@ -8,6 +8,13 @@ export type SampleReport = { ok: true; source: "statusline" | "probe" } | { ok:
 
 export type SwapFailure = "dead-grant" | "skip" | "fatal";
 
+export class StoreUnusableError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "StoreUnusableError";
+  }
+}
+
 export type Provider = {
   name: "claude" | "codex" | "grok" | "opencode-go";
   flag: string;

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;
 }
 

package/src/lib/update.ts

@@ -1,7 +1,8 @@
-import { existsSync, lstatSync, readFileSync, realpathSync } from "node:fs";
+import { existsSync, lstatSync, readFileSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 import { z } from "zod";
 import { writeFileAtomic } from "./atomic.ts";
+import { realpathOrNull } from "./claudebin.ts";
 import { http } from "./http.ts";
 import { isNixPackaged } from "./install.ts";
 import { withLock } from "./lock.ts";
@@ -29,14 +30,6 @@ function registry(): { base: URL; authorization: string | null } {
   return { base, authorization };
 }
 
-function realOrNull(path: string): string | null {
-  try {
-    return realpathSync(path);
-  } catch {
-    return null;
-  }
-}
-
 function globalRootCandidates(): string[] {
   const globalDir = optionalEnv("BUN_INSTALL_GLOBAL_DIR");
   const bunInstall = optionalEnv("BUN_INSTALL");
@@ -63,12 +56,12 @@ function registryPackageDir(root: string): string | null {
 
 function detectGlobalRoot(): string | null {
   if (isNixPackaged()) return null;
-  const entry = realOrNull(Bun.main);
+  const entry = realpathOrNull(Bun.main);
   if (entry == null) return null;
   return (
     globalRootCandidates().find((root) => {
       const dir = registryPackageDir(root);
-      return dir != null && entry === realOrNull(join(dir, "src", "main.ts"));
+      return dir != null && entry === realpathOrNull(join(dir, "src", "main.ts"));
     }) ?? null
   );
 }