Skip to content

fix: improve input token handling for anthropic metadata usage #7643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caozhiyuan wants to merge 2 commits into
base: dev
Choose a base branch
from
+16 −3
Open

fix: improve input token handling for anthropic metadata usage #7643

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5282be6
fix: improve input token handling for anthropic metadata usage
caozhiyuan Jan 10, 2026
806d9c8
Merge branch 'dev' into fix/anthropic-usage
caozhiyuan Jan 17, 2026
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
19 changes: 16 additions & 3 deletions packages/opencode/src/session/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,11 +416,24 @@ export namespace Session {
metadata: z.custom<ProviderMetadata>().optional(),
}),
(input) => {
const cachedInputTokens = input.usage.cachedInputTokens ?? 0
const usage = input.usage as LanguageModelUsage
let inputTokens = usage.inputTokens ?? 0
let cachedInputTokens = usage.cachedInputTokens ?? 0

// If input tokens are 0 and anthropic metadata usage exists, try to read from anthropic usage
const anthUsageRec = input.metadata?.["anthropic"]?.["usage"]
if (anthUsageRec) {
const anthUsage = anthUsageRec as Record<string, unknown>
if (inputTokens === 0 && anthUsage) {
inputTokens = (anthUsage["input_tokens"] ?? 0) as number
cachedInputTokens = (anthUsage["cache_read_input_tokens"] ?? 0) as number
}
}

const excludesCachedTokens = !!(input.metadata?.["anthropic"] || input.metadata?.["bedrock"])
const adjustedInputTokens = excludesCachedTokens
? (input.usage.inputTokens ?? 0)
: (input.usage.inputTokens ?? 0) - cachedInputTokens
? inputTokens
: inputTokens - cachedInputTokens
const safe = (value: number) => {
if (!Number.isFinite(value)) return 0
return value
Expand Down