@timo972/cc-router 0.7.0 → 0.9.0

package/dist/ui/Dashboard.js

@@ -11,6 +11,87 @@ const EMPTY_RL = {
     sevenDayUtil: 0, sevenDayReset: 0, claim: "", plan: "",
     requestsLimit: 0, lastUpdated: 0,
 };
+/** Match TokenPool's source precedence for the dashboard's global windows. */
+export function getGlobalCapacityView(rateLimits) {
+    const usage = rateLimits.usage;
+    const snapshotIsCurrent = usage !== undefined &&
+        usage.fetchStatus !== "unavailable" &&
+        usage.fetchedAt >= rateLimits.lastUpdated;
+    const usageFetchStatus = usage?.fetchStatus === "fresh" && !snapshotIsCurrent
+        ? "stale"
+        : usage?.fetchStatus;
+    return {
+        fiveHour: snapshotIsCurrent && usage.fiveHour
+            ? usage.fiveHour
+            : { utilization: rateLimits.fiveHourUtil, resetAt: rateLimits.fiveHourReset },
+        sevenDay: snapshotIsCurrent && usage.sevenDay
+            ? usage.sevenDay
+            : { utilization: rateLimits.sevenDayUtil, resetAt: rateLimits.sevenDayReset },
+        usageFetchStatus,
+    };
+}
+/** Turn the safe account payload into compact dynamic model/cooldown rows. */
+export function getAccountCapacityRows(account) {
+    const usage = account.rateLimits?.usage;
+    const modelCooldowns = account.modelCooldowns ?? [];
+    const rows = [];
+    const matchedCooldowns = new Set();
+    const now = Date.now();
+    if (usage?.modelLimits.length) {
+        const usageFetchStatus = usage.fetchStatus === "fresh" &&
+            usage.fetchedAt < (account.rateLimits?.lastUpdated ?? 0)
+            ? "stale"
+            : usage.fetchStatus;
+        const usageState = usageFetchStatus === "fresh" ? undefined : `usage ${usageFetchStatus}`;
+        const paidExtraAvailable = usage.extraUsage?.usable === true;
+        for (const limit of usage.modelLimits) {
+            const requestedCooldown = modelCooldowns.find(cooldown => cooldown.modelFamily === limit.modelFamily && cooldown.untilMs > now);
+            const exhausted = limit.utilization >= 1;
+            const capacityState = usageState
+                ? usageState
+                : !limit.active
+                    ? "inactive"
+                    : exhausted && paidExtraAvailable
+                        ? "paid extra active"
+                        : exhausted
+                            ? "exhausted"
+                            : "included available";
+            const state = requestedCooldown
+                ? `${capacityState} · requested-model cooldown`
+                : capacityState;
+            if (requestedCooldown)
+                matchedCooldowns.add(requestedCooldown.modelFamily);
+            const color = requestedCooldown ? "yellow"
+                : usageState ? usageFetchStatus === "stale" ? "yellow" : "gray"
+                    : !limit.active ? "gray"
+                        : exhausted && paidExtraAvailable ? "yellow"
+                            : exhausted || limit.severity === "critical" ? "red"
+                                : limit.severity === "warning" || limit.utilization >= 0.7 ? "yellow"
+                                    : "green";
+            rows.push({
+                label: limit.displayName,
+                state,
+                color,
+                utilization: limit.utilization,
+                resetAt: limit.resetAt,
+            });
+        }
+    }
+    for (const cooldown of modelCooldowns) {
+        if (matchedCooldowns.has(cooldown.modelFamily) || cooldown.untilMs <= now)
+            continue;
+        rows.push({
+            label: `cooldown ${cooldown.modelFamily}`,
+            state: "requested-model cooldown",
+            color: "yellow",
+            resetAt: Math.floor(cooldown.untilMs / 1_000),
+        });
+    }
+    if (account.globalCooldownUntilMs && account.globalCooldownUntilMs > now) {
+        rows.push({ label: "cooldown", state: "global", color: "red", resetAt: Math.floor(account.globalCooldownUntilMs / 1_000) });
+    }
+    return rows;
+}
 export function Dashboard({ port, baseUrl, authToken, onIntent }) {
     const { exit } = useApp();
     const [data, setData] = useState(null);
@@ -453,6 +534,9 @@ function ProviderBadge({ label, status, ready, }) {
 // ─── Account row (two-line: status + utilization bars) ───────────────────────
 function AccountRow({ account: a, selected }) {
     const rl = a.rateLimits ?? EMPTY_RL;
+    const usage = rl.usage;
+    const globalCapacity = getGlobalCapacityView(rl);
+    const capacityRows = getAccountCapacityRows(a);
     const isLimited = rl.status === "rate_limited";
     const isDisabled = a.enabled === false;
     const dot = isDisabled ? "⊘" : isLimited ? "⊘" : a.busy ? "◌" : a.healthy ? "●" : "●";
@@ -475,7 +559,7 @@ function AccountRow({ account: a, selected }) {
         : "";
     const pointer = selected ? "▶" : " ";
     const nameColor = isDisabled ? "gray" : undefined;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : undefined, children: pointer }), _jsxs(Text, { color: dotColor, children: [" ", dot, " "] }), _jsx(Text, { color: nameColor, dimColor: isDisabled, children: a.id.slice(0, 20).padEnd(20) }), _jsx(Text, { color: statusColor, children: statusLabel }), providerTag && _jsx(Text, { color: a.provider === "openai_subscription" ? "cyan" : "magenta", children: providerTag.padEnd(10) }), !providerTag && _jsx(Text, { children: "".padEnd(10) }), _jsx(Text, { color: "gray", children: " req " }), _jsx(Text, { color: "white", children: String(a.requestCount).padStart(5) }), _jsx(Text, { color: "gray", children: "  err " }), _jsx(Text, { color: a.errorCount > 0 ? "red" : "gray", children: String(a.errorCount).padStart(3) }), _jsx(Text, { color: "gray", children: "  tok " }), _jsx(Text, { color: expiryColor, children: expiryLabel.padEnd(8) }), _jsx(Text, { color: "gray", children: "  last " }), _jsx(Text, { color: "gray", children: formatAgo(a.lastUsedMs) }), a.provider !== "openai_subscription" && (_jsxs(Text, { color: "gray", children: ["  ", a.activeSessions ?? 0, " active / ", a.inFlightRequests ?? 0, " streams"] })), capsHint && _jsx(Text, { color: "yellow", children: capsHint })] }), rl.lastUpdated > 0 && (_jsxs(Box, { paddingLeft: 4, children: [_jsx(UtilBar, { label: "5h", util: rl.fiveHourUtil, resetTs: rl.fiveHourReset, isActive: rl.claim === "five_hour", cap: s5 }), _jsx(Text, { children: "   " }), _jsx(UtilBar, { label: "7d", util: rl.sevenDayUtil, resetTs: rl.sevenDayReset, isActive: rl.claim === "seven_day", cap: w7 })] }))] }));
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: selected ? "cyan" : undefined, children: pointer }), _jsxs(Text, { color: dotColor, children: [" ", dot, " "] }), _jsx(Text, { color: nameColor, dimColor: isDisabled, children: a.id.slice(0, 20).padEnd(20) }), _jsx(Text, { color: statusColor, children: statusLabel }), providerTag && _jsx(Text, { color: a.provider === "openai_subscription" ? "cyan" : "magenta", children: providerTag.padEnd(10) }), !providerTag && _jsx(Text, { children: "".padEnd(10) }), _jsx(Text, { color: "gray", children: " req " }), _jsx(Text, { color: "white", children: String(a.requestCount).padStart(5) }), _jsx(Text, { color: "gray", children: "  err " }), _jsx(Text, { color: a.errorCount > 0 ? "red" : "gray", children: String(a.errorCount).padStart(3) }), _jsx(Text, { color: "gray", children: "  tok " }), _jsx(Text, { color: expiryColor, children: expiryLabel.padEnd(8) }), _jsx(Text, { color: "gray", children: "  last " }), _jsx(Text, { color: "gray", children: formatAgo(a.lastUsedMs) }), a.provider !== "openai_subscription" && (_jsxs(Text, { color: "gray", children: ["  ", a.activeSessions ?? 0, " active / ", a.inFlightRequests ?? 0, " streams"] })), capsHint && _jsx(Text, { color: "yellow", children: capsHint })] }), (rl.lastUpdated > 0 || usage) && (_jsxs(Box, { paddingLeft: 4, children: [_jsx(UtilBar, { label: "5h", util: globalCapacity.fiveHour.utilization, resetTs: globalCapacity.fiveHour.resetAt, isActive: rl.claim === "five_hour", cap: s5 }), _jsx(Text, { children: "   " }), _jsx(UtilBar, { label: "7d all-model", util: globalCapacity.sevenDay.utilization, resetTs: globalCapacity.sevenDay.resetAt, isActive: rl.claim === "seven_day", cap: w7 }), usage && _jsx(Text, { color: globalCapacity.usageFetchStatus === "fresh" ? "gray" : "yellow", children: `  usage ${globalCapacity.usageFetchStatus} ${usage.fetchedAt > 0 ? formatAgo(usage.fetchedAt) : ""}` })] })), capacityRows.map((row, index) => (_jsxs(Box, { paddingLeft: 4, children: [_jsxs(Text, { color: row.color, children: [" ", row.label] }), _jsxs(Text, { color: "gray", children: [" \u00B7 ", row.state] }), row.utilization !== undefined && _jsx(Text, { color: row.color, children: ` ${Math.round(row.utilization * 100)}%` }), row.resetAt !== undefined && row.resetAt > 0 && (_jsxs(Text, { color: "gray", children: [" ", `↻${formatResetIn(row.resetAt)}`] }))] }, `${row.label}-${index}`)))] }));
 }
 // ─── Utilization bar ─────────────────────────────────────────────────────────
 function UtilBar({ label, util, resetTs, isActive, cap }) {
@@ -507,8 +591,9 @@ function LogRow({ log, selected }) {
     const time = new Date(log.ts).toLocaleTimeString("en-GB", { hour12: false });
     const isError = log.type === "error";
     const isRefresh = log.type === "refresh";
-    const typeColor = isError ? "red" : isRefresh ? "yellow" : "gray";
-    const typeIcon = isError ? "✗" : isRefresh ? "↻" : "→";
+    const isWarn = log.type === "warn";
+    const typeColor = isError ? "red" : isWarn ? "yellow" : isRefresh ? "yellow" : "gray";
+    const typeIcon = isError ? "✗" : isWarn ? "⚠" : isRefresh ? "↻" : "→";
     const statusColor = log.statusCode === undefined ? undefined
         : log.statusCode >= 500 ? "red"
             : log.statusCode >= 400 ? "yellow"
@@ -543,6 +628,7 @@ function DetailPanel({ log }) {
         hour: "2-digit", minute: "2-digit", second: "2-digit",
     });
     const isError = log.type === "error";
+    const isWarn = log.type === "warn";
     const statusLabel = log.statusCode === undefined ? "—"
         : log.statusCode === 0 ? "connection error"
             : `${log.statusCode} ${httpStatusText(log.statusCode)}`;
@@ -551,7 +637,7 @@ function DetailPanel({ log }) {
             : log.statusCode >= 500 ? "red"
                 : log.statusCode >= 400 ? "yellow"
                     : "green";
-    return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [_jsx(Text, { bold: true, color: isError ? "red" : "cyan", children: " DETAILS " }), _jsxs(Box, { marginTop: 1, flexDirection: "column", gap: 0, children: [_jsxs(Box, { gap: 2, children: [_jsx(Field, { label: "Time", value: time }), _jsx(Field, { label: "Account", value: log.accountId })] }), _jsxs(Box, { gap: 2, children: [_jsx(Field, { label: "Method", value: log.method ?? "—" }), _jsx(Field, { label: "Path", value: log.path ?? "—" })] }), _jsxs(Box, { gap: 2, children: [_jsx(FieldColored, { label: "Status", value: statusLabel, color: statusColor }), _jsx(Field, { label: "Duration", value: log.durationMs !== undefined ? `${log.durationMs}ms` : "—" }), _jsx(Field, { label: "Type", value: log.type }), _jsx(Field, { label: "Source", value: sourceFullLabel(log.source) })] }), log.details && (_jsx(Box, { children: _jsx(Field, { label: "Details", value: log.details }) })), log.cacheReadTokens !== undefined && (_jsx(Box, { gap: 2, children: _jsx(CacheBreakdown, { read: log.cacheReadTokens, created: log.cacheCreationTokens ?? 0, input: log.inputTokens ?? 0, output: log.outputTokens ?? 0 }) }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", borderStyle: "single", borderColor: "gray", paddingX: 1, children: [_jsx(Text, { bold: true, color: isError ? "red" : isWarn ? "yellow" : "cyan", children: " DETAILS " }), _jsxs(Box, { marginTop: 1, flexDirection: "column", gap: 0, children: [_jsxs(Box, { gap: 2, children: [_jsx(Field, { label: "Time", value: time }), _jsx(Field, { label: "Account", value: log.accountId })] }), _jsxs(Box, { gap: 2, children: [_jsx(Field, { label: "Method", value: log.method ?? "—" }), _jsx(Field, { label: "Path", value: log.path ?? "—" })] }), _jsxs(Box, { gap: 2, children: [_jsx(FieldColored, { label: "Status", value: statusLabel, color: statusColor }), _jsx(Field, { label: "Duration", value: log.durationMs !== undefined ? `${log.durationMs}ms` : "—" }), _jsx(Field, { label: "Type", value: log.type }), _jsx(Field, { label: "Source", value: sourceFullLabel(log.source) })] }), log.details && (_jsx(Box, { children: _jsx(Field, { label: "Details", value: log.details }) })), log.cacheReadTokens !== undefined && (_jsx(Box, { gap: 2, children: _jsx(CacheBreakdown, { read: log.cacheReadTokens, created: log.cacheCreationTokens ?? 0, input: log.inputTokens ?? 0, output: log.outputTokens ?? 0 }) }))] })] }));
 }
 function Field({ label, value }) {
     return (_jsxs(Box, { children: [_jsxs(Text, { color: "gray", children: [label, ": "] }), _jsx(Text, { color: "white", children: value })] }));

package/dist/ui/accountsApi.js

@@ -2,28 +2,22 @@
  * Tiny authenticated HTTP client for /cc-router/accounts.
  *
  * Used by the Ink dashboard to mutate account settings (enable/disable,
- * set per-account caps, delete) without exiting the TUI. The `addAccount`
- * flow is NOT in here — that runs inquirer and must exit Ink first; see
- * src/cli/cmd-status.ts `runAddAccountFlow`.
+ * set per-account caps, delete) without exiting Ink first. The `addAccount`
+ * flow is not here because it runs inquirer.
  */
 const REQUEST_TIMEOUT_MS = 3_000;
+const MAX_PUBLIC_ROWS = 12;
 export function createAccountsApi(baseUrl, authToken) {
     const base = baseUrl.replace(/\/+$/, "") + "/cc-router/accounts";
-    const authHeaders = authToken
-        ? { authorization: `Bearer ${authToken}` }
-        : {};
+    const authHeaders = authToken ? { authorization: `Bearer ${authToken}` } : {};
     async function send(method, path, body) {
         const res = await fetch(base + path, {
             method,
-            headers: {
-                ...authHeaders,
-                ...(body !== undefined ? { "content-type": "application/json" } : {}),
-            },
+            headers: { ...authHeaders, ...(body !== undefined ? { "content-type": "application/json" } : {}) },
             body: body !== undefined ? JSON.stringify(body) : undefined,
             signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
         });
         if (!res.ok) {
-            // Try to surface the server's error message if we can read one
             let detail = "";
             try {
                 const data = await res.json();
@@ -34,15 +28,137 @@ export function createAccountsApi(baseUrl, authToken) {
             throw new Error(`HTTP ${res.status}${detail}`);
         }
     }
+    async function list() {
+        const res = await fetch(base, { method: "GET", headers: authHeaders, signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS) });
+        if (!res.ok)
+            throw new Error(`HTTP ${res.status}`);
+        const payload = await res.json();
+        return Array.isArray(payload.accounts) ? payload.accounts.flatMap(publicAccountSafeView) : [];
+    }
+    return {
+        list,
+        patch(id, patch) { return send("PATCH", `/${encodeURIComponent(id)}`, patch); },
+        setProviderEnabled(provider, enabled) { return send("PATCH", `/providers/${encodeURIComponent(provider)}`, { enabled }); },
+        remove(id) { return send("DELETE", `/${encodeURIComponent(id)}`); },
+    };
+}
+function isRecord(value) {
+    return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+function publicAccountSafeView(value) {
+    if (!isRecord(value) || typeof value.id !== "string")
+        return [];
+    const provider = value.provider === "anthropic_subscription" || value.provider === "openai_subscription"
+        ? value.provider
+        : undefined;
+    const rateLimits = publicRateLimits(value.rateLimits);
+    const modelCooldowns = publicCooldowns(value.modelCooldowns);
+    return [{
+            id: publicText(value.id, 128, "unknown-account"),
+            ...(provider ? { provider } : {}),
+            ...(rateLimits ? { rateLimits } : {}),
+            globalCooldownUntilMs: publicTimestamp(value.globalCooldownUntilMs),
+            modelCooldowns,
+        }];
+}
+function publicRateLimits(value) {
+    if (!isRecord(value))
+        return undefined;
+    const usage = publicUsage(value.usage);
     return {
-        patch(id, patch) {
-            return send("PATCH", `/${encodeURIComponent(id)}`, patch);
-        },
-        setProviderEnabled(provider, enabled) {
-            return send("PATCH", `/providers/${encodeURIComponent(provider)}`, { enabled });
-        },
-        remove(id) {
-            return send("DELETE", `/${encodeURIComponent(id)}`);
-        },
+        status: value.status === "allowed" || value.status === "rate_limited" ? value.status : "unknown",
+        fiveHourUtil: publicUtilization(value.fiveHourUtil),
+        fiveHourReset: publicTimestamp(value.fiveHourReset),
+        sevenDayUtil: publicUtilization(value.sevenDayUtil),
+        sevenDayReset: publicTimestamp(value.sevenDayReset),
+        claim: publicClaim(value.claim),
+        plan: value.plan === "Pro" || value.plan === "Max 5x" || value.plan === "Max 20x" ? value.plan : "",
+        requestsLimit: publicInteger(value.requestsLimit),
+        lastUpdated: publicTimestamp(value.lastUpdated),
+        ...(usage ? { usage } : {}),
     };
 }
+function publicUsage(value) {
+    if (!isRecord(value))
+        return undefined;
+    const fiveHour = publicWindow(value.fiveHour);
+    const sevenDay = publicWindow(value.sevenDay);
+    const extraUsage = isRecord(value.extraUsage)
+        ? {
+            enabled: value.extraUsage.enabled === true,
+            spendLimitReached: value.extraUsage.spendLimitReached === true,
+            usable: value.extraUsage.usable === true,
+        }
+        : undefined;
+    return {
+        ...(fiveHour ? { fiveHour } : {}),
+        ...(sevenDay ? { sevenDay } : {}),
+        modelLimits: (Array.isArray(value.modelLimits) ? value.modelLimits : [])
+            .flatMap(publicModelLimit)
+            .slice(0, MAX_PUBLIC_ROWS),
+        ...(extraUsage ? { extraUsage } : {}),
+        fetchedAt: publicTimestamp(value.fetchedAt),
+        fetchStatus: publicFetchStatus(value.fetchStatus),
+    };
+}
+function publicWindow(value) {
+    if (!isRecord(value))
+        return undefined;
+    return { utilization: publicUtilization(value.utilization), resetAt: publicTimestamp(value.resetAt) };
+}
+function publicModelLimit(value) {
+    if (!isRecord(value))
+        return [];
+    return [{
+            modelFamily: publicModelFamily(value.modelFamily),
+            displayName: publicText(value.displayName, 80, "Unknown model"),
+            utilization: publicUtilization(value.utilization),
+            resetAt: publicTimestamp(value.resetAt),
+            active: value.active === true,
+            severity: publicSeverity(value.severity),
+        }];
+}
+function publicCooldowns(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value.flatMap(cooldown => {
+        if (!isRecord(cooldown))
+            return [];
+        const untilMs = publicTimestamp(cooldown.untilMs);
+        return untilMs > 0 ? [{ modelFamily: publicModelFamily(cooldown.modelFamily), untilMs }] : [];
+    }).slice(0, MAX_PUBLIC_ROWS);
+}
+function publicUtilization(value) {
+    return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.min(1, value)) : 0;
+}
+function publicTimestamp(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
+}
+function publicInteger(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
+}
+function publicText(value, maxLength, fallback) {
+    if (typeof value !== "string")
+        return fallback;
+    const normalized = value.replace(/[\u0000-\u001f\u007f]/g, "").trim().slice(0, maxLength);
+    return normalized || fallback;
+}
+function publicModelFamily(value) {
+    return typeof value === "string" && /^[a-z0-9-]{1,64}$/.test(value) ? value : "unknown";
+}
+function publicSeverity(value) {
+    return value === "warning" || value === "critical" ? value : value ? "unknown" : "";
+}
+function publicFetchStatus(value) {
+    return value === "fresh" || value === "stale" || value === "unavailable" ? value : "unavailable";
+}
+function publicClaim(value) {
+    if (typeof value !== "string")
+        return "unknown";
+    const claim = value.trim().toLowerCase();
+    if (!claim)
+        return "";
+    if (claim === "five_hour" || claim === "seven_day" || claim === "seven_day_oauth_apps" || claim === "seven_day_overage_included")
+        return claim;
+    return claim.startsWith("seven_day_") ? "seven_day_model" : "unknown";
+}

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "@timo972/cc-router",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "Cache-aware session router for Claude Max OAuth tokens — use multiple Claude Max accounts with Claude Code",
   "type": "module",
   "bin": {
     "cc-router": "dist/cli/index.js"
   },
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsx src/cli/index.ts",
-    "start": "node dist/cli/index.js",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "lint": "tsc --noEmit"
-  },
   "keywords": [
     "claude",
     "anthropic",
@@ -57,6 +49,7 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
+    "@types/express-serve-static-core": "^4.17.33",
     "@types/node": "^20.0.0",
     "@types/react": "^18.3.0",
     "tsx": "^4.19.0",
@@ -64,6 +57,14 @@
     "vitest": "^4.1.2"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
+  },
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsx src/cli/index.ts",
+    "start": "node dist/cli/index.js",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "lint": "tsc --noEmit"
   }
-}
+}