| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| public | ||
| src | ||
| .eslintrc.cjs | ||
| .gitignore | ||
| .prettierrc.mjs | ||
| bun.lock | ||
| i18next.config.js | ||
| index.html | ||
| jsconfig.json | ||
| package.json | ||
| postcss.config.js | ||
| tailwind.config.js | ||
| vercel.json | ||
| vite.config.js |
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 |
|---|---|---|
| .. | ||
| public | Loading commit data... | |
| src | Loading commit data... | |
| .eslintrc.cjs | Loading commit data... | |
| .gitignore | Loading commit data... | |
| .prettierrc.mjs | Loading commit data... | |
| bun.lock | Loading commit data... | |
| i18next.config.js | Loading commit data... | |
| index.html | Loading commit data... | |
| jsconfig.json | Loading commit data... | |
| package.json | Loading commit data... | |
| postcss.config.js | Loading commit data... | |
| tailwind.config.js | Loading commit data... | |
| vercel.json | Loading commit data... | |
| vite.config.js | Loading commit data... |