Fix cost and token tracking between provider styles #8954
Merged
Conversation
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
dosubot
bot
added
the
size:L
Contributor
Review Summary✅ No issues found - This PR successfully fixes cost and token tracking between provider styles. Changes ReviewedCore Changes:
Provider Updates: Test Coverage:
Verification✅ Type safety maintained across all changes |
daniel-lxs
approved these changes
Oct 31, 2025
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
Contributor
Review TODOs
|
hannesrudolph
added
the
Issue/PR - Triage
| // For OpenAI (or when protocol is not specified). | ||
| result.contextTokens = (tokensIn || 0) + (tokensOut || 0) | ||
| } | ||
| const { tokensIn, tokensOut } = parsedText |
Contributor
There was a problem hiding this comment.
ParsedApiReqStartedTextType marks tokensIn/tokensOut/cacheWrites/cacheReads as required, but this block guards for missing fields with typeof checks. api_req_started payloads may not always include these keys (e.g., before usage aggregation), so the type should make them optional to match runtime reality and prevent misleading typings. Suggested change: make these fields optional in getApiMetrics.ts.
hannesrudolph
added
PR - Needs Review
and removed
Issue/PR - Triage
cte
approved these changes
Oct 31, 2025
github-project-automation
bot
moved this from PR [Needs Review]
to Done
in Roo Code Roadmap
mini2s
added a commit
to zgsm-ai/costrict
that referenced
this pull request
Nov 2, 2025
* Correct tool use suggestion to improve model adherence to suggestion (RooCodeInc#8315) * Correct tool use suggestion to improve model adherence to suggestion * tweak * removing user hint when refreshing models (RooCodeInc#7710) * feat(zgsm): add quota info display and periodic updates * Show the Roo provider on the welcome screen (RooCodeInc#8317) * wip: Website Improvements (RooCodeInc#8303) Co-authored-by: Matt Rubens <[email protected]> * refactor: remove pr-reviewer mode (RooCodeInc#8222) * feat: add animated quota display with staggered transitions * Merge remote-tracking branch 'upstream/main' into roo-to-main * web: More website copy tweaks (RooCodeInc#8326) Co-authored-by: Matt Rubens <[email protected]> * fix: remove <thinking> tags from prompts for cleaner output and fewer tokens (RooCodeInc#8319) Co-authored-by: Roo Code <[email protected]> Co-authored-by: Hannes Rudolph <[email protected]> * Upgrade Supernova (RooCodeInc#8330) * chore: add changeset for v3.28.9 (RooCodeInc#8336) * Changeset version bump (RooCodeInc#8337) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * Track when telemetry settings change (RooCodeInc#8339) * fix: use max_completion_tokens for GPT-5 models in LiteLLM provider (RooCodeInc#6980) Co-authored-by: Roo Code <[email protected]> Co-authored-by: daniel-lxs <[email protected]> * Make chat icons shrink-0 (RooCodeInc#8343) * web: Testimonials (RooCodeInc#8360) * Adds lots of testimonials, 5-stars from marketplace * Fits more testimonials in one page * Testimonial heading tweak * ci: refresh contrib.rocks cache workflow (RooCodeInc#8083) * feat: add Claude 4.5 Sonnet model across all providers (RooCodeInc#8368) * chore: add changeset for v3.28.10 (RooCodeInc#8369) * Changeset version bump (RooCodeInc#8370) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * fix: correct AWS Bedrock Claude Sonnet 4.5 model identifier (RooCodeInc#8372) Fixes RooCodeInc#8371 - Updates the model ID from anthropic.claude-4.5-sonnet-v1:0 to anthropic.claude-sonnet-4-5-20250929-v1:0 to match AWS Bedrock naming convention Co-authored-by: Roo Code <[email protected]> * fix: correct Claude Sonnet 4.5 model ID format (RooCodeInc#8373) * chore: add changeset for v3.28.11 (RooCodeInc#8374) * Changeset version bump (RooCodeInc#8375) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * fix: Anthropic Sonnet 4.5 model id + Bedrock 1M context checkbox (RooCodeInc#8384) fix(anthropic): use claude-sonnet-4-5 id fix(bedrock): enable 1M context checkbox for Sonnet 4.5 via shared list closes RooCodeInc#8379 closes RooCodeInc#8381 * chore: add changeset for v3.28.12 (RooCodeInc#8385) * Changeset version bump (RooCodeInc#8376) * changeset version bump * Revise changelog for version 3.28.12 Updated version number and consolidated patch notes. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * Fix Vertex Sonnet 4.5 (RooCodeInc#8391) * fix: remove topP parameter from Bedrock inference config (RooCodeInc#8388) Co-authored-by: Matt Rubens <[email protected]> * chore: add changeset for v3.28.13 (RooCodeInc#8393) * Changeset version bump (RooCodeInc#8394) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * feat: add GLM-4.6 model support for z.ai provider (RooCodeInc#8408) Co-authored-by: Roo Code <[email protected]> * chore: add changeset for v3.28.14 (RooCodeInc#8413) * Changeset version bump (RooCodeInc#8414) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * A couple more sonnet 4.5 fixes (RooCodeInc#8421) * chore: Remove unsupported Gemini 2.5 Flash Image Preview free model (RooCodeInc#8359) * Include reasoning messages in cloud tasks (RooCodeInc#8401) * fix: show send button when only images are selected in chat textarea (RooCodeInc#8423) Co-authored-by: Roo Code <[email protected]> Co-authored-by: Matt Rubens <[email protected]> * Add structured data to the homepage (RooCodeInc#8427) Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> * fix(ui): disable send button when no input content and update tests * fix: Addresses overeager 'there are unsaved changes' dialog in settings (RooCodeInc#8410) Fixes overeager 'there are unsaved changes' dialog in settings * feat: add UsageStats schema and type (RooCodeInc#8441) feat: add UsageStats schema and type to cloud.ts Co-authored-by: Roo Code <[email protected]> * Release: v1.80.0 (RooCodeInc#8442) chore: bump version to v1.80.0 * feat: add new DeepSeek and GLM models with detailed descriptions to the Chutes provider (RooCodeInc#8467) * Deprecate free grok 4 fast (RooCodeInc#8481) Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com> * fix: improve save button activation in prompts settings (RooCodeInc#5780) (RooCodeInc#8267) Co-authored-by: MuriloFP <[email protected]> Co-authored-by: Roo Code <[email protected]> Co-authored-by: daniel-lxs <[email protected]> * fix: properly reset cost limit tracking when user clicks "Reset and Continue" (RooCodeInc#6890) Co-authored-by: Roo Code <[email protected]> Co-authored-by: daniel-lxs <[email protected]> * chore(deps): update dependency vite to v6.3.6 [security] (RooCodeInc#7838) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update dependency glob to v11.0.3 (RooCodeInc#7767) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: add changeset for v3.28.15 (RooCodeInc#8491) * Changeset version bump (RooCodeInc#8492) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> * Clamp GPT-5 max output tokens to 20% of context window (RooCodeInc#8495) * fix: add ollama and lmstudio to MODELS_BY_PROVIDER (RooCodeInc#8511) Co-authored-by: Roo Code <[email protected]> * Release: v1.81.0 (RooCodeInc#8519) * Add the parent task ID in telemetry (RooCodeInc#8532) * Release: v1.82.0 (RooCodeInc#8535) * feat: Experiment: Show a bit of stats in Cloud tab to help users discover there's more in Cloud (RooCodeInc#8415) Co-authored-by: Roo Code <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Rubens <[email protected]> Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com> Co-authored-by: SannidhyaSah <[email protected]> Co-authored-by: John Richmond <[email protected]> * Revert "feat: Experiment: Show a bit of stats in Cloud tab to help users discover there's more in Cloud" (RooCodeInc#8559) * Identify cloud tasks in the extension bridge (RooCodeInc#8539) * Revert "Clamp GPT-5 max output tokens to 20% of context window" (RooCodeInc#8582) * feat: Add Claude Sonnet 4.5 1M context window support for Claude Code… (RooCodeInc#8586) feat: Add Claude Sonnet 4.5 1M context window support for Claude Code provider * chore: add changeset for v3.28.16 (RooCodeInc#8592) * Changeset version bump (
Before:
After:
This also fixes the real-time stats and telemetry sent to cloud.
Important
Refactor cost and token tracking across provider handlers to ensure consistent and accurate reporting for Anthropic and OpenAI protocols.
calculateApiCostAnthropicandcalculateApiCostOpenAIincost.tsto returnApiCostResultwithtotalInputTokens,totalOutputTokens, andtotalCost.calculateApiCostInternal()to handle both Anthropic and OpenAI protocols.AnthropicHandler,CerebrasHandler,DeepInfraHandler,GroqHandler,LiteLLMHandler,OpenAiNativeHandler, andRequestyHandlerto use the new cost calculation functions.totalCostis extracted and used consistently across handlers.getApiMetrics()ingetApiMetrics.tsto calculatecontextTokensusingtokensInandtokensOut.Task.tsto handle cost and token tracking using the newApiCostResultstructure.cost.spec.tsto validate new cost calculation logic for both Anthropic and OpenAI.This description was created by
for 6be9762. You can customize this summary. It will automatically update as commits are pushed.