Commit Graph

457 Commits

Author SHA1 Message Date
Cita a7bac92975 Merge pull request #223 from cita-777/codex/proxy-log-self-report-client-name
fix: prefer self-reported proxy log client names
2026-03-21 11:52:48 +08:00
ciat-777 7c9bdc51c7 fix: prefer self-reported proxy log client names 2026-03-21 11:48:15 +08:00
Hureru 4d0c4b8129 feat(proxy): propagate account-level proxy across all surfaces
- chatSurface/openAiResponsesSurface: extract channelProxyUrl once and pass to withSiteRecordProxyRequestInit
- geminiSurface: switch from withSiteProxyRequestInit to withSiteRecordProxyRequestInit with channelProxyUrl
- balanceService: pass accountProxyUrl to sub2api token refresh requests
- siteProxy: fix isAccountOverride to only be true when account proxy differs from site proxy
- Accounts.tsx: use parseAccountExtraConfig helper for proxy badge display
2026-03-21 11:44:57 +08:00
Hureru 8df3b1431f Merge remote-tracking branch 'origin/main' into feat/account-level-proxy
# Conflicts:
#	src/server/proxy-core/surfaces/chatSurface.ts
#	src/server/proxy-core/surfaces/openAiResponsesSurface.ts
#	src/server/routes/proxy/embeddings.ts
#	src/server/routes/proxy/images.ts
#	src/server/services/modelService.ts
2026-03-21 10:09:19 +08:00
Cita 4ba7749391 Merge pull request #220 from cita-777/codex/webdav-backup-armv7l
Add WebDAV backup sync and armv7 Docker builds
2026-03-21 01:24:51 +08:00
Cita 3be452d794 Merge pull request #219 from cita-777/codex/latest-main-protocol-review
[codex] fix modeltester attachment replay and add proxy file retention
2026-03-21 01:10:36 +08:00
ciat-777 0574fa93b3 Isolate server Docker build from desktop deps 2026-03-21 01:09:50 +08:00
ciat-777 7c227d8365 Handle replay hydration file fetch timeouts 2026-03-21 01:03:03 +08:00
ciat-777 89282093a9 Use armv7-compatible Node Docker base 2026-03-21 00:59:23 +08:00
ciat-777 1ce036fd46 Address PR review for WebDAV and armv7 2026-03-21 00:48:42 +08:00
ciat-777 bc52b6b5fd Add WebDAV backup sync and armv7 Docker builds 2026-03-21 00:06:16 +08:00
cita 95bf8df499 fix modeltester attachment replay and add proxy file retention 2026-03-21 00:04:06 +08:00
Cita 94b6cac871 Merge pull request #218 from cita-777/codex/modeltester-attachment-review-fixes
[codex] Fix model tester attachment replay and capability gating
2026-03-20 23:12:43 +08:00
Cita 44c485752d Merge pull request #217 from cita-777/codex/sqlite-site-announcements-migration-fixes
[codex] fix sqlite bootstrap and site announcement migration
2026-03-20 23:12:06 +08:00
cita 78f6c5b2cc Merge origin/main into codex/modeltester-attachment-review-fixes 2026-03-20 23:09:27 +08:00
cita 4369aeb1cb fix model tester attachment replay and capability gating 2026-03-20 22:56:01 +08:00
cita 9bc804c121 fix sqlite bootstrap and site announcement migration 2026-03-20 22:51:57 +08:00
Cita 79146af16a Merge pull request #216 from cita-777/codex/fix-responses-endpoint-memory
[codex] fix cross-protocol conversation file compatibility
2026-03-20 21:53:13 +08:00
cita 2890b7daf3 fix cross-protocol conversation file compatibility 2026-03-20 21:48:05 +08:00
Cita a2a93abb69 Merge pull request #214 from zmoon460/main
Fix: postgres 环境下无法保存 模型白名单和群组选择
2026-03-20 21:21:44 +08:00
Cita 485e7a0e7c Merge pull request #215 from Brucents/fix/direct-credential-route-binding
fix(routes): dedupe direct credentials and clarify binding labels
2026-03-20 21:19:48 +08:00
Brucents 5ee493778f fix(routes): dedupe direct credentials and clarify binding labels 2026-03-20 20:41:32 +08:00
zmoon460 da76f56721 Refactor parseJson to handle different value types
Refactor parseJson function to handle various input types and improve null checks.
2026-03-20 20:10:12 +08:00
zmoon460 ade5e0b1b3 Enhance unique violation check for PostgreSQL 2026-03-20 20:08:56 +08:00
Cita 0d70dba4e6 Merge pull request #212 from Brucents/fix/proxy-upstream-resolution
fix(proxy): 修正代理上游解析并补齐系统代理测试能力
2026-03-20 19:21:30 +08:00
Cita 1758d70b55 Merge pull request #211 from cita-777/codex/fix-responses-endpoint-memory
[codex] fix responses endpoint memory
2026-03-20 19:21:11 +08:00
cita 5f744c3382 fix responses endpoint memory 2026-03-20 19:15:53 +08:00
Brucents 088d0455a9 fix(proxy): add system proxy connectivity test and align proxy UI copy 2026-03-20 19:13:23 +08:00
Brucents a66cbafeb8 fix(proxy): separate upstream target resolution from proxy dispatch and add site-level proxy URLs 2026-03-20 17:40:02 +08:00
Cita 8c5ecc26d1 Merge pull request #207 from cita-777/codex/issue-200-group-route-alias
[codex] fix explicit-group source-model fallback
2026-03-20 16:55:28 +08:00
cita 3601e7a708 fix explicit-group source-model fallback 2026-03-20 16:45:19 +08:00
Cita 112191c5bc Merge pull request #206 from cita-777/codex/proxy-logs-model-badge-width
[codex] match proxy log model badge width to model name
2026-03-20 16:32:17 +08:00
cita 1a0e22b767 fix: match proxy log model badge width to content 2026-03-20 16:30:24 +08:00
Cita 400f3e1dfc fix: use tidb-compatible mysql datetime defaults (#205) 2026-03-20 16:21:37 +08:00
Bainily e9c1bd898e [codex] improve proxy stability, routing, and site subscription visibility (#194)
* wip: preserve local changes before upstream merge

* Improve proxy routing stability and add stable-first strategy
2026-03-20 16:18:28 +08:00
Shinku e2595bcab3 Merge pull request #204 from Shinku-Chen/rand-sk-2
生成密钥的时候,能随机生成,同时能复制token
2026-03-20 16:17:51 +08:00
Cita 5e872b331e Merge pull request #202 from cita-777/codex/site-announcement-postgres-time-fix
[codex] unify external db datetime behavior
2026-03-20 15:49:13 +08:00
Cita aad21e5b33 Merge pull request #201 from cita-777/codex/fix-client-detection
[codex] improve downstream client detection
2026-03-20 15:42:28 +08:00
cita 1451e61557 fix: unify external db datetime behavior 2026-03-20 15:39:41 +08:00
cita 0068200f2d Improve downstream client detection 2026-03-20 15:31:21 +08:00
Cita 03a3db84c1 Merge pull request #195 from cita-777/codex/site-announcement-timezone-fix
[codex] prefer client timezone for site announcements
2026-03-20 14:18:01 +08:00
cita f880e3a25f prefer client timezone for site announcements 2026-03-20 14:06:11 +08:00
Cita a2caa94069 Merge pull request #191 from cita-777/codex/checkin-settings-ui-fix
[codex] fix checkin settings styling and empty updates
2026-03-20 13:35:17 +08:00
Cita fe99968602 Merge pull request #190 from cita-777/codex/site-announcement-timezone-fix
[codex] fix site announcement timezone
2026-03-20 13:33:12 +08:00
cita 4f94393806 fix checkin settings styling and empty updates 2026-03-20 13:31:26 +08:00
cita 1af1fe244a fix site announcement timezone 2026-03-20 13:26:55 +08:00
dependabot[bot] 8b47df55ec build(deps): bump the minor-and-patch group across 1 directory with 7 updates
Bumps the minor-and-patch group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [@visactor/react-vchart](https://github.com/VisActor/VChart/tree/HEAD/packages/react-vchart) | `2.0.16` | `2.0.19` |
| [mysql2](https://github.com/sidorares/node-mysql2) | `3.18.2` | `3.20.0` |
| [nodemailer](https://github.com/nodemailer/nodemailer) | `8.0.1` | `8.0.3` |
| [@tailwindcss/vite](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/@tailwindcss-vite) | `4.2.1` | `4.2.2` |
| [electron](https://github.com/electron/electron) | `41.0.2` | `41.0.3` |
| [mermaid](https://github.com/mermaid-js/mermaid) | `11.12.3` | `11.13.0` |



Updates `@visactor/react-vchart` from 2.0.16 to 2.0.19
- [Release notes](https://github.com/VisActor/VChart/releases)
- [Changelog](https://github.com/VisActor/VChart/blob/develop/packages/react-vchart/CHANGELOG.md)
- [Commits](https://github.com/VisActor/VChart/commits/v2.0.19/packages/react-vchart)

Updates `mysql2` from 3.18.2 to 3.20.0
- [Release notes](https://github.com/sidorares/node-mysql2/releases)
- [Changelog](https://github.com/sidorares/node-mysql2/blob/master/Changelog.md)
- [Commits](https://github.com/sidorares/node-mysql2/compare/v3.18.2...v3.20.0)

Updates `nodemailer` from 8.0.1 to 8.0.3
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v8.0.1...v8.0.3)

Updates `@tailwindcss/vite` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.2.2/packages/@tailwindcss-vite)

Updates `electron` from 41.0.2 to 41.0.3
- [Release notes](https://github.com/electron/electron/releases)
- [Commits](https://github.com/electron/electron/compare/v41.0.2...v41.0.3)

Updates `mermaid` from 11.12.3 to 11.13.0
- [Release notes](https://github.com/mermaid-js/mermaid/releases)
- [Commits](https://github.com/mermaid-js/mermaid/compare/mermaid@11.12.3...mermaid@11.13.0)

Updates `tailwindcss` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.2.2/packages/tailwindcss)

---
updated-dependencies:
- dependency-name: "@visactor/react-vchart"
  dependency-version: 2.0.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
- dependency-name: mysql2
  dependency-version: 3.20.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: minor-and-patch
- dependency-name: nodemailer
  dependency-version: 8.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
- dependency-name: "@tailwindcss/vite"
  dependency-version: 4.2.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
- dependency-name: electron
  dependency-version: 41.0.3
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
- dependency-name: mermaid
  dependency-version: 11.13.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: minor-and-patch
- dependency-name: tailwindcss
  dependency-version: 4.2.2
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: minor-and-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-03-20 04:56:06 +00:00
Cita 029ee10d26 Merge pull request #187 from cita-777/codex/proxy-log-client-detection-main
feat: add proxy log client detection filters
2026-03-20 12:51:53 +08:00
Cita a4cb362599 Merge pull request #188 from cita-777/codex/site-announcements
[codex] improve site announcement display
2026-03-20 12:51:31 +08:00
cita 8291b9c59f test: align proxy route db mocks with client columns 2026-03-20 12:49:09 +08:00