Skip to content

Commit a56a58e

Browse files
committed
fix: take weekly usage from the API, not the status-line payload
1 parent 798a986 commit a56a58e

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

‎src/utils/__tests__/usage-prefetch.test.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('usage prefetch', () => {
9595
expect(mockFetchUsage.mock.calls.length).toBe(0);
9696
});
9797

98-
it('uses rate_limits from StatusJSON instead of fetching from API', async () => {
98+
it('uses session rate_limits from StatusJSON without fetching from API', async () => {
9999
const lines = makeLines(
100100
[{ id: '1', type: 'session-usage' }]
101101
);
@@ -108,7 +108,7 @@ describe('usage prefetch', () => {
108108
});
109109

110110
expect(usageData?.sessionUsage).toBe(42);
111-
expect(usageData?.weeklyUsage).toBe(15);
111+
expect(usageData?.weeklyUsage).toBeUndefined();
112112
expect(mockFetchUsage.mock.calls.length).toBe(0);
113113
});
114114

@@ -318,7 +318,6 @@ describe('usage prefetch', () => {
318318

319319
expect(usageData).toEqual({
320320
sessionUsage: 42,
321-
weeklyUsage: 15,
322321
weeklyResetAt: epochToIso(1774540000)
323322
});
324323
expect(mockFetchUsage.mock.calls).toEqual([
@@ -523,6 +522,8 @@ describe('usage prefetch', () => {
523522
});
524523

525524
it('does not require per-model buckets when only the all-models weekly widget is present', async () => {
525+
mockFetchUsage.mockResolvedValue({ weeklyUsage: 15 });
526+
526527
const lines = makeLines(
527528
[{ id: '1', type: 'weekly-usage' }]
528529
);
@@ -535,7 +536,7 @@ describe('usage prefetch', () => {
535536
});
536537

537538
expect(usageData?.weeklyUsage).toBe(15);
538-
expect(mockFetchUsage.mock.calls.length).toBe(0);
539+
expect(mockFetchUsage.mock.calls.length).toBe(1);
539540
});
540541

541542
it('fetches scoped API usage when requested per-model stdin buckets are null', async () => {
@@ -670,15 +671,16 @@ describe('usage prefetch', () => {
670671
});
671672

672673
describe('extractUsageDataFromRateLimits', () => {
673-
it('extracts session and weekly usage from rate_limits', () => {
674+
it('extracts session usage and weekly reset from rate_limits, not weekly usage', () => {
674675
const result = extractUsageDataFromRateLimits({
675676
five_hour: { used_percentage: 42, resets_at: 1774020000 },
676677
seven_day: { used_percentage: 15, resets_at: 1774540000 }
677678
});
678679

679680
expect(result).not.toBeNull();
680681
expect(result?.sessionUsage).toBe(42);
681-
expect(result?.weeklyUsage).toBe(15);
682+
expect(result?.weeklyUsage).toBeUndefined();
683+
expect(result?.weeklyResetAt).toBe(epochToIso(1774540000));
682684
});
683685

684686
it('converts epoch seconds to ISO strings for resets_at', () => {
@@ -721,7 +723,8 @@ describe('extractUsageDataFromRateLimits', () => {
721723

722724
expect(result).not.toBeNull();
723725
expect(result?.sessionUsage).toBeUndefined();
724-
expect(result?.weeklyUsage).toBe(10);
726+
expect(result?.weeklyUsage).toBeUndefined();
727+
expect(result?.weeklyResetAt).toBe(epochToIso(1774540000));
725728
});
726729

727730
it('treats used_percentage of 0 as valid data', () => {

‎src/utils/usage-prefetch.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,12 @@ export function extractUsageDataFromRateLimits(rateLimits: StatusJSON['rate_limi
210210
// usage-fetch.test.ts, so this lookup is safe despite the untyped index.
211211
const rateLimitBuckets = rateLimits as unknown as Record<string, RateLimitPeriod | null | undefined>;
212212

213+
// Weekly USAGE is NOT taken from the payload: a session rendered from a stale payload
214+
// carries a stale seven_day value. The API is the weekly usage source, the same one the
215+
// usage sampler records. The reset time is still read from the payload.
213216
const usageData: UsageData = {
214217
sessionUsage: rateLimits.five_hour?.used_percentage ?? undefined,
215218
sessionResetAt: epochSecondsToIsoString(rateLimits.five_hour?.resets_at),
216-
weeklyUsage: rateLimits.seven_day?.used_percentage ?? undefined,
217219
weeklyResetAt: epochSecondsToIsoString(rateLimits.seven_day?.resets_at)
218220
// Note: rate_limits does not include extra_usage data (extraUsageEnabled, etc.).
219221
// Those fields are only available via the API fetch path.

0 commit comments

Comments
 (0)