Skip to content

fix(opencode): sanitize NaN tokens in getUsage and recover null on read #38702

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
leecoder wants to merge 1 commit into
base: dev
Choose a base branch
from
+14 −5
Open

fix(opencode): sanitize NaN tokens in getUsage and recover null on read #38702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions packages/opencode/src/session/message-v2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,20 @@ export const cursor = {
},
}

const info = (row: typeof MessageTable.$inferSelect) =>
({
...row.data,
const info = (row: typeof MessageTable.$inferSelect) => {
const data = row.data as Record<string, any>
// JSON.stringify(NaN) → null in SQLite; on read-back null violates Schema.optional(Schema.Finite).
// Sanitize affected numeric fields so existing corrupted rows don't cause 500s.
if (data.tokens) {
if (data.tokens.total === null) data.tokens.total = undefined
}
if (data.cost === null) data.cost = 0
return {
...data,
id: row.id,
sessionID: row.session_id,
}) as Info
} as Info
}

const part = (row: typeof PartTable.$inferSelect) =>
({
Expand Down
3 changes: 2 additions & 1 deletion packages/opencode/src/session/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,10 @@ export const getUsage = (input: { model: Provider.Model; usage: Usage; metadata?
const adjustedInputTokens = safe(inputTokens - cacheReadInputTokens - cacheWriteInputTokens)

const total = input.usage.totalTokens
const safeTotal = total !== undefined && Number.isFinite(total) ? Math.max(0, total) : undefined

const tokens = {
total,
total: safeTotal,
input: adjustedInputTokens,
output: safe(outputTokens - reasoningTokens),
reasoning: reasoningTokens,
Expand Down
Loading