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
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| billing.constants.js | Loading commit data... | |
| channel-affinity-template.constants.js | Loading commit data... | |
| channel.constants.js | Loading commit data... | |
| common.constant.js | Loading commit data... | |
| console.constants.js | Loading commit data... | |
| dashboard.constants.js | Loading commit data... | |
| index.js | Loading commit data... | |
| playground.constants.js | Loading commit data... | |
| redemption.constants.js | Loading commit data... | |
| toast.constants.js | Loading commit data... | |
| user.constants.js | Loading commit data... |