claude-switcher-account 2.2.0 → 2.3.0

package/README.md

@@ -30,13 +30,11 @@ npm i -g claude-switcher-account
 
 (The npm package is `claude-switcher-account`; the command it installs is `claudep`.)
 
-From source or git (the `prepare` script builds automatically):
+From source (the `prepare` script builds automatically):
 
 ```bash
-npm i -g git+https://github.com/khainguyenhm-itr/claude-switcher-account.git
-# or, from a local clone:
-git clone https://github.com/khainguyenhm-itr/claude-switcher-account.git
-cd claude-switcher-account && npm i -g .
+# from a local clone of the sources:
+npm i -g .
 ```
 
 Verify with `claudep doctor`. On macOS the first run may raise a Keychain
@@ -88,6 +86,18 @@ or `NO_COLOR` is set.
 
 Global flags: `--json` (on `list`), `--version`, `--help`.
 
+`claudep list` and the menu show each account's plan usage, the same numbers as
+Claude Code's `/usage`:
+
+```
+   5h: 40.0%  Reset: 55m
+   Weekly: 12.0%  Weekly Reset: 5d 9hr 45m
+```
+
+They are fetched live from Anthropic with each account's saved token. An account
+whose token has expired, or any fetch that fails, shows `--`; tokens are never
+refreshed by claudep.
+
 ### Interactive menu
 
 Running `claudep` with no arguments (in a terminal) opens a menu of your saved
@@ -139,6 +149,8 @@ Configured in `~/.claude-profiles/config.json`:
 - **Linux/Windows**: canonical login file `~/.claude/.credentials.json`; saved
   accounts in `~/.claude-profiles/creds.json` (mode `0600`).
 - Account metadata: `~/.claude-profiles/accounts.json`.
+- `CLAUDE_CONFIG_DIR` is not supported: only the default `~/.claude` login is
+  managed, and `claudep doctor` flags the variable when it is set.
 
 On macOS the first read of Claude's Keychain item may raise an "allow access"
 dialog — click Allow. Run `claudep doctor` if anything looks off.

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // src/cli.ts
-import { Command } from "commander";
+import { Command, CommanderError } from "commander";
 import { createInterface as createInterface2 } from "readline/promises";
 import { homedir as homedir5 } from "os";
 import { join as join6 } from "path";
@@ -19,10 +19,14 @@ import { promisify } from "util";
 var execFileP = promisify(execFile);
 var CLAUDE_SERVICE = "Claude Code-credentials";
 var STORE_SERVICE = "claude-profiles-accounts";
