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
..
2026-03-01 15:47:03 +08:00
2026-03-03 14:08:43 +08:00
2026-03-05 06:12:48 +08:00
2026-03-01 15:47:03 +08:00
2026-01-14 22:29:43 +08:00
2026-03-01 15:47:03 +08:00
2026-03-17 16:59:25 +08:00
2025-06-30 22:31:12 +08:00
2025-02-18 15:59:17 +08:00
2026-01-26 20:20:16 +08:00
2026-03-31 23:58:10 +08:00
2026-03-01 15:47:03 +08:00
2026-03-23 15:00:20 +08:00
2026-04-02 00:39:13 +08:00
2026-01-26 20:20:16 +08:00
2026-02-28 17:37:08 +08:00
2024-09-26 00:59:09 +08:00
2025-10-11 15:30:09 +08:00
2026-02-12 12:57:27 +08:00
2025-10-11 15:30:09 +08:00
2025-10-11 15:30:09 +08:00
2026-03-01 15:47:03 +08:00
2024-03-20 19:00:51 +08:00
2026-02-22 16:00:27 +08:00
2026-02-22 16:00:27 +08:00
2026-03-02 22:01:53 +08:00
2026-01-10 22:23:31 +08:00
2025-06-19 11:53:42 +08:00