ceos/opencode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: clamp reasoning tokens in session usage

Browse source
This commit is contained in:
Jack 2026-05-07 19:49:14 +08:00
commit cfa7ca14ac
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/opencode/src/session/session.ts
View file

@ -356,8 +356,11 @@ export const getUsage = (input: { model: Provider.Model; usage: LanguageModelUsa
return value return value
} }
const inputTokens = safe(input.usage.inputTokens ?? 0) const inputTokens = safe(input.usage.inputTokens ?? 0)
const outputTokens = safe(input.usage.outputTokens ?? 0) const outputTokens = Math.max(0, safe(input.usage.outputTokens ?? 0))
const reasoningTokens = safe(input.usage.outputTokenDetails?.reasoningTokens ?? input.usage.reasoningTokens ?? 0) const reasoningTokens = Math.min(
Math.max(0, safe(input.usage.outputTokenDetails?.reasoningTokens ?? input.usage.reasoningTokens ?? 0)),
outputTokens,
)
const cacheReadInputTokens = safe( const cacheReadInputTokens = safe(
input.usage.inputTokenDetails?.cacheReadTokens ?? input.usage.cachedInputTokens ?? 0, input.usage.inputTokenDetails?.cacheReadTokens ?? input.usage.cachedInputTokens ?? 0,
@ -387,7 +390,7 @@ export const getUsage = (input: { model: Provider.Model; usage: LanguageModelUsa
const tokens = { const tokens = {
total, total,
input: adjustedInputTokens, input: adjustedInputTokens,
output: safe(outputTokens - reasoningTokens), output: outputTokens - reasoningTokens,
reasoning: reasoningTokens, reasoning: reasoningTokens,
cache: { cache: {
write: cacheWriteInputTokens, write: cacheWriteInputTokens,

24
packages/opencode/test/session/compaction.test.ts
View file

@ -2011,6 +2011,30 @@ describe("SessionNs.getUsage", () => {
expect(result.tokens.total).toBe(1500) expect(result.tokens.total).toBe(1500)
}) })
test("clamps reasoning tokens to completion tokens", () => {
const model = createModel({ context: 100_000, output: 32_000 })
const result = SessionNs.getUsage({
model,
usage: {
inputTokens: 1000,
outputTokens: 45,
totalTokens: 1045,
inputTokenDetails: {
noCacheTokens: undefined,
cacheReadTokens: undefined,
cacheWriteTokens: undefined,
},
outputTokenDetails: {
textTokens: undefined,
reasoningTokens: 47,
},
},
})
expect(result.tokens.output).toBe(0)
expect(result.tokens.reasoning).toBe(45)
})
test("does not double count reasoning tokens in cost", () => { test("does not double count reasoning tokens in cost", () => {
const model = createModel({ const model = createModel({
context: 100_000, context: 100_000,