-var defaultExec = async (args) => {
-  const { stdout } = await execFileP("security", args);
+var defaultExec = async (args, input) => {
+  const p = execFileP("security", args);
+  p.child.stdin?.end(input ?? "");
+  const { stdout } = await p;
   return stdout;
 };
+var INTERACTIVE_MAX_LINE = 4e3;
+var quote = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
 var MacKeychainStore = class {
   exec;
   osUsername;
@@ -43,8 +47,18 @@ var MacKeychainStore = class {
       return "";
     }
   }
+  /** Upsert a secret, keeping it off the argv (visible to `ps`) whenever it fits on one `security -i` line. */
+  async addPassword(service, account, blob) {
+    const line = `add-generic-password -U -s ${quote(service)} -a ${quote(account)} -w ${quote(blob)}
+`;
+    if (!/[\r\n]/.test(blob) && Buffer.byteLength(line) <= INTERACTIVE_MAX_LINE) {
+      await this.exec(["-i"], line);
+      return;
+    }
+    await this.exec(["add-generic-password", "-U", "-s", service, "-a", account, "-w", blob]);
+  }
   async writeCanonical(blob) {
-    await this.exec(["add-generic-password", "-U", "-s", CLAUDE_SERVICE, "-a", this.osUsername, "-w", blob]);
+    await this.addPassword(CLAUDE_SERVICE, this.osUsername, blob);
   }
   async readSaved(name) {
     try {
@@ -55,7 +69,7 @@ var MacKeychainStore = class {
     }
   }
   async writeSaved(name, blob) {
-    await this.exec(["add-generic-password", "-U", "-s", STORE_SERVICE, "-a", name, "-w", blob]);
+    await this.addPassword(STORE_SERVICE, name, blob);
   }
   async deleteSaved(name) {
     try {
@@ -66,8 +80,46 @@ var MacKeychainStore = class {
 };
 
 // src/stores/fileStore.ts
-import { mkdirSync, readFileSync, writeFileSync, renameSync, existsSync } from "fs";
+import { mkdirSync as mkdirSync2, readFileSync, writeFileSync, renameSync, existsSync } from "fs";
+import { dirname as dirname2 } from "path";
+
+// src/lock.ts
+import { mkdirSync, statSync, rmSync } from "fs";
 import { dirname } from "path";
+var LOCK_STALE_MS = 1e4;
+var LOCK_RETRY_MS = 25;
+var LOCK_TIMEOUT_MS = 5e3;
+var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+async function acquireLock(lockPath) {
+  mkdirSync(dirname(lockPath), { recursive: true });
+  const deadline = Date.now() + LOCK_TIMEOUT_MS;
+  for (; ; ) {
+    try {
+      mkdirSync(lockPath);
+      return;
+    } catch {
+      try {
+        if (Date.now() - statSync(lockPath).mtimeMs > LOCK_STALE_MS) {
+          rmSync(lockPath, { recursive: true, force: true });
+          continue;
+        }
+      } catch {
+      }
+      if (Date.now() > deadline) throw new Error(`Timed out acquiring lock ${lockPath}`);
+      await sleep(LOCK_RETRY_MS);
+    }
+  }
+}
+async function withLock(lockPath, fn) {
+  await acquireLock(lockPath);
+  try {
+    return await fn();
+  } finally {
+    rmSync(lockPath, { recursive: true, force: true });
+  }
+}
+
+// src/stores/fileStore.ts
 var FileStore = class {
   canonicalPath;
   credsPath;
@@ -81,19 +133,28 @@ var FileStore = class {
     return this.platform === "linux" || this.platform === "win32";
   }
   atomicWrite(path, data, mode) {
-    mkdirSync(dirname(path), { recursive: true });
+    mkdirSync2(dirname2(path), { recursive: true });
     const tmp = `${path}.tmp-${process.pid}`;
     writeFileSync(tmp, data, mode !== void 0 ? { mode } : void 0);
     renameSync(tmp, path);
   }
+  /** Throws if the file exists but can't be parsed, so a write never replaces it with an empty map. */
   readMap() {
     if (!existsSync(this.credsPath)) return {};
+    let parsed;
     try {
-      const parsed = JSON.parse(readFileSync(this.credsPath, "utf8"));
-      return parsed && typeof parsed === "object" ? parsed : {};
+      parsed = JSON.parse(readFileSync(this.credsPath, "utf8"));
     } catch {
-      return {};
+      parsed = null;
     }
+    if (!parsed || typeof parsed !== "object") throw new Error(`Saved creds file ${this.credsPath} is unreadable.`);
+    return parsed;
+  }
+  updateMap(mutate) {
+    return withLock(`${this.credsPath}.lock`, () => {
+      const map = this.readMap();
+      if (mutate(map)) this.atomicWrite(this.credsPath, JSON.stringify(map, null, 2), 384);
+    });
   }
   async readCanonical() {
     try {
@@ -106,18 +167,24 @@ var FileStore = class {
     this.atomicWrite(this.canonicalPath, blob, 384);
   }
   async readSaved(name) {
-    return this.readMap()[name] ?? "";
+    try {
+      return this.readMap()[name] ?? "";
+    } catch {
+      return "";
+    }
   }
   async writeSaved(name, blob) {
-    const map = this.readMap();
-    map[name] = blob;
-    this.atomicWrite(this.credsPath, JSON.stringify(map, null, 2), 384);
+    await this.updateMap((map) => {
+      map[name] = blob;
+      return true;
+    });
   }
   async deleteSaved(name) {
-    const map = this.readMap();
-    if (!(name in map)) return;
-    delete map[name];
-    this.atomicWrite(this.credsPath, JSON.stringify(map, null, 2), 384);
+    await this.updateMap((map) => {
+      if (!(name in map)) return false;
+      delete map[name];
+      return true;
+    });
   }
 };
 
@@ -134,12 +201,8 @@ function createCredentialStore(opts) {
 }
 
 // src/metadataStore.ts
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, renameSync as renameSync2, existsSync as existsSync2, statSync, rmSync } from "fs";
-import { dirname as dirname2 } from "path";
-var LOCK_STALE_MS = 1e4;
-var LOCK_RETRY_MS = 25;
-var LOCK_TIMEOUT_MS = 5e3;
-var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync2, renameSync as renameSync2, existsSync as existsSync2 } from "fs";
+import { dirname as dirname3 } from "path";
 var MetadataStore = class {
   path;
   lockPath;
@@ -151,53 +214,34 @@ var MetadataStore = class {
     if (!existsSync2(this.path)) return { accounts: [] };
     try {
       const parsed = JSON.parse(readFileSync2(this.path, "utf8"));
-      return { lastActive: parsed?.lastActive, accounts: Array.isArray(parsed?.accounts) ? parsed.accounts : [] };
+      return {
+        lastActive: parsed?.lastActive,
+        pendingRefresh: parsed?.pendingRefresh,
+        accounts: Array.isArray(parsed?.accounts) ? parsed.accounts : []
+      };
     } catch {
       return { accounts: [] };
     }
   }
-  async acquireLock() {
-    mkdirSync2(dirname2(this.lockPath), { recursive: true });
-    const deadline = Date.now() + LOCK_TIMEOUT_MS;
-    for (; ; ) {
-      try {
-        mkdirSync2(this.lockPath);
-        return;
-      } catch {
-        try {
-          if (Date.now() - statSync(this.lockPath).mtimeMs > LOCK_STALE_MS) {
-            rmSync(this.lockPath, { recursive: true, force: true });
-            continue;
-          }
-        } catch {
-        }
-        if (Date.now() > deadline) throw new Error(`Timed out acquiring lock ${this.lockPath}`);
-        await sleep(LOCK_RETRY_MS);
-      }
-    }
-  }
-  releaseLock() {
-    rmSync(this.lockPath, { recursive: true, force: true });
-  }
   async update(mutator) {
-    await this.acquireLock();
-    try {
+    return withLock(this.lockPath, () => {
       const data = this.read();
       mutator(data);
-      mkdirSync2(dirname2(this.path), { recursive: true });
+      mkdirSync3(dirname3(this.path), { recursive: true });
       const tmp = `${this.path}.tmp-${process.pid}`;
-      writeFileSync2(tmp, JSON.stringify({ lastActive: data.lastActive, accounts: data.accounts }, null, 2));
+      writeFileSync2(
+        tmp,
+        JSON.stringify({ lastActive: data.lastActive, pendingRefresh: data.pendingRefresh, accounts: data.accounts }, null, 2)
+      );
       renameSync2(tmp, this.path);
       return data;
-    } finally {
-      this.releaseLock();
-    }
+    });
   }
 };
 
 // src/profileFile.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3, renameSync as renameSync3 } from "fs";
-import { dirname as dirname3 } from "path";
+import { mkdirSync as mkdirSync4, readFileSync as readFileSync3, writeFileSync as writeFileSync3, renameSync as renameSync3 } from "fs";
+import { dirname as dirname4 } from "path";
 var ProfileFile = class {
   path;
   constructor(opts) {
@@ -241,7 +285,7 @@ var ProfileFile = class {
     if (snapshot) d.oauthAccount = snapshot;
     else delete d.oauthAccount;
     try {
-      mkdirSync3(dirname3(this.path), { recursive: true });
+      mkdirSync4(dirname4(this.path), { recursive: true });
       const tmp = `${this.path}.tmp-${process.pid}`;
       writeFileSync3(tmp, JSON.stringify(d, null, 2));
       renameSync3(tmp, this.path);
@@ -285,6 +329,7 @@ function orderAccounts(views) {
 }
 
 // src/accountManager.ts
+var REFRESH_CONFIRM_MS = 1e4;
 function toView(a, active) {
   return {
     name: a.name,
@@ -301,12 +346,14 @@ var AccountManager = class {
   profile;
   config;
   now;
+  clock;
   constructor(deps) {
     this.store = deps.store;
     this.meta = deps.meta;
     this.profile = deps.profile;
     this.config = deps.config;
     this.now = deps.now ?? (() => (/* @__PURE__ */ new Date()).toISOString());
+    this.clock = deps.clock ?? Date.now;
   }
   matchByIdentity(accounts, id) {
     if (id.uuid) {
@@ -365,7 +412,25 @@ var AccountManager = class {
     const ordered = orderAccounts(await this.listAccounts());
     return ordered[n - 1]?.name ?? null;
   }
+  /** Before the login is replaced, copy a token the active account rotated since its last save — reconcile
+   *  may still be waiting out REFRESH_CONFIRM_MS on it. Skipped when the credential is another saved
+   *  account's, i.e. a login-over whose ~/.claude.json write hasn't landed. */
+  async keepActiveCredential() {
+    let blob = "";
+    try {
+      blob = await this.store.readCanonical();
+    } catch {
+      return;
+    }
+    if (!blob) return;
+    const fp = fingerprint(blob);
+    const accounts = this.meta.read().accounts;
+    if (accounts.some((a) => a.fingerprint === fp)) return;
+    const active = this.matchByIdentity(accounts, this.profile.currentIdentity());
+    if (active) await this.refreshStoredCredential(active.name, blob, fp);
+  }
   async switchTo(name) {
+    await this.keepActiveCredential();
     const blob = (await this.store.readSaved(name)).trim();
     if (!blob) throw new Error(`Saved account '${name}' not found.`);
     await this.store.writeCanonical(blob);
@@ -385,7 +450,8 @@ var AccountManager = class {
     if (!entry) throw new Error(`Saved account '${oldName}' not found.`);
     if (data.accounts.some((a) => a.name === newName)) throw new Error(`Account '${newName}' already exists.`);
     const blob = await this.store.readSaved(oldName);
-    if (blob) await this.store.writeSaved(newName, blob);
+    if (!blob) throw new Error(`Saved account '${oldName}' has no stored credential.`);
+    await this.store.writeSaved(newName, blob);
     await this.store.deleteSaved(oldName);
     await this.meta.update((d) => {
       d.accounts = d.accounts.map((a) => a.name === oldName ? { ...a, name: newName } : a);
@@ -403,6 +469,14 @@ var AccountManager = class {
     }
     return accounts.map((a) => toView(a, byId ? a.name === byId.name : activeFp !== null && a.fingerprint === activeFp));
   }
+  /** The account's credential: the live login for the active one (its saved copy may be older), else the saved one. */
+  async credentialOf(view) {
+    try {
+      return view.active ? await this.store.readCanonical() : await this.store.readSaved(view.name);
+    } catch {
+      return "";
+    }
+  }
   current() {
     const label = this.profile.peekLabel();
     const accounts = this.meta.read().accounts;
@@ -492,16 +566,30 @@ var AccountManager = class {
       const accounts = this.meta.read().accounts;
       const known = this.matchByIdentity(accounts, this.profile.currentIdentity()) ?? accounts.find((a) => a.fingerprint === fpNow);
       if (known) {
+        const nowMs = this.clock();
+        let confirmed = false;
         await this.meta.update((d) => {
           d.lastActive = known.name;
+          if (known.fingerprint === fpNow) {
+            d.pendingRefresh = void 0;
+            return;
+          }
+          const p = d.pendingRefresh;
+          if (p?.name !== known.name || p.fingerprint !== fpNow) {
+            d.pendingRefresh = { name: known.name, fingerprint: fpNow, since: nowMs };
+          } else if (nowMs - p.since >= REFRESH_CONFIRM_MS) {
+            d.pendingRefresh = void 0;
+            confirmed = true;
+          }
         });
-        if (known.fingerprint !== fpNow) await this.refreshStoredCredential(known.name, blob, fpNow);
+        if (confirmed) await this.refreshStoredCredential(known.name, blob, fpNow);
         return nothing;
       }
       const saved = await this.autoSaveIfNewLogin();
       if (saved) {
         await this.meta.update((d) => {
           d.lastActive = saved.name;
+          d.pendingRefresh = void 0;
         });
       }
       return { autoSaved: saved, removed: null, switchedTo: null };
@@ -522,6 +610,68 @@ function createManager(env) {
   return new AccountManager({ store, meta, profile, config });
 }
 
+// src/usage.ts
+var USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
+var TIMEOUT_MS = 3e3;
+function accessTokenOf(blob, nowMs) {
+  try {
+    const o = JSON.parse(blob)?.claudeAiOauth;
+    if (typeof o?.accessToken !== "string") return null;
+    if (typeof o.expiresAt === "number" && o.expiresAt <= nowMs) return null;
+    return o.accessToken;
+  } catch {
+    return null;
+  }
+}
+function parseWindow(w) {
+  const o = w;
+  if (typeof o?.utilization !== "number") return null;
+  const t = typeof o.resets_at === "string" ? Date.parse(o.resets_at) : NaN;
+  return { pct: o.utilization, resetsAt: Number.isNaN(t) ? null : t };
+}
+function parseUsage(json) {
+  if (!json || typeof json !== "object") return null;
+  const o = json;
+  return { fiveHour: parseWindow(o.five_hour), weekly: parseWindow(o.seven_day) };
+}
+async function fetchUsage(token, fetchFn = fetch) {
+  try {
+    const res = await fetchFn(USAGE_URL, {
+      headers: { Authorization: `Bearer ${token}`, "anthropic-beta": "oauth-2025-04-20" },
+      signal: AbortSignal.timeout(TIMEOUT_MS)
+    });
+    if (!res.ok) return null;
+    return parseUsage(await res.json());
+  } catch {
+    return null;
+  }
+}
+async function loadUsage(mgr, views, nowMs, fetchFn = fetchUsage) {
+  const entries = await Promise.all(
+    views.map(async (v) => {
+      const token = accessTokenOf(await mgr.credentialOf(v), nowMs);
+      return [v.name, token ? await fetchFn(token) : null];
+    })
+  );
+  return Object.fromEntries(entries);
+}
+function formatDuration(ms) {
+  const totalMin = Math.floor(Math.max(0, ms) / 6e4);
+  const d = Math.floor(totalMin / 1440);
+  const h = Math.floor(totalMin % 1440 / 60);
+  const m = totalMin % 60;
+  const parts = [d && `${d}d`, h && `${h}hr`, m && `${m}m`].filter(Boolean);
+  return parts.length ? parts.join(" ") : "<1m";
+}
+function formatUsageLines(u, nowMs) {
+  const pct = (w) => w ? `${w.pct.toFixed(1)}%` : "--";
+  const reset = (w) => w?.resetsAt != null ? formatDuration(w.resetsAt - nowMs) : "--";
+  return [
+    `5h: ${pct(u?.fiveHour)}  Reset: ${reset(u?.fiveHour)}`,
+    `Weekly: ${pct(u?.weekly)}  Weekly Reset: ${reset(u?.weekly)}`
+  ];
+}
+
 // src/format.ts
 var SYMBOLS = { active: "\u25CF", ok: "\u2713", err: "\u2717", warn: "!", off: "\u25CB" };
 function formatRelative(iso, nowMs) {
@@ -562,13 +712,16 @@ function formatList(views, nowMs, colors, opts = {}) {
   const idxW = String(ordered.length).length;
   const emailW = Math.max(...ordered.map((v) => v.email.length));
   const orgW = Math.min(ORG_MAX, Math.max(...ordered.map((v) => (v.organizationName ?? "\u2014").length)));
-  const rows = ordered.map((v, i) => {
+  const usageIndent = " ".repeat(2 + idxW + 4);
+  const rows = ordered.flatMap((v, i) => {
     const idx = colors.dim(pad(String(i + 1), idxW));
     const mark = v.active ? colors.green(SYMBOLS.active) : " ";
     const email = v.active ? colors.green(pad(v.email, emailW)) : pad(v.email, emailW);
     const org = colors.dim(pad(truncate(v.organizationName ?? "\u2014", ORG_MAX), orgW));
     const when = v.active ? colors.green("active") : colors.dim(formatRelative(v.savedAt, nowMs));
-    return `  ${idx}  ${mark} ${email}  ${org}  ${when}`;
+    const row = `  ${idx}  ${mark} ${email}  ${org}  ${when}`;
+    if (!opts.usage) return [row];
+    return [row, ...formatUsageLines(opts.usage[v.name] ?? null, nowMs).map((l) => colors.dim(usageIndent + l))];
   });
   const lines = [header, colors.dim("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"), ...rows, ""];
   if (opts.external) {
@@ -608,7 +761,15 @@ async function runDoctor(deps, colors = makeColors(false)) {
         label: "credential backend",
         detail: deps.store.isAvailable() ? "available" : "unavailable",
         hint: "This OS/backend is not supported yet."
-      }
+      },
+      ...deps.claudeConfigDir ? [
+        {
+          ok: false,
+          label: "CLAUDE_CONFIG_DIR",
+          detail: `${deps.claudeConfigDir} (not supported)`,
+          hint: "claudep only manages the default ~/.claude login; unset CLAUDE_CONFIG_DIR to use it."
+        }
+      ] : []
     ]
   });
   const blob = await deps.store.readCanonical().catch(() => "");
@@ -671,14 +832,15 @@ function buildDoctorDeps(env) {
     profile: new ProfileFile({ path: join3(home, ".claude.json") }),
     meta: new MetadataStore({ path: join3(home, ".claude-profiles", "accounts.json") }),
     config: new ConfigStore({ path: join3(home, ".claude-profiles", "config.json") }).load(),
-    platform
+    platform,
+    claudeConfigDir: process.env.CLAUDE_CONFIG_DIR || void 0
   };
 }
 
 // package.json
 var package_default = {
   name: "claude-switcher-account",
-  version: "2.2.0",
+  version: "2.3.0",
   description: "Switch between multiple Claude Code accounts from your terminal.",
   keywords: [
     "claude",
@@ -696,14 +858,6 @@ var package_default = {
     "cli",
     "developer-tools"
   ],
-  homepage: "https://github.com/khainguyenhm-itr/claude-switcher-account#readme",
-  repository: {
-    type: "git",
-    url: "git+https://github.com/khainguyenhm-itr/claude-switcher-account.git"
-  },
-  bugs: {
-    url: "https://github.com/khainguyenhm-itr/claude-switcher-account/issues"
-  },
   license: "MIT",
   author: "khainguyenhm-itr",
   type: "module",
@@ -778,7 +932,7 @@ import { createInterface } from "readline/promises";
 function pad2(s, width) {
   return s.length >= width ? s : s + " ".repeat(width - s.length);
 }
-function buildMenuChoices(accounts) {
+function buildMenuChoices(accounts, usage, nowMs = Date.now()) {
   const ordered = orderAccounts(accounts);
   if (!ordered.length) return [];
   const emailW = Math.max(...ordered.map((a) => a.email.length));
@@ -788,7 +942,8 @@ function buildMenuChoices(accounts) {
     const org = a.organizationName ? `  ${a.organizationName}` : "";
     return {
       label: `${i + 1}  ${mark} ${pad2(a.email, emailW)}${org}  ${when}`,
-      action: { type: "switch", name: a.name }
+      action: { type: "switch", name: a.name },
+      ...usage && { detail: formatUsageLines(usage[a.name] ?? null, nowMs) }
     };
   });
 }
@@ -802,7 +957,8 @@ async function dispatchMenu(manager, action, io) {
     case "switch":
       try {
         await manager.switchTo(action.name);
-        io.out(`${SYMBOLS.ok} Now using ${action.name}`);
+        io.out(`${SYMBOLS.ok} Now using ${action.name}
+  restart running claude sessions to apply`);
       } catch (e) {
         io.out(`${SYMBOLS.err} ${e.message}`);
       }
@@ -840,7 +996,11 @@ async function runMenu(manager, io) {
   } catch {
   }
   const accounts = await manager.listAccounts();
-  const choice = await io.pick(`claudep \xB7 ${accounts.length} account${accounts.length === 1 ? "" : "s"}`, buildMenuChoices(accounts));
+  const usage = io.usage ? await io.usage(accounts) : void 0;
+  const choice = await io.pick(
+    `claudep \xB7 ${accounts.length} account${accounts.length === 1 ? "" : "s"}`,
+    buildMenuChoices(accounts, usage)
+  );
   if (!choice) return;
   await dispatchMenu(manager, choice.action, io);
 }
@@ -865,12 +1025,15 @@ function interactiveSelect(title, choices) {
 ${colors.dim(`  ${DIVIDER}`)}
 `);
     if (!choices.length) stdout.write(colors.dim("  (no saved accounts yet)\n"));
+    const rowLines = choices.reduce((n, c) => n + 1 + (c.detail?.length ?? 0), 0);
     const render = (first) => {
-      if (!first) stdout.write(`\x1B[${choices.length + chrome}A`);
+      if (!first) stdout.write(`\x1B[${rowLines + chrome}A`);
       for (let i = 0; i < choices.length; i++) {
         const active = i === selected;
         const line = active ? `${colors.cyan("\u276F")} ${choices[i].label}` : `  ${choices[i].label}`;
         stdout.write(`\x1B[2K\r${line}
+`);
+        for (const d of choices[i].detail ?? []) stdout.write(`\x1B[2K\r${colors.dim(`        ${d}`)}
 `);
       }
       stdout.write(`\x1B[2K\r${colors.dim(`  ${DIVIDER}`)}
@@ -930,13 +1093,8 @@ async function runInteractiveMenu(manager, out) {
       rl.close();
       return a;
     },
-    confirm: async (q) => {
-      const rl = createInterface({ input: process.stdin, output: process.stdout });
-      const a = (await rl.question(`${q} [y/N] `)).trim().toLowerCase();
-      rl.close();
-      return a === "y" || a === "yes";
-    },
     doctor: async () => (await runDoctor(buildDoctorDeps())).report,
+    usage: (accounts) => loadUsage(manager, accounts, Date.now()),
     out
   };
   await runMenu(manager, io);
@@ -966,9 +1124,23 @@ function startDaemon(manager, opts = {}) {
   const interval = opts.intervalMs ?? 1e3;
   const log = opts.log ?? ((s) => console.log(s));
   const subscribe = opts.watch ?? defaultWatch;
+  let running = false;
+  let again = false;
+  const run = async () => {
+    if (running) {
+      again = true;
+      return;
+    }
+    running = true;
+    do {
+      again = false;
+      await reconcileAndLog(manager, log);
+    } while (again);
+    running = false;
+  };
   log(`[claudep] watching ${path} every ${interval}ms \u2014 instant capture on login/switch/logout`);
-  void reconcileAndLog(manager, log);
-  return subscribe(path, interval, () => void reconcileAndLog(manager, log));
+  void run();
+  return subscribe(path, interval, () => void run());
 }
 function defaultWatch(path, intervalMs, onChange) {
   const listener = () => onChange();
@@ -979,9 +1151,9 @@ function defaultWatch(path, intervalMs, onChange) {
 // src/autostart.ts
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
-import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync4, rmSync as rmSync2, existsSync as existsSync3 } from "fs";
+import { writeFileSync as writeFileSync4, mkdirSync as mkdirSync5, rmSync as rmSync2, existsSync as existsSync3 } from "fs";
 import { homedir as homedir4 } from "os";
-import { dirname as dirname4, join as join5 } from "path";
+import { dirname as dirname5, join as join5 } from "path";
 var execFileP2 = promisify2(execFile2);
 var LABEL = "com.claude-switcher-account.daemon";
 var WIN_TASK = "claude-switcher-account";
@@ -992,6 +1164,8 @@ var LEGACY_UNIT = "claude-login-switcher.service";
 var defaultExec2 = async (file, args) => {
   await execFileP2(file, args);
 };
+var xml = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+var systemdArg = (s) => `"${s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/%/g, "%%").replace(/\$/g, "$$$$")}"`;
 function launchdPlist(p) {
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -1000,15 +1174,15 @@ function launchdPlist(p) {
   <key>Label</key><string>${LABEL}</string>
   <key>ProgramArguments</key>
   <array>
-    <string>${p.nodePath}</string>
-    <string>${p.binPath}</string>
+    <string>${xml(p.nodePath)}</string>
+    <string>${xml(p.binPath)}</string>
     <string>daemon</string>
     <string>run</string>
   </array>
   <key>RunAtLoad</key><true/>
   <key>KeepAlive</key><true/>
-  <key>StandardOutPath</key><string>${p.logPath}</string>
-  <key>StandardErrorPath</key><string>${p.logPath}</string>
+  <key>StandardOutPath</key><string>${xml(p.logPath)}</string>
+  <key>StandardErrorPath</key><string>${xml(p.logPath)}</string>
 </dict>
 </plist>
 `;
@@ -1018,7 +1192,7 @@ function systemdUnit(p) {
 Description=claude-switcher-account instant login watcher
 
 [Service]
-ExecStart=${p.nodePath} ${p.binPath} daemon run
+ExecStart=${systemdArg(p.nodePath)} ${systemdArg(p.binPath)} daemon run
 Restart=always
 StandardOutput=append:${p.logPath}
 StandardError=append:${p.logPath}
@@ -1048,7 +1222,7 @@ function autostartInstalled(platform, home = homedir4()) {
   return false;
 }
 function writeFile(path, contents) {
-  mkdirSync4(dirname4(path), { recursive: true });
+  mkdirSync5(dirname5(path), { recursive: true });
   writeFileSync4(path, contents);
 }
 async function removeLegacyAutostart(platform, home = homedir4(), exec = defaultExec2) {
@@ -1085,7 +1259,14 @@ async function installAutostart(platform, paths, home = homedir4(), exec = defau
     return `systemd user service installed at ${unit}`;
   }
   if (platform === "win32") {
-    await exec("schtasks", windowsCreateArgs(paths));
+    try {
+      await exec("schtasks", windowsCreateArgs(paths));
+    } catch (e) {
+      throw new Error(
+        `${e.message.trim()}
+Creating a logon task can require an Administrator terminal \u2014 rerun \`claudep daemon install\` from one.`
+      );
+    }
     return `Task Scheduler task '${WIN_TASK}' created (runs at logon)`;
   }
   throw new Error(`Autostart not supported on ${platform}.`);
@@ -1118,6 +1299,11 @@ async function defaultConfirm(question) {
   rl.close();
   return answer === "y" || answer === "yes";
 }
+function handleFatal(err, errOut) {
+  if (err instanceof CommanderError) return err.exitCode;
+  errOut(`  ${SYMBOLS.err} ${err instanceof Error ? err.message : String(err)}`);
+  return 1;
+}
 function buildProgram(deps = {}) {
   const out = deps.out ?? ((s) => console.log(s));
   const now = deps.now ?? (() => Date.now());
@@ -1186,7 +1372,8 @@ function buildProgram(deps = {}) {
     }
     const cur = mgr.current();
     const external = !cur.saved && cur.label ? cur.label.email : void 0;
-    out(formatList(views, now(), colors, { external }));
+    const usage = await loadUsage(mgr, views, now(), deps.fetchUsage ?? fetchUsage);
+    out(formatList(views, now(), colors, { external, usage }));
   });
   program2.command("switch <target>").alias("use").description("Make an account the active login (by name or number)").action(async (target) => {
     const mgr = manager();
@@ -1202,6 +1389,11 @@ function buildProgram(deps = {}) {
       process.exitCode = 1;
       return;
     }
+    if (!(await mgr.listAccounts()).some((a) => a.name === name)) {
+      out(err(`Saved account '${name}' not found.`) + "\n" + note(listHint));
+      process.exitCode = 1;
+      return;
+    }
     if (!opts.yes) {
       const yes = await confirm(`Remove ${name}? This deletes its stored credential.`);
       if (!yes) {
@@ -1272,6 +1464,5 @@ var program = buildProgram();
 try {
   await program.parseAsync(process.argv);
 } catch (err) {
-  const code = err.exitCode ?? 1;
-  process.exit(code);
+  process.exit(handleFatal(err, (s) => console.error(s)));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-switcher-account",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Switch between multiple Claude Code accounts from your terminal.",
   "keywords": [
     "claude",
@@ -18,14 +18,6 @@
     "cli",
     "developer-tools"
   ],
-  "homepage": "https://github.com/khainguyenhm-itr/claude-switcher-account#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/khainguyenhm-itr/claude-switcher-account.git"
-  },
-  "bugs": {
-    "url": "https://github.com/khainguyenhm-itr/claude-switcher-account/issues"
-  },
   "license": "MIT",
   "author": "khainguyenhm-itr",
   "type": "module",