Repository navigation
fix(ai): count Gemini toolUsePromptTokenCount as input tokens - #4066
Merged
oschwartz10612 merged 1 commit intoNov 6, 2026
Merged
Conversation
Gemini reports the tokens of tool results (Google Search, URL context) in usageMetadata.toolUsePromptTokenCount, separate from promptTokenCount. The extractor ignored it, so usage and cost were under-counted.
pcbeingused333
requested review from
miloschwartz and
oschwartz10612
as code owners
November 5, 2026 23:06
Member
|
Thanks! |
oschwartz10612
approved these changes
Nov 6, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Community Contribution License Agreement
By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
AI Disclosure
This change was prepared with AI assistance (Claude Code): code, test and description. It was reviewed before submission.
Description
Gemini reports the tokens of tool results (Google Search grounding, URL context, code execution) in
usageMetadata.toolUsePromptTokenCount, separately frompromptTokenCount(totalTokenCount = promptTokenCount + toolUsePromptTokenCount + candidatesTokenCount + thoughtsTokenCount). These tokens are billed as input.extractGoogleGenerateContentnever read that field, so for Gemini requests that use tools the AI gateway under-counted input tokens, and with them the cost and budget figures.The fix scans
toolUsePromptTokenCountand adds it topromptTokens. It is not part ofcachedContentTokenCount, so the cache subtraction is unchanged.How to test?
npx tsx server/lib/aiUsageExtraction.test.ts: the newtestGeminiToolUsePromptTokensfails onmain(promptTokens80 instead of 120) and passes with this change, along with the existing Bedrock tests.