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-03-17 16:59:25 +08:00
2025-12-13 13:29:21 +08:00
2026-01-26 20:20:16 +08:00
2026-03-17 16:59:25 +08:00
2026-03-31 16:54:39 +08:00
2026-03-31 16:54:39 +08:00
2026-03-31 16:54:39 +08:00
2026-03-02 18:54:56 +08:00