claude-switcher-account 2.3.0 → 2.4.0

package/README.md

@@ -86,17 +86,19 @@ 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`:
+`claudep list` shows each account's plan usage, the same numbers as Claude Code's
+`/usage` (the interactive menu stays compact and skips it):
 
 ```
    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.
+They are fetched live from Anthropic with each account's token. When a saved
+(inactive) account's access token has expired, claudep refreshes it the way
+Claude Code does and saves the new credential in place of the old one; the active
+login is left to Claude Code. An account that was logged out (no refresh token
+left), or any fetch that fails, shows `--`.
 
 ### Interactive menu
 

package/dist/bin.js

@@ -477,6 +477,15 @@ var AccountManager = class {
       return "";
     }
   }
+  /** Replace an idle account's saved credential with a refreshed one. Unlike refreshStoredCredential it
+   *  leaves savedAt and the profile alone: only the tokens changed. */
+  async saveRefreshedCredential(name, blob) {
+    await this.store.writeSaved(name, blob);
+    await this.meta.update((d) => {
+      const a = d.accounts.find((x) => x.name === name);
+      if (a) a.fingerprint = fingerprint(blob);
+    });
+  }
   current() {
     const label = this.profile.peekLabel();
     const accounts = this.meta.read().accounts;
@@ -610,9 +619,45 @@ function createManager(env) {
   return new AccountManager({ store, meta, profile, config });
 }
 
+// src/oauth.ts
+var TOKEN_URL = "https://platform.claude.com/v1/oauth/token";
+var CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
+var TIMEOUT_MS = 5e3;
+async function refreshCredential(blob, nowMs, fetchFn = fetch) {
+  try {
+    const parsed = JSON.parse(blob);
+    const oauth = parsed?.claudeAiOauth;
+    if (typeof oauth?.refreshToken !== "string" || !oauth.refreshToken) return null;
+    const res = await fetchFn(TOKEN_URL, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ grant_type: "refresh_token", refresh_token: oauth.refreshToken, client_id: CLIENT_ID }),
+      signal: AbortSignal.timeout(TIMEOUT_MS)
+    });
+    if (!res.ok) return null;
+    const t = await res.json();
+    if (typeof t?.access_token !== "string") return null;
+    const next = {
+      ...parsed,
+      claudeAiOauth: {
+        ...oauth,
+        accessToken: t.access_token,
+        refreshToken: typeof t.refresh_token === "string" ? t.refresh_token : oauth.refreshToken,
+        expiresAt: typeof t.expires_in === "number" ? nowMs + t.expires_in * 1e3 : oauth.expiresAt,
+        ...typeof t.refresh_token_expires_in === "number" && {
+          refreshTokenExpiresAt: nowMs + t.refresh_token_expires_in * 1e3
+        }
+      }
+    };
+    return { blob: JSON.stringify(next), accessToken: t.access_token };
+  } catch {
+    return null;
+  }
+}
+
 // src/usage.ts
 var USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
-var TIMEOUT_MS = 3e3;
+var TIMEOUT_MS2 = 3e3;
 function accessTokenOf(blob, nowMs) {
   try {
     const o = JSON.parse(blob)?.claudeAiOauth;
@@ -638,7 +683,7 @@ 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)
+      signal: AbortSignal.timeout(TIMEOUT_MS2)
     });
     if (!res.ok) return null;
     return parseUsage(await res.json());
@@ -646,10 +691,25 @@ async function fetchUsage(token, fetchFn = fetch) {
     return null;
   }
 }
-async function loadUsage(mgr, views, nowMs, fetchFn = fetchUsage) {
+async function liveToken(mgr, v, nowMs, refresh) {
+  const blob = await mgr.credentialOf(v);
+  const token = accessTokenOf(blob, nowMs);
+  if (token || v.active || !blob) return token;
+  const r = await refresh(blob, nowMs);
+  if (!r) return null;
+  try {
+    await mgr.saveRefreshedCredential(v.name, r.blob);
+  } catch {
+    return null;
+  }
+  return r.accessToken;
+}
+async function loadUsage(mgr, views, nowMs, deps = {}) {
+  const fetchFn = deps.fetchUsage ?? fetchUsage;
+  const refresh = deps.refresh ?? refreshCredential;
   const entries = await Promise.all(
     views.map(async (v) => {
-      const token = accessTokenOf(await mgr.credentialOf(v), nowMs);
+      const token = await liveToken(mgr, v, nowMs, refresh);
       return [v.name, token ? await fetchFn(token) : null];
     })
   );
@@ -840,7 +900,7 @@ function buildDoctorDeps(env) {
 // package.json
 var package_default = {
   name: "claude-switcher-account",
-  version: "2.3.0",
+  version: "2.4.0",
   description: "Switch between multiple Claude Code accounts from your terminal.",
   keywords: [
     "claude",
@@ -932,7 +992,7 @@ import { createInterface } from "readline/promises";
 function pad2(s, width) {
   return s.length >= width ? s : s + " ".repeat(width - s.length);
 }
-function buildMenuChoices(accounts, usage, nowMs = Date.now()) {
+function buildMenuChoices(accounts) {
   const ordered = orderAccounts(accounts);
   if (!ordered.length) return [];
   const emailW = Math.max(...ordered.map((a) => a.email.length));
@@ -942,8 +1002,7 @@ function buildMenuChoices(accounts, usage, nowMs = Date.now()) {
     const org = a.organizationName ? `  ${a.organizationName}` : "";
     return {
       label: `${i + 1}  ${mark} ${pad2(a.email, emailW)}${org}  ${when}`,
-      action: { type: "switch", name: a.name },
-      ...usage && { detail: formatUsageLines(usage[a.name] ?? null, nowMs) }
+      action: { type: "switch", name: a.name }
     };
   });
 }
@@ -996,11 +1055,7 @@ async function runMenu(manager, io) {
   } catch {
   }
   const accounts = await manager.listAccounts();
-  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)
-  );
+  const choice = await io.pick(`claudep \xB7 ${accounts.length} account${accounts.length === 1 ? "" : "s"}`, buildMenuChoices(accounts));
   if (!choice) return;
   await dispatchMenu(manager, choice.action, io);
 }
@@ -1025,15 +1080,12 @@ 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[${rowLines + chrome}A`);
+      if (!first) stdout.write(`\x1B[${choices.length + 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}`)}
@@ -1094,7 +1146,6 @@ async function runInteractiveMenu(manager, out) {
       return a;
     },
     doctor: async () => (await runDoctor(buildDoctorDeps())).report,
-    usage: (accounts) => loadUsage(manager, accounts, Date.now()),
     out
   };
   await runMenu(manager, io);
@@ -1372,7 +1423,7 @@ function buildProgram(deps = {}) {
     }
     const cur = mgr.current();
     const external = !cur.saved && cur.label ? cur.label.email : void 0;
-    const usage = await loadUsage(mgr, views, now(), deps.fetchUsage ?? fetchUsage);
+    const usage = await loadUsage(mgr, views, now(), { fetchUsage: deps.fetchUsage, refresh: deps.refreshCredential });
     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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-switcher-account",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Switch between multiple Claude Code accounts from your terminal.",
   "keywords": [
     "claude",