Skip to content

feat(usage): pool subscription limits per provider across accounts and environments #10300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 8 commits into from
Sep 6, 2026
+1,823 −246
Merged

feat(usage): pool subscription limits per provider across accounts and environments #10300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
45005b1
feat(usage): pool subscription limits per provider across accounts an…
juliusmarminge Sep 6, 2026
a16dd04
chore(usage): drop exports left over from the removed matrix view
juliusmarminge Sep 6, 2026
994f962
fix(usage): look fixtures up as own properties
juliusmarminge Sep 6, 2026
ce614a9
fix(usage): judge pooled pace over members with a clock only
juliusmarminge Sep 6, 2026
0e9aedb
fix(usage): name the account chip for assistive tech
juliusmarminge Sep 6, 2026
e7901ed
fix(usage): redeem on the instance whose credits are shown; let hub r…
juliusmarminge Sep 6, 2026
1486ec3
fix(web): keep pooled limits readable on narrow screens
juliusmarminge Sep 6, 2026
83eaf1b
fix(web): fit account popovers within small phone screens
juliusmarminge Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions apps/server/src/usage/cliproxyUsageLimits.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,22 @@ describe("cliproxyStatusToAccounts", () => {
},
]);
});

it("names a Codex five-hour window `primary`, as the Codex driver does", () => {
const accounts = cliproxyStatusToAccounts(
{
accounts: {
"codex-abc-someone@example.com-pro.json": {
provider: "codex",
plan: "pro",
five_hour: { hard_limited: false, known: true, used_percent: 40 },
},
},
},
checkedAt,
);
expect(accounts[0]?.usageLimits.windows.map((window) => window.id)).toEqual(["primary"]);
});
});

describe("accountEmailFromAuthFile", () => {
Expand Down
4 changes: 3 additions & 1 deletion apps/server/src/usage/cliproxyUsageLimits.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ export function cliproxyAccountToUsageLimits(
if (!window || window.known === false) continue;
const resetsAt = isoFromHub(window.reset_at);
windows.push({
id: spec.id,
// Codex names its five-hour window by position, so a hub row and a
// native row for the same account pool together.
id: spec.key === "five_hour" && account.provider === "codex" ? "primary" : spec.id,
kind: spec.kind,
label: spec.label,
windowDurationMins: spec.windowDurationMins,
Expand Down
Loading
Loading