You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
fix(claude-cli): recognise paid usage and recheck stale plan limits - #8599
Recheck stale measured Claude CLI exhaustion after the existing one-minute cache interval. A top-up, reset or plan change can then reach the normal usage probe rather than remaining blocked until an old weekly reset.
Preserve the closed extra-usage entitlement/cap state from the usage response. When included quota is exhausted but extra usage is explicitly enabled and no reported cap is exhausted, admit as unknown and let the official CLI enforce wallet funds and spend limits. A remaining monthly allowance is never presented as a funded balance.
Preserve explicit CLI-refusal cooldowns, account/model isolation, account changes and refusal races, cache-only dashboard reads and secret-free persisted state. Usable included quota remains available after a reset even when the paid cap is exhausted.
No billing, credential, account, spend-limit or workflow settings change. This is separate from combo fallback in #8588.
Verification
Regression reproduced against unpatched published 2.100.1 source 00c02163e4352be5beb5633a3b6cc3b0be94ec8a; 2.100.2 still has the same defect.
Rebased onto dev at 9fec48a1f8bc1012fdf64dc089aeace597632782, retaining its newer display-window separation and validation.
bun test tests/providers/claude-cli-usage-admission.test.ts tests/providers/provider-anthropic-usage-windows.test.ts: 94 pass, 0 fail.
bun test tests/providers/provider-quota-claude-cli.test.ts: 27 pass, 0 fail, including inactive display rows and malformed allowance validation.
Pinned Bun 1.4.4: typecheck 2,435 files, structure check and privacy scan pass. The declared frozen dependencies were materialised without lifecycle scripts.
Independent review of the rebased final diff passed. An isolated published-package copy with the four-file repair completed a real Opus request while the measured weekly plan was exhausted and extra usage was enabled. The dev build was not installed.
bun scripts/test.ts --changed=origin/dev: 43,941 pass, 108 skip, 94 fail, 7 setup errors, across 1,860 files in 467.69 seconds. This broad run is not green. All 84 initial named failures reproduced on an unpatched release control. Two additional failures reproduced by exact name on unpatched current dev (missing generated launcher and retained-sync fixture). The remaining clean-home CLI-status case hit its five-second timeout; the unpatched control instead timed out in the adjacent dead-owner case through the same unchanged subprocess path. This supports fixture timing instability, not an exact reproduction of that case. Six setup errors concern absent release-tree fixtures; the seventh is an unrun Bun postinstall.
Local scope exception under AGENTS.md/CONTRIBUTING.md: the changed-import run already covers over 44,000 tests and took nearly eight minutes; extending this into a separate full local run during concurrent worktree activity is disproportionate. The 121 focused provider tests, type/structure/privacy/docs checks, independent review and unpatched controls cover this repair. Remaining platform/generated-artifact integration coverage is left to required CI on this exact head, which must pass before merge. No failing broad check is treated as passing.
Codex and CodeRabbit reviews completed on 3cc650af2a with no findings/actionable comments. Independent final-diff and baseline-failure review passed with the timing qualification above.
Checklist
Scope stays focused and avoids unrelated cleanup.
Docs or release notes were updated when needed.
Security-sensitive changes were reviewed for secrets, auth, and unsafe defaults.
Review readiness checklist
This PR stays in draft until every box below is ticked. Tick all four boxes once the requirements are met:
Required local validation passed; commands, results, and any full-suite exception are documented.
I pushed my PR to a recent dev commit (at most 10 behind; a maintainer may still ask for the exact tip before merge).
I resolved all correct Codex and CodeRabbit findings.
My PR is ready for review.
Summary by CodeRabbit
Usage Handling
Claude CLI subscription usage checks are cached for up to one minute. When included plan usage is exhausted, explicitly enabled extra usage can defer the decision to the CLI, but does not guarantee funds are available.
Explicitly disabled or exhausted extra usage does not bypass exhausted plan limits. CLI-reported refusals remain in effect until reset, with exhausted plans reported as a cooldown.
Documentation
Updated guidance on usage checks, caching, extra usage, and quota-limit behavior.
No actionable comments were generated in the recent review.
Walkthrough
Claude CLI usage probes now record extra-usage status in quota snapshots. Admission logic distinguishes enabled extra usage from exhausted included quota, preserves active CLI refusals, and validates cached status values. Tests and documentation cover the updated behavior.
Changes: Claude CLI usage admission
Layer / File(s)
Summary
Extra-usage quota state src/providers/quota-types.ts, src/providers/claude-cli-usage.ts, src/providers/claude-cli-usage-state.ts
ProviderQuota now supports enabled, disabled, and exhausted extra-usage states. The probe derives that state from the usage response and adds it to the quota when available. Snapshot loading rejects other defined values.
Quota admission and refusal handling src/adapters/claude-cli/usage-admission.ts
When extra usage is enabled, exhausted plan windows do not by themselves produce an exhausted result. An active CLI refusal still applies. The cached-snapshot path now preserves an active refusal independently of the computed admission state.
Regression coverage and behavior documentation tests/providers/claude-cli-usage-admission.test.ts, docs-site/src/content/docs/guides/providers.md, structure/providers/claude-cli-replay.md
Tests cover stale quota rechecks, extra-usage states, available included quota, refusal races, and account switches. The documentation describes the cache, extra-usage conditions, CLI-enforced limits, and failure behavior.
lidge-jun/opencodex#7916: Adds the Claude usage snapshot type and loader that this change extends with extra-usage validation.
Suggested reviewers:lidge-jun, ingwannu
Merge Risk: Minimal · up to 3cc65
The change recognizes paid extra usage and rechecks stale exhausted limits for the Claude CLI. No actionable merge-blocking risk was found.
Pre-merge checks: 4
Check name
Status
Explanation
Title check
The title names the two main changes: recognising paid (extra) usage in Claude CLI admission and rechecking stale plan-window exhaustion. The raw summary shows changes to usage-admission.ts, claude-cl…
Linked Issues check
The only linked issue, #8597, is closed and completed. Under the assessment rules, it supplies background only. No active directly linked targets remain, so no linked-issue coding requirements apply. …
Out of Scope Changes check
All changed files relate to the PR's stated intent: Claude CLI usage admission and its quota state. The files are src/adapters/claude-cli/usage-admission.ts, src/providers/claude-cli-usage.ts, src/pro…
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Full details: Title check
Explanation
The title names the two main changes: recognising paid (extra) usage in Claude CLI admission and rechecking stale plan-window exhaustion. The raw summary shows changes to usage-admission.ts, claude-cli-usage.ts, quota-types.ts, claude-cli-usage-state.ts, docs, and tests that match both parts. The title is specific, under 70 characters, and avoids vague wording. No unrelated changes were described.
Full details: Linked Issues check
Explanation
The only linked issue, #8597, is closed and completed. Under the assessment rules, it supplies background only. No active directly linked targets remain, so no linked-issue coding requirements apply. For reference, the PR changes address the issue's stated defects: (1) src/adapters/claude-cli/usage-admission.ts returns an active refusalUntil immediately and admits full plan windows as non-exhausting when claudeExtraUsage is "enabled"; (2) src/providers/claude-cli-usage.ts maps extra_usage to a closed claudeExtraUsage state; (3) src/providers/claude-cli-usage-state.ts rejects unknown claudeExtraUsage values; (4) tests/providers/claude-cli-usage-admission.test.ts adds coverage for these paths. These observations are informational and do not change the result.
Full details: Out of Scope Changes check
Explanation
All changed files relate to the PR's stated intent: Claude CLI usage admission and its quota state. The files are src/adapters/claude-cli/usage-admission.ts, src/providers/claude-cli-usage.ts, src/providers/claude-cli-usage-state.ts, src/providers/quota-types.ts (one optional field), tests/providers/claude-cli-usage-admission.test.ts, the provider guide docs-site/src/content/docs/guides/providers.md, and structure/providers/claude-cli-replay.md. The docs and tests support the code change. The PR description states no billing, credential, account, spend-limit, or workflow changes, and the summary shows none. Combo fallback (#8588) is not touched. The evidence came from the AI-generated change summary and the PR description. I did not read the raw diff, so this verdict rests on that summary. No unrelated change was demonstrated.
Finishing Touches
Generate unit tests (beta)
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.
all PR quality gates passed; the review readiness checklist is complete.
Review readiness checklist
✅ Required local validation passed; commands, results, and any full-suite exception are documented.
✅ I pushed my PR to a recent dev commit (at most 10 behind; a maintainer may still ask for the exact tip before merge).
✅ I resolved all correct Codex and CodeRabbit findings.
✅ My PR is ready for review.
✅ 4/4 boxes ticked.
This pull request has been marked Ready for Review.
The review-ready label marks this PR as ready; review automation runs independently.
Maintainers notified: @lidge-jun@Ingwannu
Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #8597.
No billing, credential, account, spend-limit or workflow settings change. This is separate from combo fallback in #8588.
Verification
00c02163e4352be5beb5633a3b6cc3b0be94ec8a; 2.100.2 still has the same defect.devat9fec48a1f8bc1012fdf64dc089aeace597632782, retaining its newer display-window separation and validation.bun test tests/providers/claude-cli-usage-admission.test.ts tests/providers/provider-anthropic-usage-windows.test.ts: 94 pass, 0 fail.bun test tests/providers/provider-quota-claude-cli.test.ts: 27 pass, 0 fail, including inactive display rows and malformed allowance validation.bun scripts/test.ts --changed=origin/dev: 43,941 pass, 108 skip, 94 fail, 7 setup errors, across 1,860 files in 467.69 seconds. This broad run is not green. All 84 initial named failures reproduced on an unpatched release control. Two additional failures reproduced by exact name on unpatched currentdev(missing generated launcher and retained-sync fixture). The remaining clean-home CLI-status case hit its five-second timeout; the unpatched control instead timed out in the adjacent dead-owner case through the same unchanged subprocess path. This supports fixture timing instability, not an exact reproduction of that case. Six setup errors concern absent release-tree fixtures; the seventh is an unrun Bun postinstall.3cc650af2awith no findings/actionable comments. Independent final-diff and baseline-failure review passed with the timing qualification above.Checklist
Review readiness checklist
This PR stays in draft until every box below is ticked. Tick all four boxes once the requirements are met:
Required local validation passed; commands, results, and any full-suite exception are documented.
I pushed my PR to a recent dev commit (at most 10 behind; a maintainer may still ask for the exact tip before merge).
I resolved all correct Codex and CodeRabbit findings.
My PR is ready for review.
Summary by CodeRabbit