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-19 16:56:28 +08:00
2026-01-02 23:00:33 +08:00
2025-10-11 15:30:09 +08:00
2025-10-28 23:23:24 +08:00
2025-07-31 22:08:16 +08:00
2025-10-11 15:30:09 +08:00
2025-10-11 15:30:09 +08:00
2025-10-12 13:31:03 +08:00
2026-02-22 20:03:46 +08:00
2026-03-06 18:22:25 +08:00
2026-02-06 17:52:19 +08:00
2026-03-17 16:59:25 +08:00