root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(FN-983): show reset date for all providers in usage indicator

Browse Source 
- Remove isClaudeWeeklyWindow() suppression logic so absolute reset timestamps display for all provider windows
- Populate resetAt field in Codex (reset_at / reset_after_seconds), Gemini (resetTime), Minimax (remains_time), and Zai (nextResetTime) providers
- Enable fallback relative text generation for all windows when resetText is null but resetAt exists
- Add tests for resetAt extraction across Codex, Gemini, Minimax, and Zai providers
- Update UsageIndicator component tests to reflect that all windows now show absolute reset dates
This commit is contained in:
gsxdsm
2026-04-05 11:54:20 -07:00
parent 9dca3724a0
commit 6e4ecac40b
4 changed files with 335 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
packages/dashboard/src/usage.test.ts
View File

@@ -1476,6 +1476,99 @@ describe("usage", () => {
expect(sessionWindow!.percentUsed).toBe(67.5);
expect(sessionWindow!.percentLeft).toBe(32.5);
});
it("sets resetAt from reset_at timestamp", async () => {
const resetAtTimestamp = Math.floor(Date.now() / 1000) + 2 * 60 * 60; // 2 hours from now in seconds
const mockResponse = {
rate_limit: {
primary_window: {
used_percent: 50,
reset_at: resetAtTimestamp,
limit_window_seconds: 5 * 60 * 60,
},
},
};
mockReadFileSync.mockImplementation((path: string) => {
if (path.includes("codex")) {
return JSON.stringify({
tokens: {
access_token: "test-token",
},
});
}
throw new Error("File not found");
});
const mockReq = { on: vi.fn(), write: vi.fn(), end: vi.fn() };
mockRequest.mockImplementation((_options: any, callback: any) => {
const mockRes = {
statusCode: 200,
headers: {},
on: vi.fn((event: string, handler: any) => {
if (event === "data") handler(Buffer.from(JSON.stringify(mockResponse)));
if (event === "end") handler();
}),
};
callback(mockRes);
return mockReq;
});
const providers = await fetchAllProviderUsage();
const codex = providers.find((p) => p.name === "Codex")!;
expect(codex.status).toBe("ok");
const sessionWindow = codex.windows.find((w) => w.label.includes("Session"))!;
expect(sessionWindow.resetAt).toBe(new Date(resetAtTimestamp * 1000).toISOString());
});
it("sets resetAt from reset_after_seconds fallback", async () => {
const mockResponse = {
rate_limit: {
primary_window: {
used_percent: 50,
reset_after_seconds: 7200, // 2 hours
limit_window_seconds: 5 * 60 * 60,
},
},
};
mockReadFileSync.mockImplementation((path: string) => {
if (path.includes("codex")) {
return JSON.stringify({
tokens: {
access_token: "test-token",
},
});
}
throw new Error("File not found");
});
const mockReq = { on: vi.fn(), write: vi.fn(), end: vi.fn() };
mockRequest.mockImplementation((_options: any, callback: any) => {
const mockRes = {
statusCode: 200,
headers: {},
on: vi.fn((event: string, handler: any) => {
if (event === "data") handler(Buffer.from(JSON.stringify(mockResponse)));
if (event === "end") handler();
}),
};
callback(mockRes);
return mockReq;
});
const providers = await fetchAllProviderUsage();
const codex = providers.find((p) => p.name === "Codex")!;
expect(codex.status).toBe("ok");
const sessionWindow = codex.windows.find((w) => w.label.includes("Session"))!;
expect(sessionWindow.resetAt).toBeDefined();
// resetAt should be approximately Date.now() + 7200000
const resetAtDate = new Date(sessionWindow.resetAt!);
const expectedMs = Date.now() + 7200 * 1000;
expect(Math.abs(resetAtDate.getTime() - expectedMs)).toBeLessThan(1000);
});
});
describe("Gemini provider", () => {
@@ -1558,6 +1651,53 @@ describe("usage", () => {
expect(flashWindow!.percentLeft).toBe(85);
});
it("sets resetAt from resetTime in bucket data", async () => {
const resetTime = new Date(Date.now() + 2 * 60 * 60 * 1000);
const mockResponse = {
buckets: [
{
modelId: "gemini-2.0-flash",
remainingFraction: 0.85,
resetTime: resetTime.toISOString(),
},
],
};
mockReadFileSync.mockImplementation((path: string) => {
if (path.includes("gemini")) {
if (path.includes("oauth_creds")) {
return JSON.stringify({
access_token: "test-token",
id_token: "header.eyJlbWFpbCI6InRlc3RAZXhhbXBsZS5jb20ifQ.signature",
});
}
throw new Error("File not found");
}
throw new Error("File not found");
});
const mockReq = { on: vi.fn(), write: vi.fn(), end: vi.fn() };
mockRequest.mockImplementation((_options: any, callback: any) => {
const mockRes = {
statusCode: 200,
headers: {},
on: vi.fn((event: string, handler: any) => {
if (event === "data") handler(Buffer.from(JSON.stringify(mockResponse)));
if (event === "end") handler();
}),
};
callback(mockRes);
return mockReq;
});
const providers = await fetchAllProviderUsage();
const gemini = providers.find((p) => p.name === "Gemini")!;
expect(gemini.status).toBe("ok");
const flashWindow = gemini.windows.find((w) => w.label.includes("Flash"))!;
expect(flashWindow.resetAt).toBe(new Date(resetTime).toISOString());
});
it("handles unsupported auth type (api-key)", async () => {
mockReadFileSync.mockImplementation((path: string) => {
if (path.includes("gemini")) {
@@ -1840,6 +1980,57 @@ describe("usage", () => {
expect(minimax.status).toBe("error");
expect(minimax.error).toContain("Auth expired");
});
it("sets resetAt from remains_time", async () => {
const remainsTimeMs = 3 * 60 * 60 * 1000; // 3 hours
const mockResponse = {
model_remains: [
{
model_name: "MiniMax-M*",
current_interval_total_count: 4500,
current_interval_usage_count: 4000,
remains_time: remainsTimeMs,
start_time: Date.now() - 2 * 60 * 60 * 1000,
end_time: Date.now() + remainsTimeMs,
},
],
};
mockReadFileSync.mockImplementation((filePath: string) => {
if (filePath.includes(".pi/agent/auth.json")) {
return JSON.stringify({ minimax: { type: "api_key", key: "test-key" } });
}
throw new Error("File not found");
});
mockExecFileSync.mockImplementation(() => {
throw new Error("Keychain item not found");
});
const mockReq = { on: vi.fn(), write: vi.fn(), end: vi.fn() };
mockRequest.mockImplementation((_options: any, callback: any) => {
const mockRes = {
statusCode: 200,
headers: {},
on: vi.fn((event: string, handler: any) => {
if (event === "data") handler(Buffer.from(JSON.stringify(mockResponse)));
if (event === "end") handler();
}),
};
callback(mockRes);
return mockReq;
});
const providers = await fetchAllProviderUsage();
const minimax = providers.find((p) => p.name === "Minimax")!;
expect(minimax.status).toBe("ok");
const modelWindow = minimax.windows.find((w) => w.label === "MiniMax-M*")!;
expect(modelWindow.resetAt).toBeDefined();
// resetAt should be approximately Date.now() + remainsTimeMs
const resetAtDate = new Date(modelWindow.resetAt!);
const expectedMs = Date.now() + remainsTimeMs;
expect(Math.abs(resetAtDate.getTime() - expectedMs)).toBeLessThan(1000);
});
});
describe("Zai provider", () => {
@@ -2112,6 +2303,114 @@ describe("usage", () => {
expect(zai.status).toBe("error");
expect(zai.error).toContain("Auth expired");
});
it("sets resetAt from nextResetTime for TOKENS_LIMIT", async () => {
const nextReset = Date.now() + 3 * 60 * 60 * 1000;
const mockResponse = {
code: 200,
msg: "Operation successful",
data: {
limits: [
{
type: "TOKENS_LIMIT",
percentage: 25,
nextResetTime: nextReset,
},
],
level: "max",
},
success: true,
};
mockReadFileSync.mockImplementation((filePath: string) => {
if (filePath.includes(".pi/agent/auth.json")) {
return JSON.stringify({ zai: { type: "api_key", key: "test-api-key" } });
}
throw new Error("File not found");
});
mockExecFileSync.mockImplementation(() => {
throw new Error("Keychain item not found");
});
const mockReq = { on: vi.fn(), write: vi.fn(), end: vi.fn() };
mockRequest.mockImplementation((_options: any, callback: any) => {
const mockRes = {
statusCode: 200,
headers: {},
on: vi.fn((event: string, handler: any) => {
if (event === "data") handler(Buffer.from(JSON.stringify(mockResponse)));
if (event === "end") handler();
}),
};
callback(mockRes);
return mockReq;
});
const providers = await fetchAllProviderUsage();
const zai = providers.find((p) => p.name === "Zai")!;
expect(zai.status).toBe("ok");
const sessionWindow = zai.windows.find((w) => w.label === "Session (5h)")!;
expect(sessionWindow.resetAt).toBe(new Date(nextReset).toISOString());
});
it("sets resetAt from nextResetTime for TIME_LIMIT", async () => {
const nextReset = Date.now() + 25 * 24 * 60 * 60 * 1000;
const mockResponse = {
code: 200,
msg: "Operation successful",
data: {
limits: [
{
type: "TOKENS_LIMIT",
percentage: 10,
nextResetTime: Date.now() + 3 * 60 * 60 * 1000,
},
{
type: "TIME_LIMIT",
usage: 4000,
currentValue: 100,
remaining: 3900,
percentage: 2.5,
nextResetTime: nextReset,
},
],
level: "pro",
},
success: true,
};
mockReadFileSync.mockImplementation((filePath: string) => {
if (filePath.includes(".pi/agent/auth.json")) {
return JSON.stringify({ zai: { type: "api_key", key: "test-api-key" } });
}
throw new Error("File not found");
});
mockExecFileSync.mockImplementation(() => {
throw new Error("Keychain item not found");
});
const mockReq = { on: vi.fn(), write: vi.fn(), end: vi.fn() };
mockRequest.mockImplementation((_options: any, callback: any) => {
const mockRes = {
statusCode: 200,
headers: {},
on: vi.fn((event: string, handler: any) => {
if (event === "data") handler(Buffer.from(JSON.stringify(mockResponse)));
if (event === "end") handler();
}),
};
callback(mockRes);
return mockReq;
});
const providers = await fetchAllProviderUsage();
const zai = providers.find((p) => p.name === "Zai")!;
expect(zai.status).toBe("ok");
const mcpWindow = zai.windows.find((w) => w.label === "MCP Monthly")!;
expect(mcpWindow.resetAt).toBe(new Date(nextReset).toISOString());
});
});
describe("calculatePace helper", () => {

19
packages/dashboard/src/usage.ts
View File

@@ -948,13 +948,16 @@ async function fetchCodexUsage(): Promise<ProviderUsage> {
? win.limit_window_seconds * 1000
: undefined;
let resetAt: string | undefined;
if (win.reset_at) {
const msLeft = win.reset_at * 1000 - Date.now();
resetMs = msLeft > 0 ? msLeft : 0;
resetText = msLeft > 0 ? `resets in ${formatDuration(msLeft)}` : "resetting now";
resetAt = new Date(win.reset_at * 1000).toISOString();
} else if (win.reset_after_seconds) {
resetMs = win.reset_after_seconds * 1000;
resetText = `resets in ${formatDuration(resetMs)}`;
resetAt = new Date(Date.now() + resetMs).toISOString();
}
return {
label,
@@ -963,6 +966,7 @@ async function fetchCodexUsage(): Promise<ProviderUsage> {
resetText,
windowDurationMs,
resetMs,
resetAt,
};
};
@@ -1056,7 +1060,7 @@ async function fetchGeminiUsage(): Promise<ProviderUsage> {
const buckets: any[] = data.buckets || [];
if (Array.isArray(buckets) && buckets.length > 0) {
// Group by model family, pick lowest remainingFraction per family
const modelGroups = new Map<string, { pctLeft: number; resetText: string | null; resetMs: number | undefined; models: string[] }>();
const modelGroups = new Map<string, { pctLeft: number; resetText: string | null; resetMs: number | undefined; resetAt: string | undefined; models: string[] }>();
for (const b of buckets) {
const modelId: string = b.modelId || "unknown";
@@ -1065,10 +1069,12 @@ async function fetchGeminiUsage(): Promise<ProviderUsage> {
let resetText: string | null = null;
let resetMs: number | undefined;
let resetAt: string | undefined;
if (b.resetTime) {
const msLeft = new Date(b.resetTime).getTime() - Date.now();
resetMs = msLeft > 0 ? msLeft : 0;
resetText = msLeft > 0 ? `resets in ${formatDuration(msLeft)}` : "resetting now";
resetAt = new Date(b.resetTime).toISOString();
}
// Skip _vertex duplicates, classify by family
@@ -1086,6 +1092,7 @@ async function fetchGeminiUsage(): Promise<ProviderUsage> {
pctLeft,
resetText,
resetMs,
resetAt,
models: existing ? [...existing.models, modelId] : [modelId],
});
} else {
@@ -1103,6 +1110,7 @@ async function fetchGeminiUsage(): Promise<ProviderUsage> {
percentLeft: Math.min(100, Math.max(0, info.pctLeft)),
resetText: info.resetText,
resetMs: info.resetMs,
resetAt: info.resetAt,
windowDurationMs: DAILY_WINDOW_MS,
});
}
@@ -1174,9 +1182,11 @@ async function fetchMinimaxUsage(): Promise<ProviderUsage> {
let windowDurationMs: number | undefined;
const remainsTime: number = model.remains_time;
let resetAt: string | undefined;
if (remainsTime && remainsTime > 0) {
resetMs = remainsTime;
resetText = `resets in ${formatDuration(remainsTime)}`;
resetAt = new Date(Date.now() + remainsTime).toISOString();
}
const startTime: number = model.start_time;
@@ -1193,6 +1203,7 @@ async function fetchMinimaxUsage(): Promise<ProviderUsage> {
percentLeft: Math.min(100, Math.max(0, 100 - percentUsed)),
resetText,
resetMs,
resetAt,
windowDurationMs,
});
}
@@ -1270,11 +1281,13 @@ async function fetchZaiUsage(): Promise<ProviderUsage> {
let resetText: string | null = null;
let resetMs: number | undefined;
let windowDurationMs: number | undefined;
let resetAt: string | undefined;
const nextResetTime: number | undefined = tokensLimit.nextResetTime;
if (nextResetTime) {
resetMs = Math.max(0, nextResetTime - Date.now());
resetText = resetMs > 0 ? `resets in ${formatDuration(resetMs)}` : "resetting now";
resetAt = new Date(nextResetTime).toISOString();
// 5-hour window
windowDurationMs = 5 * 60 * 60 * 1000;
}
@@ -1285,6 +1298,7 @@ async function fetchZaiUsage(): Promise<ProviderUsage> {
percentLeft: Math.min(100, Math.max(0, 100 - percentage)),
resetText,
resetMs,
resetAt,
windowDurationMs,
});
}
@@ -1299,11 +1313,13 @@ async function fetchZaiUsage(): Promise<ProviderUsage> {
let resetText: string | null = null;
let resetMs: number | undefined;
let resetAt2: string | undefined;
const nextResetTime: number | undefined = timeLimit.nextResetTime;
if (nextResetTime) {
resetMs = Math.max(0, nextResetTime - Date.now());
resetText = resetMs > 0 ? `resets in ${formatDuration(resetMs)}` : "resetting now";
resetAt2 = new Date(nextResetTime).toISOString();
}
usage.windows.push({
@@ -1312,6 +1328,7 @@ async function fetchZaiUsage(): Promise<ProviderUsage> {
percentLeft: Math.min(100, Math.max(0, 100 - percentage)),
resetText,
resetMs,
resetAt: resetAt2,
windowDurationMs: 30 * 24 * 60 * 60 * 1000,
});
}