Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@

---

## [v0.3.28](https://github.com/ding113/claude-code-hub/releases/tag/v0.3.28) - 2025-12-10

### 新增

- 日志页面新增快速日期筛选器(今日/昨日/近7天/近30天)和 CSV 导出功能 (#314)
- Session 监控页面新增分页功能,支持分别对活跃和非活跃 Session 进行分页浏览 (#314)

### 优化

- 每日排行榜改用滚动 24 小时窗口计算,替代原先基于日历日的统计方式 (#314)
- 上游 404 错误现在触发供应商故障切换而不计入熔断器,提升中转服务兼容性 (#314)

### 修复

- 修复 Anthropic SSE 流式响应中 output_tokens 提取问题,现在从 message_delta 事件正确获取 (#313)
Comment on lines +7 to +21

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.

medium

变更日志的内容与本次合并请求的修改不匹配。本次修改的核心是支持 Gemini 的 thoughtsTokenCount 计费,但 v0.3.28版本的日志条目描述的是其他功能(#314, #313)。请更新此部分,以准确反映本次 PR 的实际贡献。


---

## [v0.3.27](https://github.com/ding113/claude-code-hub/releases/tag/v0.3.27) - 2025-12-10

### 新增
Expand Down
12 changes: 11 additions & 1 deletion src/app/v1/_lib/gemini/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,21 @@ export interface GeminiRequest {
};
}

export interface GeminiTokenDetail {
modality: "TEXT" | "IMAGE" | "AUDIO" | "VIDEO";
tokenCount: number;
}

export interface GeminiUsageMetadata {
promptTokenCount: number;
candidatesTokenCount: number;
totalTokenCount: number;
cachedContentTokenCount?: number; // Gemini 缓存支持
cachedContentTokenCount?: number; // Gemini 缓存命中的 token 数
thoughtsTokenCount?: number; // Gemini 思考模型的推理 token
// 详细信息(按 modality 分类)
promptTokensDetails?: GeminiTokenDetail[];
cacheTokensDetails?: GeminiTokenDetail[];
candidatesTokensDetails?: GeminiTokenDetail[];
}

export interface GeminiCandidate {
Expand Down
5 changes: 5 additions & 0 deletions src/app/v1/_lib/proxy/response-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,11 @@ function extractUsageMetrics(value: unknown): UsageMetrics | null {
result.cache_read_input_tokens = usage.cachedContentTokenCount;
hasAny = true;
}
// Gemini 思考/推理 token:直接累加到 output_tokens(思考价格与输出价格相同)
if (typeof usage.thoughtsTokenCount === "number" && usage.thoughtsTokenCount > 0) {
result.output_tokens = (result.output_tokens ?? 0) + usage.thoughtsTokenCount;
hasAny = true;
}
Comment on lines +1210 to +1213

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.

critical

这里存在一个严重的计费逻辑错误。当前代码在将 thoughtsTokenCount 累加到 result.output_tokens 之后,后续位于 1215 行的代码块会无条件地用 usage.output_tokens 的值覆盖 result.output_tokens。这将导致在 usage.output_tokens 存在的情况下,thoughtsTokenCount 的累加值被丢弃,从而造成计费错误。

为了修复此问题,建议将这个 thoughtsTokenCount 的处理逻辑移动到 output_tokens 赋值逻辑(第 1215-1218 行)之后,以确保 thoughtsTokenCount 是在最终的 output_tokens 基础上进行累加。


if (typeof usage.output_tokens === "number") {
result.output_tokens = usage.output_tokens;
Expand Down
Loading