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 |
|---|---|---|
| .. | ||
| components | Loading commit data... | |
| constants | Loading commit data... | |
| context | Loading commit data... | |
| contexts | Loading commit data... | |
| helpers | Loading commit data... | |
| hooks | Loading commit data... | |
| i18n | Loading commit data... | |
| pages | Loading commit data... | |
| services | Loading commit data... | |
| App.jsx | Loading commit data... | |
| index.css | Loading commit data... | |
| index.jsx | Loading commit data... |