ZheFox
|
995ab302be
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/payloads.rs
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/reads.rs
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/update.rs
# apps/aether-gateway/src/tests/control/admin/endpoints/routes.rs
# frontend/src/features/models/components/GlobalModelFormDialog.vue
# frontend/src/features/providers/components/ProviderModelFormDialog.vue
# frontend/src/features/providers/components/provider-tabs/__tests__/model-test-request.spec.ts
# frontend/src/features/providers/components/provider-tabs/model-test-request.ts
|
2026-05-18 22:02:31 +08:00 |
|
fawney19
|
d51b44d642
|
Merge remote-tracking branch 'origin/pr-485'
# Conflicts:
# crates/aether-data/src/repository/provider_catalog/sqlite.rs
|
2026-05-18 19:44:18 +08:00 |
|
fawney19
|
b99f43783c
|
Merge remote-tracking branch 'origin/pr-482'
# Conflicts:
# .github/workflows/release.yml
|
2026-05-18 18:55:11 +08:00 |
|
fawney19
|
7f76eff827
|
Merge remote-tracking branch 'origin/pr-484'
|
2026-05-18 18:01:57 +08:00 |
|
fawney19
|
be939f7e63
|
Merge remote-tracking branch 'origin/pr-493'
|
2026-05-18 18:01:43 +08:00 |
|
fawney19
|
a8a87d2b41
|
Merge remote-tracking branch 'origin/pr-494'
|
2026-05-18 18:00:47 +08:00 |
|
fawney19
|
90dbc279fd
|
Merge remote-tracking branch 'origin/pr-476'
|
2026-05-18 16:13:45 +08:00 |
|
fawney19
|
3723f165bc
|
Merge remote-tracking branch 'origin/pr-496'
|
2026-05-18 16:13:03 +08:00 |
|
ZheFox
|
a4012ad353
|
Merge upstream/main
|
2026-05-18 13:11:11 +08:00 |
|
ZheFox
|
a10c02ef63
|
feat(billing): add image output range pricing support
|
2026-05-18 11:52:01 +08:00 |
|
fawney19
|
92813e6122
|
feat: add routing profile scheduling policies
|
2026-05-18 11:03:49 +08:00 |
|
MMEXA
|
9586f5158e
|
Fix fixed-provider endpoint key counts
|
2026-05-17 20:55:36 +00:00 |
|
ZheFox
|
0b2a8fafce
|
feat(billing): add image output pricing and usage tracking
|
2026-05-18 02:49:56 +08:00 |
|
ZheFox
|
691ccaaa04
|
fix(usage): track OpenAI image SSE completion and usage estimates
|
2026-05-18 01:32:45 +08:00 |
|
Kayphoon
|
ae472d6744
|
fix(data): require provider id for provider usage aggregation
|
2026-05-18 00:36:29 +08:00 |
|
MMEXA
|
89d08d9953
|
fix: align provider model fetch state
|
2026-05-17 16:17:47 +00:00 |
|
ZheFox
|
c024c782e4
|
feat(billing): add image quality pricing and usage tracking
|
2026-05-18 00:11:30 +08:00 |
|
ZheFox
|
680b617b00
|
feat(gateway): route OpenAI image streams through chat bridge
|
2026-05-17 23:09:50 +08:00 |
|
Kayphoon
|
f29cca72ba
|
refactor(data): limit query abstraction to postgres and sqlite
|
2026-05-17 15:40:44 +08:00 |
|
Kayphoon
|
77640d51a6
|
refactor(data): add select query abstraction
|
2026-05-17 15:04:35 +08:00 |
|
HsungKayphoon
|
f0a6fffa87
|
refactor(data): introduce simple query helper
|
2026-05-17 14:07:23 +08:00 |
|
Entropy.Xu
|
1b24e1c22a
|
fix(wallet): 修复额度耗尽后仍可消费
|
2026-05-17 11:49:08 +08:00 |
|
ZheFox
|
ab0d766f47
|
fix(usage): stop inferring cache reads from prompt_cache_key
|
2026-05-17 03:04:33 +08:00 |
|
ZheFox
|
41ffb18604
|
fix(billing): avoid double counting cache read in OpenAI cache hit context
|
2026-05-17 02:40:01 +08:00 |
|
ZheFox
|
b903f8ff7d
|
fix(usage): estimate cache read tokens for cancelled requests
|
2026-05-17 02:13:13 +08:00 |
|
ZheFox
|
0483d001b4
|
fix(usage): bill cancelled terminal usage and preserve total token estimates
|
2026-05-17 01:11:42 +08:00 |
|
HsungKayphoon
|
d290a1fdb9
|
fix: satisfy rust 1.95 clippy
|
2026-05-17 00:00:46 +08:00 |
|
ZheFox
|
2803e9317d
|
fix(usage): bill cancelled terminal usage and preserve terminal telemetry
|
2026-05-16 23:43:40 +08:00 |
|
HsungKayphoon
|
c5e26a1ed6
|
fix: align sqlite repositories with postgres behavior
|
2026-05-16 23:43:40 +08:00 |
|
fawney19
|
3a5922d4ee
|
fix: use codex quota refresh for account checks
|
2026-05-16 20:16:23 +08:00 |
|
HsungKayphoon
|
f9f1fa928a
|
refactor: drive pg sqlite copy from target schema
|
2026-05-16 17:29:14 +08:00 |
|
HsungKayphoon
|
527feb69db
|
fix: cover portable migration tables in logical schema
|
2026-05-16 15:58:41 +08:00 |
|
RWDai
|
a2649718ea
|
Expose scheduling failure details in usage payload
|
2026-05-16 15:42:13 +08:00 |
|
HsungKayphoon
|
4b12ec8913
|
feat: add postgres to single-node migration
|
2026-05-16 15:26:43 +08:00 |
|
HsungKayphoon
|
74a1e5ad7d
|
feat: add scoped manual usage cleanup
|
2026-05-16 15:23:44 +08:00 |
|
fawney19
|
6a608b8e3f
|
fix: recover finalized usage provider links safely
|
2026-05-16 15:15:57 +08:00 |
|
fawney19
|
893ac18d60
|
Merge PR #469: 修复用户可见性、额度、验证与 Codex 探测
|
2026-05-16 14:28:19 +08:00 |
|
fawney19
|
3a23eaa572
|
Merge pull request #470 from yao177/fix/provider-keep-priority-on-conversion-load-balance
fix: preserve conversion priority beneath scheduler modes
|
2026-05-16 12:56:57 +08:00 |
|
yao177
|
232976c14a
|
fix: keep conversion priority below load balance
|
2026-05-16 04:41:07 +00:00 |
|
yao177
|
dc1009798d
|
test: cover cache affinity conversion priority ordering
|
2026-05-16 04:32:56 +00:00 |
|
fawney19
|
f72ab383c9
|
Refine OAuth auto cleanup conditions
(cherry picked from commit 78826eae47ab18ace6931dd190a41070416b5e10)
|
2026-05-16 11:33:45 +08:00 |
|
Entropy.Xu
|
1a50c5e112
|
merge: 同步主线并解决用户侧验证冲突
|
2026-05-16 01:25:42 +08:00 |
|
Entropy.Xu
|
bbd3c30b0e
|
fix(public): 修复用户可见性、额度、验证与 Codex 探测
|
2026-05-16 00:51:44 +08:00 |
|
fawney19
|
d6c320bf06
|
Revert "Merge remote-tracking branch 'origin/pr/466'"
This reverts commit 0e0a24862f, reversing
changes made to b09fd48eee.
|
2026-05-16 00:50:00 +08:00 |
|
fawney19
|
0e0a24862f
|
Merge remote-tracking branch 'origin/pr/466'
|
2026-05-15 22:49:35 +08:00 |
|
ZheFox
|
2345df0e38
|
fix(usage): bill cancelled terminal usage
|
2026-05-15 22:38:34 +08:00 |
|
fawney19
|
b09fd48eee
|
Merge remote-tracking branch 'origin/pr/462'
|
2026-05-15 22:28:40 +08:00 |
|
fawney19
|
c916e76bd2
|
Merge branch 'pr-461'
# Conflicts:
# .github/workflows/rust-ci.yml
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
|
2026-05-15 21:52:37 +08:00 |
|
fawney19
|
87e44479cc
|
Add proxy tunnel diagnostics and default logging
|
2026-05-15 19:43:59 +08:00 |
|
fawney19
|
0bd3e2fa88
|
Merge remote-tracking branch 'origin/main'
|
2026-05-15 18:13:26 +08:00 |
|