@timo972/cc-router 0.12.4 → 0.13.0-rc.1

package/dist/ui/Dashboard.js

@@ -791,6 +791,12 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
         ? Math.max(0, orderedAccounts.findIndex(a => a.id === selectedAccountId))
         : 0;
     const selectedAccount = orderedAccounts[selectedAccountIndex] ?? null;
+    // Identity for the selected row: health never carries it, so it comes from
+    // the authenticated /cc-router/accounts poll above. The detail line and the
+    // re-auth intent must agree on which email they mean, so both read this.
+    const selectedAccountInfo = selectedAccount
+        ? accountInfo[`${selectedAccount.provider ?? "anthropic_subscription"}:${selectedAccount.id}`]
+        : undefined;
     // Same follow-scroll for the accounts window: when the fitting controller
     // shrinks the list below the fleet size, the selected account must stay on
     // screen — account actions (caps, toggle, delete confirmation) target the
@@ -955,6 +961,42 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
             refreshAllInFlightRef.current = false;
         }
     }, [api, modelsApi, modelsStatus, onRefreshAll, refreshCliRouting, showBanner]);
+    // ── Reload one account ───────────────────────────────────────────────────
+    // R with ACCOUNTS focused narrows the whole-pool reload to the selection, so
+    // a single stale account can be refreshed without paying for every provider.
+    // Its own in-flight guard: the pool reload and this one are separate calls.
+    const refreshOneInFlightRef = useRef(false);
+    const doRefreshSelected = useCallback(async () => {
+        if (!selectedAccount)
+            return;
+        if (refreshOneInFlightRef.current) {
+            showBanner("Refresh already running…", "gray");
+            return;
+        }
+        refreshOneInFlightRef.current = true;
+        showBanner(`Refreshing ${selectedAccount.id}…`, "cyan", REFRESH_ALL_BANNER_MS);
+        try {
+            // Grok has no server-side account record to refresh — its snapshot is
+            // read locally from ~/.grok, so re-read that instead of POSTing.
+            if (isXaiAccount(selectedAccount)) {
+                await onRefreshAll?.();
+                showBanner(`Refreshed ${selectedAccount.id}`, "green");
+                return;
+            }
+            const result = await api.refreshAccount(selectedAccount.id);
+            const problems = [
+                result.usageRefreshed ? "" : "usage fetch failed",
+                result.tokenRefreshed === false ? "token refresh failed" : "",
+            ].filter(Boolean);
+            showBanner(`Refreshed ${result.id} — ${problems.length ? problems.join(", ") : "usage fresh"}`, problems.length ? "yellow" : "green");
+        }
+        catch (err) {
+            showBanner(`Refresh error: ${errMsg(err)}`, "red");
+        }
+        finally {
+            refreshOneInFlightRef.current = false;
+        }
+    }, [api, onRefreshAll, selectedAccount, showBanner]);
     const doToggleCli = useCallback((target) => {
         const current = target === "claude" ? cliRouting.claude.enabled : cliRouting.codex.enabled;
         const result = target === "claude"
@@ -1080,7 +1122,7 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
         // Always call exit() so Ink fully unmounts and releases stdin.
         // The outer dashboardLoop reads `pendingIntent` after waitUntilExit().
         if (input === "q") {
-            onIntent?.("quit");
+            onIntent?.({ kind: "quit" });
             exit();
             return;
         }
@@ -1089,7 +1131,7 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
                 setFocus("logs");
                 return;
             }
-            onIntent?.("quit");
+            onIntent?.({ kind: "quit" });
             exit();
             return;
         }
@@ -1115,7 +1157,10 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
             return;
         }
         if (input === "R") {
-            void doRefreshAll();
+            if (focus === "accounts" && selectedAccount)
+                void doRefreshSelected();
+            else
+                void doRefreshAll();
             return;
         }
         if (key.tab) {
@@ -1199,6 +1244,27 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
                 setMode("confirmDelete");
                 return;
             }
