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 12:57:39 +08:00
2025-08-30 21:15:10 +08:00
2025-11-06 20:18:00 +08:00
2025-08-30 21:15:10 +08:00
2026-02-02 14:37:31 +08:00
2025-09-29 23:23:31 +08:00
2025-07-19 03:30:44 +08:00
2026-01-12 18:47:45 +08:00
2026-01-26 20:20:30 +08:00
2025-10-07 00:22:45 +08:00
2026-02-03 17:40:43 +08:00
2026-03-17 16:59:25 +08:00
2025-10-07 00:22:45 +08:00
2026-02-02 14:37:31 +08:00
2026-02-03 17:40:43 +08:00
2026-03-31 19:39:23 +08:00
2026-03-17 16:59:25 +08:00