Usage ignores Claude advisor calls because their tokens appear only in message.usage.iterations. With the transcript from #24129, the Usage page shows only the executor's $0.13 and drops the advisor's $0.75.
Keep the executor record unchanged and emit one usage record per valid advisor_message iteration under its own model. Separate stable dedupe keys prevent repeated content-block lines from counting advisor calls twice. Advance the scan cache to v10 and reparse older Claude entries so existing transcripts pick up advisor usage.
Fixes https://github.com/pingdotgg/t3code/issues/24129
Triaged bug via the automated issue flow. GitCafe: #24129.
Reuses the existing contributor fix. Changes are limited to the Claude usage parser, cache invalidation, and focused tests. Pricing, client rendering, settings, and contracts use their existing paths.
claudeUsage.test.ts, usageScanCache.test.ts, and UsageService.test.ts.Original implementation: Claude Sonnet 5.5 via T3 Code / Claude Code. Triage and verification: GPT-6.1 and Claude Opus 5.5 via T3 Code / Codex and Claude Code harnesses.
Added 1 commit
Verdict: Needs Human Approval
Macroscope's review found this PR requires human approval — This focused fix changes production usage metering by adding advisor-model token records and reparsing cached Claude history, which can alter displayed totals and calculated costs. The implementation is localized and tested, but the metering impact warrants human review.
You can add or adjust custom eligibility rules. Learn more.
No actionable comments were generated in the recent review.
44f3e6d5-b0e2-43c6-92ee-0be5a5fc91baReviewing files that changed from the base of the PR and between 7d5880c5c666da50dc51559cbf5b1b18f45cf19b and 82d2a8c468b28fba0935edf29220e13288b55056.
apps/server/src/provider/Drivers/claudeUsage.test.tsapps/server/src/usage/UsageService.test.tsapps/server/src/usage/usageScanCache.tsIncluded review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 7 remain after this review.
Claude usage parsing now returns arrays of usage records and includes valid advisor iterations as separate records. The scan cache advances to version 10 and resets older Claude entries so they can be reparsed.
Changes: Claude usage parsing and cache
| Layer / File(s) | Summary |
|---|---|
Parse executor and advisor usage apps/server/src/provider/Drivers/claudeUsage.ts, apps/server/src/provider/Drivers/claudeUsage.test.ts | parseClaudeLine returns an array. It retains the executor record and adds a record for each valid advisor iteration, using that iteration’s model and token counts. Tests cover dedupe keys, parser paths, and invalid advisor entries. |
Invalidate older Claude cache entries apps/server/src/usage/usageScanCache.ts, apps/server/src/usage/usageScanCache.test.ts, apps/server/src/usage/UsageService.test.ts | The cache version and filename advance to v10. Older Claude entries are reset for reparsing, and tests cover the reset behavior and updated filename. |
Priority: External image Normal
Estimated code review effort: 3 (Moderate) | ~25 minutes
Change: Bug fix · Severity of issue fixed: Medium
Suggested reviewers: pixpmusic, maria-rcks
82d2aAdvisor usage is counted separately at the advisor model’s rates, and existing transcripts are rescanned without duplicating cached executor usage. No actionable merge risk was established.
| Check name | Status | Explanation |
|---|---|---|
| Title check | Passed | The title clearly and concisely describes the primary change: counting Claude advisor calls under the advisor model. |
| Description check | Passed | The description includes all required sections. It explains the missing advisor usage, the parser and cache changes, the linked issue, focused verification results, runtime checks, limitations, and th… |
| Linked Issues check | Passed | The changes satisfy issue #24129. parseClaudeLine and parseClaudeRecord keep the executor record and add one record for each valid non-synthetic advisor_message iteration. Each advisor record us… |
| Out of Scope Changes check | Passed | The changes stay within issue #24129. They modify the Claude usage parser, focused parser tests, scan-cache invalidation, and related cache tests. These changes directly support advisor usage accounti… |
Explanation
The description includes all required sections. It explains the missing advisor usage, the parser and cache changes, the linked issue, focused verification results, runtime checks, limitations, and the models and harnesses used. It does not include explicit maintainer approval, but it provides a focused-bug scope justification and is otherwise complete.
Explanation
The changes satisfy issue #24129. parseClaudeLine and parseClaudeRecord keep the executor record and add one record for each valid non-synthetic advisor_message iteration. Each advisor record uses the iteration model and token counts, while the executor keeps top-level usage. Advisor dedupe keys differ from executor keys and remain stable across repeated content blocks. The model field remains available to the existing model-rate pricing path. Scan cache version 10 invalidates Claude entries from older versions, and focused tests cover parsing, deduplication, and cache invalidation.
Explanation
The changes stay within issue #24129. They modify the Claude usage parser, focused parser tests, scan-cache invalidation, and related cache tests. These changes directly support advisor usage accounting and rescanning of existing transcripts. No unrelated UI, settings, pricing logic, or contract changes are present in the reviewed change summary.
Comment @coderabbitai help to get the list of available commands.
Added 1 commit