Skip to content
Merged
Changes from 1 commit
Commits
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
10 changes: 9 additions & 1 deletion relay/channel/claude/relay-claude.go
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,15 @@ func HandleStreamFinalResponse(c *gin.Context, info *relaycommon.RelayInfo, clau
if common.DebugEnabled {
common.SysLog("claude response usage is not complete, maybe upstream error")
}
claudeInfo.Usage = service.ResponseText2Usage(c, claudeInfo.ResponseText.String(), info.UpstreamModelName, claudeInfo.Usage.PromptTokens)
// 只补缺失字段,不整份覆盖——保留 message_start 已拿到的 cache 字段
fallback := service.ResponseText2Usage(c, claudeInfo.ResponseText.String(), info.UpstreamModelName, info.GetEstimatePromptTokens())
if claudeInfo.Usage.CompletionTokens == 0 {
claudeInfo.Usage.CompletionTokens = fallback.CompletionTokens
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Fallback still undercounts interrupted streams when CompletionTokens is placeholder 1.

When !claudeInfo.Done, CompletionTokens can still be the message_start placeholder value (e.g., 1), but Line 814 only backfills when it is 0. This leaves severe undercounting in exactly the abnormal-stream path this block is handling (see relay/channel/claude/relay_claude_test.go:12-48, where message_start uses OutputTokens: 1).

💡 Suggested fix
-       if claudeInfo.Usage.CompletionTokens == 0 {
+       if claudeInfo.Usage.CompletionTokens == 0 ||
+           (!claudeInfo.Done && fallback.CompletionTokens > claudeInfo.Usage.CompletionTokens) {
            claudeInfo.Usage.CompletionTokens = fallback.CompletionTokens
        }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
if claudeInfo.Usage.CompletionTokens == 0 {
claudeInfo.Usage.CompletionTokens = fallback.CompletionTokens
}
if claudeInfo.Usage.CompletionTokens == 0 ||
(!claudeInfo.Done && fallback.CompletionTokens > claudeInfo.Usage.CompletionTokens) {
claudeInfo.Usage.CompletionTokens = fallback.CompletionTokens
}
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@relay/channel/claude/relay-claude.go` around lines 814 - 816, The fallback
only backfills claudeInfo.Usage.CompletionTokens when it's exactly 0, but
interrupted streams can leave the placeholder value 1 (from message_start) and
still be !claudeInfo.Done; update the check in the block that touches claudeInfo
(the clause using claudeInfo.Usage.CompletionTokens and
fallback.CompletionTokens) to treat the placeholder as unset (e.g.,
CompletionTokens <= 1) so you copy fallback.CompletionTokens when
CompletionTokens is 0 or the placeholder 1; ensure this logic executes in the
same place where claudeInfo.Done is considered so interrupted-stream counts get
corrected.

if claudeInfo.Usage.PromptTokens == 0 {
claudeInfo.Usage.PromptTokens = fallback.PromptTokens
}
claudeInfo.Usage.TotalTokens = claudeInfo.Usage.PromptTokens + claudeInfo.Usage.CompletionTokens
}
if claudeInfo.Usage != nil {
claudeInfo.Usage.UsageSemantic = "anthropic"
Expand Down