CaIon
35d0704640
Merge branch 'origin/main' into nightly
Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys
Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API
2026-04-02 00:39:13 +08:00
..
2024-12-02 15:59:08 +00:00
2026-04-02 00:15:04 +08:00
2026-03-02 18:54:56 +08:00
2026-03-31 16:54:39 +08:00
2025-11-25 16:45:14 +08:00
2026-03-31 16:54:39 +08:00
2026-03-01 15:47:03 +08:00
2026-03-11 23:39:18 +08:00
2026-03-01 15:47:03 +08:00
2026-03-06 19:10:42 +08:00
2026-02-07 14:21:19 +08:00
2026-03-31 16:54:39 +08:00
2026-04-02 00:39:13 +08:00
2025-10-11 15:30:09 +08:00
2025-10-11 15:30:09 +08:00
2024-05-17 19:37:18 +08:00
2026-03-11 23:39:18 +08:00
2026-03-01 15:47:03 +08:00
2025-10-11 15:30:09 +08:00
2026-03-11 23:39:18 +08:00
2026-03-01 15:47:03 +08:00
2026-03-31 16:54:39 +08:00
2026-03-05 06:12:48 +08:00
2025-12-02 21:34:39 +08:00
2026-03-01 15:47:03 +08:00
2026-03-01 15:47:03 +08:00
2026-03-01 15:47:03 +08:00
2025-10-11 15:30:09 +08:00
2026-03-27 15:31:41 +08:00
2026-03-01 15:47:03 +08:00
2026-03-02 18:54:56 +08:00
2026-03-01 15:47:03 +08:00
2026-03-31 19:16:16 +08:00
2025-06-25 18:04:34 +08:00
2026-03-01 15:47:03 +08:00
2026-03-01 15:47:03 +08:00
2026-03-11 23:39:18 +08:00
2026-02-22 16:00:27 +08:00
2026-02-25 17:24:18 +08:00
2026-03-05 17:49:36 +08:00