+            // l = re-authenticate the selection. Like `n`, the sign-in flow runs in
+            // the outer loop after Ink unmounts, so without a handler this is a no-op.
+            if (input === "l") {
+                if (!selectedAccount)
+                    return;
+                if (isXaiAccount(selectedAccount)) {
+                    showBanner("Grok credentials live in ~/.grok — run grok login, then cc-router accounts add grok", "yellow");
+                    return;
+                }
+                if (!onIntent)
+                    return;
+                const provider = selectedAccount.provider === "openai_subscription" ? "openai_subscription" : "anthropic_subscription";
+                onIntent({
+                    kind: "reauth",
+                    id: selectedAccount.id,
+                    provider,
+                    ...(selectedAccountInfo?.email ? { email: selectedAccountInfo.email } : {}),
+                });
+                exit();
+                return;
+            }
         }
         if (focus === "models") {
             if (key.upArrow) {
@@ -1251,7 +1317,7 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
         // flow after Ink unmounts; if none is wired, this key is a no-op.
         if (input === "n") {
             if (onIntent) {
-                onIntent("addAccount");
+                onIntent({ kind: "addAccount" });
                 exit();
             }
             return;
@@ -1264,10 +1330,10 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
                                             : "daemon version unreported (older build)", ` · dashboard v${DASHBOARD_VERSION}`] }), LOCAL_TARGET_RE.test(baseUrl) ? (_jsxs(_Fragment, { children: [_jsx(Text, { color: "gray", children: "  \u2014  restart: " }), _jsx(Text, { color: "cyan", children: "cc-router stop --keep-config && cc-router start" })] })) : (
                                 // A remote router can only be restarted where it runs; printing a
                                 // local restart command here would never clear the banner.
-                                _jsxs(Text, { color: "gray", children: ["  \u2014  update and restart the daemon on ", baseUrl] }))] })), _jsx(Box, { marginTop: 1 }), data.operational && (_jsxs(_Fragment, { children: [_jsx(OperationsPanel, { operational: data.operational, baseUrl: baseUrl, focus: focus, cliRouting: cliRouting }), _jsx(Box, { marginTop: 1 })] })), (focus === "models" || modelsStatus) && (_jsxs(_Fragment, { children: [_jsx(ModelsPanel, { status: modelsStatus, selectedIndex: selectedModelIndex, focused: focus === "models", visibleRows: modelsVisible, rowsRef: modelRowsRef }), _jsx(Box, { marginTop: 1 })] })), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsxs(Text, { bold: true, children: [" ACCOUNTS  ", _jsxs(Text, { color: healthyCount === orderedAccounts.length ? "green" : "yellow", children: [healthyCount, "/", orderedAccounts.length, " healthy"] }), weeklyFullCount > 0 && _jsx(Text, { color: "red", children: `  ·  ${weeklyFullCount} 7d full` })] }), shownAccounts < orderedAccounts.length && (_jsxs(Text, { color: "gray", children: ["  ·  showing ", accountWindowTop + 1, "\u2013", accountWindowTop + shownAccounts] })), compact && _jsx(Text, { color: "cyan", children: "  ·  compact" })] }), _jsx(Box, { marginTop: 1, flexDirection: "column", ref: accountRowsRef, children: _jsx(AccountGroups, { visible: orderedAccounts.slice(accountWindowTop, accountWindowTop + shownAccounts), fleet: orderedAccounts, windowTop: accountWindowTop, selectedIndex: selectedAccountIndex, focused: focus === "accounts" }) }), focus === "accounts" && selectedAccount && (_jsxs(Text, { color: "gray", wrap: "truncate-end", children: ["  ", formatAccountInfo(accountInfo[`${selectedAccount.provider ?? "anthropic_subscription"}:${selectedAccount.id}`])] }))] }), banner && (_jsx(Box, { marginTop: 1, paddingLeft: 2, children: _jsxs(Text, { color: banner.color, children: [" ", banner.text] }) })), !compact && (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1 }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: " TOTALS  " }), _jsx(Text, { children: "requests " }), _jsx(Text, { color: "cyan", children: data.totalRequests }), _jsx(Text, { color: "gray", children: "  \u00B7  " }), _jsx(Text, { children: "errors " }), _jsx(Text, { color: data.totalErrors > 0 ? "red" : "green", children: data.totalErrors }), _jsx(Text, { color: "gray", children: "  \u00B7  " }), _jsx(Text, { children: "refreshes " }), _jsx(Text, { color: "yellow", children: data.totalRefreshes }), _jsx(CacheHealthBadge, { read: data.totalCacheReadTokens, created: data.totalCacheCreationTokens, input: data.totalInputTokens })] }), _jsx(TokenSummary, { cacheRead: data.totalCacheReadTokens, cacheCreated: data.totalCacheCreationTokens, uncached: data.totalInputTokens, output: data.totalOutputTokens ?? 0 })] }), _jsx(Box, { marginTop: 1 }), _jsx(Text, { bold: true, children: " RECENT ACTIVITY" }), _jsx(Box, { marginTop: 1 })] }))] }), !compact && (_jsx(Box, { flexDirection: "column", ref: logRowsRef, children: visibleLogs.length === 0
+                                _jsxs(Text, { color: "gray", children: ["  \u2014  update and restart the daemon on ", baseUrl] }))] })), _jsx(Box, { marginTop: 1 }), data.operational && (_jsxs(_Fragment, { children: [_jsx(OperationsPanel, { operational: data.operational, baseUrl: baseUrl, focus: focus, cliRouting: cliRouting }), _jsx(Box, { marginTop: 1 })] })), (focus === "models" || modelsStatus) && (_jsxs(_Fragment, { children: [_jsx(ModelsPanel, { status: modelsStatus, selectedIndex: selectedModelIndex, focused: focus === "models", visibleRows: modelsVisible, rowsRef: modelRowsRef }), _jsx(Box, { marginTop: 1 })] })), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsxs(Text, { bold: true, children: [" ACCOUNTS  ", _jsxs(Text, { color: healthyCount === orderedAccounts.length ? "green" : "yellow", children: [healthyCount, "/", orderedAccounts.length, " healthy"] }), weeklyFullCount > 0 && _jsx(Text, { color: "red", children: `  ·  ${weeklyFullCount} 7d full` })] }), shownAccounts < orderedAccounts.length && (_jsxs(Text, { color: "gray", children: ["  ·  showing ", accountWindowTop + 1, "\u2013", accountWindowTop + shownAccounts] })), compact && _jsx(Text, { color: "cyan", children: "  ·  compact" })] }), _jsx(Box, { marginTop: 1, flexDirection: "column", ref: accountRowsRef, children: _jsx(AccountGroups, { visible: orderedAccounts.slice(accountWindowTop, accountWindowTop + shownAccounts), fleet: orderedAccounts, windowTop: accountWindowTop, selectedIndex: selectedAccountIndex, focused: focus === "accounts" }) }), focus === "accounts" && selectedAccount && (_jsxs(Text, { color: "gray", wrap: "truncate-end", children: ["  ", [selectedAccount.tokenOnly ? "token-only" : "", formatAccountInfo(selectedAccountInfo)].filter(Boolean).join(" · ")] }))] }), banner && (_jsx(Box, { marginTop: 1, paddingLeft: 2, children: _jsxs(Text, { color: banner.color, children: [" ", banner.text] }) })), !compact && (_jsxs(_Fragment, { children: [_jsx(Box, { marginTop: 1 }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { bold: true, children: " TOTALS  " }), _jsx(Text, { children: "requests " }), _jsx(Text, { color: "cyan", children: data.totalRequests }), _jsx(Text, { color: "gray", children: "  \u00B7  " }), _jsx(Text, { children: "errors " }), _jsx(Text, { color: data.totalErrors > 0 ? "red" : "green", children: data.totalErrors }), _jsx(Text, { color: "gray", children: "  \u00B7  " }), _jsx(Text, { children: "refreshes " }), _jsx(Text, { color: "yellow", children: data.totalRefreshes }), _jsx(CacheHealthBadge, { read: data.totalCacheReadTokens, created: data.totalCacheCreationTokens, input: data.totalInputTokens })] }), _jsx(TokenSummary, { cacheRead: data.totalCacheReadTokens, cacheCreated: data.totalCacheCreationTokens, uncached: data.totalInputTokens, output: data.totalOutputTokens ?? 0 })] }), _jsx(Box, { marginTop: 1 }), _jsx(Text, { bold: true, children: " RECENT ACTIVITY" }), _jsx(Box, { marginTop: 1 })] }))] }), !compact && (_jsx(Box, { flexDirection: "column", ref: logRowsRef, children: visibleLogs.length === 0
                         ? _jsx(Text, { color: "gray", children: "  No activity yet" })
                         : visibleLogs.map((log, i) => (_jsx(LogRow, { log: log, selected: focus === "logs" && logWindowTop + i === selectedLogIndex }, `${log.ts}-${i}`))) })), !compact && focus === "logs" && selectedLog && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginTop: 1 }), _jsx(DetailPanel, { log: selectedLog })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "gray", children: focus === "accounts"
