@timo972/cc-router 0.9.0 → 0.10.0-rc.0

package/dist/ui/Dashboard.js

@@ -92,6 +92,79 @@ export function getAccountCapacityRows(account) {
     }
     return rows;
 }
+function codexWindowLabel(windowMinutes, fallback) {
+    // 10_080 minutes reads better as "weekly" than the generic "168h"; 300 needs
+    // no special case because the generic branch already renders it as "5h".
+    if (windowMinutes === 10_080)
+        return "weekly";
+    if (windowMinutes > 0) {
+        return windowMinutes % 60 === 0 ? `${windowMinutes / 60}h` : `${windowMinutes}m`;
+    }
+    return fallback;
+}
+/** Named Codex metered buckets as compact capacity rows (default bucket renders as bars). */
+export function getCodexCapacityRows(codex, globalCooldownUntilMs, now = Date.now()) {
+    const rows = [];
+    for (const bucket of codex?.buckets ?? []) {
+        if (bucket.limitId === "codex")
+            continue;
+        const cooling = bucket.cooldownUntilMs > now;
+        const windows = [];
+        if (bucket.primary) {
+            windows.push({ label: codexWindowLabel(bucket.primary.windowMinutes, "5h"), ...bucket.primary });
+        }
+        if (bucket.secondary) {
+            windows.push({ label: codexWindowLabel(bucket.secondary.windowMinutes, "weekly"), ...bucket.secondary });
+        }
+        for (const window of windows) {
+            const exhausted = window.utilization >= 1;
+            // While cooling, the countdown that matters is the cooldown's own expiry
+            // — it can come from Retry-After and outlast (or replace) the window
+            // reset, and a row labeled "bucket cooldown" showing the window's reset
+            // instant, or no time at all when that reset is unknown, tells the
+            // operator the wrong thing about when routing resumes.
+            const resetAt = cooling
+                ? Math.floor(bucket.cooldownUntilMs / 1000)
+                : window.resetAt;
+            rows.push({
+                label: `${bucket.label} ${window.label}`,
+                state: cooling ? "bucket cooldown" : exhausted ? "exhausted" : "available",
+                color: cooling ? "yellow" : exhausted ? "red" : window.utilization >= 0.7 ? "yellow" : "green",
+                utilization: window.utilization,
+                ...(resetAt > 0 ? { resetAt } : {}),
+            });
+        }
+        if (windows.length === 0 && cooling) {
+            rows.push({
+                label: bucket.label,
+                state: "bucket cooldown",
+                color: "yellow",
+                resetAt: Math.floor(bucket.cooldownUntilMs / 1000),
+            });
+        }
+    }
+    if (globalCooldownUntilMs && globalCooldownUntilMs > now) {
+        rows.push({ label: "cooldown", state: "global", color: "red", resetAt: Math.floor(globalCooldownUntilMs / 1000) });
+    }
+    return rows;
+}
+/**
+ * True when an OpenAI/Codex account is hard-blocked from routing: the
+ * account-wide status reports `rate_limited`, or the default bucket
+ * (`limitId === "codex"`) has a fully exhausted primary or secondary window.
+ * Named model-scoped buckets exhausting on their own does not count — the
+ * account can still serve other models via those buckets' fallback.
+ */
+export function isCodexLimited(codex) {
+    if (!codex)
+        return false;
+    if (codex.status === "rate_limited")
+        return true;
+    const defaultBucket = codex.buckets.find(bucket => bucket.limitId === "codex");
+    if (!defaultBucket)
+        return false;
+    return (defaultBucket.primary?.utilization ?? 0) >= 1 || (defaultBucket.secondary?.utilization ?? 0) >= 1;
+}
 export function Dashboard({ port, baseUrl, authToken, onIntent }) {
     const { exit } = useApp();
     const [data, setData] = useState(null);
@@ -251,10 +324,6 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
     const doSetLimit = useCallback(async (field, value) => {
         if (!selectedAccount)
             return;
-        if (selectedAccount.provider === "openai_subscription") {
-            showBanner("OpenAI accounts do not use Anthropic caps", "yellow");
-            return;
-        }
         try {
             await api.patch(selectedAccount.id, { [field]: value });
             const label = field === "sessionLimitPercent" ? "5h cap" : "7d cap";
@@ -415,19 +484,11 @@ function LiveDashboard({ data, port, baseUrl, lastUpdate, api, modelsApi, onInte
                 return;
             }
             if (input === "w") {
-                if (!selectedAccountIsAnthropic) {
-                    showBanner("OpenAI accounts do not use Anthropic caps", "yellow");
-                    return;
-                }
                 setMode("editWeekly");
                 setEditBuffer("");
                 return;
             }
             if (input === "s") {
-                if (!selectedAccountIsAnthropic) {
-                    showBanner("OpenAI accounts do not use Anthropic caps", "yellow");
-                    return;
-                }
                 setMode("editSession");
                 setEditBuffer("");
                 return;
@@ -536,8 +597,13 @@ 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 isOpenAI = a.provider === "openai_subscription";
+    const codex = a.codexRateLimits;
+    const codexDefaultBucket = codex?.buckets.find(bucket => bucket.limitId === "codex");
+    const capacityRows = isOpenAI
+        ? getCodexCapacityRows(a.codexRateLimits, a.globalCooldownUntilMs)
+        : getAccountCapacityRows(a);
+    const isLimited = isOpenAI ? isCodexLimited(a.codexRateLimits) : rl.status === "rate_limited";
     const isDisabled = a.enabled === false;
     const dot = isDisabled ? "⊘" : isLimited ? "⊘" : a.busy ? "◌" : a.healthy ? "●" : "●";
     const dotColor = isDisabled ? "gray" : isLimited ? "red" : a.busy ? "yellow" : a.healthy ? "green" : "red";
@@ -547,8 +613,8 @@ function AccountRow({ account: a, selected }) {
     const expiryColor = a.expiresInMs < 10 * 60 * 1000 ? "red"
         : a.expiresInMs < 30 * 60 * 1000 ? "yellow"
             : "white";
-    const providerTag = a.provider === "openai_subscription"
-        ? " [OpenAI]"
+    const providerTag = isOpenAI
+        ? ` [OpenAI${codex?.plan ? ` ${codex.plan}` : ""}]`
         : rl.plan ? ` [${rl.plan}]` : "";
     // User-defined caps hint
     const s5 = a.sessionLimitPercent ?? 100;
@@ -559,7 +625,17 @@ 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 || 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}`)))] }));
+    const creditsLabel = codex?.credits
+        ? codex.credits.unlimited
+            ? "∞"
+            : codex.credits.balance !== undefined
+                ? codex.credits.balance
+                : codex.credits.hasCredits ? "yes" : "no"
+        : 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: isOpenAI ? "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) }), _jsxs(Text, { color: "gray", children: ["  ", a.activeSessions ?? 0, " active / ", a.inFlightRequests ?? 0, " streams"] }), capsHint && _jsx(Text, { color: "yellow", children: capsHint }), a.credentialsPendingWrite && (
+                    // The account still works — its rotated token is live in memory — but a
+                    // restart before the pending write lands would need a re-login.
+                    _jsx(Text, { color: "yellow", children: "  creds unsaved" }))] }), (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) : ""}` })] })), isOpenAI && codexDefaultBucket && (codexDefaultBucket.primary || codexDefaultBucket.secondary) && (_jsxs(Box, { paddingLeft: 4, children: [_jsx(UtilBar, { label: "5h", util: codexDefaultBucket.primary?.utilization ?? 0, resetTs: codexDefaultBucket.primary?.resetAt ?? 0, isActive: false, cap: s5 }), _jsx(Text, { children: "   " }), _jsx(UtilBar, { label: "weekly", util: codexDefaultBucket.secondary?.utilization ?? 0, resetTs: codexDefaultBucket.secondary?.resetAt ?? 0, isActive: false, cap: w7 }), creditsLabel !== undefined && _jsx(Text, { color: "gray", children: `  credits ${creditsLabel}` })] })), 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 }) {

package/package.json

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

package/dist/providers/openai/account-pool.js

@@ -1,11 +0,0 @@
-export function createOpenAIAccountPicker(accounts) {
-    let index = 0;
-    return () => {
-        const enabled = accounts.filter(account => account.enabled);
-        if (enabled.length === 0)
-            return null;
-        const account = enabled[index % enabled.length];
-        index = (index + 1) % enabled.length;
-        return account;
-    };
-}