log_info_generate.go
10.1 KB
-
Merge branch 'origin/main' into nightly · 35d07046Resolve 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 APICaIon committed