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

29
packages/dashboard/app/components/UsageIndicator.test.tsx
View File

@@ -1250,7 +1250,7 @@ describe("UsageIndicator", () => {
expect(document.querySelector(".usage-window-reset-at")).not.toBeInTheDocument();
});
it("Claude weekly window does not show absolute reset time (relative only)", () => {
it("Claude weekly window shows absolute reset time when resetAt is provided", () => {
const resetAt = new Date(Date.now() + 3 * 24 * 60 * 60 * 1000);
mockUseUsageData.mockReturnValue({
providers: [
@@ -1280,8 +1280,8 @@ describe("UsageIndicator", () => {
// Relative reset text should be present
expect(screen.getByText("resets in 3d")).toBeInTheDocument();
// Claude weekly windows intentionally suppress the absolute timestamp
expect(document.querySelector(".usage-window-reset-at")).not.toBeInTheDocument();
// All windows now show the absolute timestamp when resetAt is available
expect(document.querySelector(".usage-window-reset-at")).toBeInTheDocument();
});
it("Claude 5h session row shows both relative reset text and absolute reset time", () => {
@@ -1330,10 +1330,9 @@ describe("UsageIndicator", () => {
expect(screen.getByText("resets in 2h")).toBeInTheDocument();
expect(screen.getByText("resets in 5d")).toBeInTheDocument();
// Only the Session row should show the absolute reset time;
// the Weekly row intentionally suppresses it (relative-only for Claude weekly).
// Both rows show the absolute reset time (no more suppression for Claude weekly)
const resetAtElements = document.querySelectorAll(".usage-window-reset-at");
expect(resetAtElements.length).toBe(1);
expect(resetAtElements.length).toBe(2);
// Session row should show the absolute time formatted for today (just time like "2:30 PM")
const sessionResetAtEl = resetAtElements[0];
@@ -1439,7 +1438,7 @@ describe("UsageIndicator", () => {
expect(screen.getByText("resets in 6h")).toBeInTheDocument();
});
it("Claude weekly variant labels also suppress absolute reset time", () => {
it("Claude weekly variant labels show absolute reset time when resetAt is provided", () => {
const resetAt = new Date(Date.now() + 4 * 24 * 60 * 60 * 1000);
mockUseUsageData.mockReturnValue({
providers: [
@@ -1479,11 +1478,11 @@ describe("UsageIndicator", () => {
const resetTexts = screen.getAllByText("resets in 4d");
expect(resetTexts.length).toBe(2);
// Neither weekly variant should show absolute timestamp
expect(document.querySelectorAll(".usage-window-reset-at").length).toBe(0);
// Both weekly variants now show absolute timestamp
expect(document.querySelectorAll(".usage-window-reset-at").length).toBe(2);
});
it("Anthropic provider name also suppresses weekly absolute reset time", () => {
it("Anthropic provider name shows absolute reset time for weekly windows", () => {
const resetAt = new Date(Date.now() + 3 * 24 * 60 * 60 * 1000);
mockUseUsageData.mockReturnValue({
providers: [
@@ -1512,8 +1511,8 @@ describe("UsageIndicator", () => {
render(<UsageIndicator isOpen={true} onClose={mockOnClose} />);
expect(screen.getByText("resets in 3d")).toBeInTheDocument();
// "Anthropic" is treated as a Claude provider — weekly should suppress absolute time
expect(document.querySelector(".usage-window-reset-at")).not.toBeInTheDocument();
// All providers now show the absolute reset time for all windows
expect(document.querySelector(".usage-window-reset-at")).toBeInTheDocument();
});
it("non-Claude weekly windows still show absolute reset time when provided", () => {
@@ -1705,7 +1704,7 @@ describe("UsageIndicator", () => {
expect(document.querySelector(".usage-window-reset")).not.toBeInTheDocument();
});
it("Claude session window does not generate fallback text (only weekly)", () => {
it("Claude session window generates fallback reset text from resetAt", () => {
const resetAt = new Date(Date.now() + 3 * 60 * 60 * 1000);
mockUseUsageData.mockReturnValue({
providers: [
@@ -1733,7 +1732,7 @@ describe("UsageIndicator", () => {
render(<UsageIndicator isOpen={true} onClose={mockOnClose} />);
// Session window should NOT get the weekly fallback treatment
expect(document.querySelector(".usage-window-reset")).not.toBeInTheDocument();
// All windows now get fallback text generation when resetText is null but resetAt exists
expect(document.querySelector(".usage-window-reset")).toBeInTheDocument();
});
});

27
packages/dashboard/app/components/UsageIndicator.tsx
View File

@@ -69,22 +69,6 @@ interface UsageWindowRowProps {
providerName: string;
}
/**
* Determine whether a usage window is a Claude weekly window.
*
* Claude weekly windows (e.g. "Weekly", "Weekly (Sonnet)", "Weekly (Opus)")
* intentionally suppress the absolute reset timestamp display because the
* relative text ("resets in 3d") already provides the most useful information
* for weekly quota planning. Session windows (e.g. "Session (5h)") and
* non-Claude providers continue to show the absolute timestamp when available.
*/
function isClaudeWeeklyWindow(providerName: string, windowLabel: string): boolean {
const normalizedProvider = providerName.toLowerCase();
const isClaudeProvider = normalizedProvider.includes("claude") || normalizedProvider.includes("anthropic");
const isWeeklyWindow = windowLabel.toLowerCase().startsWith("weekly");
return isClaudeProvider && isWeeklyWindow;
}
/**
* Single usage window row with progress bar
*/
@@ -98,10 +82,9 @@ function UsageWindowRow({ window, viewMode, providerName }: UsageWindowRowProps)
const headerText = isRemainingMode ? `${Math.round(window.percentLeft)}% remaining` : `${Math.round(window.percentUsed)}% used`;
const footerText = isRemainingMode ? `${Math.round(window.percentUsed)}% used` : `${Math.round(window.percentLeft)}% left`;
// If resetText is null but resetAt exists (and this is a Claude weekly window),
// generate relative text from resetAt as a fallback
// If resetText is null but resetAt exists, generate relative text from resetAt as a fallback
let displayResetText = window.resetText;
if (!displayResetText && window.resetAt && isClaudeWeeklyWindow(providerName, window.label)) {
if (!displayResetText && window.resetAt) {
const msLeft = new Date(window.resetAt).getTime() - Date.now();
if (msLeft > 0) {
const hours = Math.floor(msLeft / (60 * 60 * 1000));
@@ -173,10 +156,8 @@ function UsageWindowRow({ window, viewMode, providerName }: UsageWindowRowProps)
{displayResetText && (
<span className="usage-window-reset">{displayResetText}</span>
)}
{/* Absolute reset timestamp: shown for session windows and non-Claude providers.
Claude weekly windows intentionally suppress this — the relative "resets in Xd"
text is more useful for weekly quota planning than an exact calendar timestamp. */}
{window.resetAt && !isClaudeWeeklyWindow(providerName, window.label) && (
{/* Absolute reset timestamp: shown for all windows when resetAt is available. */}
{window.resetAt && (
<span className="usage-window-reset-at">
{formatResetAt(window.resetAt)}
</span>