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-04-02 00:39:13 +08:00
2026-04-02 00:39:13 +08:00
2026-03-07 00:23:36 +08:00
2025-11-26 20:40:32 +08:00
2026-04-02 00:39:13 +08:00
2026-04-02 00:39:13 +08:00
2026-04-02 00:39:13 +08:00
2026-04-02 00:39:13 +08:00
2026-01-03 11:08:26 +08:00
2026-02-20 22:01:21 +08:00
2026-04-02 00:39:13 +08:00
2025-08-30 21:15:10 +08:00