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 18:04:58 +08:00
2026-04-02 00:39:13 +08:00
2025-08-30 21:15:10 +08:00
2023-04-22 20:39:27 +08:00
2025-04-04 17:37:27 +08:00
2026-02-11 17:44:31 +08:00
2026-03-06 21:36:51 +08:00
2026-03-04 18:19:19 +08:00
2025-10-02 18:45:37 +08:00
2026-02-28 10:22:03 +00:00
2025-08-30 21:15:10 +08:00
2025-08-30 21:15:10 +08:00
2023-04-22 20:39:27 +08:00
2025-12-19 23:04:53 +08:00