From 7433a6d2757b200e4e8994b40b3e26319fe0c631 Mon Sep 17 00:00:00 2001 From: Martijn Riemers Date: Thu, 4 Jun 2026 14:22:46 +0200 Subject: [PATCH 1/2] fix: treat enabled extra usage without a monthly limit as complete usage data Accounts with extra usage enabled but no monthly limit configured (monthly_limit: null) never receive extraUsageLimit/extraUsageUtilization from the usage API. hasRequiredUsageField treated those absent fields as incomplete data on every fetch - including successful ones - so cached data was never accepted, the fetch loop re-fetched each cycle, and the extra usage widgets surfaced the cached lock error as a permanent [Timeout]. Extend the existing extraUsageEnabled === false special case to any response where the extra usage state is known: once the API has told us whether extra usage is enabled, absent detail fields are conclusive and refetching cannot produce them. Fixes #413 Co-Authored-By: Claude Opus 4.8 --- src/utils/__tests__/usage-fetch.test.ts | 62 +++++++++++++++++++++++++ src/utils/usage-fetch.ts | 5 +- 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/src/utils/__tests__/usage-fetch.test.ts b/src/utils/__tests__/usage-fetch.test.ts index ca01ad337..305b39227 100644 --- a/src/utils/__tests__/usage-fetch.test.ts +++ b/src/utils/__tests__/usage-fetch.test.ts @@ -312,6 +312,24 @@ describe('fetchUsageData error handling', () => { utilization: 2.6 } }); + const noLimitExtraUsageResponseBody = JSON.stringify({ + five_hour: { + utilization: 42, + resets_at: '2030-01-01T00:00:00.000Z' + }, + seven_day: { + utilization: 17, + resets_at: '2030-01-07T00:00:00.000Z' + }, + extra_usage: { + is_enabled: true, + monthly_limit: null, + used_credits: 542, + utilization: null, + currency: 'EUR', + disabled_reason: null + } + }); const rateLimitedResponseBody = JSON.stringify({ error: { message: 'Rate limited. Please try again later.', @@ -625,6 +643,50 @@ describe('fetchUsageData error handling', () => { } }); + it('treats enabled extra usage without a monthly limit as complete for extra usage widget fields', () => { + const harness = createProbeHarness(); + + try { + const home = harness.createTokenHome('no-limit-extra-usage'); + const requiredFields = ['extraUsageEnabled', 'extraUsageLimit', 'extraUsageUsed', 'extraUsageUtilization']; + const result = harness.runProbe({ + claudeConfigDir: home.claudeConfig, + home: home.home, + mode: 'success', + nowMs, + pathDir: home.bin, + requiredFields, + responseBody: noLimitExtraUsageResponseBody + }); + + expect(result.first).toEqual({ + sessionUsage: 42, + sessionResetAt: '2030-01-01T00:00:00.000Z', + weeklyUsage: 17, + weeklyResetAt: '2030-01-07T00:00:00.000Z', + extraUsageEnabled: true, + extraUsageUsed: 542 + }); + expect(result.second).toEqual(result.first); + expect(result.requestCount).toBe(1); + + const cachedResult = harness.runProbe({ + claudeConfigDir: home.claudeConfig, + home: home.home, + mode: 'unexpected', + nowMs: nowMs + 10000, + pathDir: home.bin, + requiredFields + }); + + expect(cachedResult.first).toEqual(result.first); + expect(cachedResult.second).toEqual(result.first); + expect(cachedResult.requestCount).toBe(0); + } finally { + harness.cleanup(); + } + }); + it('keeps parse-error locks distinct from timeout locks', () => { const harness = createProbeHarness(); diff --git a/src/utils/usage-fetch.ts b/src/utils/usage-fetch.ts index c6f3620fe..546e6352c 100644 --- a/src/utils/usage-fetch.ts +++ b/src/utils/usage-fetch.ts @@ -181,7 +181,10 @@ function hasRequiredUsageField(data: UsageData, field: UsageDataField): boolean return true; } - return data.extraUsageEnabled === false && EXTRA_USAGE_DETAIL_FIELDS.has(field); + // Once the API has reported the extra usage state, missing detail fields are + // conclusive: accounts without a configured monthly limit never report + // monthly_limit/utilization, so refetching cannot produce them (#413). + return data.extraUsageEnabled !== undefined && EXTRA_USAGE_DETAIL_FIELDS.has(field); } function hasRequiredUsageFields(data: UsageData, requiredFields: readonly UsageDataField[] = []): boolean { From e9fdaba973281e327d527cc79a09883935fa36da Mon Sep 17 00:00:00 2001 From: Martijn Riemers Date: Thu, 4 Jun 2026 14:37:59 +0200 Subject: [PATCH 2/2] test: drop currency from no-limit fixture to stay order-independent of #418 Once #418 teaches the parser about extra_usage.currency, a fixture carrying the field would add extraUsageCurrency to the parsed result and break this test's expectation depending on merge order. The field is irrelevant to what this test covers (monthly_limit: null handling). Co-Authored-By: Claude Opus 4.8 --- src/utils/__tests__/usage-fetch.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/__tests__/usage-fetch.test.ts b/src/utils/__tests__/usage-fetch.test.ts index 305b39227..7416a8f56 100644 --- a/src/utils/__tests__/usage-fetch.test.ts +++ b/src/utils/__tests__/usage-fetch.test.ts @@ -326,7 +326,6 @@ describe('fetchUsageData error handling', () => { monthly_limit: null, used_credits: 542, utilization: null, - currency: 'EUR', disabled_reason: null } });