Skip to content

Commit 0ecad47

Browse files
committed
chore: sync CLIProxyAPI upstream
1 parent c093104 commit 0ecad47

3 files changed

Lines changed: 21 additions & 1 deletion

File tree

docs-linhay/dev/20260519-cliproxyapi-upstream-sync-session-distillation.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,21 @@ git check-ignore -v <path>
8888
- 本轮具体上游功能列表不沉淀为规则,只保留在 git 历史和 memory 中。
8989
- `server` 文件本体不归档、不提交。
9090
- 不把该流程升级到 `AGENTS.md`;它属于 CLIProxyAPI fork 领域维护流程,已沉淀到 `gettokens-domain-engineering` skill。
91+
92+
## 2026-05-24 同步记录
93+
94+
本轮将 `docs-linhay/references/CLIProxyAPI#gettokens/sidecar``upstream/main@50d19e20``v7.1.20-1-g50d19e20`)合并到维护分支,生成 merge commit `1c5db246` 并推送到 `AxApp/CLIProxyAPI#gettokens/sidecar`
95+
96+
冲突处理:
97+
98+
1. `internal/registry/model_definitions_test.go` 上游删除、本地保留;该文件仍覆盖 GetTokens 关心的 GPT-5.5 Codex 静态模型、xAI 内建模型和 catalog 校验,因此保留 fork 侧测试。
99+
2. 合并后 `internal/runtime/executor` 两个 Antigravity credits 测试失败,根因是实现已跟随上游 `antigravityLoadCodeAssistBaseURL()` 默认使用 `https://cloudcode-pa.googleapis.com`,而测试仍断言旧 daily host。已把测试断言更新为 `antigravityBaseURLProd`
100+
101+
验证:
102+
103+
1. `go test ./internal/registry`
104+
2. `go test ./internal/runtime/executor`
105+
3. `go test ./...`
106+
4. `git -C docs-linhay/references/CLIProxyAPI diff --check`
107+
108+
本地 sidecar 已通过 `./scripts/ensure-sidecar.sh darwin arm64` 重建,`build/bin/cli-proxy-api.meta.json` 记录 `commit=1c5db246``dirty=clean``goos=darwin``goarch=arm64`

docs-linhay/memory/2026-05-24.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
- 验证:`node --test frontend/src/features/accounts/tests/accountPresentation.test.mjs frontend/src/features/codex/codexAccountList.test.mjs``npm --prefix frontend run typecheck` 通过。
66
- 2026-05-24 字号偏好:Codex live sessions workbench 和 Sidebar 的字体偏小,后续同类密集工作台优先从字号 token 和行级标签入手做增大,保持 Swiss/brutalist 视觉但提高可读性。
77
- 2026-05-24 quota 展示切换:`QuotaBars` 的 percent/token 切换入口从右侧数值按钮改为整块 quota 区域可点击/可键盘切换;仅在窗口存在 `usedTokens`/`limitTokens` 时启用 `role="button"``aria-pressed``Enter`/`Space` 切换。
8+
- CLIProxyAPI 上游同步:`docs-linhay/references/CLIProxyAPI#gettokens/sidecar` 已合并 `upstream/main@50d19e20``v7.1.20-1`),生成并推送 merge commit `1c5db246``AxApp/CLIProxyAPI#gettokens/sidecar`。冲突保留 `internal/registry/model_definitions_test.go` 的 GetTokens fork 回归测试,并把 Antigravity credits 测试的 loadCodeAssist host 断言更新为上游 prod host。
9+
- CLIProxyAPI 验证:子仓库 `go test ./internal/registry``go test ./internal/runtime/executor``go test ./...``git diff --check` 均通过;已执行 `./scripts/ensure-sidecar.sh darwin arm64` 重建本地 sidecar,meta 为 `commit=1c5db246``dirty=clean`

docs-linhay/references/CLIProxyAPI

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 9df03fb40c742f1273a3927f372b9896803d6c06
1+
Subproject commit 1c5db24603a3b8c1a76c44e648e3f9fe718cbd52

0 commit comments

Comments
 (0)