-
-
-
updateTokenLimit(provider.id, USER_TOKEN_LIMIT_WINDOWS.SESSION, event.target.value)}
- aria-label={`${provider.name} session token limit`}
+
+ {TOKEN_LIMIT_WINDOW_OPTIONS.map((windowOption) => (
+ updateTokenLimit(provider.id, windowOption.id, value)}
/>
-
-
-
- updateTokenLimit(provider.id, USER_TOKEN_LIMIT_WINDOWS.WEEKLY, event.target.value)}
- aria-label={`${provider.name} weekly token limit`}
- />
-
+ ))}
))}
diff --git a/src/app/api/usage/system-quota/route.js b/src/app/api/usage/system-quota/route.js
index 628506da..226af440 100644
--- a/src/app/api/usage/system-quota/route.js
+++ b/src/app/api/usage/system-quota/route.js
@@ -84,7 +84,11 @@ function sanitizeQuotaForUser(data, user) {
}) => ({
...provider,
hasFailedQuotaChecks: failedAccountCount > 0,
- quotas: provider.quotas.map(({ resetAt: _resetAt, recurring: _recurring, ...quota }) => quota),
+ quotas: provider.quotas.map(({ resetAt, recurring: _recurring, ...quota }) => (
+ provider.quotaSource === "user-token-limit"
+ ? { ...quota, resetAt }
+ : quota
+ )),
})),
};
}
@@ -138,6 +142,7 @@ function buildUserTokenQuotaProviders(tokenQuota, activeConnectionCounts) {
remainingPercentage: quota?.remainingPercentage ?? null,
isUnlimited: quota?.isUnlimited === true,
windowStart: quota?.windowStart || null,
+ resetAt: quota?.resetAt || null,
};
}),
}];
diff --git a/src/lib/db/index.js b/src/lib/db/index.js
index ff478c18..9ca342b4 100644
--- a/src/lib/db/index.js
+++ b/src/lib/db/index.js
@@ -63,6 +63,7 @@ export {
export {
createEmptyUserTokenLimits, getUserTokenLimits,
replaceUserTokenLimits, getUserProviderTokenUsageSince,
+ getUserProviderEarliestTokenUsageSince,
} from "./repos/userTokenLimitsRepo.js";
// Aliases (model + custom + mitm)
diff --git a/src/lib/db/repos/userTokenLimitsRepo.js b/src/lib/db/repos/userTokenLimitsRepo.js
index e4a8c0c6..f146afe2 100644
--- a/src/lib/db/repos/userTokenLimitsRepo.js
+++ b/src/lib/db/repos/userTokenLimitsRepo.js
@@ -112,4 +112,28 @@ export async function getUserProviderTokenUsageSince(userId, provider, since) {
[userId, provider, since.toISOString()],
);
return Math.max(0, Number(row?.totalTokens) || 0);
+}
+
+/**
+ * Return the earliest request with billable tokens inside a rolling window.
+ * Its expiry determines when the first part of a rolling quota becomes available again.
+ */
+export async function getUserProviderEarliestTokenUsageSince(userId, provider, since) {
+ if (!userId) return null;
+ assertProvider(provider);
+ if (!(since instanceof Date) || !Number.isFinite(since.getTime())) {
+ throw new Error("A valid usage window start is required");
+ }
+
+ const db = await getAdapter();
+ const row = db.get(
+ `SELECT MIN(timestamp) AS timestamp
+ FROM usageHistory
+ WHERE userId = ?
+ AND provider = ?
+ AND timestamp >= ?
+ AND (COALESCE(promptTokens, 0) + COALESCE(completionTokens, 0)) > 0`,
+ [userId, provider, since.toISOString()],
+ );
+ return row?.timestamp || null;
}
\ No newline at end of file
diff --git a/src/lib/userTokenQuota.js b/src/lib/userTokenQuota.js
index a454f4f5..531fae15 100644
--- a/src/lib/userTokenQuota.js
+++ b/src/lib/userTokenQuota.js
@@ -1,4 +1,5 @@
import {
+ getUserProviderEarliestTokenUsageSince,
getUserProviderTokenUsageSince,
getUserTokenLimits,
} from "@/lib/db/index.js";
@@ -6,6 +7,9 @@ import { getUserTokenLimitWindowStart } from "@/lib/tokenLimitEnforcer.js";
import {
USER_TOKEN_LIMIT_PROVIDER_IDS,
USER_TOKEN_LIMIT_WINDOW_IDS,
+ USER_TOKEN_LIMIT_SESSION_MS,
+ USER_TOKEN_LIMIT_WEEKLY_MS,
+ USER_TOKEN_LIMIT_WINDOWS,
} from "open-sse/config/userTokenLimits.js";
function normalizeNonNegativeNumber(value) {
@@ -33,6 +37,19 @@ export function buildUserTokenQuotaWindow(limit, used, windowStart) {
};
}
+function getSessionNextTokenRestoreAt(earliestTokenUsageAt, now) {
+ if (!earliestTokenUsageAt) return null;
+
+ const expiryTime = new Date(earliestTokenUsageAt).getTime() + USER_TOKEN_LIMIT_SESSION_MS;
+ return Number.isFinite(expiryTime) && expiryTime > now.getTime()
+ ? new Date(expiryTime).toISOString()
+ : null;
+}
+
+function getWeeklyResetAt(windowStart) {
+ return new Date(windowStart.getTime() + USER_TOKEN_LIMIT_WEEKLY_MS).toISOString();
+}
+
/**
* Return the configured token-budget usage for a dashboard user.
* Limits of zero intentionally remain unlimited while still reporting use.
@@ -58,6 +75,24 @@ export async function getUserTokenQuota(userId, now = new Date()) {
)),
);
+ const sessionTokenUsageEntries = await Promise.all(
+ USER_TOKEN_LIMIT_PROVIDER_IDS.map(async (provider) => [
+ provider,
+ await getUserProviderEarliestTokenUsageSince(
+ userId,
+ provider,
+ windows[USER_TOKEN_LIMIT_WINDOWS.SESSION],
+ ),
+ ]),
+ );
+ const sessionNextTokenRestoreAt = Object.fromEntries(
+ sessionTokenUsageEntries.map(([provider, timestamp]) => [
+ provider,
+ getSessionNextTokenRestoreAt(timestamp, now),
+ ]),
+ );
+ const weeklyResetAt = getWeeklyResetAt(windows[USER_TOKEN_LIMIT_WINDOWS.WEEKLY]);
+
const providers = Object.fromEntries(
USER_TOKEN_LIMIT_PROVIDER_IDS.map((provider) => [provider, {}]),
);
@@ -67,6 +102,9 @@ export async function getUserTokenQuota(userId, now = new Date()) {
used,
windows[windowType],
);
+ providers[provider][windowType].resetAt = windowType === USER_TOKEN_LIMIT_WINDOWS.SESSION
+ ? sessionNextTokenRestoreAt[provider]
+ : weeklyResetAt;
}
return providers;
diff --git a/tests/unit/system-quota-route.test.js b/tests/unit/system-quota-route.test.js
index 61648d41..fe720160 100644
--- a/tests/unit/system-quota-route.test.js
+++ b/tests/unit/system-quota-route.test.js
@@ -38,6 +38,9 @@ function quota(sessionLimit, sessionUsed, weeklyLimit, weeklyUsed) {
remainingPercentage: limit > 0 ? Math.round((Math.max(0, limit - used) / limit) * 100) : null,
isUnlimited: limit === 0,
windowStart,
+ resetAt: windowStart === "2026-07-17T05:00:00.000Z"
+ ? "2026-07-17T10:00:00.000Z"
+ : "2026-07-20T17:00:00.000Z",
});
return {
@@ -92,8 +95,14 @@ describe("/api/usage/system-quota personal token quota overlay", () => {
expect(providerById(payload, "codex").accountCount).toBeUndefined();
expect(providerById(payload, "codex").quotaAccountCount).toBeUndefined();
expect(providerById(payload, "codex").quotas).toMatchObject([
- { name: "Session", tokenBudget: true, limit: 100, used: 25, remaining: 75, remainingPercentage: 75 },
- { name: "Weekly", tokenBudget: true, limit: 1000, used: 200, remaining: 800, remainingPercentage: 80 },
+ {
+ name: "Session", tokenBudget: true, limit: 100, used: 25,
+ remaining: 75, remainingPercentage: 75, resetAt: "2026-07-17T10:00:00.000Z",
+ },
+ {
+ name: "Weekly", tokenBudget: true, limit: 1000, used: 200,
+ remaining: 800, remainingPercentage: 80, resetAt: "2026-07-20T17:00:00.000Z",
+ },
]);
expect(providerById(payload, "orbit-provider").quotas).toMatchObject([
{ name: "Session", tokenBudget: true, limit: 100, used: 25 },
diff --git a/tests/unit/user-token-quota.test.js b/tests/unit/user-token-quota.test.js
index bb12ba80..22052d89 100644
--- a/tests/unit/user-token-quota.test.js
+++ b/tests/unit/user-token-quota.test.js
@@ -2,11 +2,13 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
const getUserTokenLimits = vi.fn();
const getUserProviderTokenUsageSince = vi.fn();
+const getUserProviderEarliestTokenUsageSince = vi.fn();
const getUserTokenLimitWindowStart = vi.fn();
vi.mock("@/lib/db/index.js", () => ({
getUserTokenLimits,
getUserProviderTokenUsageSince,
+ getUserProviderEarliestTokenUsageSince,
}));
vi.mock("@/lib/tokenLimitEnforcer.js", () => ({ getUserTokenLimitWindowStart }));
@@ -23,6 +25,7 @@ describe("user token quota snapshot", () => {
beforeEach(() => {
getUserTokenLimits.mockReset();
getUserProviderTokenUsageSince.mockReset();
+ getUserProviderEarliestTokenUsageSince.mockReset();
getUserTokenLimitWindowStart.mockReset();
getUserTokenLimits.mockResolvedValue({
@@ -42,6 +45,7 @@ describe("user token quota snapshot", () => {
const windowType = since.getTime() === sessionStart.getTime() ? "session" : "weekly";
return usage.get(usageKey(provider, windowType));
});
+ getUserProviderEarliestTokenUsageSince.mockResolvedValue(null);
});
it("calculates both provider windows and preserves zero as unlimited", async () => {
@@ -58,7 +62,21 @@ describe("user token quota snapshot", () => {
},
});
expect(quota.codex.session.windowStart).toBe(sessionStart.toISOString());
+ expect(quota.codex.session.resetAt).toBeNull();
+ expect(quota.codex.weekly.resetAt).toBe("2026-07-20T17:00:00.000Z");
expect(getUserProviderTokenUsageSince).toHaveBeenCalledTimes(4);
+ expect(getUserProviderEarliestTokenUsageSince).toHaveBeenCalledTimes(2);
+ });
+
+ it("reports when the next tokens leave a rolling session window", async () => {
+ getUserProviderEarliestTokenUsageSince.mockImplementation(async (_userId, provider) => (
+ provider === "orbit-provider" ? "2026-07-17T06:30:00.000Z" : null
+ ));
+
+ const quota = await getUserTokenQuota("user-1", new Date("2026-07-17T10:00:00.000Z"));
+
+ expect(quota["orbit-provider"].session.resetAt).toBe("2026-07-17T11:30:00.000Z");
+ expect(quota.codex.session.resetAt).toBeNull();
});
it("requires a user id", async () => {