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-17 16:59:25 +08:00
2026-02-06 17:52:19 +08:00
2025-10-11 15:30:09 +08:00
2026-04-02 00:39:13 +08:00
2026-04-02 00:39:13 +08:00
2026-03-19 16:58:13 +08:00
2026-03-22 13:55:10 +08:00
2026-02-06 11:01:23 +08:00
2026-03-31 17:57:47 +08:00
2025-10-28 23:25:43 +08:00
2026-03-02 21:19:04 +08:00
2024-12-22 17:24:29 +08:00
2025-09-16 22:35:46 +08:00
2025-09-27 15:43:12 +08:00
2026-03-17 18:04:58 +08:00
2025-10-11 15:30:09 +08:00
2024-12-22 17:24:29 +08:00
2025-10-28 23:25:43 +08:00