reset.restoresPercent > 0);
+ const nextReset = pool.resets[0];
return (
@@ -567,17 +574,23 @@ function PoolWindowCard({
{pool.remainingPercent}%
- left
+ {pool.members.length > 1 ? "average left" : "left"}
{pool.pace ? : null}
- {nextRefill && pool.columns.length > 1 ? (
+ {pool.members.length > 1 ? (
+
+ Across {pool.members.length} accounts
+
+ ) : null}
+ {nextReset && providerAccountCount > 1 ? (
- ↻ +{nextRefill.restoresPercent}%
+ Next account reset{" "}
+ {formatResetsIn(nextReset.member.window, now)?.replace("resets ", "")}
) : null}
-
+
{description ? (
{description}
) : null}
@@ -608,6 +621,7 @@ function PoolSection({ pool, now }: { readonly pool: LimitPool; readonly now: nu
{
});
});
- it("preserves gaps without counting missing windows toward pooled quota", () => {
+ it("fills each row with only accounts reporting that window", () => {
const [pool] = collectLimitPools(
[
account("a", [window]),
@@ -1352,18 +1352,49 @@ describe("pooled account columns", () => {
{ ...weekly, usedPercent: 80 },
]),
account("c", [weekly]),
+ {
+ ...account("capped", []),
+ limits: { checkedAt: "2026-09-03T11:00:00.000Z", windows: [], zeroSpendCap: true },
+ },
+ account("monthly", [{ ...window, kind: "monthly" }]),
],
now,
);
expect(keys(pool!)).toEqual([
- ["a", "b", null],
- [null, "b", "c"],
+ ["a", "b"],
+ ["b", "c"],
+ [null, "monthly"],
+ ]);
+ expect(pool!.windows[2]!.columns.map(({ account }) => account.key)).toEqual([
+ "capped",
+ "monthly",
]);
expect(pool!.windows[1]!.members.map((member) => member.account.key)).toEqual(["b", "c"]);
expect(pool!.windows[1]!.remainingPercent).toBe(40);
expect(pool!.windows[1]!.resets.map((reset) => reset.restoresPercent)).toEqual([40, 20]);
});
+ it("gives two Codex session accounts equal slots and a monthly-only account its own full row", () => {
+ const codex = (key: string, windows: LimitAccount["limits"]["windows"]) => ({
+ ...account(key, windows),
+ driver: ProviderDriverKind.make("codex"),
+ });
+ const [pool] = collectLimitPools(
+ [
+ codex("a", [window, { ...weekly, usedPercent: 90 }]),
+ codex("b", [window, { ...weekly, usedPercent: 100 }]),
+ codex("monthly", [{ ...window, kind: "monthly", usedPercent: 2 }]),
+ ],
+ now,
+ );
+ expect(keys(pool!)).toEqual([["a", "b"], ["a", "b"], ["monthly"]]);
+ expect(pool!.windows[1]!.remainingPercent).toBe(5);
+ expect(pool!.windows[1]!.members.map((member) => 100 - member.window.usedPercent)).toEqual([
+ 10, 0,
+ ]);
+ expect(pool!.windows[2]!.remainingPercent).toBe(98);
+ });
+
it("falls back to weekly resets when no account reports a session", () => {
const [pool] = collectLimitPools(
[
diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts
index 6fe6c70a89a4..e65d6c3fb337 100644
--- a/packages/shared/src/usageLimits.ts
+++ b/packages/shared/src/usageLimits.ts
@@ -693,9 +693,14 @@ function poolWindows(accounts: readonly LimitAccount[], now: number): readonly L
kind: first.kind,
label: first.label,
members,
- columns: accounts.map(
- (account) => memberByAccount.get(account.key) ?? { account, window: null },
- ),
+ columns: accounts.flatMap((account) => {
+ const member = memberByAccount.get(account.key);
+ return member
+ ? [member]
+ : first.kind === "monthly" && account.limits.zeroSpendCap
+ ? [{ account, window: null }]
+ : [];
+ }),
usedPercent: Math.round(usedPercent),
remainingPercent: Math.round(100 - usedPercent),
pace: meanElapsed === null ? null : paceOfShares(timedUsed, meanElapsed),