-                            ? " [Tab]  [e] toggle  [a]/[o]/[g] provider  [n] add  [d] delete  [w] 7d  [s] 5h  [Ctrl+R] reset  [R] reload  [z] compact  [q]"
+                            ? " [Tab]  [e] toggle  [a]/[o]/[g] provider  [n] add  [l] re-auth  [d] delete  [w] 7d  [s] 5h  [Ctrl+R] reset  [R] reload  [z] compact  [q]"
                             : focus === "models"
                                 ? " [Tab]  [m/r] refresh  [c]/[o] default  [R] reload all  [Esc] logs  [z] compact  [q]"
                                 : " [Tab]  [m] models  [R] reload  [z] compact  [q] quit" }) })] }) }));

package/dist/ui/accountsApi.js

@@ -12,6 +12,10 @@ const REQUEST_TIMEOUT_MS = 3_000;
 // 10s each. The server single-flights the pass, so a client that does give
 // up and presses again joins the running one rather than stacking another.
 const REFRESH_ALL_TIMEOUT_MS = 120_000;
+// One account only: a token refresh, one usage fetch and the identity fetch.
+// Far short of the whole-pool budget, but long enough that a slow upstream
+// still lands rather than the dashboard reporting a timeout it caused.
+const REFRESH_ONE_TIMEOUT_MS = 30_000;
 const MAX_PUBLIC_ROWS = 12;
 export function createAccountsApi(baseUrl, authToken) {
     const root = baseUrl.replace(/\/+$/, "");
@@ -58,6 +62,23 @@ export function createAccountsApi(baseUrl, authToken) {
     return {
         list,
         refreshAll,
+        async refreshAccount(id) {
+            const res = await fetch(`${base}/${encodeURIComponent(id)}/refresh`, {
+                method: "POST",
+                headers: authHeaders,
+                signal: AbortSignal.timeout(REFRESH_ONE_TIMEOUT_MS),
+            });
+            if (!res.ok)
+                throw new Error(`HTTP ${res.status}`);
+            const payload = await res.json();
+            const r = isRecord(payload.refresh) ? payload.refresh : {};
+            return {
+                id: publicText(r.id, 128, id),
+                tokenRefreshed: r.tokenRefreshed === true ? true : r.tokenRefreshed === false ? false : null,
+                usageRefreshed: r.usageRefreshed === true,
+                durationMs: publicInteger(r.durationMs),
+            };
+        },
         async resetUsage(id, redeemRequestId) {
             const response = await fetch(`${base}/${encodeURIComponent(id)}/reset-usage`, {
                 method: "POST",

package/dist/utils/browser.js

@@ -0,0 +1,36 @@
+import { spawn as nodeSpawn } from "node:child_process";
+export function browserCommandFor(platform, url) {
+    if (platform === "darwin")
+        return { command: "open", args: [url] };
+    if (platform === "win32")
+        return { command: "cmd", args: ["/c", "start", "", url] };
+    return { command: "xdg-open", args: [url] };
+}
+/**
+ * Best-effort: a headless box, a missing opener or an odd desktop must never
+ * fail a sign-in. The caller always prints the URL as well.
+ *
+ * Resolves as soon as the opener has been launched, never when it exits:
+ * on some Linux desktops `xdg-open` blocks until the browser it started
+ * closes, and a sign-in that awaited that would never reach its polling
+ * loop while the operator was approving it in that very browser.
+ */
+export function openInBrowser(url, deps = {}) {
+    const env = deps.env ?? process.env;
+    if (env.CC_ROUTER_NO_BROWSER === "1")
+        return Promise.resolve(false);
+    const { command, args } = browserCommandFor(deps.platform ?? process.platform, url);
+    const spawn = deps.spawn ?? nodeSpawn;
+    return new Promise(resolve => {
+        try {
+            const child = spawn(command, args, { detached: true, stdio: "ignore" });
+            child.once("spawn", () => resolve(true));
+            child.once("error", () => resolve(false));
+            // Let the process exit without waiting on the opener.
+            child.unref();
+        }
+        catch {
+            resolve(false);
+        }
+    });
+}

package/dist/utils/expiry-input.js

@@ -0,0 +1,21 @@
+/**
+ * Parse an operator-typed expiry: a Unix timestamp in milliseconds or an ISO
+ * date. Returns null when the input is neither.
+ *
+ * `new Date("1790000000000")` is `NaN` — the Date constructor only parses
+ * date strings — so a pasted millisecond timestamp has to go through
+ * `Number()` first, or the saved account carries an invalid expiry.
+ */
+export function parseExpiryInput(raw) {
+    const value = raw.trim();
+    if (!value)
+        return null;
+    // Any integer-looking input is a timestamp, negative ones included: V8's
+    // Date.parse would otherwise read "-5" as a year.
+    if (/^-?\d+$/.test(value)) {
+        const ms = Number(value);
+        return Number.isFinite(ms) && ms > 0 ? ms : null;
+    }
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
+}

package/dist/utils/token-extractor.js

@@ -123,11 +123,10 @@ function parseCredentialJson(raw) {
         const accessToken = obj["accessToken"];
         const refreshToken = obj["refreshToken"];
         const expiresAt = obj["expiresAt"];
-        if (typeof accessToken !== "string" ||
-            typeof refreshToken !== "string" ||
-            !accessToken.startsWith("sk-ant-")) {
+        if (typeof accessToken !== "string" || !accessToken.startsWith("sk-ant-"))
+            return null;
+        if (refreshToken !== undefined && typeof refreshToken !== "string")
             return null;
-        }
         const scopes = Array.isArray(obj["scopes"])
             ? obj["scopes"]
             : ["user:inference", "user:profile"];
@@ -142,7 +141,12 @@ function parseCredentialJson(raw) {
             // No expiry info — assume 8h from now (standard OAuth token lifetime)
             expiresAtMs = Date.now() + 8 * 60 * 60 * 1000;
         }
-        return { accessToken, refreshToken, expiresAt: expiresAtMs, scopes };
+        return {
+            accessToken,
+            refreshToken: typeof refreshToken === "string" ? refreshToken : undefined,
+            expiresAt: expiresAtMs,
+            scopes,
+        };
     }
     catch {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timo972/cc-router",
-  "version": "0.12.4",
+  "version": "0.13.0-rc.1",
   "description": "Cache-aware session router for Claude Max OAuth tokens — use multiple Claude Max accounts with Claude Code",
   "type": "module",
   "bin": {