Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions src/utils/__tests__/usage-fetch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,23 @@ 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,
disabled_reason: null
}
});
const rateLimitedResponseBody = JSON.stringify({
error: {
message: 'Rate limited. Please try again later.',
Expand Down Expand Up @@ -654,6 +671,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();

Expand Down
5 changes: 4 additions & 1 deletion src/utils/usage-fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down