修复: token 汇总正确性(会话级双计/is_estimated跨端/流式usage传递) + is_estimated SELECT 缺失修复

2026-08-09 23:59:55 +08:00
parent 11f4978ec1
commit 6bafdcd5a5
16 changed files with 189 additions and 127 deletions
@@ -256,17 +256,19 @@ pub(crate) fn apply_openai_sse(data: &str, usage_accum: &mut Option<TokenUsage>)
                    delta: delta_text,
                    finished,
                    tool_calls,
-                    usage: None,
+                    // 加固:usage 与 finish_reason 同帧的端点(部分兼容实现),此处已累积则挂上,
+                    // 使下游 stream_recv 不必等到 [DONE] 帧即可拿到真实 usage。
+                    usage: usage_accum.clone(),
                    error: None,
                    reasoning_content: choice.delta.reasoning_content,
                }
            } else {
-                // choices 为空 = usage-only chunk，不输出文本（usage 已累积）
+                // choices 为空 = usage-only chunk，不输出文本（usage 已累积），usage 一并带出
                StreamChunk {
                    delta: String::new(),
                    finished: false,
                    tool_calls: None,
-                    usage: None,
+                    usage: usage_accum.clone(),
                    error: None,
                    reasoning_content: None,
                }