From 7d8523eed75a67f7a4a15b533744fcd0e6059aa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2026 01:02:43 +0900 Subject: [PATCH 001/221] chore(release): open dev at 2.45.0 before releasing 2.44.0 (#3783) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9242c23306..34b7649856 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bitkyc08/opencodex", - "version": "2.44.0", + "version": "2.45.0", "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code", "type": "module", "main": "./bin/package-main.mjs", From 3a991a33a08c79532cb03dd66fc57038136861df Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:43:52 +0900 Subject: [PATCH 002/221] fix(cli): report inert generic account thresholds truthfully --- .../fr/reference/cli/providers-accounts.md | 7 +-- .../ja/reference/cli/providers-accounts.md | 5 +- .../ko/reference/cli/providers-accounts.md | 5 +- .../docs/reference/cli/providers-accounts.md | 7 +-- .../ru/reference/cli/providers-accounts.md | 7 +-- .../tr/reference/cli/providers-accounts.md | 8 +-- .../zh-cn/reference/cli/providers-accounts.md | 7 +-- .../zh-tw/reference/cli/providers-accounts.md | 5 +- src/cli/account-extended.ts | 22 +++++++ tests/cli/cli-account-pool-verbs.test.ts | 62 ++++++++++++++++++- 10 files changed, 106 insertions(+), 29 deletions(-) diff --git a/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md b/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md index 53c5b94b91..c7c4ffa7ca 100644 --- a/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md @@ -203,12 +203,11 @@ renvoient 1 ; une sonde de quota en amont qui échoue ou expire produit plutôt ### `ocx account auto-switch > [--json]` -Contrôle uniquement le groupe de comptes Codex `openai`. `on` règle 80 %, `off` règle 0 %, `status` lit la -valeur actuelle et `threshold ` accepte un entier de 0 à 100. Les autres fournisseurs et les valeurs -invalides entraînent le code de sortie 1. `--json` renvoie : +Contrôle le seuil du pool Codex `openai`, ou enregistre celui d’un pool OAuth générique. `on` enregistre 80 %, `off` 0 % et `threshold ` accepte 0–100. Les seuils génériques sont actuellement inactifs : leur sauvegarde ne change ni le basculement par seuil, ni l’activation du fournisseur, ni la rotation réactive après une erreur 429. Les sorties utilisent la réponse confirmée du serveur. Pour un pool générique, `poolEnabled` est le réglage enregistré (`null` signifie non spécifié), pas l’état effectif hérité. `inert: true` indique que le seuil ne s’applique pas ; une capacité inconnue ne produit jamais `enabled: true`. Les fournisseurs à clé API, Anthropic et les valeurs invalides sont refusés. ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md b/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md index f1b5ec4ff6..63596b369c 100644 --- a/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md @@ -149,10 +149,11 @@ OAuth プロバイダーと API キー プロバイダーの場合、これに ### `ocx account auto-switch > [--json]` -`openai` Codex アカウント プールのみを制御します。 `on` は 80% を設定し、`off` は 0% を設定します。`status` は現在の値を読み取り、`threshold ` は 0 ~ 100 の整数を受け入れます。他のプロバイダーと無効な値は 1 を終了します。`--json` は次を返します。 +`openai` Codex プールのしきい値を制御するか、汎用 OAuth プールのしきい値を保存します。`on` は 80%、`off` は 0%、`threshold ` は 0–100 を保存します。汎用プールのしきい値は現在適用されません。保存しても、しきい値による切り替え、プロバイダーの有効化設定、429 エラー時のローテーションは変更されません。照会と変更の結果はサーバーの確認値を使用します。汎用プールの `poolEnabled` は保存された設定で、`null` は未指定です。継承後の実効状態ではありません。`inert: true` は未適用を示し、機能が不明な場合も `enabled: true` とは表示しません。API キープロバイダー、Anthropic、不正な値は拒否されます。 ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md b/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md index 31757f38d7..ff86f67e8d 100644 --- a/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md @@ -209,10 +209,11 @@ OAuth 및 API 키 제공자에는 제공자의 할당량 보고 엔드포인트 ### `ocx account auto-switch > [--json]` -`openai` Codex 계정 풀만 제어합니다. `on`은 80%, `off`는 0%를 설정하고, `status`는 현재 값을 읽으며, `threshold `은 0부터 100까지의 정수를 받습니다. 다른 제공자와 잘못된 값은 종료 코드 1로 끝납니다. `--json`은 다음을 반환합니다: +`openai` Codex 풀의 임계값을 제어하거나 일반 OAuth 풀의 임계값을 저장합니다. `on`은 80%, `off`는 0%, `threshold `은 0–100을 저장합니다. 일반 풀의 임계값은 현재 동작에 적용되지 않습니다. 저장해도 임계값 기반 전환이나 제공자 활성화 설정이 바뀌지 않고, 429 오류에 따른 회전도 비활성화되지 않습니다. 조회와 변경 결과는 서버가 확인한 값을 사용합니다. 일반 풀의 `poolEnabled`는 저장된 제공자별 설정이며 `null`은 미지정입니다. 전역 설정을 상속한 실제 상태를 뜻하지 않습니다. `inert: true`이면 임계값이 적용되지 않으며, 기능 지원을 알 수 없을 때도 `enabled: true`로 표시하지 않습니다. API 키 제공자, Anthropic 및 잘못된 값은 거부합니다. ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/reference/cli/providers-accounts.md b/docs-site/src/content/docs/reference/cli/providers-accounts.md index cc2471a527..7b9d9da16c 100644 --- a/docs-site/src/content/docs/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/reference/cli/providers-accounts.md @@ -331,12 +331,11 @@ instead (exit 0), matching the dashboard's quota bars. ### `ocx account auto-switch > [--json]` -Controls only the `openai` Codex account pool. `on` sets 80%, `off` sets 0%, `status` reads the current -value, and `threshold ` accepts an integer from 0 through 100. Other providers and invalid values -exit 1. `--json` returns: +Controls the `openai` Codex pool threshold, or stores a threshold for a generic OAuth pool. `on` stores 80%, `off` stores 0%, and `threshold ` accepts 0–100. Generic pool thresholds are currently inert: saving one does not enable threshold-based switching, change the provider enablement override, or disable reactive 429 rotation. `status` and mutation output use the confirmed server response. For generic pools, `poolEnabled` is the stored provider override (`null` means unspecified), not inherited effective state; `inert: true` means the threshold is not applied, and unknown capability never reports `enabled: true`. API-key providers, Anthropic and invalid values are rejected. ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md b/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md index 3ad8e527f7..1e011a0dd5 100644 --- a/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md @@ -187,12 +187,11 @@ quota-bar'ов дашборда. ### `ocx account auto-switch > [--json]` -Управляет только пулом аккаунтов Codex `openai`. `on` ставит 80%, `off` — 0%, `status` читает -текущее значение, а `threshold ` принимает целое число от 0 до 100. Для других провайдеров и -некорректных значений команда завершается кодом 1. `--json` возвращает: +Управляет порогом пула Codex `openai` или сохраняет порог общего пула OAuth. `on` сохраняет 80 %, `off` — 0 %, а `threshold ` принимает 0–100. Пороги общих пулов пока не применяются: сохранение не включает переключение по порогу, не меняет настройку включения провайдера и не отключает ротацию после ошибки 429. Результат чтения и изменения берётся из подтверждённого ответа сервера. Для общего пула `poolEnabled` — сохранённая настройка провайдера (`null` означает отсутствие настройки), а не итоговое унаследованное состояние. `inert: true` означает, что порог не применяется; неизвестная возможность также не даёт `enabled: true`. Провайдеры с ключом API, Anthropic и неверные значения отклоняются. ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md b/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md index 9c2e9378b7..92c0cbd2a8 100644 --- a/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md @@ -229,13 +229,11 @@ eşleşen null veya eski bir rapora düşer (çıkış 0). ### `ocx account auto-switch > [--json]` -Yalnızca `openai` Codex hesap havuzunu denetler. `on` %80'i ayarlar, `off` %0'ı -ayarlar, `status` geçerli değeri okur ve `threshold ` 0 ile 100 arasında bir -tamsayı kabul eder. Diğer sağlayıcılar ve geçersiz değerler 1 ile çıkar. -`--json` şunu döndürür: +`openai` Codex havuzunun eşiğini yönetir veya genel OAuth havuzunun eşiğini kaydeder. `on` %80, `off` %0 kaydeder; `threshold ` 0–100 kabul eder. Genel havuz eşikleri şu anda uygulanmaz: kayıt işlemi eşik tabanlı geçişi, sağlayıcının etkinlik ayarını veya 429 hatasından sonraki otomatik hesap değişimini etkilemez. Çıktı sunucunun doğruladığı değerleri kullanır. Genel havuzlarda `poolEnabled`, kaydedilmiş sağlayıcı ayarıdır (`null` belirtilmemiş demektir); devralınmış etkin durumu göstermez. `inert: true`, eşiğin uygulanmadığını belirtir; yetenek bilinmiyorsa `enabled: true` bildirilmez. API anahtarlı sağlayıcılar, Anthropic ve geçersiz değerler reddedilir. ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md b/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md index 9601b0766b..a05d6cd65b 100644 --- a/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md @@ -169,12 +169,11 @@ token,也不是简单重读账号列表。`--json` 返回 ### `ocx account auto-switch > [--json]` -只控制 `openai` 的 Codex 账号池。`on` 会设为 80%,`off` 会设为 0%,`status` 会读取 -当前值,而 `threshold ` 接受 0 到 100 之间的整数。其他提供方和无效值都会以 1 -退出。`--json` 返回: +控制 `openai` Codex 账户池阈值,或保存通用 OAuth 账户池阈值。`on` 保存 80%,`off` 保存 0%,`threshold ` 接受 0–100。通用池的阈值目前不参与运行;保存阈值不会启用阈值切换、改变提供方启用设置或禁用 429 错误后的轮换。查询和修改结果使用服务器确认值。通用池的 `poolEnabled` 是已保存的提供方设置,`null` 表示未指定,并不代表继承后的实际状态。`inert: true` 表示阈值未应用;能力未知时也不会报告 `enabled: true`。API 密钥提供方、Anthropic 和无效值会被拒绝。 ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md b/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md index d8d45133b6..2a1d55176c 100644 --- a/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md @@ -129,10 +129,11 @@ Codex 池選擇套用於清除既有親和性後的下一個請求;進行中 ### `ocx account auto-switch > [--json]` -僅控制 `openai` Codex 帳號池。`on` 設為 80%,`off` 設為 0%,`status` 讀取目前值,而 `threshold ` 接受 0 到 100 的整數。其他供應商與無效值離開 1。`--json` 回傳: +控制 `openai` Codex 帳戶池閾值,或儲存通用 OAuth 帳戶池閾值。`on` 儲存 80%,`off` 儲存 0%,`threshold ` 接受 0–100。通用池的閾值目前不參與執行;儲存閾值不會啟用閾值切換、改變供應商啟用設定或停用 429 錯誤後的輪替。查詢與修改結果使用伺服器確認值。通用池的 `poolEnabled` 是已儲存的供應商設定,`null` 表示未指定,並不代表繼承後的實際狀態。`inert: true` 表示閾值未套用;能力未知時也不會回報 `enabled: true`。API 金鑰供應商、Anthropic 與無效值會被拒絕。 ```text -{ provider, autoSwitchThreshold: number, enabled: boolean } +openai: { provider, autoSwitchThreshold: number, enabled: boolean } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } ``` ### `ocx account login|reauth|code|cancel ...` diff --git a/src/cli/account-extended.ts b/src/cli/account-extended.ts index 82d6755e5b..d8ec552dca 100644 --- a/src/cli/account-extended.ts +++ b/src/cli/account-extended.ts @@ -367,6 +367,7 @@ export async function cmdAutoSwitch(args: string[], deps: AccountDeps): Promise< if (threshold !== undefined && (!Number.isInteger(threshold) || threshold < 0 || threshold > 100)) { return usage("Error: threshold must be an integer 0-100"); } + let settings: Record = {}; const baseUrl = await resolveBaseUrl(deps); if (!baseUrl) return proxyUnreachable(); if (action === "status") { @@ -378,6 +379,7 @@ export async function cmdAutoSwitch(args: string[], deps: AccountDeps): Promise< if (response.status !== 200 || (!genericPool && typeof response.json.autoSwitchThreshold !== "number")) { return apiError(response.json, "failed to read auto-switch status", response.status); } + settings = response.json; threshold = typeof response.json.autoSwitchThreshold === "number" ? response.json.autoSwitchThreshold : 0; } else { const response = genericPool @@ -385,6 +387,26 @@ export async function cmdAutoSwitch(args: string[], deps: AccountDeps): Promise< : await apiJson(deps, baseUrl, "PUT", "/api/codex-auth/auto-switch", { threshold }); if (response.status === 0) return proxyUnreachable(response.transportError); if (response.status !== 200) return apiError(response.json, "failed to update auto-switch", response.status); + settings = response.json; + } + if (genericPool) { + // Generic thresholds are stored independently of the enabled override. The + // latter may inherit global preference and never disables reactive rotation. + const stored = settings.autoSwitchThreshold; + const storedThreshold = typeof stored === "number" && Number.isInteger(stored) && stored >= 0 && stored <= 100 + ? stored : null; + const poolEnabled = typeof settings.enabled === "boolean" ? settings.enabled : null; + const inert = typeof settings.inert === "boolean" ? settings.inert : null; + const enabled = inert === false && poolEnabled === true && storedThreshold !== null && storedThreshold > 0; + if (wantsJson) { + console.log(JSON.stringify({ provider: name, autoSwitchThreshold: storedThreshold, enabled, poolEnabled, inert }, null, 2)); + } else if (inert !== false) { + const value = storedThreshold === null ? "unset" : `${storedThreshold}%`; + console.log(`auto-switch: ${inert === true ? "inactive" : "unavailable"} (stored threshold ${value}; ${inert === true ? "not applied by this pool" : "threshold support is unknown"})`); + } else { + console.log(enabled ? `auto-switch: on (threshold ${storedThreshold}%)` : "auto-switch: off"); + } + return 0; } const enabled = threshold! > 0; if (wantsJson) console.log(JSON.stringify({ provider: name, autoSwitchThreshold: threshold, enabled }, null, 2)); diff --git a/tests/cli/cli-account-pool-verbs.test.ts b/tests/cli/cli-account-pool-verbs.test.ts index 41c4c170fd..f46951cca5 100644 --- a/tests/cli/cli-account-pool-verbs.test.ts +++ b/tests/cli/cli-account-pool-verbs.test.ts @@ -349,10 +349,68 @@ describe("generic OAuth pool-settings contract (#695)", () => { const calls: Captured[] = []; const out = capture(); try { - expect(await cmdAutoSwitch(["google-antigravity", "threshold", "90"], genericDeps(() => ({ json: { ok: true, autoSwitchThreshold: 90 } }), calls))).toBe(0); + expect(await cmdAutoSwitch(["google-antigravity", "threshold", "90"], genericDeps(() => ({ json: { ok: true, autoSwitchThreshold: 90, enabled: true, inert: true } }), calls))).toBe(0); } finally { out.restore(); } expect(calls[0]).toMatchObject({ method: "PUT", path: "/api/oauth/accounts/pool", body: { provider: "google-antigravity", autoSwitchThreshold: 90 } }); - expect(out.lines.join("\n")).toContain("threshold 90%"); + expect(out.lines.join("\n")).toContain("stored threshold 90%"); + expect(out.lines.join("\n")).toContain("inactive"); + expect(out.lines.join("\n")).not.toContain("auto-switch: on"); + }); + + test("generic status preserves configured pool state without claiming an inert threshold is active", async () => { + for (const poolEnabled of [true, false, null]) { + const calls: Captured[] = []; + const out = capture(); + try { + expect(await cmdAutoSwitch(["google-antigravity", "status", "--json"], genericDeps(() => ({ + json: { kind: "generic", enabled: poolEnabled, autoSwitchThreshold: 90, inert: true }, + }), calls))).toBe(0); + } finally { out.restore(); } + expect(calls).toHaveLength(1); + expect(calls[0]).toMatchObject({ method: "GET", path: "/api/oauth/accounts/pool?provider=google-antigravity" }); + expect(JSON.parse(out.lines.join("\n"))).toEqual({ + provider: "google-antigravity", autoSwitchThreshold: 90, enabled: false, poolEnabled, inert: true, + }); + } + }); + + test("generic writes report the confirmed DTO, not the requested threshold", async () => { + const calls: Captured[] = []; + const out = capture(); + try { + expect(await cmdAutoSwitch(["google-antigravity", "on", "--json"], genericDeps(() => ({ + json: { ok: true, enabled: null, autoSwitchThreshold: null, inert: true }, + }), calls))).toBe(0); + } finally { out.restore(); } + expect(calls[0]).toMatchObject({ method: "PUT", body: { provider: "google-antigravity", autoSwitchThreshold: 80 } }); + expect(JSON.parse(out.lines.join("\n"))).toEqual({ + provider: "google-antigravity", autoSwitchThreshold: null, enabled: false, poolEnabled: null, inert: true, + }); + }); + + test("generic missing or malformed capability stays unknown rather than enabled", async () => { + for (const json of [{}, { enabled: "true", autoSwitchThreshold: "90", inert: "false" }, + { enabled: true, autoSwitchThreshold: 90 }, { enabled: true, autoSwitchThreshold: 101, inert: false }]) { + const out = capture(); + try { + expect(await cmdAutoSwitch(["google-antigravity", "status", "--json"], genericDeps(() => ({ json }), []))).toBe(0); + } finally { out.restore(); } + const result = JSON.parse(out.lines.join("\n")); + expect(result.enabled).toBe(false); + expect(result.autoSwitchThreshold === null || result.autoSwitchThreshold === 90).toBe(true); + } + }); + + test("an inert zero threshold remains distinct from an unset threshold", async () => { + for (const autoSwitchThreshold of [0, null]) { + const out = capture(); + try { + expect(await cmdAutoSwitch(["google-antigravity", "status", "--json"], genericDeps(() => ({ + json: { enabled: true, autoSwitchThreshold, inert: true }, + }), []))).toBe(0); + } finally { out.restore(); } + expect(JSON.parse(out.lines.join("\n"))).toMatchObject({ autoSwitchThreshold, enabled: false, inert: true }); + } }); test("api-key providers are still refused before any request", async () => { From c18afc93478514a878460c610d48fa2f0d0b03c3 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:45:27 +0900 Subject: [PATCH 003/221] fix(cli): keep unknown generic pool capabilities inactive --- .../fr/reference/cli/providers-accounts.md | 4 ++-- .../ja/reference/cli/providers-accounts.md | 4 ++-- .../ko/reference/cli/providers-accounts.md | 4 ++-- .../docs/reference/cli/providers-accounts.md | 4 ++-- .../ru/reference/cli/providers-accounts.md | 4 ++-- .../tr/reference/cli/providers-accounts.md | 4 ++-- .../zh-cn/reference/cli/providers-accounts.md | 4 ++-- .../zh-tw/reference/cli/providers-accounts.md | 4 ++-- src/cli/account-extended.ts | 17 ++++++++------- tests/cli/cli-account-pool-verbs.test.ts | 21 ++++++++++++++++--- 10 files changed, 43 insertions(+), 27 deletions(-) diff --git a/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md b/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md index c7c4ffa7ca..284c8c20c3 100644 --- a/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/fr/reference/cli/providers-accounts.md @@ -203,11 +203,11 @@ renvoient 1 ; une sonde de quota en amont qui échoue ou expire produit plutôt ### `ocx account auto-switch > [--json]` -Contrôle le seuil du pool Codex `openai`, ou enregistre celui d’un pool OAuth générique. `on` enregistre 80 %, `off` 0 % et `threshold ` accepte 0–100. Les seuils génériques sont actuellement inactifs : leur sauvegarde ne change ni le basculement par seuil, ni l’activation du fournisseur, ni la rotation réactive après une erreur 429. Les sorties utilisent la réponse confirmée du serveur. Pour un pool générique, `poolEnabled` est le réglage enregistré (`null` signifie non spécifié), pas l’état effectif hérité. `inert: true` indique que le seuil ne s’applique pas ; une capacité inconnue ne produit jamais `enabled: true`. Les fournisseurs à clé API, Anthropic et les valeurs invalides sont refusés. +Contrôle le seuil du pool Codex `openai`, ou enregistre celui d’un pool OAuth générique. `on` enregistre 80 %, `off` 0 % et `threshold ` accepte 0–100. Les seuils génériques sont actuellement inactifs : leur sauvegarde ne change ni le basculement par seuil, ni l’activation du fournisseur, ni la rotation réactive après une erreur 429. Pour les pools génériques, les sorties utilisent la réponse confirmée du serveur. Pour un pool générique, `poolEnabled` est le réglage enregistré (`null` signifie non spécifié), pas l’état effectif hérité. `inert: true` indique que le seuil ne s’applique pas ; une capacité inconnue ne produit jamais `enabled: true`. Les fournisseurs à clé API, Anthropic et les valeurs invalides sont refusés. ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md b/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md index 63596b369c..d20483a8a2 100644 --- a/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/ja/reference/cli/providers-accounts.md @@ -149,11 +149,11 @@ OAuth プロバイダーと API キー プロバイダーの場合、これに ### `ocx account auto-switch > [--json]` -`openai` Codex プールのしきい値を制御するか、汎用 OAuth プールのしきい値を保存します。`on` は 80%、`off` は 0%、`threshold ` は 0–100 を保存します。汎用プールのしきい値は現在適用されません。保存しても、しきい値による切り替え、プロバイダーの有効化設定、429 エラー時のローテーションは変更されません。照会と変更の結果はサーバーの確認値を使用します。汎用プールの `poolEnabled` は保存された設定で、`null` は未指定です。継承後の実効状態ではありません。`inert: true` は未適用を示し、機能が不明な場合も `enabled: true` とは表示しません。API キープロバイダー、Anthropic、不正な値は拒否されます。 +`openai` Codex プールのしきい値を制御するか、汎用 OAuth プールのしきい値を保存します。`on` は 80%、`off` は 0%、`threshold ` は 0–100 を保存します。汎用プールのしきい値は現在適用されません。保存しても、しきい値による切り替え、プロバイダーの有効化設定、429 エラー時のローテーションは変更されません。汎用プールの照会と変更の結果はサーバーの確認値を使用します。汎用プールの `poolEnabled` は保存された設定で、`null` は未指定です。継承後の実効状態ではありません。`inert: true` は未適用を示し、機能が不明な場合も `enabled: true` とは表示しません。API キープロバイダー、Anthropic、不正な値は拒否されます。 ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md b/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md index ff86f67e8d..250b3d7b1b 100644 --- a/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/ko/reference/cli/providers-accounts.md @@ -209,11 +209,11 @@ OAuth 및 API 키 제공자에는 제공자의 할당량 보고 엔드포인트 ### `ocx account auto-switch > [--json]` -`openai` Codex 풀의 임계값을 제어하거나 일반 OAuth 풀의 임계값을 저장합니다. `on`은 80%, `off`는 0%, `threshold `은 0–100을 저장합니다. 일반 풀의 임계값은 현재 동작에 적용되지 않습니다. 저장해도 임계값 기반 전환이나 제공자 활성화 설정이 바뀌지 않고, 429 오류에 따른 회전도 비활성화되지 않습니다. 조회와 변경 결과는 서버가 확인한 값을 사용합니다. 일반 풀의 `poolEnabled`는 저장된 제공자별 설정이며 `null`은 미지정입니다. 전역 설정을 상속한 실제 상태를 뜻하지 않습니다. `inert: true`이면 임계값이 적용되지 않으며, 기능 지원을 알 수 없을 때도 `enabled: true`로 표시하지 않습니다. API 키 제공자, Anthropic 및 잘못된 값은 거부합니다. +`openai` Codex 풀의 임계값을 제어하거나 일반 OAuth 풀의 임계값을 저장합니다. `on`은 80%, `off`는 0%, `threshold `은 0–100을 저장합니다. 일반 풀의 임계값은 현재 동작에 적용되지 않습니다. 저장해도 임계값 기반 전환이나 제공자 활성화 설정이 바뀌지 않고, 429 오류에 따른 회전도 비활성화되지 않습니다. 일반 풀의 조회와 변경 결과는 서버가 확인한 값을 사용합니다. 일반 풀의 `poolEnabled`는 저장된 제공자별 설정이며 `null`은 미지정입니다. 전역 설정을 상속한 실제 상태를 뜻하지 않습니다. `inert: true`이면 임계값이 적용되지 않으며, 기능 지원을 알 수 없을 때도 `enabled: true`로 표시하지 않습니다. API 키 제공자, Anthropic 및 잘못된 값은 거부합니다. ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/reference/cli/providers-accounts.md b/docs-site/src/content/docs/reference/cli/providers-accounts.md index 7b9d9da16c..b31c0f3159 100644 --- a/docs-site/src/content/docs/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/reference/cli/providers-accounts.md @@ -331,11 +331,11 @@ instead (exit 0), matching the dashboard's quota bars. ### `ocx account auto-switch > [--json]` -Controls the `openai` Codex pool threshold, or stores a threshold for a generic OAuth pool. `on` stores 80%, `off` stores 0%, and `threshold ` accepts 0–100. Generic pool thresholds are currently inert: saving one does not enable threshold-based switching, change the provider enablement override, or disable reactive 429 rotation. `status` and mutation output use the confirmed server response. For generic pools, `poolEnabled` is the stored provider override (`null` means unspecified), not inherited effective state; `inert: true` means the threshold is not applied, and unknown capability never reports `enabled: true`. API-key providers, Anthropic and invalid values are rejected. +Controls the `openai` Codex pool threshold, or stores a threshold for a generic OAuth pool. `on` stores 80%, `off` stores 0%, and `threshold ` accepts 0–100. Generic pool thresholds are currently inert: saving one does not enable threshold-based switching, change the provider enablement override, or disable reactive 429 rotation. `status` and mutation output for generic pools use the confirmed server response. For generic pools, `poolEnabled` is the stored provider override (`null` means unspecified), not inherited effective state; `inert: true` means the threshold is not applied, and unknown capability never reports `enabled: true`. API-key providers, Anthropic and invalid values are rejected. ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md b/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md index 1e011a0dd5..56bde92668 100644 --- a/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/ru/reference/cli/providers-accounts.md @@ -187,11 +187,11 @@ quota-bar'ов дашборда. ### `ocx account auto-switch > [--json]` -Управляет порогом пула Codex `openai` или сохраняет порог общего пула OAuth. `on` сохраняет 80 %, `off` — 0 %, а `threshold ` принимает 0–100. Пороги общих пулов пока не применяются: сохранение не включает переключение по порогу, не меняет настройку включения провайдера и не отключает ротацию после ошибки 429. Результат чтения и изменения берётся из подтверждённого ответа сервера. Для общего пула `poolEnabled` — сохранённая настройка провайдера (`null` означает отсутствие настройки), а не итоговое унаследованное состояние. `inert: true` означает, что порог не применяется; неизвестная возможность также не даёт `enabled: true`. Провайдеры с ключом API, Anthropic и неверные значения отклоняются. +Управляет порогом пула Codex `openai` или сохраняет порог общего пула OAuth. `on` сохраняет 80 %, `off` — 0 %, а `threshold ` принимает 0–100. Пороги общих пулов пока не применяются: сохранение не включает переключение по порогу, не меняет настройку включения провайдера и не отключает ротацию после ошибки 429. Для общего пула результат чтения и изменения берётся из подтверждённого ответа сервера. Для общего пула `poolEnabled` — сохранённая настройка провайдера (`null` означает отсутствие настройки), а не итоговое унаследованное состояние. `inert: true` означает, что порог не применяется; неизвестная возможность также не даёт `enabled: true`. Провайдеры с ключом API, Anthropic и неверные значения отклоняются. ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md b/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md index 92c0cbd2a8..f611d7be73 100644 --- a/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/tr/reference/cli/providers-accounts.md @@ -229,11 +229,11 @@ eşleşen null veya eski bir rapora düşer (çıkış 0). ### `ocx account auto-switch > [--json]` -`openai` Codex havuzunun eşiğini yönetir veya genel OAuth havuzunun eşiğini kaydeder. `on` %80, `off` %0 kaydeder; `threshold ` 0–100 kabul eder. Genel havuz eşikleri şu anda uygulanmaz: kayıt işlemi eşik tabanlı geçişi, sağlayıcının etkinlik ayarını veya 429 hatasından sonraki otomatik hesap değişimini etkilemez. Çıktı sunucunun doğruladığı değerleri kullanır. Genel havuzlarda `poolEnabled`, kaydedilmiş sağlayıcı ayarıdır (`null` belirtilmemiş demektir); devralınmış etkin durumu göstermez. `inert: true`, eşiğin uygulanmadığını belirtir; yetenek bilinmiyorsa `enabled: true` bildirilmez. API anahtarlı sağlayıcılar, Anthropic ve geçersiz değerler reddedilir. +`openai` Codex havuzunun eşiğini yönetir veya genel OAuth havuzunun eşiğini kaydeder. `on` %80, `off` %0 kaydeder; `threshold ` 0–100 kabul eder. Genel havuz eşikleri şu anda uygulanmaz: kayıt işlemi eşik tabanlı geçişi, sağlayıcının etkinlik ayarını veya 429 hatasından sonraki otomatik hesap değişimini etkilemez. Genel havuz çıktısı sunucunun doğruladığı değerleri kullanır. Genel havuzlarda `poolEnabled`, kaydedilmiş sağlayıcı ayarıdır (`null` belirtilmemiş demektir); devralınmış etkin durumu göstermez. `inert: true`, eşiğin uygulanmadığını belirtir; yetenek bilinmiyorsa `enabled: true` bildirilmez. API anahtarlı sağlayıcılar, Anthropic ve geçersiz değerler reddedilir. ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md b/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md index a05d6cd65b..85633f54f5 100644 --- a/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/zh-cn/reference/cli/providers-accounts.md @@ -169,11 +169,11 @@ token,也不是简单重读账号列表。`--json` 返回 ### `ocx account auto-switch > [--json]` -控制 `openai` Codex 账户池阈值,或保存通用 OAuth 账户池阈值。`on` 保存 80%,`off` 保存 0%,`threshold ` 接受 0–100。通用池的阈值目前不参与运行;保存阈值不会启用阈值切换、改变提供方启用设置或禁用 429 错误后的轮换。查询和修改结果使用服务器确认值。通用池的 `poolEnabled` 是已保存的提供方设置,`null` 表示未指定,并不代表继承后的实际状态。`inert: true` 表示阈值未应用;能力未知时也不会报告 `enabled: true`。API 密钥提供方、Anthropic 和无效值会被拒绝。 +控制 `openai` Codex 账户池阈值,或保存通用 OAuth 账户池阈值。`on` 保存 80%,`off` 保存 0%,`threshold ` 接受 0–100。通用池的阈值目前不参与运行;保存阈值不会启用阈值切换、改变提供方启用设置或禁用 429 错误后的轮换。通用池的查询和修改结果使用服务器确认值。通用池的 `poolEnabled` 是已保存的提供方设置,`null` 表示未指定,并不代表继承后的实际状态。`inert: true` 表示阈值未应用;能力未知时也不会报告 `enabled: true`。API 密钥提供方、Anthropic 和无效值会被拒绝。 ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account priority [<-100..100|first|earlier|normal|later|last|reset>] [--json]` diff --git a/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md b/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md index 2a1d55176c..c50a6d54ae 100644 --- a/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/zh-tw/reference/cli/providers-accounts.md @@ -129,11 +129,11 @@ Codex 池選擇套用於清除既有親和性後的下一個請求;進行中 ### `ocx account auto-switch > [--json]` -控制 `openai` Codex 帳戶池閾值,或儲存通用 OAuth 帳戶池閾值。`on` 儲存 80%,`off` 儲存 0%,`threshold ` 接受 0–100。通用池的閾值目前不參與執行;儲存閾值不會啟用閾值切換、改變供應商啟用設定或停用 429 錯誤後的輪替。查詢與修改結果使用伺服器確認值。通用池的 `poolEnabled` 是已儲存的供應商設定,`null` 表示未指定,並不代表繼承後的實際狀態。`inert: true` 表示閾值未套用;能力未知時也不會回報 `enabled: true`。API 金鑰供應商、Anthropic 與無效值會被拒絕。 +控制 `openai` Codex 帳戶池閾值,或儲存通用 OAuth 帳戶池閾值。`on` 儲存 80%,`off` 儲存 0%,`threshold ` 接受 0–100。通用池的閾值目前不參與執行;儲存閾值不會啟用閾值切換、改變供應商啟用設定或停用 429 錯誤後的輪替。通用池的查詢與修改結果使用伺服器確認值。通用池的 `poolEnabled` 是已儲存的供應商設定,`null` 表示未指定,並不代表繼承後的實際狀態。`inert: true` 表示閾值未套用;能力未知時也不會回報 `enabled: true`。API 金鑰供應商、Anthropic 與無效值會被拒絕。 ```text openai: { provider, autoSwitchThreshold: number, enabled: boolean } -generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: boolean | null } +generic OAuth: { provider, autoSwitchThreshold: number | null, enabled: boolean, poolEnabled: boolean | null, inert: true | null } ``` ### `ocx account login|reauth|code|cancel ...` diff --git a/src/cli/account-extended.ts b/src/cli/account-extended.ts index d8ec552dca..38179aca42 100644 --- a/src/cli/account-extended.ts +++ b/src/cli/account-extended.ts @@ -379,15 +379,17 @@ export async function cmdAutoSwitch(args: string[], deps: AccountDeps): Promise< if (response.status !== 200 || (!genericPool && typeof response.json.autoSwitchThreshold !== "number")) { return apiError(response.json, "failed to read auto-switch status", response.status); } - settings = response.json; - threshold = typeof response.json.autoSwitchThreshold === "number" ? response.json.autoSwitchThreshold : 0; + settings = genericPool && (!response.json || typeof response.json !== "object" || Array.isArray(response.json)) + ? {} : response.json; + threshold = typeof settings.autoSwitchThreshold === "number" ? settings.autoSwitchThreshold : 0; } else { const response = genericPool ? await apiJson(deps, baseUrl, "PUT", "/api/oauth/accounts/pool", { provider: name, autoSwitchThreshold: threshold }) : await apiJson(deps, baseUrl, "PUT", "/api/codex-auth/auto-switch", { threshold }); if (response.status === 0) return proxyUnreachable(response.transportError); if (response.status !== 200) return apiError(response.json, "failed to update auto-switch", response.status); - settings = response.json; + settings = genericPool && (!response.json || typeof response.json !== "object" || Array.isArray(response.json)) + ? {} : response.json; } if (genericPool) { // Generic thresholds are stored independently of the enabled override. The @@ -396,15 +398,14 @@ export async function cmdAutoSwitch(args: string[], deps: AccountDeps): Promise< const storedThreshold = typeof stored === "number" && Number.isInteger(stored) && stored >= 0 && stored <= 100 ? stored : null; const poolEnabled = typeof settings.enabled === "boolean" ? settings.enabled : null; - const inert = typeof settings.inert === "boolean" ? settings.inert : null; - const enabled = inert === false && poolEnabled === true && storedThreshold !== null && storedThreshold > 0; + const inert = settings.inert === true ? true : null; + // This CLI understands only the current inert generic threshold contract. + const enabled = false; if (wantsJson) { console.log(JSON.stringify({ provider: name, autoSwitchThreshold: storedThreshold, enabled, poolEnabled, inert }, null, 2)); - } else if (inert !== false) { + } else { const value = storedThreshold === null ? "unset" : `${storedThreshold}%`; console.log(`auto-switch: ${inert === true ? "inactive" : "unavailable"} (stored threshold ${value}; ${inert === true ? "not applied by this pool" : "threshold support is unknown"})`); - } else { - console.log(enabled ? `auto-switch: on (threshold ${storedThreshold}%)` : "auto-switch: off"); } return 0; } diff --git a/tests/cli/cli-account-pool-verbs.test.ts b/tests/cli/cli-account-pool-verbs.test.ts index f46951cca5..04be2e4fa6 100644 --- a/tests/cli/cli-account-pool-verbs.test.ts +++ b/tests/cli/cli-account-pool-verbs.test.ts @@ -382,15 +382,17 @@ describe("generic OAuth pool-settings contract (#695)", () => { json: { ok: true, enabled: null, autoSwitchThreshold: null, inert: true }, }), calls))).toBe(0); } finally { out.restore(); } - expect(calls[0]).toMatchObject({ method: "PUT", body: { provider: "google-antigravity", autoSwitchThreshold: 80 } }); + expect(calls).toHaveLength(1); + expect(calls[0]?.body).toEqual({ provider: "google-antigravity", autoSwitchThreshold: 80 }); expect(JSON.parse(out.lines.join("\n"))).toEqual({ provider: "google-antigravity", autoSwitchThreshold: null, enabled: false, poolEnabled: null, inert: true, }); }); test("generic missing or malformed capability stays unknown rather than enabled", async () => { - for (const json of [{}, { enabled: "true", autoSwitchThreshold: "90", inert: "false" }, - { enabled: true, autoSwitchThreshold: 90 }, { enabled: true, autoSwitchThreshold: 101, inert: false }]) { + for (const json of [null, [], {}, { enabled: "true", autoSwitchThreshold: "90", inert: "false" }, + { enabled: true, autoSwitchThreshold: 90 }, { enabled: true, autoSwitchThreshold: 101, inert: false }, + { enabled: true, autoSwitchThreshold: 90, inert: false }]) { const out = capture(); try { expect(await cmdAutoSwitch(["google-antigravity", "status", "--json"], genericDeps(() => ({ json }), []))).toBe(0); @@ -401,6 +403,19 @@ describe("generic OAuth pool-settings contract (#695)", () => { } }); + test("a successful generic write with a null body reports unknown settings", async () => { + const calls: Captured[] = []; + const out = capture(); + try { + expect(await cmdAutoSwitch(["google-antigravity", "off", "--json"], genericDeps(() => ({ json: null }), calls))).toBe(0); + } finally { out.restore(); } + expect(calls).toHaveLength(1); + expect(calls[0]?.body).toEqual({ provider: "google-antigravity", autoSwitchThreshold: 0 }); + expect(JSON.parse(out.lines.join("\n"))).toEqual({ + provider: "google-antigravity", autoSwitchThreshold: null, enabled: false, poolEnabled: null, inert: null, + }); + }); + test("an inert zero threshold remains distinct from an unset threshold", async () => { for (const autoSwitchThreshold of [0, null]) { const out = capture(); From 5faaff7d101709ee343f2067c5274fed236395fd Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:45:52 +0900 Subject: [PATCH 004/221] fix(storage): publish cleanup manifests atomically [skip ci] Preserve complete recovery records across handled publication failures and keep existing partial-purge restoration boundaries. Refs #3778. Local checks deferred to final stack CI by maintainer instruction. --- .../content/docs/reference/management-api.md | 4 + src/storage/cleanup.ts | 84 +++++++----- structure/02_config-and-codex-home.md | 6 + tests/storage/storage-cleanup.test.ts | 123 ++++++++++++++++++ 4 files changed, 182 insertions(+), 35 deletions(-) diff --git a/docs-site/src/content/docs/reference/management-api.md b/docs-site/src/content/docs/reference/management-api.md index a12303cfd7..2cd23eb4bd 100644 --- a/docs-site/src/content/docs/reference/management-api.md +++ b/docs-site/src/content/docs/reference/management-api.md @@ -231,6 +231,10 @@ Storage cleanup endpoints can move or permanently remove archived session data. first and submit the returned digest. Prefer quarantine when recovery may be needed. ::: +Cleanup recovery manifests are published atomically, preserving the previous complete record +if a replacement fails before publication. This does not reverse a permanent purge: restore +can still fail when a recorded session has no surviving rollout file. + ### Models and catalog | Method and path | Purpose | Notable errors | diff --git a/src/storage/cleanup.ts b/src/storage/cleanup.ts index c39bbeedf1..e44f7d7b5c 100644 --- a/src/storage/cleanup.ts +++ b/src/storage/cleanup.ts @@ -30,11 +30,11 @@ import { writeSync, chmodSync, } from "node:fs"; -import { basename, isAbsolute, join, relative, resolve, sep } from "node:path"; +import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path"; import { Database } from "bun:sqlite"; import { resolveCodexHomeDir } from "../codex/home"; import { readThreadFieldsFromRollout } from "../codex/history-provider"; -import { renameAtomicFile } from "../config"; +import { renameAtomicFile } from "../lib/windows-atomic-replace"; export const ARCHIVED_SESSIONS_DIR = "archived_sessions"; export const TRASH_DIR = ".trash"; @@ -115,9 +115,35 @@ function chmodPrivatePath(path: string, mode: number): void { try { chmodSync(path, mode); } catch { /* best-effort (e.g. Windows ACLs) */ } } -function writePrivateFile(path: string, content: string): void { - writeFileSync(path, content, "utf8"); - chmodPrivatePath(path, 0o600); +/** Publish complete stage metadata without truncating the last recovery record. */ +function writePrivateFile( + path: string, + content: string, + beforeRename?: (temporaryPath: string, targetPath: string) => void, +): void { + const temporaryPath = `${path}.${process.pid}.${randomUUID()}.tmp`; + let descriptor: number | undefined; + let created = false; + try { + descriptor = openSync(temporaryPath, "wx", 0o600); + created = true; + writeFileSync(descriptor, content, "utf8"); + fsyncSync(descriptor); + closeSync(descriptor); + descriptor = undefined; + chmodPrivatePath(temporaryPath, 0o600); + beforeRename?.(temporaryPath, path); + renameAtomicFile(temporaryPath, path, undefined, "storage-cleanup"); + chmodPrivatePath(path, 0o600); + fsyncDirectoryBestEffort(dirname(path)); + } finally { + if (descriptor !== undefined) { + try { closeSync(descriptor); } catch { /* preserve publication failure */ } + } + if (created) { + try { unlinkSync(temporaryPath); } catch { /* renamed or cleanup unavailable */ } + } + } } function chunkIds(ids: string[], chunkSize: number): string[][] { @@ -812,7 +838,6 @@ interface ReconcileTestHooks { const SATELLITE_BACKUP_FILE = "satellite-backup.json"; /** Marks an incomplete restore so retries can accept dest files and resume metadata. */ const RESTORE_PENDING_FILE = "restore-pending.json"; -let _satelliteBackupSeq = 0; type StagedFile = { from: string; to: string; relPath: string }; @@ -1070,34 +1095,11 @@ function writeSatelliteBackup( if (options?.failWrite) throw new Error("test_fail_satellite_backup_write"); const dest = join(stageDir, SATELLITE_BACKUP_FILE); const replacing = existsSync(dest); - const tmp = join(stageDir, `${SATELLITE_BACKUP_FILE}.${process.pid}.${++_satelliteBackupSeq}.tmp`); - const payload = Buffer.from(JSON.stringify(backup), "utf8"); - const fd = openSync(tmp, "w", 0o600); - try { - let offset = 0; - while (offset < payload.length) { - offset += writeSync(fd, payload, offset, payload.length - offset, null); + writePrivateFile(dest, JSON.stringify(backup), () => { + if (options?.failReplaceBeforeRename && replacing) { + throw new Error("test_fail_satellite_backup_replace"); } - fsyncSync(fd); - } catch (error) { - try { closeSync(fd); } catch { /* */ } - try { unlinkSync(tmp); } catch { /* */ } - throw error; - } - closeSync(fd); - chmodPrivatePath(tmp, 0o600); - if (options?.failReplaceBeforeRename && replacing) { - try { unlinkSync(tmp); } catch { /* */ } - throw new Error("test_fail_satellite_backup_replace"); - } - try { - renameAtomicFile(tmp, dest, undefined, "storage-cleanup"); - } catch (error) { - try { unlinkSync(tmp); } catch { /* */ } - throw error; - } - chmodPrivatePath(dest, 0o600); - fsyncDirectoryBestEffort(stageDir); + }); } function clearSatelliteBackup(stageDir: string): void { @@ -1734,6 +1736,12 @@ export interface ExecuteCleanupOptions { /** Test-only failure injection for atomicity regressions. */ _test?: { failManifestWrite?: boolean; + /** Observe the complete temp and prior destination before publication. Never serialized. */ + beforeManifestReplace?: ( + temporaryPath: string, + targetPath: string, + phase: "staging" | "pre-commit" | "purge-incomplete", + ) => void; failPurgeBasenames?: string[]; failRollbackBasenames?: string[]; blockStageDestBasenames?: string[]; @@ -1752,14 +1760,14 @@ export interface ExecuteCleanupOptions { /** Serializable cleanup test hooks allowed on the management API wire. */ export type CleanupWireTestHooks = Omit< NonNullable, - "afterSatelliteMutations" | "beforeReconcileLock" + "afterSatelliteMutations" | "beforeReconcileLock" | "beforeManifestReplace" >; function isStringArray(v: unknown): v is string[] { return Array.isArray(v) && v.every(e => typeof e === "string"); } -/** Pick only allowlisted serializable hooks; drops function hooks (afterSatelliteMutations, beforeReconcileLock) and unknown keys. */ +/** Pick only allowlisted serializable hooks; drops all function hooks and unknown keys. */ export function pickWireCleanupTestHooks(raw: unknown): CleanupWireTestHooks | undefined { if (!raw || typeof raw !== "object") return undefined; const o = raw as Record; @@ -1911,6 +1919,9 @@ export function executeArchivedCleanup(options: ExecuteCleanupOptions): CleanupR entries: manifestEntries, ...extra, }, null, 2), + (temporaryPath, targetPath) => options._test?.beforeManifestReplace?.( + temporaryPath, targetPath, extra.staging ? "staging" : "pre-commit", + ), ); }; @@ -1999,6 +2010,9 @@ export function executeArchivedCleanup(options: ExecuteCleanupOptions): CleanupR })) .filter(entry => entry.physicalRelPaths.length > 0), }, null, 2), + (temporaryPath, targetPath) => options._test?.beforeManifestReplace?.( + temporaryPath, targetPath, "purge-incomplete", + ), ); } catch { /* best-effort: the pre-commit manifest is still on disk */ } return { diff --git a/structure/02_config-and-codex-home.md b/structure/02_config-and-codex-home.md index bb8ec5630f..66a729b4fe 100644 --- a/structure/02_config-and-codex-home.md +++ b/structure/02_config-and-codex-home.md @@ -127,6 +127,12 @@ Worker cannot restore unrelated API keys or provider settings from a snapshot re If that metadata write is unavailable after cleanup has already completed, the job retains the cleanup outcome and exposes a bounded persistence error instead of relabeling the run as a Worker failure. +Cleanup manifests and satellite backups share the stage-local atomic publisher: an exclusive +private temporary file is fully written and file-synced before the existing Windows-tolerant +rename replaces the destination. Handled publication failures retain the previous record; +directory syncing remains best-effort. This does not make a partial permanent purge reversible: +restore still fails closed when a recorded logical entry has no surviving file. + Windows secret-file hardening resolves the effective token SID through an absolute, trusted PowerShell path before granting the owner and removing inherited broad ACL entries. The normal path obtains System32 from `GetSystemDirectoryW`. Windows ARM64 Bun builds that cannot execute diff --git a/tests/storage/storage-cleanup.test.ts b/tests/storage/storage-cleanup.test.ts index 421950368c..31cbcd6d21 100644 --- a/tests/storage/storage-cleanup.test.ts +++ b/tests/storage/storage-cleanup.test.ts @@ -8,6 +8,7 @@ import { readFileSync, renameSync, rmSync, + statSync, unlinkSync, utimesSync, writeFileSync, @@ -20,6 +21,7 @@ import { listArchivedCandidates, listTrashEntries, normalizeArchivedRolloutPath, + pickWireCleanupTestHooks, previewArchivedCleanup, previewExactArchivedCleanup, restoreTrashEntry, @@ -648,6 +650,127 @@ describe("executeArchivedCleanup", () => { expect(ids).toContain("told"); }); + test("initial manifest publication failure preserves originals and removes its private temp", () => { + home = buildHome(); + const observed: Array<{ priorExists: boolean; next: string; mode: number }> = []; + const result = runWithDigest(50, "quarantine", home, { + now: 881, + _test: { + beforeManifestReplace: (temporaryPath, targetPath, phase) => { + if (phase !== "staging") return; + observed.push({ + priorExists: existsSync(targetPath), + next: readFileSync(temporaryPath, "utf8"), + mode: statSync(temporaryPath).mode & 0o777, + }); + throw new Error("injected_manifest_publication_failure"); + }, + }, + }); + // Assert outside the production catch: an assertion inside the hook could be swallowed. + expect(observed).toHaveLength(1); + expect(observed[0]!.priorExists).toBe(false); + expect(JSON.parse(observed[0]!.next).staging).toBe(true); + if (process.platform !== "win32") expect(observed[0]!.mode).toBe(0o600); + expect(result.error).toBe("fs_failed"); + expect(existsSync(join(home, ".trash", "881"))).toBe(false); + expect(readFileSync(join(home, "archived_sessions", "rollout-old.jsonl"), "utf8")).toBe("OLD".repeat(10)); + const db = new Database(join(home, "state_5.sqlite"), { readonly: true }); + expect(db.query("SELECT id FROM threads WHERE id = 'told'").get()).toBeTruthy(); + db.close(); + expect(pickWireCleanupTestHooks({ + beforeManifestReplace: () => {}, failManifestWrite: true, + })).toEqual({ failManifestWrite: true }); + }, STORE_BUDGET_MS); + + test("failed pre-delete replacement leaves the prior manifest intact during publication and restorable", () => { + home = buildHome(); + let stagingBytes = ""; + const observed: Array<{ prior: string; next: string }> = []; + const result = runWithDigest(50, "quarantine", home, { + now: 882, + _test: { + failRollbackBasenames: ["rollout-old.jsonl"], + beforeManifestReplace: (temporaryPath, targetPath, phase) => { + if (phase === "staging") stagingBytes = readFileSync(temporaryPath, "utf8"); + if (phase !== "pre-commit") return; + observed.push({ prior: readFileSync(targetPath, "utf8"), next: readFileSync(temporaryPath, "utf8") }); + throw new Error("injected_manifest_publication_failure"); + }, + }, + }); + expect(observed).toHaveLength(1); + expect(observed[0]!.prior).toBe(stagingBytes); + expect(JSON.parse(observed[0]!.prior).staging).toBe(true); + expect(JSON.parse(observed[0]!.next).staging).toBeUndefined(); + expect(result.error).toBe("fs_failed"); + expect(result.trashDir).toBe(".trash/882"); + const stage = join(home, ".trash", "882"); + expect(readFileSync(join(stage, "manifest.json"), "utf8")).toBe(stagingBytes); + expect(readFileSync(join(stage, "rollout-old.jsonl"), "utf8")).toBe("OLD".repeat(10)); + expect(readdirSync(stage).filter(name => name.endsWith(".tmp"))).toEqual([]); + const db = new Database(join(home, "state_5.sqlite"), { readonly: true }); + expect(db.query("SELECT id FROM threads WHERE id = 'told'").get()).toBeTruthy(); + db.close(); + const restored = restoreTrashEntry(".trash/882", { codexHome: home }); + expect(restored.ok).toBe(true); + expect(restored.count).toBe(1); + expect(readFileSync(join(home, "archived_sessions", "rollout-old.jsonl"), "utf8")).toBe("OLD".repeat(10)); + }, STORE_BUDGET_MS); + + test.each([false, true])("failed post-purge manifest replacement preserves prior bytes (partial=%s)", partial => { + home = buildHome(); + let preCommitBytes = ""; + const observed: Array<{ prior: string; next: string }> = []; + const result = runWithDigest(100, "permanent", home, { + now: 883, + _test: { + failPurgeBasenames: partial + ? ["rollout-mid.jsonl"] + : ["rollout-old.jsonl", "rollout-mid.jsonl", "rollout-new.jsonl"], + beforeManifestReplace: (temporaryPath, targetPath, phase) => { + if (phase === "pre-commit") preCommitBytes = readFileSync(temporaryPath, "utf8"); + if (phase !== "purge-incomplete") return; + observed.push({ prior: readFileSync(targetPath, "utf8"), next: readFileSync(temporaryPath, "utf8") }); + throw new Error("injected_manifest_publication_failure"); + }, + }, + }); + expect(observed).toHaveLength(1); + expect(observed[0]!.prior).toBe(preCommitBytes); + expect(JSON.parse(observed[0]!.next).purgeIncomplete).toBe(true); + expect(JSON.parse(observed[0]!.next).entries).toHaveLength(partial ? 1 : 3); + expect(result.error).toBe("fs_failed"); + const stage = join(home, ".trash", "883"); + expect(readFileSync(join(stage, "manifest.json"), "utf8")).toBe(preCommitBytes); + expect(readdirSync(stage).filter(name => name.endsWith(".tmp"))).toEqual([]); + const dbBefore = new Database(join(home, "state_5.sqlite"), { readonly: true }); + const rowsBefore = dbBefore.query("SELECT id FROM threads ORDER BY id").all(); + dbBefore.close(); + expect(rowsBefore).toEqual([{ id: "active" }]); + const stageBefore = readdirSync(stage).sort(); + const restored = restoreTrashEntry(".trash/883", { codexHome: home }); + if (partial) { + // A wholly purged old entry still fails closed; valid JSON is not full recovery. + expect(restored.error).toBe("fs_failed"); + expect(restored.restoredPaths).toEqual([]); + expect(readdirSync(stage).sort()).toEqual(stageBefore); + expect(readFileSync(join(stage, "rollout-mid.jsonl"), "utf8")).toBe("MID".repeat(20)); + expect(existsSync(join(home, "archived_sessions", "rollout-old.jsonl"))).toBe(false); + const dbAfter = new Database(join(home, "state_5.sqlite"), { readonly: true }); + expect(dbAfter.query("SELECT id FROM threads ORDER BY id").all()).toEqual(rowsBefore); + dbAfter.close(); + } else { + expect(restored.ok).toBe(true); + expect(restored.count).toBe(3); + const dbAfter = new Database(join(home, "state_5.sqlite"), { readonly: true }); + expect(dbAfter.query("SELECT id FROM threads ORDER BY id").all()).toEqual([ + { id: "active" }, { id: "tmid" }, { id: "tnew" }, { id: "told" }, + ]); + dbAfter.close(); + } + }, { timeout: STORE_BUDGET_MS }); + test("rename-back failure keeps staged file and reports relative trashDir", () => { home = buildHome(); const db = new Database(join(home, "state_5.sqlite")); From e23eb63b81343f5ff98f8adee0a35ce6c29ad391 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:48:26 +0900 Subject: [PATCH 005/221] fix(gui): render subscription credit quota bars consistently Carries #3728 with raw-label and partial-coverage preservation. Co-authored-by: Yumi Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> --- gui/src/components/QuotaBars.tsx | 58 ++++++++++-- tests/gui/quota-bars-rows.test.ts | 142 ++++++++++++++++++++++++++++++ 2 files changed, 195 insertions(+), 5 deletions(-) diff --git a/gui/src/components/QuotaBars.tsx b/gui/src/components/QuotaBars.tsx index 2715f48608..8b8fd9c4e6 100644 --- a/gui/src/components/QuotaBars.tsx +++ b/gui/src/components/QuotaBars.tsx @@ -20,15 +20,38 @@ export type QuotaBarRow = { /** * Window ordering is computed from RAW wire identities BEFORE localization * (ranking on translated labels breaks the moment a locale changes copy): - * shorter windows first — 5h, weekly, cursor first-party, cursor API, monthly. + * shorter windows first — 5h, weekly, cursor first-party, cursor API, monthly, + * then subscription credits before other custom windows. */ function rawCustomWindowRank(rawLabel: string): number { if (rawLabel === "5h") return 0; if (rawLabel === "First-party models") return 2; if (rawLabel === "API usage") return 3; + if (rawLabel === "Total subscription credits") return 4.5; return 5; } +const SUBSCRIPTION_CREDITS_LABEL = "Total subscription credits"; + +function canonicalCustomWindowLabel(rawLabel: string): string { + return rawLabel.trim().toLowerCase() === SUBSCRIPTION_CREDITS_LABEL.toLowerCase() + ? SUBSCRIPTION_CREDITS_LABEL + : rawLabel; +} + +/** Coverage metadata carries raw labels, while subscription rows use a canonical identity. */ +export function isCustomQuotaWindowIncomplete( + customLabel: string | undefined, + incompleteLabels?: ReadonlySet, +): boolean { + if (customLabel === undefined || !incompleteLabels) return false; + const canonical = canonicalCustomWindowLabel(customLabel); + for (const label of incompleteLabels) { + if (canonicalCustomWindowLabel(label) === canonical) return true; + } + return false; +} + function localizeCustomQuotaLabel(rawLabel: string, t: TFn): string { switch (rawLabel) { case "First-party models": @@ -84,11 +107,12 @@ export function buildQuotaRows(quota: AccountQuota | null, plan: string | null | }); } for (const w of displayQuota.customWindows ?? []) { - const localized = localizeCustomQuotaLabel(w.label, t); + const customLabel = canonicalCustomWindowLabel(w.label); + const localized = localizeCustomQuotaLabel(customLabel, t); ranked.push({ - rank: rawCustomWindowRank(w.label), + rank: rawCustomWindowRank(customLabel), row: { - customLabel: w.label, + customLabel, label: localized, limitLabel: localized, percent: w.percent, @@ -96,6 +120,24 @@ export function buildQuotaRows(quota: AccountQuota | null, plan: string | null | }, }); } + if (displayQuota.creditsUsd && typeof displayQuota.creditsUsd.percent === "number") { + const hasSubscriptionCreditsCustom = displayQuota.customWindows?.some( + w => canonicalCustomWindowLabel(w.label) === SUBSCRIPTION_CREDITS_LABEL, + ); + if (!hasSubscriptionCreditsCustom) { + const localized = localizeCustomQuotaLabel(SUBSCRIPTION_CREDITS_LABEL, t); + ranked.push({ + rank: rawCustomWindowRank(SUBSCRIPTION_CREDITS_LABEL), + row: { + customLabel: SUBSCRIPTION_CREDITS_LABEL, + label: localized, + limitLabel: localized, + percent: displayQuota.creditsUsd.percent, + resetAt: displayQuota.creditsUsd.expiresAt, + }, + }); + } + } return ranked.sort((a, b) => a.rank - b.rank).map(entry => entry.row); } @@ -107,6 +149,12 @@ export function maxQuotaUtilisation(quota: AccountQuota | null): number { for (const w of quota.customWindows ?? []) { if (typeof w.percent === "number") vals.push(w.percent); } + const hasSubscriptionCreditsCustom = quota.customWindows?.some( + w => canonicalCustomWindowLabel(w.label) === SUBSCRIPTION_CREDITS_LABEL, + ); + if (!hasSubscriptionCreditsCustom && typeof quota.creditsUsd?.percent === "number") { + vals.push(quota.creditsUsd.percent); + } return vals.length ? Math.max(...vals) : -1; } @@ -279,7 +327,7 @@ export default function QuotaBars({ locale={locale} incomplete={row.windowKey ? incompleteWindowKeys?.has(row.windowKey) === true - : row.customLabel !== undefined && incompleteCustomWindowLabels?.has(row.customLabel) === true} + : isCustomQuotaWindowIncomplete(row.customLabel, incompleteCustomWindowLabels)} /> ))} diff --git a/tests/gui/quota-bars-rows.test.ts b/tests/gui/quota-bars-rows.test.ts index 57ddd47cfd..8ca5a27579 100644 --- a/tests/gui/quota-bars-rows.test.ts +++ b/tests/gui/quota-bars-rows.test.ts @@ -3,6 +3,7 @@ import { barWidth, buildQuotaRows, formatResetFuture, + isCustomQuotaWindowIncomplete, isQuotaExhausted, isQuotaWarn, maxQuotaUtilisation, @@ -69,6 +70,102 @@ describe("buildQuotaRows (WP070)", () => { expect(rows.map(r => r.label)).toEqual(["quota.totalSubscriptionCredits"]); }); + test("direct creditsUsd renders Total subscription credits with resetAt", () => { + const reported = quota({ + creditsUsd: { used: 89.96, limit: 90, remaining: 0.04, percent: 99.96, expiresAt: 1790430938000 }, + }); + expect(buildQuotaRows(reported, null, t)).toEqual([{ + customLabel: "Total subscription credits", + label: "quota.totalSubscriptionCredits", + limitLabel: "quota.totalSubscriptionCredits", + percent: 99.96, + resetAt: 1790430938000, + }]); + expect(maxQuotaUtilisation(reported)).toBe(99.96); + }); + + test("zero direct credit usage remains a row without an invented expiry", () => { + const reported = quota({ + creditsUsd: { used: 0, limit: 100, remaining: 100, percent: 0 }, + }); + const rows = buildQuotaRows(reported, null, t); + expect(rows).toHaveLength(1); + expect(rows[0]?.customLabel).toBe("Total subscription credits"); + expect(rows[0]?.percent).toBe(0); + expect(rows[0]?.resetAt).toBeUndefined(); + expect(maxQuotaUtilisation(reported)).toBe(0); + }); + + test("subscription credits rank after monthly and before other custom windows", () => { + const rows = buildQuotaRows(quota({ + fiveHourPercent: 10, + weeklyPercent: 40, + monthlyPercent: 70, + customWindows: [ + { label: "Gem", percent: 1 }, + { label: "API usage", percent: 55 }, + { label: "First-party models", percent: 25 }, + ], + creditsUsd: { used: 80, limit: 100, remaining: 20, percent: 80 }, + }), null, t); + expect(rows.map(r => r.limitLabel)).toEqual([ + "quota.fiveHourLimit", + "quota.weeklyLimit", + "quota.cursorFirstParty", + "quota.cursorApiUsage", + "quota.monthlyLimit", + "quota.totalSubscriptionCredits", + "Gem", + ]); + }); + + test.each(["Total subscription credits", " TOTAL SUBSCRIPTION CREDITS "])( + "direct creditsUsd does not duplicate the canonical custom window: %s", + label => { + const customOnly = quota({ customWindows: [{ label, percent: 25, resetAt: 1790430938000 }] }); + const withDirect = quota({ + ...customOnly, + creditsUsd: { used: 99, limit: 100, remaining: 1, percent: 99, expiresAt: 1790517338000 }, + }); + for (const reported of [customOnly, withDirect]) { + expect(buildQuotaRows(reported, null, t)).toEqual([{ + customLabel: "Total subscription credits", + label: "quota.totalSubscriptionCredits", + limitLabel: "quota.totalSubscriptionCredits", + percent: 25, + resetAt: 1790430938000, + }]); + } + }, + ); + + test("unrelated credit windows keep their raw identity and do not suppress direct credits", () => { + const reported = quota({ + customWindows: [ + { label: "API credits", percent: 20 }, + { label: " Gem ", percent: 10 }, + ], + creditsUsd: { used: 50, limit: 100, remaining: 50, percent: 50 }, + }); + const rows = buildQuotaRows(reported, null, t); + expect(rows.map(r => r.label)).toEqual(["quota.totalSubscriptionCredits", "API credits", " Gem "]); + expect(rows.map(r => r.customLabel)).toEqual(["Total subscription credits", "API credits", " Gem "]); + expect(maxQuotaUtilisation(reported)).toBe(50); + }); + + test.each(["go", "free"])("30-day plan %s retains direct credits after normalization", plan => { + const rows = buildQuotaRows(quota({ + shortPercent: 10, + shortWindowSeconds: 5 * 60 * 60, + weeklyPercent: 30, + monthlyPercent: 60, + customWindows: [{ label: "Total subscription credits", percent: 99 }], + creditsUsd: { used: 80, limit: 100, remaining: 20, percent: 80 }, + }), plan, t); + expect(rows.map(r => r.limitLabel)).toEqual(["quota.monthlyLimit", "quota.totalSubscriptionCredits"]); + expect(rows.map(r => r.percent)).toEqual([60, 80]); + }); + test("null and empty quotas produce no rows; 30-day plans strip to monthly", () => { expect(buildQuotaRows(null, null, t)).toEqual([]); expect(buildQuotaRows(quota({}), null, t)).toEqual([]); @@ -93,6 +190,51 @@ describe("maxQuotaUtilisation", () => { fiveHourPercent: 10, customWindows: [{ label: "x", percent: 95 }], }))).toBe(95); + expect(maxQuotaUtilisation(quota({ + fiveHourPercent: 0, + weeklyPercent: 0, + creditsUsd: { used: 90, limit: 90, remaining: 0, percent: 100 }, + }))).toBe(100); + }); + + test.each(["Total subscription credits", " total subscription credits "])( + "subscription-credit urgency follows the visible custom window: %s", + label => { + expect(maxQuotaUtilisation(quota({ + customWindows: [{ label, percent: 25 }], + creditsUsd: { used: 99, limit: 100, remaining: 1, percent: 99 }, + }))).toBe(25); + }, + ); +}); + +describe("isCustomQuotaWindowIncomplete", () => { + test("canonical subscription rows retain raw-label coverage metadata", () => { + const rows = buildQuotaRows(quota({ + customWindows: [{ label: " TOTAL SUBSCRIPTION CREDITS ", percent: 25 }], + }), null, t); + expect(rows[0]?.customLabel).toBe("Total subscription credits"); + expect(isCustomQuotaWindowIncomplete( + rows[0]?.customLabel, + new Set(["API credits", " TOTAL SUBSCRIPTION CREDITS "]), + )).toBe(true); + expect(isCustomQuotaWindowIncomplete( + " total subscription credits ", + new Set(["Total subscription credits"]), + )).toBe(true); + }); + + test("absent and unrelated coverage does not mark a subscription row incomplete", () => { + expect(isCustomQuotaWindowIncomplete(undefined, new Set(["Total subscription credits"]))).toBe(false); + expect(isCustomQuotaWindowIncomplete("Total subscription credits")).toBe(false); + expect(isCustomQuotaWindowIncomplete("Total subscription credits", new Set())).toBe(false); + expect(isCustomQuotaWindowIncomplete("Total subscription credits", new Set(["API credits"]))).toBe(false); + }); + + test("unknown window coverage preserves exact raw-label matching", () => { + expect(isCustomQuotaWindowIncomplete(" Gem ", new Set([" Gem "]))).toBe(true); + expect(isCustomQuotaWindowIncomplete(" Gem ", new Set(["Gem"]))).toBe(false); + expect(isCustomQuotaWindowIncomplete("Gem", new Set(["gem"]))).toBe(false); }); }); From 24c761a052957883f9279c291b16194f91affcc3 Mon Sep 17 00:00:00 2001 From: JUN Date: Mon, 7 Sep 2026 01:49:07 +0900 Subject: [PATCH 006/221] docs(credits): restore missing stacked-PR contributor attribution (#3787) [skip ci] Record verified carried-work credit omitted or unlinked at the final landing. Restore forward co-author credit for the carried contributors already documented in CREDITS.md as well as this follow-up. Preserve all historical commits and tags. Owner explicitly requested this documentation-only correction be merged into dev without running or waiting for CI. No tests, typecheck or build were run. Co-authored-by: agentHits <140916359+agentHits@users.noreply.github.com> Co-authored-by: benedictusrey <74437942+benedictusrey@users.noreply.github.com> Co-authored-by: bet4it <16643669+bet4it@users.noreply.github.com> Co-authored-by: Blushyes <75828899+Blushyes@users.noreply.github.com> Co-authored-by: chilung-cgu <215337896+chilung-cgu@users.noreply.github.com> Co-authored-by: darwintree <17946284+darwintree@users.noreply.github.com> Co-authored-by: dbc-hbin <282618027+dbc-hbin@users.noreply.github.com> Co-authored-by: drakonkat <17176640+drakonkat@users.noreply.github.com> Co-authored-by: Eleven-is-cool <54345049+Eleven-is-cool@users.noreply.github.com> Co-authored-by: Flowershangfromthebranches <152056395+Flowershangfromthebranches@users.noreply.github.com> Co-authored-by: gaoran1209 <15261543+gaoran1209@users.noreply.github.com> Co-authored-by: gulup <3413433+gulup@users.noreply.github.com> Co-authored-by: harryzhou2000 <67385896+harryzhou2000@users.noreply.github.com> Co-authored-by: Ingwannu <186453546+Ingwannu@users.noreply.github.com> Co-authored-by: jonathanli12 <47408717+jonathanli12@users.noreply.github.com> Co-authored-by: justin-mc-lai <13780920+justin-mc-lai@users.noreply.github.com> Co-authored-by: lilinxiong <24367027+lilinxiong@users.noreply.github.com> Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> Co-authored-by: luvyoun0224-beep <255666866+luvyoun0224-beep@users.noreply.github.com> Co-authored-by: MarcTCruz <58499846+MarcTCruz@users.noreply.github.com> Co-authored-by: mdwsk88 <11055210+mdwsk88@users.noreply.github.com> Co-authored-by: ntdatt812 <188129613+ntdatt812@users.noreply.github.com> Co-authored-by: olddonkey <22208754+olddonkey@users.noreply.github.com> Co-authored-by: rrmlima <137737127+rrmlima@users.noreply.github.com> Co-authored-by: S0RYUASUKA <64878945+S0RYUASUKA@users.noreply.github.com> Co-authored-by: Skyline-23 <62983047+Skyline-23@users.noreply.github.com> Co-authored-by: TooSpace <287153855+TooSpace@users.noreply.github.com> Co-authored-by: turin-dev <201305497+turin-dev@users.noreply.github.com> Co-authored-by: Veritas-7 <234569343+Veritas-7@users.noreply.github.com> Co-authored-by: waw4303 <59402644+waw4303@users.noreply.github.com> Co-authored-by: Yuxin-Qiao <104957188+Yuxin-Qiao@users.noreply.github.com> Co-authored-by: yxr1995-maker <257504378+yxr1995-maker@users.noreply.github.com> Co-authored-by: yzxcj797 <54314860+yzxcj797@users.noreply.github.com> --- CREDITS.md | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 2 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 14bd5c84d5..5d679a755d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -23,8 +23,8 @@ invalidating every tag and clone — direction: authorship credit in git history is not rewritten. This file is the forward repair. -Every entry cites the maintainer's own words from the closing comment or the -landing commit. Nothing here is inferred from a diff. +Every entry cites the maintainer's own words from the closing comment, pull-request +description, or landing commit. Nothing here is inferred from a diff. This file is **not** a contributor list. Most contributions merged normally, with authorship intact, and need no entry. Absence from this page means the @@ -57,6 +57,71 @@ Code, design, or tests from these pull requests shipped. | [#3300](https://github.com/lidge-jun/opencodex/pull/3300) | [@S0RYUASUKA](https://github.com/S0RYUASUKA) | `15b43e51c` | the same two test files made hermetic | | [#3284](https://github.com/lidge-jun/opencodex/pull/3284) | [@mdwsk88](https://github.com/mdwsk88) | `3d3c4fe26` | "Core implementation is already on `dev` via #3286 (`3d3c4fe26`), including the suffix wire ladder, picker collapse, Google adapter coverage" | +### 2026-09-07 follow-up: missing or malformed trailers + +These additional landings are present in the audited 3,000-commit window. +The linked landing descriptions or commit messages identify what was taken. + +| Pull request | Author | Landed as | What landed | +| --- | --- | --- | --- | +| [#1748](https://github.com/lidge-jun/opencodex/pull/1748) | [@Blushyes](https://github.com/Blushyes) | [`e3bbf5321`](https://github.com/lidge-jun/opencodex/commit/e3bbf5321c6c0483e9662466e044545bb0e086ba) | [Scoped reimplementation of the outbound Fake-IP discovery fix; the source PR author is @Blushyes, correcting the name in the landing message.](https://github.com/lidge-jun/opencodex/commit/e3bbf5321c6c0483e9662466e044545bb0e086ba) | +| [#1842](https://github.com/lidge-jun/opencodex/pull/1842) | [@luvs01](https://github.com/luvs01) | [`e1e431332`](https://github.com/lidge-jun/opencodex/commit/e1e43133281cba5f952dfa3226a4d55d505365b5) | [Public OAuth error projection and preservation of typed authentication failures.](https://github.com/lidge-jun/opencodex/pull/2043) | +| [#1889](https://github.com/lidge-jun/opencodex/pull/1889) | [@dbc-hbin](https://github.com/dbc-hbin) | [`ea16f8613`](https://github.com/lidge-jun/opencodex/commit/ea16f86130291042486ba3c10640e73b63772d27) | [The remaining x-goog-api-client removal and the contributor's header assertions.](https://github.com/lidge-jun/opencodex/pull/2018) | +| [#1896](https://github.com/lidge-jun/opencodex/pull/1896) | [@luvyoun0224-beep](https://github.com/luvyoun0224-beep) | [`5f2b93979`](https://github.com/lidge-jun/opencodex/commit/5f2b93979e4eae78e1a8c66d1f4a324c4f394084) | [The functions-namespace parser flattening; the hardcoded-name guidance was not taken.](https://github.com/lidge-jun/opencodex/pull/2020) | +| [#1899](https://github.com/lidge-jun/opencodex/pull/1899) | [@ntdatt812](https://github.com/ntdatt812) | [`fb5ceee35`](https://github.com/lidge-jun/opencodex/commit/fb5ceee35f18925a118615b3eb69dc0093f27730) | [The catalog-writer temp-path binding, extended with ordered write/harden/publish assertions.](https://github.com/lidge-jun/opencodex/pull/1923) | +| [#1920](https://github.com/lidge-jun/opencodex/pull/1920) | [@Yuxin-Qiao](https://github.com/Yuxin-Qiao) | [`34b167367`](https://github.com/lidge-jun/opencodex/commit/34b167367c09a3a2445261b845ed10a3c0664693) | [Scoped native and replay Computer Use tool-result normalization.](https://github.com/lidge-jun/opencodex/pull/2038) | +| [#1932](https://github.com/lidge-jun/opencodex/pull/1932) | [@harryzhou2000](https://github.com/harryzhou2000) | [`f2b507f83`](https://github.com/lidge-jun/opencodex/commit/f2b507f831e8065d4fac2fd9fe44bf8106b3fa0e) | [The transient bare-401 concept and test scaffolding; the literal trailer "PR #1932" identifies no account.](https://github.com/lidge-jun/opencodex/pull/2021) | +| [#2027](https://github.com/lidge-jun/opencodex/pull/2027) | [@yzxcj797](https://github.com/yzxcj797) | [`5445ce3e6`](https://github.com/lidge-jun/opencodex/commit/5445ce3e626849855521e5ff54571a1c3babc7e2), [`293494cfa`](https://github.com/lidge-jun/opencodex/commit/293494cfa0c89542320a14bb3af6e4a3f31935a2) | ["Absorbed from #2027" — OpenCode Go identity follows its destination.](https://github.com/lidge-jun/opencodex/commit/5445ce3e626849855521e5ff54571a1c3babc7e2) | +| [#2040](https://github.com/lidge-jun/opencodex/pull/2040) | [@Ingwannu](https://github.com/Ingwannu) | [`16345ab8b`](https://github.com/lidge-jun/opencodex/commit/16345ab8b0a9e5d6fdc8a237786339b674fc374c) | ["implementation and tests, with two corrections".](https://github.com/lidge-jun/opencodex/commit/16345ab8b0a9e5d6fdc8a237786339b674fc374c) | +| [#2053](https://github.com/lidge-jun/opencodex/pull/2053) | [@Ingwannu](https://github.com/Ingwannu) | [`f4ad13922`](https://github.com/lidge-jun/opencodex/commit/f4ad1392271370e1c7c08b0b11ddea346d065138) | ["Carries @Ingwannu's #2053 unchanged."](https://github.com/lidge-jun/opencodex/commit/f4ad1392271370e1c7c08b0b11ddea346d065138) | +| [#2056](https://github.com/lidge-jun/opencodex/pull/2056) | [@Ingwannu](https://github.com/Ingwannu) | [`9b0c5a02d`](https://github.com/lidge-jun/opencodex/commit/9b0c5a02d95220161fc18c72aba5756fdcbf68e3) | [The shortPercent known-quota and scoring changes.](https://github.com/lidge-jun/opencodex/commit/9b0c5a02d95220161fc18c72aba5756fdcbf68e3) | +| [#2075](https://github.com/lidge-jun/opencodex/pull/2075) | [@olddonkey](https://github.com/olddonkey) | [`647b98eb8`](https://github.com/lidge-jun/opencodex/commit/647b98eb8ae4d4ca3c16e1d515dc17a97e5993e4) | [The native Chat fast-capability gate, reconciled with the exact-ID contract.](https://github.com/lidge-jun/opencodex/commit/647b98eb8ae4d4ca3c16e1d515dc17a97e5993e4) | +| [#2077](https://github.com/lidge-jun/opencodex/pull/2077) | [@ntdatt812](https://github.com/ntdatt812) | [`f9c224b70`](https://github.com/lidge-jun/opencodex/commit/f9c224b70abcb4237d166d93fd10677791719b51) | ["Both patches are @ntdatt812's work from #2100 and #2077, applied unchanged."](https://github.com/lidge-jun/opencodex/commit/f9c224b70abcb4237d166d93fd10677791719b51) | +| [#2082](https://github.com/lidge-jun/opencodex/pull/2082) | [@yzxcj797](https://github.com/yzxcj797) | [`06cdbc109`](https://github.com/lidge-jun/opencodex/commit/06cdbc109a631203618a2d1bcf2f395f121af8fa), [`057e8575c`](https://github.com/lidge-jun/opencodex/commit/057e8575c3138f4e90d31e23feccbad60511a2fe) | [AgentRouter opening-turn framing, with exact hostname and separate-block corrections.](https://github.com/lidge-jun/opencodex/commit/06cdbc109a631203618a2d1bcf2f395f121af8fa) | +| [#2099](https://github.com/lidge-jun/opencodex/pull/2099) | [@yzxcj797](https://github.com/yzxcj797) | [`81492fd10`](https://github.com/lidge-jun/opencodex/commit/81492fd10f428d7d638550de4ba2ebcdf13d7715) | [The repro-shaped prompt-cache-retention test fixture; the runtime contract came from #2102.](https://github.com/lidge-jun/opencodex/pull/2138) | +| [#2100](https://github.com/lidge-jun/opencodex/pull/2100) | [@ntdatt812](https://github.com/ntdatt812) | [`f9c224b70`](https://github.com/lidge-jun/opencodex/commit/f9c224b70abcb4237d166d93fd10677791719b51) | ["Both patches are @ntdatt812's work from #2100 and #2077, applied unchanged."](https://github.com/lidge-jun/opencodex/commit/f9c224b70abcb4237d166d93fd10677791719b51) | +| [#2101](https://github.com/lidge-jun/opencodex/pull/2101) | [@Ingwannu](https://github.com/Ingwannu) | [`0bce9516d`](https://github.com/lidge-jun/opencodex/commit/0bce9516d8d987d5b209d1c92cce24d278941b55) | [The entitlement module and full test suite, with maintainer corrections.](https://github.com/lidge-jun/opencodex/pull/2146) | +| [#2102](https://github.com/lidge-jun/opencodex/pull/2102) | [@lilinxiong](https://github.com/lilinxiong) | [`5904178c3`](https://github.com/lidge-jun/opencodex/commit/5904178c349c555704b5f461ef38a47a47324074) | [The prompt-cache-retention implementation, narrowed to the exact native model family.](https://github.com/lidge-jun/opencodex/pull/2138) | +| [#2104](https://github.com/lidge-jun/opencodex/pull/2104) | [@olddonkey](https://github.com/olddonkey) | [`7cd270dc2`](https://github.com/lidge-jun/opencodex/commit/7cd270dc2cd4f5a4cb07b2f23b4eb0dfe869b0da) | ["Carries @olddonkey's #2104 unchanged."](https://github.com/lidge-jun/opencodex/commit/7cd270dc2cd4f5a4cb07b2f23b4eb0dfe869b0da) | +| [#2105](https://github.com/lidge-jun/opencodex/pull/2105) | [@lilinxiong](https://github.com/lilinxiong) | [`a0635eaa2`](https://github.com/lidge-jun/opencodex/commit/a0635eaa2ec16344e25f77f41916637f9cddc4c3) | ["Carries @lilinxiong's #2105 implementation and tests."](https://github.com/lidge-jun/opencodex/commit/a0635eaa2ec16344e25f77f41916637f9cddc4c3) | +| [#2109](https://github.com/lidge-jun/opencodex/pull/2109) | [@drakonkat](https://github.com/drakonkat) | [`d2493a147`](https://github.com/lidge-jun/opencodex/commit/d2493a147d5286f54be34735a13f5d13f8f19597) | [The shared base-URL override implementation from #2109 and #2110.](https://github.com/lidge-jun/opencodex/pull/2148) | +| [#2110](https://github.com/lidge-jun/opencodex/pull/2110) | [@drakonkat](https://github.com/drakonkat) | [`d2493a147`](https://github.com/lidge-jun/opencodex/commit/d2493a147d5286f54be34735a13f5d13f8f19597) | [The shared base-URL override implementation from #2109 and #2110.](https://github.com/lidge-jun/opencodex/pull/2148) | +| [#2122](https://github.com/lidge-jun/opencodex/pull/2122) | [@chilung-cgu](https://github.com/chilung-cgu) | [`6a6efa928`](https://github.com/lidge-jun/opencodex/commit/6a6efa928a165726c0fd17d893d11c21176dc812) | [Configuration union, schema and migration design for retainModels; #2860 supplied the retention predicate.](https://github.com/lidge-jun/opencodex/pull/3206) | +| [#2127](https://github.com/lidge-jun/opencodex/pull/2127) | [@agentHits](https://github.com/agentHits) | [`1adcfde0c`](https://github.com/lidge-jun/opencodex/commit/1adcfde0cfff10589eefdaa33aae077ffe404bcc) | ["Carries @agentHits's #2127 unchanged."](https://github.com/lidge-jun/opencodex/commit/1adcfde0cfff10589eefdaa33aae077ffe404bcc) | +| [#2131](https://github.com/lidge-jun/opencodex/pull/2131) | [@bet4it](https://github.com/bet4it) | [`8ff77e11e`](https://github.com/lidge-jun/opencodex/commit/8ff77e11ebe7bc6472164d29c89c779986b9469a) | ["Carries @bet4it's #2131 implementation and tests."](https://github.com/lidge-jun/opencodex/commit/8ff77e11ebe7bc6472164d29c89c779986b9469a) | +| [#2155](https://github.com/lidge-jun/opencodex/pull/2155) | [@waw4303](https://github.com/waw4303) | [`64ba54edb`](https://github.com/lidge-jun/opencodex/commit/64ba54edbe5ac90b1127f51d5890e33da183c3f0), [`772d375fe`](https://github.com/lidge-jun/opencodex/commit/772d375fed252f838c41b9315cf88046f64d192a) | [Resolved tool-call padding handling, with per-field provenance and diagnostic corrections.](https://github.com/lidge-jun/opencodex/commit/64ba54edbe5ac90b1127f51d5890e33da183c3f0) | +| [#2227](https://github.com/lidge-jun/opencodex/pull/2227) | [@olddonkey](https://github.com/olddonkey) | [`63d387cae`](https://github.com/lidge-jun/opencodex/commit/63d387cae369e3e72d4d0a7702db9d98e607d785) | [The Grok OAuth registry flip, structure documentation and test conversions.](https://github.com/lidge-jun/opencodex/pull/2255) | +| [#2432](https://github.com/lidge-jun/opencodex/pull/2432) | [@mdwsk88](https://github.com/mdwsk88) | [`850afb2e9`](https://github.com/lidge-jun/opencodex/commit/850afb2e9f84979c87e914b248de482f44b34cd6) | [The omit-sentinel documentation and provider wire comments.](https://github.com/lidge-jun/opencodex/pull/3603) | +| [#2639](https://github.com/lidge-jun/opencodex/pull/2639) | [@bet4it](https://github.com/bet4it) | [`fefeb0501`](https://github.com/lidge-jun/opencodex/commit/fefeb05016d21dc9a3b8afe1b52427e4e1d8a0ed) | [The Responses item status backfill; queued/in_progress mapping was corrected separately.](https://github.com/lidge-jun/opencodex/pull/2721) | +| [#2647](https://github.com/lidge-jun/opencodex/pull/2647) | [@darwintree](https://github.com/darwintree) | [`e1e6ec04f`](https://github.com/lidge-jun/opencodex/commit/e1e6ec04f43a287b4cfb5149893d2c6c0a520588) | [Command Code profile metadata, reconciled with the intervening catalog update.](https://github.com/lidge-jun/opencodex/pull/2721) | +| [#2663](https://github.com/lidge-jun/opencodex/pull/2663) | [@Eleven-is-cool](https://github.com/Eleven-is-cool) | [`cb9bb9b76`](https://github.com/lidge-jun/opencodex/commit/cb9bb9b7634640f18568207322d386a059f6c9ac) | [Bare code-mode helper calls through exec: "the implementation is yours, unchanged".](https://github.com/lidge-jun/opencodex/pull/2724) | +| [#2938](https://github.com/lidge-jun/opencodex/pull/2938) | [@luvs01](https://github.com/luvs01) | [`8427efe6e`](https://github.com/lidge-jun/opencodex/commit/8427efe6e80a5ce9488eab7b80b2b1663ab20579) | [The failed-wrapper diagnosis and linear-scan design, with six behavioral divergences corrected.](https://github.com/lidge-jun/opencodex/pull/2945) | +| [#3069](https://github.com/lidge-jun/opencodex/pull/3069) | [@justin-mc-lai](https://github.com/justin-mc-lai) | [`a0d386b49`](https://github.com/lidge-jun/opencodex/commit/a0d386b49074ec81df5646fcc20a5e4979c67878) | [The two query/queries parity commits, followed by malformed-history boundary fixes.](https://github.com/lidge-jun/opencodex/pull/3089) | +| [#3329](https://github.com/lidge-jun/opencodex/pull/3329) | [@Veritas-7](https://github.com/Veritas-7) | [`3ac310782`](https://github.com/lidge-jun/opencodex/commit/3ac31078244ea04c9abce0e50275ffaccf25455a) | [Combo cooldown/wait design with corrected reset metadata, clocks and Retry-After handling.](https://github.com/lidge-jun/opencodex/pull/3606) | +| [#3407](https://github.com/lidge-jun/opencodex/pull/3407) | [@turin-dev](https://github.com/turin-dev) | [`3b3fe21d4`](https://github.com/lidge-jun/opencodex/commit/3b3fe21d45e57761e9769020da4b37de5cd95726) | [The desired-state Codex switch, observed-state badge and effective-home path.](https://github.com/lidge-jun/opencodex/pull/3617) | +| [#3421](https://github.com/lidge-jun/opencodex/pull/3421) | [@Skyline-23](https://github.com/Skyline-23) | [`89c0a64fe`](https://github.com/lidge-jun/opencodex/commit/89c0a64fe2c59af1814230b0c85d61cd08672bd5) | [The Compose/container foundation, with loopback binding and generated compatibility identity.](https://github.com/lidge-jun/opencodex/pull/3604) | +| [#3469](https://github.com/lidge-jun/opencodex/pull/3469) | [@agentHits](https://github.com/agentHits) | [`c44e187ee`](https://github.com/lidge-jun/opencodex/commit/c44e187ee901275f977f5a2be32c782f4e1f1794) | [Google location-error classification, carried through #3547 and corrected for error precedence.](https://github.com/lidge-jun/opencodex/pull/3608) | +| [#3487](https://github.com/lidge-jun/opencodex/pull/3487) | [@Ingwannu](https://github.com/Ingwannu) | [`f8ba644f3`](https://github.com/lidge-jun/opencodex/commit/f8ba644f3ad650b14af9cc420d4d42782939bfef) | [The bounded Kiro fallback-execution assertion at the migrated test path.](https://github.com/lidge-jun/opencodex/pull/3602) | +| [#3489](https://github.com/lidge-jun/opencodex/pull/3489) | [@Flowershangfromthebranches](https://github.com/Flowershangfromthebranches) | [`55395a9dc`](https://github.com/lidge-jun/opencodex/commit/55395a9dc8a252a01f606b7b65859579e4f2e53d) | [Canonical-final-URL discovery injection alongside independently proxy-bound IPv6 handling.](https://github.com/lidge-jun/opencodex/pull/3618) | +| [#3528](https://github.com/lidge-jun/opencodex/pull/3528) | [@benedictusrey](https://github.com/benedictusrey) | [`bef04efbc`](https://github.com/lidge-jun/opencodex/commit/bef04efbcf506ac26ebd3eeba8ac397a5d8a8d0d) | [The effort CLI command, exact selectors and distinct live/offline failures.](https://github.com/lidge-jun/opencodex/pull/3612) | +| [#3531](https://github.com/lidge-jun/opencodex/pull/3531) | [@benedictusrey](https://github.com/benedictusrey) | [`45045623b`](https://github.com/lidge-jun/opencodex/commit/45045623bfc9c1ec7f8c55e47493da343b98a968) | [The agy alias, with captured discovery authority retained.](https://github.com/lidge-jun/opencodex/pull/3601) | + +### 2026-09-07 follow-up: unlinked trailers + +These commits contain a contributor name, but GitHub's commit-author mapping +does not resolve that trailer to the source PR author. No personal addresses +are reproduced here. The forward correction uses account-linked noreply identities. + +| Pull request | Author | Landed as | What landed | +| --- | --- | --- | --- | +| [#2817](https://github.com/lidge-jun/opencodex/pull/2817) | [@gulup](https://github.com/gulup) | [`6fe46312c`](https://github.com/lidge-jun/opencodex/commit/6fe46312cd509bbef0e79025181e7ab6fc285681) | [The opt-in upstream Responses WebSocket transport and six carried commits.](https://github.com/lidge-jun/opencodex/pull/3216) | +| [#3148](https://github.com/lidge-jun/opencodex/pull/3148) | [@Veritas-7](https://github.com/Veritas-7) | [`865a36ef0`](https://github.com/lidge-jun/opencodex/commit/865a36ef04eb6395e617f94ed87aaa474a903444) | [The two subscription-launch admission-key fixes, plus connected-launch reconciliation.](https://github.com/lidge-jun/opencodex/pull/3182) | +| [#3293](https://github.com/lidge-jun/opencodex/pull/3293) | [@Veritas-7](https://github.com/Veritas-7) | [`3a9c4d297`](https://github.com/lidge-jun/opencodex/commit/3a9c4d297451bc40abb24cf13d5f50648450fc2e) | [The missing claude-fable-5-1 model metadata and accompanying usage-cost test.](https://github.com/lidge-jun/opencodex/pull/3478) | + +The correction commit records these contributors and the earlier **Carried work** +authors as co-authors. This is forward attribution: the old commit objects, +their original dates and release tags are unchanged. + ## Report and diagnosis These fixes exist because of the report. The branch's own approach was not the @@ -84,6 +149,19 @@ inaccuracy this file exists to correct. - [#2675](https://github.com/lidge-jun/opencodex/pull/2675) by [@Ingwannu](https://github.com/Ingwannu) — closed "Landed via #2677 at `8412fe156`". +Two further source PRs were closed with a landing reference but without an +explicit statement of what was carried. Their authors are acknowledged here; +they are not counted as carried code solely from that closure: + +- [#2360](https://github.com/lidge-jun/opencodex/pull/2360) by + [@chilung-cgu](https://github.com/chilung-cgu) — + [closed as landed via #2371](https://github.com/lidge-jun/opencodex/pull/2360#issuecomment-5379638729) + at `ae05672e3`. +- [#3621](https://github.com/lidge-jun/opencodex/pull/3621) by + [@yansigit](https://github.com/yansigit) — + [closed as landed via #3622](https://github.com/lidge-jun/opencodex/pull/3621#issuecomment-5549370301) + at `1505cb196`. + ## How this stays accurate This page is a repair, not a process. The process is @@ -127,3 +205,18 @@ The lesson generalizes: when carrying work, take the trailer address from the author's GitHub account (the numeric-id `users.noreply.github.com` form is always safe), not from the commit metadata on their branch. A contributor who commits under a work email is the normal case, not an edge case. + +### Verify the landing, not just the proposal + +The 2026-09-07 audit read exactly 3,000 commits reachable from +`7d8523eed75a67f7a4a15b533744fcd0e6059aa8`, ending at +`53130de4e540fbfcf2629079effb851af54e989e`, and followed source-PR descriptions, +closure comments and GitHub commit-author mappings. Normally merged work, +credited cherry-picks, independent fixes and report-only acknowledgements were +kept distinct from the carried-work tables. + +A PR description or an intermediate branch commit can contain the right trailer +and still lose it when a custom squash message replaces that text. Before +calling a carry credited, inspect the **actual landing commit**: its final +`Co-authored-by` trailer must remain present and resolve to the source author's +GitHub account. The existing presence gate alone does not establish either fact. From 7b1ac51eb831c779d23118ee31dc3272f9c1bfae Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:50:09 +0900 Subject: [PATCH 007/221] fix(container): persist Codex home separately [skip ci] Carry #3747 for #3746 with isolated serializer regressions and explicit volume lifecycle documentation. Runtime image recreation remains unverified; final stack CI is pending. Co-authored-by: Ingwannu --- Dockerfile | 6 +- compose.yaml | 5 + .../src/content/docs/fr/guides/remote-hub.md | 21 ++++ .../src/content/docs/guides/remote-hub.md | 49 +++++++- .../src/content/docs/ja/guides/remote-hub.md | 22 ++++ .../src/content/docs/ko/guides/remote-hub.md | 22 +++- .../src/content/docs/ru/guides/remote-hub.md | 24 ++++ .../src/content/docs/tr/guides/remote-hub.md | 24 ++++ .../content/docs/zh-cn/guides/remote-hub.md | 19 +++ structure/02_config-and-codex-home.md | 18 +++ tests/service/container-bootstrap.test.ts | 116 ++++++++++++++++++ 11 files changed, 318 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f648192d4..1ed000743d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,9 +27,11 @@ WORKDIR /home/bun/app ENV NODE_ENV=production \ OPENCODEX_HOME=/home/bun/.opencodex \ + CODEX_HOME=/home/bun/.codex \ OCX_API_TOKEN_FILE=/home/bun/.opencodex/service-api-token -RUN install -d -m 0700 -o bun -g bun /home/bun/.opencodex +# These homes have incompatible auth.json formats; persist them without combining them. +RUN install -d -m 0700 -o bun -g bun /home/bun/.opencodex /home/bun/.codex COPY --chown=bun:bun --chmod=0600 docker/config.json /home/bun/.opencodex/config.json COPY --from=build --chown=bun:bun /home/bun/app/package.json ./package.json @@ -46,7 +48,7 @@ COPY --from=build --chown=bun:bun /home/bun/app/gui/dist ./gui/dist USER bun RUN ["bun", "docker/verify-compatibility.ts"] RUN ["bun", "-e", "import { readOpenCodexCompatibilityVersion } from './src/routing/compatibility/version.ts'; if (!/^[0-9a-f]{64}$/.test(readOpenCodexCompatibilityVersion() ?? '')) throw new Error('Missing or invalid generated compatibility manifest');"] -VOLUME ["/home/bun/.opencodex"] +VOLUME ["/home/bun/.opencodex", "/home/bun/.codex"] EXPOSE 10100 HEALTHCHECK --interval=30s --timeout=5s --start-period=20s --retries=3 \ diff --git a/compose.yaml b/compose.yaml index 8e25cf4cd0..b54795692a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -9,10 +9,14 @@ services: target: runtime init: true read_only: true + environment: + # A custom CODEX_HOME also requires a matching writable volume target below. + CODEX_HOME: /home/bun/.codex ports: - "${OPENCODEX_BIND_ADDRESS:-127.0.0.1}:${OPENCODEX_PORT:-10100}:10100" volumes: - ocx-state:/home/bun/.opencodex + - codex-state:/home/bun/.codex tmpfs: - /tmp:size=64m,mode=1777 security_opt: @@ -24,3 +28,4 @@ services: volumes: ocx-state: + codex-state: diff --git a/docs-site/src/content/docs/fr/guides/remote-hub.md b/docs-site/src/content/docs/fr/guides/remote-hub.md index 8ab577619f..15d5392c18 100644 --- a/docs-site/src/content/docs/fr/guides/remote-hub.md +++ b/docs-site/src/content/docs/fr/guides/remote-hub.md @@ -60,6 +60,27 @@ La rotation garde les deux clés valides sous le même `apiKeyId` pendant dix mi ## Docker, retour arrière et dépannage +Lors d'un retour arrière, conservez les deux volumes et leurs points de montage. Les droits des volumes existants ne sont pas corrigés automatiquement. Consultez le [guide canonique](/guides/remote-hub/#docker-compose) pour les montages nommés hors Compose et les chemins d'état personnalisés. + +Deux volumes distincts conservent l'état : `ocx-state` pour +`OPENCODEX_HOME=/home/bun/.opencodex` et `codex-state` pour +`CODEX_HOME=/home/bun/.codex`. Leurs fichiers `auth.json` ont des formats incompatibles : +ne fusionnez pas ces répertoires. Ils restent accessibles en écriture malgré la racine en lecture seule. + +Le catalogue n'est pas généré automatiquement. Avant de tester `/v1/catalog` avec authentification, +créez ou importez un fichier valide dans `/home/bun/.codex/opencodex-catalog.json`. +Un répertoire vide renvoie normalement 404 `catalog_not_found`. Une mise à jour conserve +`ocx-state` et ajoute `codex-state`, sans déplacer les fichiers. Sauvegardez tout catalogue +précédemment placé dans `.opencodex`, puis transférez seulement ce catalogue avec des permissions +réservées au propriétaire ; ne remplacez pas un `auth.json` par celui de l'autre produit. +Si vous redéfinissez `CODEX_HOME`, montez ce répertoire exact en écriture et placez le catalogue +par défaut dans `${CODEX_HOME}/opencodex-catalog.json`. Si `model_catalog_json` désigne un autre +fichier, son chemin résolu doit aussi être persistant. Conservez les variables et montages +personnalisés jusqu'à la fin d'une migration explicite. +`docker compose down` conserve les deux volumes ; `docker compose down --volumes` supprime +`ocx-state` et `codex-state`, avec les identifiants, l'historique d'utilisation, la clé de données, +l'état et le catalogue Codex. Ce n'est pas une commande de mise à jour ou de redémarrage. + Il n’existe pas d’image Docker officielle, mais le dépôt fournit un `Dockerfile` et un `compose.yaml` maintenus pour construire localement une image Bun épinglée par digest. Initialisez une seule fois la clé de données via stdin ; elle est enregistrée avec des permissions réservées au propriétaire dans le volume `ocx-state` et n’est jamais affichée. Installez Git et Bun sur l’hôte. Avant chaque construction, générez le manifeste canonique depuis les sources suivies par Git, sans modifier les sources entre la génération et la construction. Le JSON généré reste non suivi ; `.git` est exclu du contexte Docker. Le port hôte est lié à `127.0.0.1` par défaut. Pour un accès distant, utilisez explicitement `OPENCODEX_BIND_ADDRESS= docker compose up -d` ; `0.0.0.0` expose toutes les interfaces. Protégez cet accès par un pare-feu et un frontal TLS/tailnet authentifié. diff --git a/docs-site/src/content/docs/guides/remote-hub.md b/docs-site/src/content/docs/guides/remote-hub.md index 800251ad4c..2334303be7 100644 --- a/docs-site/src/content/docs/guides/remote-hub.md +++ b/docs-site/src/content/docs/guides/remote-hub.md @@ -174,6 +174,45 @@ Before the first normal start, stream a freshly generated data-plane token into The helper accepts at most one 4096-byte line, never prints the token, refuses to replace an existing token, and persists it as the canonical owner-only `service-api-token` in the `ocx-state` volume. +The deployment persists two separate homes: `ocx-state` at `/home/bun/.opencodex` for +OpenCodex configuration, provider credentials and usage, and `codex-state` at +`/home/bun/.codex` for Codex state and `opencodex-catalog.json`. The image and Compose +explicitly set `CODEX_HOME=/home/bun/.codex`, so this catalog path remains writable +with `read_only: true` and survives container recreation. The image creates both +directories for the non-root `bun` user with mode `0700`; existing volume +ownership and permissions are not migrated automatically. + +Do not combine `CODEX_HOME` and `OPENCODEX_HOME`: both products use an `auth.json` +filename with different formats. This packaging change adds persistence, not a +catalog generator. Materialize or import a valid catalog into +`/home/bun/.codex/opencodex-catalog.json` before the catalog acceptance check below; +without one, `catalog_not_found` remains the expected response. + +Upgrading preserves the existing `ocx-state` volume and adds `codex-state`; no files +are migrated automatically. If a previous workaround placed a catalog directly +under `/home/bun/.opencodex`, back it up and deliberately copy only the catalog to +the new Codex home, preserving owner-only access. Do not copy either product's +`auth.json` over the other. Deployments with a custom `CODEX_HOME` should retain +their explicit environment and writable volume mapping until migration is complete. +When overriding `CODEX_HOME`, mount that exact directory writable and persist the +default catalog at `${CODEX_HOME}/opencodex-catalog.json`. If `model_catalog_json` +explicitly selects another file, that resolved path must also be persisted. + +Keep the Compose project name stable during upgrades so the same named volumes are reused. +Mounts with existing foreign ownership, read-only mounts, and mounts using `volume-nocopy` +are not repaired by the image's directory setup. Persist separately selected catalog or SQLite +paths separately; an OS credential store is not backed up by these two volumes. + +When running without Compose, explicitly supply both named mounts. Dockerfile `VOLUME` +declarations alone create anonymous volumes that a later `docker run` does not automatically +reuse. These mount options use standalone example names; to reuse Compose data, substitute +its actual project-prefixed volume names: + +```sh +--mount type=volume,src=ocx-state,dst=/home/bun/.opencodex \ +--mount type=volume,src=codex-state,dst=/home/bun/.codex +``` + Install Git and Bun on the host first. Before **every** image build, run the existing canonical generator from this Git checkout. It hashes Git-tracked working-tree sources (stage any newly added source files first), not an arbitrary directory scan. Do not change source files between @@ -227,7 +266,7 @@ docker compose restart hub ``` Do not put a token in `ARG`, `ENV`, `COPY`, Compose YAML, image history, or command arguments. Do not -mount the Docker socket, host home, Codex home, SSH agent, or provider-key files. A management +mount the Docker socket, the host's home or Codex home, SSH agent, or provider-key files. A management ingress bound to `127.0.0.1:10101` inside the container is reachable only by a TLS/tailnet frontend in the same network namespace; never publish `10101` as a shortcut. @@ -244,9 +283,9 @@ docker compose exec hub bun -e \ Then send one real authenticated routed response with a configured model. If the secret is absent or unreadable, a non-loopback hub must not be accepted as ready. Never treat liveness alone as proof. -`docker compose down` removes the container and network but retains the named volume. Treat +`docker compose down` removes the container and network but retains both named volumes. Treat `docker compose down --volumes` as destructive: it deletes configuration, OAuth credentials, usage -history, and the data-plane token together. +history, the data-plane token, and persisted Codex state together. ## Rollback @@ -260,7 +299,9 @@ ocx config set hub.managementIngress '{"enabled":false}' ocx service repair ``` -For a container rollback, remove or replace the container while retaining the named state volume. +For a container rollback, retain both named state volumes and their mappings. An older image +can still use `CODEX_HOME=/home/bun/.codex` when that directory remains mounted; do not revert +to an older Compose file that drops the Codex mount. Do not merge the homes or rerun token bootstrap. For a service rollback, stop the branch service and repair the prior release against the same `OPENCODEX_HOME`. Disabling management ingress or Serve does not require changing the data listener. diff --git a/docs-site/src/content/docs/ja/guides/remote-hub.md b/docs-site/src/content/docs/ja/guides/remote-hub.md index 022de50b12..cffc233143 100644 --- a/docs-site/src/content/docs/ja/guides/remote-hub.md +++ b/docs-site/src/content/docs/ja/guides/remote-hub.md @@ -60,6 +60,28 @@ OAuth は `POST /api/oauth/login` で開始し、コールバックできない ## Docker とトラブルシューティング +ロールバック時も両方のボリュームとマウント先を維持してください。既存ボリュームの所有者や権限は自動修復されません。Compose を使わない場合の名前付きマウントと独自の状態パスについては、[正本ガイド](/guides/remote-hub/#docker-compose)を参照してください。 + +状態は二つのボリュームに分けて永続化します。`ocx-state` は +`OPENCODEX_HOME=/home/bun/.opencodex`、`codex-state` は +`CODEX_HOME=/home/bun/.codex` に対応します。両製品の `auth.json` は形式が +異なるため、ホームを同じディレクトリにしないでください。読み取り専用の +ルートでも、この二つのホームは書き込み可能です。 + +カタログは自動生成されません。認証付き `/v1/catalog` の確認前に、有効な +`/home/bun/.codex/opencodex-catalog.json` を生成または取り込んでください。 +空のホームでは `catalog_not_found` の 404 が正常です。アップグレードは既存の +`ocx-state` を保持して `codex-state` を追加しますが、ファイルは自動移行しません。 +以前 `.opencodex` に置いたカタログはバックアップし、カタログだけを所有者限定の +権限で移してください。`auth.json` を相互に上書きしないでください。 +`CODEX_HOME` を変更する場合は、そのディレクトリ自体を書き込み可能なボリュームに +マウントし、既定のカタログを `${CODEX_HOME}/opencodex-catalog.json` に置きます。 +`model_catalog_json` で別のファイルを指定した場合は、その解決先も永続化します。 +カスタム構成は、明示的な移行が完了するまで環境変数とボリュームの対応を維持します。 +`docker compose down` は両ボリュームを保持しますが、`docker compose down --volumes` +は `ocx-state` と `codex-state` の両方を削除し、認証情報・使用履歴・データキー・ +Codex の状態とカタログも失われます。更新や再起動の代わりに使わないでください。 + 公式 Docker イメージはありませんが、リポジトリには digest 固定の Bun イメージをローカルビルドするための、管理された `Dockerfile` と `compose.yaml` があります。初回起動前にデータキーを stdin から一度だけ初期化します。キーは表示されず、`ocx-state` ボリューム内に所有者限定の権限で保存されます。 ホストに Git と Bun が必要です。イメージをビルドするたびに、Git 管理下のソースから正規のマニフェストを生成し、生成後はビルドまでソースを変更しないでください。生成 JSON は Git に追加せず、`.git` は Docker コンテキストから除外します。ホスト側は既定で `127.0.0.1` にバインドします。リモート公開は `OPENCODEX_BIND_ADDRESS= docker compose up -d` で明示的に指定し、`0.0.0.0` は全インターフェースを公開します。ファイアウォールと認証付き TLS/tailnet フロントエンドで保護してください。 diff --git a/docs-site/src/content/docs/ko/guides/remote-hub.md b/docs-site/src/content/docs/ko/guides/remote-hub.md index ffbb20f9c3..e924175672 100644 --- a/docs-site/src/content/docs/ko/guides/remote-hub.md +++ b/docs-site/src/content/docs/ko/guides/remote-hub.md @@ -86,6 +86,24 @@ ocx connect rotate --admin-token-stdin ## Docker +롤백할 때도 두 볼륨과 마운트 경로를 유지하세요. 기존 볼륨의 소유권과 권한은 자동으로 복구되지 않습니다. Compose 없이 실행할 때의 named volume 지정과 별도 상태 경로는 [영문 기준 가이드](/guides/remote-hub/#docker-compose)를 참고하세요. + +상태는 두 볼륨에 분리해 보관합니다. `ocx-state`는 +`OPENCODEX_HOME=/home/bun/.opencodex`, `codex-state`는 +`CODEX_HOME=/home/bun/.codex`에 연결됩니다. 두 제품의 `auth.json` 형식이 다르므로 +홈을 같은 폴더로 합치지 마세요. 루트 파일 시스템이 read-only여도 이 두 홈은 쓰기 가능합니다. + +카탈로그는 자동 생성되지 않습니다. 인증된 `/v1/catalog` 검사 전에 유효한 +`/home/bun/.codex/opencodex-catalog.json`을 생성하거나 가져와야 합니다. +빈 홈에서 `catalog_not_found` 404는 정상입니다. 업그레이드는 기존 `ocx-state`를 +유지하고 `codex-state`를 추가하지만 파일을 자동 이동하지 않습니다. 이전 우회 설정으로 +`.opencodex`에 둔 카탈로그는 백업한 뒤 카탈로그만 owner-only 권한으로 옮기세요. +두 제품의 `auth.json`을 서로 덮어쓰면 안 됩니다. 사용자 지정 `CODEX_HOME`은 그 정확한 +디렉터리를 쓰기 가능한 볼륨에 연결하고, 기본 카탈로그를 +`${CODEX_HOME}/opencodex-catalog.json`에 준비해야 합니다. `model_catalog_json`으로 +별도 파일을 지정했다면 그 경로도 영속 보관하세요. 명시적 이전이 완료되기 전까지는 +기존 사용자 지정 환경 변수와 볼륨 경로의 대응을 유지하세요. + opencodex는 공식 컨테이너 이미지를 배포하지 않지만, 저장소 루트의 `Dockerfile`과 `compose.yaml`로 digest가 고정된 소스 이미지를 직접 빌드할 수 있습니다. 최초 실행 전에 데이터 키를 stdin으로 초기화하세요. 키는 출력되지 않으며 `ocx-state` 볼륨의 owner-only `service-api-token`에 저장됩니다. 호스트에 Git과 Bun이 필요합니다. 이미지를 빌드할 때마다 Git이 추적하는 소스로 정식 매니페스트를 생성하고, 생성부터 빌드 사이에는 소스를 변경하지 마세요. 생성된 JSON은 Git에 추가하지 않으며 `.git`은 Docker 컨텍스트에서 제외됩니다. 호스트 포트는 기본적으로 `127.0.0.1`에 바인딩됩니다. 원격 공개는 `OPENCODEX_BIND_ADDRESS= docker compose up -d`로 명시적으로 선택하며, `0.0.0.0`은 모든 인터페이스에 공개합니다. 방화벽과 인증된 TLS/tailnet 프런트엔드로 보호하세요. @@ -101,11 +119,11 @@ openssl rand -hex 32 | docker compose run --rm -T hub bun run docker/bootstrap-t docker compose up -d ``` -이미지는 non-root `bun` 사용자로 실행되고 루트 파일 시스템은 read-only이며 공개 포트는 `10100` 하나뿐입니다. 토큰을 `ARG`, `ENV`, `COPY`, Compose YAML, 이미지 기록, 명령행에 넣지 마세요. Docker socket, 호스트 홈, Codex 홈, SSH agent, 프로바이더 키도 마운트하지 마세요. 컨테이너 안의 `127.0.0.1:10101` 관리 포트는 같은 네트워크 네임스페이스의 TLS/tailnet 프런트엔드로만 연결하고 직접 publish하지 마세요. +이미지는 non-root `bun` 사용자로 실행되고 루트 파일 시스템은 read-only이며 공개 포트는 `10100` 하나뿐입니다. 토큰을 `ARG`, `ENV`, `COPY`, Compose YAML, 이미지 기록, 명령행에 넣지 마세요. Docker socket, 호스트의 홈이나 Codex 홈, SSH agent, 프로바이더 키도 마운트하지 마세요. 컨테이너 안의 `127.0.0.1:10101` 관리 포트는 같은 네트워크 네임스페이스의 TLS/tailnet 프런트엔드로만 연결하고 직접 publish하지 마세요. 컨테이너 healthcheck의 `/healthz`가 통과한 뒤 `/readyz`, 인증된 `/v1/catalog`, 실제 모델 응답을 별도로 확인하세요. -`docker compose down`은 `ocx-state` 볼륨을 보존합니다. `docker compose down --volumes`는 설정, OAuth 인증 정보, 사용량 기록, 데이터 키를 함께 삭제하므로 파괴적 작업으로 취급하세요. +`docker compose down`은 `ocx-state`와 `codex-state`를 모두 보존합니다. `docker compose down --volumes`는 두 볼륨을 모두 삭제하여 설정, OAuth 인증 정보, 사용량 기록, 데이터 키, Codex 상태와 카탈로그를 지웁니다. 업그레이드나 재시작 대신 사용하지 마세요. ## 롤백과 문제 해결 diff --git a/docs-site/src/content/docs/ru/guides/remote-hub.md b/docs-site/src/content/docs/ru/guides/remote-hub.md index cc71e8efba..0887baf9a8 100644 --- a/docs-site/src/content/docs/ru/guides/remote-hub.md +++ b/docs-site/src/content/docs/ru/guides/remote-hub.md @@ -60,6 +60,30 @@ OAuth запускается через `POST /api/oauth/login`. Если callba ## Docker и устранение неполадок +При откате сохраняйте оба тома и их точки монтирования. Владельцы и права существующих томов не исправляются автоматически. Именованные тома вне Compose и отдельные пути состояния описаны в [основном руководстве](/guides/remote-hub/#docker-compose). + +Состояние хранится в двух отдельных томах: `ocx-state` для +`OPENCODEX_HOME=/home/bun/.opencodex` и `codex-state` для +`CODEX_HOME=/home/bun/.codex`. Форматы `auth.json` у двух продуктов несовместимы, +поэтому не объединяйте их домашние каталоги. Оба тома доступны для записи при +корневой файловой системе только для чтения. + +Каталог моделей автоматически не создаётся. Перед проверкой авторизованного +`/v1/catalog` создайте или импортируйте корректный файл +`/home/bun/.codex/opencodex-catalog.json`. Для пустого каталога состояния ответ +404 `catalog_not_found` ожидаем. Обновление сохраняет `ocx-state` и добавляет +`codex-state`, но не переносит файлы автоматически. Если обходное решение хранило +каталог моделей в `.opencodex`, сначала сделайте резервную копию, затем перенесите +только каталог моделей с доступом лишь для владельца. Не перезаписывайте один +`auth.json` другим. При переопределении `CODEX_HOME` монтируйте именно эту директорию +для записи и сохраняйте каталог по умолчанию в `${CODEX_HOME}/opencodex-catalog.json`. +Если `model_catalog_json` задаёт другой файл, его разрешённый путь также должен +храниться постоянно. До явного переноса сохраняйте прежнее соответствие переменных +окружения и томов. `docker compose down` сохраняет оба тома, а +`docker compose down --volumes` удаляет и `ocx-state`, и `codex-state`, включая +учётные данные, историю использования, ключ данных, состояние и каталог Codex. +Это разрушительная операция, а не способ обновления или перезапуска. + Официального Docker-образа нет, но репозиторий содержит поддерживаемые `Dockerfile` и `compose.yaml` для локальной сборки Bun-образа, закреплённого по digest. Перед первым запуском один раз передайте ключ данных через stdin; он не выводится и сохраняется с доступом только для владельца в volume `ocx-state`. На хосте нужны Git и Bun. Перед каждой сборкой создавайте канонический манифест из отслеживаемых Git исходников и не меняйте их до завершения сборки. Сгенерированный JSON не добавляйте в Git; `.git` исключён из контекста Docker. По умолчанию порт хоста привязан к `127.0.0.1`. Для удалённого доступа явно задайте `OPENCODEX_BIND_ADDRESS= docker compose up -d`; `0.0.0.0` открывает все интерфейсы. Защитите доступ брандмауэром и аутентифицированным TLS/tailnet-фронтендом. diff --git a/docs-site/src/content/docs/tr/guides/remote-hub.md b/docs-site/src/content/docs/tr/guides/remote-hub.md index 63f8e7e5c0..6499325908 100644 --- a/docs-site/src/content/docs/tr/guides/remote-hub.md +++ b/docs-site/src/content/docs/tr/guides/remote-hub.md @@ -60,6 +60,30 @@ Döndürme sırasında eski ve yeni anahtar aynı `apiKeyId` altında en fazla o ## Docker ve sorun giderme +Geri alırken iki volume'u ve bağlama yollarını koruyun. Mevcut volume sahipliği ve izinleri otomatik düzeltilmez. Compose dışındaki adlandırılmış bağlamalar ve özel durum yolları için [ana kılavuza](/guides/remote-hub/#docker-compose) bakın. + +Durum iki ayrı kalıcı volume'da tutulur: `ocx-state`, +`OPENCODEX_HOME=/home/bun/.opencodex` yoluna; `codex-state` ise +`CODEX_HOME=/home/bun/.codex` yoluna bağlanır. İki ürünün `auth.json` biçimleri +uyumsuzdur; bu dizinleri birleştirmeyin. Kök dosya sistemi salt okunur olsa da +bu iki volume yazılabilir durumda kalır. + +Katalog otomatik oluşturulmaz. Kimlik doğrulamalı `/v1/catalog` kontrolünden önce +`/home/bun/.codex/opencodex-catalog.json` konumunda geçerli bir katalog oluşturun +veya içe aktarın. Boş dizinde 404 `catalog_not_found` beklenen sonuçtur. Güncelleme +mevcut `ocx-state` volume'unu korur ve `codex-state` ekler; dosyaları otomatik taşımaz. +Önceden `.opencodex` içine konmuş kataloğu yedekleyin ve yalnızca katalog dosyasını, +sadece sahibine erişim veren izinlerle taşıyın. Bir ürünün `auth.json` dosyasını +diğerininkiyle değiştirmeyin. `CODEX_HOME` özelleştirilirse bu dizinin tam yolunu +yazılabilir bir volume'a bağlayın ve varsayılan kataloğu +`${CODEX_HOME}/opencodex-catalog.json` konumuna koyun. `model_catalog_json` başka +bir dosya seçiyorsa çözümlenen yol da kalıcı olmalıdır. Açık bir taşıma tamamlanana +kadar mevcut özel ortam ve volume eşlemesini koruyun. +`docker compose down` iki volume'u da korur; `docker compose down --volumes` hem +`ocx-state` hem `codex-state` ile birlikte kimlik bilgilerini, kullanım geçmişini, +veri anahtarını ve Codex durumunu/kataloğunu siler. Güncelleme veya yeniden başlatma +yerine kullanılmamalıdır. + Resmî Docker imajı yoktur; ancak depo, digest ile sabitlenmiş Bun imajını yerelde oluşturmak için bakımı yapılan bir `Dockerfile` ve `compose.yaml` sağlar. İlk başlatmadan önce veri anahtarını stdin üzerinden bir kez başlatın; anahtar yazdırılmaz ve `ocx-state` volume içinde yalnızca sahibinin okuyabileceği izinlerle saklanır. Host üzerinde Git ve Bun gereklidir. Her imaj derlemesinden önce Git tarafından izlenen kaynaklardan kanonik manifesti üretin ve derleme bitene kadar kaynakları değiştirmeyin. Üretilen JSON dosyasını Git'e eklemeyin; `.git` Docker bağlamının dışında kalır. Host portu varsayılan olarak `127.0.0.1` adresine bağlanır. Uzak erişim için açıkça `OPENCODEX_BIND_ADDRESS= docker compose up -d` kullanın; `0.0.0.0` tüm arayüzleri açar. Erişimi güvenlik duvarı ve kimlik doğrulamalı TLS/tailnet ön ucu ile koruyun. diff --git a/docs-site/src/content/docs/zh-cn/guides/remote-hub.md b/docs-site/src/content/docs/zh-cn/guides/remote-hub.md index 81e91d5be1..6caa44fc23 100644 --- a/docs-site/src/content/docs/zh-cn/guides/remote-hub.md +++ b/docs-site/src/content/docs/zh-cn/guides/remote-hub.md @@ -60,6 +60,25 @@ ocx connect rotate --admin-token-stdin ## Docker、回滚与排障 +回滚时也要保留两个卷及其挂载路径。已有卷的所有权和权限不会自动修复。有关不使用 Compose 时的命名卷挂载及单独的状态路径,请参阅[英文基准指南](/guides/remote-hub/#docker-compose)。 + +部署使用两个独立持久卷:`ocx-state` 对应 +`OPENCODEX_HOME=/home/bun/.opencodex`,`codex-state` 对应 +`CODEX_HOME=/home/bun/.codex`。两个产品的 `auth.json` 格式不同,不能合并到同一个 +主目录。即使根文件系统只读,这两个目录也可通过各自的卷写入。 + +此设置不会自动生成模型目录。在检查认证后的 `/v1/catalog` 前,必须生成或导入有效的 +`/home/bun/.codex/opencodex-catalog.json`;空目录返回 `catalog_not_found` 404 属于正常行为。 +升级会保留现有 `ocx-state` 并新增 `codex-state`,但不会自动迁移文件。若之前的临时方案 +将模型目录放在 `.opencodex` 下,请先备份,再仅迁移模型目录文件,并保留仅所有者可访问的权限。 +不要用一个产品的 `auth.json` 覆盖另一个。自定义 `CODEX_HOME` 时,必须将该确切目录挂载为 +可写持久卷,并在 `${CODEX_HOME}/opencodex-catalog.json` 准备默认目录文件。 +若 `model_catalog_json` 指向其他文件,也必须持久保存其解析后的路径。 +在明确完成迁移前,请保留已有的环境变量与卷路径映射。 +`docker compose down` 保留两个卷;`docker compose down --volumes` 则会删除 +`ocx-state` 和 `codex-state`,包括配置、凭据、用量记录、数据密钥及 Codex 状态和模型目录。 +这是破坏性操作,不能当作升级或重启命令使用。 + opencodex 不发布官方 Docker 镜像,但仓库提供维护的 `Dockerfile` 和 `compose.yaml`,用于在本地构建按 digest 固定的 Bun 镜像。首次启动前,通过 stdin 初始化一次数据密钥;密钥不会输出,并以仅所有者可读的权限保存在 `ocx-state` 卷中。 宿主机需要安装 Git 和 Bun。每次构建镜像前,都应从 Git 跟踪的源码生成规范兼容性清单,生成后到构建完成前不要修改源码。生成的 JSON 不加入 Git;`.git` 不进入 Docker 构建上下文。宿主机端口默认绑定 `127.0.0.1`。远程访问须显式使用 `OPENCODEX_BIND_ADDRESS= docker compose up -d`;`0.0.0.0` 会公开所有接口。请使用防火墙和经过身份验证的 TLS/tailnet 前端保护访问。 diff --git a/structure/02_config-and-codex-home.md b/structure/02_config-and-codex-home.md index 66a729b4fe..ca27674904 100644 --- a/structure/02_config-and-codex-home.md +++ b/structure/02_config-and-codex-home.md @@ -20,6 +20,24 @@ $CODEX_HOME/.opencodex-native-main-profiles/ Never assume macOS-only paths. Windows, service installs, and app-launched Codex can all depend on the resolved `CODEX_HOME`. +The source-built Docker image explicitly keeps `CODEX_HOME=/home/bun/.codex` separate +from `OPENCODEX_HOME=/home/bun/.opencodex`. Compose persists them in `codex-state` and +`ocx-state` respectively, retaining a read-only root. The image creates owner-only +writable homes for `bun`; existing volume ownership and permissions are not repaired. +The catalog resolver is unchanged; a writable empty home is not a materialized catalog. + +[Decision Log] +- 목적과 의도: Make the container's catalog location persistent and writable without changing native home semantics. +- 기존 구현 및 제약 조건: Compose persisted only the OCX home, leaving Codex state on a read-only root; both products use incompatible auth.json formats. +- 검토한 주요 대안: Merge the homes, nest Codex under an existing volume with a new startup initializer, or persist the existing separate Codex home. +- 선택한 방식: Add a separate codex-state volume and create both owner-only directories in the image. +- 다른 대안 대신 이 방식을 선택한 이유: It preserves existing paths, avoids credential-file collisions, and works when an older ocx-state volume hides the image's seeded directory tree. +- 장점, 단점 및 영향: Two volumes must be backed up, but no automatic credential migration or runtime resolver change is needed. Catalog import/materialization remains an explicit prerequisite. + +`docker compose down` retains both volumes. `docker compose down --volumes` deletes +both `ocx-state` and `codex-state`, including their credentials and catalog/state; +treat it as destructive, not as an upgrade or restart command. + Service install-state ownership uses this same resolver. In WSL, an unset `CODEX_HOME` may resolve to the single discoverable Windows Desktop home; recording Linux `~/.codex` instead would make a later repair or uninstall look foreign even though the service and runtime were started from the diff --git a/tests/service/container-bootstrap.test.ts b/tests/service/container-bootstrap.test.ts index 237a2754ab..ada807d1d0 100644 --- a/tests/service/container-bootstrap.test.ts +++ b/tests/service/container-bootstrap.test.ts @@ -1,11 +1,14 @@ import { afterEach, describe, expect, test } from "bun:test"; +import { spawnSync } from "node:child_process"; import { existsSync, mkdirSync, mkdtempSync, readFileSync, renameSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { dirname, join } from "node:path"; +import { pathToFileURL } from "node:url"; import { readBoundedToken } from "../../docker/bootstrap-token"; import { verifyCompatibilitySnapshot } from "../../docker/verify-compatibility"; import type { CompatibilityVersionManifest } from "../../scripts/generate-compatibility-version"; +import type { SerializedCatalog } from "../../src/server/catalog-download"; import { removeTreeWithRetry } from "../helpers/remove-tree"; import { repoPath } from "../helpers/repo-root"; @@ -39,6 +42,32 @@ describe("container token bootstrap", () => { }); describe("container deployment contract", () => { + test("persists separate OCX and Codex homes under the read-only root", () => { + const compose = Bun.YAML.parse(readFileSync(repoPath("compose.yaml"), "utf8")) as { + services: { hub: { + environment: Record; volumes: string[]; read_only: boolean; + security_opt: string[]; cap_drop: string[]; + } }; + volumes: Record; + }; + const hub = compose.services.hub; + expect(hub.environment?.CODEX_HOME).toBe("/home/bun/.codex"); + expect(hub.read_only).toBe(true); + expect(hub.volumes).toContain("ocx-state:/home/bun/.opencodex"); + expect(hub.volumes).toContain("codex-state:/home/bun/.codex"); + expect(Object.hasOwn(compose.volumes, "ocx-state")).toBe(true); + expect(Object.hasOwn(compose.volumes, "codex-state")).toBe(true); + expect(hub.security_opt).toContain("no-new-privileges:true"); + expect(hub.cap_drop).toContain("ALL"); + + const runtime = readFileSync(repoPath("Dockerfile"), "utf8").split(" AS runtime")[1]!; + expect(runtime).toContain("OPENCODEX_HOME=/home/bun/.opencodex"); + expect(runtime).toContain("CODEX_HOME=/home/bun/.codex"); + expect(runtime).toContain("install -d -m 0700 -o bun -g bun /home/bun/.opencodex /home/bun/.codex"); + expect(runtime).toContain('VOLUME ["/home/bun/.opencodex", "/home/bun/.codex"]'); + expect(runtime).toContain("USER bun"); + }); + test("publishes only the data port with loopback and explicit bind overrides", () => { const compose = Bun.YAML.parse(readFileSync(repoPath("compose.yaml"), "utf8")) as { services: { hub: { ports: string[] } }; @@ -82,6 +111,93 @@ afterEach(() => { for (const dir of snapshotDirs.splice(0)) removeTreeWithRetry(dir); }); +function catalogHomeFixture(codexDirectory = "codex-state") { + const root = mkdtempSync(join(tmpdir(), "ocx-container-catalog-")); + snapshotDirs.push(root); + const ocxHome = join(root, "ocx-state"); + const codexHome = join(root, codexDirectory); + mkdirSync(ocxHome, { mode: 0o700 }); + mkdirSync(codexHome, { mode: 0o700 }); + const ocxAuth = '{"fixture":"ocx-oauth-store"}'; + const codexAuth = '{"fixture":"native-codex-store"}'; + writeFileSync(join(ocxHome, "auth.json"), ocxAuth, { mode: 0o600 }); + writeFileSync(join(codexHome, "auth.json"), codexAuth, { mode: 0o600 }); + const moduleUrl = pathToFileURL(repoPath("src/server/catalog-download.ts")).href; + const script = ` + const { serializePersistedCatalog } = await import(${JSON.stringify(moduleUrl)}); + process.stdout.write(JSON.stringify(await serializePersistedCatalog())); + `; + const read = (): SerializedCatalog => { + // A fresh process keeps import-time home constants out of the parent test runner. + const result = spawnSync(process.execPath, ["--eval", script], { + cwd: repoPath(), + env: { ...process.env, HOME: root, USERPROFILE: root, + OPENCODEX_HOME: ocxHome, CODEX_HOME: codexHome }, + encoding: "utf8", + timeout: 15000, + }); + expect(result.error).toBeUndefined(); + expect(result.status).toBe(0); + expect(readFileSync(join(ocxHome, "auth.json"), "utf8")).toBe(ocxAuth); + expect(readFileSync(join(codexHome, "auth.json"), "utf8")).toBe(codexAuth); + return JSON.parse(result.stdout); + }; + return { root, ocxHome, codexHome, read }; +} + +function fixtureCatalog(slug: string) { + return { models: [{ slug, display_name: "Fixture", description: "fixture", priority: 1, + visibility: "list", base_instructions: "Fixture", input_modalities: ["text"] }] }; +} + +describe("container catalog home selection", () => { + test("reads only the Codex-home catalog across fresh processes without changing auth stores", () => { + const fixture = catalogHomeFixture(); + const catalog = fixtureCatalog("fixture/codex-home"); + expect(fixture.read().body).toBeNull(); + writeFileSync(join(fixture.ocxHome, "opencodex-catalog.json"), JSON.stringify(fixtureCatalog("fixture/ocx-home")), { mode: 0o600 }); + expect(fixture.read().body).toBeNull(); + writeFileSync(join(fixture.codexHome, "opencodex-catalog.json"), JSON.stringify(catalog), { mode: 0o600 }); + const serialized = fixture.read(); + expect(JSON.parse(serialized.body!)).toEqual(catalog); + expect(serialized.bytes).toBe(Buffer.byteLength(JSON.stringify(catalog), "utf8")); + expect(serialized.etag).toMatch(/^"[0-9a-f]{64}"$/); + // This proves a disk reread, not Docker volume initialization or container recreation. + expect(fixture.read()).toEqual(serialized); + }, 60000); + + test("uses a custom Codex home containing spaces", () => { + const fixture = catalogHomeFixture("custom codex state"); + const catalog = fixtureCatalog("fixture/custom-home"); + writeFileSync(join(fixture.codexHome, "opencodex-catalog.json"), JSON.stringify(catalog), { mode: 0o600 }); + expect(JSON.parse(fixture.read().body!)).toEqual(catalog); + }, 60000); + + for (const selection of ["relative", "absolute"] as const) { + test(`honors a ${selection} catalog override without falling back when it is absent`, () => { + const fixture = catalogHomeFixture(); + const selectedPath = selection === "relative" + ? join(fixture.codexHome, "catalogs", "custom.json") + : join(fixture.root, "external catalog.json"); + mkdirSync(dirname(selectedPath), { recursive: true, mode: 0o700 }); + const configuredPath = selection === "relative" ? "catalogs/custom.json" : selectedPath; + writeFileSync(join(fixture.codexHome, "config.toml"), `model_catalog_json = ${JSON.stringify(configuredPath)}\n`, { mode: 0o600 }); + writeFileSync(join(fixture.codexHome, "opencodex-catalog.json"), JSON.stringify(fixtureCatalog("fixture/default")), { mode: 0o600 }); + const catalog = fixtureCatalog(`fixture/${selection}`); + writeFileSync(selectedPath, JSON.stringify(catalog), { mode: 0o600 }); + expect(JSON.parse(fixture.read().body!)).toEqual(catalog); + unlinkSync(selectedPath); + expect(fixture.read().body).toBeNull(); + }, 60000); + } + + test("returns no catalog for malformed selected JSON without modifying auth stores", () => { + const fixture = catalogHomeFixture(); + writeFileSync(join(fixture.codexHome, "opencodex-catalog.json"), "not JSON", { mode: 0o600 }); + expect(fixture.read().body).toBeNull(); + }, 60000); +}); + function compatibilitySnapshot() { const root = mkdtempSync(join(tmpdir(), "ocx-container-identity-")); snapshotDirs.push(root); From 1ddbc4e989b2240c4f1dc4adb407d4a5679e4248 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:50:54 +0900 Subject: [PATCH 008/221] docs(skill): keep plaintext keys out of agent recipes [skip ci] Carry #3324 from 2933cc5842 and 7734e758b7. Preserve prior exact revocation authority, benign commit/abort, and managed connect rotation. Add bounded literal recipe regression detector; this is guidance and static warning, not runtime enforcement. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- skills/ocx/SKILL.md | 25 ++++- skills/ocx/references/03_recipes.md | 55 +++++++++-- skills/ocx/references/05_remote_hub.md | 6 ++ tests/ci-workflows/skill-ocx.test.ts | 132 +++++++++++++++++++++++++ 4 files changed, 209 insertions(+), 9 deletions(-) diff --git a/skills/ocx/SKILL.md b/skills/ocx/SKILL.md index a9975e7745..a5f19d861f 100644 --- a/skills/ocx/SKILL.md +++ b/skills/ocx/SKILL.md @@ -1,12 +1,12 @@ --- name: ocx -description: Drive a running opencodex (`ocx`) proxy from the CLI — account pools, provider routing, model catalog, usage and cost attribution, request logs, access keys, storage cleanup, and the management API. Use when a task involves controlling or inspecting an opencodex proxy rather than editing the opencodex codebase. Triggers: ocx, opencodex, proxy control, account pool, pause account, pool strategy, provider routing, usage report, cost attribution, access key, request log, conversation trace, storage cleanup, management API. +description: "Drive a running opencodex (`ocx`) proxy from the CLI — account pools, provider routing, model catalog, usage and cost attribution, request logs, access keys, storage cleanup, and the management API. Use when a task involves controlling or inspecting an opencodex proxy rather than editing the opencodex codebase. Triggers: ocx, opencodex, proxy control, account pool, pause account, pool strategy, provider routing, usage report, cost attribution, access key, request log, conversation trace, storage cleanup, management API." --- # Operating `ocx` `ocx` controls a locally running opencodex proxy. The CLI covers the dashboard's operational -surface, with one consent exception (starring) recorded under Consent below. `ocx capabilities` +surface, subject to Consent and Secret-bearing commands below. `ocx capabilities` lists the *declared* index, not every verb. Be precise about the gap, because guessing costs you more than reading: the capability index below @@ -90,6 +90,27 @@ starring would be useful, say so and let the user decide. The same boundary covers the session-gated `/api/codex-prompt` writes: read them with `ocx inspect codex-prompt`, and leave the writes to the dashboard. +## Secret-bearing commands + +**Do not create an access key or start an access-key rotation from an agent session.** +This covers the create and rotation-start operations under `ocx access key`, +`ocx access keys`, and `ocx api-key`, their `opencodex` equivalents and executable +wrappers, and direct POST requests to `/api/keys` and `/api/keys/rotate`. +Both text and JSON responses contain a one-time plaintext data-plane credential, +which can enter the agent transcript. Ask the user to perform that step in a +human-operated terminal outside the agent session, configure and verify the +replacement, and report only confirmation plus non-secret key/rotation IDs. +Never ask for the plaintext key in chat or offer a pipe, redirection, or API +workaround to perform the secret-returning step inside the agent session. + +Configuration confirmation is not approval to revoke the existing credential. +Identify the existing key ID and obtain separate explicit revocation approval +before committing an in-place rotation or removing an old, separately replaced key. +An existing explicit approval for that exact revocation remains valid; setup +confirmation alone does not supply it. Commit and abort return no plaintext key, +but still require authority for their state changes. Follow +[recipe 5](references/03_recipes.md#5-prepare-an-access-key-rotation-without-exposing-the-new-key). + ## Destructive verbs `storage trash restore` and `storage policy run` refuse without `--yes` (exit 2, nothing sent). diff --git a/skills/ocx/references/03_recipes.md b/skills/ocx/references/03_recipes.md index 85b734a9ce..424ad34a53 100644 --- a/skills/ocx/references/03_recipes.md +++ b/skills/ocx/references/03_recipes.md @@ -94,20 +94,61 @@ Read `accounts[]`. Two things to respect: `providers[]` and `models[]` carry `estimatedCostUsd`. Costs are estimates; `estimateReasons` in the log rows tells you why (for example `usage_estimated`, `expected_price_overlay`). -## 5. Rotate an access key and confirm it went quiet +## 5. Prepare an access-key rotation without exposing the new key ```bash ocx access key list --json -ocx access key create rotated --json # the plaintext key is in THIS response only +``` + +Creating a key or starting a rotation returns a one-time plaintext credential in both text and +JSON output. **Do not perform either operation in an agent session**, including through the +aliases, executable wrappers, or management POST routes named in +[Secret-bearing commands](../SKILL.md#secret-bearing-commands). Ask the user to perform that step +in a terminal outside the agent session, configure and verify the replacement, and report only +configuration confirmation and the non-secret key/rotation IDs. Never ask for the key itself. + +Configuration confirmation is not revocation approval. Identify the existing key ID and obtain +separate explicit revocation approval before taking either path below. An existing explicit +approval for that exact revocation remains valid; do not ask again for the same action and ID. + +For an in-place rotation, commit the pending replacement on the same ID: + +```bash +ocx access key rotate commit --json +``` + +For a separately created replacement, remove only the old ID: + +```bash ocx access key remove --yes --json -ocx access key list --json # the old id is gone; check usage on the rest ``` -Note the argument style: `create ` and `remove ` are **positionals**, not `--label` and -`--id`. `remove` also refuses without `--yes`. +After the command succeeds, inspect the matching result: + +```bash +ocx access key list --json +``` + +For an in-place rotation, the same ID remains and `pendingRotation` disappears. For a separately +created replacement, the old ID disappears. The list alone does not prove the replacement accepts +traffic; use the user's successful connection verification as that evidence. `remove ` is +positional, not `--id`, and refuses without `--yes`. + +To cancel a pending rotation, with authority to discard the replacement: + +```bash +ocx access key rotate abort --json +``` + +Abort retains the old credential and removes the pending replacement. Re-list to inspect pending +state. On stale, mismatched, or expired rotation IDs, or an uncertain commit result, inspect +non-secret state and report the refusal or uncertainty. Do not start another rotation, delete the +entry, or retrieve a secret as automatic recovery. Missing pending state alone is not proof of a +successful commit: expiry and abort also clear it. -The list carries per-key usage, so a key whose count stops advancing is genuinely unused. The -plaintext key appears once, in the `create` response, and is never retrievable again. +The list carries per-key usage. A count that stops advancing shows no recorded new usage in that +observation window; it does not prove no client still needs the key. Creation and rotation-start +return the plaintext once; list does not return the full plaintext. An `ambiguous` footer on the list means two configured keys share an id, so per-key totals do not exist for them — do not attribute usage to either. diff --git a/skills/ocx/references/05_remote_hub.md b/skills/ocx/references/05_remote_hub.md index 46b846d443..0c0596be07 100644 --- a/skills/ocx/references/05_remote_hub.md +++ b/skills/ocx/references/05_remote_hub.md @@ -114,6 +114,12 @@ The ordering is not ceremony. If the old key died at issuance, a client that had received the new key would be disconnected — and a disconnected client cannot be given a new key. So the contract is: apply the new key, verify the connection, then commit. +Raw access-key creation and rotation-start return plaintext and belong outside the agent +session; follow [recipe 5](03_recipes.md#5-prepare-an-access-key-rotation-without-exposing-the-new-key) +for the human handoff and separate revocation approval. The managed `ocx connect rotate` +flow returns non-secret status and is a distinct command, not permission to invoke the raw +secret-returning endpoint from an agent tool. + The token backup (`.prev`) is not deleted while a rotation is in flight, and commits only once both sides are confirmed to have accepted. diff --git a/tests/ci-workflows/skill-ocx.test.ts b/tests/ci-workflows/skill-ocx.test.ts index 9293dd080a..dbd9693dcc 100644 --- a/tests/ci-workflows/skill-ocx.test.ts +++ b/tests/ci-workflows/skill-ocx.test.ts @@ -163,3 +163,135 @@ describe("the consent boundary is stated, not implied", () => { expect(recipes).toContain("get approval"); }); }); + +describe("access-key recipes keep plaintext outside agent sessions", () => { + // CLI oracle: access.ts removes one --json before checking exact commit/abort tokens. + // These canonical spellings are case-sensitive; commit-old-id is a start, not a commit. + const secretBearingAccessKeyCommand = + /\b(?:ocx|opencodex)(?:\.(?:exe|mjs|cmd|ps1))?["']?\s+(?:access\s+keys?|api-key)\s+(?:create\b|rotate\b(?!\s+(?:--json\s+)?(?:commit|abort)(?=\s|$)))/gm; + const secretBearingManagementRequest = + /(?:(?:\bPOST\b|(?:--request|-X|-Method)\s+["']?POST["']?|method\s*:\s*["']POST["'])[^\n]{0,240}\/api\/keys(?:\/rotate)?(?=$|[\s"'?#])|\/api\/keys(?:\/rotate)?(?=$|[\s"'?#])[^\n]{0,240}(?:\bPOST\b|(?:--request|-X|-Method)\s+["']?POST["']?|method\s*:\s*["']POST["']))/gim; + + /** + * Early warning for literal recipes in ordinary fences and single-backtick spans. + * Not a shell/JS parser: implicit POSTs, dynamic calls, alternate Markdown and + * arbitrary multiline requests remain outside this bounded detector. + */ + function secretBearingCommandsInCode(text: string): string[] { + const spans: string[] = []; + const prose = text.replace(/```[^\n]*\n([\s\S]*?)```/g, (_all: string, body: string) => { + spans.push(body); + return ""; + }); + for (const span of prose.matchAll(/`([^`\n]+)`/g)) spans.push(span[1]!); + const matches: string[] = []; + for (const span of spans) { + const executable = span.replace(/(?:\\|`|\^)\r?\n\s*/g, " "); + matches.push(...Array.from(executable.matchAll(secretBearingAccessKeyCommand), match => match[0])); + matches.push(...Array.from(executable.matchAll(secretBearingManagementRequest), match => match[0])); + } + return matches; + } + + test("all key aliases reject creation/start and preserve non-secret commit/abort", () => { + for (const binary of ["ocx", "opencodex"]) { + for (const group of ["access key", "access keys", "api-key"]) { + const prefix = `${binary} ${group}`; + for (const action of [ + "create rotated", "create rotated --json", + "rotate old-id", "rotate old-id --json", "rotate --json old-id", + ]) { + const command = `${prefix} ${action}`; + expect(secretBearingCommandsInCode("```bash\n" + command + "\n```"), command).toHaveLength(1); + } + for (const operation of ["commit", "abort"]) { + for (const args of [ + `${operation} old-id rotation-id`, + `${operation} old-id rotation-id --json`, + `--json ${operation} old-id rotation-id`, + ]) { + const command = `${prefix} rotate ${args}`; + expect(secretBearingCommandsInCode("```bash\n" + command + "\n```"), command).toEqual([]); + } + const start = `${prefix} rotate --json ${operation}-old-id`; + expect(secretBearingCommandsInCode("`" + start + "`"), start).toHaveLength(1); + } + } + } + }); + + test("wrappers, shell continuations and inline examples cannot hide literal commands", () => { + for (const command of [ + "& ocx access keys create rotated --json", + "command ocx access key create rotated", + "env ocx api-key rotate old-id", + "& 'C:\\Tools\\opencodex.exe' api-key rotate old-id", + "node /opt/bin/ocx.mjs access key create rotated", + "ocx.cmd access key create rotated", + "& './opencodex.ps1' access keys rotate old-id", + "ocx access key \\\n create rotated --json", + "ocx access key `\r\n create rotated --json", + "ocx access key ^\n rotate old-id", + "ocx access key rotate COMMIT", + ]) { + expect(secretBearingCommandsInCode("```bash\n" + command + "\n```"), command).toHaveLength(1); + } + expect(secretBearingCommandsInCode("Run `ocx api-key create rotated --json` next.")).toHaveLength(1); + expect(secretBearingCommandsInCode("Do not run `ocx api-key create rotated --json`.")).toHaveLength(1); + expect(secretBearingCommandsInCode("Creation under `ocx access key` returns plaintext.")).toEqual([]); + }); + + test("explicit management POST recipes are detected without banning commit or abort", () => { + for (const route of ["/api/keys", "/api/keys/rotate"]) { + for (const command of [ + `POST ${route}`, + `curl -X POST http://127.0.0.1:3000${route}`, + `curl 'http://127.0.0.1:3000${route}?source=recipe' --request POST`, + `curl --request POST \\\n 'http://127.0.0.1:3000${route}#example'`, + `Invoke-RestMethod http://127.0.0.1:3000${route} -Method Post`, + `Invoke-WebRequest -Method Post http://127.0.0.1:3000${route}`, + `fetch('${route}', { method: 'POST' })`, + ]) { + expect(secretBearingCommandsInCode("```text\n" + command + "\n```"), command).toHaveLength(1); + } + } + expect(secretBearingCommandsInCode("Run `POST /api/keys` next.")).toHaveLength(1); + for (const command of [ + "ocx access key list --json", + "ocx access key remove old-id --yes --json", + "ocx connect rotate --admin-token-stdin --json", + "curl -X POST http://127.0.0.1:3000/api/keys/rotate/commit", + "curl -X DELETE http://127.0.0.1:3000/api/keys/rotate", + "curl -X DELETE http://127.0.0.1:3000/api/keys", + "curl http://127.0.0.1:3000/api/keys\ncurl -X POST http://127.0.0.1:3000/api/keys/rotate/commit", + ]) { + expect(secretBearingCommandsInCode("```bash\n" + command + "\n```"), command).toEqual([]); + } + expect(secretBearingCommandsInCode("| POST | `/api/keys/rotate` |")).toEqual([]); + }); + + test("the original unsafe recipe is detected and every shipped page is scanned", () => { + const original = "```bash\nocx access key list --json\nocx access key create rotated --json\n" + + "ocx access key remove --yes --json\nocx access key list --json\n```"; + expect(secretBearingCommandsInCode(original)).toHaveLength(1); + for (const file of ["SKILL.md", ...REFERENCES.map(ref => join("references", ref))]) { + expect(secretBearingCommandsInCode(read(file)), file).toEqual([]); + } + }); + + test("guidance distinguishes configuration confirmation from revocation authority", () => { + // Documentation presence/order only: these assertions do not prove agent behavior. + const skill = readFileSync(SKILL, "utf8"); + const recipes = read("references/03_recipes.md"); + for (const text of [skill, recipes]) { + expect(text).toMatch(/outside the agent\s+session/); + expect(text).toMatch(/configuration confirmation is not (?:revocation )?approval/i); + expect(text).toMatch(/existing explicit\s+approval for that exact revocation remains valid/); + } + const approvalAt = recipes.indexOf("separate explicit revocation approval"); + expect(approvalAt).toBeGreaterThanOrEqual(0); + for (const command of ["ocx access key rotate commit", "ocx access key remove"]) { + expect(recipes.indexOf(command)).toBeGreaterThan(approvalAt); + } + }); +}); From 17c657c88784c6053d3185f26c01177a01f92f3c Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:53:16 +0900 Subject: [PATCH 009/221] fix(diagnostics): distinguish spill ACL timeout origins [skip ci] Add closed origin and cumulative terminal-publication counters without changing ACL decisions, retry limits, memo handling, cancellation or readiness. Refs #3522; runtime recovery remains unresolved. Final stack CI pending. Co-authored-by: Ingwannu <186453546+Ingwannu@users.noreply.github.com> --- .../content/docs/reference/management-api.md | 2 +- .../docs/troubleshooting/windows-memory.md | 17 ++- src/lib/windows-secret-acl.ts | 12 +- src/responses/state.ts | 51 +++++++- tests/responses/responses-state.test.ts | 115 ++++++++++++++++++ tests/server/memory-watchdog.test.ts | 11 +- tests/windows/windows-secret-acl.test.ts | 88 +++++++++++--- 7 files changed, 267 insertions(+), 29 deletions(-) diff --git a/docs-site/src/content/docs/reference/management-api.md b/docs-site/src/content/docs/reference/management-api.md index 2cd23eb4bd..538f81e400 100644 --- a/docs-site/src/content/docs/reference/management-api.md +++ b/docs-site/src/content/docs/reference/management-api.md @@ -339,7 +339,7 @@ whether to star the repository. | Method and path | Purpose | Notable errors | | --- | --- | --- | -| `GET /api/system/memory` | Return scalar process, heap, stream, response-state, watchdog, and active-turn metrics. Response-state diagnostics include spill-write status, consecutive failures, fixed privacy-safe failure class, and last failure/success timestamps; raw errors and paths are never returned. | — | +| `GET /api/system/memory` | Return scalar process, heap, stream, response-state, watchdog, and active-turn metrics. Response-state diagnostics include spill-write status, consecutive failures, fixed privacy-safe failure class, and last failure/success timestamps. `spillLastWriteFailureOrigin` is `retry_returned_timeout`, `timeout_memo_refusal`, or null; cumulative `spillAclRetryReturnedTimeouts` and `spillAclTimeoutMemoRefusals` count terminal failed publications. See [Windows spill diagnostics](/troubleshooting/windows-memory/) for process-local semantics. Raw errors and paths are never returned. | — | | `POST /api/system/restart` | Begin a drain-aware process restart without removing client injection | Returns 202; repeated calls report the existing drain | | `POST /api/stop` | Stop the service, restore native Codex, remove managed Grok injection, and drain the proxy | 409 service ownership conflict; 409 `respawnable_service` when a Windows Task Scheduler wrapper could respawn the proxy and the caller is not `ocx stop` (nothing is changed); 409 when the installed manager refuses to stop; 409 `service_state_unknown` when the Task Scheduler state cannot be read (nothing is changed; repair the query and retry) | | `GET /api/system/codex-app-server` | Report whether running Codex app-servers predate the current model catalog | — | diff --git a/docs-site/src/content/docs/troubleshooting/windows-memory.md b/docs-site/src/content/docs/troubleshooting/windows-memory.md index cea5b3c233..10bc3799cc 100644 --- a/docs-site/src/content/docs/troubleshooting/windows-memory.md +++ b/docs-site/src/content/docs/troubleshooting/windows-memory.md @@ -57,7 +57,22 @@ runtime the leak itself remains an upstream problem: time show whether failures are accumulating or recovering in the same process. The last failure is a fixed privacy-safe class such as `EACCES`, `ENOSPC`, `ETIMEDOUT`, or `EACLRETRYEXHAUSTED`; raw error messages and filesystem paths - are never returned. These diagnostics stay on the authenticated management + are never returned. `spillLastWriteFailureOrigin` adds a fixed origin or null: + `retry_returned_timeout` means the existing second spill attempt returned a + timeout; `timeout_memo_refusal` means the ACL helper refused through its + remembered timeout state. Other failures use null. The cumulative + `spillAclRetryReturnedTimeouts` and `spillAclTimeoutMemoRefusals` count terminal + failed publications, not individual ACL commands or transient first attempts. + Success clears the failure streak but retains the last failure fields and + cumulative counts; a later unrelated failure sets the last origin to null. + These values are process-local, so compare snapshots from the same process. + Neither origin identifies an OS command: the attempt budget can expire before + a command starts, and an optional compliance inspection can run before a memo + refusal. A separate process succeeding does not prove that the live process's + memo recovered. These observations do not add retries, clear memos, weaken + required ACLs, or automatically restart the service. + + These diagnostics stay on the authenticated management endpoint and are intentionally absent from `/healthz`, which remains a liveness signal. The dashboard's **Memory observability** card renders the memory and continuation-size fields from this endpoint and offers a confirm-gated diff --git a/src/lib/windows-secret-acl.ts b/src/lib/windows-secret-acl.ts index dbf1f06b79..dc8bb5749f 100644 --- a/src/lib/windows-secret-acl.ts +++ b/src/lib/windows-secret-acl.ts @@ -715,18 +715,22 @@ function sanitizedAclError(diagnostics: string, cause: unknown): NodeJS.ErrnoExc return error; } -function previousTimeoutError(retryConsumed: boolean): NodeJS.ErrnoException { +type TimeoutMemoRefusalError = NodeJS.ErrnoException & { + aclFailureOrigin: "timeout_memo_refusal"; +}; + +function previousTimeoutError(retryConsumed: boolean): TimeoutMemoRefusalError { if (retryConsumed) { const error = new Error( "ACL hardening skipped — the previous timeout recovery was already consumed", ) as NodeJS.ErrnoException; error.code = "EACLRETRYEXHAUSTED"; - return error; + return Object.assign(error, { aclFailureOrigin: "timeout_memo_refusal" as const }); } - return sanitizedAclError( + return Object.assign(sanitizedAclError( "ACL hardening skipped — previous attempt timed out", Object.assign(new Error("timeout"), { code: "ETIMEDOUT" }), - ); + ), { aclFailureOrigin: "timeout_memo_refusal" as const }); } /** Consume, but never reset, the single explicit recovery attempt for this key. */ diff --git a/src/responses/state.ts b/src/responses/state.ts index e581653725..f9195196a2 100644 --- a/src/responses/state.ts +++ b/src/responses/state.ts @@ -169,7 +169,10 @@ async function snapshotOnDiskMatches(path: string, payload: string, payloadBytes return false; } } -const spillCounters = { writes: 0, writeFailures: 0, readFailures: 0 }; +const spillCounters = { + writes: 0, writeFailures: 0, readFailures: 0, + aclRetryReturnedTimeouts: 0, aclTimeoutMemoRefusals: 0, +}; export type ResponseSpillWriteFailureCode = | "EACLRETRYEXHAUSTED" @@ -184,9 +187,14 @@ export type ResponseSpillWriteFailureCode = export type ResponseSpillWriteStatus = "initial" | "healthy" | "degraded"; +export type ResponseSpillWriteFailureOrigin = + | "retry_returned_timeout" + | "timeout_memo_refusal"; + interface ResponseSpillWriteHealth { consecutiveFailures: number; lastFailureCode: ResponseSpillWriteFailureCode | null; + lastFailureOrigin: ResponseSpillWriteFailureOrigin | null; lastFailureAt: number | null; lastSuccessAt: number | null; } @@ -194,6 +202,7 @@ interface ResponseSpillWriteHealth { const spillWriteHealth: ResponseSpillWriteHealth = { consecutiveFailures: 0, lastFailureCode: null, + lastFailureOrigin: null, lastFailureAt: null, lastSuccessAt: null, }; @@ -226,6 +235,20 @@ function classifySpillWriteFailure(error: unknown): ResponseSpillWriteFailureCod return "EUNKNOWN"; } +/** The spill writer preserves ACL errors in cause; only a fixed memo marker is diagnostic. */ +function spillAclMemoRefusalOrigin(error: unknown): "timeout_memo_refusal" | null { + let cursor = error; + for (let depth = 0; depth < 4 && cursor && typeof cursor === "object"; depth += 1) { + const record = cursor as { code?: unknown; aclFailureOrigin?: unknown; cause?: unknown }; + if ((record.code === "ETIMEDOUT" || record.code === "EACLRETRYEXHAUSTED") + && record.aclFailureOrigin === "timeout_memo_refusal") { + return "timeout_memo_refusal"; + } + cursor = record.cause; + } + return null; +} + function noteSpillWriteSuccess(): void { spillCounters.writes += 1; spillWriteHealth.consecutiveFailures = 0; @@ -235,11 +258,20 @@ function noteSpillWriteSuccess(): void { function noteSpillWriteFailure( error: unknown, override?: ResponseSpillWriteFailureCode, + retryOrigin: ResponseSpillWriteFailureOrigin | null = null, ): void { + const code = override ?? classifySpillWriteFailure(error); + const origin = code === "ETIMEDOUT" || code === "EACLRETRYEXHAUSTED" + ? spillAclMemoRefusalOrigin(error) ?? retryOrigin + : null; spillCounters.writeFailures += 1; spillWriteHealth.consecutiveFailures += 1; - spillWriteHealth.lastFailureCode = override ?? classifySpillWriteFailure(error); + spillWriteHealth.lastFailureCode = code; + spillWriteHealth.lastFailureOrigin = origin; spillWriteHealth.lastFailureAt = now(); + // Count terminal publications, not ACL calls or a transient first attempt. + if (origin === "retry_returned_timeout") spillCounters.aclRetryReturnedTimeouts += 1; + else if (origin === "timeout_memo_refusal") spillCounters.aclTimeoutMemoRefusals += 1; } /** * Admission-boundary observability (test-visible). directSpills: oversized @@ -418,6 +450,7 @@ async function runPendingResponseSpill(job: PendingResponseSpill): Promise const candidate = job.candidate; let ref: ResponseSpillRef | null = null; let exhaustedAclRetry = false; + let aclRetryFailureOrigin: ResponseSpillWriteFailureOrigin | null = null; try { const state = spillPayloadForResident(candidate); try { @@ -437,6 +470,9 @@ async function runPendingResponseSpill(job: PendingResponseSpill): Promise }); } catch (retryError) { exhaustedAclRetry = isAclTimeout(retryError); + // A returned timeout can also mean an exhausted budget before the next OS command. + aclRetryFailureOrigin = spillAclMemoRefusalOrigin(retryError) + ?? (exhaustedAclRetry ? "retry_returned_timeout" : null); throw retryError; } } @@ -460,7 +496,7 @@ async function runPendingResponseSpill(job: PendingResponseSpill): Promise } catch (error) { if (ref) deleteResponseSpill(ref); if (states.get(job.id) === candidate && !job.cancelled) { - noteSpillWriteFailure(error, exhaustedAclRetry ? "EACLRETRYEXHAUSTED" : undefined); + noteSpillWriteFailure(error, exhaustedAclRetry ? "EACLRETRYEXHAUSTED" : undefined, aclRetryFailureOrigin); replaceWithSpillFailure(job.id, candidate); deferSupersededSpill(job.supersededSpill); } @@ -2188,6 +2224,9 @@ export interface ResponseStateMetrics { spillWriteStatus: ResponseSpillWriteStatus; spillWriteConsecutiveFailures: number; spillLastWriteFailureCode: ResponseSpillWriteFailureCode | null; + spillLastWriteFailureOrigin: ResponseSpillWriteFailureOrigin | null; + spillAclRetryReturnedTimeouts: number; + spillAclTimeoutMemoRefusals: number; spillLastWriteFailureAt: number | null; spillLastWriteSuccessAt: number | null; spillReadFailures: number; @@ -2240,6 +2279,9 @@ export function responseStateMetrics(): ResponseStateMetrics { : "initial", spillWriteConsecutiveFailures: spillWriteHealth.consecutiveFailures, spillLastWriteFailureCode: spillWriteHealth.lastFailureCode, + spillLastWriteFailureOrigin: spillWriteHealth.lastFailureOrigin, + spillAclRetryReturnedTimeouts: spillCounters.aclRetryReturnedTimeouts, + spillAclTimeoutMemoRefusals: spillCounters.aclTimeoutMemoRefusals, spillLastWriteFailureAt: spillWriteHealth.lastFailureAt, spillLastWriteSuccessAt: spillWriteHealth.lastSuccessAt, spillReadFailures: spillCounters.readFailures, @@ -2360,8 +2402,11 @@ export function clearResponseStateMemoryForTests(): void { spillCounters.writes = 0; spillCounters.writeFailures = 0; spillCounters.readFailures = 0; + spillCounters.aclRetryReturnedTimeouts = 0; + spillCounters.aclTimeoutMemoRefusals = 0; spillWriteHealth.consecutiveFailures = 0; spillWriteHealth.lastFailureCode = null; + spillWriteHealth.lastFailureOrigin = null; spillWriteHealth.lastFailureAt = null; spillWriteHealth.lastSuccessAt = null; replayScopeMismatchDrops = 0; diff --git a/tests/responses/responses-state.test.ts b/tests/responses/responses-state.test.ts index 8ba5da86b2..464642cda7 100644 --- a/tests/responses/responses-state.test.ts +++ b/tests/responses/responses-state.test.ts @@ -1079,6 +1079,9 @@ describe("Responses previous_response_id state", () => { spillWriteFailures: 0, spillWriteStatus: "healthy", spillWriteConsecutiveFailures: 0, + spillLastWriteFailureOrigin: null, + spillAclRetryReturnedTimeouts: 0, + spillAclTimeoutMemoRefusals: 0, }); }); @@ -1112,6 +1115,9 @@ describe("Responses previous_response_id state", () => { spillWriteConsecutiveFailures: 1, spillLastWriteFailureCode: "EACLRETRYEXHAUSTED", spillLastWriteSuccessAt: null, + spillLastWriteFailureOrigin: "retry_returned_timeout", + spillAclRetryReturnedTimeouts: 1, + spillAclTimeoutMemoRefusals: 0, }); expect(metrics.spillLastWriteFailureAt).toBeGreaterThanOrEqual(0); @@ -1127,11 +1133,65 @@ describe("Responses previous_response_id state", () => { spillWriteStatus: "healthy", spillWriteConsecutiveFailures: 0, spillLastWriteFailureCode: "EACLRETRYEXHAUSTED", + spillLastWriteFailureOrigin: "retry_returned_timeout", + spillAclRetryReturnedTimeouts: 1, + spillAclTimeoutMemoRefusals: 0, }); expect(typeof recovered.spillLastWriteSuccessAt === "number" && recovered.spillLastWriteSuccessAt >= (recovered.spillLastWriteFailureAt ?? 0)).toBe(true); }); + test("Windows stable-directory memo refusals stay distinct after the runner becomes healthy", async () => { + forceWindowsAclLane(); + const previousVerify = process.env.OPENCODEX_ACL_VERIFY_EXISTING; + delete process.env.OPENCODEX_ACL_VERIFY_EXISTING; + let clock = 0; + let grantCalls = 0; + setNowForTests(() => clock); + setResponseSpillNowForTests(() => clock); + setResponseSpillAsyncAclAttemptBudgetForTests(100); + setResponseStateByteCapForTests(1_024); + const spillDir = responseSpillDirectory(); + let healthy = false; + setAsyncIcaclsRunnerForTests(async args => { + if (args[0] !== spillDir) return ICACLS_OK; + if (args.includes("/grant:r")) grantCalls += 1; + if (healthy) return ICACLS_OK; + clock += 100; + return { success: false, exitCode: null, timedOut: true, stdout: "private-acl-output" }; + }); + try { + rememberLarge("resp_stable_timeout", "x".repeat(8_000)); + await flushPendingResponseSpillsForTests(); + expect(responseStateMetrics()).toMatchObject({ + spillWrites: 0, spillWriteFailures: 1, + spillLastWriteFailureCode: "EACLRETRYEXHAUSTED", + spillLastWriteFailureOrigin: "retry_returned_timeout", + spillAclRetryReturnedTimeouts: 1, spillAclTimeoutMemoRefusals: 0, + }); + expect(grantCalls).toBe(2); + healthy = true; // Same stable directory and process; no memo reset between jobs. + for (let refusal = 1; refusal <= 2; refusal += 1) { + rememberLarge(`resp_stable_refusal_${refusal}`, "y".repeat(8_000)); + await flushPendingResponseSpillsForTests(); + expect(responseStateMetrics()).toMatchObject({ + spillWrites: 0, spillWriteFailures: 1 + refusal, + spillWriteStatus: "degraded", spillWriteConsecutiveFailures: 1 + refusal, + spillLastWriteFailureCode: "EACLRETRYEXHAUSTED", + spillLastWriteFailureOrigin: "timeout_memo_refusal", + spillAclRetryReturnedTimeouts: 1, spillAclTimeoutMemoRefusals: refusal, + spillLastWriteSuccessAt: null, spillStubCount: 0, + }); + expect(grantCalls).toBe(2); + expect(spillFileNames(home)).toHaveLength(0); + expect(spillTempNames(home)).toHaveLength(0); + } + } finally { + if (previousVerify === undefined) delete process.env.OPENCODEX_ACL_VERIFY_EXISTING; + else process.env.OPENCODEX_ACL_VERIFY_EXISTING = previousVerify; + } + }); + test("Windows async spill attempts share one bounded ACL budget across every harden", async () => { forceWindowsAclLane(); let clock = 0; @@ -2591,6 +2651,7 @@ describe("Responses previous_response_id state", () => { const { spillWriteStatus, spillLastWriteFailureCode, + spillLastWriteFailureOrigin, spillLastWriteFailureAt, spillLastWriteSuccessAt, ...numericMetrics @@ -2599,6 +2660,7 @@ describe("Responses previous_response_id state", () => { .every(value => typeof value === "number" && Number.isFinite(value))).toBe(true); expect(spillWriteStatus).toBe("healthy"); expect(spillLastWriteFailureCode).toBeNull(); + expect(spillLastWriteFailureOrigin).toBeNull(); expect(spillLastWriteFailureAt).toBeNull(); expect(typeof spillLastWriteSuccessAt === "number" && Number.isFinite(spillLastWriteSuccessAt)).toBe(true); const serialized = JSON.stringify(metrics); @@ -3359,6 +3421,9 @@ describe("Responses previous_response_id state", () => { spillWriteStatus: "initial", spillWriteConsecutiveFailures: 0, spillLastWriteFailureCode: null, + spillLastWriteFailureOrigin: null, + spillAclRetryReturnedTimeouts: 0, + spillAclTimeoutMemoRefusals: 0, spillLastWriteFailureAt: null, spillLastWriteSuccessAt: null, spillReadFailures: 0, @@ -3366,6 +3431,53 @@ describe("Responses previous_response_id state", () => { }); }); + test("spill failure origin decoding stays bounded, closed and paired with the effective code", () => { + setResponseStateByteCapForTests(1_024); + const memoError = Object.assign(new Error("private-path-and-payload"), { + code: "ETIMEDOUT", aclFailureOrigin: "timeout_memo_refusal", + }); + const cycle: { code: string; cause?: unknown; aclFailureOrigin: string } = { + code: "ETIMEDOUT", aclFailureOrigin: "private-origin", + }; + cycle.cause = cycle; + const cases = [ + { error: new Error("wrapper", { cause: memoError }), code: "ETIMEDOUT", origin: "timeout_memo_refusal" }, + { error: Object.assign(new Error("denied", { cause: memoError }), { code: "EACCES" }), code: "EACCES", origin: null }, + { error: { code: "EACLRETRYEXHAUSTED" }, code: "EACLRETRYEXHAUSTED", origin: null }, + { error: { code: "ETIMEDOUT", aclFailureOrigin: "private-origin" }, code: "ETIMEDOUT", origin: null }, + { error: { code: "ETIMEDOUT", aclFailureOrigin: ["timeout_memo_refusal"] }, code: "ETIMEDOUT", origin: null }, + { error: cycle, code: "ETIMEDOUT", origin: null }, + // Including the writer's wrapper, the marker is beyond the four-object scan. + { error: { code: "ETIMEDOUT", cause: { cause: { cause: memoError } } }, code: "ETIMEDOUT", origin: null }, + ]; + cases.forEach(({ error, code, origin }, index) => { + setSpillIoForTest({ write: () => { throw error; } }); + rememberLarge(`resp_private_origin_${index}`, "private-content".repeat(1_000)); + const metrics = responseStateMetrics(); + expect(metrics).toMatchObject({ + spillWriteFailures: index + 1, + spillLastWriteFailureCode: code, + spillLastWriteFailureOrigin: origin, + spillAclRetryReturnedTimeouts: 0, spillAclTimeoutMemoRefusals: 1, + }); + const serialized = JSON.stringify(metrics); + for (const privateValue of ["private-path-and-payload", "private-origin", "private-content", "resp_private_origin", home]) { + expect(serialized).not.toContain(privateValue); + } + }); + setSpillIoForTest(null); + rememberLarge("resp_after_origin_failures", "healthy".repeat(1_500)); + expect(responseStateMetrics()).toMatchObject({ + spillWriteStatus: "healthy", spillWriteConsecutiveFailures: 0, + spillLastWriteFailureCode: "ETIMEDOUT", spillLastWriteFailureOrigin: null, + spillAclRetryReturnedTimeouts: 0, spillAclTimeoutMemoRefusals: 1, + }); + clearResponseStateMemoryForTests(); + expect(responseStateMetrics()).toMatchObject({ + spillLastWriteFailureOrigin: null, spillAclRetryReturnedTimeouts: 0, spillAclTimeoutMemoRefusals: 0, + }); + }); + test("a successful spill clears a repeated failure streak without erasing the last failure", () => { const realNow = Date.now; let clock = 1_000; @@ -3471,6 +3583,9 @@ describe("Responses previous_response_id state", () => { spillWriteStatus: "initial", spillWriteConsecutiveFailures: 0, spillLastWriteFailureCode: null, + spillLastWriteFailureOrigin: null, + spillAclRetryReturnedTimeouts: 0, + spillAclTimeoutMemoRefusals: 0, spillLastWriteFailureAt: null, spillLastWriteSuccessAt: null, spillReadFailures: 0, diff --git a/tests/server/memory-watchdog.test.ts b/tests/server/memory-watchdog.test.ts index 80c38dd020..918503456c 100644 --- a/tests/server/memory-watchdog.test.ts +++ b/tests/server/memory-watchdog.test.ts @@ -196,6 +196,9 @@ describe("GET /api/system/memory", () => { spillWriteStatus: "initial" | "healthy" | "degraded"; spillWriteConsecutiveFailures: number; spillLastWriteFailureCode: string | null; + spillLastWriteFailureOrigin: string | null; + spillAclRetryReturnedTimeouts: number; + spillAclTimeoutMemoRefusals: number; spillLastWriteFailureAt: number | null; spillLastWriteSuccessAt: number | null; replayScopeMismatchDrops: number; @@ -221,11 +224,12 @@ describe("GET /api/system/memory", () => { // responseState is a scalar-only continuation-store attribution block: numbers plus fixed // enum/null fields (no paths, messages, tokens, or account identifiers). // The exact count is pinned on purpose: a new field must be reviewed for privacy safety - // before it reaches this surface. 17 after #3522 added spill-write health diagnostics. - expect(Object.keys(body.responseState)).toHaveLength(17); + // before it reaches this surface. 20 after #3522 added failure origins and counters. + expect(Object.keys(body.responseState)).toHaveLength(20); const { spillWriteStatus, spillLastWriteFailureCode, + spillLastWriteFailureOrigin, spillLastWriteFailureAt, spillLastWriteSuccessAt, ...numericResponseState @@ -233,6 +237,9 @@ describe("GET /api/system/memory", () => { expect(Object.values(numericResponseState) .every(value => typeof value === "number" && Number.isFinite(value))).toBe(true); expect(["initial", "healthy", "degraded"]).toContain(spillWriteStatus); + expect(spillLastWriteFailureOrigin === null || [ + "retry_returned_timeout", "timeout_memo_refusal", + ].includes(spillLastWriteFailureOrigin)).toBe(true); expect(spillLastWriteFailureCode === null || [ "EACLRETRYEXHAUSTED", "ETIMEDOUT", "EACCES", "ENOSPC", "EFBIG", "EIO", "ECAPACITY", "ELOOP", "EUNKNOWN", diff --git a/tests/windows/windows-secret-acl.test.ts b/tests/windows/windows-secret-acl.test.ts index dddbd38084..aa011bb516 100644 --- a/tests/windows/windows-secret-acl.test.ts +++ b/tests/windows/windows-secret-acl.test.ts @@ -376,6 +376,42 @@ describe("opt-in existing ACL proof", () => { expect(calls).toEqual([[target]]); }); + test("async compliance inspection can precede a memo refusal or an existing compliant success", async () => { + const target = join(testDir, "memo-compliance.json"); + writeFileSync(target, "secret"); + let clock = 0; + setNowForTests(() => clock); + setAsyncWindowsPrincipalRunnerForTests(async () => success(`${ownerSid}\n${ownerName}\n`)); + seedIdentity(); + delete process.env.OPENCODEX_ACL_VERIFY_EXISTING; + setAsyncIcaclsRunnerForTests(async () => { + clock += 100; + return { success: false, exitCode: null, timedOut: true, stdout: "" }; + }); + try { + await expect(hardenSecretPathAsync(target, { required: true, deadlineMs: 100 })) + .rejects.toMatchObject({ code: "ETIMEDOUT" }); + await expect(hardenSecretPathAsync(target, { required: true, deadlineMs: 100, retryTimedOutOnce: true })) + .rejects.toMatchObject({ code: "ETIMEDOUT" }); + process.env.OPENCODEX_ACL_VERIFY_EXISTING = "1"; + const calls: string[][] = []; + let compliant = false; + setAsyncIcaclsRunnerForTests(async args => { + calls.push(args); + return success(compliant ? `${target} ${ownerName}:(F)\r\n` : "unverified"); + }); + await expect(hardenSecretPathAsync(target, { required: true, deadlineMs: 100 })) + .rejects.toMatchObject({ code: "EACLRETRYEXHAUSTED", aclFailureOrigin: "timeout_memo_refusal" }); + expect(calls).toEqual([[target]]); // Inspection ran, but no grant was launched. + compliant = true; + await expect(hardenSecretPathAsync(target, { required: true, deadlineMs: 100 })).resolves.toEqual({ ok: true }); + expect(calls).toEqual([[target], [target]]); + expect(timedOutSecretPathCountForTests()).toBe(1); // Existing proof did not clear the memo. + } finally { + setNowForTests(null); + } + }); + test("an inherited owner ACE falls through to the mutation sequence", () => { const target = join(testDir, "inherited.json"); writeFileSync(target, "secret"); @@ -1014,7 +1050,7 @@ describe("async hardenSecretPath (issue #612)", () => { expect(timedOutSecretPathCountForTests()).toBe(0); }); - test("the explicit timeout recovery cannot be consumed more than once", async () => { + test.each(["sync", "async"] as const)("%s timeout origin distinguishes memo refusal without another recovery", async lane => { // Pinned: this asserts recovery CARDINALITY. At the 30s default the first call would // succeed on its internal retry and the cardinality claim would never be exercised. process.env.OPENCODEX_ACL_TIMEOUT_MS = "5000"; @@ -1022,27 +1058,43 @@ describe("async hardenSecretPath (issue #612)", () => { let now = 0; let grantCalls = 0; setNowForTests(() => now); - setAsyncIcaclsRunnerForTests(async args => { + const runner = (args: string[]): IcaclsResult => { if (args.includes("/grant:r")) grantCalls += 1; now += 5_000; return timeout; - }); + }; + setIcaclsRunnerForTests(runner); + setAsyncIcaclsRunnerForTests(async args => runner(args)); + const identity = { ...ok, stdout: "S-1-5-21-1-2-3-1001\nocx-test\n" }; + setWindowsPrincipalRunnerForTests(() => identity); + setAsyncWindowsPrincipalRunnerForTests(async () => identity); + const harden = async (retryTimedOutOnce = false) => lane === "sync" + ? hardenSecretPath(target, { required: true, retryTimedOutOnce }) + : hardenSecretPathAsync(target, { required: true, retryTimedOutOnce }); - await expect(hardenSecretPathAsync(target, { required: true })).rejects.toMatchObject({ - code: "ETIMEDOUT", - }); - await expect(hardenSecretPathAsync(target, { - required: true, - retryTimedOutOnce: true, - })).rejects.toMatchObject({ code: "ETIMEDOUT" }); - const callsAfterRecovery = grantCalls; - await expect(hardenSecretPathAsync(target, { - required: true, - retryTimedOutOnce: true, - })).rejects.toMatchObject({ code: "EACLRETRYEXHAUSTED" }); - expect(grantCalls).toBe(callsAfterRecovery); - expect(grantCalls).toBe(2); - expect(timedOutSecretPathCountForTests()).toBe(1); + try { + const first = await harden().catch(error => error); + expect(first).toMatchObject({ code: "ETIMEDOUT" }); + expect(first).not.toHaveProperty("aclFailureOrigin"); + await expect(harden()).rejects.toMatchObject({ + code: "ETIMEDOUT", aclFailureOrigin: "timeout_memo_refusal", + }); + expect(grantCalls).toBe(1); + const recovery = await harden(true).catch(error => error); + expect(recovery).toMatchObject({ code: "ETIMEDOUT" }); + expect(recovery).not.toHaveProperty("aclFailureOrigin"); + const callsAfterRecovery = grantCalls; + await expect(harden(true)).rejects.toMatchObject({ + code: "EACLRETRYEXHAUSTED", aclFailureOrigin: "timeout_memo_refusal", + }); + expect(grantCalls).toBe(callsAfterRecovery); + expect(grantCalls).toBe(2); + expect(timedOutSecretPathCountForTests()).toBe(1); + } finally { + setWindowsPrincipalRunnerForTests(null); + setAsyncWindowsPrincipalRunnerForTests(null); + resetWindowsPrincipalForTests(); + } }); test("optional timeout memo does not poison a later required harden of the same path", () => { From 20d84d30d233f503dfb7253ff5c20e579e698855 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:55:06 +0900 Subject: [PATCH 010/221] fix(gui): keep subscription quota rows readable in narrow cards --- .../pr-screenshots/t4-credit-bars-81a8.png | Bin 0 -> 194622 bytes gui/src/components/QuotaBars.tsx | 6 ++++-- gui/src/styles/provider-quota.css | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 docs-site/public/pr-screenshots/t4-credit-bars-81a8.png diff --git a/docs-site/public/pr-screenshots/t4-credit-bars-81a8.png b/docs-site/public/pr-screenshots/t4-credit-bars-81a8.png new file mode 100644 index 0000000000000000000000000000000000000000..3d63f634b79ed17b4ee531a1a63031dc640bedb3 GIT binary patch literal 194622 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%0DP}9yD{q3F9&!);_#|2!CwcX|gGY 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 literal 0 HcmV?d00001 diff --git a/gui/src/components/QuotaBars.tsx b/gui/src/components/QuotaBars.tsx index 8b8fd9c4e6..a1a32e1cfa 100644 --- a/gui/src/components/QuotaBars.tsx +++ b/gui/src/components/QuotaBars.tsx @@ -339,6 +339,7 @@ export default function QuotaBars({ {rows.map(row => ( +
{label} {hasReset ? t("codexAuth.resets") : ""} {reset.day} diff --git a/gui/src/styles/provider-quota.css b/gui/src/styles/provider-quota.css index 05f616b20c..37fb87223a 100644 --- a/gui/src/styles/provider-quota.css +++ b/gui/src/styles/provider-quota.css @@ -101,3 +101,18 @@ color: var(--amber); font-size: 12px; } + +/* Long subscription labels and reset/value text need separate rows in narrow cards. */ +.quota-compact { container: quota-compact / inline-size; } +@container quota-compact (max-width: 440px) { + .quota-row--credits { + grid-template-columns: max-content max-content minmax(0, 1fr) max-content; + row-gap: 4px; + } + .quota-row--credits .quota-label { grid-column: 1 / -1; grid-row: 1; } + .quota-row--credits .quota-reset-label { grid-column: 1; grid-row: 2; } + .quota-row--credits .quota-reset-day { grid-column: 2; grid-row: 2; } + .quota-row--credits .quota-reset-time { grid-column: 3 / -1; grid-row: 2; } + .quota-row--credits .bar { grid-column: 1 / 4; grid-row: 3; } + .quota-row--credits .quota-val { grid-column: 4; grid-row: 3; white-space: nowrap; } +} From 59a2f0d01f7141a1c971aafad927a7b789f4315a Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:55:06 +0900 Subject: [PATCH 011/221] fix(quota): align Antigravity probes with fixed outbound destinations --- .../src/content/docs/fr/guides/providers.md | 3 + .../src/content/docs/guides/providers.md | 3 + .../src/content/docs/ja/guides/providers.md | 3 + .../src/content/docs/ko/guides/providers.md | 3 + .../src/content/docs/ru/guides/providers.md | 3 + .../src/content/docs/tr/guides/providers.md | 3 + .../content/docs/zh-cn/guides/providers.md | 3 + .../content/docs/zh-tw/guides/providers.md | 3 + src/providers/quota.ts | 41 ++- .../providers/provider-account-quota.test.ts | 106 ++++++- tests/providers/provider-quota.test.ts | 264 ++++++++++++++++-- 11 files changed, 392 insertions(+), 43 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/providers.md b/docs-site/src/content/docs/fr/guides/providers.md index 5de4260813..988ca03cf7 100644 --- a/docs-site/src/content/docs/fr/guides/providers.md +++ b/docs-site/src/content/docs/fr/guides/providers.md @@ -124,6 +124,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | Connexion PKCE expérimentale, transport HTTP/2 en direct et découverte de modèles filtrés par compte. | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | Expérimental. Flux d'appareil GitHub et échange `copilot_internal` (client OAuth de VS Code). Nécessite un abonnement Copilot actif ; il ne s'agit pas d'une API tierce officielle. | +Les vérifications de quota Google Antigravity utilisent des points de terminaison Google fixes, y compris le repli vers la liste des modèles. Elles prennent en charge le DNS Fake-IP transparent pour ces destinations en conservant la vérification TLS, le refus des redirections et les contrôles des adresses privées. Une URL de base personnalisée ne modifie que les requêtes de modèles ; `NO_PROXY` conserve la politique de connexion directe. + + Après un échec définitif d'actualisation de Nous, exécutez `ocx login nous` pour vous réauthentifier. Pour les préréglages canoniques du forfait Kimi Coding (`kimi` pour la connexion au compte et `kimi-code` diff --git a/docs-site/src/content/docs/guides/providers.md b/docs-site/src/content/docs/guides/providers.md index 255c0d8dc4..05f586a816 100644 --- a/docs-site/src/content/docs/guides/providers.md +++ b/docs-site/src/content/docs/guides/providers.md @@ -125,6 +125,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | Experimental PKCE login, live HTTP/2 transport with an opt-in HTTP/1.1 compatibility path, and account-filtered model discovery. | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | Experimental. GitHub device flow + `copilot_internal` exchange (VS Code OAuth client). Requires an active Copilot subscription; not an official third-party API. | +Google Antigravity account and provider quota probes use fixed Google accounting endpoints, including the models fallback. They support transparent Fake-IP DNS for those destinations while retaining TLS verification, redirect rejection and private-address checks. A custom provider base URL changes model requests, not quota destinations; `NO_PROXY` continues to select the direct-route policy. + + After a terminal Nous refresh failure, run `ocx login nous` to reauthenticate. For the canonical Kimi Coding Plan presets (`kimi` account login and `kimi-code` API key), diff --git a/docs-site/src/content/docs/ja/guides/providers.md b/docs-site/src/content/docs/ja/guides/providers.md index 51d018f478..33be9fc694 100644 --- a/docs-site/src/content/docs/ja/guides/providers.md +++ b/docs-site/src/content/docs/ja/guides/providers.md @@ -114,6 +114,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | 実験的 PKCE ログイン、HTTP/2 トランスポート、アカウント別モデル探索をサポート。 | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | 実験的。GitHub デバイスフロー + `copilot_internal` 交換(VS Code OAuth クライアント)。有効な Copilot サブスクリプションが必要で、公式のサードパーティ API ではありません。 | +Google Antigravity のアカウント・プロバイダーのクォータ確認は、モデル一覧へのフォールバックも含め、固定の Google エンドポイントを使用します。その宛先では透過 Fake-IP DNS に対応し、TLS 検証、リダイレクト拒否、プライベートアドレス検査を維持します。カスタム base URL はモデル要求にのみ適用されます。`NO_PROXY` は直接接続のポリシーを維持します。 + + Nous の refresh が終端失敗した場合は、再認証に `ocx login nous` を実行してください。 正規の Kimi Coding Plan プリセット(`kimi` アカウントログインと `kimi-code` API key)では、 diff --git a/docs-site/src/content/docs/ko/guides/providers.md b/docs-site/src/content/docs/ko/guides/providers.md index 3c28be0a59..7781cc4f52 100644 --- a/docs-site/src/content/docs/ko/guides/providers.md +++ b/docs-site/src/content/docs/ko/guides/providers.md @@ -113,6 +113,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | 실험적 PKCE 로그인, HTTP/2 전송, 계정별 모델 탐색을 지원합니다. | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | 실험적. GitHub 디바이스 플로우 + `copilot_internal` 교환(VS Code OAuth 클라이언트). 활성 Copilot 구독 필요; 공식 서드파티 API가 아닙니다. | +Google Antigravity 계정·제공자 할당량 확인은 모델 목록 폴백을 포함해 고정된 Google 회계 엔드포인트를 사용합니다. 해당 목적지의 투명 Fake-IP DNS를 지원하며 TLS 검증, 리다이렉트 거부, 사설 주소 검사는 유지합니다. 사용자 지정 base URL은 모델 요청에만 적용되며 할당량 목적지는 바꾸지 않습니다. `NO_PROXY`는 기존 직접 연결 정책을 유지합니다. + + Nous refresh가 종료 실패한 경우, `ocx login nous`로 재인증하세요. 정식 Kimi Coding Plan 프리셋(`kimi` 계정 로그인과 `kimi-code` API key)의 경우, opencodex는 diff --git a/docs-site/src/content/docs/ru/guides/providers.md b/docs-site/src/content/docs/ru/guides/providers.md index b99eb88ec2..b057cf77c6 100644 --- a/docs-site/src/content/docs/ru/guides/providers.md +++ b/docs-site/src/content/docs/ru/guides/providers.md @@ -123,6 +123,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | Экспериментальный PKCE-вход, живой транспорт HTTP/2 и обнаружение моделей с фильтрацией по аккаунту. | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | Экспериментально. Device flow GitHub + обмен `copilot_internal` (OAuth-клиент VS Code). Требуется активная подписка Copilot; это не официальный сторонний API. | +Проверки квот аккаунтов и провайдера Google Antigravity используют фиксированные адреса Google, включая резервный запрос списка моделей. Для этих адресов поддерживается прозрачный Fake-IP DNS с сохранением проверки TLS, запрета перенаправлений и проверки частных адресов. Пользовательский base URL меняет только запросы моделей; `NO_PROXY` сохраняет политику прямого подключения. + + После терминального сбоя обновления Nous выполните `ocx login nous`, чтобы пройти повторную аутентификацию. Для канонических пресетов Kimi Coding Plan (вход через аккаунт `kimi` и API-ключ `kimi-code`) diff --git a/docs-site/src/content/docs/tr/guides/providers.md b/docs-site/src/content/docs/tr/guides/providers.md index 4559133d43..c5564e74a1 100644 --- a/docs-site/src/content/docs/tr/guides/providers.md +++ b/docs-site/src/content/docs/tr/guides/providers.md @@ -138,6 +138,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | Deneysel PKCE girişi, canlı HTTP/2 aktarımı ve hesap filtreli model keşfi. | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | Deneysel. GitHub cihaz akışı + `copilot_internal` değişimi (VS Code OAuth istemcisi). Aktif bir Copilot aboneliği gerektirir; resmi bir üçüncü taraf API değildir. | +Google Antigravity hesap ve sağlayıcı kota sorguları, model listesine geri dönüş dahil sabit Google uç noktalarını kullanır. Bu hedefler için şeffaf Fake-IP DNS desteklenirken TLS doğrulaması, yönlendirme reddi ve özel adres kontrolleri korunur. Özel base URL yalnızca model isteklerini değiştirir; `NO_PROXY` doğrudan bağlantı politikasını korur. + + Uç bir Nous yenileme hatasından sonra yeniden kimlik doğrulamak için `ocx login nous` çalıştırın. diff --git a/docs-site/src/content/docs/zh-cn/guides/providers.md b/docs-site/src/content/docs/zh-cn/guides/providers.md index a4bbab6186..3fb72a4e6a 100644 --- a/docs-site/src/content/docs/zh-cn/guides/providers.md +++ b/docs-site/src/content/docs/zh-cn/guides/providers.md @@ -104,6 +104,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | 实验性 PKCE 登录、带可选 HTTP/1.1 兼容路径的 HTTP/2 传输,以及按账号筛选的模型发现。 | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | 实验性。GitHub 设备流 + `copilot_internal` 交换(VS Code OAuth 客户端)。需要有效的 Copilot 订阅;不是官方第三方 API。 | +Google Antigravity 账户和提供方的配额查询(包括模型列表回退)使用固定的 Google 计量端点。这些目标支持透明 Fake-IP DNS,同时保留 TLS 验证、重定向拒绝和私有地址检查。自定义 base URL 仅改变模型请求,不改变配额目标;`NO_PROXY` 仍使用直连策略。 + + Nous refresh 发生终止性失败后,请运行 `ocx login nous` 重新认证。 对于规范的 Kimi Coding Plan 预设(`kimi` 账号登录和 `kimi-code` API key),opencodex diff --git a/docs-site/src/content/docs/zh-tw/guides/providers.md b/docs-site/src/content/docs/zh-tw/guides/providers.md index 0c20867124..96cf91ccfb 100644 --- a/docs-site/src/content/docs/zh-tw/guides/providers.md +++ b/docs-site/src/content/docs/zh-tw/guides/providers.md @@ -112,6 +112,9 @@ ocx logout | `cursor` | `cursor` | `https://api2.cursor.sh` | 實驗性 PKCE 登入、即時 HTTP/2 transport 與按帳號篩選的模型探索。 | | `github-copilot` | `openai-chat` | `https://api.githubcopilot.com` | 實驗性。GitHub device flow + `copilot_internal` exchange(VS Code OAuth client)。需要有效 Copilot 訂閱;不是官方第三方 API。 | +Google Antigravity 帳戶與供應商的配額查詢(包括模型清單備援)使用固定的 Google 計量端點。這些目標支援透明 Fake-IP DNS,同時保留 TLS 驗證、重新導向拒絕與私有位址檢查。自訂 base URL 只改變模型請求,不改變配額目標;`NO_PROXY` 仍使用直連政策。 + + 終端 Nous refresh 失敗後,執行 `ocx login nous` 重新認證。 對 canonical Kimi Coding Plan preset(`kimi` 帳號登入與 `kimi-code` API key),opencodex 只會把 caller diff --git a/src/providers/quota.ts b/src/providers/quota.ts index bb35c7ead1..7136cd3c70 100644 --- a/src/providers/quota.ts +++ b/src/providers/quota.ts @@ -2607,11 +2607,22 @@ function parseAntigravityQuotaSummary(body: Record | null): Pro } const ANTIGRAVITY_ACCOUNT_QUOTA_BASE = "https://daily-cloudcode-pa.googleapis.com"; -let antigravityOutboundDependencies: ProviderOutboundDependencies = {}; +const ANTIGRAVITY_QUOTA_SUMMARY_URL = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:retrieveUserQuotaSummary`; +const ANTIGRAVITY_QUOTA_MODELS_URL = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:fetchAvailableModels`; -/** Test seam: inject resolver/pinned transport for the per-account Antigravity probe. */ +/** Only these fixed accounting destinations may use transparent Fake-IP DNS. */ +export function isCanonicalAntigravityQuotaUrl(name: string, url: string): boolean { + return name === "google-antigravity" + && (url === ANTIGRAVITY_QUOTA_SUMMARY_URL || url === ANTIGRAVITY_QUOTA_MODELS_URL); +} + +let antigravityOutboundDependencies: ProviderOutboundDependencies = { + isCanonicalUrl: isCanonicalAntigravityQuotaUrl, +}; + +/** Test seam: inject resolver/pinned transport for provider and per-account probes. */ export function setAntigravityAccountQuotaTransportForTests(dependencies: ProviderOutboundDependencies | null): void { - antigravityOutboundDependencies = dependencies ?? {}; + antigravityOutboundDependencies = { ...dependencies, isCanonicalUrl: isCanonicalAntigravityQuotaUrl }; } /** @@ -2622,7 +2633,7 @@ export function setAntigravityAccountQuotaTransportForTests(dependencies: Provid * A redirect or non-2xx yields null (unavailable), never a partial row. */ export async function fetchAntigravityUsageQuota(accessToken: string, projectId: string): Promise { - const summaryUrl = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:retrieveUserQuotaSummary`; + const summaryUrl = ANTIGRAVITY_QUOTA_SUMMARY_URL; try { const summaryResponse = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, summaryUrl, { headers: { @@ -2644,7 +2655,7 @@ export async function fetchAntigravityUsageQuota(accessToken: string, projectId: // Fallback to fetchAvailableModels on error } - const url = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:fetchAvailableModels`; + const url = ANTIGRAVITY_QUOTA_MODELS_URL; const response = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, url, { headers: { Accept: "application/json", @@ -2662,7 +2673,7 @@ export async function fetchAntigravityUsageQuota(accessToken: string, projectId: return { customWindows, updatedAt: Date.now() }; } -async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig): Promise { +async function fetchAntigravityQuota(provider: string): Promise { const credential = getCredential("google-antigravity"); if (!credential?.projectId) return null; let accessToken: string; @@ -2671,13 +2682,12 @@ async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig } catch { return null; } - const baseUrl = (config.baseUrl || ANTIGRAVITY_ACCOUNT_QUOTA_BASE).replace(/\/+$/, ""); - // The summary probe is pinned to Google's own host through the provider-outbound + // Both probes are pinned to Google's own host through the provider-outbound // transport, mirroring `fetchAntigravityUsageQuota` above: a configured `baseUrl` is a - // routing choice for requests, not a second source of Google's accounting, and this - // request carries the account bearer. - const summaryUrl = `${ANTIGRAVITY_ACCOUNT_QUOTA_BASE}/v1internal:retrieveUserQuotaSummary`; + // routing choice for requests, not a second source of Google's accounting, and these + // requests carry the account bearer. + const summaryUrl = ANTIGRAVITY_QUOTA_SUMMARY_URL; try { const summaryResponse = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, summaryUrl, { headers: { @@ -2701,8 +2711,8 @@ async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig // Fallback on network/fetch error } - const response = await fetch(`${baseUrl}/v1internal:fetchAvailableModels`, { - method: "POST", + const url = ANTIGRAVITY_QUOTA_MODELS_URL; + const response = await providerOutboundPost("google-antigravity", { baseUrl: ANTIGRAVITY_ACCOUNT_QUOTA_BASE }, url, { headers: { Accept: "application/json", "Content-Type": "application/json", @@ -2711,7 +2721,8 @@ async function fetchAntigravityQuota(provider: string, config: OcxProviderConfig }, body: JSON.stringify({ project: credential.projectId }), signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS), - }); + }, antigravityOutboundDependencies); + if (await providerRedirectError(response, url)) return null; if (!response.ok) return null; const customWindows = antigravityWindowsFromModels(asRecord(await readQuotaJson(response))); if (customWindows.length === 0) return null; @@ -2783,7 +2794,7 @@ async function maybeFetchProviderQuota( } if (provider.authMode === "oauth" && explicitAccountReader(name)) return await fetchExplicitCurrentQuota(name, provider, config); if (provider.authMode === "oauth" && name === "anthropic") return fetchAnthropicQuota(name); - if (provider.authMode === "oauth" && name === "google-antigravity") return fetchAntigravityQuota(name, provider); + if (provider.authMode === "oauth" && name === "google-antigravity") return await fetchAntigravityQuota(name); if (provider.authMode === "oauth" && name === "kiro") return fetchKiroQuota(name); // Passive providers (meta-muse): Meta publishes no quota endpoint, so there is no // probe to run — the row is the active account's last in-band observation. diff --git a/tests/providers/provider-account-quota.test.ts b/tests/providers/provider-account-quota.test.ts index 1855e92d66..989f55a410 100644 --- a/tests/providers/provider-account-quota.test.ts +++ b/tests/providers/provider-account-quota.test.ts @@ -15,6 +15,7 @@ import { supportsPerAccountQuota, providerOAuthAccountQuotaMode, } from "../../src/providers/quota"; +import { PROXY_ENV_KEYS } from "../../src/lib/proxy-env"; import { removeTreeWithRetry } from "../helpers/remove-tree"; const originalFetch = globalThis.fetch; @@ -681,7 +682,21 @@ describe("google-antigravity per-account quota (#1082)", () => { }); } - afterEach(() => setAntigravityAccountQuotaTransportForTests(null)); + const proxyKeys = PROXY_ENV_KEYS.flatMap(key => [key, key.toLowerCase()]); + const originalProxyEnv = Object.fromEntries(proxyKeys.map(key => [key, process.env[key]])); + const summaryUrl = "https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary"; + const modelsUrl = "https://daily-cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels"; + + beforeEach(() => { + for (const key of proxyKeys) delete process.env[key]; + }); + afterEach(() => { + setAntigravityAccountQuotaTransportForTests(null); + for (const key of proxyKeys) { + if (originalProxyEnv[key] === undefined) delete process.env[key]; + else process.env[key] = originalProxyEnv[key]; + } + }); test("probes each account with its own bearer and project id on the fixed Google host using retrieveUserQuotaSummary", async () => { const expires = Date.now() + 60 * 60_000; @@ -748,6 +763,95 @@ describe("google-antigravity per-account quota (#1082)", () => { expect(byId[idA]!.quota!.customWindows![0]!.resetAt).toBeDefined(); }); + for (const fallback of [false, true]) { + test(`Fake-IP ${fallback ? "models fallback" : "summary"} keeps each account bearer and project separate`, async () => { + const expires = Date.now() + 3600_000; + await saveCredential("google-antigravity", { access: "agy-first", refresh: "r1", expires, projectId: "proj-first", accountId: "agy-a", email: "a@example.com" }); + await saveCredential("google-antigravity", { access: "agy-second", refresh: "r2", expires, projectId: "proj-second", accountId: "agy-b", email: "b@example.com" }); + let plainFetchCalls = 0; + globalThis.fetch = (async () => { plainFetchCalls += 1; throw new Error("unexpected raw quota fetch"); }) as typeof fetch; + const resolved: Array<{ url: string; benchmark?: boolean; private?: boolean; mihomo?: boolean }> = []; + const posted: Array<{ url: string; auth: string | null; project: string; address: string; tls?: boolean; signal: boolean }> = []; + setAntigravityAccountQuotaTransportForTests(null); + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async (url, options) => { + const policy = typeof options === "object" ? options : undefined; + resolved.push({ url, benchmark: policy?.allowBenchmarkAddresses, private: policy?.allowPrivateNetwork, mihomo: policy?.allowMihomoIpv6FakeIp }); + if (!policy?.allowBenchmarkAddresses) throw new Error("benchmark address rejected"); + return { hostname: "daily-cloudcode-pa.googleapis.com", addresses: [{ address: "198.18.56.214", family: 4 }], privateNetwork: false }; + }, + pinnedPost: async (url, pinned, body, signal, options) => { + const auth = new Headers(options?.headers).get("authorization"); + posted.push({ url, auth, project: String(JSON.parse(body).project), address: pinned.address, tls: options?.rejectUnauthorized, signal: signal instanceof AbortSignal }); + if (url === summaryUrl && fallback) return new Response(null, { status: 404 }); + const [gem, cla]: [number, number] = auth === "Bearer agy-first" ? [0.86, 0.38] : [0.97, 0.91]; + return new Response(url === summaryUrl ? antigravitySummaryBody(gem, cla) : antigravityBody(gem, cla)); + }, + }); + const rows = await fetchProviderAccountQuotas("google-antigravity"); + const urls = fallback ? [summaryUrl, modelsUrl] : [summaryUrl]; + expect(resolved).toHaveLength(urls.length * 2); + expect(posted).toHaveLength(urls.length * 2); + for (const url of urls) { + expect(resolved.filter(row => row.url === url)).toEqual([ + { url, benchmark: true, private: false, mihomo: false }, + { url, benchmark: true, private: false, mihomo: false }, + ]); + } + for (const [auth, project] of [["Bearer agy-first", "proj-first"], ["Bearer agy-second", "proj-second"]]) { + expect(posted.filter(row => row.auth === auth)).toEqual(urls.map(url => ({ url, auth, project, address: "198.18.56.214", tls: true, signal: true }))); + } + const byId = Object.fromEntries(rows.map(row => [row.accountId, row])); + expect(byId[idFor("a@example.com")]?.quota?.customWindows?.map(w => w.percent)).toEqual(fallback ? [14, 62] : [14, 14, 62, 62]); + expect(byId[idFor("b@example.com")]?.quota?.customWindows?.map(w => w.percent)).toEqual(fallback ? [3, 9] : [3, 3, 9, 9]); + expect(plainFetchCalls).toBe(0); + }); + } + + test("NO_PROXY denial preserves an unavailable account row without sending its bearer", async () => { + await saveCredential("google-antigravity", { access: "agy-first", refresh: "r1", expires: Date.now() + 3600_000, projectId: "proj-first", accountId: "agy-a", email: "a@example.com" }); + process.env.no_proxy = "daily-cloudcode-pa.googleapis.com"; + const admitted: Array = []; + let posted = 0; + let plainFetchCalls = 0; + globalThis.fetch = (async () => { plainFetchCalls += 1; throw new Error("unexpected raw quota fetch"); }) as typeof fetch; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async (_url, options) => { + const allow = typeof options === "object" ? options?.allowBenchmarkAddresses : undefined; + admitted.push(allow); + if (!allow) throw new Error("benchmark address rejected"); + return { hostname: "daily-cloudcode-pa.googleapis.com", addresses: [{ address: "198.18.56.214", family: 4 }], privateNetwork: false }; + }, + pinnedPost: async () => { posted += 1; return new Response(antigravitySummaryBody(0.5, 0.5)); }, + }); + expect(await fetchProviderAccountQuotas("google-antigravity")).toEqual([{ accountId: idFor("a@example.com"), quota: null, unavailable: true }]); + expect(admitted).toEqual([false, false]); + expect(posted).toBe(0); + expect(plainFetchCalls).toBe(0); + }); + + for (const status of [302, 307, 308, 401, 403]) { + for (const fallback of [false, true]) { + test(`account ${fallback ? "models" : "summary"} ${status} returns unavailable without following Location`, async () => { + await saveCredential("google-antigravity", { access: "agy-first", refresh: "r1", expires: Date.now() + 3600_000, projectId: "proj-first", accountId: "agy-a", email: "a@example.com" }); + const posted: string[] = []; + let plainFetchCalls = 0; + globalThis.fetch = (async () => { plainFetchCalls += 1; throw new Error("unexpected raw quota fetch"); }) as typeof fetch; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async () => ({ hostname: "daily-cloudcode-pa.googleapis.com", addresses: [{ address: "142.250.0.1", family: 4 }], privateNetwork: false }), + pinnedPost: async url => { + posted.push(url); + if (url === summaryUrl && fallback) return new Response(null, { status: 404 }); + return new Response(null, { status, headers: { location: "https://daily-cloudcode-pa.googleapis.com/redirect-target" } }); + }, + }); + expect(await fetchProviderAccountQuotas("google-antigravity")).toEqual([{ accountId: idFor("a@example.com"), quota: null, unavailable: true }]); + expect(posted).toEqual(fallback ? [summaryUrl, modelsUrl] : [summaryUrl]); + expect(plainFetchCalls).toBe(0); + }); + } + } + test("a rejected destination never receives a bearer; the row is unavailable, not 0%", async () => { const expires = Date.now() + 60 * 60_000; await saveCredential("google-antigravity", { access: "agy-first", refresh: "r1", expires, projectId: "proj-first", accountId: "agy-a", email: "a@example.com" }); diff --git a/tests/providers/provider-quota.test.ts b/tests/providers/provider-quota.test.ts index 5a02e53f28..9c12869b04 100644 --- a/tests/providers/provider-quota.test.ts +++ b/tests/providers/provider-quota.test.ts @@ -13,6 +13,7 @@ import { saveCredential } from "../../src/oauth/store"; import { clearProviderQuotaCache, fetchProviderQuotaReports, + isCanonicalAntigravityQuotaUrl, parseOllamaCloudQuota, parseXaiCreditsResponse, QUOTA_RESPONSE_MAX_BYTES, @@ -21,7 +22,10 @@ import { setProviderQuotaBeforePublishForTests, } from "../../src/providers/quota"; import type { OcxConfig } from "../../src/types"; +import { PROXY_ENV_KEYS } from "../../src/lib/proxy-env"; import { repoPath } from "../helpers/repo-root"; +const proxyKeys = PROXY_ENV_KEYS.flatMap(key => [key, key.toLowerCase()]); +const originalProxyEnv = Object.fromEntries(proxyKeys.map(key => [key, process.env[key]])); const originalFetch = globalThis.fetch; const previousOpencodexHome = process.env.OPENCODEX_HOME; const previousCodexHome = process.env.CODEX_HOME; @@ -75,6 +79,7 @@ function testConfig(): OcxConfig { } beforeEach(() => { + for (const key of proxyKeys) delete process.env[key]; opencodexHome = mkdtempSync(join(tmpdir(), "ocx-quota-")); codexHome = mkdtempSync(join(tmpdir(), "codex-quota-")); process.env.OPENCODEX_HOME = opencodexHome; @@ -90,6 +95,10 @@ beforeEach(() => { }); afterEach(() => { + for (const key of proxyKeys) { + if (originalProxyEnv[key] === undefined) delete process.env[key]; + else process.env[key] = originalProxyEnv[key]; + } globalThis.fetch = originalFetch; clearAccountQuota(); clearProviderQuotaCache(); @@ -203,15 +212,39 @@ describe("fetchProviderQuotaReports", () => { await saveCredential("google-antigravity", { access: "agy-access-secret", refresh: "agy-refresh-secret", expires: Date.now() + 3600_000, projectId: "agy-project-secret" }); await saveCredential("kimi", { access: "kimi-access-secret", refresh: "kimi-refresh-secret", expires: Date.now() + 3600_000 }); - // The Antigravity summary probe is pinned to Google's host through the provider-outbound - // transport and never touches globalThis.fetch; without this seam the test would make a - // real network request. A 404 here exercises the fetchAvailableModels fallback below. + const seen: { url: string; authorization?: string; body?: string }[] = []; + // Both Antigravity accounting requests use the pinned transport. Keep the + // summary unavailable so this fixture still exercises the models fallback. setAntigravityAccountQuotaTransportForTests({ resolveAddresses: async () => ({ hostname: "daily-cloudcode-pa.googleapis.com", addresses: [{ address: "142.250.0.1", family: 4 }], privateNetwork: false }), - pinnedPost: async () => new Response("not found", { status: 404 }), + pinnedPost: async (url, _pinned, body, _signal, options) => { + seen.push({ url, authorization: new Headers(options?.headers).get("authorization") ?? undefined, body }); + if (url === "https://daily-cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels") { + return new Response(JSON.stringify({ + models: { + "gemini-3.6-flash-medium": { + displayName: "Gemini 3.6 Flash (Medium)", + quotaInfo: { remainingFraction: 0.64, resetTime: "2026-07-05T14:00:00Z" }, + }, + "claude-sonnet-4.6": { + displayName: "Claude Sonnet", + quotaInfoByTier: { + sonnet: { remainingFraction: 0.21, resetTime: "2026-07-05T15:00:00Z" }, + }, + }, + autocomplete: { + displayName: "Autocomplete", + quotaInfo: { remainingFraction: 0.01, resetTime: "2026-07-05T16:00:00Z" }, + }, + }, + rawProject: "agy-project-secret", + rawToken: "agy-access-secret", + }), { status: 200, headers: { "content-type": "application/json" } }); + } + return new Response("not found", { status: 404 }); + }, }); - const seen: { url: string; authorization?: string; body?: string }[] = []; globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { const url = String(input); const headers = init?.headers as Record | undefined; @@ -258,28 +291,6 @@ describe("fetchProviderQuotaReports", () => { billingCycleEnd: "2026-08-01T00:00:00.000Z", }), { status: 200, headers: { "content-type": "application/json" } }); } - if (url === "https://daily-cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels") { - return new Response(JSON.stringify({ - models: { - "gemini-3.6-flash-medium": { - displayName: "Gemini 3.6 Flash (Medium)", - quotaInfo: { remainingFraction: 0.64, resetTime: "2026-07-05T14:00:00Z" }, - }, - "claude-sonnet-4.6": { - displayName: "Claude Sonnet", - quotaInfoByTier: { - sonnet: { remainingFraction: 0.21, resetTime: "2026-07-05T15:00:00Z" }, - }, - }, - autocomplete: { - displayName: "Autocomplete", - quotaInfo: { remainingFraction: 0.01, resetTime: "2026-07-05T16:00:00Z" }, - }, - }, - rawProject: "agy-project-secret", - rawToken: "agy-access-secret", - }), { status: 200, headers: { "content-type": "application/json" } }); - } if (url === "https://api.kimi.com/coding/v1/usages") { return new Response(JSON.stringify({ user: { userId: "kimi-user-secret", businessId: "kimi-business-secret" }, @@ -3078,6 +3089,205 @@ describe("fetchProviderQuotaReports", () => { expect(posted).toEqual(["https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary"]); }); + describe("Google Antigravity canonical quota transport (#3781)", () => { + const summaryUrl = "https://daily-cloudcode-pa.googleapis.com/v1internal:retrieveUserQuotaSummary"; + const modelsUrl = "https://daily-cloudcode-pa.googleapis.com/v1internal:fetchAvailableModels"; + const summaryBody = JSON.stringify({ groups: [{ displayName: "Gemini", buckets: [{ window: "5h", remainingFraction: 0.6 }] }] }); + const modelsBody = JSON.stringify({ models: { gemini: { quotaInfo: { remainingFraction: 0.75 } } } }); + const publicAddress = { hostname: "daily-cloudcode-pa.googleapis.com", addresses: [{ address: "142.250.0.1", family: 4 }], privateNetwork: false }; + let plainFetchCalls: string[]; + + function config(baseUrl = "https://daily-cloudcode-pa.googleapis.com"): OcxConfig { + return { + defaultProvider: "google-antigravity", + providers: { "google-antigravity": { adapter: "google", authMode: "oauth", baseUrl, allowPrivateNetwork: true } }, + } as OcxConfig; + } + + beforeEach(async () => { + await saveCredential("google-antigravity", { + access: "agy-canonical-access", refresh: "agy-canonical-refresh", expires: Date.now() + 3600_000, projectId: "agy-canonical-project", + }); + plainFetchCalls = []; + globalThis.fetch = (async (input) => { + plainFetchCalls.push(String(input)); + throw new Error("unexpected quota-owned raw fetch"); + }) as typeof fetch; + }); + + test("canonical proof accepts only the two exact Google accounting URLs", () => { + for (const url of [summaryUrl, modelsUrl]) { + expect(isCanonicalAntigravityQuotaUrl("google-antigravity", url)).toBe(true); + expect(isCanonicalAntigravityQuotaUrl("custom", url)).toBe(false); + for (const candidate of [ + "", "not a URL", url.replace("https:", "http:"), + url.replace(".googleapis.com", ".googleapis.com.evil.example"), + url.replace("daily-cloudcode-pa", "cloudcode-pa"), + url.replace("https://", "https://user:pass@"), + url.replace(".com/", ".com:443/"), url.replace(".com/", ".com:8443/"), + url.replace("https://", "HTTPS://"), `${url}/`, `${url}/extra`, + `${url}?token=secret`, `${url}#fragment`, ` ${url}`, + url.replace("v1internal:", "v1internal%3A"), + url.replace("v1internal:", "prefix/v1internal:"), + "https://daily-cloudcode-pa.googleapis.com/v1internal:other", + "https://198.18.0.1/v1internal:fetchAvailableModels", + "https://127.0.0.1/v1internal:fetchAvailableModels", + "https://169.254.169.254/v1internal:fetchAvailableModels", + ]) expect(isCanonicalAntigravityQuotaUrl("google-antigravity", candidate)).toBe(false); + } + }); + + for (const fallback of [false, true]) { + test(`production proof survives reset for Fake-IP ${fallback ? "fallback" : "summary"}`, async () => { + const resolved: Array<{ url: string; benchmark?: boolean; private?: boolean; mihomo?: boolean }> = []; + const posted: Array<{ url: string; address: string; tls?: boolean; auth: string | null; body: string; signal: boolean }> = []; + setAntigravityAccountQuotaTransportForTests({ isCanonicalUrl: () => false }); + setAntigravityAccountQuotaTransportForTests(null); + // Resolver/pinned-only overrides must retain the production canonical proof. + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async (url, options) => { + const policy = typeof options === "object" ? options : undefined; + resolved.push({ url, benchmark: policy?.allowBenchmarkAddresses, private: policy?.allowPrivateNetwork, mihomo: policy?.allowMihomoIpv6FakeIp }); + if (!policy?.allowBenchmarkAddresses) throw new Error("benchmark address rejected"); + return { ...publicAddress, addresses: [{ address: "198.18.56.214", family: 4 }] }; + }, + pinnedPost: async (url, pinned, body, signal, options) => { + posted.push({ url, address: pinned.address, tls: options?.rejectUnauthorized, auth: new Headers(options?.headers).get("authorization"), body, signal: signal instanceof AbortSignal }); + if (url === summaryUrl && fallback) return new Response(null, { status: 404 }); + return new Response(url === summaryUrl ? summaryBody : modelsBody); + }, + }); + const result = await fetchProviderQuotaReports(config(), true); + const urls = fallback ? [summaryUrl, modelsUrl] : [summaryUrl]; + expect(resolved).toEqual(urls.map(url => ({ url, benchmark: true, private: false, mihomo: false }))); + expect(posted).toEqual(urls.map(url => ({ url, address: "198.18.56.214", tls: true, auth: "Bearer agy-canonical-access", body: JSON.stringify({ project: "agy-canonical-project" }), signal: true }))); + expect(result.reports[0]?.source).toBe(fallback ? "google-antigravity:fetchAvailableModels" : "google-antigravity:retrieveUserQuotaSummary"); + expect(result.reports[0]?.quota.customWindows).toEqual([{ label: "Gem", percent: fallback ? 25 : 40 }]); + expect(plainFetchCalls).toEqual([]); + }); + } + + for (const baseUrl of ["https://custom.example/v1", "http://127.0.0.1:1/", "https://169.254.169.254/", "https://daily-cloudcode-pa.googleapis.com.evil.example/"]) { + test(`models fallback ignores configured destination ${baseUrl}`, async () => { + const resolved: Array<{ url: string; private?: boolean }> = []; + const posted: string[] = []; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async (url, options) => { + resolved.push({ url, private: typeof options === "object" ? options?.allowPrivateNetwork : undefined }); + return publicAddress; + }, + pinnedPost: async (url) => { + posted.push(url); + return url === summaryUrl ? new Response(null, { status: 404 }) : new Response(modelsBody); + }, + }); + const result = await fetchProviderQuotaReports(config(baseUrl), true); + expect(result.reports[0]?.quota.customWindows).toEqual([{ label: "Gem", percent: 25 }]); + expect(resolved).toEqual([{ url: summaryUrl, private: false }, { url: modelsUrl, private: false }]); + expect(posted).toEqual([summaryUrl, modelsUrl]); + expect(plainFetchCalls).toEqual([]); + }); + } + + for (const noProxy of ["daily-cloudcode-pa.googleapis.com", "*"]) { + test(`NO_PROXY ${noProxy} keeps benchmark DNS blocked`, async () => { + process.env.NO_PROXY = noProxy; + const admitted: Array = []; + let posted = 0; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async (_url, options) => { + const allow = typeof options === "object" ? options?.allowBenchmarkAddresses : undefined; + admitted.push(allow); + if (!allow) throw new Error("benchmark address rejected"); + return publicAddress; + }, + pinnedPost: async () => { posted += 1; return new Response(summaryBody); }, + }); + expect((await fetchProviderQuotaReports(config(), true)).reports).toEqual([]); + expect(admitted).toEqual([false, false]); + expect(posted).toBe(0); + expect(plainFetchCalls).toEqual([]); + }); + } + + test("resolved-address policy rejection cannot escape to raw fallback fetch", async () => { + // The real classifier's mixed-address cases live in destination-policy-resolved.test.ts; + // this checks that quota cannot bypass its rejection through a second transport. + const resolved: string[] = []; + let posted = 0; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async url => { resolved.push(url); throw new Error("provider URL resolves to metadata"); }, + pinnedPost: async () => { posted += 1; return new Response(modelsBody); }, + }); + expect((await fetchProviderQuotaReports(config("https://custom.example"), true)).reports).toEqual([]); + expect(resolved).toEqual([summaryUrl, modelsUrl]); + expect(posted).toBe(0); + expect(plainFetchCalls).toEqual([]); + }); + + for (const summary of ["{}", "invalid JSON"]) { + test(`unusable summary ${summary} falls back through the fixed models transport`, async () => { + const posted: string[] = []; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async () => publicAddress, + pinnedPost: async url => { + posted.push(url); + return new Response(url === summaryUrl ? summary : modelsBody); + }, + }); + const result = await fetchProviderQuotaReports(config(), true); + expect(result.reports[0]?.quota.customWindows).toEqual([{ label: "Gem", percent: 25 }]); + expect(posted).toEqual([summaryUrl, modelsUrl]); + expect(plainFetchCalls).toEqual([]); + }); + } + + for (const status of [200, 500]) { + test(`unusable models payload with HTTP ${status} produces no fabricated quota`, async () => { + const posted: string[] = []; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async () => publicAddress, + pinnedPost: async url => { + posted.push(url); + return url === summaryUrl ? new Response(null, { status: 404 }) : new Response("invalid JSON", { status }); + }, + }); + expect((await fetchProviderQuotaReports(config(), true)).reports).toEqual([]); + expect(posted).toEqual([summaryUrl, modelsUrl]); + expect(plainFetchCalls).toEqual([]); + }); + } + + for (const status of [302, 307, 308, 401, 403]) { + test(`summary ${status} terminates without a models request`, async () => { + const posted: string[] = []; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async () => publicAddress, + pinnedPost: async url => { posted.push(url); return new Response(null, { status, headers: { location: modelsUrl } }); }, + }); + expect((await fetchProviderQuotaReports(config(), true)).reports).toEqual([]); + expect(posted).toEqual([summaryUrl]); + expect(plainFetchCalls).toEqual([]); + }); + } + + for (const status of [302, 307, 308]) { + test(`models ${status} does not follow even a same-host redirect`, async () => { + const posted: string[] = []; + setAntigravityAccountQuotaTransportForTests({ + resolveAddresses: async () => publicAddress, + pinnedPost: async url => { + posted.push(url); + return url === summaryUrl ? new Response(null, { status: 404 }) : new Response(null, { status, headers: { location: summaryUrl } }); + }, + }); + expect((await fetchProviderQuotaReports(config(), true)).reports).toEqual([]); + expect(posted).toEqual([summaryUrl, modelsUrl]); + expect(plainFetchCalls).toEqual([]); + }); + } + }); + test("Ollama Cloud maps 5-hour session and weekly windows from /api/usage (legacy plan)", async () => { const seen: Array<{ url: string; authorization?: string; redirect?: RequestRedirect }> = []; globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { From cb84ad895d0101887c0fae3707676a6c31aa07e4 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 01:58:25 +0900 Subject: [PATCH 012/221] perf(logs): poll verified request-history deltas without losing updates Reimplements #3250 with snapshot-prefix validation, process epochs and current response fences. Co-authored-by: chilung --- .../pr-screenshots/t4-log-polling-81a8.png | Bin 0 -> 261934 bytes .../content/docs/reference/management-api.md | 8 + gui/src/pages/Logs.tsx | 23 ++- gui/src/pages/log-poll.ts | 38 ++++ gui/tests/log-poll.test.ts | 39 ++++ gui/tests/logs-auto-refresh.test.tsx | 182 +++++++++++++++++- src/server/management/logs-usage-routes.ts | 11 +- src/server/request-log-cursor.ts | 84 ++++++++ .../management-api-logs-metrics.test.ts | 137 +++++++++++++ tests/server/server-management-auth.test.ts | 60 ++++++ tests/usage/request-log.test.ts | 95 +++++++++ 11 files changed, 660 insertions(+), 17 deletions(-) create mode 100644 docs-site/public/pr-screenshots/t4-log-polling-81a8.png create mode 100644 gui/src/pages/log-poll.ts create mode 100644 gui/tests/log-poll.test.ts create mode 100644 src/server/request-log-cursor.ts diff --git a/docs-site/public/pr-screenshots/t4-log-polling-81a8.png b/docs-site/public/pr-screenshots/t4-log-polling-81a8.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd53042e94eecd25fe5cc80d73cf50b43ff302e GIT binary patch literal 261934 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�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 key: resourceKey, active: false, request: 0 }); + const logPollRef = useRef<{ key: string; cursor: string | null; rows: LogEntry[] }>( + { key: resourceKey, cursor: null, rows: [] }, + ); // Invalidate the old resource at commit, before passive resource-loader effects. // A late body read must not mutate this page's clock, cache or retry state. useLayoutEffect(() => { const clock = { key: resourceKey, active: true, request: 0 }; filterClockRef.current = clock; + // Cached display rows never establish a cursor, including A -> B -> A. + logPollRef.current = { key: resourceKey, cursor: null, rows: [] }; setFilterClockNow(Date.now()); return () => { clock.active = false; }; }, [resourceKey]); @@ -462,16 +468,22 @@ export default function Logs({ apiBase }: { apiBase: string }) { logRetryRef.current = retry; } if (retry.failures > 0 && Date.now() < retry.nextAttemptAt) throw retry.error; + const poll = logPollRef.current; + const cursor = poll.key === resourceKey ? poll.cursor : null; + const url = `${apiBase}/api/logs?limit=2000${cursor ? `&cursor=${encodeURIComponent(cursor)}` : ""}`; try { - const res = await fetch(`${apiBase}/api/logs?limit=2000`, { signal }); + const res = await fetch(url, { signal }); if (!res.ok) throw new Error(`${res.status} ${res.statusText}`.trim()); - const body = await res.json() as LogEntry[] | { logs?: LogEntry[]; generatedAt?: unknown }; + const body: unknown = await res.json(); const receivedAt = performance.now(); - const raw = Array.isArray(body) ? body : (body.logs ?? []); - const next = raw.map(sanitizeLogEntryRouteDecision); + const parsed = parseLogPollResponse(body); + const incoming = parsed.rows.map(sanitizeLogEntryRouteDecision); + const next = cursor && parsed.cursor && !parsed.reset + ? mergeLogDelta(poll.rows, incoming) : incoming; // The resource-store generation guard runs only after this loader returns. // Guard these local side effects here as fetch/body readers may ignore abort. if (!isCurrent()) throw signal.reason ?? new DOMException("Obsolete log request", "AbortError"); + logPollRef.current = { key: resourceKey, cursor: parsed.cursor, rows: next }; // Reconcile when the accepted snapshot changes, using the latest user state // rather than filters captured when the request started. Persist disappearance // as All so a later ring cannot resurrect a cleared selection. @@ -488,7 +500,7 @@ export default function Logs({ apiBase }: { apiBase: string }) { if (previous.model === nextModel && previous.provider === nextProvider) return previous; return { ...previous, model: nextModel, provider: nextProvider }; }); - const sample = logsClockAnchor(Array.isArray(body) ? undefined : body.generatedAt, receivedAt); + const sample = logsClockAnchor(parsed.generatedAt, receivedAt); if (sample) clock.anchor = sample; setFilterClockNow(logsClockNow(clock.anchor, receivedAt, Date.now())); logRetryRef.current = { key: resourceKey, failures: 0, nextAttemptAt: 0, error: null }; @@ -525,6 +537,7 @@ export default function Logs({ apiBase }: { apiBase: string }) { const fetchLogs = logsResource.refresh; const retryLogs = useCallback(() => { logRetryRef.current = { key: resourceKey, failures: 0, nextAttemptAt: 0, error: null }; + logPollRef.current = { key: resourceKey, cursor: null, rows: [] }; fetchLogs({ forceLoading: true }); }, [fetchLogs, resourceKey]); diff --git a/gui/src/pages/log-poll.ts b/gui/src/pages/log-poll.ts new file mode 100644 index 0000000000..ad13d986f7 --- /dev/null +++ b/gui/src/pages/log-poll.ts @@ -0,0 +1,38 @@ +export interface ParsedLogPollResponse { + rows: T[]; + cursor: string | null; + reset: boolean; + generatedAt?: unknown; + timeZone?: string; + total?: number; +} + +/** Legacy responses replace the window; malformed cursor responses keep last-good data. */ +export function parseLogPollResponse(body: unknown): ParsedLogPollResponse { + if (Array.isArray(body)) return { rows: body as T[], cursor: null, reset: false }; + if (!body || typeof body !== "object") throw new Error("Invalid log response"); + const value = body as Record; + const hasCursor = Object.hasOwn(value, "cursor") || Object.hasOwn(value, "reset"); + if ((value.logs !== undefined && !Array.isArray(value.logs)) + || (hasCursor && (!Array.isArray(value.logs) + || typeof value.cursor !== "string" || value.cursor.length === 0 || value.cursor.length > 512 + || !/^[A-Za-z0-9_-]+$/.test(value.cursor) || typeof value.reset !== "boolean"))) { + throw new Error("Invalid log response"); + } + return { + rows: (value.logs ?? []) as T[], + cursor: hasCursor ? value.cursor as string : null, + reset: value.reset === true, + generatedAt: value.generatedAt, + ...(typeof value.timeZone === "string" ? { timeZone: value.timeZone } : {}), + ...(typeof value.total === "number" && Number.isFinite(value.total) && value.total >= 0 + ? { total: value.total } : {}), + }; +} + +/** Updates/removals arrive as resets. Preserve order and even repeated IDs in valid suffixes. */ +export function mergeLogDelta(previous: T[], incoming: readonly T[], cap = 2000): T[] { + if (incoming.length === 0 && previous.length <= cap) return previous; + const merged = [...previous, ...incoming]; + return merged.length > cap ? merged.slice(merged.length - cap) : merged; +} diff --git a/gui/tests/log-poll.test.ts b/gui/tests/log-poll.test.ts new file mode 100644 index 0000000000..d7c2559a1f --- /dev/null +++ b/gui/tests/log-poll.test.ts @@ -0,0 +1,39 @@ +import { describe, expect, test } from "bun:test"; +import { mergeLogDelta, parseLogPollResponse } from "../src/pages/log-poll"; + +describe("log polling protocol", () => { + test("legacy arrays and envelopes replace snapshots without a cursor", () => { + const rows = [{ requestId: "a" }]; + expect(parseLogPollResponse(rows)).toEqual({ rows, cursor: null, reset: false }); + expect(parseLogPollResponse({ logs: rows, generatedAt: 123, timeZone: "UTC", total: 5 })) + .toEqual({ rows, cursor: null, reset: false, generatedAt: 123, timeZone: "UTC", total: 5 }); + expect(parseLogPollResponse({ logs: rows, generatedAt: "bad" }).generatedAt).toBe("bad"); + }); + + test("empty deltas and resets retain clock and window metadata", () => { + for (const reset of [false, true]) { + expect(parseLogPollResponse({ logs: [], cursor: "opaque-cursor", reset, generatedAt: 456, total: 2, timeZone: "UTC" })) + .toEqual({ rows: [], cursor: "opaque-cursor", reset, generatedAt: 456, total: 2, timeZone: "UTC" }); + } + }); + + test("invalid cursor envelopes fail instead of clearing accepted rows", () => { + for (const body of [null, "bad", { logs: {} }, { logs: [], cursor: null, reset: false }, + { logs: [], cursor: "", reset: false }, { logs: [], cursor: "c", reset: "false" }, + { logs: [], cursor: "c" }, { logs: [], reset: false }, { cursor: "c", reset: false }, + { logs: [], cursor: "a".repeat(513), reset: false }, { logs: [], cursor: " c ", reset: false }]) { + expect(() => parseLogPollResponse(body)).toThrow("Invalid log response"); + } + }); + + test("append preserves order and repeated IDs without mutating inputs; cap keeps newest rows", () => { + const previous = [{ requestId: "same", value: 1 }, { requestId: "other", value: 2 }]; + const incoming = [{ requestId: "same", value: 3 }]; + expect(mergeLogDelta(previous, incoming)).toEqual([...previous, ...incoming]); + expect(mergeLogDelta(previous, incoming, 2)).toEqual([previous[1], incoming[0]]); + expect(mergeLogDelta(previous, [])).toBe(previous); + expect(mergeLogDelta(previous, [], 1)).toEqual([previous[1]]); + expect(previous).toEqual([{ requestId: "same", value: 1 }, { requestId: "other", value: 2 }]); + expect(incoming).toEqual([{ requestId: "same", value: 3 }]); + }); +}); diff --git a/gui/tests/logs-auto-refresh.test.tsx b/gui/tests/logs-auto-refresh.test.tsx index 44366f146b..200b6c4f23 100644 --- a/gui/tests/logs-auto-refresh.test.tsx +++ b/gui/tests/logs-auto-refresh.test.tsx @@ -6,7 +6,7 @@ import { LanguageProvider } from "../src/i18n/provider"; import { clearClientResourceStoresForTests } from "../src/client-resource"; import Logs from "../src/pages/Logs"; -const globals = ["document", "window", "navigator", "localStorage", "IS_REACT_ACT_ENVIRONMENT", "ResizeObserver"] as const; +const globals = ["document", "window", "navigator", "localStorage", "sessionStorage", "IS_REACT_ACT_ENVIRONMENT", "ResizeObserver"] as const; let previousGlobals: Record<(typeof globals)[number], unknown>; let testWindow: Window; const originalFetch = globalThis.fetch; @@ -89,6 +89,7 @@ beforeEach(() => { window: { configurable: true, value: testWindow }, navigator: { configurable: true, value: testWindow.navigator }, localStorage: { configurable: true, value: testWindow.localStorage }, + sessionStorage: { configurable: true, value: testWindow.sessionStorage }, }); (globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true; installLayoutStubs(testWindow); @@ -952,6 +953,156 @@ function proxyLogEnvelope(generatedAt: unknown, logs: unknown[]) { return { generatedAt, timeZone: "UTC", total: logs.length, logs }; } +function cursorLogEnvelope(generatedAt: unknown, logs: unknown[], cursor: string, reset = false) { + return { ...proxyLogEnvelope(generatedAt, logs), cursor, reset }; +} + +test("Logs: append, empty delta, mutation reset and legacy fallback keep the complete window", async () => { + const urls: string[] = []; + let step = 0; + const responses = [ + cursorLogEnvelope(PROXY_NOW, [sampleLog], "c0"), + cursorLogEnvelope(PROXY_NOW, [], "c0"), + cursorLogEnvelope(PROXY_NOW, [updatedLog], "c1"), + cursorLogEnvelope(PROXY_NOW, [], "c1"), + cursorLogEnvelope(PROXY_NOW, [{ ...sampleLog, model: "gpt-mutated", durationMs: 987 }], "c2", true), + [updatedLog], + { logs: [sampleLog] }, + ]; + globalThis.fetch = (async input => { + const url = String(input); + if (!url.includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); + urls.push(url); + return jsonResponse(responses[step]); + }) as typeof fetch; + const { root, container } = await mountLogs(); + try { + await flushMicrotasks(); + expect(urls[0]).toBe("http://localhost/api/logs?limit=2000"); + step = 1; + await advanceSilentRefresh(); + expect(urls.at(-1)).toContain("cursor=c0"); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + step = 2; + await advanceSilentRefresh(); + expect(visibleRequestIds(container)).toEqual(["req-2", "req-1"]); + await changeLogSelect(container, "Model", "gpt-test"); + step = 3; + await advanceSilentRefresh(); + expect(container.querySelector('select[aria-label="Model"]')!.value).toBe("gpt-test"); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + step = 4; + await advanceSilentRefresh(); + expect(urls.at(-1)).toContain("cursor=c1"); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + expectTableLoaded(container, "gpt-mutated"); + expect(container.textContent).toContain("987"); + expect(container.querySelector('select[aria-label="Model"]')!.value).toBe(""); + step = 5; + await advanceSilentRefresh(); + expect(visibleRequestIds(container)).toEqual(["req-2"]); + step = 6; + await advanceSilentRefresh(); + expect(urls.at(-1)).toBe("http://localhost/api/logs?limit=2000"); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + } finally { + await act(async () => { root.unmount(); }); + } +}); + +test("Logs: an empty delta advances the proxy clock without discarding retained rows", async () => { + let step = 0; + const row = { ...sampleLog, timestamp: PROXY_NOW - 5 * 60_000 }; + globalThis.fetch = (async input => { + if (!String(input).includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); + return jsonResponse(cursorLogEnvelope(step ? PROXY_NOW + 20 * 60_000 : PROXY_NOW, step ? [] : [row], "same")); + }) as typeof fetch; + const { root, container } = await mountLogs(); + try { + await flushMicrotasks(); + await changeLogSelect(container, "Time", "15m"); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + step = 1; + await advanceSilentRefresh(); + expect(visibleRequestIds(container)).toEqual([]); + await changeLogSelect(container, "Time", "all"); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + expect(JSON.parse(sessionStorage.getItem("ocx.logs.list.v1:http://localhost")!)).toHaveLength(1); + } finally { + await act(async () => { root.unmount(); }); + } +}); + +test("Logs: malformed polls preserve cursor/cache, back off, and explicit retry reads a full snapshot", async () => { + let failing = false; + const urls: string[] = []; + globalThis.fetch = (async input => { + const url = String(input); + if (!url.includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); + urls.push(url); + if (failing) return jsonResponse({ logs: [], cursor: "poison", reset: "false" }); + return jsonResponse(cursorLogEnvelope(PROXY_NOW, url.includes("cursor=") ? [] : [sampleLog], "good")); + }) as typeof fetch; + const { root, container } = await mountLogs(); + try { + await flushMicrotasks(); + failing = true; + await advanceSilentRefresh(); + const count = urls.length; + await advanceSilentRefresh(); + expect(urls).toHaveLength(count); + await advanceSilentRefresh(14000); + expect(container.textContent).toContain("Could not load request logs."); + expect(visibleRequestIds(container)).toEqual(["req-1"]); + expect(urls.slice(1).every(url => url.includes("cursor=good"))).toBe(true); + expect(JSON.parse(sessionStorage.getItem("ocx.logs.list.v1:http://localhost")!)).toHaveLength(1); + failing = false; + await act(async () => { clickRetry(container); }); + await flushMicrotasks(); + expect(urls.at(-1)).toBe("http://localhost/api/logs?limit=2000"); + expectTableLoaded(container, "gpt-test"); + } finally { + await act(async () => { root.unmount(); }); + } +}); + +test("Logs: A to B to A and remount start without a cached cursor", async () => { + const urls: string[] = []; + globalThis.fetch = (async input => { + const url = String(input); + if (!url.includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); + urls.push(url); + const name = url.startsWith("http://proxy-a/") ? "a" : "b"; + return jsonResponse(cursorLogEnvelope(PROXY_NOW, url.includes("cursor=") ? [] : [ + { ...sampleLog, requestId: name }, + ], `cursor-${name}`)); + }) as typeof fetch; + const first = await mountLogs("http://proxy-a"); + try { + await flushMicrotasks(); + await advanceSilentRefresh(); + expect(urls.at(-1)).toContain("cursor=cursor-a"); + for (const name of ["b", "a"]) { + const start = urls.length; + await renderLogsAt(first.root, `http://proxy-${name}`); + await advanceSilentRefresh(); + expect(urls[start]).toBe(`http://proxy-${name}/api/logs?limit=2000`); + expect(visibleRequestIds(first.container)).toEqual([name]); + } + } finally { + await act(async () => { first.root.unmount(); }); + } + const start = urls.length; + const remount = await mountLogs("http://proxy-a"); + try { + await advanceSilentRefresh(); + expect(urls[start]).toBe("http://proxy-a/api/logs?limit=2000"); + expect(visibleRequestIds(remount.container)).toEqual(["a"]); + } finally { + await act(async () => { remount.root.unmount(); }); + } +}); + async function renderLogsAt(root: Root, apiBase: string): Promise { await act(async () => { root.render(); @@ -1104,6 +1255,7 @@ function delayedLogBody() { test("Logs: a late body from an aborted old apiBase cannot poison the new proxy clock", async () => { const late = delayedLogBody(); + const urls: string[] = []; let oldSignal: AbortSignal | undefined; let oldRequests = 0; const wall = jest.spyOn(Date, "now").mockReturnValue(PROXY_NOW + 6 * 60 * 60_000); @@ -1113,14 +1265,15 @@ test("Logs: a late body from an aborted old apiBase cannot poison the new proxy globalThis.fetch = (async (input, init) => { const url = String(input); if (!url.includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); + urls.push(url); if (url.startsWith("http://proxy-a/")) { oldRequests++; oldSignal = init?.signal ?? undefined; return late.response; } - return jsonResponse(proxyLogEnvelope(PROXY_NOW, [ + return jsonResponse(cursorLogEnvelope(PROXY_NOW, url.includes("cursor=") ? [] : [ { ...sampleLog, requestId: "proxy-b", timestamp: PROXY_NOW - 60_000 }, - ])); + ], "cursor-b")); }) as typeof fetch; let mounted: Awaited> | undefined; try { @@ -1136,9 +1289,13 @@ test("Logs: a late body from an aborted old apiBase cannot poison the new proxy await act(async () => { container.querySelector(".logs-auto-refresh input")!.click(); }); await flushMicrotasks(); expect(visibleRequestIds(container)).toEqual(["proxy-b"]); - await act(async () => { late.resolve(proxyLogEnvelope(PROXY_NOW + 12 * 60 * 60_000, [])); }); + await act(async () => { late.resolve(cursorLogEnvelope(PROXY_NOW + 12 * 60 * 60_000, [], "poison", true)); }); await flushMicrotasks(); expect(visibleRequestIds(container)).toEqual(["proxy-b"]); + expect(JSON.parse(sessionStorage.getItem("ocx.logs.list.v1:http://proxy-b")!)).toHaveLength(1); + await act(async () => { container.querySelector(".logs-auto-refresh input")!.click(); }); + await advanceSilentRefresh(); + expect(urls.at(-1)).toContain("cursor=cursor-b"); expect(container.querySelector('select[aria-label="Model"]')!.value).toBe("gpt-test"); expect(container.querySelector('select[aria-label="Provider"]')!.value).toBe("openai"); monotonic += 30_000; @@ -1158,6 +1315,7 @@ test("Logs: a late body from an aborted old apiBase cannot poison the new proxy test("Logs: aborting an in-flight refresh before pausing cannot replace the accepted clock", async () => { const late = delayedLogBody(); + const urls: string[] = []; let requests = 0; let lateSignal: AbortSignal | undefined; const wall = jest.spyOn(Date, "now").mockReturnValue(PROXY_NOW - 6 * 60 * 60_000); @@ -1166,14 +1324,15 @@ test("Logs: aborting an in-flight refresh before pausing cannot replace the acce const clock = trackFilterClock(); globalThis.fetch = (async (input, init) => { if (!String(input).includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); + urls.push(String(input)); requests++; if (requests === 2) { lateSignal = init?.signal ?? undefined; return late.response; } - return jsonResponse(proxyLogEnvelope(PROXY_NOW, [ + return jsonResponse(cursorLogEnvelope(PROXY_NOW, String(input).includes("cursor=") ? [] : [ { ...sampleLog, requestId: "current", timestamp: PROXY_NOW - 60_000 }, - ])); + ], "accepted-cursor")); }) as typeof fetch; let mounted: Awaited> | undefined; try { @@ -1187,7 +1346,7 @@ test("Logs: aborting an in-flight refresh before pausing cannot replace the acce await flushMicrotasks(); expect(lateSignal?.aborted).toBe(true); const pausedRequests = requests; - await act(async () => { late.resolve(proxyLogEnvelope(PROXY_NOW + 12 * 60 * 60_000, [])); }); + await act(async () => { late.resolve(cursorLogEnvelope(PROXY_NOW + 12 * 60 * 60_000, [], "poison", true)); }); await flushMicrotasks(); expect(visibleRequestIds(container)).toEqual(["current"]); monotonic += 30_000; @@ -1195,6 +1354,9 @@ test("Logs: aborting an in-flight refresh before pausing cannot replace the acce await flushMicrotasks(); expect(visibleRequestIds(container)).toEqual(["current"]); expect(requests).toBe(pausedRequests); + await act(async () => { container.querySelector(".logs-auto-refresh input")!.click(); }); + await advanceSilentRefresh(); + expect(urls.at(-1)).toContain("cursor=accepted-cursor"); } finally { try { if (mounted) await act(async () => { mounted!.root.unmount(); }); @@ -1244,7 +1406,7 @@ test("Logs: a pending refresh reconciles the user's latest selection rather than globalThis.fetch = (async input => { if (!String(input).includes("/api/logs")) return jsonResponse({ timeZone: "UTC" }); requests++; - return requests === 1 ? jsonResponse(original) : late.response; + return requests === 1 ? jsonResponse(cursorLogEnvelope(PROXY_NOW, original, "initial")) : late.response; }) as typeof fetch; const { root, container } = await mountLogs(); try { @@ -1258,10 +1420,10 @@ test("Logs: a pending refresh reconciles the user's latest selection rather than await changeLogSelect(container, "Status", "errors"); expect(visibleRequestIds(container)).toEqual(["b"]); await act(async () => { - late.resolve([ + late.resolve(cursorLogEnvelope(PROXY_NOW, [ { ...original[0]!, requestId: "other", model: "model-other" }, { ...original[1]!, requestId: "current", model: "MODEL-B", provider: "XAI" }, - ]); + ], "replaced", true)); }); await flushMicrotasks(); expect(container.querySelector('select[aria-label="Model"]')!.value).toBe("MODEL-B"); diff --git a/src/server/management/logs-usage-routes.ts b/src/server/management/logs-usage-routes.ts index dfb3c74df0..ecbd6f655d 100644 --- a/src/server/management/logs-usage-routes.ts +++ b/src/server/management/logs-usage-routes.ts @@ -66,6 +66,7 @@ import { import type { OcxClaudeCodeConfig, OcxConfig, OcxCustomModel, OcxProviderConfig } from "../../types"; import { drainAndShutdown } from "../lifecycle"; import { filterRequestLogs, filteredRequestLogCount, getRequestLogEntries, type RequestLogEntry } from "../request-log"; +import { decodeRequestLogCursor, selectRequestLogPoll } from "../request-log-cursor"; import { estimateComboCost, estimateRequestCost, normalizeCostTokens, tokensPerSecond } from "../../usage/cost"; import { userCostOverlayVersion } from "../../usage/user-cost-overlays"; import type { PersistedUsageAttempt } from "../../usage/log"; @@ -106,14 +107,20 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise MAX_CURSOR_LENGTH || !/^[A-Za-z0-9_-]+$/.test(raw)) return null; + try { + const bytes = Buffer.from(raw, "base64url"); + if (bytes.toString("base64url") !== raw) return null; + const value: unknown = JSON.parse(bytes.toString("utf8")); + if (!value || typeof value !== "object" || Array.isArray(value)) return null; + const row = value as Record; + const keys = Object.keys(row).sort().join(","); + if (row.v === 1 && keys === "id,t,v" + && typeof row.t === "number" && Number.isFinite(row.t) && row.t >= 0 + && typeof row.id === "string" && row.id.length > 0 && row.id.length <= 256) { + return { v: 1, t: row.t, id: row.id }; + } + if (row.v !== 2 || keys !== "e,h,n,q,v" + || typeof row.e !== "string" || !/^[a-f0-9]{32}$/.test(row.e) + || typeof row.n !== "number" || !Number.isSafeInteger(row.n) || row.n < 0 || row.n > MAX_WINDOW_ROWS + || typeof row.q !== "string" || !/^[a-f0-9]{64}$/.test(row.q) + || typeof row.h !== "string" || !/^[a-f0-9]{64}$/.test(row.h)) return null; + return { v: 2, e: row.e, n: row.n, q: row.q, h: row.h }; + } catch { + return null; + } +} + +/** + * Compare the current projected window, not ring identities: live entries and + * display-time pricing can change without append. This saves response bytes for + * stable prefixes; DTO projection and hashing still cost O(window bytes). + * No per-client rows or history are retained. The route calls this synchronously + * after projecting the full filtered/paginated window. + */ +export function selectRequestLogPoll( + rows: readonly T[], + params: URLSearchParams, + cursor: RequestLogCursor | null, + epoch = processEpoch, +): { logs: T[]; cursor: string; reset: boolean } { + const query = new URLSearchParams(params); + query.delete("cursor"); + query.sort(); + const queryDigest = createHash("sha256").update(query.toString()).digest("hex"); + const candidate = cursor?.v === 2 && cursor.e === epoch && cursor.q === queryDigest + && cursor.n <= rows.length ? cursor : null; + const full = createHash("sha256"); + const prefix = createHash("sha256"); + for (let index = 0; index < rows.length; index++) { + // JSON escapes embedded newlines, so the delimiter frames each whole row. + const serialized = JSON.stringify(rows[index]) + "\n"; + full.update(serialized); + if (candidate && index < candidate.n) prefix.update(serialized); + } + const unchangedPrefix = candidate !== null && prefix.digest("hex") === candidate.h; + const next: SnapshotCursor = { v: 2, e: epoch, n: rows.length, q: queryDigest, h: full.digest("hex") }; + return { + logs: rows.slice(unchangedPrefix ? candidate.n : 0), + cursor: Buffer.from(JSON.stringify(next)).toString("base64url"), + reset: cursor !== null && !unchangedPrefix, + }; +} diff --git a/tests/server/management-api-logs-metrics.test.ts b/tests/server/management-api-logs-metrics.test.ts index 76fbd8024e..f811810809 100644 --- a/tests/server/management-api-logs-metrics.test.ts +++ b/tests/server/management-api-logs-metrics.test.ts @@ -7,6 +7,7 @@ import { usageLogPath } from "../../src/usage/log"; import { addRequestLog, clearRequestLogsForTests, + evictOldestRequestLogForBudget, getRequestLogEntries, type RequestLogEntry, } from "../../src/server/request-log"; @@ -14,6 +15,30 @@ import type { OcxConfig } from "../../src/types"; import { buildRouteDecisionTrace } from "../../src/routing/trace"; import { summarizeUsage } from "../../src/usage/summary"; import { removeTreeWithRetry } from "../helpers/remove-tree"; +import { refreshUserCostOverlays } from "../../src/usage/user-cost-overlays"; + +interface LogPollEnvelope { + logs: Array>; + cursor: string; + reset: boolean; + generatedAt: number; + timeZone: string; + total: number; +} + +async function readLogPoll(query = "", cursor?: string): Promise { + const url = new URL(`http://localhost/api/logs?${query}`); + if (cursor) url.searchParams.set("cursor", cursor); + const before = Date.now(); + const response = await handleManagementAPI(new Request(url), url, config); + expect(response?.status).toBe(200); + const body = await response!.json() as LogPollEnvelope; + expect(body.generatedAt).toBeGreaterThanOrEqual(before); + expect(body.generatedAt).toBeLessThanOrEqual(Date.now()); + expect(body.timeZone).toBe(Intl.DateTimeFormat().resolvedOptions().timeZone); + expect(typeof body.cursor).toBe("string"); + return body; +} const config = { providers: [] } as unknown as OcxConfig; @@ -294,3 +319,115 @@ describe("GET /api/logs display metrics", () => { }); }); import { ManagementRequest as Request } from "../helpers/management-auth"; + + +describe("GET /api/logs snapshot polling", () => { + beforeEach(() => clearRequestLogsForTests()); + + test("poll application equals full reads across append, nested live mutation, eviction and clear", async () => { + let accepted: Array> = []; + let cursor: string | undefined; + const check = async (reset: boolean, deltaLength: number) => { + const poll = await readLogPoll("limit=2000", cursor); + expect(poll.reset).toBe(reset); + expect(poll.logs).toHaveLength(deltaLength); + accepted = !cursor || poll.reset ? poll.logs : [...accepted, ...poll.logs]; + const snapshot = await readLogPoll("limit=2000"); + expect(accepted).toEqual(snapshot.logs); + expect(poll.total).toBe(snapshot.total); + cursor = poll.cursor; + }; + await check(false, 0); + addRequestLog(baseEntry({ requestId: "older", usage: { inputTokens: 10, outputTokens: 5 } })); + await check(false, 1); + await check(false, 0); + addRequestLog(baseEntry({ requestId: "newest", firstOutputMs: 4 })); + await check(false, 1); + getRequestLogEntries()[0]!.usage!.outputTokens = 15; + await check(true, 2); + getRequestLogEntries()[1]!.status = 500; + delete getRequestLogEntries()[1]!.firstOutputMs; + await check(true, 2); + getRequestLogEntries()[0]!.attempts = [{ + ordinal: 1, provider: "anthropic", model: "claude-3-haiku-20240307", adapter: "anthropic", + status: 200, durationMs: 50, sendCount: 1, recoveryKinds: [], usageStatus: "reported", + usage: { inputTokens: 10, outputTokens: 5 }, + }]; + await check(true, 2); + getRequestLogEntries()[0]!.attempts![0]!.usage!.outputTokens = 20; + await check(true, 2); + // The newest cursor anchor survives this real memory-budget eviction. + evictOldestRequestLogForBudget(); + await check(true, 1); + clearRequestLogsForTests(); + await check(true, 0); + await check(false, 0); + }); + + test("pagination/filter changes and shifted windows reset against the full filtered snapshot", async () => { + for (const [requestId, provider] of [["a", "anthropic"], ["b", "openai"], ["c", "anthropic"]] as const) { + addRequestLog(baseEntry({ requestId, provider })); + } + let query = "provider=anthropic&limit=1&offset=1"; + const initial = await readLogPoll(query); + expect(initial.logs.map(row => row.requestId)).toEqual(["a"]); + expect(initial.total).toBe(2); + addRequestLog(baseEntry({ requestId: "d", provider: "anthropic" })); + let poll = await readLogPoll(query, initial.cursor); + expect(poll.reset).toBe(true); + expect(poll.logs).toEqual((await readLogPoll(query)).logs); + expect(poll.logs.map(row => row.requestId)).toEqual(["c"]); + expect(poll.total).toBe(3); + for (const changed of ["provider=openai&limit=1", "tail=2&limit=1", "model=absent", "status=5xx", "conversation=absent"]) { + query = changed; + poll = await readLogPoll(query, poll.cursor); + const full = await readLogPoll(query); + expect(poll.reset).toBe(true); + expect(poll.logs).toEqual(full.logs); + expect(poll.total).toBe(full.total); + } + const filtered = await readLogPoll("provider=openai"); + addRequestLog(baseEntry({ requestId: "not-in-filter", provider: "anthropic" })); + expect(await readLogPoll("provider=openai", filtered.cursor)) + .toMatchObject({ logs: [], reset: false, cursor: filtered.cursor, total: 1 }); + }); + + test("display-time cost changes reset even when raw entries are unchanged", async () => { + const priceConfig: OcxConfig = { port: 0, defaultProvider: "fixture", providers: { fixture: { + adapter: "openai-chat", baseUrl: "https://example.test/v1", models: ["fixture-model"], + modelCosts: { "fixture-model": { input: 1, output: 2, cacheRead: 0, cacheWrite: 0 } }, + } } }; + try { + refreshUserCostOverlays(priceConfig); + addRequestLog(baseEntry({ provider: "fixture", model: "fixture-model", usage: { inputTokens: 100, outputTokens: 10 } })); + const initial = await readLogPoll(); + const rawBefore = structuredClone(getRequestLogEntries()); + priceConfig.providers.fixture!.modelCosts!["fixture-model"]!.output = 20; + refreshUserCostOverlays(priceConfig); + const changed = await readLogPoll("", initial.cursor); + expect(changed.reset).toBe(true); + expect(changed.logs[0]!.displayMetrics).not.toEqual(initial.logs[0]!.displayMetrics); + expect(changed.logs).toEqual((await readLogPoll()).logs); + expect(getRequestLogEntries()).toEqual(rawBefore); + } finally { + refreshUserCostOverlays(config); + } + }); + + test("legacy cursors reset; invalid cursors return generic errors without reflecting input", async () => { + addRequestLog(baseEntry({ requestId: "private-row" })); + const legacy = Buffer.from(JSON.stringify({ v: 1, t: 1, id: "private-row" })).toString("base64url"); + const poll = await readLogPoll("provider=anthropic", legacy); + expect(poll.reset).toBe(true); + const payload = Buffer.from(poll.cursor, "base64url").toString(); + expect(payload).not.toContain("private-row"); + expect(payload).not.toContain("anthropic"); + for (const cursor of ["", "private-invalid-cursor", "x".repeat(513)]) { + const url = new URL("http://localhost/api/logs"); + url.searchParams.set("cursor", cursor); + const response = await handleManagementAPI(new Request(url), url, config); + expect(response?.status).toBe(400); + expect(await response!.json()).toEqual({ error: { code: "invalid_cursor", message: "invalid cursor" } }); + } + }); +}); diff --git a/tests/server/server-management-auth.test.ts b/tests/server/server-management-auth.test.ts index c1bc56f70a..340ad70bd3 100644 --- a/tests/server/server-management-auth.test.ts +++ b/tests/server/server-management-auth.test.ts @@ -1652,3 +1652,63 @@ describe("codex app-server restart routes ride the management gate", () => { } }); }); + + +test("log cursors remain behind management admission and origin gates", async () => { + const config = remoteConfig(); + saveConfig(config); + const state = initializeManagementAuthState(config); + if (!state.available) throw new Error("expected management auth state"); + const server = startServer(0, { managementAuthState: state }); + const origin = server.url.origin; + const token = "ocx_session_log_cursor_test"; + state.sessions.set(token, { + serverOrigin: origin, browserOrigin: origin, csrfToken: "csrf-log-test", + expiresAt: Date.now() + 60_000, issuance: "loopback", + }); + const adminHeaders = { "x-opencodex-api-key": "admin-secret" }; + const acceptedHeaders: HeadersInit[] = [adminHeaders, { + Origin: origin, "x-opencodex-api-key": token, "x-opencodex-gui-origin": origin, + }]; + try { + const initial = await fetch(new URL("/api/logs", server.url), { headers: adminHeaders }); + expect(initial.status).toBe(200); + const body = await initial.json() as { cursor: string }; + expect(typeof body.cursor).toBe("string"); + for (const suffix of ["", `?cursor=${body.cursor}`, "?cursor=malformed"]) { + const url = new URL(`/api/logs${suffix}`, server.url); + for (const credential of [undefined, "data-secret", "wrong-admin"]) { + const response = await fetch(url, { headers: credential ? { "x-opencodex-api-key": credential } : {} }); + expect(response.status).toBe(401); + expect(await response.json()).toEqual({ error: "opencodex admin token required" }); + } + const foreign = await fetch(url, { headers: { ...adminHeaders, Origin: "https://attacker.test" } }); + expect(foreign.status).toBe(403); + await foreign.text(); + for (const headers of acceptedHeaders) { + const allowed = await fetch(url, { headers }); + expect(allowed.status).toBe(suffix.includes("malformed") ? 400 : 200); + await allowed.text(); + } + } + } finally { + await server.stop(true); + } +}, SERVER_BUDGET_MS); + +test("unavailable management authority rejects log cursors before parsing", async () => { + saveConfig(remoteConfig()); + const server = startServer(0, { managementAuthState: { available: false, reason: "fixture unavailable" } }); + try { + const legacy = Buffer.from(JSON.stringify({ v: 1, t: 1, id: "fixture" })).toString("base64url"); + for (const suffix of ["", `?cursor=${legacy}`, "?cursor=malformed"]) { + const response = await fetch(new URL(`/api/logs${suffix}`, server.url), { + headers: { "x-opencodex-api-key": "admin-secret" }, + }); + expect(response.status).toBe(503); + expect(await response.json()).toMatchObject({ error: "management API unavailable" }); + } + } finally { + await server.stop(true); + } +}, SERVER_BUDGET_MS); diff --git a/tests/usage/request-log.test.ts b/tests/usage/request-log.test.ts index 02e26e764b..1a3b4e3264 100644 --- a/tests/usage/request-log.test.ts +++ b/tests/usage/request-log.test.ts @@ -38,6 +38,7 @@ import { mkdtempSync} from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { removeTreeWithRetry } from "../helpers/remove-tree"; +import { decodeRequestLogCursor, selectRequestLogPoll } from "../../src/server/request-log-cursor"; async function* replayAdapterEvents(events: AdapterEvent[]): AsyncGenerator { for (const event of events) yield event; @@ -1808,3 +1809,97 @@ describe("request log restart hydrate", () => { } }); }); + + +describe("request log snapshot cursor", () => { + const epoch = "a".repeat(32); + const query = new URLSearchParams("limit=2000"); + const encode = (value: unknown) => Buffer.from(JSON.stringify(value)).toString("base64url"); + + test("codec bounds and canonical encoding reject malformed or type-confused input", () => { + const poll = selectRequestLogPoll([], query, null, epoch); + const payload = JSON.parse(Buffer.from(poll.cursor, "base64url").toString()); + expect(decodeRequestLogCursor(poll.cursor)).toEqual(payload); + for (const raw of ["", "!", "a".repeat(513), `${poll.cursor}=`, ` ${poll.cursor}`, + encode(null), encode([]), encode({ ...payload, v: 3 }), encode({ ...payload, n: -1 }), + encode({ ...payload, n: 2001 }), encode({ ...payload, n: 0.5 }), encode({ ...payload, n: "0" }), + encode({ ...payload, h: "x".repeat(64) }), encode({ ...payload, q: null }), + encode({ ...payload, e: "short" }), encode({ ...payload, extra: true }), + encode({ v: 1, t: -1, id: "row" }), encode({ v: 1, t: 1, id: "" }), + encode({ v: 1, t: "1", id: "row" }), encode({ v: 1, t: 1, id: "x".repeat(257) })]) { + expect(decodeRequestLogCursor(raw)).toBeNull(); + } + const legacy = decodeRequestLogCursor(encode({ v: 1, t: 1, id: "row" })); + expect(legacy).toEqual({ v: 1, t: 1, id: "row" }); + expect(selectRequestLogPoll([], query, legacy, epoch).reset).toBe(true); + }); + + test("stable empty and populated snapshots produce empty deltas, appends preserve repeated IDs", () => { + const empty = selectRequestLogPoll([], query, null, epoch); + expect(empty.reset).toBe(false); + expect(selectRequestLogPoll([], query, decodeRequestLogCursor(empty.cursor), epoch)).toEqual(empty); + const rows = [log({ requestId: "same" })]; + const first = selectRequestLogPoll(rows, query, decodeRequestLogCursor(empty.cursor), epoch); + expect(first.logs).toEqual(rows); + const cursor = decodeRequestLogCursor(first.cursor); + expect(selectRequestLogPoll(rows, query, cursor, epoch)).toEqual({ ...first, logs: [] }); + rows.push(log({ requestId: "same", status: 500 })); + expect(selectRequestLogPoll(rows, query, cursor, epoch)).toMatchObject({ logs: [rows[1]], reset: false }); + }); + + test("in-place older/newest/nested changes, field removal, reorder and eviction reset the whole window", () => { + const original = [ + log({ requestId: "older", usage: { inputTokens: 10, outputTokens: 5 }, firstOutputMs: 3 }), + log({ requestId: "newest" }), + ]; + const cursor = decodeRequestLogCursor(selectRequestLogPoll(original, query, null, epoch).cursor); + const mutations: Array<(rows: RequestLogEntry[]) => void> = [ + rows => { rows[0]!.status = 500; }, + rows => { rows[1]!.durationMs = 22; }, + rows => { rows[0]!.usage!.outputTokens = 6; }, + rows => { delete rows[0]!.firstOutputMs; }, + rows => { rows[0] = log({ requestId: "replacement" }); }, + rows => { rows.reverse(); }, + rows => { rows.shift(); }, + rows => { rows.length = 0; }, + ]; + for (const mutate of mutations) { + const rows = structuredClone(original); + mutate(rows); + expect(selectRequestLogPoll(rows, query, cursor, epoch)).toMatchObject({ logs: rows, reset: true }); + } + // Same hydrated IDs and values do not make an old process cursor valid. + expect(selectRequestLogPoll(original, query, cursor, "b".repeat(32))) + .toMatchObject({ logs: original, reset: true }); + }); + + test("query identity ignores cursor and parameter ordering but binds filters and pagination", () => { + const rows = [log({ requestId: "private-row", conversationId: "private-conversation" })]; + const first = selectRequestLogPoll(rows, new URLSearchParams("provider=private-provider&limit=1"), null, epoch); + const cursor = decodeRequestLogCursor(first.cursor); + const raw = Buffer.from(first.cursor, "base64url").toString(); + for (const value of ["private-row", "private-conversation", "private-provider"]) expect(raw).not.toContain(value); + expect(selectRequestLogPoll(rows, new URLSearchParams(`limit=1&cursor=${first.cursor}&provider=private-provider`), cursor, epoch).logs) + .toEqual([]); + for (const changed of ["provider=other&limit=1", "provider=private-provider&limit=2", "provider=private-provider&limit=1&offset=1"]) { + expect(selectRequestLogPoll(rows, new URLSearchParams(changed), cursor, epoch).reset).toBe(true); + } + const duplicated = selectRequestLogPoll(rows, new URLSearchParams("provider=a&provider=b"), null, epoch); + expect(selectRequestLogPoll(rows, new URLSearchParams("provider=b&provider=a"), decodeRequestLogCursor(duplicated.cursor), epoch).reset) + .toBe(true); + }); + + test("a full-window rollover resets; a stale fingerprint cannot suppress current rows", () => { + const rows = Array.from({ length: 2000 }, (_, index) => log({ requestId: `row-${index}`, timestamp: 2000 - index })); + const initial = selectRequestLogPoll(rows, query, null, epoch); + const cursor = decodeRequestLogCursor(initial.cursor); + expect(cursor).toMatchObject({ v: 2, n: 2000 }); + rows.shift(); + rows.push(log({ requestId: "new", timestamp: 0 })); + expect(selectRequestLogPoll(rows, query, cursor, epoch)).toMatchObject({ logs: rows, reset: true }); + const payload = JSON.parse(Buffer.from(initial.cursor, "base64url").toString()); + const stale = decodeRequestLogCursor(encode({ ...payload, h: "0".repeat(64) })); + expect(stale).not.toBeNull(); + expect(selectRequestLogPoll(rows, query, stale, epoch)).toMatchObject({ logs: rows, reset: true }); + }); +}); From ff5996d97fbffb889cd144d82ad9628560a55967 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 02:01:21 +0900 Subject: [PATCH 013/221] fix(config): add exclusive initial configuration publication [skip ci] Reimplement #3632 with private hardening before bytes, no-replace hard-link publication, descriptor-identity cleanup and no truncation of shared/published inodes. Existing saveConfig updates remain unchanged. Consumer follows in the next stack layer; final CI pending. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi --- src/config.ts | 51 +++++- src/config/initialize.ts | 132 +++++++++++++++ tests/config/config-mutation-lock.test.ts | 190 +++++++++++++++++++++- 3 files changed, 370 insertions(+), 3 deletions(-) create mode 100644 src/config/initialize.ts diff --git a/src/config.ts b/src/config.ts index 728b3969ea..d5ef05c33f 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,5 +1,5 @@ import { createHash } from "node:crypto"; -import { chmodSync, constants as fsConstants, copyFileSync, existsSync, linkSync, mkdirSync, readFileSync, truncateSync, unlinkSync, writeFileSync } from "node:fs"; +import { chmodSync, constants as fsConstants, copyFileSync, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, truncateSync, unlinkSync, writeFileSync } from "node:fs"; import { dirname, join } from "node:path"; import { Database } from "bun:sqlite"; import * as z from "zod/v4"; @@ -123,6 +123,7 @@ export { type AtomicWriteIO, } from "./config/atomic-write"; import { getConfigDir, getConfigPath, hardenConfigDir } from "./config/paths"; +import { InitialConfigPublicationError, publishInitialConfigNoReplace, type InitialConfigPublicationIO } from "./config/initialize"; import { describeProxyForLog, readWindowsSystemProxy, @@ -2811,6 +2812,16 @@ export function readConfigDiagnostics(): ConfigDiagnostics { return readConfigFileSnapshot().diagnostics; } +/** Read-only init preflight. Occupied unsafe entries are never treated as absence. */ +export function observeInitialConfigState(): "missing" | "exists" | "invalid" { + try { + if (!lstatSync(getConfigPath()).isFile()) return "invalid"; + } catch (error) { + return isMissingPathError(error) ? "missing" : "invalid"; + } + return readConfigFileSnapshot().diagnostics.source === "file" ? "exists" : "invalid"; +} + /** * The persisted config, plus a digest of the EXACT bytes it was parsed from. * @@ -3123,6 +3134,44 @@ function persistConfigUnlocked(config: OcxConfig): boolean { return true; } +export type PersistedConfigInitializationOutcome = "created" | "exists" | "invalid"; + +/** Initialize only a missing config; ordinary explicit updates still use saveConfig. */ +export function initializePersistedConfigIfMissing( + config: OcxConfig, + io?: Partial, +): PersistedConfigInitializationOutcome { + assertNotRealHomeUnderTest(getConfigDir()); + const before = observeInitialConfigState(); + if (before !== "missing") return before; + let published = false; + try { + const persisted = withConfigMutationLockSync((): OcxConfig | "exists" | "invalid" => { + const current = observeInitialConfigState(); + if (current !== "missing") return current; + const projected = projectCustomModelCatalogMigration(undefined, projectConfigRebaseProvenance(config)); + if (!validateConfigCandidate(projected).ok) throw new Error("Initial configuration is invalid."); + if (!publishInitialConfigNoReplace(getConfigPath(), JSON.stringify(projected, null, 2) + "\n", io)) { + return observeInitialConfigState() === "exists" ? "exists" : "invalid"; + } + published = true; + recordOwnedConfigPath(getConfigDir(), getConfigPath()); + bumpGenerationForCooperatingConfigWrite(); + return projected; + }); + if (typeof persisted === "string") return persisted; + adoptCustomModelCatalogMigration(config, persisted); + if (persisted.configRebaseProvenance === undefined) delete config.configRebaseProvenance; + else config.configRebaseProvenance = structuredClone(persisted.configRebaseProvenance); + clearPendingConfigTopLevelDeletions(config); + refreshUserCostOverlays(persisted); + return "created"; + } catch (cause) { + if (published) throw new InitialConfigPublicationError("published", false, false, { cause }); + throw cause; + } +} + /** Persist `config` to config.json under the config-mutation lock. */ export function saveConfig(config: OcxConfig): void { // Keep the real-home assertion ahead of even lock-directory preparation. diff --git a/src/config/initialize.ts b/src/config/initialize.ts new file mode 100644 index 0000000000..864b09b036 --- /dev/null +++ b/src/config/initialize.ts @@ -0,0 +1,132 @@ +import { + closeSync, constants, fchmodSync, fstatSync, linkSync, lstatSync, + openSync, unlinkSync, writeFileSync, +} from "node:fs"; +import { dirname } from "node:path"; +import { assertNotRealHomeUnderTest } from "../lib/test-home-guard"; +import { forgetEphemeralSecretPath, hardenSecretPath } from "../lib/windows-secret-acl"; +import { isMissingPathError, nextAtomicTempSequence } from "./atomic-write"; + +type PublicationState = "not-published" | "published" | "uncertain"; + +/** Messages contain no candidate bytes or raw filesystem error text. */ +export class InitialConfigPublicationError extends Error { + constructor( + readonly publication: PublicationState, + readonly residualTemp: boolean, + readonly hardLinkUnavailable: boolean, + options?: ErrorOptions, + ) { + super(hardLinkUnavailable + ? "Initial config requires hard-link publication; the filesystem or its permissions denied it." + : "Initial config publication did not finish.", options); + this.name = "InitialConfigPublicationError"; + } +} + +/** Narrow fault boundary; publication must be a single link operation. */ +export interface InitialConfigPublicationIO { + harden(fd: number, temp: string, target: string): void; + write(fd: number, bytes: string): void; + link(temp: string, target: string): void; + unlink(temp: string): void; + close(fd: number): void; +} + +function hardenInitialConfig(fd: number, temp: string, target: string): void { + if (process.platform === "win32") { + hardenSecretPath(temp, { required: true, timeoutMemoKey: target }); + } else { + fchmodSync(fd, 0o600); + } +} + +function identifiesDescriptor(fd: number, path: string): boolean { + const opened = fstatSync(fd); + const entry = lstatSync(path); + return opened.isFile() && entry.isFile() + && opened.dev === entry.dev && opened.ino === entry.ino; +} + +function verifyPrivateTemp(fd: number, temp: string): void { + if (!identifiesDescriptor(fd, temp) + || (process.platform !== "win32" && (fstatSync(fd).mode & 0o777) !== 0o600)) { + throw new Error("Initial config temporary file identity or permissions changed."); + } +} + +function removeOwnedTemp(fd: number, temp: string, unlink: (path: string) => void): boolean { + for (let attempt = 0; attempt < 2; attempt++) { + try { + if (!identifiesDescriptor(fd, temp)) return false; + unlink(temp); + forgetEphemeralSecretPath(temp); + return true; + } catch (error) { + if (isMissingPathError(error)) { + forgetEphemeralSecretPath(temp); + return true; + } + } + } + return false; +} + +/** + * Publish complete bytes without replacing any entry at target. Never truncate: + * even an error from link can mean a remote filesystem already published the inode. + * Cleanup removes only our temporary name, never the target or another inode. + */ +export function publishInitialConfigNoReplace( + target: string, + bytes: string, + io: Partial = {}, +): boolean { + assertNotRealHomeUnderTest(dirname(target)); + const temp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`; + let fd: number | undefined; + let publication: PublicationState = "not-published"; + let collided = false; + let failure: unknown; + let failed = false; + let hardLinkUnavailable = false; + let residualTemp = false; + try { + fd = openSync(temp, constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL, 0o600); + (io.harden ?? hardenInitialConfig)(fd, temp, target); + verifyPrivateTemp(fd, temp); + (io.write ?? ((descriptor: number, value: string) => writeFileSync(descriptor, value, { encoding: "utf8" })))(fd, bytes); + verifyPrivateTemp(fd, temp); + try { + publication = "uncertain"; + (io.link ?? linkSync)(temp, target); + publication = "published"; + } catch (error) { + const code = (error as NodeJS.ErrnoException | undefined)?.code; + // EEXIST normally means a competitor won. A shared target means our + // publication may nevertheless have happened (e.g. a remote FS retry). + if (code === "EEXIST" && !identifiesDescriptor(fd, target)) collided = true; + else { + hardLinkUnavailable = ["EOPNOTSUPP", "ENOTSUP", "ENOSYS", "EXDEV", "EPERM"].includes(code ?? ""); + throw error; + } + } + if (!collided && !identifiesDescriptor(fd, target)) { + throw new Error("Initial config published target identity changed."); + } + } catch (error) { + failed = true; + failure = error; + } finally { + if (fd !== undefined) { + // Unlink-only cleanup preserves all bytes if another name shares this inode. + residualTemp = !removeOwnedTemp(fd, temp, io.unlink ?? unlinkSync); + try { (io.close ?? closeSync)(fd); } + catch (error) { if (!failed) failure = error; failed = true; } + } + } + if (failed || residualTemp) { + throw new InitialConfigPublicationError(publication, residualTemp, hardLinkUnavailable, { cause: failure }); + } + return !collided; +} diff --git a/tests/config/config-mutation-lock.test.ts b/tests/config/config-mutation-lock.test.ts index c0b37c28b4..32e305c321 100644 --- a/tests/config/config-mutation-lock.test.ts +++ b/tests/config/config-mutation-lock.test.ts @@ -1,8 +1,10 @@ import { afterEach, beforeEach, expect, test } from "bun:test"; -import { existsSync, mkdtempSync, writeFileSync } from "node:fs"; +import { closeSync, existsSync, linkSync, lstatSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs"; import { join } from "node:path"; import { pathToFileURL } from "node:url"; -import { ConfigMutationLockError, loadConfig, saveConfig, withConfigMutationLockSync } from "../../src/config"; +import { ConfigMutationLockError, deleteConfigTopLevelKey, getConfigPath, initializePersistedConfigIfMissing, loadConfig, observeInitialConfigState, readConfigGeneration, saveConfig, withConfigMutationLockSync } from "../../src/config"; +import { InitialConfigPublicationError, publishInitialConfigNoReplace } from "../../src/config/initialize"; +import { nextAtomicTempSequence } from "../../src/config/atomic-write"; import { CodexCredentialRefreshLockTimeoutError, getCodexAccountCredential, saveCodexAccountCredential } from "../../src/codex/account-store"; import type { OcxConfig } from "../../src/types"; import { ManagementRequest, managementHeaders } from "../helpers/management-auth"; @@ -79,6 +81,11 @@ test("a live cross-process holder is not stolen and runtime writers fail immedia } const startedAt = performance.now(); expect(() => saveConfig(config(20200))).toThrow(ConfigMutationLockError); + // A busy initializer must not steal the holder even when its target is absent. + unlinkSync(getConfigPath()); + expect(() => initializePersistedConfigIfMissing(config(20200))).toThrow(ConfigMutationLockError); + expect(existsSync(getConfigPath())).toBe(false); + writeFileSync(getConfigPath(), JSON.stringify(config())); expect(() => saveCodexAccountCredential("busy-account", { accessToken: "busy-access", refreshToken: "busy-refresh", @@ -139,6 +146,185 @@ test("a throwing mutation releases the lock and leaves writers available", () => expect(loadConfig().port).toBe(50500); }); +const initTemps = () => readdirSync(testRoot).filter(name => name.includes(".ocx.") && name.endsWith(".tmp")); + +test("initial creation keeps candidate values and existing bytes; the explicit saver still updates", () => { + const candidate = { ...config(21001), operatorNote: "keep unknown fields" }; + expect(initializePersistedConfigIfMissing(candidate)).toBe("created"); + expect(JSON.parse(readFileSync(getConfigPath(), "utf8"))).toEqual(candidate); + if (process.platform !== "win32") expect(lstatSync(getConfigPath()).mode & 0o777).toBe(0o600); + expect(readConfigGeneration()).toMatchObject({ generation: { value: 1 } }); + const bytes = readFileSync(getConfigPath(), "utf8"); + expect(initializePersistedConfigIfMissing(config(21002))).toBe("exists"); + expect(readFileSync(getConfigPath(), "utf8")).toBe(bytes); + saveConfig(config(21003)); + expect(loadConfig().port).toBe(21003); + expect(initTemps()).toEqual([]); +}); + +test.each(["", "not-json\n", '{"port":"broken"}', '\uFEFF{ "port":21002, "providers":{}, "defaultProvider":"openai", "unknown":42 }\n'])( + "init preserves occupied bytes without lock or backup creation: %j", bytes => { + writeFileSync(getConfigPath(), bytes); + const candidate = config(21001); + const original = structuredClone(candidate); + expect(initializePersistedConfigIfMissing(candidate)).toBe(bytes.startsWith("\uFEFF") ? "exists" : "invalid"); + expect(readFileSync(getConfigPath(), "utf8")).toBe(bytes); + expect(candidate).toEqual(original); + expect(readdirSync(testRoot)).toEqual(["config.json"]); + }, +); + +test("init refuses a directory and a dangling symlink without following either", () => { + mkdirSync(getConfigPath()); + expect(observeInitialConfigState()).toBe("invalid"); + expect(initializePersistedConfigIfMissing(config())).toBe("invalid"); + removeTreeWithRetry(getConfigPath()); + const absent = join(testRoot, "absent"); + symlinkSync(absent, getConfigPath(), "file"); + expect(initializePersistedConfigIfMissing(config())).toBe("invalid"); + expect(lstatSync(getConfigPath()).isSymbolicLink()).toBe(true); + expect(existsSync(absent)).toBe(false); +}); + +test("real link collision preserves the winner and does not advance generation or mutate the candidate", () => { + withConfigMutationLockSync(() => {}); + const generation = readConfigGeneration(); + const winner = JSON.stringify(config(21002)) + "\n"; + const candidate = config(21001); + const original = structuredClone(candidate); + expect(initializePersistedConfigIfMissing(candidate, { + link(temp, target) { + writeFileSync(target, winner, { flag: "wx" }); + linkSync(temp, target); + }, + })).toBe("exists"); + expect(readFileSync(getConfigPath(), "utf8")).toBe(winner); + expect(readConfigGeneration()).toEqual(generation); + expect(candidate).toEqual(original); + expect(initTemps()).toEqual([]); +}); + +test("exclusive temp collision does not remove or modify somebody else's file", () => { + const sequence = nextAtomicTempSequence() + 1; + const occupied = `${getConfigPath()}.ocx.${process.pid}.${sequence}.tmp`; + writeFileSync(occupied, "other staged bytes", { flag: "wx" }); + expect(() => publishInitialConfigNoReplace(getConfigPath(), "candidate bytes")).toThrow(InitialConfigPublicationError); + expect(readFileSync(occupied, "utf8")).toBe("other staged bytes"); + expect(existsSync(getConfigPath())).toBe(false); +}); + +test("failed hardening occurs before candidate bytes are written", () => { + let wrote = false; + expect(() => initializePersistedConfigIfMissing(config(), { + harden(_fd, temp) { + expect(readFileSync(temp, "utf8")).toBe(""); + throw new Error("ACL denied"); + }, + write() { wrote = true; }, + })).toThrow(InitialConfigPublicationError); + expect(wrote).toBe(false); + expect(existsSync(getConfigPath())).toBe(false); + expect(initTemps()).toEqual([]); +}); + +test("partial write failure removes only the unpublished temporary name", () => { + expect(() => initializePersistedConfigIfMissing(config(), { + write(fd, bytes) { writeFileSync(fd, bytes.slice(0, 10)); throw new Error("disk full"); }, + })).toThrow(InitialConfigPublicationError); + expect(existsSync(getConfigPath())).toBe(false); + expect(initTemps()).toEqual([]); +}); + +test.each(["EOPNOTSUPP", "ENOTSUP", "ENOSYS", "EXDEV", "EPERM"])("unsupported/denied link %s never falls back to replacement", code => { + try { + initializePersistedConfigIfMissing(config(), { + link() { throw Object.assign(new Error("do not print raw error"), { code }); }, + }); + throw new Error("expected link refusal"); + } catch (error) { + expect(error).toBeInstanceOf(InitialConfigPublicationError); + expect((error as InitialConfigPublicationError).hardLinkUnavailable).toBe(true); + } + expect(existsSync(getConfigPath())).toBe(false); + expect(initTemps()).toEqual([]); +}); + +test("a syscall error after a real link leaves the entire published candidate intact", () => { + const bytes = 'complete candidate bytes\n'; + expect(() => publishInitialConfigNoReplace(getConfigPath(), bytes, { + link(temp, target) { linkSync(temp, target); throw Object.assign(new Error("uncertain completion"), { code: "EIO" }); }, + })).toThrow(InitialConfigPublicationError); + expect(readFileSync(getConfigPath(), "utf8")).toBe(bytes); + expect(initTemps()).toEqual([]); +}); + +test("post-link identity failure cannot remove a concurrent replacement", () => { + expect(() => initializePersistedConfigIfMissing(config(21001), { + link(temp, target) { + linkSync(temp, target); + const replacement = join(testRoot, "replacement"); + writeFileSync(replacement, "concurrent-winner\n"); + renameSync(replacement, target); + }, + })).toThrow(InitialConfigPublicationError); + expect(readFileSync(getConfigPath(), "utf8")).toBe("concurrent-winner\n"); +}); + +test("cleanup failure retains full published/shared bytes and closes the descriptor", () => { + let closed = false; + let failure: unknown; + try { + publishInitialConfigNoReplace(getConfigPath(), "complete bytes", { + unlink() { throw new Error("sharing violation"); }, + close(fd) { closed = true; closeSync(fd); }, + }); + } catch (error) { failure = error; } + expect(failure).toMatchObject({ publication: "published", residualTemp: true }); + expect(closed).toBe(true); + expect(readFileSync(getConfigPath(), "utf8")).toBe("complete bytes"); + const temps = initTemps(); + expect(temps).toHaveLength(1); + expect(readFileSync(join(testRoot, temps[0]!), "utf8")).toBe("complete bytes"); +}); + +test("a shared unpublished inode is never scrubbed", () => { + const otherName = join(testRoot, "shared-candidate"); + expect(() => publishInitialConfigNoReplace(getConfigPath(), "candidate bytes", { + link(temp) { linkSync(temp, otherName); throw new Error("publication failed"); }, + })).toThrow(InitialConfigPublicationError); + expect(readFileSync(otherName, "utf8")).toBe("candidate bytes"); + expect(existsSync(getConfigPath())).toBe(false); + expect(initTemps()).toEqual([]); +}); + +test("a swapped temporary symlink is neither written through nor removed as our inode", () => { + const victim = join(testRoot, "victim"); + writeFileSync(victim, "untouched"); + expect(() => publishInitialConfigNoReplace(getConfigPath(), "candidate bytes", { + harden(_fd, temp) { unlinkSync(temp); symlinkSync(victim, temp, "file"); }, + })).toThrow(InitialConfigPublicationError); + expect(readFileSync(victim, "utf8")).toBe("untouched"); + expect(existsSync(getConfigPath())).toBe(false); + expect(lstatSync(join(testRoot, initTemps()[0]!)).isSymbolicLink()).toBe(true); +}); + +test("descriptor close failure cannot scrub an already published config", () => { + expect(() => publishInitialConfigNoReplace(getConfigPath(), "complete bytes", { + close(fd) { closeSync(fd); throw new Error("close failed"); }, + })).toThrow(InitialConfigPublicationError); + expect(readFileSync(getConfigPath(), "utf8")).toBe("complete bytes"); +}); + +test("successful init adopts deletion provenance before a subsequent explicit save", () => { + const candidate = config(); + deleteConfigTopLevelKey(candidate, "hostname"); + expect(initializePersistedConfigIfMissing(candidate)).toBe("created"); + expect(candidate.configRebaseProvenance).toEqual({ version: 1, deletedTopLevelKeys: ["hostname"] }); + candidate.hostname = "127.0.0.1"; + saveConfig(candidate); + expect(JSON.parse(readFileSync(getConfigPath(), "utf8")).hostname).toBe("127.0.0.1"); +}); + test("management API maps config mutation lock contention to retryable 503", async () => { saveConfig(config()); const readyPath = join(testRoot, "mgmt-holder-ready"); From 6eec1265c756e406baa28688661d59e258aa7319 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 02:04:57 +0900 Subject: [PATCH 014/221] feat(models): save picker order without replacing the featured roster Reimplements the picker feature from #3383 against current catalog and discovery contracts. Preserves native/featured bands and documents native advertised-choice effects. Co-authored-by: x3M3x --- .../pr-screenshots/t4-model-picker-81a8.png | Bin 0 -> 365701 bytes .../content/docs/fr/guides/model-ordering.md | 10 +- .../src/content/docs/guides/model-ordering.md | 11 +- .../content/docs/ja/guides/model-ordering.md | 11 +- .../content/docs/ko/guides/model-ordering.md | 10 +- .../content/docs/ru/guides/model-ordering.md | 10 +- .../content/docs/tr/guides/model-ordering.md | 10 +- .../docs/zh-cn/guides/model-ordering.md | 10 +- .../docs/zh-tw/guides/model-ordering.md | 8 + gui/src/i18n/de.ts | 16 +- gui/src/i18n/en.ts | 16 +- gui/src/i18n/fr.ts | 16 +- gui/src/i18n/ja.ts | 16 +- gui/src/i18n/ko.ts | 16 +- gui/src/i18n/ru.ts | 16 +- gui/src/i18n/tr.ts | 16 +- gui/src/i18n/zh-TW.ts | 16 +- gui/src/i18n/zh.ts | 16 +- gui/src/model-picker-order.ts | 103 ++++++++++++ gui/src/pages/Models.tsx | 115 +++++++++++++- gui/tests/model-picker-order.test.ts | 57 +++++++ gui/tests/models-status-toast.test.tsx | 140 ++++++++++++++++ src/claude/model-info.ts | 16 +- src/codex/catalog.ts | 2 +- src/codex/catalog/sync.ts | 30 +++- src/server/index.ts | 2 + .../management/agent-settings-routes.ts | 119 ++++++++++++-- src/types/config.ts | 2 + structure/03_catalog-and-subagents.md | 15 ++ structure/05_gui-and-management-api.md | 24 +++ .../claude-desktop-discovery.test.ts | 20 ++- .../claude-model-info.test.ts | 26 +++ .../catalog-full-picker-order.test.ts | 21 ++- .../codex-catalog-model-picker-order.test.ts | 30 +++- .../routing/subagent-roster-retention.test.ts | 150 +++++++++++++++++- tests/server/config.test.ts | 16 ++ 36 files changed, 1067 insertions(+), 45 deletions(-) create mode 100644 docs-site/public/pr-screenshots/t4-model-picker-81a8.png create mode 100644 gui/src/model-picker-order.ts create mode 100644 gui/tests/model-picker-order.test.ts diff --git a/docs-site/public/pr-screenshots/t4-model-picker-81a8.png b/docs-site/public/pr-screenshots/t4-model-picker-81a8.png new file mode 100644 index 0000000000000000000000000000000000000000..0754aefc3ce1c0f2bd94b31100c282a264c5ef9a GIT binary patch literal 365701 zcmb@u1yogC*ES5IpfpHGi+~77iPWK#Zjh9gkZ$Ql8l<~ZK)Smm1*E0BIdmMlzJ=cR z{XFkGzW0CL{~!MzLxvpBUVE*%=Dg-Luer7XveF`G$b`snaByg1qJna8a42u!;E*0Z zyazsc>O0O42M7PsNI*bV3l7d9DLRZt0^u#DFPXrbU#~MVd^)0yeo^Z1%A!1GHH?2D zSl_$)PzO7-H{itR8f(n%bMV7&W(D`@u!x-BmIUw3;^K$l#B1B7xY|$568O`T2j!&A z9?Xc>8vc@&4(^tDzTz3LG_GCoZS$1Az*R%rCDC|7L*iU*vDQglnXUb(FRa+L$j@c@ zD0n^c!v`OH{9`zrI6(uT}J)8z{ z892^3Kgx?5DCT9exH3LLw^W=|%aKHu5R0AUIBHhSGkyF;gSUk<-)HcD!m=1Hx+t7jZ;p*E-yj7kz7w9! z>b`+Tjgp!ou0_~@gTsUq6MU=SkhDFE^kJm)9^yhTy0&*X=2J}lN$owfj~0-Li!p`yMO&YHzR8~Nc-|SV*Tp-%9(m=?7}{C3T`rwd zzI5q&SR~hoj+GR`ks7j3<42Z!Kvp=oN6}}7RsESmA=%H*uapDbrojo(&7snQp~G_P zbItKwQq{w*@J62lw^U0vtE;&IN5y1@F88F}Zst{mDQ@Vng7y`gsG7SB99+$#_0*RR zmM_|<&dl&~B5KUSLgqOUiu0DIp2V4ib`ACW`K>hfGX`Lges#2*r6h^P(0hcRuyt52 zG5kxr-6*KWv5bb4aEg)#JqMmtb-U@2$kf!+LXx)$Ti8DjpMMr`@_H~#v?Sov#vp1@ z5-Y&*#>opSgu)qRWb9H9ZzmXHVrir1oantQ`hW@^&Lhx}tq~p$yJ3V#l{Nr>C;0qn zBe{zh_?7VU5w*T5_xUf)Jt>E`P68d?7?vC)ymt6xRid!Z+^;80bWnZc#}e2>D7Y3l z?mQZ<+82iCQUAtCz(v%8DOTX_E?gliPcV+CMK0W2uS%_=lb1i~g5|{^#=1%a=b+e4 zzT4!b=qI)I!lwqx$=$i-`q^j;b5j*8*ND{&{%U)DMnRUuoN3&W&E#%kac%++EQ!CR zQNqE=qGYkd&HP!XS1oZX$}myhi$IhlK4t+Yfd~7V{XMh8M1mV|NW(;I;1e*P2^1*W ziM4+@dEL=FwqIWlUF10k||hgtJR9fA^5bJGK*aSt}7f_9N44s zjT1tP1~4aY7JFPTdBfAj^uUaomh;CfcVF6DEtp|xd@I=O9az4=Vt=3=B*^$fz^m~& z;)gh+LdRu}GK3I{JEK~fh+4qafc3Wf!4N-jdgFt;-{IhMxa;`Be32I#lcJ}y+5OYt z(bq$6HgMeJ*^`%wjrGeyUsnswAX^)ct`gghbymO^85$GDyLqYMw-=tSRS0o}5X)0$ z&x09DHmBd?2vLy5hJ(w!H%tV#3k-1ptfY><_yCHgh|}?)KQ)fLG5wwcqrqxF6z!Rg z2Lcpr`p>$E;eK0H{*P640|oz^RTbd>lU0v^Rq0w5VWDqqId3u_K)T&W8J)?D%!6uh zSGMz52*BjSSggJuWQK1bE>1kK+G^x91MZ9z<+tH`MnzutugL>%_o+&;{U~fif?T09HNe#SMZNR)cx%cf`1$WbCzj!6Amd9*h0{Rta9_qt)Y+GA6vAi zZC1(;)oXkb>)C63@Na+Fmw39`2{J{m&9ZL!Mw903RS1{ZS{&Jy3> z+#h2IZO!^2qrZ7>#tR0^n|9Q@FFAA439_%K6D|N`_`gHNe-Dm!zm2=Vwh?ggH~$^j zHh%{;82K)+jhO2euHB1^bj z(a5Q#AGS|ZZ~9UEeNhrEB;zrIO~SMYN619bTN@DHn6v-H_kZ+6ekTg$IWRa$@uM3~ zt!+=s7W+BZB^L;Q{l!sFW9GWI6=N)xXqf=+Es2@&glYz@W<-*ng30-tKLmCLk%}dF z2TBa33&*Ou66^P*0{@L3VWA~l&ks8T;j@=YgR4&tA#;7 zUyrivr-*o~;d?Lpe|^#FgGh}i0B**d#Uusxfm?w52Qa`LCK?m)XtNWwc&L7F9bnQ2 zfD(lr(6Kd#4;3rZSmISk?g})Z|FcB@7 z@oyMa{7*0n*60Q2Hwxgl=6?SwKq6Eqnse_WK&HzD4jmdq0A~{XAS(bIe=7zDmxlbG zP52XYp#*)H=w56~EjIvf@|69xd#{>ozM|O{Rjl7ZE@=;PRARYuDE5@|JgP-56 z+T~CI4T%L$Lk5}e4wnADOh3c<5&W+m6ic!het`iP#sa|m%8qd0m@E% z4;~$5U#0o1MCeP!gr~KaCz<|C9(q^!nI$nic&^8busMK;z_)Y{(rV zX0a1LfJdi-v>KQO?49Ap4%e7t$KFNevj&K4uyk{JVT$J#jA*9rDY3{GAuI+P;!`Z@ zJ4S+eibI+`|M%M9;06Ue1h9BF08R48T0<>C5O$5z-bDix0qi;)+`aFxJD3{*6B+r< zk-+bNF_$(NaQahgr8u`XPt1j|#fxYgGu*Fz7J;8=11-N7p8i^b5hZL9oSB7>oq!B@ zqH`u~+>VevFAGn}>*EL9>7T325u532V<{B~Nslf(M?La{%t}WR4*pT*;U!OREGhk5 z$dJ)tGREBv3c;`sVfvQD>0?M1#^r9PeihhF1Of!Pl-CBXd~2SUCtvkvY_YYWuYh{+dt? z0w8NGP7f`^sL4ol`z;rHzrTD~^@_k$cr-u@lRXzA9OsN6nYJnDSNnSrZ{7eC2!RO^ z`5JZjxxGbuT^Tz_pL@><(GL8>&f9B8Qn7%nz|KKQ*@x}3Xd zc*KRxSz`S{-1iMvJxJG*1-9~FhoNqRPtmK9EjO$+TCQ<(OYS$V?$3+$yYtz)!0UJB z%i7xEXC*HOOyfbVulx|G*|~1Kz7s-1%6doowP>!K5h=S(b-6z08G4_CgC8T(g3={Qd?ZEkkERs@#)UXnf z5|xveE*~V&n+vH&0gSow>2E+KXUbyV_Pc}lC4^MXJ3FYob^5dE!p6Th9R%zg@Ia7l zy3g)&+~3N3J@M%oAk)s(KQT0{7?OiTJ1Scz8AP^W7$L$lF0UK8=Dx%3M$155+ z3isTaEQ2?3KM}M4@}Cy)6u486!GhA*JlMbd3dFenO!%}Bz9HS<10d=6=#MOObNE2c zIkTQ&`@G=KtP9ZP-M?A$9eLv-=I;#5yAO{D2CKpNpSH(A8{IOuglOp|B3bL{Fp*vC zI_w@j?!sWY&S@Sb2j{;z0Td05L}YT+XuTNch6f>osEV1i#2?VW|6pP-io|=w#=EW{ zOEnR*2R!94@O}bC`~SFKUW_L9h&T7_e-G9tf|QK z3hIv>?h5bAb?~AS{?-B%yS_b@B9WY_5*2xkGy8OAglGy90`oE2l)>r0GX)z9@o!U* zX@CcMT)wgS<87UWzrC%ZDt3^?ALGvhMVMRC({}-JSnM4#zVF!^#&q{sZy2J<+u!_0 z0MvXFkM1&gJJKI8VfWm)bB2}&Ou}>=chRu%CmJ${ik?5RG|aDGtYKA^P&BkQ^_G7J z(OmvcSO94akoFRJS?ross^7)Zm|nXq>g=AeQDNV1-468-0$lrS<9DFl2ZMMa!{fIw z75*5c$%W4VzzCoaZ0q;L{T;*C6Zu9ZIb#d5OpE+{Pkv@nEI7EO)p}CxC?=oyCfRah zyeF*~A2-^U!Erk$OkycnikW+36ELW%k%JAbKzlz&oVBdufl(He?g#<{nsXQD>r_%)diB`yn`0xJc1Bpd*!Jty!Rz)o>N;RS&5-*O44sNvYX4^)}c zV-^0D0WcHGK_o#(O409|#q2kbY$Oa3+89bQlc40Kk9x53JYs0@VGj&I}WQlmiH|%R(l~otfbVnZAsJ zC3-w0CR-SsbZjp9&v$xBg8MA#;@rT-1D5;}7GdlG{gck__!~Dd$-*G>OeP@U|7kJ5 zxx-z~f}24@H1YBIFN<-xK(p5K5CB_*`_{>;7A}k36re6J$2J2Js8;?|Hz0BR#+Lzl zFsGJ6fX)l%Oz-J_&*`63wbVQJ)b9a@jS_=A2}nyQpr`@nysL2j#~p`*dyVQ<3C4U% z*ma-7rj|jL=0D&0^f9<$1`W_eOFFsV z&iU)p43)iNQ)!@xjb18U`x1d=}#xc2Hz2UcL`^{WVu9QF$P7GskOH0eTy zdZzo!?}4or!Joe$3BlnMl_jnDI6YF-7Bf4&R{XXxnz z=hwf+r66*wwse7J33I3;5@Jsx6B;yiYC9+DZ2W7|D-maZCT(~(>HaKkz5mOk$K_Bh z-(RFXhN3Y)JlG_G@GfbVoBzS6?Z4pWP6piu0g4L0{ z=3NR=RsU@zca|z;ckPlA1^=i)z z0#d=&cVLyotzjZh&j+pIK0eV5JL~JtTVp%Z)fTf2@yDrOzMys+qiwQ3q``|AWjawC zVgl9#s^H&~0a({Cd(bAuYF2u362kSIjl*!Pp!=+pY}k{bt#4x^E|l;3YN_Kz2K<%q zvSm$xW*AQe!=uaJ0_2;a*t{&q)z1Tc)=`);w@@ddjZhK+ksa zHC9VPOpL1GSDs3y>!n?Uk4Px#bi+qFZGAZ{Xxp*GHHNo9p(771%HCxNbyWVkeP z4nG#YM_l$NbK#d-<66Cj&zXOrn78to?>6k@!+6m#*}j~(cwjt|m9Z^nP(@YNxRyJ8 zmZATW28%&oo&6qZ>ATgQXy@Z?qtzaQc!Gd{fYZJC=1=SW@hk?qIyyg#XiZST4i>9b zhv+Tt&N|;*pK9rZZhKW5jb!gNUP>Dp=GNj$ArOBRk5(;N7~n4R9V)(sD@SYV=u_)3 z=mEJ1ATPnZNue=HbHd0>$Jy)gO>TvuCk~CGA<^lLzM!FElfX4mIZozmc;HXv@`0>$ zX^h2if90`j@)?y;u?*D|S4b90Lx3&tF2(LaY@RxM#fE&%S;*~8wc4#)%gyJ*_1@F9 zAB%2oZh@yajV?Y%_lWW4e>|zqbtu*0akhzk2|GPy!C$bPOH{wUu$`_jr&4h^+Ydil zA9!5P2_;U`m}ZM8m5CU=Ctxy`YqhXI-YQXRy}H8nE;hcK6o|BKSOXz2-(ZIvcG0op z(0k4&+vK&*mnU!hkT}{K9K`FZc5s|ZBB)G83uhj}q(Zb1CMqgAQE$K3DilGt?@GB}2xApb&25|nMZXL6!9IKs?B%S4L>}5e)WnVFi;`<$h@8KsV`VMG2e{p;D_1Ai_j#<#F*M1@QU~}he_g;36<^onE*++&eSkg#q5$WW^kLeke%!>( z!!uoFrk1a?Q>xoV%IB738Fuu;)o7vRaJBcbS`rwgb{&VXGkzrJ(~OLAh~~+B zNxN6rY^F0az|OcNnqL% zusOJN;&`N-*1rxj$1EoHXFl=dE9UFhSqcfZ1I)HA%KZ!zh7M~-(<+uVNOy&hxLqH! zFCoL)b;kr@eLUz-82IsL@{TJUjD_ii&FWK^D@e(`zufcA8>J z$!9QnLidazkqwohuU?ki$Jh02A1ec}*1uN?2j?&57-J#T$GiQRzWdtgS&F9SY`rac zfz$E!TZbVT$)b_>nI-yUoN1_}pXv;7!@|Rv*LF^CHJhF>Gl$Pf)>!FYd{L2iixdAP zs`XJ_m1zFtr*7n#Qu2|+QqtUlU5hov;YWGNAyU&{8_c~i*VkD{5~63TvCv3rneJM= z9Hm%|IO#40xvmouYmFQMznO6>Qbxw&y{1bBN=k2zfNpRzu!wY%! zuFf7`ADo^JIF=$Rc1v4Wz6jWF&u0cvw|*CO-*cXtD`3qsW$;X#%DbiU={qs~W+x{R zQ}%|bTab^vQQzK|F8QF~`@0rt)U#R4xpeb`C>xAO*Z$fn9*fRm-yQM!0gBuHcci;D zTXC@X(eqfO`-tP|>*-ycEi3e*vF2;L@cG=V9GtrAO)+84e((wSHw3vK3yQ)@nK$R? zF<3;nXz1osS>4UIJI~lQ$0|SdKRQnaeIcNCy3Q+j=8X_tbsE$Tz0WK+F`P!^u75C2 zS|Uv&)>rRxJo~p6pgY|IMT@T3%Tvscp;hcjVCAyiG<5e^-kq)A8Y`|Y;oq66a+&ytJ&X?U#?g*&2JUKEP? za(vZml266rNo=Pp9hRF!XE1(ZqGa3agjrbQz1Y0viS38@#RJfeG^XTEjv_iVr z=$`NQn=a-j{m0YstO1Lp4krG{9T>M*HTwST!ZheVy zN)vB5tS?Yyl(b0-bBgD)@pAb>h-GanX6$yRdScyAckE*sG$LN2qNCq=oE3ItUhj_| zXN!Jh7IO_WTKVrXeeIgC45GCPPEa)Y3^;1|2<7 zQ3^{BZN8*C9q08Wuzgd@v9q+4{r=f!&fdK_Q5_s{OF| zg`ixNL2XU&3Zg^@;hIvNsxViq6<@{f2=epw#beaucE526CF5&y=5*llR@3nk{ZF}%G&=rmS%{o&0mq|$`I4TDBW zvWY(kuTLTdl~v>L^w9lech;bR02}-8`{kZEDK1$mljGrOJ2H%QJYTuk@hF?s_!lZN zEx$dyt4NLQ*4QZcRK0t%GlZDadXYct$`c%m*paU`Cz-+$!xI(~(rB{&*gIAz&>I~& zGg_+a*XD=uxJzzxb%W?)fbaH|)zba$Ltw>NMy;Erjv()J;_K#^u466N)#!b~Mc;V@ z6r8YP*>sn48hPvOB`*72m*dg#&cqAfgQk^t2L}frt+CBzT{_Lwl!BxZQ&6SfmjF2U z;~?QsQpGwOg6`JYdi&d>0X|r)Cj!#1B8{$+k~lfbs*k;RR1z_-!HVa5!HN@?kKOm- zOV2KFheBY<_H*Gcv&@V-zYs+DFgC*E3RNp9Q9#%@?9K5cH+?b(tY>eou{V}3mfb?L ztpXTir3paOzP!Qhn)@Wuj(T?#(q+YVrY_p8o;dcb24P8J36PKB1=EMFD zb~w0-J~4Q7diT!FT$u0MafalzpVyK~}x}tz<6Sr~x(1H04*X zD^$u0!jE^R?fa8>PNyp0>jb^}C?4v#)rWYz70-}G0snEsLkv1hpTNE~a@oOorh#+Kz^1#L;siB;ByOBD{2 z6ZJMm;8MirolFpYQzu3e!*s7oSdP~GoJc6it<~lLKBKV8i_g0+9T7i=sAJO&k}xj? zYl8r#>;=_=R--EGg>H@GCJYK4F(Bb{`^@3L2$ylW>vcL8t|jh)S8cWY{8MP5dhM`U zrtnxE6-j7LW&rG?at0qR-O1K8HQUJr8Olut+Djgu+1Bc62^>aq!}aVcv-!6$gto^` zX9bG+coEJ#^k`~z@0{AEr|Tuwr5T&K!_e8qcMm~{SfSn4r`_hu@P2>1M=@Vs9`}_R zyZM~ySiv_vZGbwrr(LOmTM{-qQ$jcU$y~Rr!6XVraw<*eW=y_tT@s9F4#&~4!3ar+ z+F!+oQrXN@F$lN~I|BVv-Q#aIhA14NDk7=d@l=HD#(GXi{mJ$1cs8iVI)6exx?P`T7#n+d;v>U%7O4 zrfgNZ!m%$16If03)6=k>vL)>H`kCDdiUpu7>b2HBE54-Zjn2(yoB72!VXFwAVVh%x z5-{bM$qJ*R0+sS2tx%Stg^9bGqp|f^zRG-B_;wZ~xh-ryQ*}asy1P_UJ>mU#%i04 z0>!GWF9w+#Y-7mrXq}A1^63^3WBwH|#C@f)vO^2Da+KSW7I7h@1osi~(ge=hA)wZc zMztNm>bX399DtUxor#~aS83C&HCt!bf1UUEBJ6uc^9?(Qr7@Z6xk`!k2e*lgViuzJ zk&uGPF2DCOqCG9xVELJFaD<=g{!GT=$7r6)a?ZDT_x&5LC3RwuN_d(Q&T1(e$=}s0 z_06vh?2P6kS-pllVR4<3nRh$-%H2q=+^AX^&*FBzJ6$Z^TLV%jhLZExYExNRuqWMyVA>8yk8N92CK4~ z+%%eYPn44Rst!@|^9MFv?oQL)oYxDVupdfYpUxM7WGjw0%>2XYcysNfT_wJxGnlA1 z7L;+}?>%{4W@JPh zMlkEnz1lYP%V7s(Nv+zPN~;Or>c!q@{!n=MaMFE}P>bQLM^-pN%1>$?kMymr%Um44 ze|`{9xVmwBykNPClV2QPW<0t%k|QI5hlqr9x-~vNBe1dMe!0VZxC&rIM)X6{PhsM^ zf(DDy$#VVf5u!C5H1rfci#cU2SE{>R0@UE5!brC(rDc8d&o47^CtXQ55&1^4-@egs*=J?Zp;jxxrJ*m4jau zMv*QTC}Ht|fq}33y(_@RpJzhsw%-u91{MgoxHPz=FJ+;}^bFn7DL8p;P%p-DpF3X^ z>z&gTH|Q{=4}X*I5|5@8!_%y_{lZCC^oh6(3Zi9}9f6AaO6>Ka z!p)o+GJE(BBMqi2ZkCQh(VCrC^we|AlczF8f=i4%41OiHq2N_8z04cjiIG#>lX*z_sgAZtB-zW9J85pGFF8&5#i7iUX8{+ zZYYpg|3Pq~RT>sXmLu68D+Ad-+Fxv|p1*!7ZIl)sbJiBs4OkR;6`fqo{)*WA1We-- zAK(1V^(8h@%{wOwKtTB<1z)2K7&sFY{dl2Y`ky-;8N z07Q#y@UEVCd5I}yjTqS3sk9iNHT1>3696i3MOW1KS4QhOEr!+M**Q)Sa}Y*y8obi4T(k2>5}dUHF5M@8pvTcV;fiz z#f>MMlRK9*d@61WpLo7LwpDK=bcIcnuBVnSE)m}GoY_mqj{1nm$kXjv_Z`)jBrRzI zmr@C@Bi4m-mFU$P_FalsZv|iQJ|c-A|3=>q+z50Mi((Jsad2FmmuYO+}fIO-Lw6a|=ks*O1TG2VxUB~>HXBQ2P z!9Ws^`wf41+OyT(cRbvLFaFj7kRO+f=P7>rl^ZUfb0cZ0Hxc{ba6PB(7RXt>%!9tC ziz3Ub_=HSP*la8vj*Smj2?z*s29kmsFbN276`7bybUF-L^Oa-yI7u=AdgWx!JNdmg z*a-VxCHZc%8IFu<46jm)#BBILyJ}et$O3Imss4r#n^tyrE(9Ost2Q>Dyx5ZNN zhZI12kp=0c)^;mqehz1yocBMnOf?ibNUjR_(5NPE!dmL zCkThlPRiOQDCV}jwIZ6=<;-$x%&ar9FM%~03B_)ECO$kxyWxBxT`_ZQG*8iNqQny# z0g9O2*+wF{m+kyym;KWgpq~5jx>?8gY+rkE5m~vk8xkTtl5)hq(h>9k1+PG%RL6mX zC*(6#J}#q@=~6qRaBvT^?O=B#b#QTxU;wsaosNA0KL*X-d0g0^yT?|a>3gW$%3}9IS#8OJ*Un{eHj_*&0pc2dmH@_ zo3j$w@x~M9dcb`vj7Eg9Upg=P;DdVdnUMtoA}qE`>sNI{jm`Rg0Vi6UL?-aw};mHSG#xOiCp zZLKe{`DDtZ`R0Po3i*oQuIKva+WkR97P{8s2}Pr&qO!fdkcz+&@;lkd9*8>v6!udn ztp=pP&J4<7*xobRjt7JUBEDUOj(Vj+O|Ih{BT)7}pQLzgqki<&^BNJuNvi2EmwkSs z-s1Ln%j&TH;>2xerr=3X?A7%^V07mq8W7ofqUqfB=eT_R-^?|@w;Nwy9xFCj_rw%V zH>bW*jIel!O#5m#6N8Y|_^HY{7*tuXK&e5&kEFnisuR`;M91bt?$w|1<(=^3phQ01 zoYb(=frF&*q`A+>m#<-R!M3JzgwcGkfIQN4wK?s6d(B9(3>E#fqslt(y0>Hf@hfx4 z93yYDZLiY#vByg$1vHY9ByMP8*~ebdy-{dW-2Un!g$OPgk!EAU60TmqRt=NY5<6%) zfU-%-qyVKR7D@JOsE%eD--Zi;6o`1ZDjcrcMWp~vb^S+?|)yJMEZj*Jk(?F$U)M!eI zh~O7_EfMo_GE=0w${+`Vvk{dGio5#x$fN}-jo{em))s5yqTdDO6c--uCwohIf zZuKRe*KVv}5~x8zK|w%{%Bo+8H=qT1${`t2xf%*&M9SH>TjLgC^SGp>H^VLPhpRSU zPJ$ji&dkW_8X{`*JKh>smV1P@Id1VQcd^O!GFSqSQAOMxwfS^os8Jjj`ceI4d-7;m z;pmYN5z;o_jYE>o&CBP{^#SK(RImA<&adSNSc7l~F*#Z4jl;6!4d+)61jETIcJjtEao1C#Hc519!(H{#=%7Rhs-AI~;6{ z+9lS}Fj`v2Bg6`e)0fPb*fxz$prGyFyc$ zuIsKq?2Z`xOnL2yO!6(7FH7XK2rnDyhvHcD+Y1_X0!m(T?TP*H>FPZuDT^nXi-YMD zMVi4ed|7JMMeWAEdFjjF9`oKRF!R1T&e5teoi*QGEN(cAaM`xpsXO-aYakc1z`VA3 z-hB1yx-GP`J9WKsT#KqIjfnRum>nosf#`l(HJD;*__JJo=p?*WhYBaOyCBnpZtu$8 z9;1rG`C;^4&eey6IVROwHT0)!d<*Lu8fcbuzV!-S z8DQD4_34#kDzj>75|8c)CS;9Z%n@1LD#l=w0&7;25p3_lq7d%!B7_z0PqLZ$d%e)) z`xvyHK$Fc<`2@_US~UDwd;Hba)tt+xD3^0UKqy%<-#=Z8mZt<#sN?PoXLoCrS!$uu z4s=_p%@+;rVHl$D`p@`JTVwPY^q>Q}JDW2Aa!HlhG~VOK0`}}XlOUfO{Tv$hWw!L- z&)CW@ZU(Dr;GS~=ZGvjy=Hpl~hAxj3spGx*R1R>6@o#U1TWA7r473vfI&c`B-&LNy z*1yQ{(-JI65$^i5Ht7mf>FB{ zKZV0l&cJQo_MDGSI+d5=oJLuR(5uFhd>EF$h`8DtP4_OtyVk(G$YwS$n1~%Kzw0wT zqo&TT93kM{T4j3iE{>qP9~&EMS}K1sy4*#R>UzRS!cHYq{o;}jGJAF2OpD$U`>w7< zYO?HOBAd}O6^HAK#ZEGHZZyJ9HSNke`&hw%mM;MeM;Jz93*(Gy60i z6ZoYem*ZAsYpl?p0*6K}3ux|#t7=u|(Jupng1Br|AtqR65@}Tg zg7VDAw$5%xwImHDuANwI8sIP6B%G4I7tiY|EGhYAC1pL;eQvj$Mg_c{^7pli43A!( z6g9{6zEme#ubTz8M>$`$BWpkBLABZR^XBc%V=Sy;gOUQE?f86zB18I1Ev*=q@!T12 zMQ&JaK(&KcX3@!>tEGIikAy*bQ?B#XCk=swOM#e*HAh~=C}tJ(1wm@*DxfzI5_bFaFKtUXetZ<4Z}6CYKHe zDP#&&XQ3d($eAZw8>7maPDQcYUj;!c__gkuDaycLserR%%SOG}JWGK0`uuzy zdKeD9P#T}Z;JZl*vuwM%-i@0}lZ!5bU=gaewhClqFrX1~|2kuF5FHD3aY&p>8_*Q3 zFij`MMMg%B&9D@@c*guG{6c`(ZaxLt~==Kfg7@r?IAso$C3er83_S zw&Ium=*j~LJjyq@CBxc>KFJW$$);o_7!MyB&gMnC zoTs`olnllW>x>nuF*ft7_#ppGc1H(35RK%-ASm2}RQruSvHAzT-F6z2r=LI+y_((0 zwhHh$`38H?5fQ|M_>sKLkxtfZ6nC<%odT@@{Vm6>!l8&{p@Gj$m*x?An>3Y~jbjF> z?kQWsw$K@sGVc^AP*sUJ?rduahE}G!MWk5azK~7R=?H9R250>Kx$M`a-UP^x5dAtK zxotW+d2tb54QdA))eeN`eJW=TuPC^}yJtrHCXq1#;gaT+a7yFDb^m z`fra`xH%AM( zK)VI>q*pI|+knM}(t;y=7n&Ok~S&^Sv?5O>ze2iM}<@iMW_0Fn*W)U%ZS0C(yf`Z72 z7<61#^kH`62zZkVNDHSH9l;yUAB~Uz5N^tg1kLwC0lR97YE0N>0rjM_a zoN}|V6G4h9PR+pi_4LAsbI!@6B5M|OZYveO$pw01^d5qqB4~LXVrXfl4h}|q>;Ziy zx>;}@;_IYN+4fZB)|cUPUz81Em-|wQyp4)mN)bo-;S}?d5)u~A620|j>udp1Qf%rK zErpQsII&g-^leNkROTtJVq|qW7g0gyUu7BUMrt*8f>W*kxDp(AozIhnPgq()Lap9h zx4DTifx-0BbPLGv|(}*;>Yrr;1rCin;3q_yOtk6M8!PXdU!|)9EYyPW6cZ^i<@tZ zfq3|=M5Er0jMKXPLerb}=igeu@$%9V&@>S4-J|RkY2;j*G*BB!hq>R*e&xO&r{>hQ zzXHmP0?=HBwi2?o8l66Cej|)B`IERp(UgtFvPjge1Ftr2pds4#M z(I|Dm=a#!dudlDA@Q0Z%ug;GWcYO+$a|0_@Qz2h%h-m^EFlioHD gTT)}tg%v#V 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

HE2SDBx6wF9AvYhBVx2L~3AW+4n^fUJS?+W` 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

S=6^q0CTE1Fd8>ATM7#J_U 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

mQq>`<`}n%HJ=tu2%+ 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�Ix^U89xWxRkC;c*}2 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�(qP~n1*8T+2fo(>>(q_q!mm+b8{jiC1p7HYLY7D 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/` ; le tableau de bord -ne les répertorie pas et les omet s’il enregistre la liste. Configurez au maximum cinq identifiants. Avec +conserve ces identifiants déjà enregistrés, même indisponibles. Configurez au maximum cinq identifiants. Avec des sélecteurs de compte, un choix natif non qualifié peut se décliner en plusieurs lignes de catalogue qualifiées par sélecteur ; les choix configurés et les lignes annoncées ne correspondent donc pas nécessairement un à un. @@ -178,3 +178,11 @@ l’outil natif. `disabledModels` et `selectedModels` de chaque fournisseur restent des champs de visibilité, pas des contrôles d’ordre. Il n’existe aucun paramètre distinct `modelOrder`, `providerOrder` ou de carte de priorité. + +## Préréglages du sélecteur + +Dans **Models**, choisissez Par défaut, A–Z par modèle, Par fournisseur ou Instantané des usages, puis appliquez l’ordre. Les identifiants routés actuellement disponibles et `modelPickerOrderMode` (`alphabetical`, `provider`, `most-used`) sont enregistrés. Les usages conservés sont lus une seule fois lors de l’application ; un rechargement ou un changement de modèles ne recalcule rien. Un ordre personnalisé ou natif complet reste intact jusqu’à une application explicite. Par défaut efface les deux champs même sans modèle disponible. + +`GET/PUT /api/subagent-models` conserve les choix enregistrés désactivés ou absents dans `chosen` et `available` ; `pickerAvailable` contient les identifiants routés admissibles. Models envoie `pickerOrder` et `pickerOrderMode`, jamais `models`. Une sauvegarde du roster seul conserve l’ordre. Entrée invalide ou échec de sauvegarde préserve l’état précédent. + +Les plages prioritaires et natives restent en place. Les préréglages affectent le catalogue Codex et les groupes routés de la découverte Claude, sans modifier le préfixe natif Claude ni les profils Desktop explicites ou la propriété des alias. Les rangs de guidage OpenCodex et les réglages de repli sont conservés ; les cinq choix annoncés nativement par Codex et le défaut recommandé peuvent changer. Aucun client n’est redémarré ; une actualisation peut rester en attente et nécessiter de rouvrir le client. diff --git a/docs-site/src/content/docs/guides/model-ordering.md b/docs-site/src/content/docs/guides/model-ordering.md index 79e74e8e2d..2d33b409d8 100644 --- a/docs-site/src/content/docs/guides/model-ordering.md +++ b/docs-site/src/content/docs/guides/model-ordering.md @@ -112,8 +112,7 @@ have expanded into selector-qualified groups. Use `subagentModels` to choose and order the leading models that Codex also advertises to `spawn_agent`. The dashboard's **Sub-agents** page can reorder bare native and routed ids. Use `ocx agent subagents set` or edit the opencodex configuration for exact -`/` choices; the dashboard does not list those choices and omits them -if it saves the roster. Use at most five configured ids. With account selectors, one bare native +`/` choices; the dashboard retains those ids once saved, including choices currently unavailable. Use at most five configured ids. With account selectors, one bare native choice can expand into multiple selector-qualified catalog rows, so configured choices and advertised rows are not necessarily one-to-one. @@ -171,3 +170,11 @@ not reorder the native tool's advertised list. `disabledModels` and each provider's `selectedModels` remain visibility fields, not ordering controls. There is no separate `modelOrder`, `providerOrder`, or priority-map setting. + +## Dashboard picker presets + +On **Models**, choose **Default**, **A–Z by model**, **Group by provider**, or **Most used snapshot**, then **Apply order**. This saves the currently visible routed ids and `modelPickerOrderMode` (`alphabetical`, `provider`, or `most-used`). Most used reads all retained usage once when applied; reloads restore the snapshot without fetching usage again. New or removed models do not automatically recompute it. A manually saved order, including a complete/native order, remains untouched until you explicitly apply a replacement. Default clears both picker fields, even when no routed models are available. + +The controls use `GET/PUT /api/subagent-models`: `chosen` and `available` retain saved roster choices, including disabled or missing models; `pickerAvailable` contains only eligible routed catalog ids. The Models page sends `pickerOrder` and `pickerOrderMode`, never `models`. Roster-only saves preserve picker settings. Invalid combined updates and failed persistence leave the previous picker/roster state intact. + +Routed-only presets keep the existing featured/native priority bands. They affect the Codex catalog and Claude discovery's routed groups; Claude's native prefix and explicit Desktop profile/alias ownership remain unchanged. OpenCodex guidance ranks and configured fallback settings are preserved, but native Codex's advertised five and recommended default can change with display priority. Saving does not restart clients; a catalog refresh may remain pending, and clients holding an old catalog may need reopening. diff --git a/docs-site/src/content/docs/ja/guides/model-ordering.md b/docs-site/src/content/docs/ja/guides/model-ordering.md index d9c782b3fb..74febb1e78 100644 --- a/docs-site/src/content/docs/ja/guides/model-ordering.md +++ b/docs-site/src/content/docs/ja/guides/model-ordering.md @@ -109,8 +109,7 @@ account selector がある場合、5 項目の制限は bare native の選択が 先頭モデルの順序を変更するサポート手段は、`subagentModels` を並べ替えることです。 ダッシュボードの **Sub-agents** ページでは bare native id と routed id を並べ替えられます。 設定と `ocx agent subagents set` は exact account-qualified -`/` id も受け付けますが、ダッシュボードはこれらの id を表示せず、 -リストの保存時にも保持しません。設定する id は最大 5 つにしてください。account selector がある +`/` id も受け付けます。ダッシュボードは保存済みの id を現在利用できなくても保持します。設定する id は最大 5 つにしてください。account selector がある 場合は 1 つの bare native が複数の selector-qualified 行に展開されるため、設定した選択肢と公開 される行は必ずしも一対一ではありません。 @@ -155,3 +154,11 @@ V1 には OpenCodex の推奨候補リストを注入しません。V2 にはク `disabledModels` と各プロバイダーの `selectedModels` は 表示の有無を制御するフィールドです。別の `modelOrder`、`providerOrder`、priority map 設定はありません。 + +## ダッシュボードの並び順プリセット + +**Models**でデフォルト、モデル名A–Z、プロバイダー別、使用量スナップショットを選び、順序を適用します。現在選択可能なルーティングIDと `modelPickerOrderMode`(`alphabetical`、`provider`、`most-used`)を保存します。使用量は適用時に保持された全履歴を一度だけ読み、再読込やモデルの増減では再計算しません。既存のカスタム・ネイティブ全体順は明示的な適用まで保持されます。デフォルトは候補が空でも両フィールドを削除できます。 + +`GET/PUT /api/subagent-models` の `chosen` と `available` は無効・欠落した保存済みrosterも保持します。`pickerAvailable` は選択可能なルーティングIDのみです。Modelsは `pickerOrder` と `pickerOrderMode` を送り、`models` は送りません。Rosterだけの保存は順序設定を維持し、不正入力・保存失敗は以前の状態を保ちます。 + +featured・ネイティブの優先順位帯を保ち、CodexカタログとClaude検出のルーティンググループに適用します。Claudeのネイティブ先頭グループと明示的なDesktopプロファイル・alias所有権は維持されます。OpenCodexのガイド順位とfallback設定は変わりませんが、ネイティブCodexの上位5候補や推奨デフォルトは変わる場合があります。保存による再起動は行いません。更新が保留中、または古いカタログを保持するクライアントでは開き直しが必要な場合があります。 diff --git a/docs-site/src/content/docs/ko/guides/model-ordering.md b/docs-site/src/content/docs/ko/guides/model-ordering.md index 365ea476fc..e921bfdfbc 100644 --- a/docs-site/src/content/docs/ko/guides/model-ordering.md +++ b/docs-site/src/content/docs/ko/guides/model-ordering.md @@ -109,7 +109,7 @@ account selector가 있으면 bare native 선택이 selector-qualified 그룹으 선두 모델 순서를 바꾸는 지원 수단은 `subagentModels`를 재정렬하는 것입니다. 대시보드의 **Sub-agents** 페이지에서는 bare native와 routed id의 순서를 바꿀 수 있습니다. 설정과 `ocx agent subagents set`은 exact account-qualified `/` id도 -지원하지만, 대시보드는 이러한 id를 제공하지 않으며 목록을 저장할 때도 보존하지 않습니다. 설정 id는 +지원합니다. 대시보드는 이미 저장된 id를 현재 사용할 수 없어도 보존합니다. 설정 id는 최대 5개만 사용하세요. account selector가 있으면 bare native 하나가 여러 selector-qualified 행으로 확장될 수 있으므로 설정 항목과 노출 행이 항상 일대일로 대응하지는 않습니다. @@ -153,3 +153,11 @@ V1에는 OpenCodex의 선호 후보 목록을 주입하지 않습니다. V2는 `disabledModels`와 각 공급자의 `selectedModels`는 노출 여부를 정하는 필드입니다. 별도의 `modelOrder`, `providerOrder`, priority map 설정은 없습니다. + +## 대시보드 정렬 프리셋 + +**Models**에서 기본값·모델 이름순·프로바이더별·사용량순 스냅샷을 선택한 뒤 **순서 적용**을 누르세요. 현재 표시 가능한 라우팅 ID와 `modelPickerOrderMode`(`alphabetical`, `provider`, `most-used`)를 저장합니다. 사용량순은 적용 시 보관된 전체 사용량을 한 번 읽습니다. 다시 열거나 모델이 추가·삭제되어도 자동 재계산하지 않습니다. 기존 사용자 지정·네이티브 전체 순서는 명시적으로 적용하기 전까지 유지됩니다. 기본값은 사용 가능한 모델이 없어도 두 피커 필드를 지웁니다. + +`GET/PUT /api/subagent-models`의 `chosen`·`available`은 비활성·누락된 저장 roster도 보존하고, `pickerAvailable`은 선택 가능한 라우팅 ID만 제공합니다. Models는 `pickerOrder`·`pickerOrderMode`만 보내며 `models`를 보내지 않습니다. Roster만 저장하면 피커 설정은 유지됩니다. 잘못된 요청이나 저장 실패는 이전 상태를 보존합니다. + +라우팅 전용 프리셋은 featured·네이티브 우선순위 구간을 유지하며 Codex 카탈로그와 Claude 검색 목록의 라우팅 그룹에 적용됩니다. Claude 네이티브 선두 그룹과 명시적 Desktop 프로필·alias 소유권은 유지됩니다. OpenCodex 가이드 순위와 fallback 설정은 유지되지만 네이티브 Codex에 표시되는 상위 5개·권장 기본 모델은 달라질 수 있습니다. 저장은 클라이언트를 재시작하지 않으며 카탈로그 갱신이 미완료이면 나중에 다시 열어야 할 수 있습니다. diff --git a/docs-site/src/content/docs/ru/guides/model-ordering.md b/docs-site/src/content/docs/ru/guides/model-ordering.md index 290194fcd2..5ff04e4892 100644 --- a/docs-site/src/content/docs/ru/guides/model-ordering.md +++ b/docs-site/src/content/docs/ru/guides/model-ordering.md @@ -118,7 +118,7 @@ native-выбора в selector-qualified группы. Поддерживаемый способ настроить порядок ведущих моделей — переставить элементы `subagentModels`. Страница **Sub-agents** в дашборде позволяет менять порядок bare native- и routed-id. Конфигурация и `ocx agent subagents set` также принимают точные account-qualified id -`/`, но дашборд не предлагает и не сохраняет их при записи списка. +`/`, а дашборд сохраняет уже записанные ID, даже если они недоступны. Используйте не более пяти настроенных id. При активных селекторах одна bare native-модель может развернуться в несколько selector-qualified строк, поэтому число настроенных вариантов и объявляемых строк не обязательно совпадает. @@ -170,3 +170,11 @@ native-выбора в selector-qualified группы. `disabledModels` и `selectedModels` каждого провайдера по-прежнему управляют видимостью. Отдельных настроек `modelOrder`, `providerOrder` или карты приоритетов нет. + +## Пресеты в дашборде + +На странице **Models** выберите порядок по умолчанию, по имени A–Z, по провайдеру или снимок использования и примените его. Сохраняются доступные маршрутизируемые ID и `modelPickerOrderMode` (`alphabetical`, `provider`, `most-used`). Сохранённая статистика читается один раз при применении; перезагрузка и изменения каталога не пересчитывают снимок. Пользовательский порядок, включая полный нативный, сохраняется до явного применения. Сброс удаляет оба поля даже при пустом списке моделей. + +`GET/PUT /api/subagent-models` сохраняет отключённые и отсутствующие выбранные ID в `chosen` и `available`; `pickerAvailable` содержит допустимые маршрутизируемые ID. Models отправляет `pickerOrder` и `pickerOrderMode`, но не `models`. Сохранение только roster не меняет порядок; неверный ввод и ошибка записи сохраняют предыдущее состояние. + +Диапазоны приоритетных и нативных моделей сохраняются. Порядок применяется к каталогу Codex и маршрутизируемым группам обнаружения Claude, сохраняя нативный префикс Claude, явные профили Desktop и владельцев alias. Ранги подсказок OpenCodex и настройки fallback не меняются, но пять вариантов, объявляемых нативным Codex, и рекомендуемая модель могут измениться. Сохранение не перезапускает клиенты; обновление может ожидать завершения, а старый каталог потребовать повторного открытия клиента. diff --git a/docs-site/src/content/docs/tr/guides/model-ordering.md b/docs-site/src/content/docs/tr/guides/model-ordering.md index 336513225a..ea42630154 100644 --- a/docs-site/src/content/docs/tr/guides/model-ordering.md +++ b/docs-site/src/content/docs/tr/guides/model-ordering.md @@ -131,7 +131,7 @@ yeniden sıralamaktır. Kontrol panelinin **Alt Ajanlar** sayfası yalın yerel yönlendirilen kimlikleri yeniden sıralayabilir. Tam `/` seçimleri için `ocx agent subagents set` kullanın veya opencodex yapılandırmasını düzenleyin; kontrol paneli bu seçimleri -listelemez ve kadroyu kaydederse bunları atlar. En fazla beş yapılandırılmış +önceden kaydedilen kimlikleri, kullanılamasalar bile korur. En fazla beş yapılandırılmış kimlik kullanın. Hesap seçicileriyle tek bir yalın yerel seçenek birden çok seçici nitelikli katalog satırına genişleyebilir, bu nedenle yapılandırılmış seçimler ve tanıtılan satırlar birebir olmak zorunda değildir. @@ -181,3 +181,11 @@ tanıttığı listeyi yeniden sıralamaz. `disabledModels` ve her sağlayıcının `selectedModels` alanı görünürlüğü denetler. Ayrı bir `modelOrder`, `providerOrder` veya öncelik haritası ayarı yoktur. + +## Kontrol paneli sıra önayarları + +**Models** sayfasında Varsayılan, Model adına göre A–Z, Sağlayıcıya göre veya Kullanım anlık görüntüsünü seçip sırayı uygulayın. Kullanılabilir yönlendirilmiş kimlikler ve `modelPickerOrderMode` (`alphabetical`, `provider`, `most-used`) kaydedilir. Saklanan tüm kullanım yalnızca uygulamada bir kez okunur; yeniden yükleme veya model değişiklikleri yeniden hesaplamaz. Özel ve tam yerel sıra açıkça değiştirilene kadar korunur. Varsayılan, kullanılabilir model yokken bile iki alanı temizler. + +`GET/PUT /api/subagent-models`, devre dışı veya eksik kayıtlı seçimleri `chosen` ve `available` içinde korur; `pickerAvailable` uygun yönlendirilmiş kimliklerdir. Models yalnızca `pickerOrder` ve `pickerOrderMode` gönderir, `models` göndermez. Yalnız kadroyu kaydetmek sırayı değiştirmez. Geçersiz giriş veya kayıt hatası önceki durumu korur. + +Öne çıkan ve yerel öncelik aralıkları korunur. Sıra Codex kataloğu ve Claude keşfinin yönlendirilmiş gruplarına uygulanır; Claude yerel öneki, açık Desktop profilleri ve alias sahipliği korunur. OpenCodex rehberlik sıraları ve fallback ayarları değişmez; yerel Codex aracının sunduğu ilk beş seçenek ve önerilen varsayılan değişebilir. Kayıt istemcileri yeniden başlatmaz; katalog yenilemesi bekleyebilir ve eski kataloğu gösteren istemcinin yeniden açılması gerekebilir. diff --git a/docs-site/src/content/docs/zh-cn/guides/model-ordering.md b/docs-site/src/content/docs/zh-cn/guides/model-ordering.md index a07d4cf01f..ffe4ffda87 100644 --- a/docs-site/src/content/docs/zh-cn/guides/model-ordering.md +++ b/docs-site/src/content/docs/zh-cn/guides/model-ordering.md @@ -104,7 +104,7 @@ subagentModels = [ 自定义开头模型顺序的受支持方式是重新排列 `subagentModels`。仪表盘的 **Sub-agents** 页面可以调整 裸原生和路由 id 的顺序。配置和 `ocx agent subagents set` 也接受精确的账户限定 -`/` id,但仪表盘不会提供这些 id,保存列表时也不会保留它们。配置的 +`/` id,仪表盘会保留已保存的 id,即使当前不可用。配置的 id 请勿超过五个。存在账户 selector 时,一个裸原生选项可能展开为多个 selector-qualified 行,因此 已配置的选项与公布的行不一定一一对应。 @@ -145,3 +145,11 @@ V2 在客户端目录状态允许时,可以额外接收基于原有优先级 `disabledModels` 和各提供商的 `selectedModels` 仍是可见性字段。没有独立的 `modelOrder`、 `providerOrder` 或优先级映射设置。 + +## 仪表盘排序预设 + +在 **Models** 中选择默认、按模型名 A–Z、按提供商或使用量快照,再应用顺序。保存当前可用的路由 ID 和 `modelPickerOrderMode`(`alphabetical`、`provider`、`most-used`)。使用量排序仅在应用时读取一次保留的全部历史;重新打开或模型增减不会重新计算。已有自定义、原生完整顺序会保留,直到明确应用替换。即使没有可用模型,默认也能清除两个字段。 + +`GET/PUT /api/subagent-models` 的 `chosen`、`available` 保留禁用或缺失的已存 roster;`pickerAvailable` 只包含可选路由 ID。Models 只发送 `pickerOrder`、`pickerOrderMode`,不发送 `models`。只保存 roster 不影响排序,非法输入或保存失败会保留原状态。 + +预设保留精选、原生优先级区间,应用于 Codex 目录与 Claude 发现列表的路由分组。Claude 原生前缀、明确的 Desktop 配置及 alias 归属不变。OpenCodex 指导排序与 fallback 设置不变,但原生 Codex 工具显示的前五候选及推荐默认模型可能改变。保存不会重启客户端;目录刷新可能尚未完成,旧列表可能需要重新打开客户端。 diff --git a/docs-site/src/content/docs/zh-tw/guides/model-ordering.md b/docs-site/src/content/docs/zh-tw/guides/model-ordering.md index e0946db620..d944aef199 100644 --- a/docs-site/src/content/docs/zh-tw/guides/model-ordering.md +++ b/docs-site/src/content/docs/zh-tw/guides/model-ordering.md @@ -134,3 +134,11 @@ V2 在用戶端目錄狀態允許時,可以額外接收基於原有優先級 `disabledModels` 和各供應商的 `selectedModels` 仍是可見性欄位。沒有獨立的 `modelOrder`、 `providerOrder` 或優先級對應表設定。 + +## 儀表板排序預設 + +在 **Models** 選擇預設、依模型名稱 A–Z、依供應商或使用量快照,再套用順序。儲存目前可用的路由 ID 和 `modelPickerOrderMode`(`alphabetical`、`provider`、`most-used`)。使用量排序僅在套用時讀取一次保留的全部歷史;重新開啟或模型增減不會重新計算。現有自訂與原生完整順序會保留,直到明確套用替換。即使沒有可用模型,預設也能清除兩個欄位。 + +`GET/PUT /api/subagent-models` 的 `chosen`、`available` 保留停用或缺少的已存 roster;`pickerAvailable` 僅包含可選路由 ID。Models 只傳送 `pickerOrder`、`pickerOrderMode`,不傳送 `models`。只儲存 roster 不影響排序;無效輸入或儲存失敗會保留原狀態。 + +預設保留精選與原生優先級區間,套用於 Codex 目錄和 Claude 探索清單的路由群組。Claude 原生前綴、明確的 Desktop 設定及 alias 歸屬不變。OpenCodex 指引排序和 fallback 設定不變,但原生 Codex 工具顯示的前五個候選與建議預設模型可能改變。儲存不會重新啟動用戶端;目錄更新可能尚未完成,舊清單可能需要重新開啟用戶端。 diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 429379396f..9086c9bf42 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -5,6 +5,20 @@ import type { TKey } from "./en"; * German i18n catalog, generated from en.ts. Must match the `TKey` set (compile-checked). */ export const de: Record = { + "models.pickerOrder.label": "Modellreihenfolge", + "models.pickerOrder.default": "Standard", + "models.pickerOrder.alphabetical": "A–Z nach Modell", + "models.pickerOrder.provider": "Nach Anbieter", + "models.pickerOrder.mostUsed": "Nutzungsschnappschuss", + "models.pickerOrder.custom": "Eigene Reihenfolge", + "models.pickerOrder.apply": "Reihenfolge anwenden", + "models.pickerOrder.applying": "Wird angewendet…", + "models.pickerOrder.saved": "Modellreihenfolge gespeichert. Clients mit altem Katalog erneut öffnen.", + "models.pickerOrder.pending": "Reihenfolge gespeichert; Katalogaktualisierung ausstehend.", + "models.pickerOrder.usageFailed": "Modellnutzung konnte nicht geladen werden.", + "models.pickerOrder.loadFailed": "Auswahleinstellungen konnten nicht geladen werden.", + "models.pickerOrder.retry": "Erneut versuchen", + "models.pickerOrder.hint": "Speichert geroutete Modelle für Codex- und Claude-Listen. Prioritätsbereiche bevorzugter/nativer Modelle bleiben erhalten. Nutzung ist eine Momentaufnahme; nativ angebotene Optionen können sich ändern.", "codexAuth.quotaAutoRefreshAllHint": "Schaltet die unterstützten 5-Stunden- und Wochenfenster aller aktuellen Konten gemeinsam um. Im Pool-Modus wird nach jedem Reset eine kleine Anfrage gesendet, die Kontingent verbraucht.", "codexAuth.quotaAutoRefreshMixed": "Einige Fenster sind aktiviert.", "codexAuth.quotaAutoRefreshEmpty": "Keine unterstützten Kontingentfenster. Aktualisieren Sie die Kontingente der Konten.", @@ -560,7 +574,7 @@ export const de: Record = { "models.setAllHint": "Schaltet das Standardfenster {value} für alle gerouteten Anbieter ein. Fehlen context_window / context_length, wird dieser Wert das tatsächliche Codex-Fenster. Für ein einzelnes Modell nutzen Sie «Eigene Fenster» in derselben Zeile. Native Anbieter bleiben unberührt.", "models.collapseAll": "Alle einklappen", "models.expandAll": "Alle ausklappen", - "models.orderHint": "Reihenfolge in der Modellauswahl: Subagents-Auswahl (in der festgelegten Reihenfolge) → übrige geroutete Modelle alphabetisch nach Anbieter, dann Modell-ID → native Modelle. Sichtbarkeitsschalter filtern nur; sie ändern diese Reihenfolge nicht.", + "models.orderHint": "Die Standardreihenfolge folgt bevorzugten Modellen und der Katalogpriorität; geroutete Modelle mit gleichem Rang folgen Anbieter und Modell. Eine gespeicherte Reihenfolge kann die Anzeige ändern. Sichtbarkeitsschalter filtern die Zeilen. Clients können bis zum erneuten Öffnen einen älteren Katalog anzeigen.", "models.custom": "Benutzerdefiniert…", "models.customApply": "Anwenden", "models.customPlaceholder": "Tokens (z. B. 420000)", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 9cbf8699fd..0d2f1d05d4 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -6,6 +6,20 @@ * `{var}` are plain interpolations. */ export const en = { + "models.pickerOrder.label": "Picker order", + "models.pickerOrder.default": "Default", + "models.pickerOrder.alphabetical": "A–Z by model", + "models.pickerOrder.provider": "Group by provider", + "models.pickerOrder.mostUsed": "Most used snapshot", + "models.pickerOrder.custom": "Custom order", + "models.pickerOrder.apply": "Apply order", + "models.pickerOrder.applying": "Applying…", + "models.pickerOrder.saved": "Picker order saved. Reopen clients that still show the old catalog.", + "models.pickerOrder.pending": "Order saved; catalog refresh is pending.", + "models.pickerOrder.usageFailed": "Could not load model usage.", + "models.pickerOrder.loadFailed": "Could not load picker settings.", + "models.pickerOrder.retry": "Retry", + "models.pickerOrder.hint": "Saves routed order for Codex and Claude discovery. Featured/native bands stay in place; Most used is a snapshot. Native advertised choices may change.", "codexAuth.quotaAutoRefreshAllHint": "Controls the supported 5-hour and weekly windows for all current accounts together. In Pool mode, a small request is sent after each reset and uses quota.", "codexAuth.quotaAutoRefreshMixed": "Some windows are enabled.", "codexAuth.quotaAutoRefreshEmpty": "No supported quota windows. Refresh account quotas to check again.", @@ -585,7 +599,7 @@ export const en = { "models.setAllHint": "Turn on the {value} default window for every routed provider. Relays that omit context_window / context_length get this as the actual Codex window. Use Custom windows on a provider row to set one model by hand. Native providers are unaffected.", "models.collapseAll": "Collapse all", "models.expandAll": "Expand all", - "models.orderHint": "Picker order: Subagents picks (in the selected order) → remaining routed models alphabetically by provider, then model ID → native models. Visibility switches only filter models; they do not change this order.", + "models.orderHint": "Default order follows featured selections and catalog priority, with provider/model ordering for tied routed rows. A saved picker order can override display order; visibility switches filter which rows appear. Clients may keep an older catalog until reopened.", "models.custom": "Custom…", "models.customApply": "Apply", "models.customPlaceholder": "Tokens (e.g. 420000)", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index ec171e627c..b6eb03f0b0 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -4,6 +4,20 @@ import type { TKey } from "./en"; * French i18n catalog. Must match the `TKey` set. */ export const fr: Record = { + "models.pickerOrder.label": "Ordre des modèles", + "models.pickerOrder.default": "Par défaut", + "models.pickerOrder.alphabetical": "A–Z par modèle", + "models.pickerOrder.provider": "Par fournisseur", + "models.pickerOrder.mostUsed": "Instantané des usages", + "models.pickerOrder.custom": "Ordre personnalisé", + "models.pickerOrder.apply": "Appliquer l’ordre", + "models.pickerOrder.applying": "Application…", + "models.pickerOrder.saved": "Ordre enregistré. Rouvrez les clients affichant encore l’ancien catalogue.", + "models.pickerOrder.pending": "Ordre enregistré ; actualisation du catalogue en attente.", + "models.pickerOrder.usageFailed": "Impossible de charger les usages.", + "models.pickerOrder.loadFailed": "Impossible de charger les réglages du sélecteur.", + "models.pickerOrder.retry": "Réessayer", + "models.pickerOrder.hint": "Enregistre l’ordre des modèles routés pour Codex et la découverte Claude. Les plages prioritaires et natives sont conservées. Les usages sont un instantané ; les choix annoncés nativement peuvent changer.", "codexAuth.quotaAutoRefreshAllHint": "Active ou désactive ensemble, pour tous les comptes actuels, les fenêtres de quota prises en charge par chaque compte : 5 heures et hebdomadaire. En mode Groupe, une petite requête consommant du quota est envoyée après chaque réinitialisation.", "codexAuth.quotaAutoRefreshMixed": "Certaines fenêtres sont activées.", "codexAuth.quotaAutoRefreshEmpty": "Aucune fenêtre de quota prise en charge. Actualisez les quotas des comptes.", @@ -570,7 +584,7 @@ export const fr: Record = { "models.setAllHint": "Active la fenêtre par défaut {value} pour chaque fournisseur routé. Si un relais omet context_window / context_length, cette valeur devient la fenêtre Codex réelle. Pour un seul modèle, utilisez « Fenêtres perso » sur la même ligne. Les fournisseurs natifs ne sont pas affectés.", "models.collapseAll": "Tout réduire", "models.expandAll": "Tout développer", - "models.orderHint": "Ordre du sélecteur : choix des sous-agents (dans l’ordre sélectionné) → autres modèles routés, classés par ordre alphabétique du fournisseur puis par ID de modèle → modèles natifs. Les options de visibilité ne font que filtrer les modèles ; elles ne modifient pas cet ordre.", + "models.orderHint": "L’ordre par défaut suit les modèles prioritaires et la priorité du catalogue ; les modèles routés à égalité suivent le fournisseur puis le modèle. Un ordre enregistré peut modifier l’affichage. Les options de visibilité filtrent les lignes. Les clients peuvent conserver un ancien catalogue jusqu’à leur réouverture.", "models.custom": "Personnalisé…", "models.customApply": "Appliquer", "models.customPlaceholder": "Jetons (p. ex. 420000)", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index c71bd7a045..4b16912324 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -4,6 +4,20 @@ import type { TKey } from "./en"; * Japanese i18n catalog; must match the `TKey` set (compile-checked). */ export const ja: Record = { + "models.pickerOrder.label": "モデル選択順", + "models.pickerOrder.default": "デフォルト", + "models.pickerOrder.alphabetical": "モデル名のA–Z順", + "models.pickerOrder.provider": "プロバイダー別", + "models.pickerOrder.mostUsed": "使用量のスナップショット", + "models.pickerOrder.custom": "カスタム順", + "models.pickerOrder.apply": "順序を適用", + "models.pickerOrder.applying": "適用中…", + "models.pickerOrder.saved": "選択順を保存しました。古い一覧が表示される場合はクライアントを開き直してください。", + "models.pickerOrder.pending": "順序を保存しました。カタログの更新は保留中です。", + "models.pickerOrder.usageFailed": "モデル使用量を読み込めませんでした。", + "models.pickerOrder.loadFailed": "モデル選択設定を読み込めませんでした。", + "models.pickerOrder.retry": "再試行", + "models.pickerOrder.hint": "CodexとClaudeの検出一覧のルーティングモデル順を保存します。優先・ネイティブの順位帯は維持されます。使用量順はスナップショットで、ネイティブツールの候補表示は変わる場合があります。", "codexAuth.quotaAutoRefreshAllHint": "現在の全アカウントで、対応する5時間・週間枠をまとめて切り替えます。プールモードではリセット後に少量の利用枠を消費するリクエストを送信します。", "codexAuth.quotaAutoRefreshMixed": "一部の枠が有効です。", "codexAuth.quotaAutoRefreshEmpty": "対応する利用枠がありません。アカウントの利用枠を更新してください。", @@ -568,7 +582,7 @@ export const ja: Record = { "models.setAllHint": "すべてのルーティング済みプロバイダーに {value} のデフォルトウィンドウをオンにします。中継が context_window / context_length を返さない場合、この値が実際の Codex ウィンドウになります。1 モデルだけ手で書くときは同じ行の「カスタムウィンドウ」を使います。ネイティブプロバイダーには影響しません。", "models.collapseAll": "すべて折りたたむ", "models.expandAll": "すべて展開", - "models.orderHint": "ピッカーの順序: サブエージェントの選択(選択順) → 残りのルーティングモデルはプロバイダー別、次にモデル ID 別のアルファベット順 → ネイティブモデル。表示切り替えはモデルをフィルタするだけで、この順序は変更しません。", + "models.orderHint": "デフォルト順は優先モデルとカタログの優先順位に従い、同順位のルーティングモデルはプロバイダー・モデル順になります。保存した順序で表示順を変更でき、表示スイッチは表示する行を絞り込みます。クライアントを開き直すまで古いカタログが表示される場合があります。", "models.custom": "カスタム…", "models.customApply": "適用", "models.customPlaceholder": "トークン (例: 420000)", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 63ac304426..a87bf608e5 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -4,6 +4,20 @@ import type { TKey } from "./en"; * Korean i18n catalog; must match the `TKey` set (compile-checked). */ export const ko: Record = { + "models.pickerOrder.label": "모델 선택 순서", + "models.pickerOrder.default": "기본값", + "models.pickerOrder.alphabetical": "모델 이름순", + "models.pickerOrder.provider": "프로바이더별", + "models.pickerOrder.mostUsed": "사용량순 스냅샷", + "models.pickerOrder.custom": "사용자 지정 순서", + "models.pickerOrder.apply": "순서 적용", + "models.pickerOrder.applying": "적용 중…", + "models.pickerOrder.saved": "모델 선택 순서를 저장했습니다. 이전 목록이 보이면 클라이언트를 다시 열어 주세요.", + "models.pickerOrder.pending": "순서를 저장했습니다. 카탈로그 갱신은 아직 완료되지 않았습니다.", + "models.pickerOrder.usageFailed": "모델 사용량을 불러오지 못했습니다.", + "models.pickerOrder.loadFailed": "모델 선택 설정을 불러오지 못했습니다.", + "models.pickerOrder.retry": "다시 시도", + "models.pickerOrder.hint": "Codex·Claude 검색 목록의 라우팅 모델 순서를 저장합니다. 지정 모델·네이티브 모델의 우선순위 구간은 유지됩니다. 사용량순은 스냅샷이며, 네이티브 도구에 표시되는 후보는 달라질 수 있습니다.", "codexAuth.quotaAutoRefreshAllHint": "현재 등록된 모든 계정의 5시간·주간 할당량을 한 번에 켜거나 끕니다. 지원하는 창에만 적용하며, 풀 모드에서 리셋 후 소량의 할당량을 쓰는 요청을 보냅니다.", "codexAuth.quotaAutoRefreshMixed": "일부만 켜져 있습니다.", "codexAuth.quotaAutoRefreshEmpty": "지원하는 할당량 창이 없습니다. 계정 할당량을 새로고침해 주세요.", @@ -571,7 +585,7 @@ export const ko: Record = { "models.setAllHint": "라우팅된 모든 프로바이더에 {value} 기본 창을 켭니다. 중계가 context_window / context_length 를 주지 않으면 이 값이 실제 Codex 창이 됩니다. 모델 하나만 손으로 쓰려면 같은 줄의 「사용자 지정 창」을 쓰세요. 네이티브 프로바이더는 영향을 받지 않습니다.", "models.collapseAll": "모두 접기", "models.expandAll": "모두 펼치기", - "models.orderHint": "피커 순서: Subagents에서 지정한 순서 → 나머지 라우팅 모델(프로바이더, 모델 ID 순 알파벳 정렬) → 네이티브 모델. 노출 토글은 모델을 필터링할 뿐 이 순서를 바꾸지 않습니다.", + "models.orderHint": "기본 순서는 지정 모델과 카탈로그 우선순위를 따르며, 우선순위가 같은 라우팅 모델은 프로바이더·모델 순으로 정렬됩니다. 저장된 피커 순서는 표시 순서를 바꿀 수 있고, 노출 토글은 표시할 행을 필터링합니다. 클라이언트를 다시 열기 전까지 이전 카탈로그가 보일 수 있습니다.", "models.custom": "직접 입력…", "models.customApply": "적용", "models.customPlaceholder": "토큰 (예: 420000)", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 9f220ba2b1..70eb364002 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -4,6 +4,20 @@ import type { TKey } from "./en"; * Russian i18n catalog; must match the `TKey` set (compile-checked). */ export const ru: Record = { + "models.pickerOrder.label": "Порядок моделей", + "models.pickerOrder.default": "По умолчанию", + "models.pickerOrder.alphabetical": "По имени A–Z", + "models.pickerOrder.provider": "По провайдеру", + "models.pickerOrder.mostUsed": "Снимок использования", + "models.pickerOrder.custom": "Свой порядок", + "models.pickerOrder.apply": "Применить порядок", + "models.pickerOrder.applying": "Применение…", + "models.pickerOrder.saved": "Порядок сохранён. Перезапустите клиенты, показывающие старый каталог.", + "models.pickerOrder.pending": "Порядок сохранён; обновление каталога ожидается.", + "models.pickerOrder.usageFailed": "Не удалось загрузить статистику моделей.", + "models.pickerOrder.loadFailed": "Не удалось загрузить настройки выбора.", + "models.pickerOrder.retry": "Повторить", + "models.pickerOrder.hint": "Сохраняет порядок маршрутизируемых моделей для Codex и обнаружения Claude. Диапазоны приоритетных и нативных моделей сохраняются. Использование — снимок; нативно объявляемые варианты могут измениться.", "codexAuth.quotaAutoRefreshAllHint": "Общее переключение поддерживаемых 5-часовых и недельных окон всех текущих аккаунтов. В режиме пула после сброса отправляется небольшой запрос, расходующий квоту.", "codexAuth.quotaAutoRefreshMixed": "Включены некоторые окна.", "codexAuth.quotaAutoRefreshEmpty": "Нет поддерживаемых окон квоты. Обновите квоты аккаунтов.", @@ -573,7 +587,7 @@ export const ru: Record = { "models.setAllHint": "Включает окно по умолчанию {value} для всех маршрутизируемых провайдеров. Если релей не отдаёт context_window / context_length, это значение становится реальным окном Codex. Чтобы задать одну модель вручную, используйте «Пользовательские окна» в той же строке. Нативные провайдеры не затрагиваются.", "models.collapseAll": "Свернуть все", "models.expandAll": "Развернуть все", - "models.orderHint": "Порядок в селекторе: модели, выбранные на странице «Подагенты» (в заданном порядке) → остальные маршрутизируемые модели по алфавиту — сначала по провайдеру, затем по ID модели → нативные модели. Переключатели видимости лишь фильтруют модели и не меняют этот порядок.", + "models.orderHint": "Порядок по умолчанию следует избранным моделям и приоритету каталога; равные по рангу маршрутизируемые строки сортируются по провайдеру и модели. Сохранённый порядок может менять отображение, а переключатели видимости фильтруют строки. До повторного открытия клиент может показывать старый каталог.", "models.custom": "Другое…", "models.customApply": "Применить", "models.customPlaceholder": "Токены (напр. 420000)", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index aee152cd39..ca233f452e 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -5,6 +5,20 @@ import type { TKey } from "./en"; * Turkish i18n catalog. Must match the `TKey` set (compile-checked). */ export const tr: Record = { + "models.pickerOrder.label": "Model sırası", + "models.pickerOrder.default": "Varsayılan", + "models.pickerOrder.alphabetical": "Model adına göre A–Z", + "models.pickerOrder.provider": "Sağlayıcıya göre", + "models.pickerOrder.mostUsed": "Kullanım anlık görüntüsü", + "models.pickerOrder.custom": "Özel sıra", + "models.pickerOrder.apply": "Sırayı uygula", + "models.pickerOrder.applying": "Uygulanıyor…", + "models.pickerOrder.saved": "Model sırası kaydedildi. Eski kataloğu gösteren istemcileri yeniden açın.", + "models.pickerOrder.pending": "Sıra kaydedildi; katalog yenilemesi bekleniyor.", + "models.pickerOrder.usageFailed": "Model kullanımı yüklenemedi.", + "models.pickerOrder.loadFailed": "Seçici ayarları yüklenemedi.", + "models.pickerOrder.retry": "Yeniden dene", + "models.pickerOrder.hint": "Codex ve Claude keşfi için yönlendirilen model sırasını kaydeder. Öne çıkan/yerel öncelik aralıkları korunur. Kullanım bir anlık görüntüdür; yerel araçta sunulan seçenekler değişebilir.", "codexAuth.quotaAutoRefreshAllHint": "Mevcut tüm hesapların desteklenen 5 saatlik ve haftalık pencerelerini birlikte açıp kapatır. Havuz modunda her sıfırlamadan sonra az miktarda kota kullanan bir istek gönderilir.", "codexAuth.quotaAutoRefreshMixed": "Bazı pencereler etkin.", "codexAuth.quotaAutoRefreshEmpty": "Desteklenen kota penceresi yok. Hesap kotalarını yenileyin.", @@ -576,7 +590,7 @@ export const tr: Record = { "models.setAllHint": "Her yönlendirilen sağlayıcıda {value} varsayılan pencereyi açar. Röle context_window / context_length vermezse bu değer gerçek Codex penceresi olur. Tek bir modeli elle yazmak için aynı satırdaki «Özel pencereler»i kullanın.", "models.collapseAll": "Tümünü daralt", "models.expandAll": "Tümünü genişlet", - "models.orderHint": "Seçici sırası: Alt ajan seçimleri → kalan modeller.", + "models.orderHint": "Varsayılan sıra öne çıkan seçimleri ve katalog önceliğini izler; eşit öncelikli yönlendirilmiş satırlar sağlayıcı ve modele göre sıralanır. Kaydedilmiş sıra görünümü değiştirebilir; görünürlük anahtarları satırları filtreler. İstemci yeniden açılana kadar eski kataloğu gösterebilir.", "models.custom": "Özel…", "models.customApply": "Uygula", "models.customPlaceholder": "Jetonlar (örn. 420000)", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 39c9e2f0b3..2b7e6ac6ba 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2,6 +2,20 @@ import type { TKey } from "./en"; /** Traditional Chinese (Taiwan) UI strings — keys must match `en.ts` 1:1. */ export const zhTW: Record = { + "models.pickerOrder.label": "模型選擇順序", + "models.pickerOrder.default": "預設", + "models.pickerOrder.alphabetical": "依模型名稱 A–Z", + "models.pickerOrder.provider": "依供應商分組", + "models.pickerOrder.mostUsed": "使用量快照", + "models.pickerOrder.custom": "自訂順序", + "models.pickerOrder.apply": "套用順序", + "models.pickerOrder.applying": "正在套用…", + "models.pickerOrder.saved": "選擇順序已儲存。若仍顯示舊目錄,請重新開啟用戶端。", + "models.pickerOrder.pending": "順序已儲存,目錄更新尚未完成。", + "models.pickerOrder.usageFailed": "無法載入模型使用量。", + "models.pickerOrder.loadFailed": "無法載入模型選擇設定。", + "models.pickerOrder.retry": "重試", + "models.pickerOrder.hint": "儲存 Codex 與 Claude 探索清單中的路由模型順序。保留精選與原生模型的優先級區間;使用量排序是快照,原生工具顯示的候選可能改變。", "codexAuth.quotaAutoRefreshAllHint": "統一切換目前所有帳戶各自支援的 5 小時與每週額度視窗。在帳戶池模式下,重設後會傳送消耗少量額度的請求。", "codexAuth.quotaAutoRefreshMixed": "部分視窗已啟用。", "codexAuth.quotaAutoRefreshEmpty": "沒有支援的額度視窗。請重新整理帳戶額度。", @@ -439,7 +453,7 @@ export const zhTW: Record = { "models.setAllHint": "為所有已路由供應商打開 {value} 預設視窗。中繼站沒回報 context_window / context_length 時,這個值就是 Codex 實際視窗。要幫單一模型手寫,用同一列上的「自訂視窗」。原生供應商不受影響。", "models.collapseAll": "全部摺疊", "models.expandAll": "全部展開", - "models.orderHint": "選擇器順序:Subagents 中的選擇(按所選順序)→ 其餘已路由模型(依次按供應商、模型 ID 字母排序)→ 原生模型。可見性開關僅用於篩選,不會改變此順序。", + "models.orderHint": "預設順序遵循精選項目與目錄優先級;同優先級的路由列依供應商、模型排序。儲存的選擇順序可改變顯示順序,可見性開關用於篩選顯示的列。用戶端重新開啟前可能仍顯示舊目錄。", "models.custom": "自訂…", "models.customApply": "套用", "models.customPlaceholder": "tokens (例如 420000)", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 1ba4cabfa8..42ac3941d4 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -4,6 +4,20 @@ import type { TKey } from "./en"; * Chinese i18n catalog; must match the `TKey` set (compile-checked). */ export const zh: Record = { + "models.pickerOrder.label": "模型选择顺序", + "models.pickerOrder.default": "默认", + "models.pickerOrder.alphabetical": "按模型名 A–Z", + "models.pickerOrder.provider": "按提供商分组", + "models.pickerOrder.mostUsed": "使用量快照", + "models.pickerOrder.custom": "自定义顺序", + "models.pickerOrder.apply": "应用顺序", + "models.pickerOrder.applying": "正在应用…", + "models.pickerOrder.saved": "选择顺序已保存。若仍显示旧目录,请重新打开客户端。", + "models.pickerOrder.pending": "顺序已保存,目录刷新尚未完成。", + "models.pickerOrder.usageFailed": "无法加载模型使用量。", + "models.pickerOrder.loadFailed": "无法加载模型选择设置。", + "models.pickerOrder.retry": "重试", + "models.pickerOrder.hint": "保存 Codex 和 Claude 发现列表中的路由模型顺序。保留精选与原生模型的优先级区间;使用量排序是快照,原生工具显示的候选可能变化。", "codexAuth.quotaAutoRefreshAllHint": "统一开关当前所有账户各自支持的 5 小时和每周额度窗口。在账户池模式下,重置后会发送消耗少量额度的请求。", "codexAuth.quotaAutoRefreshMixed": "部分窗口已启用。", "codexAuth.quotaAutoRefreshEmpty": "没有支持的额度窗口。请刷新账户额度。", @@ -568,7 +582,7 @@ export const zh: Record = { "models.setAllHint": "给所有已路由提供方打开 {value} 默认窗口。中转站没报 context_window / context_length 时,这个值就是 Codex 实际窗口。要给单个模型手写,用同一行上的「自定义窗口」。原生提供方不受影响。", "models.collapseAll": "全部折叠", "models.expandAll": "全部展开", - "models.orderHint": "选择器顺序:Subagents 中的选择(按所选顺序)→ 其余已路由模型(依次按提供方、模型 ID 字母排序)→ 原生模型。可见性开关仅用于筛选,不会改变此顺序。", + "models.orderHint": "默认顺序遵循精选项和目录优先级;同优先级的路由行按提供商、模型排序。保存的选择顺序可改变显示顺序,可见性开关用于筛选显示的行。客户端重新打开前可能仍显示旧目录。", "models.custom": "自定义…", "models.customApply": "应用", "models.customPlaceholder": "令牌 (例如 420000)", diff --git a/gui/src/model-picker-order.ts b/gui/src/model-picker-order.ts new file mode 100644 index 0000000000..9878b3dbd1 --- /dev/null +++ b/gui/src/model-picker-order.ts @@ -0,0 +1,103 @@ +export type ModelPickerOrderMode = "default" | "alphabetical" | "provider" | "most-used" | "custom"; +export type SavedModelPickerOrderMode = Exclude; +export interface ModelPickerUsage { + provider: string; + model: string; + resolvedModel?: string; + requests: number; +} +export interface PickerModelIdentity { provider: string; id: string; namespaced: string } +export interface PickerOrderSaved { + pickerOrder: string[]; + pickerOrderMode: SavedModelPickerOrderMode | null; +} +export interface PickerOrderSettings extends PickerOrderSaved { pickerAvailable: string[] } + +function stringList(value: unknown): value is string[] { + return Array.isArray(value) && value.every(id => typeof id === "string" && id.trim().length > 0); +} +function savedMode(value: unknown): value is SavedModelPickerOrderMode | null { + return value === null || value === "alphabetical" || value === "provider" || value === "most-used"; +} +export function isPickerOrderSaved(value: unknown): value is PickerOrderSaved { + if (value === null || typeof value !== "object") return false; + const row = value as Record; + return stringList(row.pickerOrder) && savedMode(row.pickerOrderMode); +} +export function isPickerOrderSettings(value: unknown): value is PickerOrderSettings { + return isPickerOrderSaved(value) && stringList((value as PickerOrderSettings).pickerAvailable); +} +export function isModelPickerUsage(value: unknown): value is ModelPickerUsage[] { + return Array.isArray(value) && value.every(row => row !== null && typeof row === "object" + && typeof row.provider === "string" && typeof row.model === "string" + && (row.resolvedModel === undefined || typeof row.resolvedModel === "string") + && typeof row.requests === "number" && Number.isFinite(row.requests) && row.requests >= 0); +} +function parts(slug: string): [string, string] { + const slash = slug.indexOf("/"); + return slash < 0 ? ["", slug] : [slug.slice(0, slash), slug.slice(slash + 1)]; +} +// Fixed locale makes snapshots independent of the user's display language/OS locale. +const compare = (a: string, b: string) => a.localeCompare(b, "en"); +function byProvider(a: string, b: string): number { + const [ap, am] = parts(a), [bp, bm] = parts(b); + return compare(ap, bp) || compare(am, bm); +} + +export function modelPickerOrder( + mode: Exclude, + models: readonly string[], + usage: readonly ModelPickerUsage[] = [], + identities: readonly PickerModelIdentity[] = [], +): string[] | null { + if (mode === "default") return null; + const unique = [...new Set(models)]; + if (mode === "alphabetical") return unique.sort((a, b) => compare(parts(a)[1], parts(b)[1]) || byProvider(a, b)); + if (mode === "provider") return unique.sort(byProvider); + const candidates = new Set(unique); + const raw = new Map>(); + const owners = new Map>(); + for (const row of identities) { + if (!candidates.has(row.namespaced)) continue; + const key = JSON.stringify([row.provider, row.id]); + const values = raw.get(key) ?? new Set(); + values.add(row.namespaced); + raw.set(key, values); + const sources = owners.get(row.namespaced) ?? new Set(); + sources.add(key); + owners.set(row.namespaced, sources); + } + const unambiguous = (slug: string): string | null => (owners.get(slug)?.size ?? 0) > 1 ? null : slug; + const resolve = (provider: string, id: string): string | null | undefined => { + const exact = raw.get(JSON.stringify([provider, id])); + if (exact) return exact.size === 1 ? unambiguous([...exact][0]!) : null; + // A raw upstream slash is not a namespace. Use the observed identity table above; + // only fall back to an exact same-provider catalog id or an ordinary bare model id. + if (id.startsWith(`${provider}/`) && candidates.has(id)) return unambiguous(id); + const slug = `${provider}/${id}`; + return !id.includes("/") && candidates.has(slug) ? unambiguous(slug) : undefined; + }; + const counts = new Map(); + for (const row of usage) { + const requested = resolve(row.provider, row.model); + const target = requested === undefined && row.resolvedModel !== undefined + ? resolve(row.provider, row.resolvedModel) : requested; + if (target) counts.set(target, (counts.get(target) ?? 0) + row.requests); + } + return unique.sort((a, b) => (counts.get(b) ?? 0) - (counts.get(a) ?? 0) || byProvider(a, b)); +} + +export function modelPickerOrderMode( + models: readonly string[], saved: readonly string[], mode?: SavedModelPickerOrderMode | null, +): ModelPickerOrderMode { + if (saved.length === 0) return "default"; + // Existing complete/native orders are never silently replaced by a routed preset. + if (saved.some(id => !id.includes("/"))) return "custom"; + if (mode === "alphabetical" || mode === "provider" || mode === "most-used") return mode; + if (new Set(saved).size !== saved.length || saved.length !== new Set(models).size + || saved.some(id => !models.includes(id))) return "custom"; + for (const preset of ["alphabetical", "provider"] as const) { + if (modelPickerOrder(preset, models)?.every((id, index) => id === saved[index])) return preset; + } + return "custom"; +} diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx index a78a57e6a8..cd6a034cee 100644 --- a/gui/src/pages/Models.tsx +++ b/gui/src/pages/Models.tsx @@ -13,7 +13,11 @@ import { readJsonIfOk, readJsonOrThrow } from "../fetch-json"; import { describeIntegrationRefusalParts } from "./integrations/refusal-copy"; import { readSessionListCache, writeSessionListCache } from "../session-list-cache"; import { setClientResourceData } from "../client-resource"; -import { createBoundedFetch } from "../bounded-fetch"; +import { createBoundedFetch, type BoundedFetch } from "../bounded-fetch"; +import { + isModelPickerUsage, isPickerOrderSaved, isPickerOrderSettings, modelPickerOrder, modelPickerOrderMode, + type ModelPickerOrderMode, type PickerOrderSettings, type ModelPickerUsage, +} from "../model-picker-order"; import { startVisibilityPoll } from "../visibility-poll"; import { useDataSurface } from "../data-surface"; import { DataSurfaceSkeleton } from "../components/data-surface"; @@ -217,6 +221,39 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; const [contextCaps, setContextCaps] = useState>(() => cached?.contextCaps ?? {}); const [contextCapValues, setContextCapValues] = useState>(() => cached?.contextCapValues ?? {}); const [contextCapValue, setContextCapValue] = useState(() => cached?.contextCapValue ?? 350_000); + const pickerCacheKey = `${cacheKey}:picker-order`; + const cachedPicker = useMemo(() => { + const value = readSessionListCache(pickerCacheKey); + return isPickerOrderSettings(value) ? value : undefined; + }, [pickerCacheKey]); + const [pickerDraft, setPickerDraft] = useState(null); + const [pickerBusy, setPickerBusy] = useState(false); + const pickerFlight = useRef(null); + const pickerResource = useDataSurface( + pickerCacheKey, [apiBase], + useCallback(async (signal: AbortSignal) => { + const response = await fetch(`${apiBase}/api/subagent-models`, { signal }); + const data = await readJsonOrThrow(response); + if (!isPickerOrderSettings(data)) throw new Error("picker settings payload missing"); + if (signal.aborted) throw new Error("picker settings request aborted"); + writeSessionListCache(pickerCacheKey, data); + return data; + }, [apiBase, pickerCacheKey]), + { isEmpty: () => false, enabled: catalogActive, deadlineMs: 15_000, initialData: cachedPicker }, + ); + const pickerSettings = pickerResource.state.data; + const pickerMode = pickerDraft ?? modelPickerOrderMode( + pickerSettings?.pickerAvailable ?? [], pickerSettings?.pickerOrder ?? [], pickerSettings?.pickerOrderMode, + ); + useEffect(() => { + setPickerDraft(null); + setPickerBusy(false); + return () => { + pickerFlight.current?.controller.abort(); + pickerFlight.current?.clear(); + pickerFlight.current = null; + }; + }, [apiBase, catalogActive]); const [customCap, setCustomCap] = useState(""); const [showCustom, setShowCustom] = useState(false); const [providerCapCustomOpen, setProviderCapCustomOpen] = useState>({}); @@ -486,6 +523,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; // Follow-up mutation refreshes retain their existing awaitable contract while publishing // the result through the same shared store used by the initial catalog subscription. setClientResourceData(cacheKey, next); + pickerResource.refresh(); return true; } catch { return false; @@ -494,7 +532,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; loadPendingRef.current = false; } } - }, [applyCatalog, cacheKey, fetchCatalog]); + }, [applyCatalog, cacheKey, fetchCatalog, pickerResource.refresh]); // Shadow/v2 controls must not wait on the models catalog (live discovery can be slow). useEffect(() => { @@ -1593,6 +1631,50 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; ? groups.filter(group => group.provider === selectedProvider) : groups; + const savePickerOrder = async () => { + if (pickerFlight.current || !pickerSettings || pickerResource.state.showError || pickerMode === "custom") return; + const mode = pickerMode; + const available = pickerSettings.pickerAvailable; + const bounded = createBoundedFetch(15_000); + pickerFlight.current = bounded; + setPickerBusy(true); + try { + let usage: ModelPickerUsage[] = []; + if (mode === "most-used") { + const response = await fetch(`${apiBase}/api/usage?range=all&surface=all`, { signal: bounded.signal }); + const payload = await readJsonOrThrow<{ models?: unknown }>(response, t("models.pickerOrder.usageFailed")); + if (!isModelPickerUsage(payload?.models)) throw new Error(t("models.pickerOrder.usageFailed")); + usage = payload.models; + } + const order = modelPickerOrder(mode, available, usage, models); + const response = await fetch(`${apiBase}/api/subagent-models`, { + method: "PUT", headers: { "Content-Type": "application/json" }, signal: bounded.signal, + body: JSON.stringify({ pickerOrder: order, pickerOrderMode: mode === "default" ? null : mode }), + }); + const data = await readJsonOrThrow(response, t("models.saveFailed")); + if (!isPickerOrderSaved(data) || !("ok" in data) || data.ok !== true) throw new Error(t("models.saveFailed")); + if (bounded.signal.aborted || pickerFlight.current !== bounded) return; + const next = { ...pickerSettings, pickerOrder: data.pickerOrder, pickerOrderMode: data.pickerOrderMode }; + // This aborts an older GET and advances the shared resource generation. + setClientResourceData(pickerCacheKey, next); + writeSessionListCache(pickerCacheKey, next); + setPickerDraft(null); + reloadAppServerState(bounded.signal); + const refresh = "catalogRefresh" in data ? data.catalogRefresh : undefined; + const converged = refresh !== null && typeof refresh === "object" + && "status" in refresh && refresh.status === "committed" + && "degraded" in refresh && refresh.degraded === false; + publishFeedback(converged, t(converged ? "models.pickerOrder.saved" : "models.pickerOrder.pending")); + } catch (error) { + if (pickerFlight.current === bounded) { + publishFeedback(false, error instanceof Error ? error.message : t("models.networkError")); + } + } finally { + bounded.clear(); + if (pickerFlight.current === bounded) { pickerFlight.current = null; setPickerBusy(false); } + } + }; + const controlsBlock = ( <>

@@ -1752,6 +1834,35 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; {t("models.setAllHint", { value: fmtK(contextCapValue) })}
+
+ {t("models.pickerOrder.label")} + { + onEdit?.(); + setDraft(event.target.value); + setValidationKey(null); + }} + /> +

+ {t("models.displayNameHelp", { model: model.namespaced })} +

+ {visibleError && ( + + )} + +
+ + + +
+ + + ); +} diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 9086c9bf42..817034bed6 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -2548,4 +2548,27 @@ export const de: Record = { "integrations.cursor.colReasoning": "Reasoning-Aufwand", "integrations.cursor.colContext": "Kontext", "integrations.cursor.guide": "Anleitung zu Cursor Private Inference öffnen", + "models.displayNameSavedRefreshFailed": "Die Änderung wurde gespeichert, aber die Modellliste konnte nicht aktualisiert werden. Versuchen Sie es erneut.", + "models.displayNameOutcomeUnknown": "Die Anfrage wurde nicht abgeschlossen. Die Änderung wurde möglicherweise gespeichert. Prüfen Sie den aktuellen Namen durch erneutes Versuchen, bevor Sie ihn weiter ändern.", + "models.displayNameCurrentUnavailable": "Aktueller Name erst nach Aktualisierung verfügbar", + "models.displayNameReloaded": "Modellliste aktualisiert", + "models.displayNameAction": "Name", + "models.displayNameActionLabel": "Anzeigenamen für {model} bearbeiten", + "models.displayNameTitle": "Anzeigename", + "models.displayNameModelId": "Modell-ID", + "models.displayNameCurrent": "Aktueller Name", + "models.displayNameSourceOperator": "Ihr Name", + "models.displayNameSourceProvider": "Anbietername", + "models.displayNameSourceFallback": "Modell-ID als Ersatz", + "models.displayNameField": "Anzeigename", + "models.displayNamePlaceholder": "z. B. Grok 4.6", + "models.displayNameHelp": "Ändert nur die Anzeige. Das Routing bleibt {model}.", + "models.displayNameReset": "Name zurücksetzen", + "models.displayNameSaved": "Anzeigename gespeichert", + "models.displayNameResetDone": "Anzeigename zurückgesetzt", + "models.displayNameSaveFailed": "Anzeigename konnte nicht gespeichert werden", + "models.displayNameRequired": "Geben Sie einen Anzeigenamen ein oder verwenden Sie Name zurücksetzen.", + "models.displayNameTooLong": "Der Anzeigename darf höchstens 128 Zeichen lang sein.", + "models.displayNameNoSlash": "Der Anzeigename darf kein / enthalten.", + "models.displayNameNoControl": "Der Anzeigename darf keine Steuerzeichen enthalten.", }; diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 0d2f1d05d4..a5ba86e2dd 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -2582,6 +2582,29 @@ export const en = { "usage.scope.machine": "This machine", "usage.scope.hub": "Hub-wide", "usage.hubOffline": "Hub usage is unavailable. Local usage was not substituted.", + "models.displayNameSavedRefreshFailed": "The change was saved, but the model list could not be refreshed. Retry to refresh it.", + "models.displayNameOutcomeUnknown": "The request did not finish. The change may have been saved. Retry to check the current name before making another change.", + "models.displayNameCurrentUnavailable": "Current name unavailable until refresh", + "models.displayNameReloaded": "Model list refreshed", + "models.displayNameAction": "Name", + "models.displayNameActionLabel": "Edit friendly name for {model}", + "models.displayNameTitle": "Friendly name", + "models.displayNameModelId": "Model ID", + "models.displayNameCurrent": "Current name", + "models.displayNameSourceOperator": "Your name", + "models.displayNameSourceProvider": "Provider name", + "models.displayNameSourceFallback": "Model ID fallback", + "models.displayNameField": "Friendly name", + "models.displayNamePlaceholder": "e.g. Grok 4.6", + "models.displayNameHelp": "Changes presentation only. Routing remains {model}.", + "models.displayNameReset": "Reset name", + "models.displayNameSaved": "Display name saved", + "models.displayNameResetDone": "Display name reset", + "models.displayNameSaveFailed": "Failed to save display name", + "models.displayNameRequired": "Enter a friendly name, or use Reset name.", + "models.displayNameTooLong": "Friendly name must be 128 characters or fewer.", + "models.displayNameNoSlash": "Friendly name cannot contain /.", + "models.displayNameNoControl": "Friendly name cannot contain control characters.", } as const; export type TKey = keyof typeof en; diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index b6eb03f0b0..fecc7ca243 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -2535,4 +2535,27 @@ export const fr: Record = { "integrations.cursor.colReasoning": "Raisonnement", "integrations.cursor.colContext": "Contexte", "integrations.cursor.guide": "Ouvrir le guide de Cursor Private Inference", + "models.displayNameSavedRefreshFailed": "La modification a été enregistrée, mais la liste des modèles n’a pas pu être actualisée. Réessayez.", + "models.displayNameOutcomeUnknown": "La requête n’a pas abouti. La modification a peut-être été enregistrée. Réessayez pour vérifier le nom actuel avant toute autre modification.", + "models.displayNameCurrentUnavailable": "Nom actuel indisponible avant actualisation", + "models.displayNameReloaded": "Liste des modèles actualisée", + "models.displayNameAction": "Nom", + "models.displayNameActionLabel": "Modifier le nom d’affichage de {model}", + "models.displayNameTitle": "Nom d’affichage", + "models.displayNameModelId": "ID du modèle", + "models.displayNameCurrent": "Nom actuel", + "models.displayNameSourceOperator": "Votre nom d’affichage", + "models.displayNameSourceProvider": "Nom du fournisseur", + "models.displayNameSourceFallback": "ID du modèle par défaut", + "models.displayNameField": "Nom d’affichage", + "models.displayNamePlaceholder": "p. ex. Grok 4.6", + "models.displayNameHelp": "Modifie uniquement l’affichage. Le routage reste {model}.", + "models.displayNameReset": "Réinitialiser le nom", + "models.displayNameSaved": "Nom d’affichage enregistré", + "models.displayNameResetDone": "Nom d’affichage réinitialisé", + "models.displayNameSaveFailed": "Impossible d’enregistrer le nom d’affichage", + "models.displayNameRequired": "Saisissez un nom d’affichage ou utilisez Réinitialiser le nom.", + "models.displayNameTooLong": "Le nom d’affichage doit contenir au maximum 128 caractères.", + "models.displayNameNoSlash": "Le nom d’affichage ne peut pas contenir /.", + "models.displayNameNoControl": "Le nom d’affichage ne peut pas contenir de caractères de contrôle.", }; diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 4b16912324..cf2a3df5a8 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -2569,4 +2569,27 @@ export const ja: Record = { "integrations.cursor.colReasoning": "推論", "integrations.cursor.colContext": "コンテキスト", "integrations.cursor.guide": "Cursor Private Inference のガイドを開く", + "models.displayNameSavedRefreshFailed": "変更は保存されましたが、モデル一覧を更新できませんでした。再試行してください。", + "models.displayNameOutcomeUnknown": "リクエストが完了しませんでした。変更が保存されている可能性があります。再度変更する前に再試行して現在の名前を確認してください。", + "models.displayNameCurrentUnavailable": "更新するまで現在の名前を確認できません", + "models.displayNameReloaded": "モデル一覧を更新しました", + "models.displayNameAction": "名前", + "models.displayNameActionLabel": "{model} の表示名を編集", + "models.displayNameTitle": "表示名", + "models.displayNameModelId": "モデル ID", + "models.displayNameCurrent": "現在の名前", + "models.displayNameSourceOperator": "設定した名前", + "models.displayNameSourceProvider": "プロバイダー名", + "models.displayNameSourceFallback": "モデル ID の既定値", + "models.displayNameField": "表示名", + "models.displayNamePlaceholder": "例: Grok 4.6", + "models.displayNameHelp": "表示だけを変更します。ルーティングは {model} のままです。", + "models.displayNameReset": "名前をリセット", + "models.displayNameSaved": "表示名を保存しました", + "models.displayNameResetDone": "表示名をリセットしました", + "models.displayNameSaveFailed": "表示名を保存できませんでした", + "models.displayNameRequired": "表示名を入力するか、名前をリセットしてください。", + "models.displayNameTooLong": "表示名は 128 文字以内にしてください。", + "models.displayNameNoSlash": "表示名に / は使用できません。", + "models.displayNameNoControl": "表示名に制御文字は使用できません。", }; diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index a87bf608e5..3c1d0b1497 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -2570,4 +2570,27 @@ export const ko: Record = { "integrations.cursor.colReasoning": "추론", "integrations.cursor.colContext": "컨텍스트", "integrations.cursor.guide": "Cursor Private Inference 가이드 열기", + "models.displayNameSavedRefreshFailed": "변경 사항은 저장되었지만 모델 목록을 새로 고치지 못했습니다. 다시 시도해 주세요.", + "models.displayNameOutcomeUnknown": "요청이 완료되지 않았습니다. 변경 사항이 저장되었을 수 있습니다. 다시 변경하기 전에 재시도하여 현재 이름을 확인하세요.", + "models.displayNameCurrentUnavailable": "새로 고침 전까지 현재 이름을 확인할 수 없음", + "models.displayNameReloaded": "모델 목록을 새로 고쳤습니다", + "models.displayNameAction": "이름", + "models.displayNameActionLabel": "{model}의 표시 이름 편집", + "models.displayNameTitle": "표시 이름", + "models.displayNameModelId": "모델 ID", + "models.displayNameCurrent": "현재 이름", + "models.displayNameSourceOperator": "운영자 지정 이름", + "models.displayNameSourceProvider": "프로바이더 제공 이름", + "models.displayNameSourceFallback": "모델 ID 기본값", + "models.displayNameField": "표시 이름", + "models.displayNamePlaceholder": "예: Grok 4.6", + "models.displayNameHelp": "표시 방식만 변경합니다. 라우팅은 {model}로 유지됩니다.", + "models.displayNameReset": "이름 초기화", + "models.displayNameSaved": "표시 이름이 저장되었습니다", + "models.displayNameResetDone": "표시 이름이 초기화되었습니다", + "models.displayNameSaveFailed": "표시 이름을 저장하지 못했습니다", + "models.displayNameRequired": "표시 이름을 입력하거나 이름 초기화를 사용하세요.", + "models.displayNameTooLong": "표시 이름은 128자 이하여야 합니다.", + "models.displayNameNoSlash": "표시 이름에 /를 사용할 수 없습니다.", + "models.displayNameNoControl": "표시 이름에 제어 문자를 사용할 수 없습니다.", }; diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 70eb364002..b7f02bdf50 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -2571,4 +2571,27 @@ export const ru: Record = { "integrations.cursor.colReasoning": "Рассуждения", "integrations.cursor.colContext": "Контекст", "integrations.cursor.guide": "Открыть руководство по Cursor Private Inference", + "models.displayNameSavedRefreshFailed": "Изменение сохранено, но список моделей не удалось обновить. Повторите попытку.", + "models.displayNameOutcomeUnknown": "Запрос не завершён. Изменение могло сохраниться. Повторите попытку, чтобы проверить текущее имя перед следующим изменением.", + "models.displayNameCurrentUnavailable": "Текущее имя недоступно до обновления", + "models.displayNameReloaded": "Список моделей обновлён", + "models.displayNameAction": "Имя", + "models.displayNameActionLabel": "Изменить понятное имя для {model}", + "models.displayNameTitle": "Понятное имя", + "models.displayNameModelId": "ID модели", + "models.displayNameCurrent": "Текущее имя", + "models.displayNameSourceOperator": "Ваше имя", + "models.displayNameSourceProvider": "Имя провайдера", + "models.displayNameSourceFallback": "ID модели по умолчанию", + "models.displayNameField": "Понятное имя", + "models.displayNamePlaceholder": "например, Grok 4.6", + "models.displayNameHelp": "Меняет только отображение. Маршрут остаётся {model}.", + "models.displayNameReset": "Сбросить имя", + "models.displayNameSaved": "Понятное имя сохранено", + "models.displayNameResetDone": "Понятное имя сброшено", + "models.displayNameSaveFailed": "Не удалось сохранить понятное имя", + "models.displayNameRequired": "Введите понятное имя или используйте Сбросить имя.", + "models.displayNameTooLong": "Понятное имя должно содержать не более 128 символов.", + "models.displayNameNoSlash": "Понятное имя не может содержать /.", + "models.displayNameNoControl": "Понятное имя не может содержать управляющие символы.", }; diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index ca233f452e..b18d1cb360 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -2571,4 +2571,27 @@ export const tr: Record = { "integrations.cursor.colReasoning": "Akıl yürütme", "integrations.cursor.colContext": "Bağlam", "integrations.cursor.guide": "Cursor Private Inference kılavuzunu aç", + "models.displayNameSavedRefreshFailed": "Değişiklik kaydedildi ancak model listesi yenilenemedi. Yenilemek için tekrar deneyin.", + "models.displayNameOutcomeUnknown": "İstek tamamlanmadı. Değişiklik kaydedilmiş olabilir. Başka bir değişiklik yapmadan önce geçerli adı kontrol etmek için tekrar deneyin.", + "models.displayNameCurrentUnavailable": "Geçerli ad yenilemeye kadar kullanılamıyor", + "models.displayNameReloaded": "Model listesi yenilendi", + "models.displayNameAction": "Ad", + "models.displayNameActionLabel": "{model} için görünen adı düzenle", + "models.displayNameTitle": "Görünen ad", + "models.displayNameModelId": "Model kimliği", + "models.displayNameCurrent": "Geçerli ad", + "models.displayNameSourceOperator": "Sizin adınız", + "models.displayNameSourceProvider": "Sağlayıcı adı", + "models.displayNameSourceFallback": "Model kimliği varsayılanı", + "models.displayNameField": "Görünen ad", + "models.displayNamePlaceholder": "örn. Grok 4.6", + "models.displayNameHelp": "Yalnızca görünümü değiştirir. Yönlendirme {model} olarak kalır.", + "models.displayNameReset": "Adı sıfırla", + "models.displayNameSaved": "Görünen ad kaydedildi", + "models.displayNameResetDone": "Görünen ad sıfırlandı", + "models.displayNameSaveFailed": "Görünen ad kaydedilemedi", + "models.displayNameRequired": "Bir görünen ad girin veya Adı sıfırla seçeneğini kullanın.", + "models.displayNameTooLong": "Görünen ad en fazla 128 karakter olabilir.", + "models.displayNameNoSlash": "Görünen ad / içeremez.", + "models.displayNameNoControl": "Görünen ad denetim karakterleri içeremez.", }; diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 2b7e6ac6ba..463c2c88e5 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2533,4 +2533,27 @@ export const zhTW: Record = { "integrations.cursor.colReasoning": "推理", "integrations.cursor.colContext": "上下文", "integrations.cursor.guide": "開啟 Cursor Private Inference 指南", + "models.displayNameSavedRefreshFailed": "變更已儲存,但無法重新整理模型清單。請重試。", + "models.displayNameOutcomeUnknown": "請求未完成。變更可能已儲存。再次變更之前,請重試以檢查目前名稱。", + "models.displayNameCurrentUnavailable": "重新整理之前無法取得目前名稱", + "models.displayNameReloaded": "模型清單已重新整理", + "models.displayNameAction": "名稱", + "models.displayNameActionLabel": "編輯 {model} 的友善名稱", + "models.displayNameTitle": "友善名稱", + "models.displayNameModelId": "模型 ID", + "models.displayNameCurrent": "目前名稱", + "models.displayNameSourceOperator": "你的名稱", + "models.displayNameSourceProvider": "供應商名稱", + "models.displayNameSourceFallback": "模型 ID 預設值", + "models.displayNameField": "友善名稱", + "models.displayNamePlaceholder": "例如 Grok 4.6", + "models.displayNameHelp": "只變更顯示方式。路由仍為 {model}。", + "models.displayNameReset": "重設名稱", + "models.displayNameSaved": "友善名稱已儲存", + "models.displayNameResetDone": "友善名稱已重設", + "models.displayNameSaveFailed": "無法儲存友善名稱", + "models.displayNameRequired": "請輸入友善名稱,或使用重設名稱。", + "models.displayNameTooLong": "友善名稱不能超過 128 個字元。", + "models.displayNameNoSlash": "友善名稱不能包含 /。", + "models.displayNameNoControl": "友善名稱不能包含控制字元。", }; diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 42ac3941d4..1c6694fc8b 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -2569,4 +2569,27 @@ export const zh: Record = { "integrations.cursor.colReasoning": "推理", "integrations.cursor.colContext": "上下文", "integrations.cursor.guide": "打开 Cursor Private Inference 指南", + "models.displayNameSavedRefreshFailed": "更改已保存,但无法刷新模型列表。请重试以刷新。", + "models.displayNameOutcomeUnknown": "请求未完成。更改可能已保存。再次更改之前,请重试以检查当前名称。", + "models.displayNameCurrentUnavailable": "刷新之前无法获取当前名称", + "models.displayNameReloaded": "模型列表已刷新", + "models.displayNameAction": "名称", + "models.displayNameActionLabel": "编辑 {model} 的友好名称", + "models.displayNameTitle": "友好名称", + "models.displayNameModelId": "模型 ID", + "models.displayNameCurrent": "当前名称", + "models.displayNameSourceOperator": "你的名称", + "models.displayNameSourceProvider": "提供商名称", + "models.displayNameSourceFallback": "模型 ID 默认值", + "models.displayNameField": "友好名称", + "models.displayNamePlaceholder": "例如 Grok 4.6", + "models.displayNameHelp": "仅更改显示方式。路由仍为 {model}。", + "models.displayNameReset": "重置名称", + "models.displayNameSaved": "友好名称已保存", + "models.displayNameResetDone": "友好名称已重置", + "models.displayNameSaveFailed": "无法保存友好名称", + "models.displayNameRequired": "请输入友好名称,或使用重置名称。", + "models.displayNameTooLong": "友好名称不能超过 128 个字符。", + "models.displayNameNoSlash": "友好名称不能包含 /。", + "models.displayNameNoControl": "友好名称不能包含控制字符。", }; diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx index 22ea51bc20..b7b3a0e285 100644 --- a/gui/src/pages/Models.tsx +++ b/gui/src/pages/Models.tsx @@ -1,4 +1,5 @@ import { CodexStaleBanner } from "../components/codex-stale-banner"; +import ModelDisplayNameDialog from "../components/ModelDisplayNameDialog"; import { fetchCodexAppServerState } from "../codex-app-server-state"; import type { AppServerStateOutcome } from "../codex-app-server-state"; import { useCodexRestart } from "../use-codex-restart"; @@ -8,7 +9,7 @@ import { IconChevron, IconBoxes, IconInfo, IconCheck, IconAlert, IconRefresh, Ic import { useT } from "../i18n/shared"; import type { TFn, TKey } from "../i18n/shared"; import { modelLabel } from "../model-display"; -import { formatNamespacedModelId, formatProviderDisplayName, providerDisplaySlug } from "../provider-icons"; +import { formatProviderDisplayName, providerDisplaySlug } from "../provider-icons"; import { readJsonIfOk, readJsonOrThrow } from "../fetch-json"; import { describeIntegrationRefusalParts } from "./integrations/refusal-copy"; import { readSessionListCache, writeSessionListCache } from "../session-list-cache"; @@ -328,6 +329,22 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; const [showThreadsCustom, setShowThreadsCustom] = useState(false); const [v2HelpOpen, setV2HelpOpen] = useState(false); const [customModalOpen, setCustomModalOpen] = useState(false); + const [displayNameModel, setDisplayNameModel] = useState(null); + const [displayNameSaving, setDisplayNameSaving] = useState(false); + const [displayNameRequestError, setDisplayNameRequestError] = useState(null); + const [displayNameRecovery, setDisplayNameRecovery] = useState<{ + value: string | null | undefined; + confirmed: boolean; + } | null>(null); + const [displayNameCurrentPending, setDisplayNameCurrentPending] = useState(false); + const displayNameRequestRef = useRef(null); + const displayNameSavingRef = useRef(false); + useEffect(() => () => { + displayNameRequestRef.current?.controller.abort(); + displayNameRequestRef.current?.clear(); + displayNameRequestRef.current = null; + }, []); + const displayNameTriggerRef = useRef(null); const reloadAliases = useCallback(async (signal?: AbortSignal) => { const response = await fetch(`${apiBase}/api/aliases`, { signal }); @@ -535,12 +552,12 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; ); const catalogState = catalogResource.state; - const load = useCallback(async (force = false): Promise => { + const load = useCallback(async (force = false, signal?: AbortSignal): Promise => { if (loadPendingRef.current && !force) return false; loadPendingRef.current = true; const generation = ++loadGenerationRef.current; try { - const next = await fetchCatalog(new AbortController().signal); + const next = await fetchCatalog(signal ?? new AbortController().signal); if (!shouldApplyLoadGeneration(generation, loadGenerationRef.current)) return false; applyCatalog(next); // Follow-up mutation refreshes retain their existing awaitable contract while publishing @@ -557,6 +574,106 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; } }, [applyCatalog, cacheKey, fetchCatalog, pickerResource.refresh]); + const finishDisplayNameEdit = useCallback(() => { + const trigger = displayNameTriggerRef.current; + setDisplayNameModel(null); + setDisplayNameRequestError(null); + setDisplayNameRecovery(null); + setDisplayNameCurrentPending(false); + window.setTimeout(() => { + if (trigger?.isConnected) trigger.focus(); + }, 0); + }, []); + + const closeDisplayNameEdit = useCallback(() => { + if (!displayNameSavingRef.current) finishDisplayNameEdit(); + }, [finishDisplayNameEdit]); + + // undefined retries only the read after a confirmed write or an unknown outcome. + const saveDisplayName = useCallback(async (displayName: string | null | undefined) => { + const model = displayNameModel; + if (!model || displayNameSavingRef.current) return; + const bounded = createBoundedFetch(60_000); + displayNameRequestRef.current = bounded; + displayNameSavingRef.current = true; + setDisplayNameSaving(true); + setDisplayNameRequestError(null); + let confirmed = displayName === undefined && displayNameRecovery?.confirmed === true; + let refreshOnly = displayName === undefined; + try { + if (displayName !== undefined) { + const response = await fetch( + `${apiBase}/api/providers/${encodeURIComponent(model.provider)}/model-display-names`, + { + method: "PUT", + headers: { "content-type": "application/json" }, + body: JSON.stringify({ modelId: model.id, displayName }), + signal: bounded.signal, + }, + ); + // The route can persist the value and return 503 when catalog convergence fails. + // Keep that receipt instead of throwing away saved:true with the error body. + type DisplayNameReceipt = { + saved?: boolean; + error?: string; + displayName?: string; + displayNameOverride?: string | null; + displayNameSource?: ModelRow["displayNameSource"]; + }; + const result: DisplayNameReceipt | undefined = response.ok + ? await readJsonOrThrow(response, t("models.displayNameSaveFailed")) + : await response.json(); + bounded.signal.throwIfAborted(); + if (!result) throw new Error(t("models.displayNameSaveFailed")); + confirmed = response.ok || result.saved === true; + if (confirmed) { + const override = result.displayNameOverride === null ? undefined + : result.displayNameOverride ?? displayName ?? undefined; + const fields: Pick = { + displayName: result.displayName ?? override, + displayNameOverride: override, + displayNameSource: result.displayNameSource ?? (override ? "operator" : undefined), + }; + setModels(current => current.map(row => row.namespaced === model.namespaced ? { ...row, ...fields } : row)); + setDisplayNameModel({ ...model, ...fields }); + // A saved:true reset receipt omits the provider's effective fallback label. + setDisplayNameCurrentPending(fields.displayName === undefined); + } + if (!response.ok) { + throw new Error(result.error || t("models.displayNameSaveFailed")); + } + refreshOnly = true; + } + if (!await load(true, bounded.signal)) throw new Error(t("models.loadFail")); + bounded.signal.throwIfAborted(); + publishFeedback(true, confirmed + ? t(displayName === null || (displayName === undefined && displayNameRecovery?.value === null) + ? "models.displayNameResetDone" : "models.displayNameSaved") + : t("models.displayNameReloaded")); + finishDisplayNameEdit(); + } catch (error) { + if (displayNameRequestRef.current !== bounded) return; + if (bounded.signal.aborted && !confirmed) setDisplayNameCurrentPending(true); + setDisplayNameRecovery(confirmed || bounded.signal.aborted || refreshOnly + ? { value: refreshOnly || bounded.signal.aborted ? undefined : displayName, confirmed } + : null); + setDisplayNameRequestError(confirmed + ? t("models.displayNameSavedRefreshFailed") + : bounded.signal.aborted || refreshOnly + ? t("models.displayNameOutcomeUnknown") + : error instanceof Error && error.message + ? error.message + : t("models.displayNameSaveFailed")); + } finally { + bounded.clear(); + if (displayNameRequestRef.current === bounded) { + displayNameRequestRef.current = null; + displayNameSavingRef.current = false; + setDisplayNameSaving(false); + } + } + }, [apiBase, displayNameModel, displayNameRecovery, finishDisplayNameEdit, load, t]); + // Shadow/v2 controls must not wait on the models catalog (live discovery can be slow). useEffect(() => { // Both belong to the catalog tab; a hidden panel polling /api/v2 every ten seconds @@ -1537,9 +1654,31 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; void applyVisibility("models", provider, [{ id: m.id, native: m.native === true }], off)} disabled={busy || m.initialSelectionPending} label={m.native ? m.id : m.namespaced} /> {m.initialSelectionPending && {t("models.initialSelectionPending")}} {aliases.models[provider]?.[m.id] && {aliases.models[provider][m.id].alias}} - {m.native ? modelLabel(m.id) : formatNamespacedModelId(m.namespaced, t)} + + {m.native ? modelLabel(m.id) : m.namespaced} + {!m.native && m.displayName?.trim() && m.displayName.trim() !== m.namespaced && ( + {m.displayName.trim()} + )} + {aliases.models[provider]?.[m.id]?.source === "builtin" && {t("models.aliasAuto")}} + {!m.native && !m.custom && ( + + )} {m.custom && ( {t("models.customBadge")} @@ -2485,6 +2624,20 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; )}
+ + {displayNameModel && ( + void saveDisplayName(displayNameRecovery.value) : undefined} + onEdit={() => setDisplayNameRecovery(null)} + onSave={value => void saveDisplayName(value)} + onReset={() => void saveDisplayName(null)} + onClose={closeDisplayNameEdit} + /> + )} ); diff --git a/gui/src/pages/models-shared.ts b/gui/src/pages/models-shared.ts index fdc487301c..1f5ef7786b 100644 --- a/gui/src/pages/models-shared.ts +++ b/gui/src/pages/models-shared.ts @@ -1,4 +1,4 @@ -import type { TFn } from "../i18n/shared"; +import type { TFn, TKey } from "../i18n/shared"; import type { ProviderDiscoverySummary } from "../models-groups"; import { modelVisible, type ProviderModelMap } from "../model-visibility"; import { formatNamespacedModelId } from "../provider-icons"; @@ -35,6 +35,8 @@ export interface ModelRow { custom?: boolean; customId?: string; displayName?: string; + displayNameOverride?: string; + displayNameSource?: "operator" | "provider" | "fallback"; inputModalities?: string[]; contextWindow?: number; contextCap?: number; @@ -43,6 +45,26 @@ export interface ModelRow { reasoningEfforts?: string[]; } +function containsDisplayNameControlCharacter(value: string): boolean { + return [...value].some(character => { + const codePoint = character.codePointAt(0)!; + return codePoint <= 0x1f + || (codePoint >= 0x7f && codePoint <= 0x9f) + || codePoint === 0x2028 + || codePoint === 0x2029; + }); +} + +/** Mirror the server display-name contract for immediate form feedback. */ +export function modelDisplayNameValidationKey(value: string): TKey | null { + const trimmed = value.trim(); + if (!trimmed) return "models.displayNameRequired"; + if (trimmed.length > 128) return "models.displayNameTooLong"; + if (trimmed.includes("/")) return "models.displayNameNoSlash"; + if (containsDisplayNameControlCharacter(trimmed)) return "models.displayNameNoControl"; + return null; +} + /** * Reasoning-effort labels offered in the custom-model dialog. The full set of real * `reasoning_effort` values (none, minimal, low, medium, high, xhigh, max). Deliberately diff --git a/gui/src/styles.css b/gui/src/styles.css index b0bbc0a6ff..630882006f 100644 --- a/gui/src/styles.css +++ b/gui/src/styles.css @@ -2639,6 +2639,52 @@ button.prov-account-row.active { cursor: default; } /* ---- model row hover tooltip ---- */ .model-row-wrap { position: relative; } +.models-model-identity { + display: inline-flex; + min-width: 0; + flex-direction: column; + align-items: flex-start; + gap: 1px; +} +.models-model-friendly { + max-width: min(42vw, 420px); + overflow: hidden; + color: var(--muted); + text-overflow: ellipsis; + white-space: nowrap; +} +.models-display-name-trigger { flex-shrink: 0; } +.model-display-name-dialog { max-width: 460px; } +.model-display-name-identity, +.model-display-name-current { + display: grid; + gap: 5px; + margin-bottom: 16px; +} +.model-display-name-identity code { + overflow-wrap: anywhere; + color: var(--text); +} +.model-display-name-current { + grid-template-columns: 1fr auto; + align-items: center; +} +.model-display-name-current > .text-label { grid-column: 1 / -1; } +.model-display-name-current strong { min-width: 0; overflow-wrap: anywhere; } +.model-display-name-dialog > .input { margin-bottom: 6px; } +.model-display-name-error { + margin-top: 8px; + color: var(--red); + font-size: var(--text-label); + line-height: var(--leading-body); +} +@media (max-width: 560px) { + .models-model-friendly { max-width: 58vw; } + .model-display-name-current { grid-template-columns: 1fr; } + .model-display-name-current > .text-label { grid-column: auto; } + .model-display-name-dialog .modal-actions { align-items: stretch; flex-direction: column; } + .model-display-name-dialog .modal-actions .btn { width: 100%; } +} .model-tip { z-index: 10; background: var(--surface); diff --git a/gui/tests/models-display-name-editor.test.tsx b/gui/tests/models-display-name-editor.test.tsx new file mode 100644 index 0000000000..be64333944 --- /dev/null +++ b/gui/tests/models-display-name-editor.test.tsx @@ -0,0 +1,657 @@ +import { afterEach, beforeEach, describe, expect, jest, test } from "bun:test"; +import { Window } from "happy-dom"; +import { act } from "react"; +import type { Root } from "react-dom/client"; +import ModelDisplayNameDialog from "../src/components/ModelDisplayNameDialog"; +import { clearClientResourceStoresForTests } from "../src/client-resource"; +import { LanguageProvider } from "../src/i18n/provider"; +import { installApiAuthFetch, resetApiAuthFetchForTests } from "../src/api"; +import Models from "../src/pages/Models"; +import type { ModelRow } from "../src/pages/models-shared"; +import { modelDisplayNameValidationKey } from "../src/pages/models-shared"; + +describe("discovered model display name validation", () => { + test("accepts a safe label at both ordinary and maximum length", () => { + expect(modelDisplayNameValidationKey("Grok 4.6")).toBeNull(); + expect(modelDisplayNameValidationKey("A".repeat(128))).toBeNull(); + expect(modelDisplayNameValidationKey("모델 이름")).toBeNull(); + expect(modelDisplayNameValidationKey("🚀".repeat(64))).toBeNull(); + expect(modelDisplayNameValidationKey("🚀".repeat(65))).toBe("models.displayNameTooLong"); + }); + + test("rejects values that the management API cannot persist", () => { + expect(modelDisplayNameValidationKey(" ")).toBe("models.displayNameRequired"); + expect(modelDisplayNameValidationKey("Grok/4.6")).toBe("models.displayNameNoSlash"); + for (const control of ["\n", "\u0000", "\u007f", "\u0085", "\u2028", "\u2029"]) { + expect(modelDisplayNameValidationKey(`Grok${control}4.6`)).toBe("models.displayNameNoControl"); + } + expect(modelDisplayNameValidationKey("A".repeat(129))).toBe("models.displayNameTooLong"); + }); +}); + +describe("discovered model display name responsive styles", () => { + test("keeps the narrow action order aligned with keyboard navigation", async () => { + const styles = await Bun.file(new URL("../src/styles.css", import.meta.url)).text(); + + expect(styles).toContain( + ".model-display-name-dialog .modal-actions { align-items: stretch; flex-direction: column; }", + ); + expect(styles).not.toContain( + ".model-display-name-dialog .modal-actions { align-items: stretch; flex-direction: column-reverse; }", + ); + }); +}); + +describe("Models dashboard discovered display name integration", () => { + const globals = [ + "document", "window", "navigator", "localStorage", "sessionStorage", + "IS_REACT_ACT_ENVIRONMENT", "fetch", "setInterval", "clearInterval", + ] as const; + let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; + let testWindow: Window; + let container: HTMLElement; + let root: Root | null; + let mutationBodies: Array<{ modelId: string; displayName: string | null }>; + let mutationFailure: string | null; + let savedFailure: boolean; + let mutationGate: Promise | null; + let modelFetches: number; + let modelFetchFailure: string | null; + let currentModels: ModelRow[]; + + const routedModel = (): ModelRow => ({ + provider: "xai-demo", + id: "grok-4.6", + namespaced: "xai-demo/grok-4.6", + disabled: false, + displayName: "Grok 4.6", + displayNameOverride: "Grok 4.6", + displayNameSource: "operator", + }); + + beforeEach(() => { + clearClientResourceStoresForTests(); + previousGlobals = Object.fromEntries( + globals.map(key => [key, Object.getOwnPropertyDescriptor(globalThis, key)]), + ) as typeof previousGlobals; + testWindow = new Window({ url: "http://localhost/#models" }); + Object.defineProperties(globalThis, { + document: { configurable: true, value: testWindow.document }, + window: { configurable: true, value: testWindow }, + navigator: { configurable: true, value: testWindow.navigator }, + localStorage: { configurable: true, value: testWindow.localStorage }, + sessionStorage: { configurable: true, value: testWindow.sessionStorage }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true }, + setInterval: { configurable: true, value: () => 1 }, + clearInterval: { configurable: true, value: () => {} }, + }); + currentModels = [ + routedModel(), + { + provider: "command-code", + id: "deepseek-deepseek-v4-flash", + namespaced: "command-code/deepseek-deepseek-v4-flash", + disabled: false, + displayName: "DeepSeek V4 Flash", + displayNameSource: "provider", + }, + { provider: "openai", id: "gpt-5.5", namespaced: "openai/gpt-5.5", disabled: false, native: true }, + { + provider: "xai-demo", id: "custom-one", namespaced: "xai-demo/custom-one", + disabled: false, custom: true, customId: "custom-1", displayName: "Custom One", + }, + ]; + mutationBodies = []; + mutationFailure = null; + savedFailure = false; + resetApiAuthFetchForTests(); + mutationGate = null; + modelFetches = 0; + modelFetchFailure = null; + testWindow.localStorage.setItem("ocx-models-collapsed:v2", JSON.stringify([])); + testWindow.sessionStorage.setItem("ocx.models.catalog.v1:http://localhost", JSON.stringify({ + models: currentModels, + providers: [ + { name: "xai-demo", liveModels: false, models: ["grok-4.6", "custom-one"] }, + { name: "command-code", liveModels: false, models: ["deepseek-deepseek-v4-flash"] }, + { name: "openai", liveModels: false, models: ["gpt-5.5"] }, + ], + selectedModels: {}, + disabled: [], + contextCaps: {}, + contextCapValue: 350_000, + })); + + globalThis.fetch = (async (input, init) => { + const url = String(input); + if (url.endsWith("/api/models")) { + modelFetches += 1; + if (modelFetchFailure) { + return Response.json({ error: modelFetchFailure }, { status: 500 }); + } + return Response.json(currentModels); + } + if (url.endsWith("/api/providers")) return Response.json([ + { name: "xai-demo", liveModels: false, models: ["grok-4.6", "custom-one"] }, + { name: "command-code", liveModels: false, models: ["deepseek-deepseek-v4-flash"] }, + { name: "openai", liveModels: false, models: ["gpt-5.5"] }, + ]); + if (url.endsWith("/api/selected-models")) return Response.json({ selected: {} }); + if (url.endsWith("/api/provider-context-caps")) return Response.json({ caps: {} }); + if (url.endsWith("/api/aliases")) return Response.json({ providers: {}, models: {}, defaults: { global: false, providers: {} } }); + if (url.endsWith("/api/combos")) return Response.json({ combos: [] }); + if (url.endsWith("/api/shadow-call-settings")) return Response.json({ enabled: false, model: "" }); + if (url.endsWith("/api/v2")) return Response.json({ enabled: false, agentsMaxThreadsConflict: false, multiAgentMode: "default" }); + if (url.includes("/api/providers/xai-demo/model-display-names") && init?.method === "PUT") { + const body = JSON.parse(String(init.body)) as { modelId: string; displayName: string | null }; + mutationBodies.push(body); + if (mutationGate) await mutationGate; + if (mutationFailure && !savedFailure) return Response.json({ error: mutationFailure }, { status: 500 }); + currentModels = currentModels.map(row => row.namespaced !== "xai-demo/grok-4.6" ? row : { + ...row, + displayName: body.displayName ?? "xai-demo/grok-4.6", + displayNameOverride: body.displayName ?? undefined, + displayNameSource: body.displayName ? "operator" : "fallback", + }); + if (savedFailure) return Response.json({ + error: "model display name saved but catalog refresh failed", + saved: true, + displayNameOverride: body.displayName, + }, { status: 503 }); + const row = currentModels.find(model => model.namespaced === "xai-demo/grok-4.6")!; + return Response.json({ + ok: true, + displayName: row.displayName, + displayNameOverride: row.displayNameOverride ?? null, + displayNameSource: row.displayNameSource, + }); + } + return new Response(null, { status: 404 }); + }) as typeof fetch; + + container = testWindow.document.createElement("div"); + testWindow.document.body.appendChild(container as never); + root = null; + }); + + afterEach(async () => { + resetApiAuthFetchForTests(); + clearClientResourceStoresForTests(); + if (root) { + const mounted = root; + await act(async () => mounted.unmount()); + } + testWindow.close(); + for (const key of globals) { + const descriptor = previousGlobals[key]; + if (descriptor) Object.defineProperty(globalThis, key, descriptor); + else Reflect.deleteProperty(globalThis, key); + } + }); + + async function flush() { + await act(async () => { + await new Promise(resolve => testWindow.setTimeout(resolve, 0)); + await Promise.resolve(); + }); + } + + async function mountModels() { + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root = createRoot(container); + root.render(); + }); + await flush(); + } + + function nameTrigger(): HTMLButtonElement { + return container.querySelector( + '[aria-label="Edit friendly name for xai-demo/grok-4.6"]', + )!; + } + + function dialogInput(): HTMLInputElement { + return container.querySelector("dialog")! + .querySelector("input")!; + } + + function setInputValue(input: HTMLInputElement, value: string) { + Object.getOwnPropertyDescriptor(testWindow.HTMLInputElement.prototype, "value")! + .set!.call(input, value); + input.dispatchEvent(new testWindow.Event("input", { bubbles: true })); + } + + function dialogButton(label: string): HTMLButtonElement { + return [...container.querySelectorAll("dialog button")] + .find(button => button.textContent === label)!; + } + + test("only discovered rows expose Name while showing friendly and exact identities", async () => { + await mountModels(); + + expect(nameTrigger()).not.toBeNull(); + expect(container.querySelectorAll('[aria-label^="Edit friendly name for "]')).toHaveLength(2); + expect(container.querySelector('[aria-label="Edit friendly name for openai/gpt-5.5"]')).toBeNull(); + expect(container.querySelector('[aria-label="Edit friendly name for xai-demo/custom-one"]')).toBeNull(); + expect(container.textContent).toContain("Grok 4.6"); + expect(container.textContent).toContain("xai-demo/grok-4.6"); + expect([...container.querySelectorAll("code")].some(code => + code.textContent === "command-code/deepseek-deepseek-v4-flash" + )).toBe(true); + expect(container.textContent).toContain("Custom One"); + }); + + test("save and reset send exact payloads, reload the catalog, and restore trigger focus", async () => { + await mountModels(); + const trigger = nameTrigger(); + const fetchesBeforeSave = modelFetches; + + await act(async () => trigger.click()); + await act(async () => { + setInputValue(dialogInput(), " Grok Fast "); + dialogButton("Save").click(); + }); + await flush(); + + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: "Grok Fast" }]); + expect(modelFetches).toBeGreaterThan(fetchesBeforeSave); + expect(container.querySelector("dialog")).toBeNull(); + expect(container.textContent).toContain("Grok Fast"); + expect(testWindow.document.activeElement).toBe(trigger); + + await act(async () => nameTrigger().click()); + await act(async () => dialogButton("Reset name").click()); + await flush(); + + expect(mutationBodies[1]).toEqual({ modelId: "grok-4.6", displayName: null }); + expect(container.querySelector("dialog")).toBeNull(); + expect(container.textContent).toContain("xai-demo/grok-4.6"); + }); + + test("a server failure keeps the dialog and edited draft available for retry", async () => { + mutationFailure = "Catalog refresh failed"; + await mountModels(); + await act(async () => nameTrigger().click()); + await act(async () => { + setInputValue(dialogInput(), "Retry Name"); + dialogButton("Save").click(); + }); + await flush(); + + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: "Retry Name" }]); + expect(container.querySelector("dialog")).not.toBeNull(); + expect(dialogInput().value).toBe("Retry Name"); + expect(container.textContent).toContain("Catalog refresh failed"); + expect(testWindow.document.activeElement).toBe(dialogInput()); + mutationFailure = null; + await act(async () => dialogButton("Save").click()); + await flush(); + expect(mutationBodies).toHaveLength(2); + expect(currentModels[0]!.displayNameOverride).toBe("Retry Name"); + expect(container.querySelector("dialog")).toBeNull(); + }); + + test("a failed catalog reload after save keeps the dialog available for retry", async () => { + await mountModels(); + modelFetchFailure = "Catalog reload failed"; + await act(async () => nameTrigger().click()); + await act(async () => { + setInputValue(dialogInput(), "Retry Reload"); + dialogButton("Save").click(); + }); + await flush(); + + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: "Retry Reload" }]); + expect(container.querySelector("dialog")).not.toBeNull(); + expect(dialogInput().value).toBe("Retry Reload"); + expect(container.textContent).toContain("The change was saved, but the model list could not be refreshed."); + expect(testWindow.document.activeElement).toBe(dialogInput()); + }); + + function currentNameText(): string { + return container.querySelector(".model-display-name-current")!.textContent ?? ""; + } + + test("first save followed by failed reload updates the snapshot and enables Reset", async () => { + await mountModels(); + await act(async () => nameTrigger().click()); + await act(async () => dialogButton("Reset name").click()); + await flush(); + mutationBodies = []; + await act(async () => nameTrigger().click()); + expect(dialogButton("Reset name").disabled).toBe(true); + modelFetchFailure = "reload failed"; + await act(async () => { + setInputValue(dialogInput(), " First Name "); + dialogButton("Save").click(); + }); + await flush(); + expect(dialogInput().value).toBe("First Name"); + expect(currentNameText()).toContain("First Name"); + expect(currentNameText()).toContain("Your name"); + expect(dialogButton("Reset name").disabled).toBe(false); + + modelFetchFailure = null; + await act(async () => dialogButton("Retry").click()); + await flush(); + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: "First Name" }]); + expect(container.querySelector("dialog")).toBeNull(); + }); + + test("reset followed by failed reload clears the draft and Enter retries only the read", async () => { + await mountModels(); + await act(async () => nameTrigger().click()); + modelFetchFailure = "reload failed"; + await act(async () => dialogButton("Reset name").click()); + await flush(); + expect(dialogInput().value).toBe(""); + expect(currentNameText()).toContain("xai-demo/grok-4.6"); + expect(currentNameText()).not.toContain("Your name"); + expect(dialogButton("Reset name").disabled).toBe(true); + + modelFetchFailure = null; + await act(async () => container.querySelector("dialog form")!.dispatchEvent( + new testWindow.Event("submit", { bubbles: true, cancelable: true }), + )); + await flush(); + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: null }]); + expect(container.querySelector("dialog")).toBeNull(); + expect(currentModels[0]!.displayNameOverride).toBeUndefined(); + }); + + for (const value of ["Saved Name", null]) { + test(`saved:true failure reconciles ${value === null ? "reset" : "save"} and retries the same operation`, async () => { + await mountModels(); + await act(async () => nameTrigger().click()); + savedFailure = true; + await act(async () => { + if (value === null) dialogButton("Reset name").click(); + else { + setInputValue(dialogInput(), value); + dialogButton("Save").click(); + } + }); + await flush(); + expect(dialogInput().value).toBe(value ?? ""); + expect(dialogButton("Reset name").disabled).toBe(value === null); + expect(currentNameText()).toContain(value ?? "Current name unavailable until refresh"); + expect(currentNameText()).not.toContain(value === null ? "Your name" : "Model ID fallback"); + expect(container.textContent).toContain("The change was saved"); + savedFailure = false; + await act(async () => dialogButton("Retry").click()); + await flush(); + expect(mutationBodies).toEqual([ + { modelId: "grok-4.6", displayName: value }, + { modelId: "grok-4.6", displayName: value }, + ]); + expect(container.querySelector("dialog")).toBeNull(); + }); + } + + test("editing after a saved receipt explicitly starts a new save", async () => { + await mountModels(); + await act(async () => nameTrigger().click()); + savedFailure = true; + await act(async () => dialogButton("Reset name").click()); + await flush(); + savedFailure = false; + await act(async () => setInputValue(dialogInput(), "New intention")); + await act(async () => dialogButton("Save").click()); + await flush(); + expect(mutationBodies.map(body => body.displayName)).toEqual([null, "New intention"]); + }); + + // Exercise the real global auth wrapper over an abort-aware transport. Only + // the deadline clock is controlled; the operation must supply its own signal. + for (const stage of ["mutation", "reload"] as const) { + test(`stalled ${stage} through installed API fetch releases the editor and retries a read`, async () => { + await mountModels(); + const descriptor = Object.getOwnPropertyDescriptor(AbortSignal, "timeout"); + const deadline = new AbortController(); + const budgets: number[] = []; + const seenSignals: Array = []; + let stall = true; + const transport = globalThis.fetch; + Object.defineProperty(AbortSignal, "timeout", { + configurable: true, + value: (ms: number) => { budgets.push(ms); return deadline.signal; }, + }); + const boundedTransport = (async (input: RequestInfo | URL, init?: RequestInit) => { + if (String(input).includes("model-display-names") || String(input).endsWith("/api/models")) { + seenSignals.push(init?.signal); + } + if (stall && (stage === "mutation" + ? init?.method === "PUT" && String(input).includes("model-display-names") + : String(input).endsWith("/api/models"))) { + // Persist the write before losing its response: abort is not rollback. + if (stage === "mutation") await transport(input, init); + return new Promise((_resolve, reject) => { + const signal = init?.signal; + if (signal?.aborted) reject(signal.reason); + else signal?.addEventListener("abort", () => reject(signal.reason), { once: true }); + }); + } + return transport(input, init); + }) as typeof fetch; + Object.defineProperty(window, "fetch", { configurable: true, value: boundedTransport }); + installApiAuthFetch(); + globalThis.fetch = window.fetch; + try { + const trigger = nameTrigger(); + await act(async () => trigger.click()); + await act(async () => { + setInputValue(dialogInput(), "Possibly saved"); + dialogButton("Save").click(); + }); + await flush(); + expect(budgets).toEqual([60_000]); + expect(seenSignals.every(signal => signal != null)).toBe(true); + if (stage === "reload") expect(seenSignals[1]).toBe(seenSignals[0]); + await act(async () => deadline.abort(new DOMException("Timed out", "TimeoutError"))); + await flush(); + expect(dialogInput().disabled).toBe(false); + expect(dialogButton("Cancel").disabled).toBe(false); + expect(dialogInput().value).toBe("Possibly saved"); + expect(container.textContent).toContain(stage === "mutation" + ? "The change may have been saved" : "The change was saved"); + expect(testWindow.document.activeElement).toBe(dialogInput()); + stall = false; + if (descriptor) Object.defineProperty(AbortSignal, "timeout", descriptor); + await act(async () => dialogButton("Retry").click()); + await flush(); + expect(mutationBodies).toHaveLength(1); + expect(currentModels[0]!.displayNameOverride).toBe("Possibly saved"); + expect(container.querySelector("dialog")).toBeNull(); + expect(testWindow.document.activeElement).toBe(trigger); + } finally { + if (descriptor) Object.defineProperty(AbortSignal, "timeout", descriptor); + else Reflect.deleteProperty(AbortSignal, "timeout"); + } + }); + } + + test("a pending save blocks duplicate mutations", async () => { + let releaseMutation!: () => void; + mutationGate = new Promise(resolve => { releaseMutation = resolve; }); + await mountModels(); + await act(async () => nameTrigger().click()); + const save = dialogButton("Save"); + + await act(async () => { + setInputValue(dialogInput(), "Grok Once"); + save.click(); + save.click(); + await Promise.resolve(); + }); + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: "Grok Once" }]); + expect(save.disabled).toBe(true); + + releaseMutation(); + await flush(); + expect(container.querySelector("dialog")).toBeNull(); + }); + + test("Cancel closes without mutation and restores focus to Name", async () => { + await mountModels(); + const trigger = nameTrigger(); + await act(async () => trigger.click()); + await act(async () => dialogButton("Cancel").click()); + await flush(); + + expect(mutationBodies).toHaveLength(0); + expect(container.querySelector("dialog")).toBeNull(); + expect(testWindow.document.activeElement).toBe(trigger); + }); +}); + +describe("discovered model display name dialog", () => { + const globals = ["document", "window", "navigator", "localStorage", "IS_REACT_ACT_ENVIRONMENT"] as const; + let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; + let testWindow: Window; + let container: HTMLElement; + let root: Root | null; + + const model: ModelRow = { + provider: "xai-demo", + id: "grok-4.6", + namespaced: "xai-demo/grok-4.6", + disabled: false, + displayName: "Grok 4.6", + displayNameOverride: "Grok 4.6", + displayNameSource: "operator", + }; + + beforeEach(() => { + previousGlobals = Object.fromEntries( + globals.map(key => [key, Object.getOwnPropertyDescriptor(globalThis, key)]), + ) as typeof previousGlobals; + testWindow = new Window({ url: "http://localhost/" }); + Object.defineProperties(globalThis, { + document: { configurable: true, value: testWindow.document }, + window: { configurable: true, value: testWindow }, + navigator: { configurable: true, value: testWindow.navigator }, + localStorage: { configurable: true, value: testWindow.localStorage }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true }, + }); + container = testWindow.document.createElement("div"); + testWindow.document.body.appendChild(container as never); + root = null; + }); + + afterEach(async () => { + if (root) { + const mounted = root; + await act(async () => mounted.unmount()); + } + testWindow.close(); + for (const key of globals) { + const descriptor = previousGlobals[key]; + if (descriptor) Object.defineProperty(globalThis, key, descriptor); + else Reflect.deleteProperty(globalThis, key); + } + }); + + async function renderDialog(options: { + saving?: boolean; + requestError?: string | null; + onSave?: (value: string) => void; + onReset?: () => void; + onClose?: () => void; + } = {}) { + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root ??= createRoot(container); + root.render( + + {})} + onReset={options.onReset ?? (() => {})} + onClose={options.onClose ?? (() => {})} + /> + , + ); + }); + } + + function setInputValue(input: HTMLInputElement, value: string) { + Object.getOwnPropertyDescriptor(testWindow.HTMLInputElement.prototype, "value")! + .set!.call(input, value); + input.dispatchEvent(new testWindow.Event("input", { bubbles: true })); + } + + test("opens with immutable identity and only the operator override in the input", async () => { + await renderDialog(); + + const dialog = container.querySelector("dialog")!; + const input = container.querySelector("input")!; + expect(dialog.open).toBe(true); + expect(dialog.textContent).toContain("xai-demo/grok-4.6"); + expect(dialog.textContent).toContain("Grok 4.6"); + expect(dialog.textContent).toContain("Your name"); + expect(input.value).toBe("Grok 4.6"); + expect(testWindow.document.activeElement).toBe(input); + }); + + test("validates before save and sends the trimmed safe draft", async () => { + const onSave = jest.fn(); + await renderDialog({ onSave }); + const input = container.querySelector("input")!; + const save = [...container.querySelectorAll("button")] + .find(button => button.textContent === "Save")!; + + await act(async () => { + setInputValue(input, "Bad/Name"); + save.click(); + }); + expect(container.textContent).toContain("Friendly name cannot contain /."); + expect(onSave).not.toHaveBeenCalled(); + + await act(async () => { + setInputValue(input, " Grok Fast "); + save.click(); + }); + expect(onSave).toHaveBeenCalledTimes(1); + expect(onSave).toHaveBeenCalledWith("Grok Fast"); + }); + + test("keeps request errors visible and locks every closing action while saving", async () => { + const onClose = jest.fn(); + const onReset = jest.fn(); + await renderDialog({ saving: true, requestError: "Catalog refresh failed", onClose, onReset }); + + expect(container.textContent).toContain("Catalog refresh failed"); + const actionButtons = [...container.querySelectorAll("button")]; + expect(actionButtons.filter(button => button.tabIndex !== -1).every(button => button.disabled)).toBe(true); + + const dialog = container.querySelector("dialog")!; + await act(async () => { + dialog.dispatchEvent(new testWindow.Event("cancel", { bubbles: false, cancelable: true })); + container.querySelector(".modal-backdrop-dismiss")!.click(); + }); + expect(onClose).not.toHaveBeenCalled(); + expect(onReset).not.toHaveBeenCalled(); + }); + + test("a request failure does not mark a valid display name as invalid", async () => { + await renderDialog({ requestError: "Catalog refresh failed" }); + + const input = container.querySelector("input")!; + expect(input.getAttribute("aria-invalid")).toBeNull(); + expect(testWindow.document.activeElement).toBe(input); + }); + + test("focus returns to the editable name after a pending save fails", async () => { + await renderDialog({ saving: true }); + testWindow.document.body.tabIndex = -1; + testWindow.document.body.focus(); + expect(testWindow.document.activeElement).toBe(testWindow.document.body); + + await renderDialog({ requestError: "Catalog refresh failed" }); + + expect(testWindow.document.activeElement).toBe(container.querySelector("input")); + }); +}); From f215f79b4562735029ad5672a68bc6104e534b98 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:41:57 +0900 Subject: [PATCH 064/221] fix(anthropic): attribute quota headers and honor measured reset deadlines [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Carry and refine #3809: observe each request-bound physical response, preserve probe clocks and model-specific windows, and retain valid multi-day upstream reset deadlines. Preserve credential ownership and skip unprovable observations. Runtime checks are deferred to the final cumulative hosted CI at owner request; no local suite was run. Co-authored-by: Éverton Toffanetto --- .../src/content/docs/guides/claude-code.md | 13 +- .../docs/reference/configuration/providers.md | 20 +- scripts/test-layout/layout.json | 2 + src/images/loop.ts | 12 +- src/oauth/anthropic-routing.ts | 73 ++- src/oauth/health.ts | 3 + src/providers/quota.ts | 77 ++- src/server/responses/core.ts | 35 +- src/web-search/loop.ts | 12 +- .../anthropic-quota-dispatch.test.ts | 283 ++++++++++ .../anthropic-ratelimit-headers.test.ts | 528 ++++++++++++++++++ ...anthropic-sidecar-account-failover.test.ts | 55 +- tests/fixtures/test-layout-expected.json | 2 + 13 files changed, 1074 insertions(+), 41 deletions(-) create mode 100644 tests/adapters/anthropic/anthropic-quota-dispatch.test.ts create mode 100644 tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts diff --git a/docs-site/src/content/docs/guides/claude-code.md b/docs-site/src/content/docs/guides/claude-code.md index 5ed946c72a..2e841e205c 100644 --- a/docs-site/src/content/docs/guides/claude-code.md +++ b/docs-site/src/content/docs/guides/claude-code.md @@ -27,9 +27,16 @@ rotation does not protect against provider enforcement. Operational contract when enabled: -- Upstream **429** cools that account using `Retry-After` when present (else a default backoff), - clears its affinities, and may rotate to another eligible account within the same request - (bounded). +- Upstream **429** cools that account, clears its affinities, and may rotate to another eligible + account within the same request (bounded). The cooldown uses a usable `Retry-After` when present, + otherwise the latest valid reset time among windows Anthropic marks `rejected`, including + weekly windows. Valid upstream deadlines are not shortened to a fixed cooldown ceiling. + A refusal with no usable deadline falls back to a default backoff. +- Responses report the serving account's 5-hour and weekly utilization, and whichever of those + two the response carries is recorded for that account — each window independently, and a + refusal counts as well as a success. Usage-aware selection works from ordinary traffic, + without waiting for a dashboard poll. Headers preserve model-specific quota windows and do + not postpone usage probes or clear a failed usage probe's unavailable status. - Affinity is **process-local** (lost on proxy restart). - **401/403** credential failures quarantine the account (`needsReauth`) so it is excluded from selection until re-authenticated. diff --git a/docs-site/src/content/docs/reference/configuration/providers.md b/docs-site/src/content/docs/reference/configuration/providers.md index 02d5ba4323..c80176868e 100644 --- a/docs-site/src/content/docs/reference/configuration/providers.md +++ b/docs-site/src/content/docs/reference/configuration/providers.md @@ -430,14 +430,26 @@ rotation may trigger provider restrictions. | `anthropicAccountPool.enabled?` | `boolean` | `false` | Enable sticky session affinity and quota-ranked new-session selection. **429 failover is not gated here**: it activates whenever two or more usable accounts are stored, exactly like every other multi-credential provider, and cannot be switched off. | | `anthropicAccountPool.autoSwitchThreshold?` | `number` | `80` | For new sessions, when the active account reaches this threshold, choose the lowest known cached usage in the configured window; the account chosen does not itself have to be at or above the threshold. `0` disables **proactive** usage-based switching only — new-session selection and routing recovery after an eligible 429 still consult `quotaWindow`. | | `anthropicAccountPool.strategy?` | `"quota" \| "round-robin" \| "fill-first"` | `"quota"` | New-session strategy; `quota` ranks accounts by the window set by `quotaWindow`, and `fill-first` evaluates its drain threshold in that same window. | -| `anthropicAccountPool.quotaWindow?` | `"five-hour" \| "weekly" \| "max-utilization"` | `"five-hour"` | The cached provider-reported utilization bar used for usage-aware account selection. `five-hour` keeps the original behavior. `weekly` scores the weekly bar and skips accounts whose 5-hour bar is exhausted while another eligible account remains, but falls back to exhausted candidates when none do. `max-utilization` scores the highest known bar, so it can use 5-hour usage before weekly usage is available; if neither is known, the account follows unknown-usage ordering. Known usage ranks before unknown usage under the opt-in `weekly` and `max-utilization` windows only; an omitted or explicit `five-hour` preserves the legacy ordering. If every eligible account is unknown, selection still returns one in eligible order. After the documented lower-5-hour tie-break, exact ties preserve eligible order. A healthy affinity-bound session is not proactively rebalanced. For new-session assignment and routing recovery after an eligible 429 replacement, `quota` ranks eligible candidates directly with this window; `fill-first` advances in stable order using this window's threshold and exhaustion rules; `round-robin` ignores it. Cooldown, failover limits, and reauthentication eligibility remain separate local state. Per-account weekly bars are only known once the dashboard Providers page has polled them. | +| `anthropicAccountPool.quotaWindow?` | `"five-hour" \| "weekly" \| "max-utilization"` | `"five-hour"` | The cached provider-reported utilization bar used for usage-aware account selection. `five-hour` keeps the original behavior. `weekly` scores the weekly bar and skips accounts whose 5-hour bar is exhausted while another eligible account remains, but falls back to exhausted candidates when none do. `max-utilization` scores the highest known bar, so it can use 5-hour usage before weekly usage is available; if neither is known, the account follows unknown-usage ordering. Known usage ranks before unknown usage under the opt-in `weekly` and `max-utilization` windows only; an omitted or explicit `five-hour` preserves the legacy ordering. If every eligible account is unknown, selection still returns one in eligible order. After the documented lower-5-hour tie-break, exact ties preserve eligible order. A healthy affinity-bound session is not proactively rebalanced. For new-session assignment and routing recovery after an eligible 429 replacement, `quota` ranks eligible candidates directly with this window; `fill-first` advances in stable order using this window's threshold and exhaustion rules; `round-robin` ignores it. Cooldown, failover limits, and reauthentication eligibility remain separate local state. Per-account weekly bars come from usage probes or observed response headers. | | `anthropicAccountPool.stickyLimit?` | `number` | `1` | Successful new-session binds retained on one round-robin selection. Range 1–100. | -When enabled, 429 records bounded cooldown from `Retry-After` or a default backoff and may rotate -within the request. Affinity is process-local and size-bounded. Credential 401/403 marks the account -as needing reauthentication. If all eligible accounts are cooling, clients receive 429 with +When enabled, 429 records a cooldown and may rotate within the request. The cooldown length comes +from a usable `Retry-After`, otherwise from the latest valid reset time among rate-limit windows +Anthropic reports as `rejected`, including weekly windows. Valid upstream deadlines are not +shortened to a fixed cooldown ceiling; non-finite or unrepresentable deadlines are ignored. +A refusal with no usable deadline falls back to a short default backoff. Affinity is process-local +and size-bounded. Credential 401/403 marks the account as needing reauthentication. If all eligible accounts are cooling, clients receive 429 with `Retry-After` when known, not an authentication error. +Anthropic responses also report the serving account's 5-hour and weekly utilization, and whichever +of those two a given response carries is recorded against that account — each window independently, +on refusals as well as successes. Usage-aware selection therefore works from the accounts you +actually use, without waiting for the dashboard Providers page to poll them. These readings refresh +the existing row rather than replacing it, so the model-scoped weekly bars that only the usage +endpoint reports are preserved. Header observations do not postpone usage probes or clear a failed +probe's unavailable status. After restart, cached Anthropic observations remain available while +the next quota read probes again, because the saved observations do not include the probe clock. + :::caution[Experimental] Leave this disabled unless you understand Anthropic account policy risk. Prefer manual `ocx account use anthropic ` switching when unsure. diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json index d309073a3f..f560dffeb5 100644 --- a/scripts/test-layout/layout.json +++ b/scripts/test-layout/layout.json @@ -204,6 +204,8 @@ "anthropic-image-retry.test.ts": "adapters/anthropic", "anthropic-pool-toggle-copy.test.ts": "adapters/anthropic", "anthropic-quorum-cache.test.ts": "routing", + "anthropic-quota-dispatch.test.ts": "adapters/anthropic", + "anthropic-ratelimit-headers.test.ts": "adapters/anthropic", "anthropic-reasoning.test.ts": "adapters/anthropic", "anthropic-sidecar-account-failover.test.ts": "adapters/anthropic", "anthropic-stream-hardening.test.ts": "adapters/anthropic", diff --git a/src/images/loop.ts b/src/images/loop.ts index e3a7f8252f..7d4855f91b 100644 --- a/src/images/loop.ts +++ b/src/images/loop.ts @@ -263,8 +263,16 @@ export interface ImageBridgeDeps { * Optional 429 failover for the routed (non-xAI) model. Return a rebuilt adapter for the * rotated credential, or null when the pool is exhausted. Async hooks support OAuth refresh; * existing synchronous key-pool hooks remain valid. + * + * `responseHeaders` carries the whole refusal, not just Retry-After, because an Anthropic + * 429 states the window's reset epoch even when it omits Retry-After -- and a rotation that + * cannot see it cools the drained account for the short default instead of until the window + * actually reopens. Optional so existing callers keep compiling. */ - on429?: (retryAfterHeader: string | null) => ProviderAdapter | null | Promise; + on429?: ( + retryAfterHeader: string | null, + responseHeaders?: Headers, + ) => ProviderAdapter | null | Promise; /** Opt-in same-target 429 policy (key-auth providers). When present, 429 replays on the SAME key before on429 rotation. */ retryOn429Policy?: Required | null; /** Called when the bridged Responses stream completes (parity with runTurn / routed paths). */ @@ -579,7 +587,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise {}); } catch { /* already closed */ } adapter = rotated; diff --git a/src/oauth/anthropic-routing.ts b/src/oauth/anthropic-routing.ts index a029207be5..6b2eea5a3b 100644 --- a/src/oauth/anthropic-routing.ts +++ b/src/oauth/anthropic-routing.ts @@ -10,9 +10,10 @@ * Intentionally narrower than the Codex pool: no mid-session quota rotation, * soft-avoid ladders, or probe leases. Anthropic OAuth is ToS-sensitive. * - * Affinity is process-local (lost on restart). Cooldown uses Retry-After when present, - * otherwise a default backoff. 401/403 credential failures should set needsReauth on the - * store (existing OAuth path) so the account is excluded from eligibility. + * Affinity is process-local (lost on restart). Cooldown uses Retry-After when present, else + * the reset time of whichever rate-limit window upstream reports as rejected, else a default + * backoff. 401/403 credential failures should set needsReauth on the store (existing OAuth + * path) so the account is excluded from eligibility. */ import { createHash } from "node:crypto"; import { captureOAuthAccountSelection, commitOAuthAccountSelection, credentialGeneration, getAccountSet, getAccountCredential, getAccountCredentialWithStatus } from "./store"; @@ -33,9 +34,16 @@ import type { OcxAccountPoolQuotaWindow, OcxAccountPoolRotationStrategy, OcxConf import { sweepExpiredOnWrite } from "../lib/state-store-sweeper"; import { retainedUtf8Bytes } from "../lib/admission"; +/** + * The read side of a `Headers` object, so a caller can pass the live upstream response's + * headers without this module importing anything from the server layer -- and so a test can + * hand it a plain `new Headers({...})`. + */ +export type AnthropicRateLimitHeaders = Pick; + const PROVIDER = "anthropic"; +/** Backoff only when upstream supplies no usable deadline. */ const DEFAULT_COOLDOWN_MS = 60_000; -const MAX_COOLDOWN_MS = 15 * 60_000; const AFFINITY_IDLE_TTL_MS = 24 * 60 * 60_000; const MAX_AFFINITY_ENTRIES = 2_000; const MAX_AFFINITY_COMPONENT_BYTES = 512; @@ -58,9 +66,19 @@ export interface AnthropicAccountPoolConfig { quotaWindow?: OcxAccountPoolQuotaWindow; } +/** + * Where a cooldown's length came from. Same vocabulary as `CodexCooldownSource`, because it + * answers the same question for the same reason: `retry-after` is upstream answering THIS + * refusal, `reset-derived` is upstream stating when the spent window reopens, and `default` + * is our own guess. The dashboard renders the first as a rate limit and the rest as quota, + * which is exactly the distinction a reset-derived cooldown carries -- collapsing it into + * `retry-after` would report a drained five-hour window as request-rate throttling. + */ +type AnthropicCooldownSource = "retry-after" | "reset-derived" | "default"; + interface AccountHealth { cooldownUntil: number; - cooldownSource: "retry-after" | "default"; + cooldownSource: AnthropicCooldownSource; } interface AffinityEntry { @@ -112,19 +130,38 @@ export function anthropicQuotaWindow(config: AnthropicAccountPoolConfig): OcxAcc return normalizeAccountPoolQuotaWindow(config.quotaWindow); } +/** Accept upstream deadlines within the runtime's date range, without a policy ceiling. */ +function delayUntil(timestamp: number, now: number): number | undefined { + const delay = timestamp - now; + return Number.isFinite(new Date(timestamp).getTime()) && Number.isFinite(delay) && delay > 0 + ? delay : undefined; +} + function parseRetryAfterMs(value: string | null | undefined, now: number): number | undefined { const text = value?.trim(); if (!text) return undefined; if (/^\d+(?:\.\d+)?$/.test(text)) { const seconds = Number(text); - if (Number.isFinite(seconds) && seconds > 0) { - return Math.min(Math.max(Math.ceil(seconds * 1000), 1), MAX_COOLDOWN_MS); - } + if (!Number.isFinite(seconds) || seconds <= 0) return undefined; + return delayUntil(now + Math.max(Math.ceil(seconds * 1000), 1), now); } - const timestamp = Date.parse(text); - if (!Number.isFinite(timestamp)) return undefined; - const delay = timestamp - now; - return delay > 0 ? Math.min(delay, MAX_COOLDOWN_MS) : undefined; + return delayUntil(Date.parse(text), now); +} + +/** Only rejected windows constrain recovery; all must reopen, so take the latest reset. */ +function parseRateLimitResetMs(headers: AnthropicRateLimitHeaders | null | undefined, now: number): number | undefined { + if (!headers) return undefined; + let latest: number | undefined; + for (const window of ["5h", "7d"] as const) { + if (headers.get(`anthropic-ratelimit-unified-${window}-status`)?.trim() !== "rejected") continue; + const resetSeconds = Number(headers.get(`anthropic-ratelimit-unified-${window}-reset`)?.trim()); + if (!Number.isFinite(resetSeconds) || resetSeconds <= 0) continue; + const resetAt = resetSeconds * 1000; + if (delayUntil(resetAt, now) === undefined) continue; + if (latest === undefined || resetAt > latest) latest = resetAt; + } + if (latest === undefined) return undefined; + return latest - now; } export function getAnthropicAccountHealthSnapshot( @@ -669,6 +706,7 @@ export function rotateAnthropicAccountOn429( retryAfterHeader: string | null | undefined, sessionKey?: string | null, now = Date.now(), + rateLimitHeaders?: AnthropicRateLimitHeaders | null, ): string | null { // Reactive 429 failover is NOT gated on the pool flag. That flag buys PROACTIVE routing -- // session affinity, quota-ranked new-session selection, autoSwitchThreshold, strategy -- all @@ -678,11 +716,18 @@ export function rotateAnthropicAccountOn429( // Presence is the activation rule, the same one an apiKeyPool of two keys already uses. if (!isAnthropicAccountPoolEnabled(config) && !hasAnthropicFailoverQuorum(now)) return null; + // Retry-After first: it is the header written FOR this decision. The rejected window's + // reset is the fallback, because a 429 that omits Retry-After still carries it -- and + // without that fallback such a refusal cools for the 60s default and the exhausted + // account is back in the rotation a minute later. const parsedRetry = parseRetryAfterMs(retryAfterHeader, now); - const cooldownMs = parsedRetry ?? DEFAULT_COOLDOWN_MS; + const resetDerived = parsedRetry === undefined ? parseRateLimitResetMs(rateLimitHeaders, now) : undefined; + const cooldownMs = parsedRetry ?? resetDerived ?? DEFAULT_COOLDOWN_MS; upstreamHealth.set(failedAccountId, { cooldownUntil: now + cooldownMs, - cooldownSource: parsedRetry ? "retry-after" : "default", + cooldownSource: parsedRetry !== undefined + ? "retry-after" + : resetDerived !== undefined ? "reset-derived" : "default", }); sweepExpiredOnWrite(now); clearAnthropicSessionAffinityForAccount(failedAccountId); diff --git a/src/oauth/health.ts b/src/oauth/health.ts index 4c997c47cc..011ebd8f41 100644 --- a/src/oauth/health.ts +++ b/src/oauth/health.ts @@ -184,6 +184,9 @@ export function projectStoredOAuthAccountHealth( needsReauth: account.needsReauth === true, reauthReason: account.needsReauth === true ? "refresh_failed" : undefined, cooldownUntilMs: anthropicSnap?.cooldownUntil, + // Same mapping as the Codex pool's `cooldownReasonFromSource`: only a Retry-After is + // request-rate throttling. A reset-derived cooldown means a usage window is spent, which + // is quota, and reporting it as a rate limit would tell the operator to retry shortly. cooldownReason: anthropicSnap?.cooldownSource === "retry-after" ? "rate_limit" : anthropicSnap ? "quota" : undefined, warningReason: detectOAuthWarning(provider, account, opts.observeOnly === true, now), now, diff --git a/src/providers/quota.ts b/src/providers/quota.ts index 7136cd3c70..dbdb6699f7 100644 --- a/src/providers/quota.ts +++ b/src/providers/quota.ts @@ -1568,7 +1568,10 @@ function hydrateAccountQuotaCache(): void { if (diskHydrated) return; diskHydrated = true; for (const [key, quota] of readPersistedAccountQuotas()) { - if (!accountQuotaCache.has(key)) accountQuotaCache.set(key, { ts: quota.updatedAt, quota }); + // Disk stores observation time, not the Anthropic usage probe's clock. + if (!accountQuotaCache.has(key)) { + accountQuotaCache.set(key, { ts: key.startsWith("anthropic\u0000") ? 0 : quota.updatedAt, quota }); + } } } @@ -1642,6 +1645,66 @@ export function setCachedProviderAccountQuotaForTests( accountQuotaCache.set(key, { ts: Date.now(), quota }); } +/** Unified headers report utilization fractions and epoch-second reset times. */ +function anthropicHeaderResetAt(value: string | null): number | undefined { + const seconds = toFiniteNumber(value); + if (seconds === undefined || seconds <= 0) return undefined; + const timestamp = seconds * 1000; + return Number.isFinite(new Date(timestamp).getTime()) ? timestamp : undefined; +} + +export function parseAnthropicRateLimitHeaders(headers: Headers): ProviderQuota | null { + const fiveHourPercent = normalizeUtilizationFraction(headers.get("anthropic-ratelimit-unified-5h-utilization")); + const weeklyPercent = normalizeUtilizationFraction(headers.get("anthropic-ratelimit-unified-7d-utilization")); + if (fiveHourPercent === undefined && weeklyPercent === undefined) return null; + const fiveHourResetAt = anthropicHeaderResetAt(headers.get("anthropic-ratelimit-unified-5h-reset")); + const weeklyResetAt = anthropicHeaderResetAt(headers.get("anthropic-ratelimit-unified-7d-reset")); + return { + ...(fiveHourPercent !== undefined ? { fiveHourPercent } : {}), + ...(fiveHourResetAt !== undefined ? { fiveHourResetAt } : {}), + ...(weeklyPercent !== undefined ? { weeklyPercent } : {}), + ...(weeklyResetAt !== undefined ? { weeklyResetAt } : {}), + updatedAt: Date.now(), + }; +} + +/** Reject unknown scales; round fraction conversion for persisted/displayed percentages. */ +function normalizeUtilizationFraction(value: string | null): number | undefined { + const numeric = toFiniteNumber(value); + if (numeric === undefined || numeric < 0 || numeric > 1) return undefined; + return Math.round(numeric * 10_000) / 100; +} + +/** + * Merge serving-account observations without advancing the usage probe's clock or + * erasing model-specific windows. The caller owns credential attribution; this guard + * prevents a retired account key from being revived by an older config generation. + */ +export function recordAnthropicAccountQuotaFromHeaders( + accountId: string, + headers: Headers, + writerGeneration: number, +): void { + if (!accountId) return; + const observed = parseAnthropicRateLimitHeaders(headers); + if (!observed) return; + const key = accountCacheKey("anthropic", accountId); + if (!mayCommitAccountQuotaKey(key, writerGeneration)) return; + // Hydrate before writing, for the same reason `recordPassiveAccountQuota` does: this write + // arrives unprompted from the request path, and `persistAccountQuotaCache` serializes the + // whole map. Landing before any reader has hydrated would persist this single row and erase + // every other provider's saved row. + hydrateAccountQuotaCache(); + const previous = accountQuotaCache.get(key); + accountQuotaCache.set(key, { + ...previous, + // Headers do not prove that the last usage probe succeeded. + ts: previous?.ts ?? 0, + quota: { ...(previous?.quota ?? {}), ...observed }, + }); + persistAccountQuotaCache(); +} + /** * Providers whose per-account quota is OBSERVED in-band, never probed. * @@ -1714,7 +1777,11 @@ export function readPassiveProviderAccountQuotas(provider: string): ProviderAcco export function sweepExpiredProviderAccountQuotaRows(now = Date.now()): number { let removed = 0; for (const [key, entry] of accountQuotaCache) { - if (entry.ts + ACCOUNT_QUOTA_TTL_MS > now) continue; + // Anthropic observations extend retention, never the usage probe's eligibility clock. + const retainedAt = key.startsWith("anthropic\u0000") + ? Math.max(entry.ts, entry.quota?.updatedAt ?? 0) + : entry.ts; + if (retainedAt + ACCOUNT_QUOTA_TTL_MS > now) continue; accountQuotaCache.delete(key); removed += 1; } @@ -1907,6 +1974,7 @@ async function fetchAccountQuota( ): Promise { if (!supportsPerAccountQuota(provider)) return { ts: Date.now(), quota: null, unavailable: true }; if (explicitAccountReader(provider)) return fetchExplicitAccountQuota(provider, accountId, forceRefresh, providerConfig); + if (provider === "anthropic") hydrateAccountQuotaCache(); const key = accountCacheKey(provider, accountId); const writerGeneration = captureConfigGeneration(); const cached = accountQuotaCache.get(key); @@ -1947,7 +2015,8 @@ async function fetchAccountQuota( // negative-cache instead of re-probing on every GUI poll. const entry: AccountQuotaCacheEntry = { ts: Date.now(), - quota: cached?.quota ?? null, + // Settle once for all joiners against observations committed during the probe. + quota: (provider === "anthropic" ? accountQuotaCache.get(key)?.quota : cached?.quota) ?? null, unavailable: true, }; if (mayCommitAccountQuotaKey(key, writerGeneration)) { @@ -1969,7 +2038,7 @@ async function fetchAccountQuota( } catch { const entry: AccountQuotaCacheEntry = { ts: Date.now(), - quota: cached?.quota ?? null, + quota: (provider === "anthropic" ? accountQuotaCache.get(key)?.quota : cached?.quota) ?? null, unavailable: true, }; if (mayCommitAccountQuotaKey(key, writerGeneration)) { diff --git a/src/server/responses/core.ts b/src/server/responses/core.ts index 3c539c6d8e..fc2195f427 100644 --- a/src/server/responses/core.ts +++ b/src/server/responses/core.ts @@ -230,7 +230,7 @@ import { } from "../../providers/request-pacing"; import { slugsEquivalent } from "../../providers/slug-codec"; import { isMuseSubscriptionUsagePayload, parseMuseSubscriptionUsage } from "../../providers/muse-subscription-usage"; -import { hasPassiveAccountQuota, recordPassiveAccountQuota } from "../../providers/quota"; +import { hasPassiveAccountQuota, recordAnthropicAccountQuotaFromHeaders, recordPassiveAccountQuota } from "../../providers/quota"; import { captureConfigGeneration } from "../../lib/state-store-sweeper"; import { applyOpenAiVirtualModel, resolveOpenAiCompactModel } from "../../providers/openai-virtual-models"; import { isUsageDebugEnabled } from "../../usage/debug"; @@ -3946,7 +3946,27 @@ async function handleResponsesInner( for (let attempt = 0; attempt < 3; attempt++) { if (selectionIsCurrent(requestBindings.get(wireRequest))) { const fetchImpl = (route.provider as OcxProviderConfig & { fetch?: typeof globalThis.fetch }).fetch ?? execute; - return fetchImpl(destination, dispatchInit); + const binding = requestBindings.get(wireRequest); + const snapshot = route.providerName === "anthropic" && anthropicPoolAccountId && binding?.kind === "oauth" + ? binding.snapshot : undefined; + const writerGeneration = snapshot ? captureConfigGeneration() : 0; + const sentHeaders = snapshot ? new Headers(dispatchInit.headers) : undefined; + const ownsBearer = snapshot !== undefined + && sentHeaders?.get("authorization") === `Bearer ${snapshot.accessToken}` + && !sentHeaders?.has("x-api-key"); + const response = await fetchImpl(destination, dispatchInit); + // Observe each physical response before retries replace it. The binding belongs to + // this dispatch, so a manual switch cannot file A's headers against B. Header + // overrides and credential replacement make ownership unprovable: skip those writes. + if (ownsBearer && snapshot) { + try { + const current = getAccountCredentialWithStatus("anthropic", snapshot.accountId); + if (current && !current.needsReauth && credentialGeneration(current.credential) === snapshot.generation) { + recordAnthropicAccountQuotaFromHeaders(snapshot.accountId, response.headers, writerGeneration); + } + } catch { /* best-effort observation cannot fail the response */ } + } + return response; } const nextAdapter = await refreshDispatchAdapter(requestParsed); const rebuilt = await nextAdapter.buildRequest(requestParsed, { @@ -5956,7 +5976,10 @@ async function handleResponsesInner( const imgPlan = !routedCompaction ? await planImageBridge(config, parsed, route.provider) : undefined; const vidPlan = !routedCompaction ? await planVideoBridge(config, parsed, route.provider) : undefined; const canRunWebSearch = !!wsPlan && !adapter.runTurn; - const rotateSidecarProviderOn429 = async (retryAfter: string | null): Promise => { + const rotateSidecarProviderOn429 = async ( + retryAfter: string | null, + responseHeaders?: Headers, + ): Promise => { const rotated = rotateProviderTransportOn429(config, route.providerName, route.provider, { retryAfter, now: Date.now(), @@ -6000,6 +6023,8 @@ async function handleResponsesInner( anthropicPoolAccountId, retryAfter, anthropicSessionKey, + Date.now(), + responseHeaders, ); if (!nextAccountId) return null; try { @@ -7032,6 +7057,8 @@ async function handleResponsesInner( anthropicPoolAccountId, upstreamResponse.headers.get("retry-after"), anthropicSessionKey, + Date.now(), + upstreamResponse.headers, ); if (!nextAccountId) break; try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ } @@ -7445,6 +7472,8 @@ async function handleResponsesInner( anthropicPoolAccountId, response.headers.get("retry-after"), anthropicSessionKey, + Date.now(), + response.headers, ); if (nextAccountId) { try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ } diff --git a/src/web-search/loop.ts b/src/web-search/loop.ts index 3a2c5e99b4..0c957e1c17 100644 --- a/src/web-search/loop.ts +++ b/src/web-search/loop.ts @@ -309,8 +309,16 @@ export interface WebSearchLoopDeps { * 429 failover hook: rotate the provider's active credential and return a rebuilt adapter, * or null when the pool is exhausted. Async hooks support OAuth refresh; existing synchronous * key-pool hooks remain valid. + * + * `responseHeaders` carries the whole refusal, not just Retry-After, because an Anthropic + * 429 states the window's reset epoch even when it omits Retry-After -- and a rotation that + * cannot see it cools the drained account for the short default instead of until the window + * actually reopens. Optional so existing callers keep compiling. */ - on429?: (retryAfterHeader: string | null) => ProviderAdapter | null | Promise; + on429?: ( + retryAfterHeader: string | null, + responseHeaders?: Headers, + ) => ProviderAdapter | null | Promise; /** Opt-in same-target 429 policy (key-auth providers). When present, 429 replays on the SAME key before on429 rotation. */ retryOn429Policy?: Required | null; /** Called only when the final bridged Responses stream reaches completed or incomplete. */ @@ -521,7 +529,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise }[]; + +beforeEach(() => { + home = mkdtempSync(join(tmpdir(), "ocx-anthropic-quota-dispatch-")); + process.env.OPENCODEX_HOME = home; + sent = []; + clearAnthropicAccountPoolState(); + forgetAnthropicFailoverQuorum(); + clearGenericFailoverHealth(); + clearAccountQuotaCache(); + resetProviderQuotaReconcileStateForTests(); + clearResponseStateForTests(); +}); + +afterEach(() => { + clearAnthropicAccountPoolState(); + forgetAnthropicFailoverQuorum(); + clearGenericFailoverHealth(); + // Cancel the debounced persistence before restoring the real home. + clearAccountQuotaCache(); + resetProviderQuotaReconcileStateForTests(); + clearResponseStateForTests(); + if (originalHome === undefined) delete process.env.OPENCODEX_HOME; + else process.env.OPENCODEX_HOME = originalHome; + removeTreeWithRetry(home); +}); + +function credential(index: number) { + return { + access: `synthetic-anthropic-access-${index}`, + refresh: `synthetic-anthropic-refresh-${index}`, + expires: Date.now() + 3_600_000, + accountId: `synthetic-account-${index}`, + }; +} + +async function seed(count = 2): Promise { + for (let index = 0; index < count; index++) { + await saveCredential("anthropic", credential(index)); + } + const ids = getAccountSet("anthropic")!.accounts.map(account => account.id); + await setActiveAccount("anthropic", ids[0]!); + return ids; +} + +function quotaHeaders(fiveHour: string, weekly: string): Record { + return { + "anthropic-ratelimit-unified-5h-utilization": fiveHour, + "anthropic-ratelimit-unified-7d-utilization": weekly, + }; +} + +function limited(fiveHour = "1", weekly = "0.61"): Response { + return Response.json({ type: "error", error: { type: "rate_limit_error", message: "synthetic quota exhausted" } }, { + status: 429, + headers: { ...quotaHeaders(fiveHour, weekly), "retry-after": "30" }, + }); +} + +function answer(stream: boolean, fiveHour = "0.23", weekly = "0.47", text = "The answer is complete."): Response { + const usage = { input_tokens: 8, output_tokens: 6 }; + const message = { id: "msg_synthetic", type: "message", role: "assistant", model: "claude-sonnet-4-5", content: [{ type: "text", text }], stop_reason: "end_turn", usage }; + if (!stream) return Response.json(message, { headers: quotaHeaders(fiveHour, weekly) }); + const frames = [ + { type: "message_start", message: { ...message, content: [], stop_reason: null } }, + { type: "content_block_start", index: 0, content_block: { type: "text", text: "" } }, + { type: "content_block_delta", index: 0, delta: { type: "text_delta", text } }, + { type: "content_block_stop", index: 0 }, + { type: "message_delta", delta: { stop_reason: "end_turn" }, usage }, + { type: "message_stop" }, + ]; + return new Response(frames.map(frame => `event: ${frame.type}\ndata: ${JSON.stringify(frame)}\n\n`).join(""), { + headers: { ...quotaHeaders(fiveHour, weekly), "content-type": "text/event-stream" }, + }); +} + +function configFor(reply: (body: Record) => Response | Promise, headers?: Record): OcxConfig { + const transport = (async (_input, init) => { + const wireHeaders = new Headers(init?.headers); + const body = JSON.parse(String(init?.body)) as Record; + sent.push({ authorization: wireHeaders.get("authorization"), apiKey: wireHeaders.get("x-api-key"), body }); + return reply(body); + }) as typeof fetch; + const provider: OcxProviderConfig & { fetch: typeof fetch } = { + adapter: "anthropic", baseUrl: "https://anthropic-quota.test", authMode: "oauth", + models: ["claude-sonnet-4-5"], fetch: transport, ...(headers ? { headers } : {}), + }; + return { + port: 0, defaultProvider: "anthropic", + anthropicAccountPool: { enabled: false, strategy: "round-robin" }, + providers: { anthropic: provider }, + }; +} + +function post(config: OcxConfig, body: Record = {}) { + return handleResponses(new Request("http://localhost/v1/responses", { + method: "POST", headers: { "content-type": "application/json" }, + body: JSON.stringify({ model: "anthropic/claude-sonnet-4-5", input: "Answer briefly", stream: false, ...body }), + }), config, { model: "", provider: "" }); +} + +function expectQuota(id: string, fiveHourPercent: number, weeklyPercent: number) { + expect(getCachedProviderAccountQuota("anthropic", id)).toMatchObject({ fiveHourPercent, weeklyPercent }); +} + +function deferred() { + let resolve!: (value: T) => void; + const promise = new Promise(done => { resolve = done; }); + return { promise, resolve }; +} + +test("main A429 -> B200 records both physical responses against their sending accounts", async () => { + const [a, b] = await seed(); + const config = configFor(body => { + if (sent.length === 1) return limited(); + expect(sent.length).toBe(2); + // A must already be measured before the replacement response exists. + expectQuota(a!, 100, 61); + expect(getCachedProviderAccountQuota("anthropic", b!)).toBeNull(); + return answer(body.stream === true); + }); + const response = await post(config); + expect(response.status).toBe(200); + expect(await response.text()).toContain("The answer is complete."); + expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); + expectQuota(a!, 100, 61); + expectQuota(b!, 23, 47); +}); + +test("terminal 429 after both accounts are exhausted records both refused physical responses", async () => { + const [a, b] = await seed(); + const response = await post(configFor(() => { + if (sent.length === 1) return limited(); + expect(sent.length).toBe(2); + expectQuota(a!, 100, 61); + return limited("0.89", "1"); + })); + expect(response.status).toBe(429); + await response.text(); + expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); + expectQuota(a!, 100, 61); + expectQuota(b!, 89, 100); +}); + +test("manual active switch while A is pending keeps A's measurement off B", async () => { + const [a, b] = await seed(); + const entered = deferred(); + const returned = deferred(); + const config = configFor(() => { entered.resolve(); return returned.promise; }); + const pending = post(config); + await entered.promise; + try { + expect(sent[0]!.authorization).toBe(`Bearer ${credential(0).access}`); + expect(await setActiveAccount("anthropic", b!)).toBe(true); + } finally { + returned.resolve(answer(false, "0.37", "0.53")); + } + const response = await pending; + expect(response.status).toBe(200); + await response.text(); + expect(sent).toHaveLength(1); + expect(getAccountSet("anthropic")!.activeAccountId).toBe(b!); + expectQuota(a!, 37, 53); + expect(getCachedProviderAccountQuota("anthropic", b!)).toBeNull(); +}); + +test("credential replacement while A is pending skips its old-generation response", async () => { + const [a, b] = await seed(); + const entered = deferred(); + const returned = deferred(); + const pending = post(configFor(() => { entered.resolve(); return returned.promise; })); + await entered.promise; + try { + expect(sent[0]!.authorization).toBe(`Bearer ${credential(0).access}`); + await saveAccountCredential("anthropic", a!, { ...credential(0), access: "synthetic-replacement-access", refresh: "synthetic-replacement-refresh" }); + } finally { + returned.resolve(answer(false)); + } + const response = await pending; + expect(response.status).toBe(200); + await response.text(); + expect(sent).toHaveLength(1); + expect(getAccountSet("anthropic")!.accounts.find(row => row.id === a)!.credential.access).toBe("synthetic-replacement-access"); + expect(getCachedProviderAccountQuota("anthropic", a!)).toBeNull(); + expect(getCachedProviderAccountQuota("anthropic", b!)).toBeNull(); +}); + +const overriddenHeaders: { label: string; headers: Record; authorization: string; apiKey: string | null }[] = [ + { label: "overridden bearer", headers: { Authorization: "Bearer synthetic-override" }, authorization: "Bearer synthetic-override", apiKey: null }, + { label: "additional x-api-key", headers: { "x-api-key": "synthetic-api-key" }, authorization: `Bearer ${credential(0).access}`, apiKey: "synthetic-api-key" }, +]; +test.each(overriddenHeaders)("$label skips quota attribution even when a selected OAuth account exists", async ({ headers, authorization, apiKey }) => { + const ids = await seed(); + const response = await post(configFor(body => answer(body.stream === true), headers)); + expect(response.status).toBe(200); + await response.text(); + expect(sent).toHaveLength(1); + expect(sent[0]).toMatchObject({ authorization, apiKey }); + for (const id of ids) expect(getCachedProviderAccountQuota("anthropic", id)).toBeNull(); +}); + +test("real web-search routed loop records A429 and B200 through fetchForRequest", async () => { + const [a, b] = await seed(); + const config = configFor(body => { + // The search loop forces upstream streaming although the client asks for JSON. + expect(body.stream).toBe(true); + if (sent.length === 1) return limited(); + expect(sent.length).toBe(2); + expectQuota(a!, 100, 61); + return answer(true); + }); + config.webSearchSidecar = { backend: "anthropic", enabled: true }; + const response = await post(config, { tools: [{ type: "web_search" }] }); + expect(response.status).toBe(200); + expect(await response.text()).toContain("The answer is complete."); + expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); + expectQuota(a!, 100, 61); + expectQuota(b!, 23, 47); +}); + +test("real terminal continuation records A429 before retrying the continuation on B", async () => { + const [a, b] = await seed(); + const config = configFor(body => { + // The real guard recognizes an actionable request plus a short execution announcement, + // with available tools and no tool call. A normal completed answer does not trigger it. + if (sent.length === 1) return answer(body.stream === true, "0.11", "0.31", "I will modify the file now."); + if (sent.length === 2) { + expectQuota(a!, 11, 31); + return limited(); + } + expect(sent.length).toBe(3); + expectQuota(a!, 100, 61); + return answer(body.stream === true); + }); + const response = await post(config, { + input: "Please modify the file now", + tools: [{ type: "function", name: "read_file", description: "read a file", parameters: { type: "object" } }], + }); + expect(response.status).toBe(200); + expect(await response.text()).toContain("The answer is complete."); + expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); + expectQuota(a!, 100, 61); + expectQuota(b!, 23, 47); +}); + +test("real image bridge routed loop records A429 and B200 through fetchForRequest", async () => { + const [a, b] = await seed(); + const config = configFor(body => { + expect(body.stream).toBe(true); + // Only the bridge installs this synthetic tool for the hosted image_generation input. + expect(body.tools).toEqual(expect.arrayContaining([expect.objectContaining({ name: "custom_image_gen" })])); + if (sent.length === 1) return limited(); + expect(sent.length).toBe(2); + expectQuota(a!, 100, 61); + return answer(true); + }); + config.images = { bridgeEnabled: true }; + config.providers.xai = { + adapter: "openai-chat", baseUrl: "https://api.x.ai/v1", authMode: "key", apiKey: "synthetic-image-key", + }; + const response = await post(config, { stream: true, tools: [{ type: "image_generation" }] }); + expect(response.status).toBe(200); + expect(await response.text()).toContain("The answer is complete."); + expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); + expectQuota(a!, 100, 61); + expectQuota(b!, 23, 47); +}); diff --git a/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts b/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts new file mode 100644 index 0000000000..21ae2d8489 --- /dev/null +++ b/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts @@ -0,0 +1,528 @@ +/** Anthropic response observations must preserve account usage and probe semantics. */ +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { mkdtempSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { + clearAnthropicAccountCooldown, + clearAnthropicAccountPoolState, + forgetAnthropicFailoverQuorum, + getAnthropicAccountHealthSnapshot, + rotateAnthropicAccountOn429, +} from "../../../src/oauth/anthropic-routing"; +import { projectStoredOAuthAccountHealth } from "../../../src/oauth/health"; +import { + clearAccountQuotaCache, + fetchProviderAccountQuotas, + getCachedProviderAccountQuota, + parseAnthropicRateLimitHeaders, + recordAnthropicAccountQuotaFromHeaders, + reconcileProviderAccountQuotaRows, + resetProviderQuotaReconcileStateForTests, + setCachedProviderAccountQuotaForTests, + sweepExpiredProviderAccountQuotaRows, +} from "../../../src/providers/quota"; +import { getAccountSet, saveCredential } from "../../../src/oauth/store"; +import { clearPoolRotationState } from "../../../src/codex/pool-rotation"; +import { removeTreeWithRetry } from "../../helpers/remove-tree"; +import type { OcxConfig } from "../../../src/types"; + +const originalHome = process.env.OPENCODEX_HOME; +const originalFetch = globalThis.fetch; +const originalNow = Date.now; +let home: string; + +beforeEach(() => { + globalThis.fetch = (async () => { throw new Error("Unexpected network request in quota test"); }) as typeof fetch; + home = mkdtempSync(join(tmpdir(), "ocx-anthropic-ratelimit-")); + process.env.OPENCODEX_HOME = home; + clearAnthropicAccountPoolState(); + clearPoolRotationState(); + clearAccountQuotaCache(); + // `lastReconciledGeneration` is module-global and survives a cache clear, so the fence case + // below would otherwise raise the floor for every test that runs after it in this file. + resetProviderQuotaReconcileStateForTests(); + forgetAnthropicFailoverQuorum(); +}); + +afterEach(() => { + globalThis.fetch = originalFetch; + Date.now = originalNow; + clearAnthropicAccountPoolState(); + clearPoolRotationState(); + // The argument-less form, deliberately: only it calls cancelPendingAccountQuotaPersist. + // The observer ends in a 250ms-debounced write that resolves OPENCODEX_HOME at fire time, + // so a provider-scoped clear would leave that write to land in whatever home is current a + // quarter second later — the next test's sandbox, or the developer's real one. + clearAccountQuotaCache(); + resetProviderQuotaReconcileStateForTests(); + forgetAnthropicFailoverQuorum(); + if (originalHome === undefined) delete process.env.OPENCODEX_HOME; + else process.env.OPENCODEX_HOME = originalHome; + removeTreeWithRetry(home); +}); + +/** The store assigns its own slot ids, so the seeded `accountId` is never the cache key. */ +async function seed(count: number): Promise { + for (let i = 0; i < count; i++) { + await saveCredential("anthropic", { + access: `access-${i}`, + refresh: `refresh-${i}`, + expires: Date.now() + 3_600_000, + accountId: `uuid-${i}`, + email: `user${i}@example.test`, + } as never); + } + return getAccountSet("anthropic")?.accounts.map(a => a.id) ?? []; +} + +function poolEnabled(): OcxConfig { + return { + port: 0, + defaultProvider: "anthropic", + providers: { + anthropic: { adapter: "anthropic", baseUrl: "https://api.anthropic.com", authMode: "oauth" }, + }, + anthropicAccountPool: { enabled: true }, + } as OcxConfig; +} + +/** A real 429 from a drained five-hour window, captured from api.anthropic.com. */ +function drainedFiveHour(resetEpochSeconds: number): Headers { + return new Headers({ + "anthropic-ratelimit-unified-status": "rejected", + "anthropic-ratelimit-unified-5h-status": "rejected", + "anthropic-ratelimit-unified-5h-reset": String(resetEpochSeconds), + "anthropic-ratelimit-unified-5h-utilization": "1.0", + "anthropic-ratelimit-unified-7d-status": "allowed", + "anthropic-ratelimit-unified-7d-reset": String(resetEpochSeconds + 86_400), + "anthropic-ratelimit-unified-7d-utilization": "0.36", + }); +} + +describe("Anthropic cooldown honours the stated window", () => { + test("a multi-hour Retry-After is not truncated to the guessed-backoff ceiling", async () => { + const start = Date.now(); + const ids = await seed(2); + // 7999s is what a drained five-hour window actually answers; the old 15-minute clamp + // turned a single refusal into sixteen wasted retries before the window reopened. + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, "7999", null, start); + const health = getAnthropicAccountHealthSnapshot(ids[0]!, start); + expect(health?.cooldownUntil).toBe(start + 7_999_000); + expect(health?.cooldownSource).toBe("retry-after"); + }); + + test("a week-long Retry-After retains its stated deadline", async () => { + const start = Date.now(); + const ids = await seed(2); + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, "604800", null, start); + expect(getAnthropicAccountHealthSnapshot(ids[0]!, start)?.cooldownUntil) + .toBe(start + 604_800_000); + }); + + test("an HTTP-date Retry-After is honoured beyond six hours", async () => { + const start = Date.now(); + const ids = await seed(2); + // RFC 9110 allows either form, and both are upstream STATING when it will serve again -- + // the date branch had its own clamp and would have kept the 15-minute truncation. + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, new Date(start + 2 * 60 * 60_000).toUTCString(), null, start); + const cooldown = getAnthropicAccountHealthSnapshot(ids[0]!, start)?.cooldownUntil; + // toUTCString drops sub-second precision, so the deadline lands within a second of target. + expect(cooldown).toBeGreaterThan(start + 2 * 60 * 60_000 - 1_000); + expect(cooldown).toBeLessThanOrEqual(start + 2 * 60 * 60_000); + + const reset = Math.floor(start / 1000) * 1000 + 48 * 60 * 60_000; + rotateAnthropicAccountOn429(poolEnabled(), ids[1]!, new Date(reset).toUTCString(), null, start); + expect(getAnthropicAccountHealthSnapshot(ids[1]!, start)?.cooldownUntil).toBe(reset); + }); + + test("a 429 without Retry-After cools until the rejected window reopens", async () => { + const start = Date.now(); + const ids = await seed(2); + // The wire carries whole seconds, so the reset is built from an epoch second and the + // expectation is derived from the same value rather than from `start + 90min` — an + // assertion on the un-truncated millisecond would be testing the fixture, not the code. + const resetEpochSeconds = Math.floor((start + 90 * 60_000) / 1000); + // Retry-After is not guaranteed on an Anthropic 429; the rejected window's reset is. + // Without reading it this refusal cooled for the 60s default and the drained account + // was back in the rotation a minute later. + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, null, null, start, drainedFiveHour(resetEpochSeconds)); + const health = getAnthropicAccountHealthSnapshot(ids[0]!, start); + expect(health?.cooldownUntil).toBe(resetEpochSeconds * 1000); + // Its own source, not "retry-after": the dashboard renders that one as request-rate + // throttling, and a spent five-hour window is quota. Same vocabulary the Codex pool uses. + expect(health?.cooldownSource).toBe("reset-derived"); + }); + + test("an ALLOWED window's reset never cools the account", async () => { + const start = Date.now(); + const ids = await seed(2); + // Every response names when the current period ends, including a healthy one. Treating + // that as a cooldown would bench an account with 4% used for the rest of its window. + const healthy = new Headers({ + "anthropic-ratelimit-unified-status": "allowed", + "anthropic-ratelimit-unified-5h-status": "allowed", + "anthropic-ratelimit-unified-5h-reset": String(Math.floor((start + 3 * 60 * 60_000) / 1000)), + "anthropic-ratelimit-unified-5h-utilization": "0.04", + }); + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, null, null, start, healthy); + const health = getAnthropicAccountHealthSnapshot(ids[0]!, start); + expect(health?.cooldownUntil).toBe(start + 60_000); + expect(health?.cooldownSource).toBe("default"); + }); + + test("both windows rejected cools until the LAST one reopens", async () => { + const start = Date.now(); + const ids = await seed(2); + // The limiter is AND-composed: upstream refuses while ANY window rejects. An account whose + // 5-hour bucket rolls in three minutes is still refused for the days its weekly window + // needs, so cooling to the earliest reset would re-offer it every three minutes until the + // weekly window finally reopens -- the exact loop this path exists to end. + const fiveHourReset = Math.floor((start + 3 * 60_000) / 1000); + const weeklyReset = Math.floor((start + 5 * 24 * 60 * 60_000) / 1000); + const bothDrained = new Headers({ + "anthropic-ratelimit-unified-status": "rejected", + "anthropic-ratelimit-unified-5h-status": "rejected", + "anthropic-ratelimit-unified-5h-reset": String(fiveHourReset), + "anthropic-ratelimit-unified-7d-status": "rejected", + "anthropic-ratelimit-unified-7d-reset": String(weeklyReset), + }); + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, null, null, start, bothDrained); + expect(getAnthropicAccountHealthSnapshot(ids[0]!, start)?.cooldownUntil).toBe(weeklyReset * 1000); + }); + + test("a reset-derived cooldown surfaces as quota, a Retry-After as a rate limit", async () => { + const start = Date.now(); + const ids = await seed(2); + const account = getAccountSet("anthropic")!.accounts.find(a => a.id === ids[0]!)!; + // The distinction is not cosmetic: the dashboard tells an operator to wait out a rate + // limit and to switch accounts on spent quota. A drained five-hour window is the second. + rotateAnthropicAccountOn429( + poolEnabled(), + ids[0]!, + null, + null, + start, + drainedFiveHour(Math.floor((start + 90 * 60_000) / 1000)), + ); + expect(projectStoredOAuthAccountHealth("anthropic", account, start)).toMatchObject({ + status: "cooldown", + reason: "quota", + }); + + clearAnthropicAccountCooldown(ids[0]!); + rotateAnthropicAccountOn429(poolEnabled(), ids[0]!, "300", null, start); + expect(projectStoredOAuthAccountHealth("anthropic", account, start)).toMatchObject({ + status: "cooldown", + reason: "rate_limit", + }); + }); + + test("Retry-After wins over the header reset", async () => { + const start = Date.now(); + const ids = await seed(2); + // Retry-After is written for this decision; the reset epoch is a fallback for the + // refusals that omit it. A disagreement must not silently prefer the fallback. + rotateAnthropicAccountOn429( + poolEnabled(), + ids[0]!, + "120", + null, + start, + drainedFiveHour(Math.floor((start + 4 * 60 * 60_000) / 1000)), + ); + expect(getAnthropicAccountHealthSnapshot(ids[0]!, start)?.cooldownUntil).toBe(start + 120_000); + }); +}); + +describe("Anthropic rate-limit headers feed the routing cache", () => { + test("utilization is read as a fraction, not as a percent", () => { + // The header sends 0.74 for a 74%-spent window while the probe endpoint sends 74.0 for + // the same account. Passing the header value through unscaled would file the emptiest + // account as the freshest and route every new session straight at it. + const quota = parseAnthropicRateLimitHeaders(new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0.42", + "anthropic-ratelimit-unified-7d-utilization": "0.74", + })); + expect(quota?.fiveHourPercent).toBe(42); + expect(quota?.weeklyPercent).toBe(74); + }); + + test("reset epochs are promoted from seconds to milliseconds", () => { + const quota = parseAnthropicRateLimitHeaders(new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0.5", + "anthropic-ratelimit-unified-5h-reset": "1788717000", + })); + expect(quota?.fiveHourResetAt).toBe(1_788_717_000_000); + }); + + test("a header set with no utilization yields no measurement", () => { + // A renamed or dropped header must degrade to "unmeasured", which the router already + // has a defined behaviour for -- never to a fabricated zero, which reads as a fresh + // account and would pull traffic toward whichever account stopped reporting. + expect(parseAnthropicRateLimitHeaders(new Headers({ + "anthropic-ratelimit-unified-5h-reset": "1788717000", + }))).toBeNull(); + }); + + test("a utilization above 1 is rejected rather than clamped", () => { + // Above one is a wire change, not a full window. Inventing 100 from it would cool a + // healthy account on a misread. + expect(parseAnthropicRateLimitHeaders(new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "42", + }))).toBeNull(); + }); + + test("an observed turn makes the serving account's usage known to the router", async () => { + const ids = await seed(2); + // Before the observation the account has no reading at all, which is what left a + // two-account pool scoring both at UNKNOWN_USAGE_SCORE and picking between them blind. + expect(getCachedProviderAccountQuota("anthropic", ids[0]!)).toBeNull(); + recordAnthropicAccountQuotaFromHeaders(ids[0]!, drainedFiveHour(Math.floor(Date.now() / 1000) + 3600), 0); + expect(getCachedProviderAccountQuota("anthropic", ids[0]!)?.fiveHourPercent).toBe(100); + // The other account stays unmeasured: an observation is attributed to the account that + // served the turn, never spread across the roster. + expect(getCachedProviderAccountQuota("anthropic", ids[1]!)).toBeNull(); + }); + + test("headers with nothing parseable leave the previous reading intact", async () => { + const ids = await seed(1); + recordAnthropicAccountQuotaFromHeaders(ids[0]!, new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0.25", + }), 0); + recordAnthropicAccountQuotaFromHeaders(ids[0]!, new Headers({ "content-type": "application/json" }), 0); + // A response that says nothing about quota is not evidence that the quota is gone. + expect(getCachedProviderAccountQuota("anthropic", ids[0]!)?.fiveHourPercent).toBe(25); + }); + + test("an empty account id writes nothing", () => { + // API-key providers and single-account installs below failover quorum reach the observer + // with no account to attribute; that is an ordinary state, not an error. Asserting only + // that it does not throw would pass with the guard deleted -- an empty-string cache key + // is perfectly writable -- so this asserts the absence of the row instead. + recordAnthropicAccountQuotaFromHeaders("", drainedFiveHour(Math.floor(Date.now() / 1000) + 3600), 0); + expect(getCachedProviderAccountQuota("anthropic", "")).toBeNull(); + }); + + test("a stale writer generation is refused", async () => { + const ids = await seed(1); + // The fence exists because a turn is a long await: an account or config change that lands + // mid-turn must not be overwritten by a measurement taken before it. Every other test here + // passes 0, which a fresh worker always accepts, so without this case the parameter is + // carried but never actually exercised as a fence. + reconcileProviderAccountQuotaRows({ + generation: 5, + providerNames: new Set(), + comboIds: new Set(), + comboTargets: new Set(), + codexAccountIds: new Set(), + oauthAccountKeys: new Set(), + configRoots: new Set(), + }); + recordAnthropicAccountQuotaFromHeaders(ids[0]!, new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0.5", + }), 1); + expect(getCachedProviderAccountQuota("anthropic", ids[0]!)).toBeNull(); + }); + + test("an observation keeps the model-scoped bars the probe filled", async () => { + const ids = await seed(1); + // The probe reports per-model weekly limits (Opus, Sonnet, Fable) that no header carries. + // They are read by the manual-preference exhaustion check and by `headroomOf`, so a + // wholesale replace would not merely blank the dashboard: it would route an Opus request + // to an account whose Opus allowance is spent. + setCachedProviderAccountQuotaForTests("anthropic", ids[0]!, { + fiveHourPercent: 10, + weeklyPercent: 20, + customWindows: [{ label: "Opus", percent: 96 }], + updatedAt: Date.now(), + }); + recordAnthropicAccountQuotaFromHeaders(ids[0]!, new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0.41", + }), 0); + const quota = getCachedProviderAccountQuota("anthropic", ids[0]!); + expect(quota?.fiveHourPercent).toBe(41); + // Untouched by this observation, not erased by it. + expect(quota?.weeklyPercent).toBe(20); + expect(quota?.customWindows).toEqual([{ label: "Opus", percent: 96 }]); + }); + + test("a percent that is not exactly representable is rounded, not left as an artifact", () => { + // `0.29 * 100` is 28.999999999999996 in binary floating point, and the CLI interpolates the + // percent raw. A user reading `5h 28.999999999999996%` would reasonably file a bug. + expect(parseAnthropicRateLimitHeaders(new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0.29", + }))?.fiveHourPercent).toBe(29); + }); +}); + +describe("Anthropic observation and probe clocks", () => { + function observe(accountId: string, percent = "0.41"): void { + recordAnthropicAccountQuotaFromHeaders(accountId, new Headers({ + "anthropic-ratelimit-unified-5h-utilization": percent, + }), 0); + } + + function usageResponse(): Response { + return Response.json({ five_hour: { utilization: 12 }, seven_day_opus: { utilization: 63 } }); + } + + test("a cold header-only row does not defer the first usage probe", async () => { + const [id] = await seed(1); + let calls = 0; + globalThis.fetch = (async () => { calls++; return usageResponse(); }) as typeof fetch; + observe(id!); + expect(getCachedProviderAccountQuota("anthropic", id!)?.fiveHourPercent).toBe(41); + const [row] = await fetchProviderAccountQuotas("anthropic"); + expect(calls).toBe(1); + expect(row?.quota).toMatchObject({ fiveHourPercent: 12, customWindows: [{ label: "Opus", percent: 63 }] }); + expect(row?.unavailable).toBeUndefined(); + }); + + test("fresh header observations survive sweeping until their own TTL expires", async () => { + const [id] = await seed(1); + const observedAt = originalNow(); + Date.now = () => observedAt; + observe(id!); + expect(sweepExpiredProviderAccountQuotaRows(observedAt + 1)).toBe(0); + expect(getCachedProviderAccountQuota("anthropic", id!)?.fiveHourPercent).toBe(41); + expect(sweepExpiredProviderAccountQuotaRows(observedAt + 10 * 60_000 - 1)).toBe(0); + expect(sweepExpiredProviderAccountQuotaRows(observedAt + 10 * 60_000)).toBe(1); + expect(getCachedProviderAccountQuota("anthropic", id!)).toBeNull(); + }); + + test("headers preserve the probe TTL instead of renewing it", async () => { + const [id] = await seed(1); + let now = originalNow(); + Date.now = () => now; + let calls = 0; + globalThis.fetch = (async () => { calls++; return usageResponse(); }) as typeof fetch; + await fetchProviderAccountQuotas("anthropic"); + now += 9 * 60_000; + observe(id!); + expect((await fetchProviderAccountQuotas("anthropic"))[0]?.quota?.fiveHourPercent).toBe(41); + expect(calls).toBe(1); + now += 60_001; + await fetchProviderAccountQuotas("anthropic"); + expect(calls).toBe(2); + }); + + for (const observeAfterRestart of [false, true]) { + test(`restart keeps Anthropic probes due with new headers: ${observeAfterRestart}`, async () => { + const [id] = await seed(1); + const updatedAt = Date.now(); + const saved = { fiveHourPercent: 41, customWindows: [{ label: "Opus", percent: 63 }], updatedAt }; + writeFileSync(join(home, "provider-account-quota-cache.json"), JSON.stringify({ + version: 1, + rows: { [`anthropic\u0000${id}`]: saved, "kiro\u0000other": { monthlyPercent: 17, updatedAt } }, + })); + clearAccountQuotaCache(); + // Cover both dashboard-first and response-first hydration after restart. + if (observeAfterRestart) observe(id!, "0.52"); + let calls = 0; + globalThis.fetch = (async () => { calls++; return new Response("busy", { status: 429 }); }) as typeof fetch; + const [row] = await fetchProviderAccountQuotas("anthropic"); + expect(calls).toBe(1); + expect(row?.quota).toMatchObject({ fiveHourPercent: observeAfterRestart ? 52 : 41, customWindows: saved.customWindows }); + expect(getCachedProviderAccountQuota("kiro", "other")?.monthlyPercent).toBe(17); + expect(row?.unavailable).toBe(true); + }); + } + + for (const [failure, warm] of [["http", true], ["network", true], ["http", false]] as const) { + test(`joined ${failure} probe failures preserve in-flight headers (warm cache: ${warm})`, async () => { + const [id] = await seed(1); + if (warm) setCachedProviderAccountQuotaForTests("anthropic", id!, { + fiveHourPercent: 10, weeklyPercent: 20, customWindows: [{ label: "Opus", percent: 63 }], updatedAt: Date.now(), + }); + let started!: () => void; + const dispatched = new Promise(resolve => { started = resolve; }); + let finish!: (response: Response) => void; + let fail!: (error: Error) => void; + const response = new Promise((resolve, reject) => { finish = resolve; fail = reject; }); + let calls = 0; + globalThis.fetch = (async () => { calls++; started(); return response; }) as typeof fetch; + const first = fetchProviderAccountQuotas("anthropic", true); + await dispatched; + const second = fetchProviderAccountQuotas("anthropic", true); + observe(id!); + const latest = getCachedProviderAccountQuota("anthropic", id!); + if (failure === "http") finish(new Response("busy", { status: 429 })); + else fail(new Error("offline")); + const [a, b] = await Promise.all([first, second]); + expect(calls).toBe(1); + expect(a).toEqual(b); + expect(a[0]?.quota).toEqual(latest); + expect(a[0]?.quota?.fiveHourPercent).toBe(41); + if (warm) expect(a[0]?.quota).toMatchObject({ weeklyPercent: 20, customWindows: [{ label: "Opus", percent: 63 }] }); + expect(a[0]?.unavailable).toBe(true); + expect(getCachedProviderAccountQuota("anthropic", id!)).toEqual(latest); + // A later partial observation cannot claim that the failed usage probe succeeded. + observe(id!, "0.53"); + const [cached] = await fetchProviderAccountQuotas("anthropic"); + expect(cached?.unavailable).toBe(true); + expect(cached?.quota?.fiveHourPercent).toBe(53); + expect(calls).toBe(1); + globalThis.fetch = (async () => usageResponse()) as typeof fetch; + expect((await fetchProviderAccountQuotas("anthropic", true))[0]?.unavailable).toBeUndefined(); + }); + } +}); + +describe("Anthropic malformed deadlines and partial windows", () => { + for (const invalid of ["NaN", "Infinity", "1e309", "1e308", "8640000000001", "not-a-date", "-1", "0"]) { + test(`invalid reset ${invalid} cannot establish a cooldown deadline`, async () => { + const start = Date.now(); + const [id] = await seed(1); + const headers = new Headers({ + "anthropic-ratelimit-unified-7d-status": "rejected", + "anthropic-ratelimit-unified-7d-reset": invalid, + "anthropic-ratelimit-unified-7d-utilization": "0.74", + }); + rotateAnthropicAccountOn429(poolEnabled(), id!, null, null, start, headers); + expect(getAnthropicAccountHealthSnapshot(id!, start)).toMatchObject({ + cooldownUntil: start + 60_000, cooldownSource: "default", + }); + expect(parseAnthropicRateLimitHeaders(headers)?.weeklyResetAt).toBeUndefined(); + }); + } + + test("overflowing Retry-After falls back to a valid rejected reset", async () => { + const start = Date.now(); + const [id] = await seed(1); + const reset = Math.floor(start / 1000) + 432_000; + for (const invalid of ["9".repeat(400), "8640000000001", "invalid-date"]) { + rotateAnthropicAccountOn429(poolEnabled(), id!, invalid, null, start, drainedFiveHour(reset)); + expect(getAnthropicAccountHealthSnapshot(id!, start)).toMatchObject({ + cooldownUntil: reset * 1000, cooldownSource: "reset-derived", + }); + } + }); + + test("a malformed weekly deadline cannot hide a valid five-hour reset", async () => { + const start = Date.now(); + const [id] = await seed(1); + const reset = Math.floor(start / 1000) + 180; + const headers = drainedFiveHour(reset); + headers.set("anthropic-ratelimit-unified-7d-status", "rejected"); + headers.set("anthropic-ratelimit-unified-7d-reset", "1e308"); + rotateAnthropicAccountOn429(poolEnabled(), id!, null, null, start, headers); + expect(getAnthropicAccountHealthSnapshot(id!, start)?.cooldownUntil).toBe(reset * 1000); + }); + + test("partial zero utilization preserves other and model-specific windows", async () => { + const [id] = await seed(1); + const customWindows = [{ label: "Opus", percent: 63 }]; + setCachedProviderAccountQuotaForTests("anthropic", id!, { + fiveHourPercent: 10, weeklyPercent: 20, weeklyResetAt: 1_800_000_000_000, customWindows, updatedAt: Date.now(), + }); + recordAnthropicAccountQuotaFromHeaders(id!, new Headers({ + "anthropic-ratelimit-unified-5h-utilization": "0", + "anthropic-ratelimit-unified-7d-utilization": "NaN", + "anthropic-ratelimit-unified-7d-reset": "1e308", + }), 0); + expect(getCachedProviderAccountQuota("anthropic", id!)).toMatchObject({ + fiveHourPercent: 0, weeklyPercent: 20, weeklyResetAt: 1_800_000_000_000, customWindows, + }); + }); +}); diff --git a/tests/adapters/anthropic/anthropic-sidecar-account-failover.test.ts b/tests/adapters/anthropic/anthropic-sidecar-account-failover.test.ts index 31b2389fb8..8d094db631 100644 --- a/tests/adapters/anthropic/anthropic-sidecar-account-failover.test.ts +++ b/tests/adapters/anthropic/anthropic-sidecar-account-failover.test.ts @@ -8,10 +8,11 @@ import { afterAll, afterEach, beforeAll, beforeEach, expect, mock, test } from " import { mkdtempSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import type { ProviderAdapter } from "../../../src/adapters/base"; +import type { AdapterRequest, IncomingMeta, ProviderAdapter } from "../../../src/adapters/base"; import { clearAnthropicAccountPoolState } from "../../../src/oauth/anthropic-routing"; import { clearGenericFailoverHealth } from "../../../src/oauth/generic-account-failover"; import { getAccountSet, saveCredential, setActiveAccount } from "../../../src/oauth/store"; +import { clearAccountQuotaCache, getCachedProviderAccountQuota, resetProviderQuotaReconcileStateForTests } from "../../../src/providers/quota"; import type { OcxConfig, OcxParsedRequest, OcxProviderConfig } from "../../../src/types"; import { removeTreeWithRetry } from "../../helpers/remove-tree"; @@ -66,15 +67,24 @@ beforeAll(async () => { runWithWebSearch: async (args: { parsed: OcxParsedRequest; adapter: ProviderAdapter; + incomingMeta: IncomingMeta; + fetchForRequest: (request: AdapterRequest, parsed: OcxParsedRequest) => typeof fetch; on429?: (retryAfter: string | null) => Promise; }) => { - const first = await args.adapter.buildRequest(args.parsed); - observedKeys.push(new Headers(first.headers).get("authorization") ?? ""); - const rotated = await args.on429?.("30"); + // This is a dispatch seam test. The real loop is covered in anthropic-quota-dispatch. + const first = await args.adapter.buildRequest(args.parsed, args.incomingMeta); + const refused = await args.fetchForRequest(first, args.parsed)(first.url, { + method: first.method, headers: first.headers, body: first.body, + }); + expect(refused.status).toBe(429); + const retryAfter = refused.headers.get("retry-after"); + await refused.body?.cancel(); + const rotated = await args.on429?.(retryAfter); if (!rotated) throw new Error("Anthropic sidecar did not rotate after 429"); - const second = await rotated.buildRequest(args.parsed); - observedKeys.push(new Headers(second.headers).get("authorization") ?? ""); - return new Response("sidecar-ok", { status: 200 }); + const second = await rotated.buildRequest(args.parsed, args.incomingMeta); + return args.fetchForRequest(second, args.parsed)(second.url, { + method: second.method, headers: second.headers, body: second.body, + }); }, })); @@ -88,11 +98,15 @@ beforeEach(() => { sidecarMode = false; clearAnthropicAccountPoolState(); clearGenericFailoverHealth(); + clearAccountQuotaCache(); + resetProviderQuotaReconcileStateForTests(); }); afterEach(() => { clearAnthropicAccountPoolState(); clearGenericFailoverHealth(); + clearAccountQuotaCache(); + resetProviderQuotaReconcileStateForTests(); removeTreeWithRetry(testHome); }); @@ -102,7 +116,7 @@ afterAll(() => { mock.restore(); }); -test("Anthropic web-search sidecar rotates on 429 when proactive pooling is disabled", async () => { +test("Anthropic sidecar dispatch seam records A429 and B200 when proactive pooling is disabled", async () => { sidecarMode = true; for (let index = 0; index < 2; index += 1) { await saveCredential("anthropic", { @@ -110,7 +124,7 @@ test("Anthropic web-search sidecar rotates on 429 when proactive pooling is disa refresh: `anthropic-refresh-${index}`, expires: Date.now() + 3_600_000, accountId: `anthropic-account-${index}`, - } as never, { addAccount: true }); + }); } const ids = getAccountSet("anthropic")!.accounts.map(account => account.id); await setActiveAccount("anthropic", ids[0]!); @@ -125,6 +139,27 @@ test("Anthropic web-search sidecar rotates on 429 when proactive pooling is disa baseUrl: "https://anthropic-sidecar.test/v1", authMode: "oauth", models: ["model"], + fetch: (async (_input, init) => { + observedKeys.push(new Headers(init?.headers).get("authorization") ?? ""); + if (observedKeys.length === 1) { + return new Response("rate limited", { + status: 429, + headers: { + "retry-after": "30", + "anthropic-ratelimit-unified-5h-utilization": "1", + "anthropic-ratelimit-unified-7d-utilization": "0.61", + }, + }); + } + expect(observedKeys).toHaveLength(2); + expect(getCachedProviderAccountQuota("anthropic", ids[0]!)).toMatchObject({ fiveHourPercent: 100, weeklyPercent: 61 }); + return new Response("sidecar-ok", { + headers: { + "anthropic-ratelimit-unified-5h-utilization": "0.23", + "anthropic-ratelimit-unified-7d-utilization": "0.47", + }, + }); + }) as typeof fetch, }, }, } as unknown as OcxConfig; @@ -146,4 +181,6 @@ test("Anthropic web-search sidecar rotates on 429 when proactive pooling is disa "Bearer anthropic-access-0", "Bearer anthropic-access-1", ]); + expect(getCachedProviderAccountQuota("anthropic", ids[0]!)).toMatchObject({ fiveHourPercent: 100, weeklyPercent: 61 }); + expect(getCachedProviderAccountQuota("anthropic", ids[1]!)).toMatchObject({ fiveHourPercent: 23, weeklyPercent: 47 }); }); diff --git a/tests/fixtures/test-layout-expected.json b/tests/fixtures/test-layout-expected.json index 6565f12821..2a1cac7ec3 100644 --- a/tests/fixtures/test-layout-expected.json +++ b/tests/fixtures/test-layout-expected.json @@ -39,6 +39,8 @@ "anthropic-image-retry.test.ts": "adapters/anthropic", "anthropic-pool-toggle-copy.test.ts": "adapters/anthropic", "anthropic-quorum-cache.test.ts": "routing", + "anthropic-quota-dispatch.test.ts": "adapters/anthropic", + "anthropic-ratelimit-headers.test.ts": "adapters/anthropic", "anthropic-reasoning.test.ts": "adapters/anthropic", "anthropic-sidecar-account-failover.test.ts": "adapters/anthropic", "anthropic-stream-hardening.test.ts": "adapters/anthropic", From 12b174ebc90e980970024445825f6b49a374154c Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 07:42:22 +0900 Subject: [PATCH 065/221] fix(claude): preserve signed and opaque replay block boundaries Preserve empty signed and redacted-only replay items, keep signature updates within their source thinking block, and emit opaque blocks in order. Retain hidden-summary policy and document deferred Claude hidden-text replay and live/cache claims. Add exact-array synthetic round-trip coverage; local tests and typecheck intentionally not run, pending parent combined remote CI. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi --- .../src/content/docs/fr/guides/claude-code.md | 2 + .../src/content/docs/guides/claude-code.md | 2 + .../src/content/docs/ja/guides/claude-code.md | 2 + .../src/content/docs/ko/guides/claude-code.md | 2 + .../src/content/docs/ru/guides/claude-code.md | 2 + .../src/content/docs/tr/guides/claude-code.md | 2 + .../content/docs/zh-cn/guides/claude-code.md | 2 + .../content/docs/zh-tw/guides/claude-code.md | 2 + src/adapters/anthropic.ts | 11 +- src/bridge.ts | 34 +++- src/claude/outbound.ts | 11 +- src/responses/parser.ts | 19 +- .../anthropic-thinking-signature.test.ts | 188 +++++++++++++++++- .../claude-outbound.test.ts | 17 ++ tests/responses/reasoning-envelope.test.ts | 4 +- 15 files changed, 277 insertions(+), 23 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/claude-code.md b/docs-site/src/content/docs/fr/guides/claude-code.md index ffc3ad6e88..7f1c0a54aa 100644 --- a/docs-site/src/content/docs/fr/guides/claude-code.md +++ b/docs-site/src/content/docs/fr/guides/claude-code.md @@ -506,6 +506,8 @@ Le proxy traduit chaque requête Anthropic Messages API au format Codex Response | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +Sur l’adaptateur Anthropic prévu, les blocs signés non masqués (y compris thinking vide) et les blocs redacted opaques sont préservés. `hideThinkingSummary` reste inchangé : le texte signé masqué localement n’est pas exposé aux clients Claude ; sa relecture sans perte via cette frontière reste non établie. Les anciennes enveloppes combinées ne permettent pas de rétablir l’ordre après émission du texte en streaming. `claudeCode.compatibility: "enforce"` refuse toujours la relecture thinking. Cela ne prouve ni l’acceptation réelle par Anthropic ni une amélioration du cache ; [#3719](https://github.com/lidge-jun/opencodex/issues/3719) reste ouvert. + **Cas d'erreur (400) :** JSON mal formé ; `model` absent ou vide ; `messages` absent ou vide ; rôle non pris en charge ; `tool_result` sans `tool_use_id` ; `tool_use` sans identifiant ni nom ; `tool_choice` nommé sans nom. diff --git a/docs-site/src/content/docs/guides/claude-code.md b/docs-site/src/content/docs/guides/claude-code.md index b237955adb..f1c1bfbfe1 100644 --- a/docs-site/src/content/docs/guides/claude-code.md +++ b/docs-site/src/content/docs/guides/claude-code.md @@ -519,6 +519,8 @@ The proxy translates every Anthropic Messages API request into the Codex Respons | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +Replay preserves non-hidden signed blocks (including empty thinking) and opaque redacted blocks on the intended Anthropic adapter. `hideThinkingSummary` remains unchanged: locally hidden signed text is not exposed to Claude clients, and lossless replay through that hidden Claude boundary is not established. Older combined reasoning envelopes cannot recover original block order once streaming text has been emitted. `claudeCode.compatibility: "enforce"` still rejects thinking replay. This does not establish live Anthropic acceptance or cache-hit improvements; [#3719](https://github.com/lidge-jun/opencodex/issues/3719) remains open. + **Error cases (400):** malformed JSON; missing/empty `model`; missing/empty `messages`; unsupported role; `tool_result` without `tool_use_id`; `tool_use` without id/name; named `tool_choice` without name. diff --git a/docs-site/src/content/docs/ja/guides/claude-code.md b/docs-site/src/content/docs/ja/guides/claude-code.md index 43b8bcee24..2445e7fa3a 100644 --- a/docs-site/src/content/docs/ja/guides/claude-code.md +++ b/docs-site/src/content/docs/ja/guides/claude-code.md @@ -374,6 +374,8 @@ Claude Code の `/effort` 設定はアダプターでも維持されます。 | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +意図した Anthropic アダプターでは、非表示でない署名付きブロック(空の thinking を含む)と不透明な redacted ブロックを保持します。`hideThinkingSummary` は変更しません。ローカルで隠した署名付きテキストは Claude クライアントに公開せず、この非表示境界での無損失再生は未確認です。旧形式の結合エンベロープは、テキスト送信後に元のブロック順を復元できません。`claudeCode.compatibility: "enforce"` は引き続き thinking 再生を拒否します。実際の Anthropic 受理やキャッシュ改善の証明ではなく、[#3719](https://github.com/lidge-jun/opencodex/issues/3719) は未解決です。 + **エラー条件(400):** 不正な JSON、欠落または空の `model`、欠落または空の `messages`、未サポートの role、`tool_use_id` のない `tool_result`、id/name のない `tool_use`、name のない名前指定 `tool_choice` です。 diff --git a/docs-site/src/content/docs/ko/guides/claude-code.md b/docs-site/src/content/docs/ko/guides/claude-code.md index 0964f2ff49..4e3535d821 100644 --- a/docs-site/src/content/docs/ko/guides/claude-code.md +++ b/docs-site/src/content/docs/ko/guides/claude-code.md @@ -412,6 +412,8 @@ Claude Code의 `/effort` 설정은 어댑터에서도 유지돼요. | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +의도한 Anthropic 어댑터에서는 숨기지 않은 서명 블록(빈 thinking 포함)과 불투명 redacted 블록을 보존해요. `hideThinkingSummary` 정책은 유지돼요. 로컬에서 숨긴 서명 텍스트를 Claude 클라이언트에 노출하지 않으며, 이 숨김 경계를 통한 무손실 재생은 아직 보장하지 않아요. 이전 결합 봉투는 스트리밍 텍스트가 이미 전송됐다면 원래 블록 순서를 복원할 수 없어요. `claudeCode.compatibility: "enforce"`는 여전히 thinking 재생을 거절해요. 실제 Anthropic 수락이나 캐시 적중 개선을 증명한 것은 아니며 [#3719](https://github.com/lidge-jun/opencodex/issues/3719)는 열어 둬요. + **오류 조건(400):** 잘못된 JSON, 누락되거나 빈 `model`, 누락되거나 빈 `messages`, 지원하지 않는 role, `tool_use_id` 없는 `tool_result`, id/name 없는 `tool_use`, name 없는 이름 지정 `tool_choice`예요. diff --git a/docs-site/src/content/docs/ru/guides/claude-code.md b/docs-site/src/content/docs/ru/guides/claude-code.md index 1769642bd7..847e79964a 100644 --- a/docs-site/src/content/docs/ru/guides/claude-code.md +++ b/docs-site/src/content/docs/ru/guides/claude-code.md @@ -399,6 +399,8 @@ Claude Code — это лишь учётные данные для доступ | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +На выбранном адаптере Anthropic сохраняются нескрытые подписанные блоки (включая пустой thinking) и непрозрачные блоки redacted. Политика `hideThinkingSummary` не меняется: локально скрытый подписанный текст не раскрывается клиентам Claude, а воспроизведение без потерь через эту границу пока не подтверждено. Старые объединённые конверты не восстанавливают порядок после отправки потокового текста. `claudeCode.compatibility: "enforce"` по-прежнему отклоняет thinking replay. Приём реальным Anthropic и улучшение кеша не доказаны; [#3719](https://github.com/lidge-jun/opencodex/issues/3719) остаётся открытым. + **Случаи ошибок (400):** некорректный JSON; отсутствующий или пустой `model`; отсутствующий или пустой `messages`; неподдерживаемая роль; `tool_result` без `tool_use_id`; `tool_use` без id/name; именованный `tool_choice` без имени. diff --git a/docs-site/src/content/docs/tr/guides/claude-code.md b/docs-site/src/content/docs/tr/guides/claude-code.md index 29d96506ac..f1c7fca438 100644 --- a/docs-site/src/content/docs/tr/guides/claude-code.md +++ b/docs-site/src/content/docs/tr/guides/claude-code.md @@ -588,6 +588,8 @@ dönüştürür: | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +Hedeflenen Anthropic adaptöründe gizlenmemiş imzalı bloklar (boş thinking dahil) ve opak redacted blokları korunur. `hideThinkingSummary` değişmez: yerel olarak gizlenen imzalı metin Claude istemcilerine gösterilmez; bu sınır üzerinden kayıpsız yeniden oynatma doğrulanmamıştır. Eski birleşik zarflarda metin akışla gönderildikten sonra özgün blok sırası geri getirilemez. `claudeCode.compatibility: "enforce"` thinking yeniden oynatmasını hâlâ reddeder. Bu, gerçek Anthropic kabulünü veya önbellek iyileşmesini kanıtlamaz; [#3719](https://github.com/lidge-jun/opencodex/issues/3719) açık kalır. + **Hata durumları (400):** hatalı biçimlendirilmiş JSON; eksik/boş `model`; eksik/boş `messages`; desteklenmeyen rol; `tool_use_id` içermeyen `tool_result`; kimlik/ad içermeyen `tool_use`; ad içermeyen adlandırılmış `tool_choice`. diff --git a/docs-site/src/content/docs/zh-cn/guides/claude-code.md b/docs-site/src/content/docs/zh-cn/guides/claude-code.md index 3e2824d3e9..2b8c0bfa98 100644 --- a/docs-site/src/content/docs/zh-cn/guides/claude-code.md +++ b/docs-site/src/content/docs/zh-cn/guides/claude-code.md @@ -350,6 +350,8 @@ Claude Code 的 `/effort` 设置会完整保留并传递给适配器: | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +在预期的 Anthropic 适配器上,保留未隐藏的签名块(包括空 thinking)和不透明的 redacted 块。`hideThinkingSummary` 策略不变:不会向 Claude 客户端公开本地隐藏的签名文本,尚未证明经过此隐藏边界的无损重放。旧版组合信封在流式文本发出后无法恢复原始块顺序。`claudeCode.compatibility: "enforce"` 仍拒绝 thinking 重放。这不证明真实 Anthropic 接受请求或缓存命中改善;[#3719](https://github.com/lidge-jun/opencodex/issues/3719) 仍未关闭。 + **错误情况(400):**JSON 格式错误;缺少/空的 `model`;缺少/空的 `messages`;不支持的 role;`tool_result` 缺少 `tool_use_id`;`tool_use` 缺少 id/name;指定名称的 `tool_choice` 缺少 name。 diff --git a/docs-site/src/content/docs/zh-tw/guides/claude-code.md b/docs-site/src/content/docs/zh-tw/guides/claude-code.md index 5a6fbf3a86..db1c779145 100644 --- a/docs-site/src/content/docs/zh-tw/guides/claude-code.md +++ b/docs-site/src/content/docs/zh-tw/guides/claude-code.md @@ -426,6 +426,8 @@ Claude Code 的 `/effort` 設定會完整保留並傳遞給適配器: | `max_tokens` | `max_output_tokens` | | `stop_sequences` | `stop` | +在預期的 Anthropic 適配器上,保留未隱藏的簽名區塊(包括空 thinking)和不透明的 redacted 區塊。`hideThinkingSummary` 政策不變:不會向 Claude 用戶端公開本地隱藏的簽名文字,尚未證明經過此隱藏邊界的無損重播。舊版組合信封在串流文字發出後無法恢復原始區塊順序。`claudeCode.compatibility: "enforce"` 仍拒絕 thinking 重播。這不證明真實 Anthropic 接受請求或快取命中改善;[#3719](https://github.com/lidge-jun/opencodex/issues/3719) 仍未關閉。 + **錯誤情況(400):**JSON 格式錯誤;缺少/空的 `model`;缺少/空的 `messages`;不支援的 role;`tool_result` 缺少 `tool_use_id`;`tool_use` 缺少 id/name;指定名稱的 `tool_choice` 缺少 name。 diff --git a/src/adapters/anthropic.ts b/src/adapters/anthropic.ts index 6eea4764a1..a9a8279198 100644 --- a/src/adapters/anthropic.ts +++ b/src/adapters/anthropic.ts @@ -1118,9 +1118,14 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti break; } case "content_block_start": { - const block = data.content_block as { type: string; id?: string; name?: string; data?: string } | undefined; + const block = data.content_block as { type: string; id?: string; name?: string; data?: string; thinking?: string } | undefined; if (!block) break; currentBlockType = block.type; + if (block.type === "thinking") { + // Preserve even a display:omitted block boundary. The bridge can then + // distinguish consecutive empty signed blocks from signature updates. + yield { type: "thinking_delta", thinking: typeof block.thinking === "string" ? block.thinking : "" }; + } if (block.type === "tool_use") { currentToolCallId = usableToolUseId(block.id); currentToolCallName = toolNames.fromWire(block.name ?? ""); @@ -1151,8 +1156,8 @@ export function createAnthropicAdapter(provider: OcxProviderConfig, cacheRetenti // later text blocks independent. yield { type: "thinking_delta", thinking: delta.reasoning }; } else if (delta.type === "signature_delta" && typeof delta.signature === "string" && (currentBlockType === "thinking" || currentBlockType === "reasoning")) { - // Arrives once, just before the thinking block's content_block_stop; block-scoped - // so a stray signature on a non-thinking block can never be captured. + // Anthropic SDKs replace the signature with this value. Forward updates + // within the block; the bridge closes on the next semantic boundary. yield { type: "thinking_signature", signature: delta.signature }; } else if (delta.type === "input_json_delta" && typeof delta.partial_json === "string" && currentBlockType === "tool_use") { // Forwarded immediately: the bridge maps each delta to a client-visible diff --git a/src/bridge.ts b/src/bridge.ts index 645dfff8e7..ff044a5e52 100644 --- a/src/bridge.ts +++ b/src/bridge.ts @@ -945,6 +945,13 @@ export function bridgeToResponsesSSE( } if (event.type !== "done" && event.type !== "incomplete" && event.type !== "error") continue; } + // Anthropic signature_delta supplies the latest signature, not an append-only + // fragment (anthropic-sdk-typescript MessageStream). Keep consecutive updates + // together; the next semantic event belongs to the following block. + if (pendingSignature !== undefined && event.type !== "thinking_signature" && event.type !== "heartbeat") { + if (currentReasoning) closeCurrentReasoning(); + else flushHiddenReasoningEnvelope(); + } switch (event.type) { case "assistant_boundary": { // A guarded continuation starts a fresh assistant output item while keeping the @@ -1054,15 +1061,21 @@ export function bridgeToResponsesSSE( case "thinking_signature": { pendingSignatureBytes = replaceRetainedString(pendingSignatureBytes, event.signature, "reasoning"); pendingSignature = event.signature; - // Signature arrives at the end of the thinking block. With a visible reasoning item - // open, closeCurrentReasoning attaches the envelope; hidden/suppressed blocks flush - // an envelope-only reasoning item now. - if (!currentReasoning) flushHiddenReasoningEnvelope(); + // Delay closing until the next semantic event so a signature update cannot + // create another block or become attached to the following thinking text. break; } case "redacted_thinking": { + if (currentMsg) closeCurrentMessage("commentary"); + if (currentReasoning) closeCurrentReasoning(); + if (currentRawReasoning) closeCurrentRawReasoning(); + flushHiddenRawReasoning(); + if (currentToolCall) closeCurrentToolCall(); budget?.chargeRetained(bytesOf(event.data), { kind: "reasoning" }); pendingRedacted.push(event.data); + // A redacted block is complete at content_block_start. Emit it here, + // not with a later thinking block or after a tool call at turn end. + flushHiddenReasoningEnvelope(); break; } case "kiro_redacted_reasoning": { @@ -1816,6 +1829,9 @@ function buildResponseJSONWithBudget( if (budget) releaseTranslatedEvent(e, budget); continue; } + if (batchSignature !== undefined && e.type !== "thinking_signature" && e.type !== "heartbeat") { + flushSummaryReasoning(); + } switch (e.type) { case "assistant_boundary": flushText("commentary"); @@ -1860,19 +1876,23 @@ function buildResponseJSONWithBudget( } break; case "thinking_signature": - // End of the current thinking block — flush it WITH the signature envelope so the - // block/signature pairing survives multi-block turns. + // Like streaming, retain the latest signature update until the next semantic + // event. Flushing every update would manufacture signature-only siblings. batchSignatureBytes = replaceBatchRetainedString(batchSignatureBytes, e.signature, "reasoning"); batchSignature = e.signature; - flushSummaryReasoning(); break; case "redacted_thinking": + flushText("commentary"); + flushSummaryReasoning(); + flushRawReasoning(); + flushToolCall(); { const dataBytes = bytesOf(e.data); budget?.chargeRetained(dataBytes, { kind: "reasoning" }); batchRedactedBytes += dataBytes; } batchRedacted.push(e.data); + flushSummaryReasoning(); break; case "kiro_redacted_reasoning": // Stash only — pushed after the trailing flushes. One blob per turn, so last wins. diff --git a/src/claude/outbound.ts b/src/claude/outbound.ts index 8c0db5b7b8..4dcdaa0eb7 100644 --- a/src/claude/outbound.ts +++ b/src/claude/outbound.ts @@ -559,7 +559,10 @@ export function responsesSseToAnthropicSse( if (env?.sig) open.reasoningSig = env.sig; closeOpenBlock(); } - if (red.length > 0) ensureStarted(); + if (red.length > 0) { + ensureStarted(); + closeOpenBlock(); + } for (const data of red) { const idx = blockIndex++; emit("content_block_start", { type: "content_block_start", index: idx, content_block: { type: "redacted_thinking", data } }); @@ -806,10 +809,14 @@ export function responsesJsonToAnthropicMessage(json: unknown, model: string): R } const encrypted = typeof raw.encrypted_content === "string" ? raw.encrypted_content : ""; const env = encrypted ? decodeReasoningEnvelope(encrypted) : null; + // Legacy combined envelopes place redacted blocks before the signed block, + // matching the Anthropic adapter. New bridge output uses separate items. + for (const data of env?.red ?? []) content.push({ type: "redacted_thinking", data }); + // env.txt may be locally hidden text. Do not expose it here or manufacture + // a new signed continuity carrier; hidden-summary replay remains limited. if (parts.length > 0 || env?.sig) { content.push({ type: "thinking", thinking: parts.join("\n\n"), signature: env?.sig ?? encodeReasoningEnvelope({ txt: parts.join("\n\n") }) }); } - for (const data of env?.red ?? []) content.push({ type: "redacted_thinking", data }); break; } case "function_call": { diff --git a/src/responses/parser.ts b/src/responses/parser.ts index a81a693a4a..396f2170b2 100644 --- a/src/responses/parser.ts +++ b/src/responses/parser.ts @@ -126,6 +126,12 @@ export function parseRequest( } return holder; }; + const preservePendingReplay = () => { + const replay = pendingReasoning.filter(entry => entry.envelopeSigned || entry.part.redacted?.length); + if (replay.length > 0) { + ensureAssistantPlaceholder(messages, data.model, now).content.push(...replay.map(entry => entry.part)); + } + }; // Tool specs surfaced by a prior tool_search (deferred tools, e.g. subagents). Codex does not // re-list these in `tools`, but chat models can only call listed tools — so we re-inject them. const loadedToolSpecs: unknown[] = []; @@ -148,6 +154,12 @@ export function parseRequest( const effectiveType = (item as { type?: string }).type ?? ("role" in item ? "message" : undefined); const itemRole = (item as { role?: string }).role; const externalTaskInput = effectiveType === "function_call_output" ? externalTaskInputContent(item) : undefined; + // A signed/opaque assistant-only turn still owns its replay blocks, even + // without a following assistant text or tool call to drain the pending list. + if (effectiveType === "agent_message" || externalTaskInput !== undefined + || (effectiveType === "message" && ["user", "developer", "system"].includes(itemRole ?? ""))) { + preservePendingReplay(); + } // Raw protocol items do not map one-to-one onto context messages. Capture the boundary while // both representations are available so later metadata can stay before conversation in both. if ( @@ -269,7 +281,7 @@ export function parseRequest( const envelope = typeof reasoning.encrypted_content === "string" ? decodeReasoningEnvelope(reasoning.encrypted_content) : null; - const thinkingText = envelope?.txt || text; + const thinkingText = envelope?.txt ?? text; // Kiro reasoning round-trip: a krc-only item carries nothing renderable — it is provider // state for the assistant turn that ALREADY closed, because Kiro emits its @@ -285,7 +297,7 @@ export function parseRequest( // Native/non-ocxr1 encrypted-only reasoning is opaque here. Do not create a detached // assistant turn or invent replayable plaintext/signatures from the encrypted payload. - if (thinkingText.length > 0) { + if (thinkingText.length > 0 || envelope?.sig || envelope?.red?.length) { const part: OcxThinkingContent = { type: "thinking", thinking: thinkingText, @@ -296,7 +308,7 @@ export function parseRequest( const envelopeSigned = typeof envelope?.sig === "string"; const previous = pendingReasoning[pendingReasoning.length - 1]; - if (!envelopeSigned && previous && !previous.envelopeSigned) { + if (!envelopeSigned && !part.redacted && previous && !previous.envelopeSigned && !previous.part.redacted) { previous.part = { ...part, thinking: `${previous.part.thinking}\n${part.thinking}`, @@ -466,6 +478,7 @@ export function parseRequest( } } } + preservePendingReplay(); if (data.previous_response_id && continuationConversationMessageIndex === undefined) { continuationConversationMessageIndex = messages.length; } diff --git a/tests/adapters/anthropic/anthropic-thinking-signature.test.ts b/tests/adapters/anthropic/anthropic-thinking-signature.test.ts index 68c972a742..db8f489c4f 100644 --- a/tests/adapters/anthropic/anthropic-thinking-signature.test.ts +++ b/tests/adapters/anthropic/anthropic-thinking-signature.test.ts @@ -4,7 +4,12 @@ import { createAnthropicAdapter as createAnthropicAdapterProduction } from "../. import { parseRequest } from "../../../src/responses/parser"; import { encodeReasoningEnvelope, decodeReasoningEnvelope, OCX_REASONING_PREFIX } from "../../../src/responses/reasoning-envelope"; import type { AdapterEvent, OcxProviderConfig, OcxThinkingContent } from "../../../src/types"; -import { withTestTranslatorBudget } from "../../helpers/translator-budget"; +import { createTestTranslatorBudget, withTestTranslatorBudget } from "../../helpers/translator-budget"; + +import { anthropicToResponsesBody } from "../../../src/claude/inbound"; +import { collectAnthropicMessage, responsesSseToAnthropicSse, responsesJsonToAnthropicMessage } from "../../../src/claude/outbound"; +import { createGoogleAdapter } from "../../../src/adapters/google"; +import { sanitizeReasoningInputContent } from "../../../src/adapters/openai-responses"; const createAnthropicAdapter = (...args: Parameters) => withTestTranslatorBudget(createAnthropicAdapterProduction(...args)); @@ -127,11 +132,11 @@ describe("bridge ocxr1 envelope emission", () => { ...baseEvents, ], "claude-x"); const output = response.output as Record[]; - const reasoning = output.find(i => i.type === "reasoning"); - expect(reasoning).toBeDefined(); - const env = decodeReasoningEnvelope(reasoning!.encrypted_content as string); - expect(env?.sig).toBe("RealSig1234567890=="); - expect(env?.red).toEqual(["RED1"]); + const reasoning = output.filter(i => i.type === "reasoning"); + expect(reasoning.map(item => decodeReasoningEnvelope(item.encrypted_content as string))).toEqual([ + { red: ["RED1"] }, + { sig: "RealSig1234567890==" }, + ]); }); test("redacted-only turn still emits an envelope reasoning item (SSE)", async () => { @@ -326,3 +331,174 @@ describe("passthrough scrub of ocxr1 envelopes", () => { expect(req.body ?? "").toContain('"rs_1"'); // reasoning item itself survives }); }); + + +describe("Claude / Responses / intended Anthropic replay fidelity", () => { + // Synthetic fixtures prove transport fidelity only, never upstream signature validity. + const first = { type: "thinking", thinking: "first\nexact", signature: "FirstSyntheticSignature123456==" }; + const second = { type: "thinking", thinking: "second", signature: "SecondSyntheticSignature123456==" }; + const empty = { type: "thinking", thinking: "", signature: "EmptySyntheticSignature123456==" }; + const before = { type: "redacted_thinking", data: "opaque-before" }; + const middle = { type: "redacted_thinking", data: "opaque-middle" }; + const after = { type: "redacted_thinking", data: "opaque-after" }; + const tool = { type: "tool_use", id: "toolu_replay", name: "lookup", input: { q: "x" } }; + const cases = [ + { name: "consecutive signed blocks", blocks: [first, second, tool] }, + { name: "opaque blocks in source order", blocks: [before, first, middle, second, after, tool] }, + { name: "empty signed block", blocks: [empty, tool] }, + { name: "consecutive empty signed blocks", blocks: [empty, { ...empty, signature: "OtherEmptySyntheticSignature123456==" }, tool] }, + { name: "redacted-only tool turn", blocks: [before, after, tool] }, + ]; + + for (const fixture of cases) { + for (const streaming of [true, false]) { + test(`${fixture.name}: ${streaming ? "SSE" : "JSON"} full chain preserves exact blocks`, async () => { + const adapter = createAnthropicAdapter(provider, "none"); + let events: AdapterEvent[]; + if (streaming) { + const frames = [frame("message_start", { message: { usage: { input_tokens: 1, output_tokens: 0 } } })]; + fixture.blocks.forEach((block, index) => { + frames.push(frame("content_block_start", { index, content_block: block.type === "thinking" + ? { type: "thinking", thinking: "", signature: "" } + : block.type === "tool_use" ? { ...tool, input: {} } : block })); + if ("thinking" in block) { + // Omitted thinking has no thinking_delta on the actual wire. + if (block.thinking) frames.push(frame("content_block_delta", { index, delta: { type: "thinking_delta", thinking: block.thinking } })); + frames.push(frame("content_block_delta", { index, delta: { type: "signature_delta", signature: block.signature } })); + } else if (block.type === "tool_use") { + frames.push(frame("content_block_delta", { index, delta: { type: "input_json_delta", partial_json: JSON.stringify(tool.input) } })); + } + frames.push(frame("content_block_stop", { index })); + }); + frames.push(frame("message_delta", { delta: { stop_reason: "tool_use" }, usage: { output_tokens: 1 } }), frame("message_stop", {})); + events = await collect(adapter.parseStream(sseResponse(frames))); + } else { + events = await adapter.parseResponse!(new Response(JSON.stringify({ + id: "msg_fixture", type: "message", role: "assistant", model: "claude-x", + content: fixture.blocks, stop_reason: "tool_use", usage: { input_tokens: 1, output_tokens: 1 }, + }))); + } + let message: Record; + if (streaming) { + async function* upstream() { yield* events; } + const budget = createTestTranslatorBudget(); + message = await collectAnthropicMessage(responsesSseToAnthropicSse( + bridgeToResponsesSSE(upstream(), "claude-x"), "claude-x", { translatorBudget: budget }, + ), "claude-x", budget); + } else { + message = responsesJsonToAnthropicMessage(buildResponseJSON(events, "claude-x"), "claude-x"); + } + expect(message.content).toEqual(fixture.blocks); + const parsed = parseRequest(anthropicToResponsesBody({ + model: "anthropic/claude-x", messages: [ + { role: "user", content: "question" }, + { role: "assistant", content: message.content }, + { role: "user", content: [{ type: "tool_result", tool_use_id: tool.id, content: "result" }] }, + ], + })); + const request = await adapter.buildRequest(parsed); + const replay = JSON.parse(request.body as string) as { messages: Array<{ role: string; content: unknown }> }; + expect(replay.messages).toEqual([ + { role: "user", content: [{ type: "text", text: "question" }] }, + { role: "assistant", content: fixture.blocks }, + { role: "user", content: [{ type: "tool_result", tool_use_id: tool.id, content: "result" }] }, + ]); + }); + } + } + + test("signature updates replace rather than concatenate, across heartbeats", async () => { + // Both official SDKs assign signature_delta.signature instead of appending it: + // anthropic-sdk-typescript/src/lib/MessageStream.ts and + // anthropic-sdk-python/src/anthropic/lib/streaming/_messages.py. + const adapter = createAnthropicAdapter(provider); + const events = await collect(adapter.parseStream(sseResponse([ + frame("content_block_start", { index: 0, content_block: { type: "thinking", thinking: "", signature: "" } }), + frame("content_block_delta", { index: 0, delta: { type: "thinking_delta", thinking: "first" } }), + frame("content_block_delta", { index: 0, delta: { type: "signature_delta", signature: "old" } }), + ": heartbeat\n\n", + frame("content_block_delta", { index: 0, delta: { type: "signature_delta", signature: "FirstSyntheticSignature123456==" } }), + frame("content_block_stop", { index: 0 }), + frame("content_block_start", { index: 1, content_block: { type: "thinking", thinking: "", signature: "" } }), + frame("content_block_delta", { index: 1, delta: { type: "thinking_delta", thinking: "second" } }), + frame("content_block_delta", { index: 1, delta: { type: "signature_delta", signature: "SecondSyntheticSignature123456==" } }), + frame("content_block_stop", { index: 1 }), + frame("message_stop", {}), + ]))); + async function* upstream() { yield* events; } + const streamed = sseItems(await drainSse(bridgeToResponsesSSE(upstream(), "claude-x"))); + const buffered = buildResponseJSON(events, "claude-x").output as Record[]; + for (const items of [streamed, buffered]) { + expect(items.map(item => ({ summary: item.summary, envelope: decodeReasoningEnvelope(item.encrypted_content as string) }))).toEqual([ + { summary: [{ type: "summary_text", text: "first" }], envelope: { sig: "FirstSyntheticSignature123456==" } }, + { summary: [{ type: "summary_text", text: "second" }], envelope: { sig: "SecondSyntheticSignature123456==" } }, + ]); + } + }); + + test("signed/opaque-only assistant turns survive a user boundary and end of input", () => { + for (const continuation of [[], [{ role: "user", content: "next" }]]) { + const parsed = parseRequest(anthropicToResponsesBody({ model: "anthropic/claude-x", messages: [ + { role: "assistant", content: [empty, before, after] }, ...continuation, + ] })); + const assistant = parsed.context.messages.find(message => message.role === "assistant"); + expect(assistant?.content).toEqual([ + expect.objectContaining({ type: "thinking", thinking: "", signature: empty.signature }), + expect.objectContaining({ type: "thinking", thinking: "", redacted: [before.data] }), + expect.objectContaining({ type: "thinking", thinking: "", redacted: [after.data] }), + ]); + } + }); + + test("locally hidden signed text remains exact on Responses replay without being exposed to Claude", async () => { + const events: AdapterEvent[] = [ + { type: "thinking_delta", thinking: "hidden exact\ntext" }, + { type: "thinking_signature", signature: first.signature }, + { type: "text_delta", text: "answer" }, + { type: "done", usage: { inputTokens: 1, outputTokens: 1 } }, + ]; + async function* upstream() { yield* events; } + const items = sseItems(await drainSse(bridgeToResponsesSSE(upstream(), "claude-x", undefined, undefined, undefined, undefined, 2000, { hideThinkingSummary: true }))); + const response = buildResponseJSON(events, "claude-x", { hideThinkingSummary: true }); + for (const output of [items, response.output as Record[]]) { + const reasoning = output.find(item => item.type === "reasoning")!; + expect(reasoning.summary).toEqual([]); + expect(decodeReasoningEnvelope(reasoning.encrypted_content as string)).toEqual({ sig: first.signature, txt: "hidden exact\ntext" }); + const request = await createAnthropicAdapter(provider, "none").buildRequest(parseRequest({ model: "anthropic/claude-x", input: output })); + const replay = JSON.parse(request.body as string) as { messages: Array<{ content: unknown }> }; + expect(replay.messages[0].content).toEqual([ + { type: "thinking", thinking: "hidden exact\ntext", signature: first.signature }, + { type: "text", text: "answer" }, + ]); + // Deliberate existing limitation: no new signed carrier and no hidden-text disclosure. + expect(JSON.stringify(responsesJsonToAnthropicMessage({ output }, "claude-x"))).not.toContain("hidden exact"); + } + expect(() => anthropicToResponsesBody({ model: "m", messages: [{ role: "assistant", content: [ + { type: "thinking", thinking: "", signature: encodeReasoningEnvelope({ sig: first.signature, txt: "hidden exact" }) }, + ] }] })).toThrow(/continuity/); + }); + + test("explicitly empty signed envelope text does not fall back to a different summary", () => { + const parsed = parseRequest({ model: "m", input: [ + { type: "reasoning", summary: [{ type: "summary_text", text: "different summary" }], encrypted_content: encodeReasoningEnvelope({ sig: empty.signature, txt: "" }) }, + ] }); + expect(parsed.context.messages[0]?.content).toEqual([ + { type: "thinking", thinking: "", signature: empty.signature }, + ]); + }); + + test("opaque Anthropic payloads do not become Google signatures or native Responses encryption", async () => { + const body = anthropicToResponsesBody({ model: "google/gemini-test", messages: [ + { role: "assistant", content: [empty, before, tool] }, + { role: "user", content: [{ type: "tool_result", tool_use_id: tool.id, content: "result" }] }, + ] }); + const google = withTestTranslatorBudget(createGoogleAdapter({ adapter: "google", baseUrl: "https://generativelanguage.googleapis.com", apiKey: "synthetic" })); + const request = await google.buildRequest(parseRequest(body)); + for (const output of [request.body as string, JSON.stringify(sanitizeReasoningInputContent(body))]) { + expect(output).not.toContain(empty.signature); + expect(output).not.toContain(before.data); + expect(output).not.toContain("ocxr1:"); + } + expect(parseRequest({ model: "m", input: [{ type: "reasoning", summary: [], encrypted_content: "native-opaque" }] }).context.messages).toEqual([]); + }); +}); diff --git a/tests/claude-integration/claude-outbound.test.ts b/tests/claude-integration/claude-outbound.test.ts index e78cc529d3..33faa2e839 100644 --- a/tests/claude-integration/claude-outbound.test.ts +++ b/tests/claude-integration/claude-outbound.test.ts @@ -1179,6 +1179,23 @@ describe("sanitizeWebSearchInput (#381)", () => { expect(events[2].data.content_block).toEqual({ type: "redacted_thinking", data: "opaque" }); }); + test("redacted reasoning closes an open text block before opening its opaque block", async () => { + const events = await collectEvents(responsesSseToAnthropicSse(streamFrom([ + sse("response.output_text.delta", { delta: "text" }), + sse("response.output_item.done", { + item: { type: "reasoning", id: "rs_red", encrypted_content: encodeReasoningEnvelope({ red: ["opaque"] }) }, + }), + sse("response.completed", { response: { status: "completed", usage: {} } }), + ].join("")), "m")); + expect(events.filter(event => event.name === "content_block_start" || event.name === "content_block_stop") + .map(event => ({ name: event.name, index: event.data.index }))).toEqual([ + { name: "content_block_start", index: 0 }, + { name: "content_block_stop", index: 0 }, + { name: "content_block_start", index: 1 }, + { name: "content_block_stop", index: 1 }, + ]); + }); + test("signature-only reasoning emits an empty thinking block with the genuine signature", async () => { const events = await collectEvents(responsesSseToAnthropicSse(streamFrom([ sse("response.output_item.done", { diff --git a/tests/responses/reasoning-envelope.test.ts b/tests/responses/reasoning-envelope.test.ts index 75c51994f2..2469b8e46b 100644 --- a/tests/responses/reasoning-envelope.test.ts +++ b/tests/responses/reasoning-envelope.test.ts @@ -34,8 +34,8 @@ describe("reasoning and tool/result envelopes", () => { const message = responsesJsonToAnthropicMessage({ output: [{ type: "reasoning", summary: [{ type: "summary_text", text: "visible" }], encrypted_content: encoded }], }, "m") as any; - expect(message.content[0]).toMatchObject({ type: "thinking", signature: "sig" }); - expect(message.content.slice(1)).toEqual([ + expect(message.content[2]).toMatchObject({ type: "thinking", signature: "sig" }); + expect(message.content.slice(0, 2)).toEqual([ { type: "redacted_thinking", data: "red-a" }, { type: "redacted_thinking", data: "red-b" }, ]); From 8f8790e31cdaf6d9c0083324aa01d6f778410e98 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 07:43:23 +0900 Subject: [PATCH 066/221] docs(devlog): record axis three protocol delivery plan --- .../_plan/260907_axis3_protocol/000_plan.md | 13 ++++++ .../260907_axis3_protocol/001_roadmap_lock.md | 3 ++ .../010_prepare_and_verify.md | 42 +++++++++++++++++++ .../260907_axis3_protocol/011_candidate.md | 9 ++++ .../260907_axis3_protocol/020_delivery.md | 7 ++++ 5 files changed, 74 insertions(+) create mode 100644 devlog/_plan/260907_axis3_protocol/000_plan.md create mode 100644 devlog/_plan/260907_axis3_protocol/001_roadmap_lock.md create mode 100644 devlog/_plan/260907_axis3_protocol/010_prepare_and_verify.md create mode 100644 devlog/_plan/260907_axis3_protocol/011_candidate.md create mode 100644 devlog/_plan/260907_axis3_protocol/020_delivery.md diff --git a/devlog/_plan/260907_axis3_protocol/000_plan.md b/devlog/_plan/260907_axis3_protocol/000_plan.md new file mode 100644 index 0000000000..36cfe95772 --- /dev/null +++ b/devlog/_plan/260907_axis3_protocol/000_plan.md @@ -0,0 +1,13 @@ +# Axis 3 protocol fidelity roadmap + +Mode: satisfy-spec HOTL, requested by the maintainer on 2026-09-07. Deliver source-grounded dispositions for #3815, #3816, #3807, #3719 and land accepted fixes with original authors credited in commits. No local suites or typecheck; verification is remote exact final-head CI, with lower-layer CI only on final failure. Ordinary manual PR chain only; admin merge authorized. No explicit token or wall-time limit was requested; agents use bounded tasks and waits. Do not invoke private provider accounts or spend inference credits. Tools: local Git/files, GitHub gh, Astra high leaf agents. Writes confined to task worktrees and this axis's GitHub branches/PRs. Preserve unrelated dirty work. + +Scope: ordered Claude thinking/redacted/tool-result envelope fidelity; Grok strict-client control frame projection; valid task-seed diagnosis. Exclude new auth/routing/default policies, fabricated provider signatures or tool pairing IDs (new Responses reasoning item IDs are permitted transport identities), cache savings claims, unrelated axes, deployment/release. Unknown field/runtime reports receive explicit deferred dispositions per user direction. + +Work phases: wp0 roadmap audit and lock; wp1 prepare two independently reviewable source layers and any justified contract regressions, then remote final combined verification; wp2 publish/merge ordinary PRs bottom-up and record final ancestry/dispositions. The two source fixes are independent; the manual chain is the user's requested integration/CI grouping, not a runtime dependency. + +Success: roadmap verified, accepted changes reviewed and remotely validated, commits credit SB Yoon (yansigit) and Yumi for #3815 and Danh Thanh (dt418) for #3816, landed SHA proven ancestor of refreshed dev; uncertain #3807/#3719 runtime or cache claims remain open. Stop only after accepted delivery and explicit dispositions. Escalate only an unavoidable owner-policy choice; defer that portion and continue the rest. + +Acceptance: (1) thinking then text/tool then result retains order and genuine signatures; opaque blocks remain bounded and malformed/nested signatures fail closed. (2) Grok user agent receives ordinary Responses data without codex.rate_limits/codex.response.metadata, while proxy inspection and normal clients retain metadata. (3) valid external task seeds preserve text/order; absent metadata invalid tool outputs still reject. (4) no credential, admission, cache-retention default, provider/routing policy mutation. (5) final CI must really run relevant tests/typecheck, not skip/cancel or fabricate success. No local suite was run. Final failure permits lower-layer CI for localization; unrelated failures may defer delivery, never count as success. + +Sources: PRs https://github.com/lidge-jun/opencodex/pull/3815 and /pull/3816; issues /issues/3807 and /issues/3719. Current dev 137d6a727. Evidence snapshots under .tmp/axis3. Public notes contain no unreleased vulnerability detail; any new security investigation stays in scratch. diff --git a/devlog/_plan/260907_axis3_protocol/001_roadmap_lock.md b/devlog/_plan/260907_axis3_protocol/001_roadmap_lock.md new file mode 100644 index 0000000000..115f8c3dfa --- /dev/null +++ b/devlog/_plan/260907_axis3_protocol/001_roadmap_lock.md @@ -0,0 +1,3 @@ +# Roadmap lock + +Independent Astra high reviewer Pauli passed the amended wp0 roadmap. Transport reasoning IDs are permitted; fabricated tool pairing IDs remain prohibited. Claude fallback retention must be bounded or removed and checked remotely. Grok parser must follow SSE last-field/reset semantics. No runtime was changed in wp0. Next: wp1 carries source layers, adds justified regression coverage and verifies the final combined head remotely. diff --git a/devlog/_plan/260907_axis3_protocol/010_prepare_and_verify.md b/devlog/_plan/260907_axis3_protocol/010_prepare_and_verify.md new file mode 100644 index 0000000000..c278f094bf --- /dev/null +++ b/devlog/_plan/260907_axis3_protocol/010_prepare_and_verify.md @@ -0,0 +1,42 @@ +# Prepare and verify combined protocol candidate + +Reverify base/source heads before build. Carry exact source deltas from the scratch diff snapshots, fold independently confirmed review fixes only. Each commit contains verified contributor trailers. Do not include upstream planning notes or unrelated changes. + +Layer 1 MODIFY: +scripts/test-layout/layout.json +src/claude/inbound.ts +src/claude/outbound.ts +src/responses/reasoning-envelope.ts +tests/claude-integration/claude-code-thought-signature-scope.test.ts +tests/claude-integration/claude-inbound.test.ts +tests/claude-integration/claude-outbound.test.ts +tests/claude-integration/claude-source-envelope.test.ts +tests/fixtures/test-layout-expected.json +tests/responses/reasoning-envelope.test.ts + +Preserve genuine signatures; encode bounded unsigned/redacted fallback; keep structured tool results. Layer 2 NEW src/server/grok-responses-control-frame.ts and MODIFY: +src/server/grok-responses-control-frame.ts +src/server/responses/core.ts +tests/responses/responses-snapshot-repair-server.test.ts + +Separate strict-client filtering from internal inspection. On a Grok metadata frame, forward no incompatible client frame; on ordinary delta, preserve unchanged; ordinary clients remain unchanged. No shared account/routing changes. + +Potential follow-up tests belong only in existing responses/Claude test files after diagnosis, with independent expected values. If no valid unhandled #3807 input is established, leave production guards unchanged. #3719 cache-hit and true Anthropic signed replay cannot be certified by codec fixtures. + +SoT: update docs-site/src/content/docs/guides/claude-code.md and existing translated counterparts only if #3815 makes their drop-policy statements stale. Read docs-site/AGENTS.md first. No global retention change. + +Verification: user prohibits local suites/typecheck (NOT RUN). Inspect source and diff-check locally. Push task branches with --no-verify. Dispatch existing Cross-platform CI workflow on final combined head, lane all. Confirm workflow head SHA, jobs, conclusion, test/typecheck execution from logs. Final CI failure permits lower-layer CI. Keep workflow/protection configuration unchanged; suppress only task-owned redundant automatic runs when needed for requested top-first scheduling, reporting cancelled runs honestly. No real accounts are used. + +## Audit amendments + +New rs_ reasoning IDs are normal transport identity, not fabricated tool call pairing. Do not synthesize tool-call IDs to bypass #3807 validation. + +Before acceptance, remove unbounded thinkingBuf retention introduced by #3815 or charge it to the existing TranslatorBudget retained bytes with normal fail-closed overflow. Use the established budget and error event; no silent truncation or new policy default. Cover multi-part text exactness, empty continuity fallback, and overflow with a small injected existing budget in remote regression tests. Decoder/consumer traces must prove any compact continuity marker still replays the original summary. + +#3816 must use SSE last-event-field-wins semantics, including colonless/empty resets and removal of only one optional leading space. Test event-only, data-only, repeated event fields in both orders, and preservation of ordinary completion data. Keep downstream Grok WebSocket support deferred because the existing surface marker is absent there; do not claim this HTTP/SSE patch solves it. + +## WP1 source refresh and scoped hardening + +Previous D: roadmap locked; execute reviewed source preparation. PR #3815 advanced to 76e07d181c48dca8c80167878381e1edb5642395 during investigation, including budget fixes and translated guide changes; carry fresh source, not old snapshots. Add a third dependent hardening layer only for source-proven preservation faults. MODIFY src/responses/parser.ts: retain recognized redacted-only and empty signed envelopes even when text is empty, preserving real boundary grouping. MODIFY src/bridge.ts: preserve signed block boundaries and redacted block positions identically in streaming/buffered output; signature fragments must be assembled at owning adapter boundary. MODIFY src/claude/outbound.ts only for exact block order/text restoration where current contract permits; do not invent a new signed continuity carrier or change hide-thinking policy. If hidden signed replay needs a new policy/carrier, explicitly defer that part rather than widening scope. Existing budget/guard contracts remain. + +Tests: existing tests/responses/anthropic-thinking-signature.test.ts or matching current domain file and Claude envelope tests get exact block-array roundtrip oracles; no fixture claims a live genuine signature. tests/responses/responses-compaction-routing.test.ts gets an established-history complete send_message_to_thread envelope across normal response, stored-ID continuation, v2 compaction_trigger and v1 compact endpoint, preserving real pairing and task content. If current fixture support makes a case impractical, record exact gap; no runtime seed repair. diff --git a/devlog/_plan/260907_axis3_protocol/011_candidate.md b/devlog/_plan/260907_axis3_protocol/011_candidate.md new file mode 100644 index 0000000000..7edc9aa1ce --- /dev/null +++ b/devlog/_plan/260907_axis3_protocol/011_candidate.md @@ -0,0 +1,9 @@ +# Combined candidate + +Source baseline: dev 137d6a727. Foundation carries #3815 through 76e07d181 with SB Yoon/Yumi commit trailers. Grok carries #3816 d5e0a9a2 and corrects SSE event overwrite/reset semantics, with Danh Thanh trailers. Added established-history external-task HTTP/continuation/compact fixtures without changing the missing-ID guard. Replay hardening preserves signed/opaque-only inputs and block ordering; signature updates replace previous values according to the SDK accumulator contract, and block closure waits for the next semantic event. + +Independent source reviews: Pauli scoped foundation PASS (18/18 files); Faraday Grok/seed PASS. Final Claude combined source audit and remote CI pending. Local suites/typecheck/build not run under user instruction. No live accounts invoked. + +Deferred: #3807 lacks raw failing current-version input; #3719 still needs live intended-Anthropic acceptance and controlled cache comparisons. Locally hidden text through Claude and legacy combined-envelope streaming order recovery are not claimed supported. Existing compatibility enforcement, hidden presentation, credential/admission and retention policies remain. + +Ordinary PR chain is an integration grouping requested by owner, with final combined CI first. Lower-layer runs only if it fails. Admin merge is authorized after accepted evidence. No GitHub native stack or fabricated check status. diff --git a/devlog/_plan/260907_axis3_protocol/020_delivery.md b/devlog/_plan/260907_axis3_protocol/020_delivery.md new file mode 100644 index 0000000000..050cc76d54 --- /dev/null +++ b/devlog/_plan/260907_axis3_protocol/020_delivery.md @@ -0,0 +1,7 @@ +# Publish and deliver verified manual chain + +Prerequisite: wp1 accepted-source review and successful final-head remote validation, or source-grounded defer outcome. Publish ordinary PRs targeting dev then the parent branch, using every repository template section. Bodies name source PRs, own layer-only diff, exact final combined CI evidence and explicit lower-layer CI deferral per owner instruction. Do not attest local CI. Preserve original contributor trailers in commits; admin merge with merge commits preserves their identity. + +Read live native-stack membership and head/base identity before merge. Never register a native stack. Parent merges to dev first; retain its branch, retarget child to dev, verify current head and ancestry. If integration tree changes materially, refresh final combined CI before landing. Use --admin and --match-head-commit exact guard. Do not merge into the parent branch by mistake. Refresh origin/dev and prove each merge SHA ancestor. Close superseded source PRs only after equivalent fix is actually landed, with credit and replacement link. Keep #3807 and #3719 open if real reproduction/cache acceptance remains unmet. No release or deployment. + +Record final PR URLs, source-to-delivery mapping, commit authors/trailers, CI run and exact SHA, review verdicts, remaining limitations and preserved dirty-work evidence. No fabricated status checks. Completion: every candidate has an honest disposition, accepted work is landed, unresolved diagnostics explicitly deferred under user direction. From 9d775faccce38d9e16e5d544bdba0b451d170333 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:44:48 +0900 Subject: [PATCH 067/221] fix(gui): preserve display name receipts across recovery failures Keep an earlier confirmed save/reset receipt when retrying the same value and convergence fails with an ordinary HTTP error. Do not replace the saved snapshot from an unconfirmed response; retain the pending reset intent for another retry. Treat transport and response-body failures without a usable receipt as unknown outcomes, hide the stale current name, and make Retry/Enter read-only. Keep known unpersisted HTTP failures on the existing editable-draft path. Add regressions for reset -> saved:true -> HTTP failure -> success and persisted save/reset followed by rejected transport or response-body reads without abort. Local tests/typecheck/build NOT RUN by owner mandate; static diff check only. Co-authored-by: Zig Zag --- gui/src/pages/Models.tsx | 28 +++++--- gui/tests/models-display-name-editor.test.tsx | 72 +++++++++++++++++++ 2 files changed, 92 insertions(+), 8 deletions(-) diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx index b7b3a0e285..c342866d7e 100644 --- a/gui/src/pages/Models.tsx +++ b/gui/src/pages/Models.tsx @@ -598,7 +598,11 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; displayNameSavingRef.current = true; setDisplayNameSaving(true); setDisplayNameRequestError(null); - let confirmed = displayName === undefined && displayNameRecovery?.confirmed === true; + // A failed convergence retry cannot invalidate an earlier persistence receipt + // for the same value. Editing the draft clears recovery and starts a new intent. + let confirmed = displayNameRecovery?.confirmed === true + && (displayName === undefined || displayName === displayNameRecovery.value); + let receivedReceipt = displayName === undefined; let refreshOnly = displayName === undefined; try { if (displayName !== undefined) { @@ -624,9 +628,14 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; ? await readJsonOrThrow(response, t("models.displayNameSaveFailed")) : await response.json(); bounded.signal.throwIfAborted(); - if (!result) throw new Error(t("models.displayNameSaveFailed")); - confirmed = response.ok || result.saved === true; - if (confirmed) { + if (!result || typeof result !== "object" || Array.isArray(result) + || (!response.ok && result.saved !== true && typeof result.error !== "string")) { + throw new Error(t("models.displayNameSaveFailed")); + } + receivedReceipt = true; + const receiptConfirmed = response.ok || result.saved === true; + confirmed = confirmed || receiptConfirmed; + if (receiptConfirmed) { const override = result.displayNameOverride === null ? undefined : result.displayNameOverride ?? displayName ?? undefined; const fields: Pick = { @@ -653,13 +662,16 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; finishDisplayNameEdit(); } catch (error) { if (displayNameRequestRef.current !== bounded) return; - if (bounded.signal.aborted && !confirmed) setDisplayNameCurrentPending(true); - setDisplayNameRecovery(confirmed || bounded.signal.aborted || refreshOnly - ? { value: refreshOnly || bounded.signal.aborted ? undefined : displayName, confirmed } + // A dropped connection or unreadable body can hide a committed write just + // like a timeout. Reconcile by reading; never replay an unchanged old draft. + const unknownOutcome = !receivedReceipt || bounded.signal.aborted; + if (unknownOutcome && !confirmed) setDisplayNameCurrentPending(true); + setDisplayNameRecovery(confirmed || unknownOutcome || refreshOnly + ? { value: refreshOnly || unknownOutcome ? undefined : displayName, confirmed } : null); setDisplayNameRequestError(confirmed ? t("models.displayNameSavedRefreshFailed") - : bounded.signal.aborted || refreshOnly + : unknownOutcome || refreshOnly ? t("models.displayNameOutcomeUnknown") : error instanceof Error && error.message ? error.message diff --git a/gui/tests/models-display-name-editor.test.tsx b/gui/tests/models-display-name-editor.test.tsx index be64333944..b0656391ed 100644 --- a/gui/tests/models-display-name-editor.test.tsx +++ b/gui/tests/models-display-name-editor.test.tsx @@ -389,6 +389,78 @@ describe("Models dashboard discovered display name integration", () => { }); } + test("confirmed reset survives an ordinary convergence retry error before success", async () => { + await mountModels(); + await act(async () => nameTrigger().click()); + savedFailure = true; + await act(async () => dialogButton("Reset name").click()); + await flush(); + savedFailure = false; + mutationFailure = "Temporary server failure"; + await act(async () => dialogButton("Retry").click()); + await flush(); + expect(dialogInput().value).toBe(""); + expect(dialogButton("Reset name").disabled).toBe(true); + expect(dialogButton("Retry").disabled).toBe(false); + expect(container.textContent).toContain("The change was saved"); + expect(currentNameText()).not.toContain("Your name"); + expect(currentModels[0]!.displayNameOverride).toBeUndefined(); + + mutationFailure = null; + await act(async () => container.querySelector("dialog form")!.dispatchEvent( + new testWindow.Event("submit", { bubbles: true, cancelable: true }), + )); + await flush(); + expect(mutationBodies.map(body => body.displayName)).toEqual([null, null, null]); + expect(container.querySelector("dialog")).toBeNull(); + expect(currentModels[0]!.displayNameOverride).toBeUndefined(); + }); + + for (const failure of ["transport", "body"] as const) { + for (const value of ["Saved despite disconnect", null]) { + test(`persisted ${value === null ? "reset" : "save"} with ${failure} failure retries only a read`, async () => { + await mountModels(); + const transport = globalThis.fetch; + let failedSignal: AbortSignal | null | undefined; + globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { + const response = await transport(input, init); + if (init?.method === "PUT" && String(input).includes("model-display-names")) { + failedSignal = init.signal; + if (failure === "transport") throw new TypeError("Connection closed"); + Object.defineProperty(response, "text", { + value: async () => { throw new TypeError("Response body interrupted"); }, + }); + } + return response; + }) as typeof fetch; + await act(async () => nameTrigger().click()); + await act(async () => { + if (value === null) dialogButton("Reset name").click(); + else { + setInputValue(dialogInput(), value); + dialogButton("Save").click(); + } + }); + await flush(); + expect(failedSignal?.aborted).toBe(false); + expect(currentModels[0]!.displayNameOverride).toBe(value ?? undefined); + expect(dialogInput().value).toBe(value ?? "Grok 4.6"); + expect(currentNameText()).toContain("Current name unavailable until refresh"); + expect(currentNameText()).not.toContain("Your name"); + expect(container.textContent).toContain("The change may have been saved"); + expect(dialogButton("Retry").disabled).toBe(false); + expect(dialogButton("Cancel").disabled).toBe(false); + await act(async () => container.querySelector("dialog form")!.dispatchEvent( + new testWindow.Event("submit", { bubbles: true, cancelable: true }), + )); + await flush(); + expect(mutationBodies).toEqual([{ modelId: "grok-4.6", displayName: value }]); + expect(currentModels[0]!.displayNameOverride).toBe(value ?? undefined); + expect(container.querySelector("dialog")).toBeNull(); + }); + } + } + test("editing after a saved receipt explicitly starts a new save", async () => { await mountModels(); await act(async () => nameTrigger().click()); From d52399070f098865394500398862b05ef95261c6 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:46:19 +0900 Subject: [PATCH 068/221] fix(providers): repair static BigModel login and Responses effort Skip undocumented HTTP model-list validation through the existing unknown key-validation policy. Add a zero-fetch regression. For explicitly empty model/provider effort ladders, omit only the Responses effort field and retain reasoning summaries. Preserve omitted requests, nonempty model override precedence, unknown/non-rankable ladders, and forward behavior. Keep the documented Turbo max metadata without adding a selectable tier or injecting a wire default. Existing __omit__ mappings and noReasoningModels policy are unchanged. Add outbound serialization cases for omitted, max and ultra effort, summary preservation, input immutability, and unchanged consumer paths. Regenerate model metadata; the generated delta is only the BigModel Responses to zai alias. Validation: bun run generate:model-metadata and git diff --check passed. No tests, typecheck, lint or builds run; commit hooks skipped to honor that restriction. Main final CI and separate independent review remain required. Co-authored-by: jamespan --- .../src/content/docs/guides/providers.md | 5 ++ src/adapters/openai-responses.ts | 7 +++ src/generated/model-metadata.ts | 1 + src/providers/registry.ts | 2 + .../provider-registry-parity.test.ts | 17 ++++-- .../openai-responses-passthrough.test.ts | 52 +++++++++++++++++++ 6 files changed, 81 insertions(+), 3 deletions(-) diff --git a/docs-site/src/content/docs/guides/providers.md b/docs-site/src/content/docs/guides/providers.md index f5c4ddc190..081dced988 100644 --- a/docs-site/src/content/docs/guides/providers.md +++ b/docs-site/src/content/docs/guides/providers.md @@ -605,11 +605,16 @@ Both entries declare text input. The default model is `glm-5.3`; Responses reaso content is preserved on replay. The existing Codex export adds its compatibility `ultra` tier to GLM-5.3 and omits Turbo's default-effort field because Turbo has no selectable ladder; the provider metadata still records `max` for both models. +For Turbo, outgoing Responses requests omit `reasoning.effort`, including a caller's +`max` or `ultra`, while preserving requested reasoning summaries. This leaves effort +selection to the upstream default; opencodex does not inject a selectable or wire `max`. The example's `models.json` is a local catalog file, not a documented HTTP model-list response. This preset does not perform live model discovery. `glm-5.3-flash` is not seeded here because its exact Responses metadata is not verified. An existing custom provider with the same name keeps its configured destination and metadata. +CLI key login also skips the undocumented `/models` probe and reports validation as +unknown; successful key authentication is established by a subsequent inference request. ### Multiple API keys diff --git a/src/adapters/openai-responses.ts b/src/adapters/openai-responses.ts index 07c0556d5e..1b8c1b076e 100644 --- a/src/adapters/openai-responses.ts +++ b/src/adapters/openai-responses.ts @@ -630,6 +630,13 @@ function mapRoutedResponsesReasoningEffort( if (provider.authMode === "forward") return body; if (configuredReasoningEfforts(provider, modelId) === undefined) return body; if (!isPlainObject(body) || !isPlainObject(body.reasoning)) return body; + const declaredEfforts = modelRecordValue(provider.modelReasoningEfforts, modelId) ?? provider.reasoningEfforts; + // An explicitly empty ladder means no effort control, not no reasoning output. + // Omit only effort so the upstream default applies; unknown/non-rankable ladders stay untouched. + if (declaredEfforts?.length === 0 && Object.hasOwn(body.reasoning, "effort")) { + const { effort: _effort, ...reasoning } = body.reasoning; + return { ...body, reasoning: Object.keys(reasoning).length > 0 ? reasoning : undefined }; + } const requested = body.reasoning.effort; if (typeof requested !== "string") return body; diff --git a/src/generated/model-metadata.ts b/src/generated/model-metadata.ts index 662cf6f1a7..7220aa7509 100644 --- a/src/generated/model-metadata.ts +++ b/src/generated/model-metadata.ts @@ -31,6 +31,7 @@ const PROVIDER_ALIASES: Record = { "moonshot": "moonshot", "zhipu-bigmodel": "zai", "zhipu-bigmodel-coding": "zai", + "zhipu-bigmodel-responses": "zai", "minimax": "minimax", "minimax-cn": "minimax" } as const; diff --git a/src/providers/registry.ts b/src/providers/registry.ts index 1c3396a48a..ef7cb59e00 100644 --- a/src/providers/registry.ts +++ b/src/providers/registry.ts @@ -2557,6 +2557,8 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [ defaultModel: "glm-5.3", models: ["glm-5.3", "glm-5-turbo"], liveModels: false, + // The local Codex catalog does not establish an authenticated HTTP /models contract. + apiKeyValidation: "unknown", jawcodeBundle: "zai", // A pre-existing same-named custom provider must retain its destination and key boundary. preserveCustomDestination: true, diff --git a/tests/providers/provider-registry-parity.test.ts b/tests/providers/provider-registry-parity.test.ts index 0d935d12a2..e2083646a5 100644 --- a/tests/providers/provider-registry-parity.test.ts +++ b/tests/providers/provider-registry-parity.test.ts @@ -1,10 +1,10 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, spyOn, test } from "bun:test"; import { buildCatalogEntries } from "../../src/codex/catalog"; import { CURSOR_NO_VISION_MODELS } from "../../src/adapters/cursor/discovery"; import { getModelMetadata, resolveMetadataProvider } from "../../src/generated/model-metadata"; import { buildInitProviders } from "../../src/cli/init"; import { OAUTH_PROVIDERS } from "../../src/oauth"; -import { enrichProviderFromCatalog, KEY_LOGIN_PROVIDERS } from "../../src/oauth/key-providers"; +import { enrichProviderFromCatalog, KEY_LOGIN_PROVIDERS, validateApiKey } from "../../src/oauth/key-providers"; import { deriveFeaturedProviderIds, deriveInitProviders, @@ -459,7 +459,7 @@ describe("provider registry parity", () => { expect(registry.modelDiscovery).toBeUndefined(); expect(registry.preserveReasoningContentModels).toBeUndefined(); expect(KEY_LOGIN_PROVIDERS[id]).toMatchObject({ - models: ["glm-5.3", "glm-5-turbo"], liveModels: false, + models: ["glm-5.3", "glm-5-turbo"], liveModels: false, apiKeyValidation: "unknown", }); const provider = providerConfigSeed(registry); enrichProviderFromRegistry(id, provider); @@ -492,6 +492,17 @@ describe("provider registry parity", () => { expect(entries.some(entry => String(entry.slug).includes("glm-5.3-flash"))).toBe(false); }); + test("BigModel Responses key login does not probe an undocumented models endpoint", async () => { + const fetchSpy = spyOn(globalThis, "fetch").mockImplementation(async () => new Response(null, { status: 403 })); + try { + const id = "zhipu-bigmodel-responses"; + expect(await validateApiKey(id, KEY_LOGIN_PROVIDERS[id], "test-bigmodel-key")).toBe("unknown"); + expect(fetchSpy).not.toHaveBeenCalled(); + } finally { + fetchSpy.mockRestore(); + } + }); + test("BigModel Responses name collisions preserve custom transport and metadata", () => { const id = "zhipu-bigmodel-responses"; // Exercise both a different destination on the same wire and the canonical URL on diff --git a/tests/responses/openai-responses-passthrough.test.ts b/tests/responses/openai-responses-passthrough.test.ts index 0277da71d4..7e97217dc2 100644 --- a/tests/responses/openai-responses-passthrough.test.ts +++ b/tests/responses/openai-responses-passthrough.test.ts @@ -569,6 +569,58 @@ describe("DeepSeek Responses endpoint contract", () => { } }); + test.each([undefined, "max", "ultra"])("BigModel Turbo omits outbound effort %s and preserves summary requests", (effort) => { + const id = "zhipu-bigmodel-responses"; + const config: OcxConfig = { + port: 10100, + defaultProvider: id, + providers: { [id]: providerConfigSeed(getProviderRegistryEntry(id)!) }, + }; + const route = routeModel(config, `${id}/glm-5-turbo`); + for (const withSummary of [false, true]) { + const raw = { + model: route.modelId, + input: "ping", + ...(effort !== undefined || withSummary ? { + reasoning: { + ...(effort !== undefined ? { effort } : {}), + ...(withSummary ? { summary: "auto" } : {}), + }, + } : {}), + }; + const before = structuredClone(raw); + const request = createResponsesPassthroughAdapter(route.provider).buildRequest(parseRequest(raw)); + const wire = JSON.parse(request.body); + expect(request.url).toBe("https://open.bigmodel.cn/api/v1/responses"); + if (withSummary) expect(wire.reasoning).toEqual({ summary: "auto" }); + else expect(wire).not.toHaveProperty("reasoning"); + expect(raw).toEqual(before); + } + }); + + test("a provider-wide empty ladder removes even non-string raw effort", () => { + const keyed = { adapter: "openai-responses", baseUrl: "https://example.test/v1", authMode: "key" as const }; + const raw = { model: "model", input: "ping", reasoning: { effort: 123, summary: "auto" } }; + const wire = JSON.parse(createResponsesPassthroughAdapter({ ...keyed, reasoningEfforts: [] }) + .buildRequest(parseRequest(raw)).body); + expect(wire.reasoning).toEqual({ summary: "auto" }); + expect(raw.reasoning.effort).toBe(123); + }); + + test("empty-ladder repair preserves unknown, non-rankable and native forward effort behavior", () => { + const keyed = { adapter: "openai-responses", baseUrl: "https://example.test/v1", authMode: "key" as const }; + for (const unchanged of [keyed, { ...keyed, reasoningEfforts: ["enabled"] }, { ...provider, reasoningEfforts: [] }]) { + const raw = { model: "gpt-5.6-sol", input: "ping", reasoning: { effort: "ultra" } }; + const wire = JSON.parse(createResponsesPassthroughAdapter(unchanged).buildRequest(parseRequest(raw)).body); + expect(wire.reasoning.effort).toBe("ultra"); + } + // A model-specific nonempty ladder overrides a provider-wide empty declaration. + const wire = JSON.parse(createResponsesPassthroughAdapter({ + ...keyed, reasoningEfforts: [], modelReasoningEfforts: { model: ["low", "high", "max"] }, + }).buildRequest(parseRequest({ model: "model", input: "ping", reasoning: { effort: "ultra" } })).body); + expect(wire.reasoning.effort).toBe("max"); + }); + test("a config saved before the fix is backfilled, and a hand-set path is preserved", () => { const saved = { adapter: "openai-chat", baseUrl: "https://api.deepseek.com", apiKey: "sk-test" } as Parameters[1]; enrichProviderFromRegistry("deepseek", saved); From 9336a27ffeed3023500de914654b85b1e889fb81 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:47:39 +0900 Subject: [PATCH 069/221] test(providers): distinguish BigModel upstream and bridge modalities First CI run 34064726690 reports text,image rather than text for both BigModel models at provider-registry-parity.test.ts:471; the Turbo effort array remains empty. Source tracing confirms applyProviderConfigHints uses isModelVisionSidecarConsumer, also used by the runtime vision planner, to expose image attachment support for configured text-only models. Keep the official text-only registry declarations and assert them independently before checking the bridge-enriched model and final catalog modalities. Preserve exact Turbo empty effort expectations and all generic modality behavior. Clarify that image handling requires the existing available, enabled vision sidecar rather than native BigModel image support. Validation: supplied CI failure log and source contract reviewed; git diff --check passed. No local tests, typecheck, lint or builds run. Commit hooks skipped per execution restriction. Main final CI and independent review remain required. Co-authored-by: jamespan --- docs-site/src/content/docs/guides/providers.md | 9 +++++++-- tests/providers/provider-registry-parity.test.ts | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs-site/src/content/docs/guides/providers.md b/docs-site/src/content/docs/guides/providers.md index 081dced988..5e46979816 100644 --- a/docs-site/src/content/docs/guides/providers.md +++ b/docs-site/src/content/docs/guides/providers.md @@ -601,8 +601,13 @@ The preset uses a **static roster** (`liveModels: false`) taken from the | `glm-5.3` | 1,048,576 | `low`, `high`, `max` | `max` | Supported | | `glm-5-turbo` | 204,800 | None (empty list) | `max` | Supported | -Both entries declare text input. The default model is `glm-5.3`; Responses reasoning -content is preserved on replay. The existing Codex export adds its compatibility +Both entries declare upstream text-only input. The Codex catalog advertises text and +image because opencodex's existing vision sidecar can describe images for text-only +models. Image handling requires an available, enabled vision sidecar; this does not +declare native BigModel image support. + +The default model is `glm-5.3`; Responses reasoning content is preserved on replay. +The existing Codex export adds its compatibility `ultra` tier to GLM-5.3 and omits Turbo's default-effort field because Turbo has no selectable ladder; the provider metadata still records `max` for both models. For Turbo, outgoing Responses requests omit `reasoning.effort`, including a caller's diff --git a/tests/providers/provider-registry-parity.test.ts b/tests/providers/provider-registry-parity.test.ts index e2083646a5..238a5808ea 100644 --- a/tests/providers/provider-registry-parity.test.ts +++ b/tests/providers/provider-registry-parity.test.ts @@ -458,6 +458,8 @@ describe("provider registry parity", () => { }); expect(registry.modelDiscovery).toBeUndefined(); expect(registry.preserveReasoningContentModels).toBeUndefined(); + const upstreamModalities = { "glm-5.3": ["text"], "glm-5-turbo": ["text"] }; + expect(registry.modelInputModalities).toEqual(upstreamModalities); expect(KEY_LOGIN_PROVIDERS[id]).toMatchObject({ models: ["glm-5.3", "glm-5-turbo"], liveModels: false, apiKeyValidation: "unknown", }); @@ -468,11 +470,14 @@ describe("provider registry parity", () => { const models = provider.models!.map(modelId => applyProviderConfigHints(id, provider, { provider: id, id: modelId, })); + // The official upstream declaration stays text-only. Catalog hints add image for the + // existing vision sidecar (vision/eligibility.ts), not native BigModel image support. + expect(provider.modelInputModalities).toEqual(upstreamModalities); expect(models).toMatchObject([ { id: "glm-5.3", contextWindow: 1_048_576, reasoningEfforts: ["low", "high", "max"], - defaultReasoningEffort: "max", supportsReasoningSummaries: true, inputModalities: ["text"] }, + defaultReasoningEffort: "max", supportsReasoningSummaries: true, inputModalities: ["text", "image"] }, { id: "glm-5-turbo", contextWindow: 204_800, reasoningEfforts: [], - defaultReasoningEffort: "max", supportsReasoningSummaries: true, inputModalities: ["text"] }, + defaultReasoningEffort: "max", supportsReasoningSummaries: true, inputModalities: ["text", "image"] }, ]); const entries = buildCatalogEntries(nativeTemplate(), [], models); for (const [modelId, window, efforts] of [ @@ -482,6 +487,7 @@ describe("provider registry parity", () => { const entry = entries.find(row => row.slug === `${id}/${modelId}`); expect(entry).toMatchObject({ context_window: window, supports_reasoning_summaries: true, + input_modalities: ["text", "image"], }); // Existing export policy adds a compatibility ultra tier and omits the default // for empty ladders. The provider/CatalogModel defaults above remain official max. From e352ede9f6ad2e2a5fa58d982315968c5f4520e6 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:48:54 +0900 Subject: [PATCH 070/221] fix(gui): balance name editor helper text on narrow screens Browser review found an isolated Korean ending at 390px. Balance the short helper sentence without fixed line breaks or changing the existing layout. Co-authored-by: Zig Zag --- gui/src/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/src/styles.css b/gui/src/styles.css index 630882006f..a5838be7e4 100644 --- a/gui/src/styles.css +++ b/gui/src/styles.css @@ -2672,6 +2672,7 @@ button.prov-account-row.active { cursor: default; } .model-display-name-current > .text-label { grid-column: 1 / -1; } .model-display-name-current strong { min-width: 0; overflow-wrap: anywhere; } .model-display-name-dialog > .input { margin-bottom: 6px; } +.model-display-name-dialog > .small { text-wrap: balance; } .model-display-name-error { margin-top: 8px; color: var(--red); From c721b94494a9c6f12e059aec9f9c77f0a0ce0380 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 07:48:43 +0900 Subject: [PATCH 071/221] fix(claude): report terminal closure buffer overflow once Distinguish termination entry from terminal delivery so closure-time overflow can release thinking and emit the bounded error without retrying closure. Prioritize collected errors over unfinished block serialization. Add eight real-budget closure-only overflow cases for EOF, failure, completion and incomplete terminals, including shared-budget collection. Tests and typecheck intentionally not run; parent owns final combined remote CI. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi --- src/claude/outbound.ts | 16 +++- .../claude-outbound.test.ts | 84 +++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/src/claude/outbound.ts b/src/claude/outbound.ts index 4dcdaa0eb7..ac06afac2d 100644 --- a/src/claude/outbound.ts +++ b/src/claude/outbound.ts @@ -234,6 +234,9 @@ export function responsesSseToAnthropicSse( let bufferBytes = 0; let started = false; let terminated = false; + // Starting termination can still throw while closing a block or emitting its + // terminal frame. Only a delivered terminal forbids the bounded overflow error. + let terminalDelivered = false; let cancelled = false; let blockIndex = 0; let open: OpenBlock | null = null; @@ -338,6 +341,7 @@ export function responsesSseToAnthropicSse( usage: anthropicUsage(usage, webSearchRequests), }); emit("message_stop", { type: "message_stop" }); + terminalDelivered = true; }; // upstreamDerived: transient upstream statuses become overloaded_error so the // Anthropic-SDK client retries with backoff; proxy-internal exceptions stay @@ -346,12 +350,15 @@ export function responsesSseToAnthropicSse( // resets reach the reader catch (no failed-tail relay) and stay api_error — // same as today, deliberate residual. const fail = (status: number, message: string, upstreamDerived = false, code?: string) => { - if (terminated) return; + // finish/fail sets terminated before closeOpenBlock. A closure-time + // allocation failure must still emit one error, without retrying closure. + if (terminated && (code !== "translation_buffer_limit" || terminalDelivered)) return; terminated = true; if (code === "translation_buffer_limit") { releaseThinkingBuffer(open); if (open?.callId) translatorBudget.closeCall(open.callId); open = null; + terminalDelivered = true; // No normal close frames are valid after overflow. Emit exactly one bounded // typed terminal without consulting the exhausted budget. controller.enqueue(encoder.encode(sseFrame("error", anthropicErrorBody( @@ -368,10 +375,12 @@ export function responsesSseToAnthropicSse( // Do not manufacture message_start before the terminal error. Earlier transport-only // pings remain valid and do not turn the failure into a partial message. emit("error", anthropicErrorBody(status, message, type, code)); + terminalDelivered = true; return; } closeOpenBlock(); emit("error", anthropicErrorBody(status, message, type, code)); + terminalDelivered = true; }; const handleFrame = (eventName: string, data: Rec) => { @@ -981,9 +990,10 @@ export async function collectAnthropicMessage( } finally { reader.releaseLock(); } - closeBlock(); - + // Error is authoritative. In particular, do not allocate another copy of an + // unfinished thinking block after the translator reported closure overflow. if (error) return error; + closeBlock(); return { id: `msg_${uuid()}`, type: "message", diff --git a/tests/claude-integration/claude-outbound.test.ts b/tests/claude-integration/claude-outbound.test.ts index 33faa2e839..78fcf0879c 100644 --- a/tests/claude-integration/claude-outbound.test.ts +++ b/tests/claude-integration/claude-outbound.test.ts @@ -342,6 +342,90 @@ describe("claude outbound SSE", () => { expect(reasoningReleased).toBe(reasoningCommitted); }); + for (const terminal of ["eof", "failed", "completed", "incomplete"] as const) { + for (const buffered of [false, true]) { + test(`closure-only reasoning overflow: ${terminal}, ${buffered ? "collector" : "stream"}`, async () => { + // All small deltas fit, including replacement reservations. Closing needs + // the retained 32 KiB text PLUS its base64 signature frame. For the + // collector allow its additional retained text in the same real budget. + const budget = createTestTranslatorBudget({ maxTurnBytes: (buffered ? 102 : 70) * 1024 }); + let reasoningBytes = 0; + let maxReasoningBytes = 0; + let reasoningBytesAtOverflow = -1; + const trackedBudget: TranslatorBudget = { + openCall: id => budget.openCall(id), + closeCall: id => budget.closeCall(id), + reserveTransient(bytes, scope) { + let reservation: ReturnType; + try { reservation = budget.reserveTransient(bytes, scope); } + catch (error) { reasoningBytesAtOverflow = reasoningBytes; throw error; } + return { + commitRetained() { + reservation.commitRetained(); + if (scope.kind === "reasoning") { + reasoningBytes += bytes; + maxReasoningBytes = Math.max(maxReasoningBytes, reasoningBytes); + } + }, + release: () => reservation.release(), + }; + }, + chargeRetained: (bytes, scope) => budget.chargeRetained(bytes, scope), + releaseRetained(bytes, scope) { + if (scope.kind === "reasoning") reasoningBytes -= bytes; + budget.releaseRetained(bytes, scope); + }, + observeAcceptedRequestCopy: bytes => budget.observeAcceptedRequestCopy(bytes), + observeExternallyCapped: (kind, bytes) => budget.observeExternallyCapped(kind, bytes), + snapshot: () => budget.snapshot(), + dispose: () => budget.dispose(), + }; + const text = "x".repeat(32 * 1024); + const frames = Array.from({ length: 128 }, () => sse("response.reasoning_text.delta", { + item_id: "rs_closure", content_index: 0, delta: text.slice(0, 256), + })); + if (terminal !== "eof") { + frames.push(sse(`response.${terminal}`, { response: terminal === "failed" + ? { error: { message: "upstream failure", status: 502 } } + : terminal === "incomplete" + ? { status: "incomplete", incomplete_details: { reason: "max_output_tokens" }, usage: {} } + : { status: "completed", usage: {} } })); + // Neither a repeated completion nor a later failure may add a terminal. + frames.push(sse("response.completed", { response: { status: "completed", usage: {} } })); + frames.push(sse("response.failed", { response: { error: { message: "late failure" } } })); + } + const stream = responsesSseToAnthropicSse(streamFromChunks(frames), "m", { + translatorBudget: trackedBudget, pingIntervalMs: 0, + }); + if (buffered) { + const message = await collectAnthropicMessage(stream, "m", trackedBudget); + expect(message).toMatchObject({ type: "error", error: { + type: "request_too_large", code: "translation_buffer_limit", + } }); + expect(message).not.toHaveProperty("content"); + expect(message).not.toHaveProperty("stop_reason"); + } else { + const events = await collectEvents(stream); + const deltas = events.filter(event => event.data.delta?.type === "thinking_delta"); + expect(deltas.map(event => event.data.delta.thinking).join("")).toBe(text); + expect(events.filter(event => event.name === "error")).toHaveLength(1); + expect(events.at(-1)).toMatchObject({ name: "error", data: { type: "error", error: { + type: "request_too_large", code: "translation_buffer_limit", + } } }); + expect(JSON.stringify(events.at(-1)).length).toBeLessThan(1024); + expect(events.some(event => event.name === "message_stop" || event.name === "message_delta" || event.name === "content_block_stop")).toBe(false); + expect(events.some(event => event.data.delta?.type === "signature_delta")).toBe(false); + } + // These prove failure happened after all text was retained, not while + // ingesting a delta, and the error path released the thinking reservation. + expect(reasoningBytesAtOverflow).toBe(text.length); + expect(maxReasoningBytes).toBeGreaterThanOrEqual(text.length); + expect(reasoningBytes).toBe(0); + expect(budget.snapshot().overflows).toBe(1); + }); + } + } + test("same-part deltas and index-free reasoning frames never get a separator", async () => { const samePart = [ sse("response.created", { response: { id: "resp_1", status: "in_progress" } }), From 513391e8fa94716867ac127821beaa003ddbf48f Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:49:57 +0900 Subject: [PATCH 072/221] test(container): isolate synthetic inference without internal networking [skip ci] CI run 34064754947 built and started the image, then proved internal-only networking suppressed host port publication. Keep actual Compose networking and seed a checked loopback-only provider into disposable state before startup. Verify loaded configuration and hashes through recreation. Co-authored-by: Buseong Kim Co-authored-by: Ingwannu --- scripts/ci/docker-smoke.ts | 46 +++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/scripts/ci/docker-smoke.ts b/scripts/ci/docker-smoke.ts index 0745f6bd9e..6bcf56f164 100644 --- a/scripts/ci/docker-smoke.ts +++ b/scripts/ci/docker-smoke.ts @@ -126,6 +126,20 @@ const fixture = JSON.stringify({ models: [{ const token = randomBytes(32).toString("hex"); const replacement = randomBytes(32).toString("hex"); const sha256 = (value: string) => createHash("sha256").update(value).digest("hex"); +let seededConfigHash = ""; + +// Check the loader, including its schema-repair/default-provider fallback, before server startup +// and again in each running container. This isolates synthetic inference, not all process egress. +const fixtureConfigCheck = ` + const { loadConfig } = await import('./src/config.ts'); + const effective = loadConfig(); + const provider = effective.providers.smoke; + if (Object.keys(effective.providers).join(',') !== 'smoke' || effective.defaultProvider !== 'smoke' + || provider?.adapter !== 'openai-responses' || provider?.authMode !== 'local' + || provider?.baseUrl !== 'http://127.0.0.1:9/v1' || provider?.codexAccountMode !== undefined || provider?.apiKey + || effective.runtimeRole !== 'hub' || effective.hostname !== '0.0.0.0' || effective.port !== 10100 + || effective.codexAutoStart !== false || effective.codexShimAutoRestore !== false) throw new Error('unsafe effective fixture config'); +`; interface Container { Id: string; @@ -169,6 +183,7 @@ async function inspect() { const stateProbe = ` import { readFileSync, statSync, writeFileSync } from 'node:fs'; import { createHash } from 'node:crypto'; + ${fixtureConfigCheck} const homes = ['/home/bun/.opencodex', '/home/bun/.codex']; const uid = process.getuid(); if (uid === 0) throw new Error('root user'); @@ -192,6 +207,7 @@ const stateProbe = ` async function state() { const hashes = JSON.parse(await compose(["exec", "-T", "hub", "bun", "-e", stateProbe])) as string[]; check(hashes.length === 3 && hashes.every(hash => /^[a-f0-9]{64}$/.test(hash)), "invalid state evidence"); + check(hashes[0] === seededConfigHash, "seeded config changed"); check(hashes[1] === sha256(`${token}\n`) && hashes[2] === sha256(fixture), "token/catalog changed"); return JSON.stringify(hashes); } @@ -280,8 +296,6 @@ async function main() { writeFileSync(join(scratch, "empty.env"), "", { mode: 0o600 }); writeFileSync(join(scratch, "override.json"), JSON.stringify({ services: { hub: { image, restart: "no" } }, - // Block upstream egress even if an admission regression reaches a provider path. - networks: { default: { internal: true } }, }), { mode: 0o600 }); env = { PATH: process.env.PATH ?? "/usr/local/bin:/usr/bin:/bin", TMPDIR: scratch, @@ -293,10 +307,32 @@ async function main() { progress("validate and build"); await compose(["config", "--quiet"]); await build(); - progress("bootstrap and seed synthetic catalog"); + progress("verify shipped config and seed loopback-only fixture"); + seededConfigHash = await compose(["run", "--rm", "-T", "--no-deps", "hub", "bun", "-e", + ` + import { readFileSync, writeFileSync } from 'node:fs'; + import { createHash } from 'node:crypto'; + import { atomicWriteFile } from './src/config/atomic-write.ts'; + const { shipped, catalog } = JSON.parse(await Bun.stdin.text()); + const path = '/home/bun/.opencodex/config.json'; + if (readFileSync(path, 'utf8') !== shipped || readFileSync('docker/config.json', 'utf8') !== shipped) { + throw new Error('shipped config mismatch'); + } + const config = JSON.parse(shipped); + if (config.runtimeRole !== 'hub' || config.hostname !== '0.0.0.0' || config.port !== 10100 + || config.codexAutoStart !== false || config.codexShimAutoRestore !== false) throw new Error('shipped runtime contract'); + // Port 9 has no listener in this image. Replace all provider routes before any server starts; + // even an admission regression cannot send these synthetic requests to a real provider. + config.providers = { smoke: { adapter: 'openai-responses', baseUrl: 'http://127.0.0.1:9/v1', authMode: 'local' } }; + config.defaultProvider = 'smoke'; + atomicWriteFile(path, JSON.stringify(config) + '\\n'); + ${fixtureConfigCheck} + writeFileSync('/home/bun/.codex/opencodex-catalog.json', catalog, { mode: 0o600, flag: 'wx' }); + console.log(createHash('sha256').update(readFileSync(path)).digest('hex')); + `], JSON.stringify({ shipped: readFileSync(join(root, "docker/config.json"), "utf8"), catalog: fixture })); + check(/^[a-f0-9]{64}$/.test(seededConfigHash), "invalid seeded config evidence"); + progress("bootstrap throwaway token"); await compose(["run", "--rm", "-T", "--no-deps", "hub", "bun", "run", "docker/bootstrap-token.ts"], `${token}\n`); - await compose(["run", "--rm", "-T", "--no-deps", "hub", "bun", "-e", - "import { writeFileSync } from 'node:fs'; writeFileSync('/home/bun/.codex/opencodex-catalog.json', await Bun.stdin.text(), { mode: 0o600, flag: 'wx' });"], fixture); progress("start and check admission"); await compose(["up", "--no-build", "--wait", "--wait-timeout", "120", "hub"], undefined, 150_000); const first = await inspect(); From 76e667fbb6e06b58d84a92e45481b9f0db27a298 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 07:59:20 +0900 Subject: [PATCH 073/221] test(responses): account for ordinary tool catalog guidance Combined Linux CI at c721b94494a9c6f12e059aec9f9c77f0a0ce0380 reported six messages where the seed fixtures expected five. Non-OpenAI chat translation prepends system tool-catalog guidance while compaction removes context.tools first. Explicitly require one system prefix advertising read_value on ordinary and stored-ID turns, and none on compact turns. Keep exact total length, ordered history content, original tool pairing and compact output assertions. Follow-up to synthetic #3807 coverage motivated by @DaveW001 and @stephen-drew; no original source patch copied. Source-only review and git diff --check passed. Local tests, typecheck and build NOT RUN by instruction. --- .../responses-compaction-routing.test.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/responses/responses-compaction-routing.test.ts b/tests/responses/responses-compaction-routing.test.ts index 8faca32bef..a787024d95 100644 --- a/tests/responses/responses-compaction-routing.test.ts +++ b/tests/responses/responses-compaction-routing.test.ts @@ -1817,10 +1817,20 @@ describe("established-history external task input (#3807)", () => { return captured; } - function expectHistory(sent: Record, tail: Array> = []) { + function expectHistory( + sent: Record, + tail: Array> = [], + withToolCatalog = true, + ) { const messages = sent.messages as Array>; - expect(messages).toHaveLength(wireHistory.length + tail.length); - expect(messages).toMatchObject([...wireHistory, ...tail]); + // Ordinary non-OpenAI chat turns prepend catalog guidance; compaction removes + // context.tools before translation. Require that exact prefix, not arbitrary extras. + const prefix = withToolCatalog ? [{ + role: "system", + content: expect.stringContaining("Valid tool names for this turn are exactly `read_value`."), + }] : []; + expect(messages).toHaveLength(prefix.length + wireHistory.length + tail.length); + expect(messages).toMatchObject([...prefix, ...wireHistory, ...tail]); // Exactly one original pair: delivery must not acquire a synthesized tool identity. expect(messages.flatMap(message => message.tool_calls ?? [])).toEqual(wireHistory[1]!.tool_calls); expect(messages.filter(message => message.role === "tool")).toEqual([wireHistory[2]]); @@ -1882,7 +1892,7 @@ describe("established-history external task input (#3807)", () => { expect(captured).toHaveLength(1); expectHistory(captured[0]!, [ { role: "user", content: expect.stringContaining("CONTEXT CHECKPOINT COMPACTION") }, - ]); + ], false); expect(captured[0]!.tools).toBeUndefined(); expect(JSON.stringify(captured)).not.toContain("compaction_trigger"); if (version === "v2 trigger") { From 9b5b670db3e24ae5522c5d61e74c071c71257a26 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 08:00:29 +0900 Subject: [PATCH 074/221] test(claude): correct replay and closure overflow oracles Match the canonical user string observed at parent combined head c721b9449 while preserving exact assistant block arrays. Capture closure-overflow output before collecting under the same unreset budget, separating concurrent ingestion pressure from closure-only failure. Assert all text, one bounded error, no success terminal, exact 32768-byte overflow boundary and no second overflow. No local tests or typecheck run. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi --- .../anthropic-thinking-signature.test.ts | 2 +- .../claude-outbound.test.ts | 41 +++++++++++-------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/tests/adapters/anthropic/anthropic-thinking-signature.test.ts b/tests/adapters/anthropic/anthropic-thinking-signature.test.ts index db8f489c4f..86ca82b412 100644 --- a/tests/adapters/anthropic/anthropic-thinking-signature.test.ts +++ b/tests/adapters/anthropic/anthropic-thinking-signature.test.ts @@ -399,7 +399,7 @@ describe("Claude / Responses / intended Anthropic replay fidelity", () => { const request = await adapter.buildRequest(parsed); const replay = JSON.parse(request.body as string) as { messages: Array<{ role: string; content: unknown }> }; expect(replay.messages).toEqual([ - { role: "user", content: [{ type: "text", text: "question" }] }, + { role: "user", content: "question" }, { role: "assistant", content: fixture.blocks }, { role: "user", content: [{ type: "tool_result", tool_use_id: tool.id, content: "result" }] }, ]); diff --git a/tests/claude-integration/claude-outbound.test.ts b/tests/claude-integration/claude-outbound.test.ts index 78fcf0879c..67380bb44a 100644 --- a/tests/claude-integration/claude-outbound.test.ts +++ b/tests/claude-integration/claude-outbound.test.ts @@ -346,9 +346,11 @@ describe("claude outbound SSE", () => { for (const buffered of [false, true]) { test(`closure-only reasoning overflow: ${terminal}, ${buffered ? "collector" : "stream"}`, async () => { // All small deltas fit, including replacement reservations. Closing needs - // the retained 32 KiB text PLUS its base64 signature frame. For the - // collector allow its additional retained text in the same real budget. - const budget = createTestTranslatorBudget({ maxTurnBytes: (buffered ? 102 : 70) * 1024 }); + // the retained 32 KiB text PLUS its base64 signature frame. Capture the + // generated stream before collection: concurrent collector retention can + // exceed a shared budget during ingestion instead of exercising closure. + // Collection below reuses this SAME budget, without resetting it. + const budget = createTestTranslatorBudget({ maxTurnBytes: 70 * 1024 }); let reasoningBytes = 0; let maxReasoningBytes = 0; let reasoningBytesAtOverflow = -1; @@ -397,24 +399,31 @@ describe("claude outbound SSE", () => { const stream = responsesSseToAnthropicSse(streamFromChunks(frames), "m", { translatorBudget: trackedBudget, pingIntervalMs: 0, }); - if (buffered) { - const message = await collectAnthropicMessage(stream, "m", trackedBudget); + const captured = buffered ? await new Response(stream).text() : undefined; + const capturedFrames = captured?.split("\n\n").filter(Boolean).map(frame => `${frame}\n\n`); + const events = await collectEvents(capturedFrames ? streamFromChunks(capturedFrames) : stream); + const deltas = events.filter(event => event.data.delta?.type === "thinking_delta"); + expect(deltas.map(event => event.data.delta.thinking).join("")).toBe(text); + expect(events.filter(event => event.name === "error")).toHaveLength(1); + expect(events.at(-1)).toMatchObject({ name: "error", data: { type: "error", error: { + type: "request_too_large", code: "translation_buffer_limit", + } } }); + expect(JSON.stringify(events.at(-1)).length).toBeLessThan(1024); + expect(events.some(event => event.name === "message_stop" || event.name === "message_delta" || event.name === "content_block_stop")).toBe(false); + expect(events.some(event => event.data.delta?.type === "signature_delta")).toBe(false); + if (capturedFrames) { + expect(capturedFrames.join("")).toBe(captured); + expect(reasoningBytesAtOverflow).toBe(text.length); + expect(reasoningBytes).toBe(0); + expect(budget.snapshot().overflows).toBe(1); + // Feed the actual generated frames, without inventing an error event or + // collecting one huge chunk that introduces a different buffer limit. + const message = await collectAnthropicMessage(streamFromChunks(capturedFrames), "m", trackedBudget); expect(message).toMatchObject({ type: "error", error: { type: "request_too_large", code: "translation_buffer_limit", } }); expect(message).not.toHaveProperty("content"); expect(message).not.toHaveProperty("stop_reason"); - } else { - const events = await collectEvents(stream); - const deltas = events.filter(event => event.data.delta?.type === "thinking_delta"); - expect(deltas.map(event => event.data.delta.thinking).join("")).toBe(text); - expect(events.filter(event => event.name === "error")).toHaveLength(1); - expect(events.at(-1)).toMatchObject({ name: "error", data: { type: "error", error: { - type: "request_too_large", code: "translation_buffer_limit", - } } }); - expect(JSON.stringify(events.at(-1)).length).toBeLessThan(1024); - expect(events.some(event => event.name === "message_stop" || event.name === "message_delta" || event.name === "content_block_stop")).toBe(false); - expect(events.some(event => event.data.delta?.type === "signature_delta")).toBe(false); } // These prove failure happened after all text was retained, not while // ingesting a delta, and the error path released the thinking reservation. From 619f7a7b0ecfdc3dd32cf8b399dd2851e3002f10 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 08:01:39 +0900 Subject: [PATCH 075/221] test(container): declare the synthetic loopback destination [skip ci] The Docker diagnostic failed because loadConfig correctly rejects private destinations unless explicitly allowed. A bounded remote fixture reproduced the fallback and passed with the test-only flag. Validate the fixture before startup and report fixed seed-phase codes without exposing child errors. Co-authored-by: Buseong Kim Co-authored-by: Ingwannu --- scripts/ci/docker-smoke.ts | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/scripts/ci/docker-smoke.ts b/scripts/ci/docker-smoke.ts index 6bcf56f164..eb488cf3b1 100644 --- a/scripts/ci/docker-smoke.ts +++ b/scripts/ci/docker-smoke.ts @@ -136,6 +136,7 @@ const fixtureConfigCheck = ` const provider = effective.providers.smoke; if (Object.keys(effective.providers).join(',') !== 'smoke' || effective.defaultProvider !== 'smoke' || provider?.adapter !== 'openai-responses' || provider?.authMode !== 'local' + || provider?.allowPrivateNetwork !== true || provider?.baseUrl !== 'http://127.0.0.1:9/v1' || provider?.codexAccountMode !== undefined || provider?.apiKey || effective.runtimeRole !== 'hub' || effective.hostname !== '0.0.0.0' || effective.port !== 10100 || effective.codexAutoStart !== false || effective.codexShimAutoRestore !== false) throw new Error('unsafe effective fixture config'); @@ -308,13 +309,18 @@ async function main() { await compose(["config", "--quiet"]); await build(); progress("verify shipped config and seed loopback-only fixture"); - seededConfigHash = await compose(["run", "--rm", "-T", "--no-deps", "hub", "bun", "-e", + const seeded = await run(["docker", ...composeArgs, "run", "--rm", "-T", "--no-deps", "hub", "bun", "-e", ` import { readFileSync, writeFileSync } from 'node:fs'; import { createHash } from 'node:crypto'; - import { atomicWriteFile } from './src/config/atomic-write.ts'; + // Exit codes are fixed diagnostic markers; never serialize the caught exception. + let seedStage = 70; + try { + const { atomicWriteFile } = await import('./src/config/atomic-write.ts'); + seedStage = 71; const { shipped, catalog } = JSON.parse(await Bun.stdin.text()); const path = '/home/bun/.opencodex/config.json'; + seedStage = 72; if (readFileSync(path, 'utf8') !== shipped || readFileSync('docker/config.json', 'utf8') !== shipped) { throw new Error('shipped config mismatch'); } @@ -323,13 +329,27 @@ async function main() { || config.codexAutoStart !== false || config.codexShimAutoRestore !== false) throw new Error('shipped runtime contract'); // Port 9 has no listener in this image. Replace all provider routes before any server starts; // even an admission regression cannot send these synthetic requests to a real provider. - config.providers = { smoke: { adapter: 'openai-responses', baseUrl: 'http://127.0.0.1:9/v1', authMode: 'local' } }; + config.providers = { smoke: { adapter: 'openai-responses', baseUrl: 'http://127.0.0.1:9/v1', authMode: 'local', allowPrivateNetwork: true } }; config.defaultProvider = 'smoke'; + seedStage = 73; + const { validateConfigCandidate } = await import('./src/config.ts'); + if (!validateConfigCandidate(config).ok) throw new Error('invalid fixture'); + seedStage = 74; atomicWriteFile(path, JSON.stringify(config) + '\\n'); + seedStage = 75; ${fixtureConfigCheck} + seedStage = 76; writeFileSync('/home/bun/.codex/opencodex-catalog.json', catalog, { mode: 0o600, flag: 'wx' }); + seedStage = 77; console.log(createHash('sha256').update(readFileSync(path)).digest('hex')); + } catch { process.exitCode = seedStage; } `], JSON.stringify({ shipped: readFileSync(join(root, "docker/config.json"), "utf8"), catalog: fixture })); + const seedFailures: Record = { + 70: "imports", 71: "input", 72: "shipped config contract", 73: "fixture validation", + 74: "atomic config write", 75: "effective config", 76: "catalog write", 77: "config hash", + }; + check(seeded.code === 0, `seed failed: ${seedFailures[seeded.code ?? -1] ?? "unclassified child failure"} (exit ${seeded.code ?? "signal"})`); + seededConfigHash = seeded.out.trim(); check(/^[a-f0-9]{64}$/.test(seededConfigHash), "invalid seeded config evidence"); progress("bootstrap throwaway token"); await compose(["run", "--rm", "-T", "--no-deps", "hub", "bun", "run", "docker/bootstrap-token.ts"], `${token}\n`); From 4c1d9afaa6152b6a84c5f5a929aefbae52adc595 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 08:05:11 +0900 Subject: [PATCH 076/221] fix(gui): reconcile display name draft during snapshot render Replace effect-driven draft synchronization with a guarded render-state adjustment when the parent supplies a new confirmed model snapshot. Keep the dialog mounted, retaining focus refs, pending state and request errors. Ordinary typing and catalog polling do not replace the editor snapshot. Local tests, lint, typecheck and build NOT RUN by owner mandate. Static diff inspection only; final CI and independent review remain parent-owned. Co-authored-by: Zig Zag --- gui/src/components/ModelDisplayNameDialog.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/src/components/ModelDisplayNameDialog.tsx b/gui/src/components/ModelDisplayNameDialog.tsx index c24b6612d7..2a57ff8279 100644 --- a/gui/src/components/ModelDisplayNameDialog.tsx +++ b/gui/src/components/ModelDisplayNameDialog.tsx @@ -41,6 +41,7 @@ export default function ModelDisplayNameDialog({ const titleId = useId(); const helpId = useId(); const errorId = useId(); + const [draftSnapshot, setDraftSnapshot] = useState(model); const [draft, setDraft] = useState(model.displayNameOverride ?? ""); const [validationKey, setValidationKey] = useState(null); @@ -57,11 +58,13 @@ export default function ModelDisplayNameDialog({ if (saveFailed) inputRef.current?.focus(); }, [requestError, saving]); - // Parent replaces this snapshot only after a confirmed mutation, not catalog polling. - useEffect(() => { + // Parent replaces this snapshot only after a confirmed mutation, not typing or polling. + // Adjust before committing children, preserving the mounted dialog and its focus refs. + if (draftSnapshot !== model) { + setDraftSnapshot(model); setDraft(model.displayNameOverride ?? ""); setValidationKey(null); - }, [model]); + } const validationError = validationKey ? t(validationKey) : null; const visibleError = validationError ?? requestError; From d6cf8764ff2758c9ab0aca63cb0dda07a0ccae2c Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:36:59 +0900 Subject: [PATCH 077/221] feat(integrations): carry Raycast client from #3733 Carry source fa8b488dce0aa661653b0ef4c61d33b6a76249ff onto current dev. Local test, typecheck, lint and build execution deferred to combined remote CI per task scope. Co-authored-by: Chanhee Lee --- .../260904_raycast_integration/000_plan.md | 121 ++++++++ .../pr-screenshots/raycast-integration.png | Bin 0 -> 282997 bytes .../content/docs/fr/guides/integrations.md | 36 ++- .../content/docs/fr/reference/cli/agents.md | 15 +- .../src/content/docs/guides/integrations.md | 39 ++- .../content/docs/ja/reference/cli/agents.md | 7 +- .../content/docs/ko/reference/cli/agents.md | 7 +- .../src/content/docs/reference/cli/agents.md | 14 +- .../content/docs/ru/reference/cli/agents.md | 15 +- .../content/docs/tr/guides/integrations.md | 40 ++- .../content/docs/tr/reference/cli/agents.md | 16 +- .../docs/zh-cn/reference/cli/agents.md | 7 +- .../content/docs/zh-tw/guides/integrations.md | 31 +- .../docs/zh-tw/reference/cli/agents.md | 7 +- gui/public/provider-icons/README.md | 13 + gui/public/provider-icons/raycast.svg | 3 + gui/src/app-routing.ts | 1 + .../client-config-clients.ts | 5 +- gui/src/components/integration-marks.ts | 1 + gui/src/i18n/de.ts | 6 + gui/src/i18n/en.ts | 6 + gui/src/i18n/fr.ts | 6 + gui/src/i18n/ja.ts | 6 + gui/src/i18n/ko.ts | 6 + gui/src/i18n/ru.ts | 6 + gui/src/i18n/tr.ts | 6 + gui/src/i18n/zh-TW.ts | 6 + gui/src/i18n/zh.ts | 6 + .../integrations/FileIntegrationPage.tsx | 5 + .../pages/integrations/RaycastPlanNotice.tsx | 32 +++ gui/src/pages/integrations/integration-api.ts | 15 + .../pages/integrations/integration-tabs.ts | 2 + .../pages/integrations/overview-clients.ts | 1 + gui/tests/client-config-panel.test.tsx | 4 +- gui/tests/fr-localization.test.ts | 2 + gui/tests/integration-marks.test.ts | 9 +- gui/tests/integrations-api.test.ts | 4 +- gui/tests/integrations-overview-rows.test.ts | 7 +- gui/tests/locale-parity.test.ts | 2 + gui/tests/raycast-plan-notice.test.tsx | 51 ++++ scripts/test-layout/layout.json | 3 + src/cli/dispatch.ts | 2 +- src/cli/help.ts | 2 +- src/cli/index.ts | 38 ++- src/cli/integrations.ts | 35 ++- src/cli/registry.ts | 4 +- src/clients/config-export.ts | 36 +++ src/clients/config-export/contracts.ts | 3 +- src/clients/config-export/raycast.ts | 86 ++++++ src/clients/model-presentation.ts | 61 ++++ src/integrations/catalog-refresh.ts | 2 +- src/integrations/merge.ts | 183 ++++++++++-- src/integrations/raycast-detect.ts | 110 +++++++ src/integrations/registry.ts | 18 ++ src/integrations/state.ts | 74 ++++- src/integrations/writer.ts | 69 +++-- src/server/management/config-routes.ts | 8 +- src/server/management/integration-routes.ts | 31 +- tests/clients/integrations-merge.test.ts | 268 +++++++++++++++++ tests/clients/integrations-state.test.ts | 4 +- tests/clients/raycast-client.test.ts | 271 ++++++++++++++++++ tests/clients/raycast-detect.test.ts | 82 ++++++ .../clients/sync-client-integrations.test.ts | 18 +- .../client-config-export-new-clients.test.ts | 12 +- tests/config/client-config-export.test.ts | 6 +- .../config/client-config-new-clients.test.ts | 12 +- tests/fixtures/test-layout-expected.json | 3 + tests/gui/integrations-invariants.test.ts | 39 ++- .../management-integration-routes.test.ts | 26 ++ 69 files changed, 1904 insertions(+), 168 deletions(-) create mode 100644 devlog/_plan/260904_raycast_integration/000_plan.md create mode 100644 docs-site/public/pr-screenshots/raycast-integration.png create mode 100644 gui/public/provider-icons/raycast.svg create mode 100644 gui/src/pages/integrations/RaycastPlanNotice.tsx create mode 100644 gui/tests/raycast-plan-notice.test.tsx create mode 100644 src/clients/config-export/raycast.ts create mode 100644 src/clients/model-presentation.ts create mode 100644 src/integrations/raycast-detect.ts create mode 100644 tests/clients/integrations-merge.test.ts create mode 100644 tests/clients/raycast-client.test.ts create mode 100644 tests/clients/raycast-detect.test.ts diff --git a/devlog/_plan/260904_raycast_integration/000_plan.md b/devlog/_plan/260904_raycast_integration/000_plan.md new file mode 100644 index 0000000000..c98701a2cd --- /dev/null +++ b/devlog/_plan/260904_raycast_integration/000_plan.md @@ -0,0 +1,121 @@ +# Raycast Custom Providers integration — plan + +Raycast (Pro-only) reads `~/.config/raycast/ai/providers.yaml` and watches it, so a +file-toggle client is the right shape. Spec: https://manual.raycast.com/ai/custom-providers. + +Decisions taken with the maintainer: + +1. Install signal is `~/.config/raycast/ai` (the directory Raycast creates on + "Reveal Providers Config"), not `Raycast.app`. +2. A non-Pro plan is a warning in status/GUI, never a refusal. +3. Every exported model declares `tools: supported: true` (same stance as Hermes: + every routed model is tool-capable). +4. Array ownership goes into the shared merge/classifier layer as a path-segment + selector rather than a Raycast-only patcher. `structure/09_client-integrations.md` + forbids a special case that lives only in the writer or only in status; a + selector segment that `readPath`/`setPath`/`deletePath` all understand is the + one way both keep agreeing. + +## Raycast file shape + +```yaml +providers: + - id: opencodex # <- our one owned sequence item + name: OpenCodex + base_url: http://127.0.0.1:10100/v1 + models: + - id: anthropic/claude-opus-5 + name: Claude Opus 5 + context: 200000 + abilities: + temperature: { supported: true } + vision: { supported: true } + system_message: { supported: true } + tools: { supported: true } + reasoning_effort: { supported: false } +``` + +No `api_keys`: loopback is unauthenticated and the file has no env interpolation, +so the client is `loopbackOnly: true`. + +## Pro signal (macOS) + +`defaults read com.raycast.macos.v1 subscriptions_active` → `1` / `0`. Read via +`Bun.spawnSync`, not by parsing the binary plist (cfprefsd caches). Windows: `unknown`. + +## Work packages (disjoint files, run in parallel) + +| WP | Files | +|---|---| +| 1 merge selector | `src/integrations/merge.ts`, `src/integrations/state.ts`, `tests/integrations-merge.test.ts` | +| 2 client | `src/clients/config-export.ts`, `src/integrations/registry.ts`, `src/cli/registry.ts`, `src/cli/help.ts`, `tests/raycast-client.test.ts`, list-assertion tests | +| 3 sync fan-out | `src/integrations/owned-refresh.ts`, `src/cli/dispatch.ts`, `src/server/management/config-routes.ts`, `src/cli/index.ts`, `tests/sync-client-integrations.test.ts` | +| 4 detect + API + GUI | `src/integrations/raycast-detect.ts`, `src/server/management/integration-routes.ts`, `src/cli/integrations.ts`, `gui/**`, i18n | +| 5 docs | `docs-site/**` | + +### WP1 — `[field=value]` path segment + +```ts +// merge.ts +const ARRAY_SELECTOR = /^\[([A-Za-z_][A-Za-z0-9_]*)=([^\]]+)\]$/u; +export type PathSegment = { kind: "key"; key: string } | { kind: "select"; field: string; value: string }; +export function parseSegment(raw: string): PathSegment; +export class AmbiguousSelectorError extends Error {} +``` + +- `setPath`: a `select` segment addresses the element of an array whose + `item[field] === value`. Missing parent → `[]` is created (recorded by + `createdContainerPaths`). Match found → replace in place; none → push; ≥2 → + throw `AmbiguousSelectorError` (writer maps it to `unsafe` alongside + `UnserializableValueError`). +- `deletePath`: splice the match; an emptied array we created is pruned by the + existing `createdContainers` walk. +- `state.ts readPath`: `select` → `Array.prototype.find`. Because the classifier + and the writer share this one function, status and mutation cannot disagree. +- `blockedContainerPath`: a non-array, non-undefined value where a `select` + segment expects an array is blocked (`providers: {}` written by the user). +- `createdContainerPaths`: unchanged join rule; a `select` segment is never a + container prefix on its own. +- A key-only path is byte-for-byte the old behaviour; the twelve existing clients + do not change. + +### WP2 — client registration + +`config-export.ts`: `"raycast"` in `ExportClientId`; `raycastAiDir(env, home)` = +`join(home, ".config", "raycast", "ai")` (Raycast ignores XDG; same path on Windows); +`raycastConfigPath` = `…/providers.yaml`; types `RaycastAbility`, +`RaycastModelEntry`, `RaycastProviderEntry`, `RaycastGeneratedConfig`; +`buildRaycastClientConfig(ctx)` over `normalizeExportModels(ctx.models)` with +`exportModelLabel(model)` as `name`, `contextWindow` → `context`, abilities: +`temperature: !(reasoningEfforts?.length)`, `vision: inputModalities?.includes("image") ?? false`, +`system_message: true`, `tools: true`, `reasoning_effort: (reasoningEfforts?.length ?? 0) > 0`. +`buildRaycastContribution` = `singleFragment("raycast", ["providers", "[id=opencodex]"], providers[0])`. +`summarizeRaycast` finds the `opencodex` item. `EXPORT_CLIENTS.raycast`: +`filename: "raycast-providers.yaml"`, `format: "yaml"`, `apiKeyEnv: ""`, `loopbackOnly: true`. + +`registry.ts`: `configPath: raycastConfigPath`, `detectDir: raycastAiDir`, no +`sourcePreservingYaml` (that patcher handles block-map leaves only), no `writerLock`. + +### WP3 — sync fan-out + +Raycast joins the shared `refreshOwnedCatalogIntegrations` coordinator. Model +selection changes use its default `["pi", "aside", "raycast"]` set; +`POST /api/sync` uses `["mcode", "pi", "aside", "raycast"]`; direct CLI sync +updates `["mcode", "pi", "raycast"]` locally and keeps Aside behind its +server-owned multi-profile route. Startup and ensure refresh the owned Raycast +catalog after the Codex catalog publishes, using the live port. + +### WP4 — detection, API, GUI + +`raycast-detect.ts` mirrors `cursor-detect.ts` (injectable deps, read-only): +`RaycastPlan = "pro" | "free" | "unknown"`, `detectRaycast(deps)` → +`{ appPath, aiDirPresent, plan }`. `GET /api/client-integrations/raycast` +adds `raycast: { plan, appPath, aiDirPresent }` to the envelope (only for this +client). `ocx integration client status --client raycast` prints `plan`. GUI: +every surface in `devlog/_fin/260831_aside_client_and_integrations_ux/002_registration_checklist.md` +plus one `RaycastPlanNotice` shown when `plan !== "pro"` or `!aiDirPresent`. + +### WP5 — docs + +`guides/integrations.md` row + paragraph (Pro, reveal-first), `reference/cli/agents.md`, +translated locales, `bun run build` in `docs-site`. diff --git a/docs-site/public/pr-screenshots/raycast-integration.png b/docs-site/public/pr-screenshots/raycast-integration.png new file mode 100644 index 0000000000000000000000000000000000000000..e17261c158d64cab5ce5f8112000ffbb3cb3500a GIT binary patch literal 282997 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

A0+6Mo1P(PAj7!Qi250`_gDOyCJRWxN-CLFYa6 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%0A7UdBS})4ht_ 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 z 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 BVSoSt literal 0 HcmV?d00001 diff --git a/docs-site/src/content/docs/fr/guides/integrations.md b/docs-site/src/content/docs/fr/guides/integrations.md index c65531a4d3..c70d471f39 100644 --- a/docs-site/src/content/docs/fr/guides/integrations.md +++ b/docs-site/src/content/docs/fr/guides/integrations.md @@ -1,10 +1,10 @@ --- title: Intégrations -description: Connectez opencodex à OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness et MiniMax Code depuis le tableau de bord — un commutateur par client, avec une sauvegarde avant chaque écriture. +description: Connectez opencodex à OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code et Raycast depuis le tableau de bord — un commutateur par client, avec une sauvegarde avant chaque écriture. --- L'onglet **Intégrations** écrit le bloc fournisseur d'opencodex dans le fichier de configuration du client, -puis peut le retirer. Neuf clients fonctionnent ainsi, chacun avec son propre commutateur : +puis peut le retirer. Dix clients fonctionnent ainsi, chacun avec son propre commutateur : | Client | Fichier de configuration | Format | Prise d'effet de la modification | Identifiant | |---|---|---|---|---| @@ -17,6 +17,7 @@ puis peut le retirer. Neuf clients fonctionnent ainsi, chacun avec son propre co | Gajae Code | `~/.gjc/agent/models.yml` | YAML | dans les nouvelles sessions ou à l'ouverture de `/model` |`OPENCODEX_GAJAE_API_KEY` | | DeepSeek Harness (DSH) | `$DSH_HOME/settings.yaml` (`~/.dsh/settings.yaml` par défaut) | YAML | rechargement à chaud | jeton porteur fictif et non secret pour le bouclage | | MiniMax Code | `~/.minimax/config.yaml` | YAML | dans les nouvelles sessions ou après l’ouverture du sélecteur de modèles | valeur fictive de bouclage | +| Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | immédiatement à l'enregistrement — Raycast surveille le fichier | aucun — bouclage uniquement | La prise en charge gérée de DSH exige au minimum **DSH 0.1.0-rc.6**. OpenCodex ne possède que le fragment `llm-pi-ai.providers.opencodex` : **Appliquer** et **Actualiser** remplacent ce fragment, **Désactiver** ne @@ -33,6 +34,27 @@ L’actualisation de l’intégration met également à jour les fenêtres de co d’effort de raisonnement faisant autorité ; les capacités inconnues sont omises et l’effort courant, qui appartient à la session MCode, est préservé. +Raycast a deux prérequis. Les fournisseurs personnalisés (Custom Providers) sont une fonctionnalité +**Raycast Pro** : avec un forfait gratuit, le fichier est tout de même écrit, mais +`ocx integration client status --client raycast` et la page Intégrations signalent un avertissement, +car Raycast ne le lira pas. Et Raycast ne crée son dossier `ai` que lorsque vous ouvrez une fois +Raycast → Settings → AI → **Reveal Providers Config** ; opencodex utilise ce dossier comme signal +d'installation et indique que le client n'est pas installé tant qu'il n'existe pas. Raycast lit +`~/.config/raycast/ai/providers.yaml` aussi bien sur macOS que sur Windows et n'honore pas +`XDG_CONFIG_HOME` ; ce chemin ne peut donc pas être déplacé. + +Le bloc géré est un seul élément, `id: opencodex`, dans la séquence `providers` du fichier : +`name: OpenCodex`, `base_url: http://:/v1`, et chaque modèle routé avec ses `abilities` — +`tools` et `system_message` sont toujours pris en charge, `vision` suit les modalités d'entrée du +catalogue, `reasoning_effort` est défini lorsque le modèle dispose d'une échelle d'effort, et +`temperature` est désactivé pour les modèles de raisonnement. Les autres fournisseurs du fichier sont +préservés, et la désactivation ne retire que l'élément OpenCodex. Raycast prend en compte la +modification dès l'enregistrement du fichier, sans redémarrage ; les modèles apparaissent dans le +sélecteur de modèles de Raycast regroupés sous **OpenCodex**. Le fichier n'a aucun emplacement pour +un identifiant, ce client est donc limité au bouclage : aucune entrée `api_keys` n'est écrite et une +liaison hors bouclage est refusée. Le format est documenté sur +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). + Les chemins respectent les variables de remplacement propres à chaque client, lorsqu'elles existent. Pour OMP, la présence de `OMP_PROFILE` l'emporte sur `PI_PROFILE`, même si sa valeur est explicitement vide. Un profil nommé emploie `PI_CONFIG_DIR` comme nom de répertoire relatif au dossier personnel de l'utilisateur @@ -93,7 +115,7 @@ niveaux. Dans ces cas, le commutateur est verrouillé afin que rien ne soit modi **OMP** n'est pas affecté non plus par les modifications voisines, mais pour une autre raison : son outil d'écriture ne modifie, octet par octet, que sa propre plage `providers.opencodex` ; le reste du fichier n'est jamais réécrit. Pour les autres formats susceptibles de contenir des commentaires (Hermes, OpenClaw, -Kimi Code, Gajae Code et MiniMax Code — documents YAML, JSON5 et TOML réécrits en entier), ou lorsque les propres entrées +Kimi Code, Gajae Code, MiniMax Code et Raycast — documents YAML, JSON5 et TOML réécrits en entier), ou lorsque les propres entrées d'opencodex ont été modifiées, le commutateur se verrouille et la désactivation est refusée plutôt que de deviner quelles modifications vous appartiennent. @@ -169,9 +191,11 @@ ocx integration client enable --client mcode ocx mcode ``` -Une fois l’intégration connectée, `ocx sync` actualise également le bloc MCode géré avec les fenêtres de -contexte et les niveaux d’effort de raisonnement actuels. Les blocs absents, modifiés par un tiers, non sûrs -ou jamais gérés restent intacts ; réactivez explicitement l’intégration lorsque vous souhaitez la reconnecter. +Une fois l’intégration connectée, `ocx sync` et `POST /api/sync` actualisent les catalogues MCode, +Pi, Aside et Raycast gérés. Le démarrage du proxy actualise aussi le catalogue Raycast géré. +Les changements de visibilité, de fournisseur ou de préréglage actualisent Pi, Aside et Raycast. +Les blocs absents, modifiés par un tiers, non sûrs ou supprimés manuellement restent intacts ; +réactivez explicitement l’intégration lorsque vous souhaitez la reconnecter. Le CLI distinct de la plateforme MiniMax (`mmx`) n’est pas une intégration à commutateur de fichier. Ses commandes textuelles utilisent le point de terminaison compatible avec Anthropic de MiniMax ; OpenCodex diff --git a/docs-site/src/content/docs/fr/reference/cli/agents.md b/docs-site/src/content/docs/fr/reference/cli/agents.md index e1501048c6..749119f70a 100644 --- a/docs-site/src/content/docs/fr/reference/cli/agents.md +++ b/docs-site/src/content/docs/fr/reference/cli/agents.md @@ -164,7 +164,7 @@ Gérez et appliquez la clôture du modèle Grok Build. ## Exportation de la configuration client -### `ocx export --client ` +### `ocx export --client ` Imprimez une configuration client connectée au proxy en cours d'exécution. La commande sérialise le bloc fournisseur `opencodex` — URL de base, liste de modèles et référence d’identifiant du client @@ -175,7 +175,7 @@ les modèles Codex peuvent actuellement voir. | Option | Actions | | --- | --- | -| `--client ` | Requis. Sélectionne le dialecte de configuration client. | +| `--client ` | Requis. Sélectionne le dialecte de configuration client. | | `--json` | Imprimez le document généré en tant que JSON sur la sortie standard pour les scripts. Il s'agit de JSON même lorsque le format natif du client sélectionné est YAML, TOML ou JSON5. | | `--out ` | Écrivez le format de configuration natif du client dans ``. Refuse de remplacer un fichier existant. | | `--force` | Autoriser `--out` à remplacer un fichier existant. | @@ -205,6 +205,17 @@ propres valeurs par défaut à ces lignes. | `mcode` | `~/.minimax/config.yaml` (`MINIMAX_DATA_DIR`, puis l'ancien `MAVIS_DATA_DIR`, l'emportent une fois définis ; une valeur relative est refusée) | `mcode-config.yaml` | aucun — espace réservé de bouclage | | `zcode` | `~/.zcode/v2/config.json` (`ZCODE_DATA_DIR` l'emporte une fois défini ; une valeur relative est refusée) | `config.json` | aucun — espace réservé de bouclage | | `prime` | `~/.prime/agent/models.json` (`PRIME_AGENT_CODING_AGENT_DIR` l'emporte une fois défini ; une valeur relative est refusée) | `prime-models.json` | aucun — espace réservé de bouclage | +| `raycast` | `~/.config/raycast/ai/providers.yaml`, sur macOS comme sur Windows (Raycast n'honore pas `XDG_CONFIG_HOME`) | `raycast-providers.yaml` | aucun — bouclage uniquement, aucune entrée `api_keys` n'est écrite | + +L'exportation Raycast est un document `providers.yaml` autonome contenant un seul élément `id: opencodex` +dans la séquence `providers` : `name: OpenCodex`, l'URL de base `/v1` du proxy et chaque modèle routé avec +ses `abilities` (`tools` et `system_message` toujours pris en charge, `vision` d'après les modalités d'entrée +du catalogue, `reasoning_effort` lorsque le modèle dispose d'une échelle d'effort, `temperature` désactivé +pour les modèles de raisonnement). Les fournisseurs personnalisés sont une fonctionnalité Raycast Pro, et +Raycast surveille le fichier : une modification enregistrée prend effet sans redémarrage. Le format est +documenté sur [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). +Aucune entrée `api_keys` n'est écrite ; cette exportation est donc limitée au bouclage et une liaison hors +bouclage est refusée. L'exportation DSH gérée nécessite DSH 0.1.0-rc.6 ou plus récent et ne possède que `llm-pi-ai.providers.opencodex`. DSH recharge à chaud ce fournisseur ; le modèle par défaut de l'utilisateur et diff --git a/docs-site/src/content/docs/guides/integrations.md b/docs-site/src/content/docs/guides/integrations.md index 0c95908206..bb8cea7001 100644 --- a/docs-site/src/content/docs/guides/integrations.md +++ b/docs-site/src/content/docs/guides/integrations.md @@ -1,10 +1,10 @@ --- title: Integrations -description: Connect opencodex to OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code, ZCode, Prime Agent and Aside from the dashboard — one switch per client, with a backup taken before every write. +description: Connect opencodex to OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code, ZCode, Prime Agent, Aside and Raycast from the dashboard — one switch per client, with a backup taken before every write. --- The **Integrations** tab writes opencodex's provider block into a client's own config -file, and removes it again. Twelve clients work this way, each with a switch: +file, and removes it again. Thirteen clients work this way, each with a switch: | Client | Config file | Format | When the change takes effect | Credential | |---|---|---|---|---| @@ -20,6 +20,7 @@ file, and removes it again. Twelve clients work this way, each with a switch: | Prime Agent | `~/.prime/agent/models.json` | JSON | new sessions | loopback placeholder | | ZCode | `~/.zcode/v2/config.json` | JSON | on restart | loopback placeholder | | Aside | `~/.aside/u//models.json` | JSON | after fully quitting and reopening Aside | loopback placeholder | +| Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | immediately on save — Raycast watches the file | none — loopback only | Generated catalogs include only enabled models from each provider selection. This applies to both downloads and managed integrations, including Pi and Aside. The management model list still shows @@ -61,6 +62,28 @@ One caveat specific to Aside: the running app rewrites `models.json` itself, so fully quit and reopen Aside after applying, the same way Claude Desktop needs a restart. Aside's block is loopback-only and never carries a real credential. +Raycast has two prerequisites. Custom Providers is a **Raycast Pro** feature: on a +free plan the file is still written, but `ocx integration client status --client +raycast` and the Integrations page report a warning, because Raycast will not +read it. And Raycast only creates its `ai` folder when you open Raycast → +Settings → AI → **Reveal Providers Config** once; opencodex uses that folder as +the install signal and reports the client as not installed until then. Raycast +reads `~/.config/raycast/ai/providers.yaml` on macOS and Windows alike and does +not honor `XDG_CONFIG_HOME`, so that path is not relocatable. + +The managed block is one element, `id: opencodex`, in the file's `providers` +sequence: `name: OpenCodex`, `base_url: http://:/v1`, and every +routed model with its `abilities` — `tools` and `system_message` are always +supported, `vision` follows the catalog's input modalities, `reasoning_effort` +is set when the model has an effort ladder, and `temperature` is turned off for +reasoning models. Other providers in the file are preserved, and disable removes +only the OpenCodex element. Raycast picks up the change as soon as the file is +saved, no restart needed; the models appear in Raycast's model picker grouped +under **OpenCodex**. The file has no place for a credential, so this client is +loopback-only: no `api_keys` entry is written and a non-loopback bind is refused. +The format is documented at +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). + Cursor has a tab but is not one of these switches. Regular Cursor calls custom endpoints from its own backend, so a loopback proxy is unreachable without a public tunnel, and Cursor's separate Private Inference build is configured inside Cursor. The **Cursor** tab is read-only: @@ -130,7 +153,7 @@ than 1000 levels — which locks the switch instead, so nothing is silently chan **OMP** is unaffected by sibling edits too, for a different reason: its writer patches only its own `providers.opencodex` range byte-wise, so the rest of the file is never rewritten. For the remaining formats that can carry comments -(Hermes, OpenClaw, Kimi Code, Gajae Code, MiniMax Code — YAML, JSON5 and TOML +(Hermes, OpenClaw, Kimi Code, Gajae Code, MiniMax Code, Raycast — YAML, JSON5 and TOML written as whole documents), or whenever our own entries were edited, the switch locks and disable refuses rather than guessing which edits were yours. @@ -216,10 +239,12 @@ ocx integration client enable --client mcode ocx mcode ``` -Once connected, `ocx sync` refreshes owned MCode, Pi, and Aside catalogs with the current -model selection, context windows, and reasoning-effort ladders. Changes to model visibility, -provider selection, or presets also refresh connected Pi and Aside catalogs. Foreign-edited -or unsafe blocks stay untouched, as do previously owned blocks you removed manually. +Once connected, `ocx sync` and `POST /api/sync` refresh owned MCode, Pi, Aside, and +Raycast catalogs with the current model selection, context windows, and reasoning-effort +ladders. Proxy startup refreshes an owned Raycast catalog. Changes to model visibility, +provider selection, or presets also refresh connected Pi, Aside, and Raycast catalogs. +Missing, foreign-edited, or unsafe blocks stay untouched, as do previously owned blocks +you removed manually. An enabled Aside profile is an exception to the usual owned-only refresh: if its account directory exists and it has never had an owned block, sync may create its first block when that slot is empty. A prior Aside connection enables this behavior for all registered diff --git a/docs-site/src/content/docs/ja/reference/cli/agents.md b/docs-site/src/content/docs/ja/reference/cli/agents.md index cd1b4fa30f..a223362a56 100644 --- a/docs-site/src/content/docs/ja/reference/cli/agents.md +++ b/docs-site/src/content/docs/ja/reference/cli/agents.md @@ -125,7 +125,7 @@ Grok Build モデル フェンスを管理および適用します。 ## クライアント設定のエクスポート -### `ocx export --client ` +### `ocx export --client ` 実行中のプロキシに接続するクライアント設定を出力します。このコマンドは、ベース URL、モデル一覧、およびクライアントに応じた認証情報参照または `opencodex-loopback` プレースホルダーを含む `opencodex` プロバイダーブロックを、選択したクライアントのネイティブ形式でシリアル化します。 @@ -133,7 +133,7 @@ Grok Build モデル フェンスを管理および適用します。 |旗 |アクション | | --- | --- | -| `--client ` |必須。クライアントの設定形式を選択します。 | +| `--client ` |必須。クライアントの設定形式を選択します。 | | `--json` |構成 JSON のみを標準出力に出力するため、リダイレクトはバイト正確な出力をキャプチャします。 `--out` 書き込みメモを含むすべての診断は stderr に送られます。 | | `--out ` |設定を `` に書き込みます。既存のファイルの置き換えを拒否します。 | | `--force` | `--out` が既存のファイルを置き換えることを許可します。 | @@ -160,6 +160,9 @@ ocx export --client opencode --out ~/opencodex-opencode.json | `mcode` | `~/.minimax/config.yaml` (`MINIMAX_DATA_DIR`、次に旧 `MAVIS_DATA_DIR` が設定時に優先。相対値は拒否されます) | `mcode-config.yaml` | なし — loopback placeholder | | `zcode` | `~/.zcode/v2/config.json` (`ZCODE_DATA_DIR` が設定時に優先。相対値は拒否されます) | `config.json` | なし — loopback placeholder | | `prime` | `~/.prime/agent/models.json` (`PRIME_AGENT_CODING_AGENT_DIR` が設定時に優先。相対値は拒否されます) | `prime-models.json` | なし — loopback placeholder | +| `raycast` | `~/.config/raycast/ai/providers.yaml` (macOS と Windows で同じ。Raycast は `XDG_CONFIG_HOME` を尊重しません) | `raycast-providers.yaml` | なし — loopback のみ。`api_keys` エントリは書き込まれません | + +Raycast のエクスポートは、`providers` シーケンスに `id: opencodex` 要素を 1 つだけ持つ独立した `providers.yaml` 文書です。内容は `name: OpenCodex`、プロキシの `/v1` ベース URL、および `abilities` 付きのルーティング済み全モデルです (`tools` と `system_message` は常にサポート、`vision` はカタログの入力モダリティから、`reasoning_effort` はモデルに effort ラダーがある場合、`temperature` は推論モデルではオフ)。Custom Providers は Raycast Pro の機能で、Raycast はこのファイルを監視しているため、保存した変更は再起動なしで反映されます。形式は [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers) に記載されています。`api_keys` エントリは書き込まれないため、このエクスポートは loopback 専用で、loopback 以外のバインドは拒否されます。 opencode は `{env:OPENCODEX_OPENCODE_API_KEY}` を補間します。opencodex が生成する Pi のエクスポートには環境変数が不要で、リテラルのプレースホルダー `opencodex-loopback` が入ります。この値は必須です。Pi はモデル リストを構築する際に `apiKey` を解決し、既存の設定に未設定の環境変数参照がある場合はプロバイダー全体を隠すためです。ループバックでは、生成されたプレースホルダーをプロキシが検査することはありません。 diff --git a/docs-site/src/content/docs/ko/reference/cli/agents.md b/docs-site/src/content/docs/ko/reference/cli/agents.md index a229551a83..3624a2a803 100644 --- a/docs-site/src/content/docs/ko/reference/cli/agents.md +++ b/docs-site/src/content/docs/ko/reference/cli/agents.md @@ -131,7 +131,7 @@ Grok Build model fence를 관리하고 적용합니다. ## 클라이언트 설정 내보내기 -### `ocx export --client ` +### `ocx export --client ` 실행 중인 프록시에 연결할 client config를 출력합니다. 이 명령은 base URL, model list, 그리고 client에 따라 credential reference 또는 `opencodex-loopback` placeholder를 포함한 `opencodex` provider block을 선택한 client의 네이티브 형식으로 직렬화합니다. @@ -139,7 +139,7 @@ Grok Build model fence를 관리하고 적용합니다. | 플래그 | 동작 | | --- | --- | -| `--client ` | 필수입니다. 클라이언트 설정 형식을 선택합니다. | +| `--client ` | 필수입니다. 클라이언트 설정 형식을 선택합니다. | | `--json` | config JSON만 stdout에 출력하므로, redirect가 byte-exact 출력을 캡처합니다. `--out` write note를 포함한 모든 진단 메시지는 stderr로 갑니다. | | `--out ` | config를 ``에 씁니다. 기존 파일이 있으면 덮어쓰지 않습니다. | | `--force` | `--out`이 기존 파일을 덮어쓰도록 허용합니다. | @@ -166,6 +166,9 @@ ocx export --client opencode --out ~/opencodex-opencode.json | `mcode` | `~/.minimax/config.yaml` (`MINIMAX_DATA_DIR`, 그다음 레거시 `MAVIS_DATA_DIR`가 설정되면 우선. 상대 경로는 거부됩니다) | `mcode-config.yaml` | 없음 — loopback placeholder | | `zcode` | `~/.zcode/v2/config.json` (`ZCODE_DATA_DIR`가 설정되면 우선. 상대 경로는 거부됩니다) | `config.json` | 없음 — loopback placeholder | | `prime` | `~/.prime/agent/models.json` (`PRIME_AGENT_CODING_AGENT_DIR`가 설정되면 우선. 상대 경로는 거부됩니다) | `prime-models.json` | 없음 — loopback placeholder | +| `raycast` | `~/.config/raycast/ai/providers.yaml` (macOS와 Windows 모두 동일. Raycast는 `XDG_CONFIG_HOME`을 따르지 않습니다) | `raycast-providers.yaml` | 없음 — loopback 전용. `api_keys` 항목은 쓰지 않습니다 | + +Raycast 내보내기는 `providers` 시퀀스에 `id: opencodex` 요소 하나만 담은 독립 `providers.yaml` 문서입니다. 내용은 `name: OpenCodex`, proxy의 `/v1` base URL, 그리고 `abilities`가 붙은 라우팅된 모든 모델입니다(`tools`와 `system_message`는 항상 지원, `vision`은 카탈로그의 입력 모달리티를 따름, `reasoning_effort`는 모델에 effort 사다리가 있을 때, `temperature`는 추론 모델에서 꺼짐). Custom Providers는 Raycast Pro 기능이며, Raycast가 이 파일을 감시하므로 저장한 변경은 재시작 없이 적용됩니다. 형식은 [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers)에 문서화되어 있습니다. `api_keys` 항목은 쓰지 않으므로 이 내보내기는 loopback 전용이며, loopback이 아닌 bind는 거부됩니다. opencode는 `{env:OPENCODEX_OPENCODE_API_KEY}`를 보간합니다. opencodex가 생성한 Pi 블록에는 환경 변수가 필요 없으며, 리터럴 placeholder인 `opencodex-loopback`이 들어갑니다. 이 값은 필수입니다. Pi는 모델 목록을 만들 때 `apiKey`를 해석하고, 기존 config에 설정되지 않은 env 참조가 있으면 provider 전체를 숨기기 때문입니다. 루프백에서 proxy는 생성된 placeholder를 검사하지 않습니다. diff --git a/docs-site/src/content/docs/reference/cli/agents.md b/docs-site/src/content/docs/reference/cli/agents.md index e6470eae0e..300bb7d5e2 100644 --- a/docs-site/src/content/docs/reference/cli/agents.md +++ b/docs-site/src/content/docs/reference/cli/agents.md @@ -207,7 +207,7 @@ Manage and apply the Grok Build model fence. ## Client config export -### `ocx export --client ` +### `ocx export --client ` Print a client config wired to the running proxy. The command serializes the `opencodex` provider block — base URL, model list, and the client's credential @@ -218,7 +218,7 @@ models Codex can currently see. | Flag | Action | | --- | --- | -| `--client ` | Required. Selects the client config dialect. | +| `--client ` | Required. Selects the client config dialect. | | `--json` | Print the generated document as JSON on stdout for scripts. This is JSON even when the selected client's native format is YAML, TOML, or JSON5. | | `--out ` | Write the client's native config format to ``. Refuses to replace an existing file. | | `--force` | Allow `--out` to replace an existing file. | @@ -248,6 +248,7 @@ client applies its own defaults for those). | `zcode` | `~/.zcode/v2/config.json` (`ZCODE_DATA_DIR` wins when set; a relative value is refused) | `config.json` | none — loopback placeholder | | `prime` | `~/.prime/agent/models.json` (`PRIME_AGENT_CODING_AGENT_DIR` wins when set; a relative value is refused) | `prime-models.json` | none — loopback placeholder | | `aside` | `~/.aside/u//models.json` for the account Aside's own `accounts.json` names as current; an unreadable manifest is refused rather than defaulting to an account | `aside-models.json` | none — loopback placeholder | +| `raycast` | `~/.config/raycast/ai/providers.yaml` on macOS and Windows alike (Raycast does not honor `XDG_CONFIG_HOME`) | `raycast-providers.yaml` | none — loopback only, no `api_keys` entry is written | The managed DSH export requires DSH 0.1.0-rc.6 or newer and owns only `llm-pi-ai.providers.opencodex`. DSH hot reloads that provider; the user's default model and @@ -260,6 +261,15 @@ hide the whole provider when an existing config contains an unset env reference. checks the generated placeholder on loopback. OMP supports provider-level headers, but this initial integration deliberately remains loopback-only; remote `x-opencodex-api-key` wiring is deferred. +The Raycast export is a standalone `providers.yaml` document with one `id: opencodex` element +in the `providers` sequence: `name: OpenCodex`, the proxy's `/v1` base URL, and every routed model +with its `abilities` (`tools` and `system_message` always supported, `vision` from the catalog's +input modalities, `reasoning_effort` when the model has an effort ladder, `temperature` off for +reasoning models). Custom Providers is a Raycast Pro feature, and Raycast watches the file, so a +saved change takes effect without a restart. The format is documented at +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). No +`api_keys` entry is written, so this export is loopback-only and a non-loopback bind is refused. + The MCode, ZCode and Prime exports are loopback-only for the same reason and likewise carry the `opencodex-loopback` placeholder rather than a real credential. Prime Agent reads the same `models.json` contract Pi does, so the two exports produce the same document; only the destination diff --git a/docs-site/src/content/docs/ru/reference/cli/agents.md b/docs-site/src/content/docs/ru/reference/cli/agents.md index b49162dbc6..8df8175173 100644 --- a/docs-site/src/content/docs/ru/reference/cli/agents.md +++ b/docs-site/src/content/docs/ru/reference/cli/agents.md @@ -152,7 +152,7 @@ override, но файлы на диске никогда не меняются. ## Экспорт client config -### `ocx export --client ` +### `ocx export --client ` Печатает client config, направленный на работающий прокси. Команда сериализует блок провайдера `opencodex` в нативном формате выбранного клиента: base URL, список моделей и, @@ -163,7 +163,7 @@ override, но файлы на диске никогда не меняются. | Флаг | Действие | | --- | --- | -| `--client ` | Обязателен. Выбирает формат конфигурации клиента. | +| `--client ` | Обязателен. Выбирает формат конфигурации клиента. | | `--json` | Печатать только JSON-конфиг в stdout, чтобы redirect сохранял побайтно точный вывод. Вся диагностика, включая заметку о записи через `--out`, идёт в stderr. | | `--out ` | Записать конфиг в ``. Перезаписывать существующий файл не позволит. | | `--force` | Разрешить `--out` заменить существующий файл. | @@ -193,6 +193,17 @@ ocx export --client opencode --out ~/opencodex-opencode.json | `mcode` | `~/.minimax/config.yaml` (`MINIMAX_DATA_DIR`, затем устаревшая `MAVIS_DATA_DIR`, имеют приоритет, если заданы; относительное значение отклоняется) | `mcode-config.yaml` | нет — loopback placeholder | | `zcode` | `~/.zcode/v2/config.json` (`ZCODE_DATA_DIR` имеет приоритет, если задана; относительное значение отклоняется) | `config.json` | нет — loopback placeholder | | `prime` | `~/.prime/agent/models.json` (`PRIME_AGENT_CODING_AGENT_DIR` имеет приоритет, если задана; относительное значение отклоняется) | `prime-models.json` | нет — loopback placeholder | +| `raycast` | `~/.config/raycast/ai/providers.yaml` одинаково на macOS и Windows (Raycast не учитывает `XDG_CONFIG_HOME`) | `raycast-providers.yaml` | нет — только loopback, запись `api_keys` не создаётся | + +Экспорт для Raycast — это отдельный документ `providers.yaml` с одним элементом `id: opencodex` в +последовательности `providers`: `name: OpenCodex`, базовый URL прокси с `/v1` и каждая маршрутизируемая +модель с её `abilities` (`tools` и `system_message` поддерживаются всегда, `vision` берётся из входных +модальностей каталога, `reasoning_effort` задаётся, когда у модели есть шкала усилий, `temperature` +отключена для рассуждающих моделей). Custom Providers — функция Raycast Pro, а Raycast следит за файлом, +поэтому сохранённое изменение вступает в силу без перезапуска. Формат описан на +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). Запись +`api_keys` не создаётся, поэтому этот экспорт работает только через loopback, а привязка вне loopback +отклоняется. opencode интерполирует `{env:OPENCODEX_OPENCODE_API_KEY}`. Сгенерированный opencodex экспорт для Pi не требует переменной окружения и несёт литеральную заглушку `opencodex-loopback`. Это значение diff --git a/docs-site/src/content/docs/tr/guides/integrations.md b/docs-site/src/content/docs/tr/guides/integrations.md index fea4b37dd4..ff0dcaa41e 100644 --- a/docs-site/src/content/docs/tr/guides/integrations.md +++ b/docs-site/src/content/docs/tr/guides/integrations.md @@ -1,10 +1,10 @@ --- title: Entegrasyonlar -description: Kontrol panelinden OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness ve MiniMax Code'u opencodex'e bağlayın — istemci başına tek bir anahtar ve her yazmadan önce alınan bir yedek. +description: Kontrol panelinden OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code ve Raycast'i opencodex'e bağlayın — istemci başına tek bir anahtar ve her yazmadan önce alınan bir yedek. --- **Entegrasyonlar** sekmesi, opencodex'in sağlayıcı bloğunu istemcinin kendi -yapılandırma dosyasına yazar ve tekrar kaldırır. Dokuz istemci bu şekilde +yapılandırma dosyasına yazar ve tekrar kaldırır. On istemci bu şekilde çalışır, her biri bir anahtarla: | İstemci | Yapılandırma dosyası | Format | Değişiklik ne zaman geçerli olur? | Kimlik bilgisi | @@ -18,6 +18,7 @@ yapılandırma dosyasına yazar ve tekrar kaldırır. Dokuz istemci bu şekilde | Gajae Code | `~/.gjc/agent/models.yml` | YAML | yeni oturumlarda veya `/model` açtığınızda | `OPENCODEX_GAJAE_API_KEY` | | DeepSeek Harness (DSH) | `$DSH_HOME/settings.yaml` (varsayılan `~/.dsh/settings.yaml`) | YAML | çalışırken yeniden yükleme | gizli olmayan geri döngü bearer yer tutucusu | | MiniMax Code | `~/.minimax/config.yaml` | YAML | yeni oturumlarda veya model seçici açıldıktan sonra | geri döngü (loopback) yer tutucusu | +| Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | kaydedildiği anda — Raycast dosyayı izler | yok — yalnızca geri döngü | Yönetilen DSH desteğinin en düşük uyumlu sürümü **DSH 0.1.0-rc.6**'dır. OpenCodex yalnızca `llm-pi-ai.providers.opencodex` bölümünü yönetir: Uygula ve Yenile bu bölümü değiştirir, Devre Dışı @@ -35,6 +36,29 @@ Entegrasyon yenilendiğinde model başına doğrulanmış bağlam pencereleri ve çabası seçenekleri de yenilenir; bilinmeyen yetenekler atlanır ve MCode oturumunun yönettiği geçerli çaba seçimi korunur. +Raycast'in iki ön koşulu vardır. Özel sağlayıcılar (Custom Providers) bir **Raycast Pro** +özelliğidir: ücretsiz planda dosya yine yazılır, ancak Raycast onu okumayacağı için +`ocx integration client status --client raycast` ve Entegrasyonlar sayfası bir uyarı +bildirir. Ayrıca Raycast `ai` klasörünü yalnızca Raycast → Settings → AI → +**Reveal Providers Config** seçeneğini bir kez açtığınızda oluşturur; opencodex bu +klasörü kurulum sinyali olarak kullanır ve klasör var olana kadar istemciyi kurulu değil +olarak bildirir. Raycast, `~/.config/raycast/ai/providers.yaml` dosyasını macOS ve +Windows'ta aynı şekilde okur ve `XDG_CONFIG_HOME` değerini dikkate almaz; bu nedenle bu +yol taşınamaz. + +Yönetilen blok, dosyanın `providers` dizisindeki tek bir öğedir: `id: opencodex`, +`name: OpenCodex`, `base_url: http://:/v1` ve `abilities` alanıyla birlikte +yönlendirilen her model — `tools` ve `system_message` her zaman destekli, `vision` +kataloğun giriş modalitelerini izler, `reasoning_effort` modelin bir çaba merdiveni +varsa ayarlanır ve `temperature` akıl yürütme modelleri için kapatılır. Dosyadaki diğer +sağlayıcılar korunur ve devre dışı bırakma yalnızca OpenCodex öğesini kaldırır. Raycast +değişikliği dosya kaydedilir kaydedilmez, yeniden başlatma gerekmeden alır; modeller +Raycast'in model seçicisinde **OpenCodex** altında gruplanmış olarak görünür. Dosyada +kimlik bilgisi için bir yer yoktur, bu yüzden bu istemci yalnızca geri döngü içindir: +hiçbir `api_keys` girdisi yazılmaz ve geri döngü dışı bir bağlama reddedilir. Format +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers) +adresinde belgelenmiştir. + Yollar, varsa her istemcinin kendi ortam geçersiz kılmalarını dikkate alır. OMP için `OMP_PROFILE`, açıkça boş olduğunda bile varlığıyla `PI_PROFILE`'a üstün gelir. Adlandırılmış bir profil, `PI_CONFIG_DIR`'i kullanıcının ev dizinine göre @@ -112,7 +136,7 @@ hiçbir şey sessizce değiştirilmez veya düşürülmez. **OMP** de yanındaki düzenlemelerden etkilenmez, ama başka bir nedenle: writer'ı yalnızca kendi `providers.opencodex` aralığını bayt bayt yamalar, dosyanın geri kalanı hiçbir zaman yeniden yazılmaz. Yorum taşıyabilen diğer biçimlerde (Hermes, OpenClaw, -Kimi Code, Gajae Code, MiniMax Code — bütün belge olarak yazılan YAML, JSON5 ve TOML) veya +Kimi Code, Gajae Code, MiniMax Code, Raycast — bütün belge olarak yazılan YAML, JSON5 ve TOML) veya kendi girdilerimiz düzenlenmişse, anahtar kilitlenir ve hangi düzenlemelerin size ait olduğunu tahmin etmek yerine devre dışı bırakmayı reddeder. @@ -192,10 +216,12 @@ ocx integration client enable --client mcode ocx mcode ``` -Bağlandıktan sonra `ocx sync`, yönetilen MCode bloğunu güncel bağlam pencereleri ve -akıl yürütme çabası seçenekleriyle de yeniler. Eksik, dışarıdan düzenlenmiş, güvenli -olmayan veya hiç sahiplenilmemiş bloklara dokunmaz; yeniden bağlamak istediğinizde -entegrasyonu açıkça yeniden etkinleştirin. +Bağlandıktan sonra `ocx sync` ve `POST /api/sync`, yönetilen MCode, Pi, Aside ve +Raycast kataloglarını yeniler. Proxy başlangıcı da yönetilen Raycast kataloğunu +yeniler. Model görünürlüğü, sağlayıcı veya ön ayar değişiklikleri Pi, Aside ve +Raycast kataloglarını günceller. Eksik, dışarıdan düzenlenmiş, güvenli olmayan +veya elle kaldırılmış bloklara dokunmaz; yeniden bağlamak istediğinizde +entegrasyonu açıkça etkinleştirin. Ayrı MiniMax platform CLI'si (`mmx`) bir dosya anahtarı entegrasyonu değildir. Metin komutları MiniMax'ın Anthropic uyumlu uç noktasını kullandığı için OpenCodex, diff --git a/docs-site/src/content/docs/tr/reference/cli/agents.md b/docs-site/src/content/docs/tr/reference/cli/agents.md index a3e184661d..04e72a766c 100644 --- a/docs-site/src/content/docs/tr/reference/cli/agents.md +++ b/docs-site/src/content/docs/tr/reference/cli/agents.md @@ -191,7 +191,7 @@ Grok Build model çitini yönetin ve uygulayın. ## İstemci yapılandırma dışa aktarma -### `ocx export --client ` +### `ocx export --client ` Çalışan proxy'ye bağlı bir istemci yapılandırmasını yazdırın. Komut, `opencodex` sağlayıcı bloğunu — temel URL, model listesi ve istemcinin kimlik bilgisi @@ -203,7 +203,7 @@ yalnızca Codex'in şu anda görebildiği modelleri yayınlar. | Bayrak | Eylem | | --- | --- | -| `--client ` | Gerekli. İstemci yapılandırma lehçesini seçer. | +| `--client ` | Gerekli. İstemci yapılandırma lehçesini seçer. | | `--json` | Betikler için stdout üzerinde oluşturulan belgeyi JSON olarak yazdırın. Bu, seçilen istemcinin yerel formatı YAML, TOML veya JSON5 olsa bile JSON'dur. | | `--out ` | İstemcinin yerel yapılandırma formatını `` konumuna yazın. Mevcut bir dosyanın üzerine yazmayı reddeder. | | `--force` | `--out`'un mevcut bir dosyanın üzerine yazmasına izin verin. | @@ -233,6 +233,18 @@ için kendi varsayılanlarını uygular) gelir. | `mcode` | `~/.minimax/config.yaml` (ayarlandığında `MINIMAX_DATA_DIR`, ardından eski `MAVIS_DATA_DIR` öncelikli; göreli değer reddedilir) | `mcode-config.yaml` | yok — geri döngü yer tutucusu | | `zcode` | `~/.zcode/v2/config.json` (ayarlandığında `ZCODE_DATA_DIR` öncelikli; göreli değer reddedilir) | `config.json` | yok — geri döngü yer tutucusu | | `prime` | `~/.prime/agent/models.json` (ayarlandığında `PRIME_AGENT_CODING_AGENT_DIR` öncelikli; göreli değer reddedilir) | `prime-models.json` | yok — geri döngü yer tutucusu | +| `raycast` | `~/.config/raycast/ai/providers.yaml`, macOS ve Windows'ta aynı (Raycast `XDG_CONFIG_HOME` değerini dikkate almaz) | `raycast-providers.yaml` | yok — yalnızca geri döngü, `api_keys` girdisi yazılmaz | + +Raycast dışa aktarımı, `providers` dizisinde tek bir `id: opencodex` öğesi içeren bağımsız +bir `providers.yaml` belgesidir: `name: OpenCodex`, proxy'nin `/v1` temel URL'si ve +`abilities` alanıyla birlikte yönlendirilen her model (`tools` ve `system_message` her +zaman destekli, `vision` kataloğun giriş modalitelerinden, `reasoning_effort` modelin bir +çaba merdiveni varsa, `temperature` akıl yürütme modelleri için kapalı). Özel sağlayıcılar +bir Raycast Pro özelliğidir ve Raycast dosyayı izlediği için kaydedilen bir değişiklik +yeniden başlatma gerekmeden etkili olur. Format +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers) +adresinde belgelenmiştir. Hiçbir `api_keys` girdisi yazılmaz; bu yüzden bu dışa aktarım +yalnızca geri döngü içindir ve geri döngü dışı bir bağlama reddedilir. opencode `{env:OPENCODEX_OPENCODE_API_KEY}` değerini enterpole eder. Üretilen Pi ve OMP dışa aktarımları bir ortam değişkeni gerektirmez: her biri değişmez diff --git a/docs-site/src/content/docs/zh-cn/reference/cli/agents.md b/docs-site/src/content/docs/zh-cn/reference/cli/agents.md index 11e1c38ee1..89203420e9 100644 --- a/docs-site/src/content/docs/zh-cn/reference/cli/agents.md +++ b/docs-site/src/content/docs/zh-cn/reference/cli/agents.md @@ -132,7 +132,7 @@ ocx claude desktop import [--apply] Validate and import JSON ## Client config export -### `ocx export --client ` +### `ocx export --client ` 输出连接到正在运行代理的客户端配置。此命令会以所选客户端的原生格式序列化 `opencodex` provider 块,其中包含基础 URL、模型列表,以及该客户端适用的凭据引用或 `opencodex-loopback` 占位值。 @@ -140,7 +140,7 @@ ocx claude desktop import [--apply] Validate and import JSON | 标志 | 动作 | | --- | --- | -| `--client ` | 必需。选择客户端配置格式。 | +| `--client ` | 必需。选择客户端配置格式。 | | `--json` | 仅在 stdout 打印配置 JSON,这样重定向即可捕获字节级精确输出。包括 `--out` 写入提示在内的所有诊断信息都会输出到 stderr。 | | `--out ` | 将配置写入 ``。拒绝替换已存在的文件。 | | `--force` | 允许 `--out` 替换已存在的文件。 | @@ -167,6 +167,9 @@ ocx export --client opencode --out ~/opencodex-opencode.json | `mcode` | `~/.minimax/config.yaml` (设置后 `MINIMAX_DATA_DIR` 优先,其次是旧的 `MAVIS_DATA_DIR`;相对路径会被拒绝) | `mcode-config.yaml` | 无 — loopback placeholder | | `zcode` | `~/.zcode/v2/config.json` (设置后 `ZCODE_DATA_DIR` 优先;相对路径会被拒绝) | `config.json` | 无 — loopback placeholder | | `prime` | `~/.prime/agent/models.json` (设置后 `PRIME_AGENT_CODING_AGENT_DIR` 优先;相对路径会被拒绝) | `prime-models.json` | 无 — loopback placeholder | +| `raycast` | `~/.config/raycast/ai/providers.yaml`(macOS 与 Windows 相同;Raycast 不遵循 `XDG_CONFIG_HOME`) | `raycast-providers.yaml` | 无 — 仅限回环,不会写入 `api_keys` 条目 | + +Raycast 导出是一份独立的 `providers.yaml` 文档,在 `providers` 序列中只有一个 `id: opencodex` 元素:`name: OpenCodex`、代理的 `/v1` 基础 URL,以及每个已路由模型及其 `abilities`(`tools` 与 `system_message` 始终支持,`vision` 取自目录的输入模态,`reasoning_effort` 在模型有 effort 阶梯时设置,`temperature` 对推理模型关闭)。Custom Providers 是 Raycast Pro 功能,且 Raycast 会监视该文件,因此保存后的更改无需重启即可生效。格式见 [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers)。不会写入任何 `api_keys` 条目,所以该导出仅限回环,非回环绑定会被拒绝。 opencode 会插值 `{env:OPENCODEX_OPENCODE_API_KEY}`。opencodex 生成的 Pi 导出不需要环境变量,而是携带字面占位值 `opencodex-loopback`。这个值是必需的:Pi 在构建模型列表时会解析 `apiKey`,如果已有配置包含未设置的环境变量引用,它就会隐藏整个 provider。回环上的代理从不校验生成的占位值。 diff --git a/docs-site/src/content/docs/zh-tw/guides/integrations.md b/docs-site/src/content/docs/zh-tw/guides/integrations.md index 54751d5620..ebf2e6f0de 100644 --- a/docs-site/src/content/docs/zh-tw/guides/integrations.md +++ b/docs-site/src/content/docs/zh-tw/guides/integrations.md @@ -1,9 +1,9 @@ --- title: 整合 -description: 從儀表板把 opencodex 連接到 OpenCode、Pi、OMP、Hermes、OpenClaw、Kimi Code、Gajae Code、DeepSeek Harness 與 MiniMax Code——每個客戶端一個開關,每次寫入前都會先備份。 +description: 從儀表板把 opencodex 連接到 OpenCode、Pi、OMP、Hermes、OpenClaw、Kimi Code、Gajae Code、DeepSeek Harness、MiniMax Code 與 Raycast——每個客戶端一個開關,每次寫入前都會先備份。 --- -**整合(Integrations)** 分頁會把 opencodex 的 provider 區塊寫入客戶端自己的設定檔,也會把它移除。共有九個客戶端以這種方式運作,每個都有一個開關: +**整合(Integrations)** 分頁會把 opencodex 的 provider 區塊寫入客戶端自己的設定檔,也會把它移除。共有十個客戶端以這種方式運作,每個都有一個開關: | 客戶端 | 設定檔 | 格式 | 變更生效時機 | 憑證 | |---|---|---|---|---| @@ -16,6 +16,7 @@ description: 從儀表板把 opencodex 連接到 OpenCode、Pi、OMP、Hermes、 | Gajae Code | `~/.gjc/agent/models.yml` | YAML | 新 sessions,或當你開啟 `/model` 時 | `OPENCODEX_GAJAE_API_KEY` | | DeepSeek Harness (DSH) | `$DSH_HOME/settings.yaml`(預設 `~/.dsh/settings.yaml`) | YAML | 熱重載 | 非秘密的 loopback bearer 佔位符 | | MiniMax Code | `~/.minimax/config.yaml` | YAML | 新 sessions,或開啟模型選擇器後 | loopback 佔位符 | +| Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | 儲存後立即生效——Raycast 會監看該檔案 | 無——僅限 loopback | 受管理 DSH 支援的相容性下限是 **DSH 0.1.0-rc.6**。OpenCodex 只擁有 `llm-pi-ai.providers.opencodex`:Apply 與 Refresh 會取代該片段,Disable 只移除該片段, @@ -30,6 +31,22 @@ MiniMax Code 依序遵循 `MINIMAX_DATA_DIR`、`MAVIS_DATA_DIR`,最後才回 逐模型 context window 與 reasoning-effort 選項;未知能力會省略,而 MCode session 目前選取的 effort 不會被覆寫。 +Raycast 有兩個前提。Custom Providers 是 **Raycast Pro** 功能:免費方案下檔案仍會被寫入,但 +`ocx integration client status --client raycast` 與整合頁面會回報警告,因為 Raycast 不會讀取它。 +另外,Raycast 只有在你開啟一次 Raycast → Settings → AI → **Reveal Providers Config** 後才會建立 +`ai` 資料夾;opencodex 以該資料夾作為安裝訊號,在它存在之前都會回報客戶端尚未安裝。Raycast 在 +macOS 與 Windows 上同樣讀取 `~/.config/raycast/ai/providers.yaml`,且不遵循 `XDG_CONFIG_HOME`, +所以該路徑無法搬移。 + +受管理區塊是檔案 `providers` 序列中的單一元素 `id: opencodex`:`name: OpenCodex`、 +`base_url: http://:/v1`,以及每個路由模型及其 `abilities`——`tools` 與 +`system_message` 一律支援,`vision` 依目錄的輸入模態而定,`reasoning_effort` 在模型有 effort +階梯時設定,`temperature` 對推理模型關閉。檔案中的其他 provider 會被保留,停用只移除 OpenCodex +元素。檔案一儲存 Raycast 就會套用變更,不需重新啟動;模型會在 Raycast 的模型選擇器中歸在 +**OpenCodex** 群組下。該檔案沒有存放憑證的位置,因此此客戶端僅限 loopback:不會寫入任何 +`api_keys` 項目,非 loopback 的 bind 會被拒絕。格式說明見 +[manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers)。 + 路徑遵循客戶端自己的環境覆寫(environment override)。對 OMP 而言,`OMP_PROFILE` 以存在與否優先於 `PI_PROFILE`,即使明確為空也一樣。具名 profile 會把 `PI_CONFIG_DIR` 當作相對於使用者家目錄的目錄名稱,並忽略 `PI_CODING_AGENT_DIR`;沒有具名 profile 時,`PI_CODING_AGENT_DIR` 勝出。OMP 支援 provider 層級的 headers,但這個最初的整合刻意只支援 loopback;遠端 `x-opencodex-api-key` 的連線設定被延後。搬移過的 `HERMES_HOME`、`KIMI_CODE_HOME` 與 `XDG_CONFIG_HOME` 路徑同樣會被遵循,而非猜測。表格列出每個客戶端的預設值。 對原生 OpenAI 模型,產生的 OMP 區塊會選用其模型層級的 Responses API,保留圖片輸入與 reasoning-effort 控制。路由模型則維持 provider 的 Chat Completions 方言,讓它們既有的 adapters 保持相容。 @@ -52,7 +69,7 @@ opencodex 從自己的環境讀取這些變數。如果你的 gateway 以 profil - **Restore this point…** 會出現在較舊的操作上,或當檔案在那次操作之後有變更時。跨過這樣的變更做回復會再詢問一次,才覆蓋你的較新編輯——並且也會備份它們,所以那次的回復本身也可以復原。 - 每個客戶端保留十份備份。超過之後,最舊的快照檔案會被移除,其歷史列顯示為 **Backup expired**。 -停用只移除 opencodex 記錄為自己寫入的條目。如果你的檔案在我們寫入之後有變更,後續行為取決於我們自己的條目是否完好,以及檔案的格式。對於嚴格 JSON 設定檔(OpenCode、Pi),在我們的區塊**旁邊**進行的編輯——例如新增 MCP 伺服器或你自己的 provider——會顯示為**需要更新**:重新整理會在保留你的條目的前提下合併寫入,但格式可能會被正規化。例外情況是 JSON 無法精確重寫的內容——例如 `1e999` 這類非有限數字、重寫會被四捨五入的數字(極大的整數,或小到會塌縮成零的數字)、`-0`、同一個物件裡重複出現的鍵,或巢狀層數超過 1000 層——此時開關會鎖定,確保沒有任何值被悄悄改動或刪除。**OMP** 同樣不受旁邊編輯影響,但原因不同:它的 writer 只逐位元組修補自己的 `providers.opencodex` 範圍,檔案其餘部分從不會被重寫。至於其餘可以包含註解的格式(Hermes、OpenClaw、Kimi Code、Gajae Code、MiniMax Code——以整份文件寫出的 YAML、JSON5 與 TOML),或當我們自己的條目被編輯過時,開關會鎖定,停用會拒絕執行,而不是猜測哪些編輯是你的。 +停用只移除 opencodex 記錄為自己寫入的條目。如果你的檔案在我們寫入之後有變更,後續行為取決於我們自己的條目是否完好,以及檔案的格式。對於嚴格 JSON 設定檔(OpenCode、Pi),在我們的區塊**旁邊**進行的編輯——例如新增 MCP 伺服器或你自己的 provider——會顯示為**需要更新**:重新整理會在保留你的條目的前提下合併寫入,但格式可能會被正規化。例外情況是 JSON 無法精確重寫的內容——例如 `1e999` 這類非有限數字、重寫會被四捨五入的數字(極大的整數,或小到會塌縮成零的數字)、`-0`、同一個物件裡重複出現的鍵,或巢狀層數超過 1000 層——此時開關會鎖定,確保沒有任何值被悄悄改動或刪除。**OMP** 同樣不受旁邊編輯影響,但原因不同:它的 writer 只逐位元組修補自己的 `providers.opencodex` 範圍,檔案其餘部分從不會被重寫。至於其餘可以包含註解的格式(Hermes、OpenClaw、Kimi Code、Gajae Code、MiniMax Code、Raycast——以整份文件寫出的 YAML、JSON5 與 TOML),或當我們自己的條目被編輯過時,開關會鎖定,停用會拒絕執行,而不是猜測哪些編輯是你的。 ## 誠實的預期 @@ -98,9 +115,11 @@ ocx integration client enable --client mcode ocx mcode ``` -完成一次連接後,`ocx sync` 也會以目前的 context window 與 reasoning-effort 階梯更新 -OpenCodex 已擁有的 MCode 區塊。若區塊已刪除、遭外部修改、不安全或從未由 OpenCodex -建立,sync 會保持原檔不動;只有在你確定要重新連接時才再次執行 enable。 +完成一次連接後,`ocx sync` 與 `POST /api/sync` 會更新 OpenCodex 已擁有的 +MCode、Pi、Aside 與 Raycast 目錄。proxy 啟動也會更新已擁有的 Raycast 目錄。 +模型可見性、provider 或 preset 變更會更新 Pi、Aside 與 Raycast。若區塊已刪除、 +遭外部修改、不安全或由你手動移除,sync 會保持原檔不動;只有在你確定要重新 +連接時才再次執行 enable。 另一個 MiniMax 平台 CLI(`mmx`)不是檔案開關整合。其文字命令使用 MiniMax 的 Anthropic 相容端點,因此 OpenCodex 提供憑證隔離、僅限 loopback 的 launcher: diff --git a/docs-site/src/content/docs/zh-tw/reference/cli/agents.md b/docs-site/src/content/docs/zh-tw/reference/cli/agents.md index 497d2e4252..d04c099ebf 100644 --- a/docs-site/src/content/docs/zh-tw/reference/cli/agents.md +++ b/docs-site/src/content/docs/zh-tw/reference/cli/agents.md @@ -130,7 +130,7 @@ ocx claude desktop import [--apply] 驗證並匯入 JSON ## 客戶端設定匯出 -### `ocx export --client ` +### `ocx export --client ` 印出連接到執行中代理的客戶端設定。此指令會用所選客戶端的原生格式,序列化含有 base URL、模型清單,以及適用的環境變數參考或 loopback 佔位符的 `opencodex` provider 區塊。 @@ -138,7 +138,7 @@ ocx claude desktop import [--apply] 驗證並匯入 JSON | 旗標 | 動作 | | --- | --- | -| `--client ` | 必填。選擇客戶端設定格式。 | +| `--client ` | 必填。選擇客戶端設定格式。 | | `--json` | 僅在 stdout 印出設定 JSON,使重導向能擷取逐位元組輸出。所有診斷訊息(含 `--out` 寫入提示)皆送至 stderr。 | | `--out ` | 將設定寫入 ``。拒絕覆寫既有檔案。 | | `--force` | 允許 `--out` 覆寫既有檔案。 | @@ -165,6 +165,9 @@ ocx export --client opencode --out ~/opencodex-opencode.json | `mcode` | `~/.minimax/config.yaml` (設定後 `MINIMAX_DATA_DIR` 優先,其次為舊的 `MAVIS_DATA_DIR`;相對路徑會被拒絕) | `mcode-config.yaml` | 無——loopback 佔位符 | | `zcode` | `~/.zcode/v2/config.json` (設定後 `ZCODE_DATA_DIR` 優先;相對路徑會被拒絕) | `config.json` | 無——loopback 佔位符 | | `prime` | `~/.prime/agent/models.json` (設定後 `PRIME_AGENT_CODING_AGENT_DIR` 優先;相對路徑會被拒絕) | `prime-models.json` | 無——loopback 佔位符 | +| `raycast` | `~/.config/raycast/ai/providers.yaml`(macOS 與 Windows 相同;Raycast 不遵循 `XDG_CONFIG_HOME`) | `raycast-providers.yaml` | 無——僅限 loopback,不會寫入 `api_keys` 項目 | + +Raycast 匯出是一份獨立的 `providers.yaml` 文件,在 `providers` 序列中只有一個 `id: opencodex` 元素:`name: OpenCodex`、proxy 的 `/v1` base URL,以及每個路由模型及其 `abilities`(`tools` 與 `system_message` 一律支援,`vision` 依目錄的輸入模態而定,`reasoning_effort` 在模型有 effort 階梯時設定,`temperature` 對推理模型關閉)。Custom Providers 是 Raycast Pro 功能,且 Raycast 會監看該檔案,因此儲存後的變更不需重新啟動即可生效。格式說明見 [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers)。不會寫入任何 `api_keys` 項目,所以此匯出僅限 loopback,非 loopback 的 bind 會被拒絕。 opencode 會插值 `{env:OPENCODEX_OPENCODE_API_KEY}`。Pi 與 OMP 的匯出不需要環境變數, 而是帶有字面值 `opencodex-loopback`。DSH 匯出需要 DSH 0.1.0-rc.6 或更新版本,且只擁有 diff --git a/gui/public/provider-icons/README.md b/gui/public/provider-icons/README.md index 1fc7c57857..f5e64b568b 100644 --- a/gui/public/provider-icons/README.md +++ b/gui/public/provider-icons/README.md @@ -47,6 +47,16 @@ Export-client marks (used by the API tab's connect rows, not the provider list): on the web (`aside.com/favicon.svg` is a 404), so the shipping application is the first-party source. +- `raycast.svg` — fetched 2026-09-04 from + `https://fz1sd71lwhbqy6sh.public.blob.vercel-storage.com/press/images/logo/raycast-logo-dark.svg`, + the "Logo (dark)" download Raycast's own press kit (`raycast.com/press`) links. + `raycast.com/favicon.svg` and the other conventional paths are 404s, so the + press kit is the first-party source. Path data and the `#FF6363` fill are + verbatim; the fixed `width`/`height` are dropped in favour of the `viewBox`, + and the `` wrapper — a full-frame white `` the export tool left + behind — is removed because the path never leaves the frame and the rect + would read as a second ink to the mark tooling here. + - `minimax.svg` — fetched 2026-08-31 from `https://raw.githubusercontent.com/MiniMax-AI/MiniMax-01/main/figures/minimax.svg`, MiniMax's own symbol as committed in their own model repository. The API-docs @@ -135,6 +145,9 @@ Decisions that are not obvious from looking at the file: - `aside.svg` **is masked.** It already paints with `currentColor`, so it would follow the theme either way; masking keeps it consistent with the other silhouettes rather than depending on inherited color. +- `raycast.svg` **is not masked.** One ink, but that ink is #FF6363 — Raycast + red, the same case as `openai.svg` and `deepseek-harness.svg`. Legible on both + surfaces as an image. Both directions are enforced in `gui/tests/integration-marks.test.ts`, including a luminance check that fails any single-ink near-neutral mark left as an image. That diff --git a/gui/public/provider-icons/raycast.svg b/gui/public/provider-icons/raycast.svg new file mode 100644 index 0000000000..b6a40c7ba2 --- /dev/null +++ b/gui/public/provider-icons/raycast.svg @@ -0,0 +1,3 @@ + + + diff --git a/gui/src/app-routing.ts b/gui/src/app-routing.ts index bab41b1eee..c5971ffb6b 100644 --- a/gui/src/app-routing.ts +++ b/gui/src/app-routing.ts @@ -100,6 +100,7 @@ export const INTEGRATION_TAB_HASHES = [ "integrations/zcode", "integrations/prime", "integrations/aside", + "integrations/raycast", ] as const; export function hashBelongsToPage(rawHash: string, page: Page): boolean { diff --git a/gui/src/components/apikeys-workspace/client-config-clients.ts b/gui/src/components/apikeys-workspace/client-config-clients.ts index c7c42d3e56..afd4484551 100644 --- a/gui/src/components/apikeys-workspace/client-config-clients.ts +++ b/gui/src/components/apikeys-workspace/client-config-clients.ts @@ -8,7 +8,7 @@ * with EXPORT_CLIENT_IDS by hand; adding a client server-side renders no row * until this tuple changes. */ -export const CLIENTS = ["opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside"] as const; +export const CLIENTS = ["opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", "raycast"] as const; export type ExportClientId = (typeof CLIENTS)[number]; export const CLIENT_LABEL_KEYS = { @@ -24,6 +24,7 @@ export const CLIENT_LABEL_KEYS = { zcode: "api.clientConfig.clientZcode", prime: "api.clientConfig.clientPrime", aside: "api.clientConfig.clientAside", + raycast: "api.clientConfig.clientRaycast", } as const; /** @@ -70,6 +71,8 @@ export const CLIENT_MARKS: Partial> = { zcode: "/provider-icons/zcode.svg", prime: "/provider-icons/prime-agent.svg", aside: "/provider-icons/aside.svg", + // Raycast red (#FF6363) is the brand, so like `dsh` it stays an image. + raycast: "/provider-icons/raycast.svg", }; /** diff --git a/gui/src/components/integration-marks.ts b/gui/src/components/integration-marks.ts index e8786224ec..eca38510bd 100644 --- a/gui/src/components/integration-marks.ts +++ b/gui/src/components/integration-marks.ts @@ -57,6 +57,7 @@ export const INTEGRATION_MARKS: Record = { zcode: CLIENT_MARKS.zcode ?? null, prime: CLIENT_MARKS.prime ?? null, aside: CLIENT_MARKS.aside ?? null, + raycast: CLIENT_MARKS.raycast ?? null, }; /** diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 9086c9bf42..af5546775a 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -1093,6 +1093,7 @@ export const de: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Aside-Profile", "integrations.aside.profilesHint": "Wähle, welche Profile die ausgewählten Modelle erhalten. Das aktive Aside-Profil bleibt unverändert.", "integrations.aside.all": "Alle Profile synchronisieren", @@ -1252,6 +1253,10 @@ export const de: Record = { "integrations.semantics.zcode": "Verwaltet nur provider.opencodex in ~/.zcode/v2/config.json. Z.ai-Anmeldung und andere Provider bleiben unverändert. ZCode nach Änderungen neu starten.", "integrations.semantics.prime": "Verwaltet nur providers.opencodex in der models.json von Prime Agent — ~/.prime/agent, sofern PRIME_AGENT_CODING_AGENT_DIR sie nicht umleitet. Andere Provider und Modell-Overrides bleiben unverändert. Gilt für neue Sitzungen.", "integrations.semantics.aside": "Verwaltet nur providers.opencodex in der ~/.aside/u//models.json dieses Profils. Andere Provider bleiben unverändert. Beende Aside nach dem Anwenden vollständig und öffne es erneut.", + "integrations.semantics.raycast": "Fügt einen OpenCodex-Provider-Eintrag in die providers.yaml von Raycast ein, damit jedes geroutete Modell in der Modellauswahl von Raycast AI erscheint. Raycast Pro erforderlich.", + "integrations.raycast.proRequired": "Custom Providers ist eine Funktion von Raycast Pro. Die Datei wird geschrieben, aber Raycast ignoriert sie, bis ein Pro-Abonnement aktiv ist.", + "integrations.raycast.planUnknown": "Der Abonnementstatus von Raycast konnte nicht gelesen werden; Custom Providers erfordert Raycast Pro.", + "integrations.raycast.revealConfig": "Öffnen Sie Raycast → Einstellungen → AI und klicken Sie einmal auf „Reveal Providers Config“, damit der Providers-Ordner existiert.", "codexAuth.mainAccount": "Hauptkonto", "codexAuth.logLabel": "Log-Kennung", "codexAuth.codexApp": "Codex App", @@ -1580,6 +1585,7 @@ export const de: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "Konfiguration kopieren", "api.clientConfig.download": "Herunterladen", "api.clientConfig.loading": "Client-Konfiguration wird erstellt…", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 0d2f1d05d4..71bfd5e2c3 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -1600,6 +1600,7 @@ export const en = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Aside profiles", "integrations.aside.profilesHint": "Choose which profiles receive the selected models. Aside’s active profile stays unchanged.", "integrations.aside.all": "Sync all profiles", @@ -1799,6 +1800,10 @@ export const en = { "integrations.semantics.zcode": "Manages only provider.opencodex in ~/.zcode/v2/config.json. Your Z.ai login and other providers stay unchanged. Restart ZCode after changes.", "integrations.semantics.prime": "Manages only providers.opencodex in Prime Agent's models.json — ~/.prime/agent unless PRIME_AGENT_CODING_AGENT_DIR redirects it. Your other providers and model overrides stay unchanged. Applies to new sessions.", "integrations.semantics.aside": "Manages only providers.opencodex in this profile’s ~/.aside/u//models.json. Your other providers stay unchanged. Fully quit and reopen Aside after applying.", + "integrations.semantics.raycast": "Adds an OpenCodex provider entry to Raycast's providers.yaml so every routed model appears in the Raycast AI model picker. Raycast Pro required.", + "integrations.raycast.proRequired": "Custom Providers is a Raycast Pro feature. The file will be written, but Raycast ignores it until a Pro subscription is active.", + "integrations.raycast.planUnknown": "Could not read the Raycast subscription state; Custom Providers requires Raycast Pro.", + "integrations.raycast.revealConfig": "Open Raycast → Settings → AI and click Reveal Providers Config once so the providers folder exists.", "codexAuth.mainAccount": "Main Account", "codexAuth.logLabel": "Log label", "codexAuth.codexApp": "Codex App", @@ -2138,6 +2143,7 @@ export const en = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "Copy config", "api.clientConfig.download": "Download", "api.clientConfig.loading": "Building client config…", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index b6eb03f0b0..028e910bc3 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -1572,6 +1572,7 @@ export const fr: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Profils Aside", "integrations.aside.profilesHint": "Choisissez les profils qui recevront les modèles sélectionnés. Le profil actif dans Aside reste inchangé.", "integrations.aside.all": "Synchroniser tous les profils", @@ -1731,6 +1732,10 @@ export const fr: Record = { "integrations.semantics.zcode": "Gère uniquement provider.opencodex dans ~/.zcode/v2/config.json. Votre connexion Z.ai et les autres fournisseurs restent inchangés. Redémarrez ZCode après toute modification.", "integrations.semantics.prime": "Gère uniquement providers.opencodex dans le models.json de Prime Agent — ~/.prime/agent, sauf si PRIME_AGENT_CODING_AGENT_DIR le redirige. Vos autres fournisseurs et surcharges de modèles restent inchangés. S'applique aux nouvelles sessions.", "integrations.semantics.aside": "Gère uniquement providers.opencodex dans le fichier ~/.aside/u//models.json de ce profil. Vos autres fournisseurs restent inchangés. Quittez complètement Aside et relancez-le après application.", + "integrations.semantics.raycast": "Ajoute une entrée de fournisseur OpenCodex dans le providers.yaml de Raycast afin que chaque modèle routé apparaisse dans le sélecteur de modèles de Raycast AI. Raycast Pro requis.", + "integrations.raycast.proRequired": "Custom Providers est une fonctionnalité Raycast Pro. Le fichier sera écrit, mais Raycast l'ignore tant qu'un abonnement Pro n'est pas actif.", + "integrations.raycast.planUnknown": "Impossible de lire l'état de l'abonnement Raycast ; Custom Providers nécessite Raycast Pro.", + "integrations.raycast.revealConfig": "Ouvrez Raycast → Réglages → AI et cliquez une fois sur « Reveal Providers Config » pour que le dossier des fournisseurs existe.", "codexAuth.mainAccount": "Compte principal", "codexAuth.logLabel": "Libellé du journal", "codexAuth.codexApp": "Application Codex", @@ -2057,6 +2062,7 @@ export const fr: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "Copier la configuration", "api.clientConfig.download": "Télécharger", "api.clientConfig.loading": "Génération de la configuration du client…", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 4b16912324..864b498483 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -1513,6 +1513,7 @@ export const ja: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Asideのプロファイル", "integrations.aside.profilesHint": "選択したモデルを同期するプロファイルを選んでください。Asideで使用中のプロファイルは変わりません。", "integrations.aside.all": "すべてのプロファイルを同期", @@ -1672,6 +1673,10 @@ export const ja: Record = { "integrations.semantics.zcode": "~/.zcode/v2/config.json の provider.opencodex のみを管理します。Z.ai ログインと他のプロバイダーは変更しません。変更後は ZCode を再起動してください。", "integrations.semantics.prime": "Prime Agent の models.json 内の providers.opencodex のみを管理します。場所は ~/.prime/agent ですが、PRIME_AGENT_CODING_AGENT_DIR が設定されている場合はそちらが優先されます。他のプロバイダーとモデルオーバーライドは変更しません。新しいセッションから適用されます。", "integrations.semantics.aside": "このプロファイルの ~/.aside/u//models.json 内の providers.opencodex のみを管理します。他のプロバイダーは変更しません。適用後は Aside を完全に終了してから開き直してください。", + "integrations.semantics.raycast": "Raycast の providers.yaml に OpenCodex のプロバイダーエントリを追加し、ルーティングされたすべてのモデルを Raycast AI のモデル選択に表示します。Raycast Pro が必要です。", + "integrations.raycast.proRequired": "Custom Providers は Raycast Pro の機能です。ファイルは書き込まれますが、Pro サブスクリプションが有効になるまで Raycast はこれを無視します。", + "integrations.raycast.planUnknown": "Raycast のサブスクリプション状態を読み取れませんでした。Custom Providers には Raycast Pro が必要です。", + "integrations.raycast.revealConfig": "Raycast → 設定 → AI を開き、「Reveal Providers Config」を一度クリックして providers フォルダを作成してください。", "codexAuth.mainAccount": "メインアカウント", "codexAuth.logLabel": "ログラベル", "codexAuth.codexApp": "Codex App", @@ -2005,6 +2010,7 @@ export const ja: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "設定をコピー", "api.clientConfig.download": "ダウンロード", "api.clientConfig.loading": "クライアント設定を生成中…", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index a87bf608e5..364805943e 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -1117,6 +1117,7 @@ export const ko: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Aside 프로필", "integrations.aside.profilesHint": "선택한 모델을 동기화할 프로필을 고르세요. Aside에서 사용 중인 프로필은 바뀌지 않습니다.", "integrations.aside.all": "모든 프로필 동기화", @@ -1276,6 +1277,10 @@ export const ko: Record = { "integrations.semantics.zcode": "~/.zcode/v2/config.json의 provider.opencodex만 관리하며 Z.ai 로그인과 다른 프로바이더는 변경하지 않습니다. 변경 후 ZCode를 재시작하세요.", "integrations.semantics.prime": "Prime Agent의 models.json에서 providers.opencodex만 관리합니다. 위치는 ~/.prime/agent이며 PRIME_AGENT_CODING_AGENT_DIR가 설정되면 그쪽이 우선합니다. 다른 프로바이더와 모델 오버라이드는 변경하지 않습니다. 새 세션부터 적용됩니다.", "integrations.semantics.aside": "이 프로필의 ~/.aside/u//models.json에서 providers.opencodex만 관리합니다. 다른 프로바이더는 그대로 유지됩니다. 적용 후 Aside를 완전히 종료하고 다시 여세요.", + "integrations.semantics.raycast": "Raycast의 providers.yaml에 OpenCodex 프로바이더 항목을 추가해 라우팅된 모든 모델이 Raycast AI 모델 선택기에 표시되도록 합니다. Raycast Pro가 필요합니다.", + "integrations.raycast.proRequired": "Custom Providers는 Raycast Pro 기능입니다. 파일은 기록되지만 Pro 구독이 활성화될 때까지 Raycast는 이를 무시합니다.", + "integrations.raycast.planUnknown": "Raycast 구독 상태를 읽을 수 없습니다. Custom Providers에는 Raycast Pro가 필요합니다.", + "integrations.raycast.revealConfig": "Raycast → 설정 → AI를 열고 「Reveal Providers Config」를 한 번 클릭해 providers 폴더를 만드세요.", "codexAuth.mainAccount": "메인 계정", "codexAuth.logLabel": "로그 라벨", "codexAuth.codexApp": "Codex App", @@ -1607,6 +1612,7 @@ export const ko: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "설정 복사", "api.clientConfig.download": "다운로드", "api.clientConfig.loading": "클라이언트 설정 생성 중…", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 70eb364002..bfd6e0182e 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -1583,6 +1583,7 @@ export const ru: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Профили Aside", "integrations.aside.profilesHint": "Выберите профили, в которые будут добавлены выбранные модели. Активный профиль Aside не изменится.", "integrations.aside.all": "Синхронизировать все профили", @@ -1742,6 +1743,10 @@ export const ru: Record = { "integrations.semantics.zcode": "Управляет только provider.opencodex в ~/.zcode/v2/config.json. Вход Z.ai и другие провайдеры не меняются. Перезапустите ZCode после изменений.", "integrations.semantics.prime": "Управляет только providers.opencodex в models.json Prime Agent — ~/.prime/agent, если PRIME_AGENT_CODING_AGENT_DIR не переопределяет путь. Другие провайдеры и переопределения моделей не меняются. Применяется к новым сессиям.", "integrations.semantics.aside": "Управляет только providers.opencodex в файле ~/.aside/u//models.json этого профиля. Другие провайдеры остаются без изменений. После применения полностью закройте и снова откройте Aside.", + "integrations.semantics.raycast": "Добавляет запись провайдера OpenCodex в providers.yaml Raycast, чтобы каждая маршрутизируемая модель появилась в выборе моделей Raycast AI. Требуется Raycast Pro.", + "integrations.raycast.proRequired": "Custom Providers — функция Raycast Pro. Файл будет записан, но Raycast игнорирует его, пока не активна подписка Pro.", + "integrations.raycast.planUnknown": "Не удалось прочитать состояние подписки Raycast; для Custom Providers требуется Raycast Pro.", + "integrations.raycast.revealConfig": "Откройте Raycast → Настройки → AI и один раз нажмите «Reveal Providers Config», чтобы папка провайдеров появилась.", "codexAuth.mainAccount": "Основной аккаунт", "codexAuth.logLabel": "Метка журнала", "codexAuth.codexApp": "Codex App", @@ -2075,6 +2080,7 @@ export const ru: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "Копировать конфигурацию", "api.clientConfig.download": "Скачать", "api.clientConfig.loading": "Формируется конфигурация клиента…", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index ca233f452e..83ad09002b 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -1590,6 +1590,7 @@ export const tr: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Aside profilleri", "integrations.aside.profilesHint": "Seçili modellerin hangi profillere aktarılacağını seçin. Aside’ın etkin profili değişmez.", "integrations.aside.all": "Tüm profilleri eşitle", @@ -1748,6 +1749,10 @@ export const tr: Record = { "integrations.semantics.zcode": "Yalnızca ~/.zcode/v2/config.json içindeki provider.opencodex bölümünü yönetir. Z.ai oturumu ve diğer sağlayıcılar değişmez. Değişikliklerden sonra ZCode'u yeniden başlatın.", "integrations.semantics.prime": "Yalnızca Prime Agent'ın models.json dosyasındaki providers.opencodex bölümünü yönetir — PRIME_AGENT_CODING_AGENT_DIR ayarlı değilse ~/.prime/agent. Diğer sağlayıcılar ve model geçersiz kılmaları değişmez. Yeni oturumlarda geçerli olur.", "integrations.semantics.aside": "Yalnızca bu profilin ~/.aside/u//models.json dosyasındaki providers.opencodex bölümünü yönetir. Diğer sağlayıcılarınız değişmez. Uyguladıktan sonra Aside’ı tamamen kapatıp yeniden açın.", + "integrations.semantics.raycast": "Raycast'in providers.yaml dosyasına bir OpenCodex sağlayıcı girdisi ekler; böylece yönlendirilen her model Raycast AI model seçicisinde görünür. Raycast Pro gerekir.", + "integrations.raycast.proRequired": "Custom Providers bir Raycast Pro özelliğidir. Dosya yazılır, ancak bir Pro aboneliği etkin olana kadar Raycast bunu yok sayar.", + "integrations.raycast.planUnknown": "Raycast abonelik durumu okunamadı; Custom Providers için Raycast Pro gerekir.", + "integrations.raycast.revealConfig": "Raycast → Ayarlar → AI bölümünü açıp sağlayıcı klasörünün oluşması için „Reveal Providers Config“ seçeneğine bir kez tıklayın.", "integrations.semantics.omp": "Kataloğu yüklemek için OMP'yi yeniden başlatın.", "codexAuth.mainAccount": "Ana Hesap", "codexAuth.logLabel": "Günlük etiketi", @@ -2082,6 +2087,7 @@ export const tr: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "JSON Kopyala", "api.clientConfig.download": "İndir", "api.clientConfig.loading": "İstemci konfigürasyonu oluşturuluyor…", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 2b7e6ac6ba..4e137ebdd6 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2178,6 +2178,7 @@ export const zhTW: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Aside 設定檔", "integrations.aside.profilesHint": "選擇要接收所選模型的設定檔。Aside 目前使用的設定檔不會改變。", "integrations.aside.all": "同步所有設定檔", @@ -2337,6 +2338,10 @@ export const zhTW: Record = { "integrations.semantics.zcode": "僅管理 ~/.zcode/v2/config.json 中的 provider.opencodex,不會變更 Z.ai 登入狀態或其他供應商。變更後請重新啟動 ZCode。", "integrations.semantics.prime": "僅管理 Prime Agent 的 models.json 中的 providers.opencodex;預設位於 ~/.prime/agent,若設定 PRIME_AGENT_CODING_AGENT_DIR 則以其為準。不會變更其他供應商或模型覆寫設定。對新工作階段生效。", "integrations.semantics.aside": "僅管理此設定檔的 ~/.aside/u//models.json 中的 providers.opencodex。其他供應商維持不變。套用後請完全結束並重新開啟 Aside。", + "integrations.semantics.raycast": "在 Raycast 的 providers.yaml 中新增一個 OpenCodex 供應商項目,讓所有已路由的模型出現在 Raycast AI 模型選擇器中。需要 Raycast Pro。", + "integrations.raycast.proRequired": "Custom Providers 是 Raycast Pro 功能。檔案會被寫入,但在 Pro 訂閱生效之前 Raycast 會忽略它。", + "integrations.raycast.planUnknown": "無法讀取 Raycast 訂閱狀態;Custom Providers 需要 Raycast Pro。", + "integrations.raycast.revealConfig": "開啟 Raycast → 設定 → AI,點一次「Reveal Providers Config」,以便建立 providers 資料夾。", "codexAuth.pinned": "已固定", "codexAuth.pinnedHint": "你手動選取了此帳號,因此較高的選擇順序不會越過它。此固定會持續到該帳號用盡、你改選其他帳號,或你變更任一選擇順序為止。", "codexAuth.requestUserInput": "在 Default 模式中要求輸入", @@ -2378,6 +2383,7 @@ export const zhTW: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "cws.tabsLabel": "Combo 詳細區段", "cws.field.nativeAlias": "原生 OpenAI 別名", "cws.field.nativeAliasHint": "讓此 combo 擁有受支援的未限定原生 OpenAI 模型 ID。帶有帳號或供應商限定的 OpenAI 路由仍保持獨立。", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 42ac3941d4..67400eaaea 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -1110,6 +1110,7 @@ export const zh: Record = { "integrations.tab.zcode": "ZCode", "integrations.tab.prime": "Prime Agent", "integrations.tab.aside": "Aside", + "integrations.tab.raycast": "Raycast", "integrations.aside.profilesTitle": "Aside 配置文件", "integrations.aside.profilesHint": "选择要接收所选模型的配置文件。Aside 当前使用的配置文件不会改变。", "integrations.aside.all": "同步所有配置文件", @@ -1269,6 +1270,10 @@ export const zh: Record = { "integrations.semantics.zcode": "仅管理 ~/.zcode/v2/config.json 中的 provider.opencodex,不会更改 Z.ai 登录状态或其他提供商。更改后请重启 ZCode。", "integrations.semantics.prime": "仅管理 Prime Agent 的 models.json 中的 providers.opencodex;默认位于 ~/.prime/agent,若设置 PRIME_AGENT_CODING_AGENT_DIR 则以其为准。不会更改其他提供商或模型覆盖设置。对新会话生效。", "integrations.semantics.aside": "仅管理此配置文件的 ~/.aside/u//models.json 中的 providers.opencodex。其他提供商保持不变。应用后请完全退出并重新打开 Aside。", + "integrations.semantics.raycast": "在 Raycast 的 providers.yaml 中添加一个 OpenCodex 提供商条目,让所有已路由的模型出现在 Raycast AI 模型选择器中。需要 Raycast Pro。", + "integrations.raycast.proRequired": "Custom Providers 是 Raycast Pro 功能。文件会被写入,但在 Pro 订阅生效之前 Raycast 会忽略它。", + "integrations.raycast.planUnknown": "无法读取 Raycast 订阅状态;Custom Providers 需要 Raycast Pro。", + "integrations.raycast.revealConfig": "打开 Raycast → 设置 → AI,点击一次“Reveal Providers Config”,以便创建 providers 文件夹。", "codexAuth.mainAccount": "主账号", "codexAuth.logLabel": "日志标签", "codexAuth.codexApp": "Codex App", @@ -1600,6 +1605,7 @@ export const zh: Record = { "api.clientConfig.clientZcode": "ZCode", "api.clientConfig.clientPrime": "Prime Agent", "api.clientConfig.clientAside": "Aside", + "api.clientConfig.clientRaycast": "Raycast", "api.clientConfig.copy": "复制配置", "api.clientConfig.download": "下载", "api.clientConfig.loading": "正在生成客户端配置…", diff --git a/gui/src/pages/integrations/FileIntegrationPage.tsx b/gui/src/pages/integrations/FileIntegrationPage.tsx index 51db75bd9f..2eef2c5cf0 100644 --- a/gui/src/pages/integrations/FileIntegrationPage.tsx +++ b/gui/src/pages/integrations/FileIntegrationPage.tsx @@ -8,6 +8,7 @@ import { markFor } from "../../components/integration-marks"; import IntegrationStateBadge from "./IntegrationStateBadge"; import ConsequenceDialog, { type ConsequenceCopy } from "./ConsequenceDialog"; import RestoreDialog from "./RestoreDialog"; +import RaycastPlanNotice from "./RaycastPlanNotice"; import { RollbackHistory } from "./RollbackHistory"; import { describeRefusal } from "./refusal-copy"; import { @@ -57,6 +58,7 @@ const SEMANTICS_KEY: Record = { zcode: "integrations.semantics.zcode", prime: "integrations.semantics.prime", aside: "integrations.semantics.aside", + raycast: "integrations.semantics.raycast", }; const TAB_LABEL_KEY: Record = { @@ -72,6 +74,7 @@ const TAB_LABEL_KEY: Record = { zcode: "integrations.tab.zcode", prime: "integrations.tab.prime", aside: "integrations.tab.aside", + raycast: "integrations.tab.raycast", }; export default function FileIntegrationPage({ @@ -261,6 +264,8 @@ export default function FileIntegrationPage({

{t(SEMANTICS_KEY[client])}

{status.configPath}

+ {/* Only the raycast envelope carries this; the guard is the field, not the id. */} + {status.raycast && } {status.appliedAt && (

diff --git a/gui/src/pages/integrations/RaycastPlanNotice.tsx b/gui/src/pages/integrations/RaycastPlanNotice.tsx new file mode 100644 index 0000000000..9f08446751 --- /dev/null +++ b/gui/src/pages/integrations/RaycastPlanNotice.tsx @@ -0,0 +1,32 @@ +import { useT } from "../../i18n/shared"; +import { Notice } from "../../ui"; +import type { RaycastInstall } from "./integration-api"; + +/* + * Raycast is the one file client whose `current` state can still mean + * "ignored": Custom Providers is a Pro feature, and the file is read from a + * folder Raycast only creates after a click in its own settings. Neither fact + * is a reason to refuse the write -- the user may be about to subscribe, or + * has already clicked and the folder is seconds old -- so the page writes and + * says so here instead of showing a green badge that overstates the result. + * + * `free` is a warning because it is a known blocker; `unknown` stays muted + * because on Linux and Windows there is no subscription signal to read, and a + * Pro user there must not be told they are not one. + */ +export default function RaycastPlanNotice({ install }: { install: RaycastInstall }) { + const t = useT(); + return ( + <> + {install.plan === "free" && ( + {t("integrations.raycast.proRequired")} + )} + {install.plan === "unknown" && ( +

{t("integrations.raycast.planUnknown")}

+ )} + {!install.aiDirPresent && ( +

{t("integrations.raycast.revealConfig")}

+ )} + + ); +} diff --git a/gui/src/pages/integrations/integration-api.ts b/gui/src/pages/integrations/integration-api.ts index 7a9139f436..38b0e0fe89 100644 --- a/gui/src/pages/integrations/integration-api.ts +++ b/gui/src/pages/integrations/integration-api.ts @@ -14,6 +14,7 @@ export const FILE_INTEGRATION_CLIENTS = [ "zcode", "prime", "aside", + "raycast", ] as const; export type FileIntegrationClientId = (typeof FILE_INTEGRATION_CLIENTS)[number]; @@ -36,6 +37,19 @@ export type IntegrationRefusalReason = | "snapshot_expired" | "write_failed"; +export type RaycastPlan = "pro" | "free" | "unknown"; + +/** + * Raycast's app-side facts, sent only on `/api/client-integrations/raycast`. + * Custom Providers is a Pro feature, so a `current` file can still be one + * Raycast ignores — this is what lets the page say so instead of showing green. + */ +export interface RaycastInstall { + plan: RaycastPlan; + appPath: string | null; + aiDirPresent: boolean; +} + export interface IntegrationStatus { clientId: FileIntegrationClientId; state: IntegrationState; @@ -49,6 +63,7 @@ export interface IntegrationStatus { /** Aside's explicit account-backed profile scope and desired sync state. */ profileId?: number; enabled?: boolean; + raycast?: RaycastInstall; } export interface IntegrationStateListEnvelope { diff --git a/gui/src/pages/integrations/integration-tabs.ts b/gui/src/pages/integrations/integration-tabs.ts index 33c4f04358..99502bde87 100644 --- a/gui/src/pages/integrations/integration-tabs.ts +++ b/gui/src/pages/integrations/integration-tabs.ts @@ -46,6 +46,7 @@ export const TABS: readonly TabDefinition[] = [ { id: "zcode", hash: "integrations/zcode", labelKey: "integrations.tab.zcode" }, { id: "prime", hash: "integrations/prime", labelKey: "integrations.tab.prime" }, { id: "aside", hash: "integrations/aside", labelKey: "integrations.tab.aside" }, + { id: "raycast", hash: "integrations/raycast", labelKey: "integrations.tab.raycast" }, ] as const; export const FILE_CLIENTS = new Set([ @@ -61,4 +62,5 @@ export const FILE_CLIENTS = new Set([ "zcode", "prime", "aside", + "raycast", ]); diff --git a/gui/src/pages/integrations/overview-clients.ts b/gui/src/pages/integrations/overview-clients.ts index 4dd347b90c..7932cf5648 100644 --- a/gui/src/pages/integrations/overview-clients.ts +++ b/gui/src/pages/integrations/overview-clients.ts @@ -152,6 +152,7 @@ const FILE_LABEL_KEY: Record = { zcode: "integrations.tab.zcode", prime: "integrations.tab.prime", aside: "integrations.tab.aside", + raycast: "integrations.tab.raycast", }; /** A file client's block is in the file for both `current` and `stale`. */ diff --git a/gui/tests/client-config-panel.test.tsx b/gui/tests/client-config-panel.test.tsx index 8acc44e9ee..ea8210e7e4 100644 --- a/gui/tests/client-config-panel.test.tsx +++ b/gui/tests/client-config-panel.test.tsx @@ -170,8 +170,8 @@ function rowButton(container: HTMLElement, name: string, label: string): HTMLBut .find(el => el.textContent?.trim() === label)!; } -test("the API download surface includes DSH, MiniMax Code and Aside as clients", () => { - expect(CLIENTS).toEqual(["opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside"]); +test("the API download surface includes DSH, MiniMax Code, Aside and Raycast as clients", () => { + expect(CLIENTS).toEqual(["opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", "raycast"]); expect(CLIENT_LABEL_KEYS.dsh).toBe("api.clientConfig.clientDsh"); expect(CLIENT_LABEL_KEYS.mcode).toBe("api.clientConfig.clientMcode"); expect(CLIENT_LABEL_KEYS.zcode).toBe("api.clientConfig.clientZcode"); diff --git a/gui/tests/fr-localization.test.ts b/gui/tests/fr-localization.test.ts index 221de55d00..8c1ca29ada 100644 --- a/gui/tests/fr-localization.test.ts +++ b/gui/tests/fr-localization.test.ts @@ -118,6 +118,8 @@ const INTENTIONAL_ENGLISH = new Set([ "api.clientConfig.clientPrime", "integrations.tab.aside", "api.clientConfig.clientAside", + "integrations.tab.raycast", + "api.clientConfig.clientRaycast", "models.reasoningEffort.minimal", "models.reasoningEffort.max", "pws.pacingRpmUnit", diff --git a/gui/tests/integration-marks.test.ts b/gui/tests/integration-marks.test.ts index b964bc4ce1..b13387d1b6 100644 --- a/gui/tests/integration-marks.test.ts +++ b/gui/tests/integration-marks.test.ts @@ -61,15 +61,16 @@ test("no multi-color asset is masked", () => { /* * The inverse rule, and the one that cannot be derived from the file: a mark may * be a single ink and still not be a masking candidate, because that ink is the - * brand. openai.svg is #10A37F and deepseek-harness.svg is #4d6bfe; masking - * either repaints a trademark in the theme's text color. Pinned with their inks - * so a vendor changing its asset shows up here rather than silently satisfying - * the assertion. + * brand. openai.svg is #10A37F, deepseek-harness.svg is #4d6bfe and raycast.svg + * is #FF6363; masking any of them repaints a trademark in the theme's text + * color. Pinned with their inks so a vendor changing its asset shows up here + * rather than silently satisfying the assertion. */ test("a single-ink asset whose ink is a brand color is not masked", () => { for (const [src, ink] of [ ["/provider-icons/openai.svg", "#10a37f"], ["/provider-icons/deepseek-harness.svg", "#4d6bfe"], + ["/provider-icons/raycast.svg", "#ff6363"], ] as const) { expect(MASKED_MARKS.has(src), `${src} must not be masked`).toBe(false); expect([...inksOf(bodyOf(src))], `${src} ink changed upstream`).toEqual([ink]); diff --git a/gui/tests/integrations-api.test.ts b/gui/tests/integrations-api.test.ts index 4338d9ead8..eea7dcfa0c 100644 --- a/gui/tests/integrations-api.test.ts +++ b/gui/tests/integrations-api.test.ts @@ -16,9 +16,9 @@ import { const originalFetch = globalThis.fetch; -test("DSH and Aside are file integration clients", () => { +test("DSH, Aside and Raycast are file integration clients", () => { expect(FILE_INTEGRATION_CLIENTS).toEqual([ - "opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", + "opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", "raycast", ]); }); diff --git a/gui/tests/integrations-overview-rows.test.ts b/gui/tests/integrations-overview-rows.test.ts index 5bd673f849..54809a4422 100644 --- a/gui/tests/integrations-overview-rows.test.ts +++ b/gui/tests/integrations-overview-rows.test.ts @@ -290,12 +290,17 @@ test("every client counts toward the summary, not just the file clients", () => test("an unsettled file list renders unknown rows instead of dropping them", () => { const built = buildOverviewRows(sources({ clients: [], clientsSettled: false })); - expect(built.rows).toHaveLength(17); + expect(built.rows).toHaveLength(18); expect(rowById(built, "omp").state).toBe("unknown"); expect(rowById(built, "mcode").state).toBe("unknown"); expect(rowById(built, "zcode").state).toBe("unknown"); expect(rowById(built, "prime").state).toBe("unknown"); expect(rowById(built, "aside").state).toBe("unknown"); + expect(rowById(built, "raycast")).toMatchObject({ + hash: "integrations/raycast", + labelKey: "integrations.tab.raycast", + state: "unknown", + }); expect(rowById(built, "kimi").state).toBe("unknown"); expect(rowById(built, "dsh")).toMatchObject({ hash: "integrations/dsh", diff --git a/gui/tests/locale-parity.test.ts b/gui/tests/locale-parity.test.ts index 11976154c9..5ea6785493 100644 --- a/gui/tests/locale-parity.test.ts +++ b/gui/tests/locale-parity.test.ts @@ -130,6 +130,8 @@ const ZH_TW_KEEP_ENGLISH: ReadonlySet = new Set([ "api.clientConfig.clientPrime", "integrations.tab.aside", "api.clientConfig.clientAside", + "integrations.tab.raycast", + "api.clientConfig.clientRaycast", "integrations.codex.title", // Provider proper nouns kept in English "provider.name.commandCodeAuth", diff --git a/gui/tests/raycast-plan-notice.test.tsx b/gui/tests/raycast-plan-notice.test.tsx new file mode 100644 index 0000000000..4a8d44a77d --- /dev/null +++ b/gui/tests/raycast-plan-notice.test.tsx @@ -0,0 +1,51 @@ +import { expect, test } from "bun:test"; +import { createElement } from "react"; +import { renderToStaticMarkup } from "react-dom/server"; +import { I18nContext, type TFn } from "../src/i18n/shared"; +import RaycastPlanNotice from "../src/pages/integrations/RaycastPlanNotice"; +import type { RaycastInstall } from "../src/pages/integrations/integration-api"; + +/* + * Raycast reads providers.yaml only on a Pro plan and only from a folder it + * creates itself, so a `current` badge can be a lie. The notice is the one place + * that lie is corrected, and each of its three lines answers a different + * question; a regression that drops one leaves the page green and silent. + */ + +const echoT: TFn = key => key; + +function render(install: RaycastInstall): string { + return renderToStaticMarkup( + createElement( + I18nContext.Provider, + { value: { locale: "en", setLocale: () => {}, t: echoT } }, + createElement(RaycastPlanNotice, { install }), + ), + ); +} + +test("a Pro install with the ai folder renders nothing", () => { + expect(render({ plan: "pro", appPath: "/Applications/Raycast.app", aiDirPresent: true })).toBe(""); +}); + +test("a free plan is a warning notice, never a refusal", () => { + const markup = render({ plan: "free", appPath: "/Applications/Raycast.app", aiDirPresent: true }); + expect(markup).toContain("notice-warn"); + expect(markup).toContain("integrations.raycast.proRequired"); + expect(markup).not.toContain("notice-err"); + expect(markup).not.toContain("integrations.raycast.planUnknown"); +}); + +test("an unreadable plan stays muted, because non-macOS hosts have no signal", () => { + const markup = render({ plan: "unknown", appPath: null, aiDirPresent: true }); + expect(markup).toContain('data-raycast-plan="unknown"'); + expect(markup).toContain("integrations.raycast.planUnknown"); + expect(markup).not.toContain("notice-warn"); +}); + +test("a missing ai folder adds the reveal hint independently of the plan", () => { + const markup = render({ plan: "free", appPath: "/Applications/Raycast.app", aiDirPresent: false }); + expect(markup).toContain("integrations.raycast.proRequired"); + expect(markup).toContain('data-raycast-ai-dir="absent"'); + expect(markup).toContain("integrations.raycast.revealConfig"); +}); diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json index d309073a3f..753b896416 100644 --- a/scripts/test-layout/layout.json +++ b/scripts/test-layout/layout.json @@ -690,6 +690,7 @@ "install-scripts.test.ts": "ci-workflows", "integrations-invariants.test.ts": "gui", "integrations-journal.test.ts": "clients", + "integrations-merge.test.ts": "clients", "integrations-serialize.test.ts": "clients", "integrations-state.test.ts": "clients", "integrations-writer.test.ts": "clients", @@ -998,6 +999,8 @@ "reserve-quota-scope.test.ts": "codex-integration", "rate-limit-reset-credits.test.ts": "gui", "rate-limit-retry.test.ts": "providers", + "raycast-client.test.ts": "clients", + "raycast-detect.test.ts": "clients", "reasoning-effort.test.ts": "codex-integration", "reasoning-replay-identity.test.ts": "adapters", "reasoning-replay-robustness.test.ts": "adapters", diff --git a/src/cli/dispatch.ts b/src/cli/dispatch.ts index 6d018536c7..c884bb2e5d 100644 --- a/src/cli/dispatch.ts +++ b/src/cli/dispatch.ts @@ -403,7 +403,7 @@ const commandRunners: Record = { }, config, port: live.port, - }, ["mcode", "pi"])); + }, ["mcode", "pi", "raycast"])); } catch (error) { console.warn(`Client integrations were not refreshed: ${error instanceof Error ? error.message : String(error)}`); } diff --git a/src/cli/help.ts b/src/cli/help.ts index 0b3652ab59..0cd6bec4dc 100644 --- a/src/cli/help.ts +++ b/src/cli/help.ts @@ -77,7 +77,7 @@ Usage: ocx memory [--json] Alias of ocx observe memory ocx api-key Alias of ocx access key ocx access External API keys and endpoint information - ocx export --client Print a client config wired to the running proxy (12 clients) + ocx export --client Print a client config wired to the running proxy (13 clients) ocx integration client Enable, disable, inspect or roll back a client integration ocx grok Grok Build model selection and apply ocx system Runtime settings, startup, sync, OpenCodex updates, and Codex CLI inspection diff --git a/src/cli/index.ts b/src/cli/index.ts index 7b863630b9..9d9f08951c 100755 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -92,6 +92,15 @@ import { grokSyncFailureMessage, reconcileEnsureDesiredIntegrations, } from "./ensure-desired-integrations"; +import { refreshOwnedCatalogIntegrations } from "../integrations/catalog-refresh"; +import { loadExportModels } from "../server/management/model-rows"; + +import { removeOwnedConfigAfterDesktopCleanup } from "./uninstall-client-state"; +import { withProcessRuntimeProvenance } from "../lib/bun-runtime"; +import { selfLaunchArgv } from "../lib/self-launch-argv"; +import { initializeNodeLauncherContext } from "./launcher-context"; +import { createLocalAttestationSecret } from "../lib/local-management-attestation"; +import { MEMORY_DRAIN_RESTART_MS, REPLACEMENT_READY_TIMEOUT_MS } from "../lib/system-restart-contract"; /** * A failed shell-hook reconcile is not cosmetic: a stale hook keeps sourcing @@ -105,13 +114,25 @@ function reportShellHookFailure(result: { state: "installed" | "absent" | "faile console.warn(" Check ~/.zshrc for the '# opencodex claude-env hook' block."); } - -import { removeOwnedConfigAfterDesktopCleanup } from "./uninstall-client-state"; -import { withProcessRuntimeProvenance } from "../lib/bun-runtime"; -import { selfLaunchArgv } from "../lib/self-launch-argv"; -import { initializeNodeLauncherContext } from "./launcher-context"; -import { createLocalAttestationSecret } from "../lib/local-management-attestation"; -import { MEMORY_DRAIN_RESTART_MS, REPLACEMENT_READY_TIMEOUT_MS } from "../lib/system-restart-contract"; +async function refreshOwnedRaycastCatalog( + config: ReturnType, + port: number, +): Promise { + try { + const outcomes = await refreshOwnedCatalogIntegrations({ + models: () => loadExportModels(config), + config, + port, + }, ["raycast"]); + for (const outcome of outcomes) { + if (!outcome.ok) { + console.error(`⚠️ Raycast integration was not refreshed: ${outcome.reason}`); + } + } + } catch (error) { + console.error(`⚠️ Raycast integration was not refreshed: ${error instanceof Error ? error.message : String(error)}`); + } +} initializeNodeLauncherContext(); @@ -493,6 +514,7 @@ async function handleStart(options: { block?: boolean } = {}) { }, ); if (!startupSync.ran) console.log(" Codex integration OFF; startup left Codex native."); + await refreshOwnedRaycastCatalog(config, port); // #1046: one warning per startup, after BOTH writes. The server's cache // invalidation happens first and the catalog sync second, so the mtime is only // final here — and neither write site warns on its own, or a boot that hits @@ -558,6 +580,7 @@ async function handleEnsure(options: { existingIsSuccess?: boolean } = {}): Prom return null; }); if (synced?.status === "skipped") console.log(" Codex integration OFF; startup left Codex native."); + await refreshOwnedRaycastCatalog(config, live.port); // Ensure env file exists for already-running proxy (may have been deleted or pre-dates this feature). const systemEnv = await injectSystemEnv(live.port, config).catch(() => ({ injected: false })); reportShellHookFailure(reconcileShellHook(systemEnv.injected)); @@ -602,6 +625,7 @@ async function handleEnsure(options: { existingIsSuccess?: boolean } = {}): Prom return null; }); if (synced?.status === "skipped") console.log(" Codex integration OFF; startup left Codex native."); + await refreshOwnedRaycastCatalog(config, port); // The child opens /healthz before its best-effort roster reconcile. Await the same idempotent // operation in the parent so `ocx ensure` cannot report success while stale ocx-*.md files are // still observable. Always use the live port, including fallback-port starts. diff --git a/src/cli/integrations.ts b/src/cli/integrations.ts index bcb87d5d18..89ab3ee046 100644 --- a/src/cli/integrations.ts +++ b/src/cli/integrations.ts @@ -161,6 +161,39 @@ export async function handleGrokCommand(argv: string[], deps: RuntimeApiDeps = { }); } +/** The Raycast-only block the single-client route adds; see IntegrationStateEnvelope. */ +interface RaycastStatusBlock { + plan: string; + aiDirPresent: boolean; +} + +function raycastBlock(result: unknown): RaycastStatusBlock | null { + if (!result || typeof result !== "object") return null; + const block = (result as { raycast?: unknown }).raycast; + if (!block || typeof block !== "object") return null; + const { plan, aiDirPresent } = block as Partial; + return typeof plan === "string" && typeof aiDirPresent === "boolean" ? { plan, aiDirPresent } : null; +} + +/** + * Text view of one client's status. + * + * Raycast carries an extra block, and the generic summary would print it as + * three dotted keys. A `current` file that Raycast ignores for want of a Pro + * subscription is the one fact this view must not bury, so `plan` gets its own + * line and a missing `ai` folder gets the instruction that creates it. + */ +function singleClientStatusLines(result: unknown): string[] { + const raycast = raycastBlock(result); + if (!raycast) return summaryLines(result); + const rest = Object.fromEntries(Object.entries(result as Record).filter(([key]) => key !== "raycast")); + const lines = [...summaryLines(rest), `plan: ${raycast.plan}`]; + if (!raycast.aiDirPresent) { + lines.push('Open Raycast → Settings → AI → "Reveal Providers Config" once so the ai folder exists.'); + } + return lines; +} + /** * The headless half of the client-integration toggle. * @@ -197,7 +230,7 @@ export async function handleClientIntegrationCommand( : [String((result as { error?: string }).error ?? "No Aside profiles found.")] : rows ? rows.map(row => `${String(row.clientId)}: ${String(row.state)}${row.installed ? "" : " (not installed)"}`) - : summaryLines(result)); + : singleClientStatusLines(result)); return; } diff --git a/src/cli/registry.ts b/src/cli/registry.ts index 00ff25ed52..467a0f7971 100644 --- a/src/cli/registry.ts +++ b/src/cli/registry.ts @@ -287,8 +287,8 @@ export const CLI_COMMANDS: CliCommandEntry[] = [ { name: "api-key", usage: "ocx api-key ...", summary: "Alias of ocx access key." }, { name: "export", - usage: "ocx export --client [--json] [--out ] [--force]", - summary: "Print a client config (OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code, ZCode, Prime Agent, Aside) wired to the running proxy.", + usage: "ocx export --client [--json] [--out ] [--force]", + summary: "Print a client config (OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code, ZCode, Prime Agent, Aside, Raycast) wired to the running proxy.", details: [ "--json prints the generated document as JSON on stdout; use --out for the client's native format.", "--out writes the native config there and refuses to replace an existing file without --force.", diff --git a/src/clients/config-export.ts b/src/clients/config-export.ts index 372abcc00e..8fb42f311d 100644 --- a/src/clients/config-export.ts +++ b/src/clients/config-export.ts @@ -37,6 +37,8 @@ export type { OmpModelEntry, OmpProviderBlock, OmpGeneratedConfig } from "./conf export type { ZcodeModelEntry, ZcodeProviderBlock, ZcodeGeneratedConfig } from "./config-export/zcode"; export type { DshReasoningEffort, DshWireReasoningEffort, DshModelEntry, DshProviderBlock, DshGeneratedConfig } from "./config-export/dsh"; export type { McodeProviderBlock, McodeModelEntry, McodeGeneratedConfig } from "./config-export/mcode"; +export type { RaycastAbility, RaycastAbilityName, RaycastModelEntry, RaycastProviderEntry, RaycastGeneratedConfig } from "./config-export/raycast"; +export { buildRaycastClientConfig, summarizeRaycast, buildRaycastContribution } from "./config-export/raycast"; import type { OpencodeLaunchEnv, OpencodeCatalogModel, ExportContext, PiModelEntry, ManagedContribution, ManagedFragment, ExportClientId, ExportClientSpec } from "./config-export/contracts"; import { OPENCODE_API_KEY_ENV_REF, OPENCODE_PROVIDER_BLOCK_DEFAULT_CONFIG, OPENCODE_CONFIG_SCHEMA, OPENCODE_PROVIDER_ID, PI_API_DIALECT, LOOPBACK_API_KEY_PLACEHOLDER, HERMES_API_KEY_ENV_REF, OPENCLAW_API_KEY_ENV_REF, GAJAE_API_KEY_ENV, OPENCODE_API_KEY_ENV, HERMES_API_KEY_ENV, OPENCLAW_API_KEY_ENV } from "./config-export/constants"; @@ -45,6 +47,7 @@ import { buildOmpClientConfig, summarizeOmp, buildOmpContribution } from "./conf import { buildDshClientConfig, summarizeDsh, buildDshContribution } from "./config-export/dsh"; import { buildMcodeClientConfig, summarizeMcode, buildMcodeContribution } from "./config-export/mcode"; import { buildZcodeClientConfig, summarizeZcode, buildZcodeContribution } from "./config-export/zcode"; +import { buildRaycastClientConfig, summarizeRaycast, buildRaycastContribution } from "./config-export/raycast"; @@ -533,6 +536,22 @@ export function asideConfigPath(env: OpencodeLaunchEnv = process.env, home: stri return join(asideAccountDir(env, home), "models.json"); } +/** + * Raycast's Custom Providers directory. Raycast hard-codes + * `~/.config/raycast/ai` on macOS AND Windows: it neither honors + * `XDG_CONFIG_HOME` nor ships a variable of its own that relocates the file, so + * unlike `opencodeGlobalConfigPath` there is no override to mirror and the env + * parameter exists only to keep the resolver signature uniform with the rest. + */ +export function raycastAiDir(_env: OpencodeLaunchEnv = process.env, home: string = homedir()): string { + return join(home, ".config", "raycast", "ai"); +} + +/** The providers file Raycast watches (manual.raycast.com/ai/custom-providers). */ +export function raycastConfigPath(env: OpencodeLaunchEnv = process.env, home: string = homedir()): string { + return join(raycastAiDir(env, home), "providers.yaml"); +} + /** Endpoint plus admission, identical for the V1 `options` and V2 `settings` field. */ function opencodeProviderConnection(baseURL: string, config: OcxConfig): OpencodeProviderConnection { const options: OpencodeProviderConnection = { baseURL }; @@ -1259,6 +1278,23 @@ export const EXPORT_CLIENTS: Record = { // bind would generate a config that 401s. loopbackOnly: true, }, + raycast: { + id: "raycast", + // Not a bare `providers.yaml`: same Downloads-folder collision argument as + // `aside-models.json`. + filename: "raycast-providers.yaml", + destination: env => raycastConfigPath(env), + apiKeyEnv: "", + exportHint: "Raycast reads providers.yaml with no api_keys entry; loopback needs no key.", + build: buildRaycastClientConfig, + format: "yaml", + summarize: summarizeRaycast, + buildContribution: buildRaycastContribution, + // Raycast's provider entry has no header field, and its `api_keys` value + // is read literally (no env interpolation), so the only way to admit a + // remote bind would be a plaintext secret on disk. Refuse instead. + loopbackOnly: true, + }, }; export const EXPORT_CLIENT_IDS: readonly ExportClientId[] = Object.keys(EXPORT_CLIENTS) as ExportClientId[]; diff --git a/src/clients/config-export/contracts.ts b/src/clients/config-export/contracts.ts index 039d7eaaf0..c888a4c257 100644 --- a/src/clients/config-export/contracts.ts +++ b/src/clients/config-export/contracts.ts @@ -93,7 +93,8 @@ export type ExportClientId = | "mcode" | "zcode" | "prime" - | "aside"; + | "aside" + | "raycast"; export interface ExportClientSpec { id: ExportClientId; diff --git a/src/clients/config-export/raycast.ts b/src/clients/config-export/raycast.ts new file mode 100644 index 0000000000..2cf9396ed5 --- /dev/null +++ b/src/clients/config-export/raycast.ts @@ -0,0 +1,86 @@ +import { exportPresentationLabel } from "../model-presentation"; +import { OPENCODE_PROVIDER_ID } from "./constants"; +import type { ExportContext, ManagedContribution } from "./contracts"; +import { authoritativeContextWindow, normalizeExportModels, singleFragment } from "./model-metadata"; + +export interface RaycastAbility { + supported: boolean; +} + +export type RaycastAbilityName = + | "temperature" + | "vision" + | "system_message" + | "tools" + | "reasoning_effort"; + +export interface RaycastModelEntry { + id: string; + name: string; + context?: number; + abilities: Record; +} + +export interface RaycastProviderEntry { + id: string; + name: string; + base_url: string; + models: RaycastModelEntry[]; +} + +export interface RaycastGeneratedConfig { + providers: RaycastProviderEntry[]; +} + +/** + * Raycast appends `/chat/completions` to `base_url`, so the proxy's `/v1` + * root is passed through unchanged. The format has no safe credential + * interpolation, which is why the registry exposes it only on loopback. + */ +export function buildRaycastClientConfig(ctx: ExportContext): RaycastGeneratedConfig { + const models: RaycastModelEntry[] = normalizeExportModels(ctx.models).map(model => { + const hasLadder = (model.reasoningEfforts?.length ?? 0) > 0; + const context = authoritativeContextWindow(model.contextWindow); + return { + id: model.namespaced, + name: exportPresentationLabel(model), + ...(context !== undefined ? { context } : {}), + abilities: { + temperature: { supported: !hasLadder }, + vision: { supported: model.inputModalities?.includes("image") ?? false }, + system_message: { supported: true }, + tools: { supported: true }, + reasoning_effort: { supported: hasLadder }, + }, + }; + }); + return { + providers: [ + { id: OPENCODE_PROVIDER_ID, name: "OpenCodex", base_url: ctx.baseUrl, models }, + ], + }; +} + +export function summarizeRaycast( + document: unknown, +): { modelCount: number; modelsWithoutLimits: number } { + const providers = (document as RaycastGeneratedConfig | undefined)?.providers ?? []; + const models = providers.find(provider => provider.id === OPENCODE_PROVIDER_ID)?.models ?? []; + return { + modelCount: models.length, + modelsWithoutLimits: models.filter(model => model.context === undefined).length, + }; +} + +/** + * Raycast stores providers in a sequence. The stable id selector owns only + * OpenCodex's element, preserving user-defined providers around it. + */ +export function buildRaycastContribution(ctx: ExportContext): ManagedContribution { + const doc = buildRaycastClientConfig(ctx); + return singleFragment( + "raycast", + ["providers", `[id=${OPENCODE_PROVIDER_ID}]`], + doc.providers[0]!, + ); +} diff --git a/src/clients/model-presentation.ts b/src/clients/model-presentation.ts new file mode 100644 index 0000000000..9a5f9ae3c3 --- /dev/null +++ b/src/clients/model-presentation.ts @@ -0,0 +1,61 @@ +import { CURSOR_CAPABILITIES } from "../adapters/cursor/catalog"; +import { nativeOpenAiCapabilityDisplayName } from "../codex/catalog/metadata"; +import type { ExportModel } from "./config-export/contracts"; + +const KNOWN_ACRONYMS = new Set(["gpt", "glm", "grok"]); + +function titleWord(word: string): string { + const lower = word.toLowerCase(); + if (KNOWN_ACRONYMS.has(lower)) return lower.toUpperCase(); + if (/^\d+\.\d+$/.test(word)) return word; + return lower.charAt(0).toUpperCase() + lower.slice(1); +} + +/** + * Last-resort label when no catalog or operator name exists. Joins dotted version + * tails (`5-1` → `5.1`, `2-5` → `2.5`) so Raycast reads like a product name + * instead of a slug. + */ +function humanizeModelSlug(modelId: string): string { + const parts = modelId.split("-"); + const words: string[] = []; + for (let index = 0; index < parts.length; index += 1) { + const part = parts[index]!; + const next = parts[index + 1]; + if (/^\d+$/.test(part) && next !== undefined && /^\d+$/.test(next)) { + words.push(`${part}.${next}`); + index += 1; + continue; + } + words.push(part); + } + return words.map(titleWord).join(" "); +} + +function wireModelId(model: ExportModel): string { + if (model.id?.trim()) return model.id.trim(); + const slash = model.namespaced.lastIndexOf("/"); + return slash >= 0 ? model.namespaced.slice(slash + 1) : model.namespaced; +} + +/** + * Human-facing model label for clients whose picker shows `name` verbatim. + * + * Raycast has no second column for provider, so the shared `exportModelLabel` + * suffix `(anthropic)` would be noise — and its fallback is the raw wire id + * because management slugs are deliberately withheld from ExportModel. Resolve + * operator labels first, then the canonical capability tables, then a slug + * humanizer. + */ +export function exportPresentationLabel(model: ExportModel): string { + const configured = model.displayName?.trim(); + if (configured) return configured; + const wireId = wireModelId(model); + const fromCursor = CURSOR_CAPABILITIES[wireId]?.displayName; + if (fromCursor) return fromCursor; + if (model.native) { + const native = nativeOpenAiCapabilityDisplayName(wireId); + if (native) return native; + } + return humanizeModelSlug(wireId); +} diff --git a/src/integrations/catalog-refresh.ts b/src/integrations/catalog-refresh.ts index 8efb990002..8b89762f30 100644 --- a/src/integrations/catalog-refresh.ts +++ b/src/integrations/catalog-refresh.ts @@ -10,7 +10,7 @@ import { /** Refresh only previously connected clients; a refused file never blocks its peers. */ export async function refreshOwnedCatalogIntegrations( input: Omit, - clientIds: readonly IntegrationClientId[] = ["pi", "aside"], + clientIds: readonly IntegrationClientId[] = ["pi", "aside", "raycast"], ): Promise { let models: Promise | undefined; const loadModels = () => models ??= Promise.resolve().then(() => diff --git a/src/integrations/merge.ts b/src/integrations/merge.ts index 4dccd48e50..768ddc755f 100644 --- a/src/integrations/merge.ts +++ b/src/integrations/merge.ts @@ -20,18 +20,103 @@ function clone(value: T): T { return value === undefined ? value : (JSON.parse(JSON.stringify(value)) as T); } -/** Write `value` at `path`, creating intermediate objects. Returns a new document. */ +/** + * `[field=value]` addresses the ONE element of a sequence whose `field` equals + * `value`. Raycast keeps its providers as a YAML list, so the element is the + * smallest thing we can own there; an index would move under us the moment + * the user reordered their own entries. Any other segment is a plain key. + */ +const ARRAY_SELECTOR = /^\[([A-Za-z_][A-Za-z0-9_]*)=([^\]]+)\]$/u; + +export type PathSegment = + | { kind: "key"; key: string } + | { kind: "select"; field: string; value: string }; + +export function parseSegment(raw: string): PathSegment { + const match = ARRAY_SELECTOR.exec(raw); + if (!match) return { kind: "key", key: raw }; + return { kind: "select", field: match[1]!, value: match[2]! }; +} + +/** + * Thrown when a selector matches more than one element. Picking either one + * would silently rewrite an entry the user may have written; the writer maps + * this to an `unsafe` refusal instead. + */ +export class AmbiguousSelectorError extends Error { + constructor(field: string, value: string) { + super(`more than one entry has ${field}=${value}`); + this.name = "AmbiguousSelectorError"; + } +} + +/** The index of the element a selector names, -1 when none matches. */ +function selectIndex(items: readonly unknown[], field: string, value: string): number { + const matches: number[] = []; + items.forEach((item, index) => { + if (isPlainRecord(item) && item[field] === value) matches.push(index); + }); + if (matches.length > 1) throw new AmbiguousSelectorError(field, value); + return matches[0] ?? -1; +} + +function assertNever(segment: never): never { + throw new Error(`unknown path segment ${JSON.stringify(segment)}`); +} + +/** + * Write `value` at `path`, creating intermediate containers. Returns a new document. + * + * A `key` segment descends through a record, creating `{}` where the slot is + * absent or holds something else. A `select` segment descends through an + * array the same way, creating `[]`; a missing element is pushed, a matching + * one is replaced in place so the user's ordering survives. + */ export function setPath(doc: unknown, path: readonly string[], value: unknown): unknown { if (path.length === 0) throw new Error("setPath needs a non-empty path"); - const root: Record = isPlainRecord(doc) ? clone(doc) : {}; - let cursor = root; - for (const key of path.slice(0, -1)) { - const next = cursor[key]; - if (!isPlainRecord(next)) cursor[key] = {}; - cursor = cursor[key] as Record; + /* + * `parent[slot]` is the position the segment just consumed addresses. The + * root sits in a one-key holder so the first segment needs no special case: + * a non-record document is replaced by `{}` exactly as before. + */ + const holder: Record = { root: isPlainRecord(doc) ? clone(doc) : {} }; + let parent: Record | unknown[] = holder; + let slot: string | number = "root"; + const read = (): unknown => (Array.isArray(parent) ? parent[slot as number] : parent[slot as string]); + const write = (next: unknown): void => { + if (Array.isArray(parent)) parent[slot as number] = next; + else parent[slot as string] = next; + }; + for (const raw of path) { + const segment = parseSegment(raw); + switch (segment.kind) { + case "key": { + if (!isPlainRecord(read())) write({}); + parent = read() as Record; + slot = segment.key; + break; + } + case "select": { + if (!Array.isArray(read())) write([]); + const items = read() as unknown[]; + const found = selectIndex(items, segment.field, segment.value); + parent = items; + if (found >= 0) { + slot = found; + } else { + // Seed the element so the selector stays true for whatever a deeper + // segment writes into it; a last-position select replaces it whole. + slot = items.length; + items.push({ [segment.field]: segment.value }); + } + break; + } + default: + return assertNever(segment); + } } - cursor[path[path.length - 1]!] = clone(value); - return root; + write(clone(value)); + return holder.root; } /** @@ -54,27 +139,53 @@ export function deletePath( ): { doc: unknown; removed: boolean } { if (!isPlainRecord(doc) || path.length === 0) return { doc, removed: false }; const root = clone(doc) as Record; - const chain: Record[] = [root]; - let cursor: Record = root; - for (const key of path.slice(0, -1)) { - const next = cursor[key]; - if (!isPlainRecord(next)) return { doc: root, removed: false }; - cursor = next; - chain.push(cursor); + // `chain[i]` is the container segment `i` is resolved against; `slots[i]` is + // the key or index it resolved to, so the prune walk can delete by position. + const chain: (Record | unknown[])[] = [root]; + const slots: (string | number)[] = []; + for (let depth = 0; depth < path.length; depth += 1) { + const container = chain[depth]!; + const segment = parseSegment(path[depth]!); + switch (segment.kind) { + case "key": { + if (Array.isArray(container) || !(segment.key in container)) return { doc: root, removed: false }; + slots.push(segment.key); + chain.push(container[segment.key] as Record | unknown[]); + break; + } + case "select": { + if (!Array.isArray(container)) return { doc: root, removed: false }; + const found = selectIndex(container, segment.field, segment.value); + if (found < 0) return { doc: root, removed: false }; + slots.push(found); + chain.push(container[found] as Record | unknown[]); + break; + } + default: + return assertNever(segment); + } + // Only the leaf may be a scalar; walking into one means the path is absent. + if (depth < path.length - 1) { + const next = chain[depth + 1]; + if (!isPlainRecord(next) && !Array.isArray(next)) return { doc: root, removed: false }; + } } - const leaf = path[path.length - 1]!; - if (!(leaf in cursor)) return { doc: root, removed: false }; - delete cursor[leaf]; + const remove = (container: Record | unknown[], slot: string | number): void => { + if (Array.isArray(container)) container.splice(slot as number, 1); + else delete container[slot as string]; + }; + remove(chain[path.length - 1]!, slots[path.length - 1]!); /* * Walk back up, pruning only containers this deletion emptied AND that we * created. The root is never pruned. */ - for (let index = chain.length - 1; index >= 1; index -= 1) { + for (let index = path.length - 1; index >= 1; index -= 1) { const container = chain[index]!; - if (Object.keys(container).length > 0) break; + const empty = Array.isArray(container) ? container.length === 0 : Object.keys(container).length === 0; + if (!empty) break; const containerPath = path.slice(0, index).join("\u0000"); if (!createdContainers.has(containerPath)) break; - delete chain[index - 1]![path[index - 1]!]; + remove(chain[index - 1]!, slots[index - 1]!); } return { doc: root, removed: true }; } @@ -121,9 +232,31 @@ export function createdContainerPaths( for (const fragment of contribution.fragments) { let cursor: unknown = doc; for (let depth = 0; depth < fragment.path.length - 1; depth += 1) { - const key = fragment.path[depth]!; - const next = isPlainRecord(cursor) ? cursor[key] : undefined; - if (!isPlainRecord(next)) { + const segment = parseSegment(fragment.path[depth]!); + let next: unknown; + switch (segment.kind) { + case "key": { + /* + * The container this key must hold is whatever the NEXT segment + * descends into: an array when that is a selector, a record + * otherwise. Either one is ours to create when absent. + */ + const nextSegment = parseSegment(fragment.path[depth + 1]!); + next = isPlainRecord(cursor) ? cursor[segment.key] : undefined; + if (nextSegment.kind === "select" ? !Array.isArray(next) : !isPlainRecord(next)) next = undefined; + break; + } + case "select": { + // A selector that matches nothing means setPath will push the element. + next = Array.isArray(cursor) + ? cursor.find(item => isPlainRecord(item) && item[segment.field] === segment.value) + : undefined; + break; + } + default: + return assertNever(segment); + } + if (next === undefined) { created.add(fragment.path.slice(0, depth + 1).join("\u0000")); cursor = undefined; continue; diff --git a/src/integrations/raycast-detect.ts b/src/integrations/raycast-detect.ts new file mode 100644 index 0000000000..5e79578f46 --- /dev/null +++ b/src/integrations/raycast-detect.ts @@ -0,0 +1,110 @@ +/** + * Detect a Raycast install and whether Custom Providers can take effect. + * + * Custom Providers is a Raycast Pro feature: Raycast reads + * `~/.config/raycast/ai/providers.yaml` only while a subscription is active, and + * the `ai` directory itself only exists once the user has clicked "Reveal + * Providers Config" in Settings > AI. Neither fact stops the writer — the plan + * (devlog/_plan/260904_raycast_integration/000_plan.md) makes a free plan a + * WARNING, never a refusal — so this module only answers what status and the + * GUI need to explain a file that is written but ignored. + * + * Detection is read-only and injectable, like cursor-detect.ts: nothing here + * touches the Raycast install or its preferences, and the tests run against + * stubbed deps rather than the machine they execute on. + */ +import { existsSync } from "node:fs"; +import { homedir } from "node:os"; +import { posix, win32 } from "node:path"; + +export type RaycastPlan = "pro" | "free" | "unknown"; + +export interface RaycastInstall { + /** The app bundle or install directory, or null when none of the well-known locations exist. */ + appPath: string | null; + /** `~/.config/raycast/ai` exists — the install signal the registry uses. */ + aiDirPresent: boolean; + plan: RaycastPlan; +} + +export interface RaycastDetectDeps { + platform: string; + homedir: string; + env: Record; + exists(path: string): boolean; + /** stdout of `defaults read ` trimmed, or null when the command fails / is unavailable. */ + readDefault(domain: string, key: string): string | null; +} + +/** + * The preference Raycast writes for its subscription state. Read through + * `defaults` rather than by parsing the plist: cfprefsd caches writes, so the + * file on disk can lag what the running app believes. + */ +const RAYCAST_DEFAULTS_DOMAIN = "com.raycast.macos.v1"; +const RAYCAST_SUBSCRIPTION_KEY = "subscriptions_active"; + +export function realRaycastDetectDeps(): RaycastDetectDeps { + return { + platform: process.platform, + homedir: homedir(), + env: process.env, + exists: path => { + try { + return existsSync(path); + } catch { + return false; + } + }, + readDefault: (domain, key) => { + // `defaults` is macOS-only; elsewhere the plan is simply unknown. + if (process.platform !== "darwin") return null; + try { + const result = Bun.spawnSync(["defaults", "read", domain, key], { stdout: "pipe", stderr: "pipe" }); + if (result.exitCode !== 0) return null; + return result.stdout.toString().trim(); + } catch { + return null; + } + }, + }; +} + +function appPathFor(deps: RaycastDetectDeps): string | null { + // Join with the target platform's separator so a test describing another OS + // gets that OS's paths, not the host's. + const { join } = deps.platform === "win32" ? win32 : posix; + if (deps.platform === "darwin") { + for (const candidate of ["/Applications/Raycast.app", join(deps.homedir, "Applications", "Raycast.app")]) { + if (deps.exists(candidate)) return candidate; + } + return null; + } + if (deps.platform === "win32") { + const local = deps.env.LOCALAPPDATA; + if (!local) return null; + const candidate = join(local, "Programs", "Raycast"); + return deps.exists(candidate) ? candidate : null; + } + return null; +} + +function planFor(deps: RaycastDetectDeps): RaycastPlan { + if (deps.platform !== "darwin") return "unknown"; + // Read once: `defaults` spawns a process, and the answer cannot change + // between two reads inside one detection. + const value = deps.readDefault(RAYCAST_DEFAULTS_DOMAIN, RAYCAST_SUBSCRIPTION_KEY); + if (value === "1") return "pro"; + if (value === "0") return "free"; + return "unknown"; +} + +export function detectRaycast(deps: RaycastDetectDeps = realRaycastDetectDeps()): RaycastInstall { + const { join } = deps.platform === "win32" ? win32 : posix; + return { + appPath: appPathFor(deps), + // Raycast ignores XDG and uses this path on every platform it ships on. + aiDirPresent: deps.exists(join(deps.homedir, ".config", "raycast", "ai")), + plan: planFor(deps), + }; +} diff --git a/src/integrations/registry.ts b/src/integrations/registry.ts index 13662d52d5..f5780f4f98 100644 --- a/src/integrations/registry.ts +++ b/src/integrations/registry.ts @@ -35,6 +35,8 @@ import { piConfigPath, primeAgentDir, primeConfigPath, + raycastAiDir, + raycastConfigPath, zcodeConfigPath, zcodeHomeDir, type ExportClientId, @@ -261,6 +263,22 @@ export const INTEGRATION_CLIENTS: Record join(asideHomeDir(env, home), "u"), }, + raycast: { + id: "raycast", + configPath: (env = process.env, home = homedir()) => raycastConfigPath(env, home), + /* + * The `ai` directory, not `Raycast.app`. Raycast creates it only when the + * user clicks "Reveal Providers Config" in Settings > AI, which is exactly + * the signal that Custom Providers is reachable on this install; an app + * bundle alone says nothing about the plan or the feature. + * + * No `sourcePreservingYaml`: that patcher handles block-map leaves only, + * and our entry is a SEQUENCE item, so the file is re-rendered through + * `renderYaml` (block style). The `[id=opencodex]` selector keeps the user's + * other providers in place across that re-render. + */ + detectDir: (env = process.env, home = homedir()) => raycastAiDir(env, home), + }, }; export const INTEGRATION_CLIENT_IDS: readonly IntegrationClientId[] = diff --git a/src/integrations/state.ts b/src/integrations/state.ts index 008f46fbf1..bb0e5b3567 100644 --- a/src/integrations/state.ts +++ b/src/integrations/state.ts @@ -12,6 +12,7 @@ import { ClientPathError, EXPORT_CLIENTS, opencodeProxyBaseUrl, type ExportModel import type { OcxConfig } from "../types"; import { PARSE_FAILED, loadTarget, parseConfig, type IntegrationIO } from "./config-io"; import { SNAPSHOT_RETENTION } from "./journal"; +import { parseSegment, type PathSegment } from "./merge"; import { canonicalContribution, fingerprint, semanticContribution, type OwnershipRecord } from "./ownership"; import { protectedContributionFingerprint, @@ -52,11 +53,41 @@ export interface IntegrationStatus { retentionDegraded: boolean; } +function isPlainRecord(value: unknown): value is Record { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + +function assertNever(segment: never): never { + throw new Error(`unknown path segment ${JSON.stringify(segment)}`); +} + +/** The element a selector names, or `undefined` when none matches. */ +function selectElement(items: readonly unknown[], segment: PathSegment & { kind: "select" }): unknown { + return items.find(item => isPlainRecord(item) && item[segment.field] === segment.value); +} + +/** + * Same segment grammar as `setPath`: a plain key reads through a record, a + * `[field=value]` selector reads through an array. Because the classifier and + * the writer share this one function, status and mutation cannot disagree + * about which element is ours. + */ export function readPath(doc: unknown, path: readonly string[]): unknown { let cursor: unknown = doc; - for (const key of path) { - if (typeof cursor !== "object" || cursor === null || Array.isArray(cursor)) return undefined; - cursor = (cursor as Record)[key]; + for (const raw of path) { + const segment = parseSegment(raw); + switch (segment.kind) { + case "key": + if (!isPlainRecord(cursor)) return undefined; + cursor = cursor[segment.key]; + break; + case "select": + if (!Array.isArray(cursor)) return undefined; + cursor = selectElement(cursor, segment); + break; + default: + return assertNever(segment); + } if (cursor === undefined) return undefined; } return cursor; @@ -82,10 +113,35 @@ export function blockedContainerPath( doc: unknown, contribution: ManagedContribution, ): readonly string[] | null { + /* + * What a segment needs the value it walks through to BE: a record for a key, + * an array for a selector. `typeof null === "object"`, so null is excluded + * by both checks rather than walking straight into the dereference below. + */ + const holds = (segment: PathSegment, value: unknown): boolean => { + switch (segment.kind) { + case "key": + return isPlainRecord(value); + case "select": + return Array.isArray(value); + default: + return assertNever(segment); + } + }; + const step = (segment: PathSegment, value: unknown): unknown => { + switch (segment.kind) { + case "key": + return (value as Record)[segment.key]; + case "select": + return selectElement(value as readonly unknown[], segment); + default: + return assertNever(segment); + } + }; for (const fragment of contribution.fragments) { let cursor: unknown = doc; for (let depth = 0; depth < fragment.path.length - 1; depth += 1) { - const key = fragment.path[depth]!; + const segment = parseSegment(fragment.path[depth]!); /* * ONLY `undefined` means absent. A missing file parses as `{}`, so an * absent prefix reads `undefined` — but a parsed `null` is a value the @@ -94,14 +150,10 @@ export function blockedContainerPath( * "successful" apply. */ if (cursor === undefined) break; - // `typeof null === "object"`, so null has to be named explicitly or it - // walks straight into the dereference below. - if (cursor === null || typeof cursor !== "object" || Array.isArray(cursor)) { - return fragment.path.slice(0, depth); - } - const next = (cursor as Record)[key]; + if (!holds(segment, cursor)) return fragment.path.slice(0, depth); + const next = step(segment, cursor); if (next === undefined) break; - if (typeof next !== "object" || next === null || Array.isArray(next)) { + if (!holds(parseSegment(fragment.path[depth + 1]!), next)) { return fragment.path.slice(0, depth + 1); } cursor = next; diff --git a/src/integrations/writer.ts b/src/integrations/writer.ts index 23b3eaaad4..7ec543715a 100644 --- a/src/integrations/writer.ts +++ b/src/integrations/writer.ts @@ -27,7 +27,7 @@ import { refreshablePathsOf, semanticProtectedContributionFingerprint, } from "./ownership-policy"; -import { createdContainerPaths, mergeContribution, removeFragments } from "./merge"; +import { AmbiguousSelectorError, createdContainerPaths, mergeContribution, removeFragments } from "./merge"; import { INTEGRATION_CLIENTS, isLoopbackOnly, resolveIntegrationPaths, type IntegrationClientId } from "./registry"; import { classifyIntegration, exportContextOf } from "./state"; import type { IntegrationState } from "./state"; @@ -352,36 +352,39 @@ function applyOrRefreshIntegration( * concludes the user owns it, and the replacement record forgets we made it * — so a later disable strands it forever. */ - const base = classified.state === "stale" && record - ? removeFragments(parsed, record.fragmentPaths, new Set(record.createdContainers ?? [])).doc - : classified.state === "conflict" && record - /* - * A forced overwrite of a `foreign-edit` conflict drops what the previous - * record owned for the same reason a stale refresh does: the replacement - * record covers the paths we are about to write, so a path the old record - * owned and the new one does not would be stranded forever, unremovable by - * any later disable. - * - * With NO record -- an `unowned-key` conflict -- there is nothing to drop and - * the merge runs against the user's document directly. That is correct: - * createdContainerPaths then attributes every container they already had to - * them, so a later disable removes our leaves and leaves their structure - * standing. - */ - ? removeFragments(parsed, record.fragmentPaths, new Set(record.createdContainers ?? [])).doc - : parsed; - // Computed against the document as it stands BEFORE the merge: afterwards - // every container exists and "did we create this?" is unanswerable. - const created = createdContainerPaths(base, contribution); /* * A document can hold a value its own format cannot round-trip through our * renderers. That used to throw straight out of the writer and reach the * user as a 500 with no path and no advice; it is a refusal like any other, - * and the file is untouched because this happens before any write. + * and the file is untouched because this happens before any write. The + * removal and merge sit inside the same guard: a sequence holding two + * entries our selector matches is equally unwritable, and equally untouched. */ - const nextDocument = mergeContribution(base, contribution); + let created: string[]; let text: string; try { + const base = classified.state === "stale" && record + ? removeFragments(parsed, record.fragmentPaths, new Set(record.createdContainers ?? [])).doc + : classified.state === "conflict" && record + /* + * A forced overwrite of a `foreign-edit` conflict drops what the previous + * record owned for the same reason a stale refresh does: the replacement + * record covers the paths we are about to write, so a path the old record + * owned and the new one does not would be stranded forever, unremovable by + * any later disable. + * + * With NO record -- an `unowned-key` conflict -- there is nothing to drop and + * the merge runs against the user's document directly. That is correct: + * createdContainerPaths then attributes every container they already had to + * them, so a later disable removes our leaves and leaves their structure + * standing. + */ + ? removeFragments(parsed, record.fragmentPaths, new Set(record.createdContainers ?? [])).doc + : parsed; + // Computed against the document as it stands BEFORE the merge: afterwards + // every container exists and "did we create this?" is unanswerable. + created = createdContainerPaths(base, contribution); + const nextDocument = mergeContribution(base, contribution); if (spec.sourcePreservingYaml && before !== null) { const value = sourcePreservingFragmentValue(contribution, spec.sourcePreservingYaml.path); const patched = value === undefined @@ -401,6 +404,10 @@ function applyOrRefreshIntegration( text = serializeDocument(nextDocument, exportSpec.format); } } catch (error) { + if (error instanceof AmbiguousSelectorError) { + return refuse(clientId, "unsafe", "unsafe", + `${configPath} holds more than one entry matching ours, so it was left alone`); + } if (!(error instanceof UnserializableValueError)) throw error; return refuse(clientId, "unsafe", "unsafe", `${configPath} contains something opencodex cannot rewrite safely (${error.message}), so it was left alone`); @@ -527,11 +534,15 @@ export function disableIntegration(input: IntegrationWriteInput): WriteOutcome { return refuse(clientId, "unsafe", "unsafe", `${configPath} uses YAML source opencodex cannot patch without risking unrelated comments or formatting, so nothing was removed`); } - const { doc, removed } = removeFragments( - parsed, - record!.fragmentPaths, - new Set(prunableCreated), - ); + let doc: unknown; + let removed: boolean; + try { + ({ doc, removed } = removeFragments(parsed, record!.fragmentPaths, new Set(prunableCreated))); + } catch (error) { + if (!(error instanceof AmbiguousSelectorError)) throw error; + return refuse(clientId, "unsafe", "unsafe", + `${configPath} holds more than one entry matching ours, so nothing was removed`); + } if (!removed) { return { ok: true, changed: false, state: "absent", clientId, message: "nothing to remove" }; } diff --git a/src/server/management/config-routes.ts b/src/server/management/config-routes.ts index ac6929c968..4d551a886d 100644 --- a/src/server/management/config-routes.ts +++ b/src/server/management/config-routes.ts @@ -161,7 +161,7 @@ interface ClientIntegrationSyncOutcome { } /** - * Re-inject native clients that are switched ON and file integrations whose + * Re-inject native clients that are switched ON and every file integration whose * OpenCodex ownership record is the operator's durable opt-in. * * Only Codex used to run here, so a catalog change reached Codex and nothing else: a Grok @@ -169,6 +169,10 @@ interface ClientIntegrationSyncOutcome { * next `ocx start`. The startup path already gates each client on its own toggle * (`src/cli/index.ts`), and this is that same fan-out for the on-demand command. * + * File integrations use the catalog-refresh coordinator so owned blocks are + * updated without claiming unowned files. Aside remains on its multi-profile + * server-owned path inside that coordinator. + * * A client that is OFF or never connected is omitted from the result rather than reported as skipped — the * caller has to be able to tell "not touched" from "tried and failed". A client that fails * does not fail the sync: Codex is the one that matters for routing, and a broken Grok file @@ -233,7 +237,7 @@ export async function syncEnabledClientIntegrations( }, config, port, - }, ["mcode", "pi", "aside"])); + }, ["mcode", "pi", "aside", "raycast"])); return out; } diff --git a/src/server/management/integration-routes.ts b/src/server/management/integration-routes.ts index b332718e07..43c0e6a98c 100644 --- a/src/server/management/integration-routes.ts +++ b/src/server/management/integration-routes.ts @@ -22,6 +22,7 @@ import { isIntegrationClientId, type IntegrationClientId, } from "../../integrations/registry"; +import { detectRaycast, type RaycastInstall } from "../../integrations/raycast-detect"; import { readIntegrationState } from "../../integrations/state"; import { createIntegrationStateStore, type IntegrationStateStore } from "../../integrations/store"; import { @@ -58,6 +59,13 @@ type RestoreResult = Awaited>; export type IntegrationStateEnvelope = { clientId: IntegrationClientId; + /** + * Raycast only, and only on the single-client read. Custom Providers is a + * Pro feature, so a file that is `current` can still be one Raycast ignores; + * this is the fact that lets status and the GUI say so. It is not part of + * the shared `IntegrationStatus`, which describes the file, not the app. + */ + raycast?: RaycastInstall; } & IntegrationStateRecord; export interface IntegrationStateListEnvelope { @@ -141,6 +149,17 @@ export function setIntegrationPathTestHooks(hooks: { env?: NodeJS.ProcessEnv; ho integrationPathTestHooks = hooks; } +/** + * Raycast detection override for tests. The real detector spawns `defaults` and + * reads the developer's own subscription state, which is exactly the kind of + * host fact a route test must not depend on. + */ +let raycastDetectTestHook: (() => RaycastInstall) | null = null; + +export function setRaycastDetectTestHook(hook: (() => RaycastInstall) | null): void { + raycastDetectTestHook = hook; +} + /** The `env`/`home` overrides, spread into every registry-resolving call. */ function pathOverrides(): { env?: NodeJS.ProcessEnv; home?: string } { return { @@ -177,7 +196,10 @@ export function setIntegrationMutationFlightTestHooks( setIntegrationMutationFlightTestHook(hooks?.run ?? null); // Path overrides are part of the same isolation contract: clearing flights // while leaving a temp home bound would let the next suite write real files. - if (hooks === null) integrationPathTestHooks = null; + if (hooks === null) { + integrationPathTestHooks = null; + raycastDetectTestHook = null; + } } /** @@ -633,7 +655,12 @@ export async function handleIntegrationRoutes(ctx: ManagementContext): Promise { + test("a selector splits into field and value; anything else is a key", () => { + expect(parseSegment("[id=opencodex]")).toEqual({ kind: "select", field: "id", value: "opencodex" }); + expect(parseSegment("[model_id=anthropic/claude-opus-5]")) + .toEqual({ kind: "select", field: "model_id", value: "anthropic/claude-opus-5" }); + expect(parseSegment("providers")).toEqual({ kind: "key", key: "providers" }); + // Near misses stay keys: a client whose map literally has such a key keeps working. + expect(parseSegment("[id=]")).toEqual({ kind: "key", key: "[id=]" }); + expect(parseSegment("[=x]")).toEqual({ kind: "key", key: "[=x]" }); + expect(parseSegment("[id=x")).toEqual({ kind: "key", key: "[id=x" }); + }); +}); + +describe("setPath with a selector", () => { + test("replaces the matching element in place and keeps siblings and order", () => { + const doc = { providers: [THEIRS, { id: "opencodex", name: "old" }, { id: "other" }], keep: true }; + const next = setPath(doc, SELECT, OURS) as typeof doc; + expect(next.providers).toEqual([THEIRS, OURS, { id: "other" }]); + expect(next.keep).toBe(true); + // The input is not mutated. + expect(doc.providers[1]).toEqual({ id: "opencodex", name: "old" }); + }); + + test("pushes when no element matches", () => { + const next = setPath({ providers: [THEIRS] }, SELECT, OURS) as { providers: unknown[] }; + expect(next.providers).toEqual([THEIRS, OURS]); + }); + + test("creates the array when absent, and createdContainerPaths reports it", () => { + expect(createdContainerPaths({}, contribution(SELECT))).toEqual(["providers"]); + expect(createdContainerPaths({ providers: {} }, contribution(SELECT))).toEqual(["providers"]); + expect(createdContainerPaths({ providers: [THEIRS] }, contribution(SELECT))).toEqual([]); + expect(setPath({}, SELECT, OURS)).toEqual({ providers: [OURS] }); + // A record where the array belongs is replaced, exactly as a scalar under a key is. + expect(setPath({ providers: {} }, SELECT, OURS)).toEqual({ providers: [OURS] }); + }); + + test("descends into a matched element, seeding one when absent", () => { + const path = ["providers", "[id=opencodex]", "name"]; + expect(setPath({ providers: [THEIRS] }, path, "X")) + .toEqual({ providers: [THEIRS, { id: "opencodex", name: "X" }] }); + expect(setPath({ providers: [OURS, THEIRS] }, path, "X")) + .toEqual({ providers: [{ id: "opencodex", name: "X" }, THEIRS] }); + // The element the selector would create is recorded, the existing array is not. + expect(createdContainerPaths({ providers: [THEIRS] }, contribution(path, "X"))) + .toEqual(["providers\u0000[id=opencodex]"]); + expect(createdContainerPaths({ providers: [OURS] }, contribution(path, "X"))).toEqual([]); + }); + + test("throws AmbiguousSelectorError when two elements match", () => { + const doc = { providers: [OURS, THEIRS, { id: "opencodex", name: "dupe" }] }; + expect(() => setPath(doc, SELECT, OURS)).toThrow(AmbiguousSelectorError); + expect(() => deletePath(doc, SELECT)).toThrow(AmbiguousSelectorError); + }); +}); + +describe("deletePath with a selector", () => { + test("removes only the matching element and leaves siblings", () => { + const { doc, removed } = deletePath({ providers: [THEIRS, OURS, { id: "other" }], keep: 1 }, SELECT); + expect(removed).toBe(true); + expect(doc).toEqual({ providers: [THEIRS, { id: "other" }], keep: 1 }); + }); + + test("reports nothing removed when no element matches or the slot is not an array", () => { + expect(deletePath({ providers: [THEIRS] }, SELECT)).toEqual({ doc: { providers: [THEIRS] }, removed: false }); + expect(deletePath({ providers: {} }, SELECT)).toEqual({ doc: { providers: {} }, removed: false }); + expect(deletePath({}, SELECT)).toEqual({ doc: {}, removed: false }); + }); + + test("prunes an emptied array we created and keeps one we did not", () => { + const created = new Set(["providers"]); + expect(deletePath({ providers: [OURS], keep: 1 }, SELECT, created).doc).toEqual({ keep: 1 }); + expect(deletePath({ providers: [OURS], keep: 1 }, SELECT).doc).toEqual({ providers: [], keep: 1 }); + // A sibling keeps the array alive even when we created it. + expect(deletePath({ providers: [OURS, THEIRS] }, SELECT, created).doc).toEqual({ providers: [THEIRS] }); + }); + + test("a leaf inside a selected element is removed without touching the element", () => { + const path = ["providers", "[id=opencodex]", "name"]; + const created = new Set(["providers", "providers\u0000[id=opencodex]"]); + // The seeded element keeps its selector field, so it is never empty and the prune walk + // stops at it. No client owns a leaf inside a selected element today; when one does, it + // decides whether a `{ id }` husk is residue worth a dedicated rule. + expect(deletePath({ providers: [{ id: "opencodex", name: "X" }] }, path, created).doc) + .toEqual({ providers: [{ id: "opencodex" }] }); + expect(deletePath({ providers: [{ id: "opencodex", name: "X", extra: 1 }] }, path, created).doc) + .toEqual({ providers: [{ id: "opencodex", extra: 1 }] }); + }); +}); + +describe("readPath and blockedContainerPath with a selector", () => { + test("readPath finds the element through a selector", () => { + const doc = { providers: [THEIRS, OURS] }; + expect(readPath(doc, SELECT)).toEqual(OURS); + expect(readPath(doc, ["providers", "[id=opencodex]", "name"])).toBe("OpenCodex"); + expect(readPath(doc, ["providers", "[id=missing]"])).toBeUndefined(); + expect(readPath({ providers: {} }, SELECT)).toBeUndefined(); + expect(readPath({ providers: "x" }, SELECT)).toBeUndefined(); + }); + + test("blockedContainerPath blocks a non-array where the selector expects one", () => { + expect(blockedContainerPath({ providers: {} }, contribution(SELECT))).toEqual(["providers"]); + expect(blockedContainerPath({ providers: "x" }, contribution(SELECT))).toEqual(["providers"]); + expect(blockedContainerPath({ providers: null }, contribution(SELECT))).toEqual(["providers"]); + expect(blockedContainerPath({ providers: [THEIRS] }, contribution(SELECT))).toBeNull(); + expect(blockedContainerPath({}, contribution(SELECT))).toBeNull(); + // Reading through a matched element continues the walk: a scalar element is blocked, + // a record one is fine, an absent one is simply not there yet. + const deep = ["providers", "[id=opencodex]", "name"]; + expect(blockedContainerPath({ providers: [OURS] }, contribution(deep, "X"))).toBeNull(); + expect(blockedContainerPath({ providers: [THEIRS] }, contribution(deep, "X"))).toBeNull(); + expect(blockedContainerPath({ providers: [{ id: "opencodex", name: 1 }] }, contribution(["providers", "[id=opencodex]", "name", "leaf"], "X"))) + .toEqual(["providers", "[id=opencodex]", "name"]); + }); +}); + +describe("plain-key paths are unchanged", () => { + test("setPath, deletePath, readPath, createdContainerPaths and blockedContainerPath behave as before", () => { + const path = ["providers", "opencodex", "api_key"]; + expect(setPath({}, path, "k")).toEqual({ providers: { opencodex: { api_key: "k" } } }); + expect(setPath({ providers: "x" }, path, "k")).toEqual({ providers: { opencodex: { api_key: "k" } } }); + expect(setPath({ providers: [1] }, path, "k")).toEqual({ providers: { opencodex: { api_key: "k" } } }); + expect(setPath({ providers: { other: 1 } }, path, "k")) + .toEqual({ providers: { other: 1, opencodex: { api_key: "k" } } }); + expect(createdContainerPaths({}, contribution(path, "k"))).toEqual(["providers", "providers\u0000opencodex"]); + expect(createdContainerPaths({ providers: { other: 1 } }, contribution(path, "k"))).toEqual(["providers\u0000opencodex"]); + + const created = new Set(["providers", "providers\u0000opencodex"]); + expect(deletePath({ providers: { opencodex: { api_key: "k" } } }, path, created)).toEqual({ doc: {}, removed: true }); + expect(deletePath({ providers: { opencodex: { api_key: "k" } } }, path)).toEqual({ doc: { providers: { opencodex: {} } }, removed: true }); + expect(deletePath({ providers: { opencodex: { api_key: "k", other: 1 } }, x: 1 }, path, created)) + .toEqual({ doc: { providers: { opencodex: { other: 1 } }, x: 1 }, removed: true }); + expect(deletePath({ providers: {} }, path)).toEqual({ doc: { providers: {} }, removed: false }); + expect(deletePath({ providers: [] }, path)).toEqual({ doc: { providers: [] }, removed: false }); + expect(deletePath({ providers: { opencodex: "x" } }, path)).toEqual({ doc: { providers: { opencodex: "x" } }, removed: false }); + expect(deletePath({ providers: { opencodex: { api_key: null } } }, path, created)).toEqual({ doc: {}, removed: true }); + + expect(readPath({ providers: { opencodex: { api_key: "k" } } }, path)).toBe("k"); + expect(readPath({ providers: [OURS] }, ["providers", "0"])).toBeUndefined(); + expect(readPath({ providers: null }, path)).toBeUndefined(); + + expect(blockedContainerPath({ providers: ["x"] }, contribution(path, "k"))).toEqual(["providers"]); + expect(blockedContainerPath({ providers: { opencodex: null } }, contribution(path, "k"))).toEqual(["providers", "opencodex"]); + expect(blockedContainerPath(null, contribution(path, "k"))).toEqual([]); + expect(blockedContainerPath({ providers: { opencodex: {} } }, contribution(path, "k"))).toBeNull(); + expect(blockedContainerPath(undefined, contribution(path, "k"))).toBeNull(); + }); +}); + +/** + * End to end through the real writer: Raycast is the first client whose + * fragment path carries a selector, so this is where status and mutation are + * shown agreeing on which sequence element is ours. + */ +describe("raycast writer round trip", () => { + const TEST_ENV = {} as NodeJS.ProcessEnv; + const MODELS: ExportModel[] = [ + { namespaced: "anthropic/claude-opus-4-8", provider: "anthropic", id: "claude-opus-4-8", contextWindow: 200_000 }, + ]; + const CONFIG: OcxConfig = { + port: 10100, + hostname: "127.0.0.1", + defaultProvider: "mock", + providers: { mock: { adapter: "openai-chat", baseUrl: "http://127.0.0.1/v1" } }, + } as unknown as OcxConfig; + let home: string; + let store: IntegrationStateStore; + + beforeEach(() => { + const base = mkdtempSync(join(tmpdir(), "ocx-integrations-merge-")); + home = join(base, "home"); + mkdirSync(home, { recursive: true }); + store = createIntegrationStateStore(join(base, "store", "integrations")); + }); + + afterEach(() => { + removeTreeWithRetry(dirname(home)); + }); + + function installRaycast(): string { + const spec = INTEGRATION_CLIENTS.raycast; + mkdirSync(spec.detectDir(TEST_ENV, home), { recursive: true }); + const configPath = spec.configPath(TEST_ENV, home); + mkdirSync(dirname(configPath), { recursive: true }); + return configPath; + } + + function input(): IntegrationWriteInput { + return { clientId: "raycast", models: MODELS, config: CONFIG, port: 10100, env: TEST_ENV, home, store }; + } + + test("apply appends beside the user's provider, disable removes only ours", () => { + const configPath = installRaycast(); + writeFileSync(configPath, Bun.YAML.stringify({ providers: [THEIRS] })); + + expect(readIntegrationState(input())).toMatchObject({ state: "absent" }); + expect(applyIntegration(input())).toMatchObject({ ok: true, changed: true }); + const applied = Bun.YAML.parse(readFileSync(configPath, "utf8")) as { providers: Array<{ id: string }> }; + expect(applied.providers.map(item => item.id)).toEqual(["lmstudio", "opencodex"]); + expect(readIntegrationState(input())).toMatchObject({ state: "current" }); + + expect(disableIntegration(input())).toMatchObject({ ok: true, changed: true }); + // The user's array was there before us, so it survives with their entry intact. + expect(Bun.YAML.parse(readFileSync(configPath, "utf8"))).toEqual({ providers: [THEIRS] }); + expect(readIntegrationState(input())).toMatchObject({ state: "absent" }); + }); + + test("a providers map instead of a sequence is unsafe for status and writer alike", () => { + const configPath = installRaycast(); + writeFileSync(configPath, Bun.YAML.stringify({ providers: { opencodex: {} } })); + expect(readIntegrationState(input())).toMatchObject({ state: "unsafe", reason: "blocked-container" }); + expect(applyIntegration(input())).toMatchObject({ ok: false, reason: "unsafe" }); + expect(Bun.YAML.parse(readFileSync(configPath, "utf8"))).toEqual({ providers: { opencodex: {} } }); + }); + + test("two entries with our id refuse as unsafe and leave the file alone", () => { + const configPath = installRaycast(); + const text = Bun.YAML.stringify({ providers: [{ id: "opencodex", name: "a" }, { id: "opencodex", name: "b" }] }); + writeFileSync(configPath, text); + // Neither entry is ours on record, so status reads conflict and a plain apply refuses + // there. The explicit overwrite reaches the merge, which is where the ambiguity is + // detected: it must surface as an `unsafe` refusal, never as a thrown error. + expect(readIntegrationState(input())).toMatchObject({ state: "conflict" }); + expect(applyIntegration(input())).toMatchObject({ ok: false, reason: "conflict" }); + const result = overwriteIntegration(input()); + expect(result).toMatchObject({ ok: false, reason: "unsafe", state: "unsafe" }); + if (!result.ok) expect(result.message).toContain("more than one entry"); + expect(readFileSync(configPath, "utf8")).toBe(text); + expect(store.listOperations("raycast")).toHaveLength(0); + }); +}); diff --git a/tests/clients/integrations-state.test.ts b/tests/clients/integrations-state.test.ts index 872e9b3824..56093b3dd6 100644 --- a/tests/clients/integrations-state.test.ts +++ b/tests/clients/integrations-state.test.ts @@ -775,9 +775,9 @@ describe("installation detection is independent of config state", () => { * from. Rationale and the per-client table: 020 §1 amendment. */ describe("the loopback-only set is one fact, read through one seam", () => { - test("omp, pi, kimi, gajae, dsh, mcode, zcode, prime and aside are loopback-only and nobody else is", () => { + test("omp, pi, kimi, gajae, dsh, mcode, zcode, prime, aside and raycast are loopback-only and nobody else is", () => { const loopbackOnly = INTEGRATION_CLIENT_IDS.filter(id => isLoopbackOnly(id)); - expect(loopbackOnly).toEqual(["pi", "omp", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside"]); + expect(loopbackOnly).toEqual(["pi", "omp", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", "raycast"]); }); test("the registry restates nothing — it reads the export spec", () => { diff --git a/tests/clients/raycast-client.test.ts b/tests/clients/raycast-client.test.ts new file mode 100644 index 0000000000..148f84babb --- /dev/null +++ b/tests/clients/raycast-client.test.ts @@ -0,0 +1,271 @@ +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { mkdirSync, mkdtempSync, readFileSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { + EXPORT_CLIENTS, + OPENCODE_PROVIDER_ID, + buildClientConfig, + buildClientConfigText, + buildClientContribution, + raycastAiDir, + raycastConfigPath, + type ExportContext, + type ExportModel, + type RaycastGeneratedConfig, +} from "../../src/clients/config-export"; +import { exportPresentationLabel } from "../../src/clients/model-presentation"; +import { refreshOwnedCatalogIntegrations } from "../../src/integrations/catalog-refresh"; +import { INTEGRATION_CLIENTS } from "../../src/integrations/registry"; +import { createIntegrationStateStore, type IntegrationStateStore } from "../../src/integrations/store"; +import { applyIntegration, disableIntegration, refreshIntegration } from "../../src/integrations/writer"; +import type { OcxConfig } from "../../src/types"; +import { removeTreeWithRetry } from "../helpers/remove-tree"; + +const CONFIG = { + port: 10100, + hostname: "127.0.0.1", + defaultProvider: "mock", + providers: { mock: { adapter: "openai-chat", baseUrl: "http://127.0.0.1/v1" } }, +} as OcxConfig; + +// One model per cell of the vision x reasoning matrix, so every ability +// branch is exercised by a row that differs from its neighbours in one axis. +const MODELS: ExportModel[] = [ + { namespaced: "anthropic/claude-opus-5", provider: "anthropic", id: "claude-opus-5", contextWindow: 200_000, inputModalities: ["text", "image"] }, + { namespaced: "openai/gpt-5.6-sol", provider: "openai", id: "gpt-5.6-sol", contextWindow: 922_000, reasoningEfforts: ["low", "medium", "high"] }, + { namespaced: "mystery/model", provider: "mystery", id: "model" }, + { namespaced: "google/gemini-3-pro", provider: "google", id: "gemini-3-pro", contextWindow: 1_048_576, inputModalities: ["text", "image"], reasoningEfforts: ["low", "high"] }, +]; + +function context(models: readonly ExportModel[] = MODELS): ExportContext { + return { baseUrl: "http://127.0.0.1:10100/v1", config: CONFIG, models }; +} + +// A provider the user wrote by hand: the merge must carry it through every +// apply, refresh and disable untouched. +const LMSTUDIO = { id: "lmstudio", name: "LM Studio", base_url: "http://localhost:1234/v1", models: [] }; +const USER_SEED = [ + "providers:", + " - id: lmstudio", + " name: LM Studio", + " base_url: http://localhost:1234/v1", + " models: []", + "", +].join(String.fromCharCode(10)); + +function ourProvider(document: RaycastGeneratedConfig) { + return document.providers.find(provider => provider.id === OPENCODE_PROVIDER_ID)!; +} + +function abilitiesOf(document: RaycastGeneratedConfig, id: string): Record { + const model = ourProvider(document).models.find(entry => entry.id === id)!; + return Object.fromEntries(Object.entries(model.abilities).map(([name, ability]) => [name, ability.supported])); +} + +let home: string; +let store: IntegrationStateStore; + +beforeEach(() => { + home = mkdtempSync(join(tmpdir(), "ocx-raycast-")); + store = createIntegrationStateStore(mkdtempSync(join(tmpdir(), "ocx-raycast-store-"))); +}); + +afterEach(() => { + removeTreeWithRetry(home); +}); + +/** Raycast "installed" for our purposes: the `ai` directory exists. */ +function installRaycast(seed?: string): string { + const spec = INTEGRATION_CLIENTS.raycast; + mkdirSync(spec.detectDir({}, home), { recursive: true }); + const configPath = spec.configPath({}, home); + if (seed !== undefined) writeFileSync(configPath, seed); + return configPath; +} + +function readProviders(configPath: string): RaycastGeneratedConfig { + return Bun.YAML.parse(readFileSync(configPath, "utf8")) as RaycastGeneratedConfig; +} + +function request(models: readonly ExportModel[] = MODELS) { + return { clientId: "raycast" as const, models, config: CONFIG, port: 10100, env: {}, home, store }; +} + +describe("Raycast client config", () => { + /* + * The shape is Raycast's, not ours: `providers` is a SEQUENCE, `base_url` + * ends in `/v1` without `/chat/completions`, and there is no `api_keys` at + * all because a loopback bind is unauthenticated. Every model carries all + * five abilities so Raycast never has to guess at a missing one. + */ + test("emits one provider element with the documented field vocabulary", () => { + const document = buildClientConfig("raycast", context()) as RaycastGeneratedConfig; + expect(Object.keys(document)).toEqual(["providers"]); + expect(document.providers.map(provider => provider.id)).toEqual([OPENCODE_PROVIDER_ID]); + + const provider = ourProvider(document); + expect(Object.keys(provider)).toEqual(["id", "name", "base_url", "models"]); + expect(provider.name).toBe("OpenCodex"); + expect(provider.base_url).toBe("http://127.0.0.1:10100/v1"); + expect(Object.keys(provider)).not.toContain("api_keys"); + + for (const model of provider.models) { + expect(Object.keys(model.abilities)).toEqual(["temperature", "vision", "system_message", "tools", "reasoning_effort"]); + } + const claude = provider.models.find(model => model.id === "anthropic/claude-opus-5")!; + // Raycast shows `name` verbatim with no provider suffix; capability tables + // supply the product label when ExportModel has no operator override. + expect(claude.name).toBe("Claude Opus 5"); + expect(claude.context).toBe(200_000); + // No authoritative window means the key is absent, not zero or null. + const unknown = provider.models.find(model => model.id === "mystery/model")!; + expect("context" in unknown).toBe(false); + }); + + test("uses product labels instead of raw slugs or provider suffixes", () => { + expect(exportPresentationLabel({ + namespaced: "anthropic/claude-fable-5-1", provider: "anthropic", id: "claude-fable-5-1", + })).toBe("Claude Fable 5.1"); + expect(exportPresentationLabel({ + namespaced: "cursor/composer-2.5", provider: "cursor", id: "composer-2.5", + })).toBe("Composer 2.5"); + expect(exportPresentationLabel({ + namespaced: "mystery/model", provider: "mystery", id: "model", displayName: "Custom Name", + })).toBe("Custom Name"); + }); + + /* + * Abilities follow the catalog row, not the vendor name. Temperature and + * reasoning_effort are the same bit inverted: Raycast's own template notes + * that reasoning models commonly reject temperature. system_message and + * tools are always on, the same stance as Hermes. + */ + test("maps vision and reasoning ladders onto abilities per model", () => { + const document = buildClientConfig("raycast", context()) as RaycastGeneratedConfig; + expect(abilitiesOf(document, "anthropic/claude-opus-5")).toEqual({ + temperature: true, vision: true, system_message: true, tools: true, reasoning_effort: false, + }); + expect(abilitiesOf(document, "openai/gpt-5.6-sol")).toEqual({ + temperature: false, vision: false, system_message: true, tools: true, reasoning_effort: true, + }); + expect(abilitiesOf(document, "mystery/model")).toEqual({ + temperature: true, vision: false, system_message: true, tools: true, reasoning_effort: false, + }); + expect(abilitiesOf(document, "google/gemini-3-pro")).toEqual({ + temperature: false, vision: true, system_message: true, tools: true, reasoning_effort: true, + }); + }); + + test("native YAML round-trips, leads with our element, and never carries a credential", () => { + const sentinel = ["sk", "live", "raycast", "sentinel"].join("-"); + const withKey = { ...CONFIG, apiKeys: [{ key: sentinel }] } as OcxConfig; + const built = buildClientConfigText("raycast", { ...context(), config: withKey }); + expect(built.format).toBe("yaml"); + expect(built.text.startsWith(["providers:", " - id: opencodex"].join(String.fromCharCode(10)))).toBe(true); + expect(Bun.YAML.parse(built.text)).toEqual(built.document as never); + expect(built.text).not.toContain(sentinel); + expect(built.text).not.toContain("api_keys"); + }); + + test("the contribution owns the providers element selected by our id", () => { + const contribution = buildClientContribution("raycast", context()); + expect(contribution.clientId).toBe("raycast"); + expect(contribution.fragments.map(fragment => fragment.path)).toEqual([["providers", `[id=${OPENCODE_PROVIDER_ID}]`]]); + expect((contribution.fragments[0]!.value as { id: string }).id).toBe(OPENCODE_PROVIDER_ID); + }); + + test("resolves under the home directory and ignores XDG_CONFIG_HOME", () => { + // Raycast hardcodes ~/.config/raycast on macOS and Windows alike; honoring + // XDG here would name a file Raycast never reads. + const env = { XDG_CONFIG_HOME: join(home, "elsewhere") }; + expect(raycastAiDir(env, home)).toBe(join(home, ".config", "raycast", "ai")); + expect(raycastConfigPath(env, home)).toBe(join(home, ".config", "raycast", "ai", "providers.yaml")); + expect(INTEGRATION_CLIENTS.raycast.configPath(env, home)).toBe(raycastConfigPath(env, home)); + expect(INTEGRATION_CLIENTS.raycast.detectDir(env, home)).toBe(raycastAiDir(env, home)); + }); + + test("ships as a loopback-only integration with no env var to export", () => { + const spec = EXPORT_CLIENTS.raycast; + // `api_keys` is read literally, so a remote bind would need a plaintext + // secret on disk; the spec refuses instead. + expect(spec.loopbackOnly).toBe(true); + expect(spec.apiKeyEnv).toBe(""); + expect(spec.format).toBe("yaml"); + // Not a bare providers.yaml: a download would collide with other clients'. + expect(spec.filename).toBe("raycast-providers.yaml"); + }); + + /* + * The whole point of the `[id=opencodex]` selector: the user's own element + * survives every operation, we replace only ours, and a disable leaves the + * sequence exactly as the user wrote it. + */ + test("apply, refresh and disable touch only our element of the sequence", () => { + const configPath = installRaycast(USER_SEED); + + const applied = applyIntegration(request()); + expect(applied.ok).toBe(true); + const afterApply = readProviders(configPath); + expect(new Set(afterApply.providers.map(provider => provider.id))).toEqual(new Set(["lmstudio", OPENCODE_PROVIDER_ID])); + expect(afterApply.providers.find(provider => provider.id === "lmstudio")).toEqual(LMSTUDIO); + expect(ourProvider(afterApply).models.map(model => model.id)).toEqual(MODELS.map(model => model.namespaced).sort()); + + // A smaller catalog rewrites our element in place and nothing else. + const fewer = MODELS.filter(model => model.namespaced !== "mystery/model"); + const refreshed = refreshIntegration(request(fewer)); + expect(refreshed.ok).toBe(true); + const afterRefresh = readProviders(configPath); + expect(afterRefresh.providers.map(provider => provider.id)).toEqual(afterApply.providers.map(provider => provider.id)); + expect(afterRefresh.providers.find(provider => provider.id === "lmstudio")).toEqual(LMSTUDIO); + expect(ourProvider(afterRefresh).models.map(model => model.id)).toEqual(fewer.map(model => model.namespaced).sort()); + + const disabled = disableIntegration(request(fewer)); + expect(disabled.ok).toBe(true); + const afterDisable = readProviders(configPath); + expect(afterDisable.providers).toEqual([LMSTUDIO]); + }); + + test("the default catalog refresh updates an owned Raycast provider", async () => { + const configPath = installRaycast(USER_SEED); + expect(applyIntegration(request()).ok).toBe(true); + const fewer = MODELS.filter(model => model.namespaced !== "mystery/model"); + let loads = 0; + + const outcomes = await refreshOwnedCatalogIntegrations({ + models: async () => { + loads += 1; + return fewer; + }, + config: CONFIG, + port: 10100, + env: {}, + home, + store, + }); + + expect(outcomes).toEqual([{ client: "raycast", ok: true, changed: true }]); + expect(loads).toBe(1); + expect(readProviders(configPath).providers.find(provider => provider.id === "lmstudio")).toEqual(LMSTUDIO); + expect(ourProvider(readProviders(configPath)).models.map(model => model.id)) + .toEqual(fewer.map(model => model.namespaced).sort()); + }); + + test("refuses a file whose providers is a map rather than a sequence", () => { + // `providers: {}` is a container we would have to REPLACE with `[]` to + // write our element, and replacing a user's container is never a success. + const configPath = installRaycast("providers: {}" + String.fromCharCode(10)); + const result = applyIntegration(request()); + expect(result.ok).toBe(false); + if (!result.ok) expect(result.reason).toBe("unsafe"); + expect(readFileSync(configPath, "utf8")).toBe("providers: {}" + String.fromCharCode(10)); + }); + + test("refuses when the ai directory does not exist yet", () => { + // The directory appears only after "Reveal Providers Config" in Raycast's + // AI settings, which is the signal that Custom Providers is reachable. + const result = applyIntegration(request()); + expect(result.ok).toBe(false); + if (!result.ok) expect(result.reason).toBe("not_installed"); + }); +}); diff --git a/tests/clients/raycast-detect.test.ts b/tests/clients/raycast-detect.test.ts new file mode 100644 index 0000000000..4e4268b29b --- /dev/null +++ b/tests/clients/raycast-detect.test.ts @@ -0,0 +1,82 @@ +import { describe, expect, test } from "bun:test"; +import { detectRaycast, type RaycastDetectDeps } from "../../src/integrations/raycast-detect"; + +/** + * Stubbed deps only. The real detector spawns `defaults` and reads the + * developer's subscription state, and this suite must pass identically on a + * machine with Raycast Pro, with the free tier, and with no Raycast at all. + */ +function fakeDeps( + platform: string, + existing: readonly string[], + options: { env?: Record; defaultValue?: string | null; homedir?: string } = {}, +): RaycastDetectDeps & { defaultsReads: number } { + const present = new Set(existing); + const deps = { + platform, + homedir: options.homedir ?? (platform === "win32" ? "C:\\Users\\u" : "/home/u"), + env: options.env ?? {}, + defaultsReads: 0, + exists: (path: string) => present.has(path), + readDefault: (domain: string, key: string) => { + deps.defaultsReads += 1; + expect(domain).toBe("com.raycast.macos.v1"); + expect(key).toBe("subscriptions_active"); + return options.defaultValue ?? null; + }, + }; + return deps; +} + +describe("detectRaycast", () => { + test("darwin: a Pro subscription, the app bundle and the revealed ai folder", () => { + const deps = fakeDeps("darwin", ["/Applications/Raycast.app", "/home/u/.config/raycast/ai"], { defaultValue: "1" }); + expect(detectRaycast(deps)).toEqual({ + appPath: "/Applications/Raycast.app", + aiDirPresent: true, + plan: "pro", + }); + // One process spawn per detection, not one per field. + expect(deps.defaultsReads).toBe(1); + }); + + test("darwin: the free tier is reported, not refused, and the user-local bundle is found", () => { + const deps = fakeDeps("darwin", ["/home/u/Applications/Raycast.app"], { defaultValue: "0" }); + expect(detectRaycast(deps)).toEqual({ + appPath: "/home/u/Applications/Raycast.app", + aiDirPresent: false, + plan: "free", + }); + }); + + test("darwin: a failed or unexpected defaults read is unknown, never free", () => { + expect(detectRaycast(fakeDeps("darwin", [], { defaultValue: null })).plan).toBe("unknown"); + expect(detectRaycast(fakeDeps("darwin", [], { defaultValue: "(null)" })).plan).toBe("unknown"); + expect(detectRaycast(fakeDeps("darwin", [], { defaultValue: "" })).plan).toBe("unknown"); + }); + + test("win32: LOCALAPPDATA\\Programs\\Raycast is the install path and the plan is unknown", () => { + const local = "C:\\Users\\u\\AppData\\Local"; + const deps = fakeDeps("win32", [`${local}\\Programs\\Raycast`, "C:\\Users\\u\\.config\\raycast\\ai"], { + env: { LOCALAPPDATA: local }, + defaultValue: "1", + }); + expect(detectRaycast(deps)).toEqual({ + appPath: `${local}\\Programs\\Raycast`, + aiDirPresent: true, + plan: "unknown", + }); + // `defaults` does not exist off macOS, so it is never asked. + expect(deps.defaultsReads).toBe(0); + }); + + test("win32: no LOCALAPPDATA means no app path rather than a guessed one", () => { + expect(detectRaycast(fakeDeps("win32", [])).appPath).toBeNull(); + }); + + test("linux: nothing is detected and nothing is spawned", () => { + const deps = fakeDeps("linux", [], { defaultValue: "1" }); + expect(detectRaycast(deps)).toEqual({ appPath: null, aiDirPresent: false, plan: "unknown" }); + expect(deps.defaultsReads).toBe(0); + }); +}); diff --git a/tests/clients/sync-client-integrations.test.ts b/tests/clients/sync-client-integrations.test.ts index 5661373642..9050eecd3b 100644 --- a/tests/clients/sync-client-integrations.test.ts +++ b/tests/clients/sync-client-integrations.test.ts @@ -65,7 +65,7 @@ describe("ocx sync fans out to enabled native clients and owned file integration expect(fn).toContain("grokIntegrationEnabled(config)"); expect(fn).toContain("claudeDesktopIntegrationEnabled(config)"); - expect(fn).toContain('["mcode", "pi", "aside"]'); + expect(fn).toContain('["mcode", "pi", "aside", "raycast"]'); expect(fn).toContain("refreshOwnedCatalogIntegrations"); // Native clients keep their catches; the owned catalog helper isolates file clients. expect(fn.match(/catch \(error\)/g)?.length).toBe(2); @@ -651,17 +651,29 @@ describe("owned Pi/Aside catalogs follow filtered model selections", () => { }); }); -test("the direct ocx sync command refreshes MCode, Pi and Aside instead of relying on /api/sync", async () => { +test("the direct ocx sync command refreshes MCode, Pi, Raycast and server-owned Aside", async () => { const src = await Bun.file(new URL("../../src/cli/dispatch.ts", import.meta.url)).text(); const start = src.indexOf("sync: async deps =>"); const command = src.slice(start, src.indexOf("v2: async deps =>", start)); expect(command).toContain("refreshOwnedCatalogIntegrations"); - expect(command).toContain('["mcode", "pi"]'); + expect(command).toContain('["mcode", "pi", "raycast"]'); expect(command).toContain("refreshAsideProfilesThroughServer"); expect(command.indexOf("syncModelsToCodex")).toBeLessThan(command.indexOf("refreshOwnedCatalogIntegrations")); expect(command).toContain('synced.status !== "refused"'); }); +test("startup and ensure refresh owned Raycast through the catalog coordinator", async () => { + const src = await Bun.file(new URL("../../src/cli/index.ts", import.meta.url)).text(); + const start = src.slice(src.indexOf("async function handleStart"), src.indexOf("function detachedStartEnvironment")); + const ensure = src.slice(src.indexOf("async function handleEnsure"), src.indexOf("async function handleTrayProxyStart")); + expect(src).toContain("refreshOwnedCatalogIntegrations"); + expect(src).toContain('}, ["raycast"]);'); + expect(start).toContain("await refreshOwnedRaycastCatalog(config, port)"); + expect(ensure).toContain("await refreshOwnedRaycastCatalog(config, live.port)"); + expect(ensure).toContain("await refreshOwnedRaycastCatalog(config, port)"); + expect(src).not.toContain("refreshAllOwnedIntegrations"); +}); + test("identical explicit mutation keys join but cannot swallow a different apply or disable", async () => { let release!: () => void; const gate = new Promise(resolve => { release = resolve; }); diff --git a/tests/config/client-config-export-new-clients.test.ts b/tests/config/client-config-export-new-clients.test.ts index 6b6b4c4e80..5a381d6237 100644 --- a/tests/config/client-config-export-new-clients.test.ts +++ b/tests/config/client-config-export-new-clients.test.ts @@ -58,12 +58,14 @@ function ctx(config: OcxConfig = LOOPBACK): ExportContext { describe("no secret reaches a client config", () => { test("the generated client support policy identifies every loopback-only integration", () => { - // Pi, Kimi, Gajae and Aside cannot emit the dedicated admission header -- - // Aside's observed provider block has four keys and none is `headers`. OMP - // and Prime can carry provider headers, but remote credential wiring is - // deliberately deferred from those initial generated integrations. + // Pi, Kimi, Gajae, Aside and Raycast cannot emit the dedicated admission + // header -- Aside's observed provider block has four keys and none is + // `headers`; Raycast's `api_keys` is read literally with no env + // interpolation. OMP and Prime can carry provider headers, but remote + // credential wiring is deliberately deferred from those initial generated + // integrations. const loopbackOnly = EXPORT_CLIENT_IDS.filter(id => EXPORT_CLIENTS[id].loopbackOnly); - expect(loopbackOnly).toEqual(["pi", "omp", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside"]); + expect(loopbackOnly).toEqual(["pi", "omp", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", "raycast"]); }); test("every client that is not loopback-only carries the header on a remote bind", () => { diff --git a/tests/config/client-config-export.test.ts b/tests/config/client-config-export.test.ts index 707d6dd62c..6a71813e9f 100644 --- a/tests/config/client-config-export.test.ts +++ b/tests/config/client-config-export.test.ts @@ -32,6 +32,7 @@ import { normalizeExportModels as leafNormalizeExportModels } from "../../src/cl import * as omp from "../../src/clients/config-export/omp"; import * as dsh from "../../src/clients/config-export/dsh"; import * as mcode from "../../src/clients/config-export/mcode"; +import * as raycast from "../../src/clients/config-export/raycast"; import * as zcode from "../../src/clients/config-export/zcode"; /** @@ -100,6 +101,7 @@ describe("split config-export public facade", () => { ["dsh", dsh.buildDshClientConfig, dsh.summarizeDsh, dsh.buildDshContribution], ["mcode", mcode.buildMcodeClientConfig, mcode.summarizeMcode, mcode.buildMcodeContribution], ["zcode", zcode.buildZcodeClientConfig, zcode.summarizeZcode, zcode.buildZcodeContribution], + ["raycast", raycast.buildRaycastClientConfig, raycast.summarizeRaycast, raycast.buildRaycastContribution], ] as const; for (const [id, build, summarize, contribute] of leaves) { expect(EXPORT_CLIENTS[id].build).toBe(build); @@ -803,8 +805,8 @@ describe("hub-resolved Fast exports", () => { }); describe("EXPORT_CLIENTS registry", () => { - test("covers exactly the twelve file-toggle clients", () => { - expect(EXPORT_CLIENT_IDS).toEqual(["opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside"]); + test("covers exactly the thirteen file-toggle clients", () => { + expect(EXPORT_CLIENT_IDS).toEqual(["opencode", "pi", "omp", "hermes", "openclaw", "kimi", "gajae", "dsh", "mcode", "zcode", "prime", "aside", "raycast"]); for (const id of EXPORT_CLIENT_IDS) expect(isExportClientId(id)).toBe(true); // The exception clients keep their own surfaces and are not export clients. expect(isExportClientId("claude-desktop")).toBe(false); diff --git a/tests/config/client-config-new-clients.test.ts b/tests/config/client-config-new-clients.test.ts index 65b52727c9..7deb7fdb36 100644 --- a/tests/config/client-config-new-clients.test.ts +++ b/tests/config/client-config-new-clients.test.ts @@ -17,6 +17,7 @@ import { type OpenclawGeneratedConfig, } from "../../src/clients/config-export"; import { serializeDocument } from "../../src/integrations/serialize"; +import { readPath } from "../../src/integrations/state"; import type { OcxConfig } from "../../src/types"; /** @@ -159,14 +160,11 @@ describe("contributions describe what a writer would own", () => { test("every client's fragments point at real entries in its own document", () => { for (const clientId of EXPORT_CLIENT_IDS) { - const document = buildClientConfig(clientId, ctx()) as Record; + const document = buildClientConfig(clientId, ctx()); for (const fragment of EXPORT_CLIENTS[clientId].buildContribution(ctx()).fragments) { - let cursor: unknown = document; - for (const key of fragment.path) { - expect(cursor && typeof cursor === "object").toBe(true); - cursor = (cursor as Record)[key]; - } - expect(cursor).toEqual(fragment.value); + // Read through the writer's own segment grammar: Raycast's path holds + // a `[id=opencodex]` selector into a sequence, not a map key. + expect(readPath(document, fragment.path)).toEqual(fragment.value); } } }); diff --git a/tests/fixtures/test-layout-expected.json b/tests/fixtures/test-layout-expected.json index 6565f12821..a00407e89a 100644 --- a/tests/fixtures/test-layout-expected.json +++ b/tests/fixtures/test-layout-expected.json @@ -525,6 +525,7 @@ "install-scripts.test.ts": "ci-workflows", "integrations-invariants.test.ts": "gui", "integrations-journal.test.ts": "clients", + "integrations-merge.test.ts": "clients", "integrations-serialize.test.ts": "clients", "integrations-state.test.ts": "clients", "integrations-writer.test.ts": "clients", @@ -833,6 +834,8 @@ "reserve-quota-scope.test.ts": "codex-integration", "rate-limit-reset-credits.test.ts": "gui", "rate-limit-retry.test.ts": "providers", + "raycast-client.test.ts": "clients", + "raycast-detect.test.ts": "clients", "reasoning-effort.test.ts": "codex-integration", "reasoning-replay-identity.test.ts": "adapters", "reasoning-replay-robustness.test.ts": "adapters", diff --git a/tests/gui/integrations-invariants.test.ts b/tests/gui/integrations-invariants.test.ts index 33e7480f86..2353104311 100644 --- a/tests/gui/integrations-invariants.test.ts +++ b/tests/gui/integrations-invariants.test.ts @@ -6,7 +6,7 @@ import { EXPORT_CLIENTS, EXPORT_CLIENT_IDS, type ExportModel } from "../../src/c import { parseConfig } from "../../src/integrations/config-io"; import { INTEGRATION_CLIENTS, INTEGRATION_CLIENT_IDS, type IntegrationClientId } from "../../src/integrations/registry"; import { createIntegrationStateStore, type IntegrationStateStore } from "../../src/integrations/store"; -import { readIntegrationState } from "../../src/integrations/state"; +import { readIntegrationState, readPath } from "../../src/integrations/state"; import { applyIntegration, disableIntegration, restoreIntegration } from "../../src/integrations/writer"; import { printSubcommandUsage, printUsage } from "../../src/cli/help"; import type { OcxConfig } from "../../src/types"; @@ -78,9 +78,9 @@ afterEach(() => { }); describe("the client registries cannot drift apart", () => { - test("every list of clients holds exactly the same twelve ids", async () => { + test("every list of clients holds exactly the same thirteen ids", async () => { /* - * Five lists name the same twelve clients, and two of them are maintained by + * Five lists name the same thirteen clients, and two of them are maintained by * hand: the GUI cannot import the backend registry, because that would * pull node:os and node:path into the browser bundle. A client added * server-side renders no row until someone remembers the tuple, and the @@ -91,7 +91,7 @@ describe("the client registries cannot drift apart", () => { const guiRouting = await import("../../gui/src/app-routing"); const expected = [...EXPORT_CLIENT_IDS].sort(); - expect(expected).toHaveLength(12); + expect(expected).toHaveLength(13); expect([...INTEGRATION_CLIENT_IDS].sort()).toEqual(expected); expect([...gui.CLIENTS].sort()).toEqual(expected); @@ -170,6 +170,13 @@ describe("every client survives a full lifecycle", () => { prime: '{\n "providers": {\n "mine": { "api": "http://keep-me" }\n }\n}\n', // Aside reads the same models.json contract as Pi and Prime. aside: '{\n "providers": {\n "mine": { "api": "http://keep-me" }\n }\n}\n', + // Raycast's `providers` is a SEQUENCE keyed by `id`, so the user's entry is + // a sibling element rather than a sibling map key. + raycast: "providers:\n - id: lmstudio\n name: LM Studio\n base_url: http://localhost:1234/v1\n models: []\n", + }; + /** Where the seed's user-owned entry lives when the seed is a sequence. */ + const USER_ELEMENT: Partial> = { + raycast: ["providers", "[id=lmstudio]"], }; for (const clientId of INTEGRATION_CLIENT_IDS) { @@ -190,18 +197,22 @@ describe("every client survives a full lifecycle", () => { const afterApply = parseConfig(readFileSync(configPath, "utf8"), format); const record = store.readRecords()[clientId]!; expect(record.fragmentPaths.length).toBeGreaterThan(0); + // Read through the writer's own segment grammar: Raycast's path holds a + // `[id=opencodex]` selector into a sequence, not a map key. for (const path of record.fragmentPaths) { - let cursor: unknown = afterApply; - for (const segment of path) { - expect(cursor && typeof cursor === "object").toBe(true); - cursor = (cursor as Record)[segment]; - } - expect(cursor).toBeDefined(); + expect(readPath(afterApply, path)).toBeDefined(); + } + // …and the user's own entry is untouched. `toMatchObject` treats an + // array as exact-length, so a sequence-shaped seed is checked by the + // same selector the writer uses to find its own element. + const userElement = USER_ELEMENT[clientId]; + if (userElement) { + expect(readPath(afterApply, userElement)).toEqual(readPath(original, userElement)); + } else { + expect((afterApply as Record)).toMatchObject( + original as Record, + ); } - // …and the user's own entry is untouched. - expect((afterApply as Record)).toMatchObject( - original as Record, - ); const disabled = disableIntegration({ clientId, models: MODELS, config: CONFIG, port: 10100, diff --git a/tests/server/management-integration-routes.test.ts b/tests/server/management-integration-routes.test.ts index 1f8cba92a2..e0d6563aea 100644 --- a/tests/server/management-integration-routes.test.ts +++ b/tests/server/management-integration-routes.test.ts @@ -14,6 +14,7 @@ import { handleManagementAPI } from "../../src/server/management-api"; import { setIntegrationMutationFlightTestHooks, setIntegrationPathTestHooks, + setRaycastDetectTestHook, } from "../../src/server/management/integration-routes"; import type { OcxConfig } from "../../src/types"; import { catalogConvergenceFactory } from "../helpers/catalog-convergence"; @@ -274,6 +275,31 @@ describe("GET /api/client-integrations", () => { // A read is a read: it appends nothing. expect(store.listOperations()).toHaveLength(before); }); + + test("the raycast envelope carries the plan block; every other client's does not", async () => { + // Stubbed: the real detector spawns `defaults` and would report the + // developer's own subscription. + setRaycastDetectTestHook(() => ({ appPath: "/Applications/Raycast.app", aiDirPresent: false, plan: "free" })); + try { + const raycast = await api("/api/client-integrations/raycast"); + expect(raycast.status).toBe(200); + const body = await raycast.json() as { clientId: string; raycast?: { plan: string; appPath: string | null; aiDirPresent: boolean } }; + expect(body.clientId).toBe("raycast"); + expect(body.raycast).toEqual({ appPath: "/Applications/Raycast.app", aiDirPresent: false, plan: "free" }); + + installHermes(); + const hermes = await api("/api/client-integrations/hermes"); + expect(hermes.status).toBe(200); + expect("raycast" in (await hermes.json() as Record)).toBe(false); + + // The collection read describes files, not apps: no client gets the block there. + const list = await api("/api/client-integrations"); + const { clients } = await list.json() as { clients: Array> }; + expect(clients.some(client => "raycast" in client)).toBe(false); + } finally { + setRaycastDetectTestHook(null); + } + }); }); /** The models the route itself derives, so expectations cannot drift from it. */ From ea3d03aeccd1cd9ebf37508f81ae7ff113e140b0 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:40:03 +0900 Subject: [PATCH 078/221] fix(integrations): repair Raycast #3733 ownership and plan guidance Reject duplicate selectors before ownership classification with or without a record. Validate unknown summary shapes; repair French, Turkish and Traditional Chinese client catalogs and optional api_keys guidance. Clarify unknown Pro activity in all GUI locales and advisory-only private detection. Retain export capability conventions and document their limits. Add selector cardinality, malformed summaries, unowned refresh, admission refusal and Windows notice regressions. Tests, typecheck, lint and builds NOT RUN per worker scope; combined remote CI and rendered preview belong to main. git diff --check passed. Co-authored-by: Chanhee Lee --- .../content/docs/fr/guides/integrations.md | 21 ++++--- .../src/content/docs/guides/integrations.md | 16 +++-- .../content/docs/tr/guides/integrations.md | 19 ++++-- .../content/docs/zh-tw/guides/integrations.md | 16 +++-- gui/src/i18n/de.ts | 2 +- gui/src/i18n/en.ts | 2 +- gui/src/i18n/fr.ts | 2 +- gui/src/i18n/ja.ts | 2 +- gui/src/i18n/ko.ts | 2 +- gui/src/i18n/ru.ts | 2 +- gui/src/i18n/tr.ts | 2 +- gui/src/i18n/zh-TW.ts | 2 +- gui/src/i18n/zh.ts | 2 +- gui/src/pages/integrations/integration-api.ts | 1 + gui/tests/raycast-plan-notice.test.tsx | 18 ++++-- src/clients/config-export/raycast.ts | 26 +++++++- src/integrations/merge.ts | 4 +- src/integrations/raycast-detect.ts | 5 +- src/integrations/state.ts | 25 ++++++-- src/integrations/writer.ts | 8 ++- tests/clients/integrations-merge.test.ts | 63 ++++++++++++++----- tests/clients/raycast-client.test.ts | 49 ++++++++++++++- 22 files changed, 223 insertions(+), 66 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/integrations.md b/docs-site/src/content/docs/fr/guides/integrations.md index c70d471f39..6a0a6d0dd3 100644 --- a/docs-site/src/content/docs/fr/guides/integrations.md +++ b/docs-site/src/content/docs/fr/guides/integrations.md @@ -1,10 +1,10 @@ --- title: Intégrations -description: Connectez opencodex à OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code et Raycast depuis le tableau de bord — un commutateur par client, avec une sauvegarde avant chaque écriture. +description: Connectez opencodex à OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code, ZCode, Prime Agent, Aside et Raycast depuis le tableau de bord — un commutateur par client, avec une sauvegarde avant chaque écriture. --- L'onglet **Intégrations** écrit le bloc fournisseur d'opencodex dans le fichier de configuration du client, -puis peut le retirer. Dix clients fonctionnent ainsi, chacun avec son propre commutateur : +puis peut le retirer. Treize clients fonctionnent ainsi, chacun avec son propre commutateur : | Client | Fichier de configuration | Format | Prise d'effet de la modification | Identifiant | |---|---|---|---|---| @@ -17,6 +17,9 @@ puis peut le retirer. Dix clients fonctionnent ainsi, chacun avec son propre com | Gajae Code | `~/.gjc/agent/models.yml` | YAML | dans les nouvelles sessions ou à l'ouverture de `/model` |`OPENCODEX_GAJAE_API_KEY` | | DeepSeek Harness (DSH) | `$DSH_HOME/settings.yaml` (`~/.dsh/settings.yaml` par défaut) | YAML | rechargement à chaud | jeton porteur fictif et non secret pour le bouclage | | MiniMax Code | `~/.minimax/config.yaml` | YAML | dans les nouvelles sessions ou après l’ouverture du sélecteur de modèles | valeur fictive de bouclage | +| Prime Agent | `~/.prime/agent/models.json` | JSON | dans les nouvelles sessions | valeur fictive de bouclage | +| ZCode | `~/.zcode/v2/config.json` | JSON | au redémarrage | valeur fictive de bouclage | +| Aside | `~/.aside/u//models.json` | JSON | après avoir quitté complètement puis rouvert Aside | valeur fictive de bouclage | | Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | immédiatement à l'enregistrement — Raycast surveille le fichier | aucun — bouclage uniquement | La prise en charge gérée de DSH exige au minimum **DSH 0.1.0-rc.6**. OpenCodex ne possède que le fragment @@ -45,14 +48,18 @@ d'installation et indique que le client n'est pas installé tant qu'il n'existe Le bloc géré est un seul élément, `id: opencodex`, dans la séquence `providers` du fichier : `name: OpenCodex`, `base_url: http://:/v1`, et chaque modèle routé avec ses `abilities` — -`tools` et `system_message` sont toujours pris en charge, `vision` suit les modalités d'entrée du +`tools` et `system_message` sont définis à `true` par convention d’export, `vision` suit les modalités d'entrée du catalogue, `reasoning_effort` est défini lorsque le modèle dispose d'une échelle d'effort, et `temperature` est désactivé pour les modèles de raisonnement. Les autres fournisseurs du fichier sont préservés, et la désactivation ne retire que l'élément OpenCodex. Raycast prend en compte la modification dès l'enregistrement du fichier, sans redémarrage ; les modèles apparaissent dans le -sélecteur de modèles de Raycast regroupés sous **OpenCodex**. Le fichier n'a aucun emplacement pour -un identifiant, ce client est donc limité au bouclage : aucune entrée `api_keys` n'est écrite et une -liaison hors bouclage est refusée. Le format est documenté sur +sélecteur de modèles de Raycast regroupés sous **OpenCodex**. Raycast accepte le champ facultatif +`api_keys`, mais OpenCodex l’omet volontairement et refuse les cibles hors bouclage ou exigeant +authentification : cette intégration ne fournit pas l’en-tête d’admission requis par OpenCodex. +Le signal Pro issu d’une préférence privée macOS est indicatif ; Windows ne la lit jamais et +renvoie un état inconnu. Il ne bloque pas l’écriture. Les métadonnées exportées ne prouvent pas +la prise en charge des outils pour chaque modèle. Les valeurs des autres fournisseurs sont +préservées, sans garantie pour les commentaires ou la mise en forme YAML. Le format est documenté sur [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). Les chemins respectent les variables de remplacement propres à chaque client, lorsqu'elles existent. Pour @@ -115,7 +122,7 @@ niveaux. Dans ces cas, le commutateur est verrouillé afin que rien ne soit modi **OMP** n'est pas affecté non plus par les modifications voisines, mais pour une autre raison : son outil d'écriture ne modifie, octet par octet, que sa propre plage `providers.opencodex` ; le reste du fichier n'est jamais réécrit. Pour les autres formats susceptibles de contenir des commentaires (Hermes, OpenClaw, -Kimi Code, Gajae Code, MiniMax Code et Raycast — documents YAML, JSON5 et TOML réécrits en entier), ou lorsque les propres entrées +Kimi Code, Gajae Code, MiniMax Code, ZCode, Prime Agent, Aside et Raycast — documents YAML, JSON5 et TOML réécrits en entier), ou lorsque les propres entrées d'opencodex ont été modifiées, le commutateur se verrouille et la désactivation est refusée plutôt que de deviner quelles modifications vous appartiennent. diff --git a/docs-site/src/content/docs/guides/integrations.md b/docs-site/src/content/docs/guides/integrations.md index bb8cea7001..e6230e4956 100644 --- a/docs-site/src/content/docs/guides/integrations.md +++ b/docs-site/src/content/docs/guides/integrations.md @@ -73,14 +73,22 @@ not honor `XDG_CONFIG_HOME`, so that path is not relocatable. The managed block is one element, `id: opencodex`, in the file's `providers` sequence: `name: OpenCodex`, `base_url: http://:/v1`, and every -routed model with its `abilities` — `tools` and `system_message` are always -supported, `vision` follows the catalog's input modalities, `reasoning_effort` +routed model with its `abilities` — the exporter sets `tools` and `system_message` to +`true` as a client-export convention, `vision` follows the catalog's input modalities, `reasoning_effort` is set when the model has an effort ladder, and `temperature` is turned off for reasoning models. Other providers in the file are preserved, and disable removes only the OpenCodex element. Raycast picks up the change as soon as the file is saved, no restart needed; the models appear in Raycast's model picker grouped -under **OpenCodex**. The file has no place for a credential, so this client is -loopback-only: no `api_keys` entry is written and a non-loopback bind is refused. +under **OpenCodex**. Raycast supports optional `api_keys`, but OpenCodex intentionally +omits them and refuses non-loopback or admission-authenticated targets; this integration +cannot supply OpenCodex's required admission header. + +The macOS private preference is only an advisory Pro hint; Windows never reads it and +reports the plan as unknown. Plan detection does not authorize or block a write. +The export metadata has no authoritative tool-support flag, so `tools: true` does not +prove every routed model supports tools. Vision and effort flags follow catalog metadata; +turning temperature off for an effort ladder is conservative export behavior. +Provider values are preserved; YAML formatting and comments are not guaranteed to survive. The format is documented at [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). diff --git a/docs-site/src/content/docs/tr/guides/integrations.md b/docs-site/src/content/docs/tr/guides/integrations.md index ff0dcaa41e..145cd8c6bc 100644 --- a/docs-site/src/content/docs/tr/guides/integrations.md +++ b/docs-site/src/content/docs/tr/guides/integrations.md @@ -1,10 +1,10 @@ --- title: Entegrasyonlar -description: Kontrol panelinden OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code ve Raycast'i opencodex'e bağlayın — istemci başına tek bir anahtar ve her yazmadan önce alınan bir yedek. +description: Kontrol panelinden OpenCode, Pi, OMP, Hermes, OpenClaw, Kimi Code, Gajae Code, DeepSeek Harness, MiniMax Code, ZCode, Prime Agent, Aside ve Raycast'i opencodex'e bağlayın — istemci başına tek bir anahtar ve her yazmadan önce alınan bir yedek. --- **Entegrasyonlar** sekmesi, opencodex'in sağlayıcı bloğunu istemcinin kendi -yapılandırma dosyasına yazar ve tekrar kaldırır. On istemci bu şekilde +yapılandırma dosyasına yazar ve tekrar kaldırır. On üç istemci bu şekilde çalışır, her biri bir anahtarla: | İstemci | Yapılandırma dosyası | Format | Değişiklik ne zaman geçerli olur? | Kimlik bilgisi | @@ -18,6 +18,9 @@ yapılandırma dosyasına yazar ve tekrar kaldırır. On istemci bu şekilde | Gajae Code | `~/.gjc/agent/models.yml` | YAML | yeni oturumlarda veya `/model` açtığınızda | `OPENCODEX_GAJAE_API_KEY` | | DeepSeek Harness (DSH) | `$DSH_HOME/settings.yaml` (varsayılan `~/.dsh/settings.yaml`) | YAML | çalışırken yeniden yükleme | gizli olmayan geri döngü bearer yer tutucusu | | MiniMax Code | `~/.minimax/config.yaml` | YAML | yeni oturumlarda veya model seçici açıldıktan sonra | geri döngü (loopback) yer tutucusu | +| Prime Agent | `~/.prime/agent/models.json` | JSON | yeni oturumlarda | geri döngü yer tutucusu | +| ZCode | `~/.zcode/v2/config.json` | JSON | yeniden başlatmada | geri döngü yer tutucusu | +| Aside | `~/.aside/u//models.json` | JSON | Aside tamamen kapatılıp yeniden açıldıktan sonra | geri döngü yer tutucusu | | Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | kaydedildiği anda — Raycast dosyayı izler | yok — yalnızca geri döngü | Yönetilen DSH desteğinin en düşük uyumlu sürümü **DSH 0.1.0-rc.6**'dır. OpenCodex yalnızca @@ -48,14 +51,18 @@ yol taşınamaz. Yönetilen blok, dosyanın `providers` dizisindeki tek bir öğedir: `id: opencodex`, `name: OpenCodex`, `base_url: http://:/v1` ve `abilities` alanıyla birlikte -yönlendirilen her model — `tools` ve `system_message` her zaman destekli, `vision` +yönlendirilen her model — dışa aktarma kuralı olarak `tools` ve `system_message` değeri `true` olur, `vision` kataloğun giriş modalitelerini izler, `reasoning_effort` modelin bir çaba merdiveni varsa ayarlanır ve `temperature` akıl yürütme modelleri için kapatılır. Dosyadaki diğer sağlayıcılar korunur ve devre dışı bırakma yalnızca OpenCodex öğesini kaldırır. Raycast değişikliği dosya kaydedilir kaydedilmez, yeniden başlatma gerekmeden alır; modeller -Raycast'in model seçicisinde **OpenCodex** altında gruplanmış olarak görünür. Dosyada -kimlik bilgisi için bir yer yoktur, bu yüzden bu istemci yalnızca geri döngü içindir: -hiçbir `api_keys` girdisi yazılmaz ve geri döngü dışı bir bağlama reddedilir. Format +Raycast'in model seçicisinde **OpenCodex** altında gruplanmış olarak görünür. Raycast şeması +isteğe bağlı `api_keys` alanını destekler; OpenCodex bu alanı bilerek yazmaz ve geri döngü +dışı veya kimlik doğrulaması gerektiren hedefleri reddeder. Bu entegrasyon OpenCodex'in +zorunlu kabul başlığını sağlayamaz. macOS'taki özel tercih yalnızca bir Pro ipucudur; +Windows bu tercihi hiç okumaz ve durumu bilinmiyor olarak bildirir. Bu bilgi yazmayı engellemez. +Dışa aktarılan meta veriler her modelin araç desteğini doğrulamaz. Diğer sağlayıcıların +değerleri korunur; YAML biçimlendirmesi ve yorumlarının korunması garanti edilmez. Format [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers) adresinde belgelenmiştir. diff --git a/docs-site/src/content/docs/zh-tw/guides/integrations.md b/docs-site/src/content/docs/zh-tw/guides/integrations.md index ebf2e6f0de..6a42ea8571 100644 --- a/docs-site/src/content/docs/zh-tw/guides/integrations.md +++ b/docs-site/src/content/docs/zh-tw/guides/integrations.md @@ -1,9 +1,9 @@ --- title: 整合 -description: 從儀表板把 opencodex 連接到 OpenCode、Pi、OMP、Hermes、OpenClaw、Kimi Code、Gajae Code、DeepSeek Harness、MiniMax Code 與 Raycast——每個客戶端一個開關,每次寫入前都會先備份。 +description: 從儀表板把 opencodex 連接到 OpenCode、Pi、OMP、Hermes、OpenClaw、Kimi Code、Gajae Code、DeepSeek Harness、MiniMax Code、ZCode、Prime Agent、Aside 與 Raycast——每個客戶端一個開關,每次寫入前都會先備份。 --- -**整合(Integrations)** 分頁會把 opencodex 的 provider 區塊寫入客戶端自己的設定檔,也會把它移除。共有十個客戶端以這種方式運作,每個都有一個開關: +**整合(Integrations)** 分頁會把 opencodex 的 provider 區塊寫入客戶端自己的設定檔,也會把它移除。共有十三個客戶端以這種方式運作,每個都有一個開關: | 客戶端 | 設定檔 | 格式 | 變更生效時機 | 憑證 | |---|---|---|---|---| @@ -16,6 +16,9 @@ description: 從儀表板把 opencodex 連接到 OpenCode、Pi、OMP、Hermes、 | Gajae Code | `~/.gjc/agent/models.yml` | YAML | 新 sessions,或當你開啟 `/model` 時 | `OPENCODEX_GAJAE_API_KEY` | | DeepSeek Harness (DSH) | `$DSH_HOME/settings.yaml`(預設 `~/.dsh/settings.yaml`) | YAML | 熱重載 | 非秘密的 loopback bearer 佔位符 | | MiniMax Code | `~/.minimax/config.yaml` | YAML | 新 sessions,或開啟模型選擇器後 | loopback 佔位符 | +| Prime Agent | `~/.prime/agent/models.json` | JSON | 新 sessions | loopback 佔位符 | +| ZCode | `~/.zcode/v2/config.json` | JSON | 重新啟動時 | loopback 佔位符 | +| Aside | `~/.aside/u//models.json` | JSON | 完全結束並重新開啟 Aside 後 | loopback 佔位符 | | Raycast | `~/.config/raycast/ai/providers.yaml` | YAML | 儲存後立即生效——Raycast 會監看該檔案 | 無——僅限 loopback | 受管理 DSH 支援的相容性下限是 **DSH 0.1.0-rc.6**。OpenCodex 只擁有 @@ -40,11 +43,14 @@ macOS 與 Windows 上同樣讀取 `~/.config/raycast/ai/providers.yaml`,且不 受管理區塊是檔案 `providers` 序列中的單一元素 `id: opencodex`:`name: OpenCodex`、 `base_url: http://:/v1`,以及每個路由模型及其 `abilities`——`tools` 與 -`system_message` 一律支援,`vision` 依目錄的輸入模態而定,`reasoning_effort` 在模型有 effort +`system_message` 依匯出慣例設為 `true`,`vision` 依目錄的輸入模態而定,`reasoning_effort` 在模型有 effort 階梯時設定,`temperature` 對推理模型關閉。檔案中的其他 provider 會被保留,停用只移除 OpenCodex 元素。檔案一儲存 Raycast 就會套用變更,不需重新啟動;模型會在 Raycast 的模型選擇器中歸在 -**OpenCodex** 群組下。該檔案沒有存放憑證的位置,因此此客戶端僅限 loopback:不會寫入任何 -`api_keys` 項目,非 loopback 的 bind 會被拒絕。格式說明見 +**OpenCodex** 群組下。Raycast 支援選填的 `api_keys`,但 OpenCodex 刻意省略該欄位,並拒絕 +非 loopback 或需要准入驗證的目標,因為此整合無法提供 OpenCodex 要求的准入標頭。 +macOS 私有偏好設定僅提供 Pro 狀態提示;Windows 完全不讀取該設定,狀態會是未知。 +此提示不會阻擋寫入。匯出中繼資料並未證實每個模型的工具能力。其他 provider 的值會保留, +但不保證 YAML 格式與註解不變。格式說明見 [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers)。 路徑遵循客戶端自己的環境覆寫(environment override)。對 OMP 而言,`OMP_PROFILE` 以存在與否優先於 `PI_PROFILE`,即使明確為空也一樣。具名 profile 會把 `PI_CONFIG_DIR` 當作相對於使用者家目錄的目錄名稱,並忽略 `PI_CODING_AGENT_DIR`;沒有具名 profile 時,`PI_CODING_AGENT_DIR` 勝出。OMP 支援 provider 層級的 headers,但這個最初的整合刻意只支援 loopback;遠端 `x-opencodex-api-key` 的連線設定被延後。搬移過的 `HERMES_HOME`、`KIMI_CODE_HOME` 與 `XDG_CONFIG_HOME` 路徑同樣會被遵循,而非猜測。表格列出每個客戶端的預設值。 diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index af5546775a..85e5c90a25 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -1255,7 +1255,7 @@ export const de: Record = { "integrations.semantics.aside": "Verwaltet nur providers.opencodex in der ~/.aside/u//models.json dieses Profils. Andere Provider bleiben unverändert. Beende Aside nach dem Anwenden vollständig und öffne es erneut.", "integrations.semantics.raycast": "Fügt einen OpenCodex-Provider-Eintrag in die providers.yaml von Raycast ein, damit jedes geroutete Modell in der Modellauswahl von Raycast AI erscheint. Raycast Pro erforderlich.", "integrations.raycast.proRequired": "Custom Providers ist eine Funktion von Raycast Pro. Die Datei wird geschrieben, aber Raycast ignoriert sie, bis ein Pro-Abonnement aktiv ist.", - "integrations.raycast.planUnknown": "Der Abonnementstatus von Raycast konnte nicht gelesen werden; Custom Providers erfordert Raycast Pro.", + "integrations.raycast.planUnknown": "Es konnte nicht festgestellt werden, ob Raycast Pro aktiv ist; Custom Providers erfordert Raycast Pro.", "integrations.raycast.revealConfig": "Öffnen Sie Raycast → Einstellungen → AI und klicken Sie einmal auf „Reveal Providers Config“, damit der Providers-Ordner existiert.", "codexAuth.mainAccount": "Hauptkonto", "codexAuth.logLabel": "Log-Kennung", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 71bfd5e2c3..4d9514e4de 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -1802,7 +1802,7 @@ export const en = { "integrations.semantics.aside": "Manages only providers.opencodex in this profile’s ~/.aside/u//models.json. Your other providers stay unchanged. Fully quit and reopen Aside after applying.", "integrations.semantics.raycast": "Adds an OpenCodex provider entry to Raycast's providers.yaml so every routed model appears in the Raycast AI model picker. Raycast Pro required.", "integrations.raycast.proRequired": "Custom Providers is a Raycast Pro feature. The file will be written, but Raycast ignores it until a Pro subscription is active.", - "integrations.raycast.planUnknown": "Could not read the Raycast subscription state; Custom Providers requires Raycast Pro.", + "integrations.raycast.planUnknown": "Could not determine whether Raycast Pro is active; Custom Providers requires Raycast Pro.", "integrations.raycast.revealConfig": "Open Raycast → Settings → AI and click Reveal Providers Config once so the providers folder exists.", "codexAuth.mainAccount": "Main Account", "codexAuth.logLabel": "Log label", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index 028e910bc3..3b370fa20d 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -1734,7 +1734,7 @@ export const fr: Record = { "integrations.semantics.aside": "Gère uniquement providers.opencodex dans le fichier ~/.aside/u//models.json de ce profil. Vos autres fournisseurs restent inchangés. Quittez complètement Aside et relancez-le après application.", "integrations.semantics.raycast": "Ajoute une entrée de fournisseur OpenCodex dans le providers.yaml de Raycast afin que chaque modèle routé apparaisse dans le sélecteur de modèles de Raycast AI. Raycast Pro requis.", "integrations.raycast.proRequired": "Custom Providers est une fonctionnalité Raycast Pro. Le fichier sera écrit, mais Raycast l'ignore tant qu'un abonnement Pro n'est pas actif.", - "integrations.raycast.planUnknown": "Impossible de lire l'état de l'abonnement Raycast ; Custom Providers nécessite Raycast Pro.", + "integrations.raycast.planUnknown": "Impossible de déterminer si Raycast Pro est actif ; Custom Providers nécessite Raycast Pro.", "integrations.raycast.revealConfig": "Ouvrez Raycast → Réglages → AI et cliquez une fois sur « Reveal Providers Config » pour que le dossier des fournisseurs existe.", "codexAuth.mainAccount": "Compte principal", "codexAuth.logLabel": "Libellé du journal", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 864b498483..2112788943 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -1675,7 +1675,7 @@ export const ja: Record = { "integrations.semantics.aside": "このプロファイルの ~/.aside/u//models.json 内の providers.opencodex のみを管理します。他のプロバイダーは変更しません。適用後は Aside を完全に終了してから開き直してください。", "integrations.semantics.raycast": "Raycast の providers.yaml に OpenCodex のプロバイダーエントリを追加し、ルーティングされたすべてのモデルを Raycast AI のモデル選択に表示します。Raycast Pro が必要です。", "integrations.raycast.proRequired": "Custom Providers は Raycast Pro の機能です。ファイルは書き込まれますが、Pro サブスクリプションが有効になるまで Raycast はこれを無視します。", - "integrations.raycast.planUnknown": "Raycast のサブスクリプション状態を読み取れませんでした。Custom Providers には Raycast Pro が必要です。", + "integrations.raycast.planUnknown": "Raycast Pro が有効かどうか確認できませんでした。Custom Providers には Raycast Pro が必要です。", "integrations.raycast.revealConfig": "Raycast → 設定 → AI を開き、「Reveal Providers Config」を一度クリックして providers フォルダを作成してください。", "codexAuth.mainAccount": "メインアカウント", "codexAuth.logLabel": "ログラベル", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 364805943e..2edc3de875 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -1279,7 +1279,7 @@ export const ko: Record = { "integrations.semantics.aside": "이 프로필의 ~/.aside/u//models.json에서 providers.opencodex만 관리합니다. 다른 프로바이더는 그대로 유지됩니다. 적용 후 Aside를 완전히 종료하고 다시 여세요.", "integrations.semantics.raycast": "Raycast의 providers.yaml에 OpenCodex 프로바이더 항목을 추가해 라우팅된 모든 모델이 Raycast AI 모델 선택기에 표시되도록 합니다. Raycast Pro가 필요합니다.", "integrations.raycast.proRequired": "Custom Providers는 Raycast Pro 기능입니다. 파일은 기록되지만 Pro 구독이 활성화될 때까지 Raycast는 이를 무시합니다.", - "integrations.raycast.planUnknown": "Raycast 구독 상태를 읽을 수 없습니다. Custom Providers에는 Raycast Pro가 필요합니다.", + "integrations.raycast.planUnknown": "Raycast Pro 활성 여부를 확인할 수 없습니다. Custom Providers에는 Raycast Pro가 필요합니다.", "integrations.raycast.revealConfig": "Raycast → 설정 → AI를 열고 「Reveal Providers Config」를 한 번 클릭해 providers 폴더를 만드세요.", "codexAuth.mainAccount": "메인 계정", "codexAuth.logLabel": "로그 라벨", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index bfd6e0182e..a0675e554d 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -1745,7 +1745,7 @@ export const ru: Record = { "integrations.semantics.aside": "Управляет только providers.opencodex в файле ~/.aside/u//models.json этого профиля. Другие провайдеры остаются без изменений. После применения полностью закройте и снова откройте Aside.", "integrations.semantics.raycast": "Добавляет запись провайдера OpenCodex в providers.yaml Raycast, чтобы каждая маршрутизируемая модель появилась в выборе моделей Raycast AI. Требуется Raycast Pro.", "integrations.raycast.proRequired": "Custom Providers — функция Raycast Pro. Файл будет записан, но Raycast игнорирует его, пока не активна подписка Pro.", - "integrations.raycast.planUnknown": "Не удалось прочитать состояние подписки Raycast; для Custom Providers требуется Raycast Pro.", + "integrations.raycast.planUnknown": "Не удалось определить, активен ли Raycast Pro; для Custom Providers требуется Raycast Pro.", "integrations.raycast.revealConfig": "Откройте Raycast → Настройки → AI и один раз нажмите «Reveal Providers Config», чтобы папка провайдеров появилась.", "codexAuth.mainAccount": "Основной аккаунт", "codexAuth.logLabel": "Метка журнала", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index 83ad09002b..8b8a9aa0c5 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -1751,7 +1751,7 @@ export const tr: Record = { "integrations.semantics.aside": "Yalnızca bu profilin ~/.aside/u//models.json dosyasındaki providers.opencodex bölümünü yönetir. Diğer sağlayıcılarınız değişmez. Uyguladıktan sonra Aside’ı tamamen kapatıp yeniden açın.", "integrations.semantics.raycast": "Raycast'in providers.yaml dosyasına bir OpenCodex sağlayıcı girdisi ekler; böylece yönlendirilen her model Raycast AI model seçicisinde görünür. Raycast Pro gerekir.", "integrations.raycast.proRequired": "Custom Providers bir Raycast Pro özelliğidir. Dosya yazılır, ancak bir Pro aboneliği etkin olana kadar Raycast bunu yok sayar.", - "integrations.raycast.planUnknown": "Raycast abonelik durumu okunamadı; Custom Providers için Raycast Pro gerekir.", + "integrations.raycast.planUnknown": "Raycast Pro’nun etkin olup olmadığı belirlenemedi; Custom Providers için Raycast Pro gerekir.", "integrations.raycast.revealConfig": "Raycast → Ayarlar → AI bölümünü açıp sağlayıcı klasörünün oluşması için „Reveal Providers Config“ seçeneğine bir kez tıklayın.", "integrations.semantics.omp": "Kataloğu yüklemek için OMP'yi yeniden başlatın.", "codexAuth.mainAccount": "Ana Hesap", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 4e137ebdd6..51369b8bca 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2340,7 +2340,7 @@ export const zhTW: Record = { "integrations.semantics.aside": "僅管理此設定檔的 ~/.aside/u//models.json 中的 providers.opencodex。其他供應商維持不變。套用後請完全結束並重新開啟 Aside。", "integrations.semantics.raycast": "在 Raycast 的 providers.yaml 中新增一個 OpenCodex 供應商項目,讓所有已路由的模型出現在 Raycast AI 模型選擇器中。需要 Raycast Pro。", "integrations.raycast.proRequired": "Custom Providers 是 Raycast Pro 功能。檔案會被寫入,但在 Pro 訂閱生效之前 Raycast 會忽略它。", - "integrations.raycast.planUnknown": "無法讀取 Raycast 訂閱狀態;Custom Providers 需要 Raycast Pro。", + "integrations.raycast.planUnknown": "無法確認 Raycast Pro 是否已啟用;Custom Providers 需要 Raycast Pro。", "integrations.raycast.revealConfig": "開啟 Raycast → 設定 → AI,點一次「Reveal Providers Config」,以便建立 providers 資料夾。", "codexAuth.pinned": "已固定", "codexAuth.pinnedHint": "你手動選取了此帳號,因此較高的選擇順序不會越過它。此固定會持續到該帳號用盡、你改選其他帳號,或你變更任一選擇順序為止。", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 67400eaaea..0ec38172c5 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -1272,7 +1272,7 @@ export const zh: Record = { "integrations.semantics.aside": "仅管理此配置文件的 ~/.aside/u//models.json 中的 providers.opencodex。其他提供商保持不变。应用后请完全退出并重新打开 Aside。", "integrations.semantics.raycast": "在 Raycast 的 providers.yaml 中添加一个 OpenCodex 提供商条目,让所有已路由的模型出现在 Raycast AI 模型选择器中。需要 Raycast Pro。", "integrations.raycast.proRequired": "Custom Providers 是 Raycast Pro 功能。文件会被写入,但在 Pro 订阅生效之前 Raycast 会忽略它。", - "integrations.raycast.planUnknown": "无法读取 Raycast 订阅状态;Custom Providers 需要 Raycast Pro。", + "integrations.raycast.planUnknown": "无法确定 Raycast Pro 是否已激活;Custom Providers 需要 Raycast Pro。", "integrations.raycast.revealConfig": "打开 Raycast → 设置 → AI,点击一次“Reveal Providers Config”,以便创建 providers 文件夹。", "codexAuth.mainAccount": "主账号", "codexAuth.logLabel": "日志标签", diff --git a/gui/src/pages/integrations/integration-api.ts b/gui/src/pages/integrations/integration-api.ts index 38b0e0fe89..85ffdc7be4 100644 --- a/gui/src/pages/integrations/integration-api.ts +++ b/gui/src/pages/integrations/integration-api.ts @@ -26,6 +26,7 @@ export type IntegrationReason = | "foreign-edit" | "unowned-key" | "blocked-container" + | "ambiguous-selector" | "unresolvable-path"; export type IntegrationRefusalReason = diff --git a/gui/tests/raycast-plan-notice.test.tsx b/gui/tests/raycast-plan-notice.test.tsx index 4a8d44a77d..7f08550317 100644 --- a/gui/tests/raycast-plan-notice.test.tsx +++ b/gui/tests/raycast-plan-notice.test.tsx @@ -1,7 +1,7 @@ import { expect, test } from "bun:test"; import { createElement } from "react"; import { renderToStaticMarkup } from "react-dom/server"; -import { I18nContext, type TFn } from "../src/i18n/shared"; +import { DICTS, I18nContext, type TFn } from "../src/i18n/shared"; import RaycastPlanNotice from "../src/pages/integrations/RaycastPlanNotice"; import type { RaycastInstall } from "../src/pages/integrations/integration-api"; @@ -14,11 +14,11 @@ import type { RaycastInstall } from "../src/pages/integrations/integration-api"; const echoT: TFn = key => key; -function render(install: RaycastInstall): string { +function render(install: RaycastInstall, t: TFn = echoT): string { return renderToStaticMarkup( createElement( I18nContext.Provider, - { value: { locale: "en", setLocale: () => {}, t: echoT } }, + { value: { locale: "en", setLocale: () => {}, t } }, createElement(RaycastPlanNotice, { install }), ), ); @@ -36,7 +36,7 @@ test("a free plan is a warning notice, never a refusal", () => { expect(markup).not.toContain("integrations.raycast.planUnknown"); }); -test("an unreadable plan stays muted, because non-macOS hosts have no signal", () => { +test("an unknown plan stays muted, because non-macOS hosts have no signal", () => { const markup = render({ plan: "unknown", appPath: null, aiDirPresent: true }); expect(markup).toContain('data-raycast-plan="unknown"'); expect(markup).toContain("integrations.raycast.planUnknown"); @@ -49,3 +49,13 @@ test("a missing ai folder adds the reveal hint independently of the plan", () => expect(markup).toContain('data-raycast-ai-dir="absent"'); expect(markup).toContain("integrations.raycast.revealConfig"); }); + +test("a Windows install reports unknown Pro activity without claiming a preference read failed", () => { + const markup = render({ + plan: "unknown", appPath: "C:\\Users\\u\\AppData\\Local\\Programs\\Raycast", aiDirPresent: true, + }, key => DICTS.en[key]); + expect(markup).toContain("Could not determine whether Raycast Pro is active"); + expect(markup).not.toContain("Could not read"); + expect(markup).not.toContain("notice-warn"); + expect(markup).not.toContain(" { + return typeof value === "object" && value !== null && !Array.isArray(value); +} + export function summarizeRaycast( document: unknown, ): { modelCount: number; modelsWithoutLimits: number } { - const providers = (document as RaycastGeneratedConfig | undefined)?.providers ?? []; - const models = providers.find(provider => provider.id === OPENCODE_PROVIDER_ID)?.models ?? []; + const empty = { modelCount: 0, modelsWithoutLimits: 0 }; + if (!isRecord(document) || !Array.isArray(document.providers)) return empty; + const providers = document.providers.filter( + provider => isRecord(provider) && provider.id === OPENCODE_PROVIDER_ID, + ); + // An ambiguous managed provider has no meaningful summary either. + if (providers.length !== 1) return empty; + const provider: unknown = providers[0]; + if (!isRecord(provider) || !Array.isArray(provider.models)) return empty; + const models = provider.models.filter((model): model is Record => ( + isRecord(model) + && typeof model.id === "string" && model.id.trim().length > 0 + && typeof model.name === "string" && model.name.trim().length > 0 + )); return { modelCount: models.length, - modelsWithoutLimits: models.filter(model => model.context === undefined).length, + modelsWithoutLimits: models.filter(model => ( + typeof model.context !== "number" || authoritativeContextWindow(model.context) === undefined + )).length, }; } diff --git a/src/integrations/merge.ts b/src/integrations/merge.ts index 768ddc755f..ab2099b424 100644 --- a/src/integrations/merge.ts +++ b/src/integrations/merge.ts @@ -51,7 +51,7 @@ export class AmbiguousSelectorError extends Error { } /** The index of the element a selector names, -1 when none matches. */ -function selectIndex(items: readonly unknown[], field: string, value: string): number { +export function selectIndex(items: readonly unknown[], field: string, value: string): number { const matches: number[] = []; items.forEach((item, index) => { if (isPlainRecord(item) && item[field] === value) matches.push(index); @@ -249,7 +249,7 @@ export function createdContainerPaths( case "select": { // A selector that matches nothing means setPath will push the element. next = Array.isArray(cursor) - ? cursor.find(item => isPlainRecord(item) && item[segment.field] === segment.value) + ? cursor[selectIndex(cursor, segment.field, segment.value)] : undefined; break; } diff --git a/src/integrations/raycast-detect.ts b/src/integrations/raycast-detect.ts index 5e79578f46..7ae70edf46 100644 --- a/src/integrations/raycast-detect.ts +++ b/src/integrations/raycast-detect.ts @@ -10,7 +10,7 @@ * GUI need to explain a file that is written but ignored. * * Detection is read-only and injectable, like cursor-detect.ts: nothing here - * touches the Raycast install or its preferences, and the tests run against + * writes to the Raycast install or its preferences, and the tests run against * stubbed deps rather than the machine they execute on. */ import { existsSync } from "node:fs"; @@ -37,7 +37,8 @@ export interface RaycastDetectDeps { } /** - * The preference Raycast writes for its subscription state. Read through + * A private preference used only as an advisory subscription hint, not an + * entitlement API or a condition for writes. Read through * `defaults` rather than by parsing the plist: cfprefsd caches writes, so the * file on disk can lag what the running app believes. */ diff --git a/src/integrations/state.ts b/src/integrations/state.ts index bb0e5b3567..0249987027 100644 --- a/src/integrations/state.ts +++ b/src/integrations/state.ts @@ -12,7 +12,7 @@ import { ClientPathError, EXPORT_CLIENTS, opencodeProxyBaseUrl, type ExportModel import type { OcxConfig } from "../types"; import { PARSE_FAILED, loadTarget, parseConfig, type IntegrationIO } from "./config-io"; import { SNAPSHOT_RETENTION } from "./journal"; -import { parseSegment, type PathSegment } from "./merge"; +import { AmbiguousSelectorError, parseSegment, selectIndex, type PathSegment } from "./merge"; import { canonicalContribution, fingerprint, semanticContribution, type OwnershipRecord } from "./ownership"; import { protectedContributionFingerprint, @@ -36,6 +36,7 @@ export type StateReason = | "unowned-key" /** A container we would have to write through holds a non-object value. */ | "blocked-container" + | "ambiguous-selector" /** A path selector we cannot resolve, e.g. a relative OPENCLAW_CONFIG_PATH. */ | "unresolvable-path"; @@ -63,7 +64,7 @@ function assertNever(segment: never): never { /** The element a selector names, or `undefined` when none matches. */ function selectElement(items: readonly unknown[], segment: PathSegment & { kind: "select" }): unknown { - return items.find(item => isPlainRecord(item) && item[segment.field] === segment.value); + return items[selectIndex(items, segment.field, segment.value)]; } /** @@ -291,8 +292,24 @@ export function classifyIntegration(input: { * Checked BEFORE `absent`: our leaf is missing in exactly this case, so the * absent branch would authorize an apply that replaces the user's value. */ - if (blockedContainerPath(input.parsed, input.contribution)) { - return { state: "unsafe", reason: "blocked-container" }; + try { + if (blockedContainerPath(input.parsed, input.contribution)) { + return { state: "unsafe", reason: "blocked-container" }; + } + // Check every selector before presence/fingerprint short-circuits, including + // paths an older ownership record may remove during refresh or disable. + const paths = [ + ...input.contribution.fragments.map(fragment => fragment.path), + ...(input.record?.fragmentPaths ?? []), + ]; + for (const path of paths) { + if (Array.isArray(path) && path.every(key => typeof key === "string")) { + readPath(input.parsed, path); + } + } + } catch (error) { + if (!(error instanceof AmbiguousSelectorError)) throw error; + return { state: "unsafe", reason: "ambiguous-selector" }; } if (!hasOurFragments(input.parsed, input.contribution)) return { state: "absent" }; diff --git a/src/integrations/writer.ts b/src/integrations/writer.ts index 7ec543715a..514fbc3220 100644 --- a/src/integrations/writer.ts +++ b/src/integrations/writer.ts @@ -321,7 +321,9 @@ function applyOrRefreshIntegration( return refuse(clientId, "unsafe", "unsafe", classified.reason === "blocked-container" ? `${configPath} holds a value where opencodex would have to write a section, so applying would replace it` - : `${configPath} cannot be changed safely`); + : classified.reason === "ambiguous-selector" + ? `${configPath} has more than one entry matching a managed selector` + : `${configPath} cannot be changed safely`); } /* * An implicit catalog sync is refresh-only. Keeping this decision inside the @@ -511,7 +513,9 @@ export function disableIntegration(input: IntegrationWriteInput): WriteOutcome { return refuse(clientId, "unsafe", "unsafe", classified.reason === "blocked-container" ? `${configPath} holds a value where opencodex would have to read a section, so nothing can be removed safely` - : `${configPath} cannot be changed safely`); + : classified.reason === "ambiguous-selector" + ? `${configPath} has more than one entry matching a managed selector` + : `${configPath} cannot be changed safely`); } /* diff --git a/tests/clients/integrations-merge.test.ts b/tests/clients/integrations-merge.test.ts index 6bea116319..6585d9f1e9 100644 --- a/tests/clients/integrations-merge.test.ts +++ b/tests/clients/integrations-merge.test.ts @@ -17,6 +17,7 @@ import { applyIntegration, disableIntegration, overwriteIntegration, + refreshIntegration, type IntegrationWriteInput, } from "../../src/integrations/writer"; import type { OcxConfig } from "../../src/types"; @@ -88,6 +89,9 @@ describe("setPath with a selector", () => { const doc = { providers: [OURS, THEIRS, { id: "opencodex", name: "dupe" }] }; expect(() => setPath(doc, SELECT, OURS)).toThrow(AmbiguousSelectorError); expect(() => deletePath(doc, SELECT)).toThrow(AmbiguousSelectorError); + expect(() => readPath(doc, SELECT)).toThrow(AmbiguousSelectorError); + expect(() => createdContainerPaths(doc, contribution([...SELECT, "name"]))) + .toThrow(AmbiguousSelectorError); }); }); @@ -250,19 +254,48 @@ describe("raycast writer round trip", () => { expect(Bun.YAML.parse(readFileSync(configPath, "utf8"))).toEqual({ providers: { opencodex: {} } }); }); - test("two entries with our id refuse as unsafe and leave the file alone", () => { - const configPath = installRaycast(); - const text = Bun.YAML.stringify({ providers: [{ id: "opencodex", name: "a" }, { id: "opencodex", name: "b" }] }); - writeFileSync(configPath, text); - // Neither entry is ours on record, so status reads conflict and a plain apply refuses - // there. The explicit overwrite reaches the merge, which is where the ambiguity is - // detected: it must surface as an `unsafe` refusal, never as a thrown error. - expect(readIntegrationState(input())).toMatchObject({ state: "conflict" }); - expect(applyIntegration(input())).toMatchObject({ ok: false, reason: "conflict" }); - const result = overwriteIntegration(input()); - expect(result).toMatchObject({ ok: false, reason: "unsafe", state: "unsafe" }); - if (!result.ok) expect(result.message).toContain("more than one entry"); - expect(readFileSync(configPath, "utf8")).toBe(text); - expect(store.listOperations("raycast")).toHaveLength(0); - }); + for (const recorded of [false, true]) { + for (const count of [0, 1, 2]) { + test(`${count} matching rows with record=${recorded} agree across status and mutation`, () => { + const configPath = installRaycast(); + writeFileSync(configPath, Bun.YAML.stringify({ providers: [THEIRS] })); + let managed: unknown = OURS; + if (recorded) { + expect(applyIntegration(input())).toMatchObject({ ok: true }); + const applied = Bun.YAML.parse(readFileSync(configPath, "utf8")) as { providers: unknown[] }; + managed = applied.providers[1]; + } + // For one owned row retain the writer's exact bytes, so this exercises + // current rather than an unrelated whole-file formatting conflict. + if (!recorded || count !== 1) { + writeFileSync(configPath, Bun.YAML.stringify({ + providers: [THEIRS, ...Array.from({ length: count }, () => managed)], + })); + } + const text = readFileSync(configPath, "utf8"); + const records = store.readRecords(); + const operations = store.listOperations("raycast"); + const expected = count === 0 ? "absent" : count === 2 ? "unsafe" : recorded ? "current" : "conflict"; + expect(readIntegrationState(input()).state).toBe(expected); + if (count === 2) { + expect(readIntegrationState(input()).reason).toBe("ambiguous-selector"); + for (const mutate of [applyIntegration, refreshIntegration, disableIntegration, overwriteIntegration]) { + expect(mutate(input())).toMatchObject({ ok: false, state: "unsafe", reason: "unsafe" }); + expect(readFileSync(configPath, "utf8")).toBe(text); + expect(store.readRecords()).toEqual(records); + expect(store.listOperations("raycast")).toEqual(operations); + } + } else if (count === 0) { + expect(refreshIntegration(input())).toMatchObject({ ok: true, changed: false, state: "absent" }); + expect(readFileSync(configPath, "utf8")).toBe(text); + } else if (recorded) { + expect(applyIntegration(input())).toMatchObject({ ok: true, changed: false, state: "current" }); + } else { + expect(applyIntegration(input())).toMatchObject({ ok: false, reason: "conflict" }); + expect(disableIntegration(input())).toMatchObject({ ok: false, reason: "conflict" }); + expect(readFileSync(configPath, "utf8")).toBe(text); + } + }); + } + } }); diff --git a/tests/clients/raycast-client.test.ts b/tests/clients/raycast-client.test.ts index 148f84babb..d84123f458 100644 --- a/tests/clients/raycast-client.test.ts +++ b/tests/clients/raycast-client.test.ts @@ -10,6 +10,7 @@ import { buildClientContribution, raycastAiDir, raycastConfigPath, + summarizeRaycast, type ExportContext, type ExportModel, type RaycastGeneratedConfig, @@ -73,6 +74,7 @@ beforeEach(() => { afterEach(() => { removeTreeWithRetry(home); + removeTreeWithRetry(store.root); }); /** Raycast "installed" for our purposes: the `ai` directory exists. */ @@ -123,6 +125,25 @@ describe("Raycast client config", () => { expect("context" in unknown).toBe(false); }); + test("summarizes unknown file shapes without trusting parsed YAML", () => { + const empty = { modelCount: 0, modelsWithoutLimits: 0 }; + for (const document of [undefined, null, false, 42, "providers", [], {}, + { providers: null }, { providers: {} }, { providers: "bad" }, + { providers: [null, false, "bad", [], {}] }, + ...[undefined, null, false, 42, "bad", {}].map(models => ({ providers: [{ id: "opencodex", models }] })), + { providers: [{ id: "opencodex", models: [] }, { id: "opencodex", models: [] }] }, + ]) expect(summarizeRaycast(document)).toEqual(empty); + expect(summarizeRaycast({ providers: [null, { id: "foreign", models: "bad" }, { + id: "opencodex", models: [null, false, 1, "bad", [], {}, { id: "x" }, + { id: "", name: "empty id" }, { id: "x", name: 1 }, + { id: "known", name: "Known", context: 1000 }, + { id: "unknown", name: "Unknown" }, + { id: "invalid", name: "Invalid", context: "1000" }, + { id: "negative", name: "Negative", context: -1 }, + ], + }] })).toEqual({ modelCount: 4, modelsWithoutLimits: 3 }); + }); + test("uses product labels instead of raw slugs or provider suffixes", () => { expect(exportPresentationLabel({ namespaced: "anthropic/claude-fable-5-1", provider: "anthropic", id: "claude-fable-5-1", @@ -137,9 +158,9 @@ describe("Raycast client config", () => { /* * Abilities follow the catalog row, not the vendor name. Temperature and - * reasoning_effort are the same bit inverted: Raycast's own template notes - * that reasoning models commonly reject temperature. system_message and - * tools are always on, the same stance as Hermes. + * reasoning_effort use opposite flags as a conservative export convention. + * This is not a complete per-model capability oracle. system_message and + * tools retain the client export convention, not verified per-model support. */ test("maps vision and reasoning ladders onto abilities per model", () => { const document = buildClientConfig("raycast", context()) as RaycastGeneratedConfig; @@ -251,6 +272,28 @@ describe("Raycast client config", () => { .toEqual(fewer.map(model => model.namespaced).sort()); }); + test("implicit catalog refresh neither loads models nor connects an unowned Raycast", async () => { + const configPath = installRaycast(USER_SEED); + const outcomes = await refreshOwnedCatalogIntegrations({ + ...request(), + models: async () => { throw new Error("unowned client must not load models"); }, + }, ["raycast"]); + expect(outcomes).toEqual([]); + expect(readFileSync(configPath, "utf8")).toBe(USER_SEED); + expect(store.readRecords().raycast).toBeUndefined(); + expect(store.listOperations("raycast")).toEqual([]); + }); + + for (const hostname of ["0.0.0.0", "192.0.2.1"]) { + test(`refuses admission-authenticated bind ${hostname} without changing the file`, () => { + const configPath = installRaycast(USER_SEED); + const result = applyIntegration({ ...request(), config: { ...CONFIG, hostname } }); + expect(result).toMatchObject({ ok: false, reason: "non_loopback" }); + expect(readFileSync(configPath, "utf8")).toBe(USER_SEED); + expect(store.listOperations("raycast")).toEqual([]); + }); + } + test("refuses a file whose providers is a map rather than a sequence", () => { // `providers: {}` is a container we would have to REPLACE with `[]` to // write our element, and replacing a user's container is never a success. From 387d787b43b9a8b3e1b048d9913c927e98531565 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:45:00 +0900 Subject: [PATCH 079/221] fix(raycast): honor live export admission and defer ensure refresh (#3733) Use the existing live client-config API for Raycast CLI export, refusing admission-authenticated destinations before serialization. Resolve declared unauthenticated loopback ports consistently in CLI/API URL composition. Preserve other exporter policy and add OpenCode compatibility coverage. Remove parent-side ensure catalog refresh from saved config; actual server startup and explicit sync remain responsible. Add reachable CLI/API admission/listener tests and an executed-command-body ensure divergence regression. Tests, typecheck, lint and builds NOT RUN per worker scope; git diff --check passed. Main owns final CI and rendered preview. Co-authored-by: Chanhee Lee --- .../content/docs/fr/guides/integrations.md | 6 ++ .../src/content/docs/guides/integrations.md | 6 ++ .../content/docs/tr/guides/integrations.md | 6 ++ .../content/docs/zh-tw/guides/integrations.md | 5 ++ src/cli/export-command.ts | 36 +++++++---- src/cli/index.ts | 7 ++- src/server/management/model-routes.ts | 10 +++- tests/cli/cli-export-command.test.ts | 59 +++++++++++++++++++ .../clients/sync-client-integrations.test.ts | 45 +++++++++++++- .../management-client-config-route.test.ts | 45 ++++++++++++++ 10 files changed, 207 insertions(+), 18 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/integrations.md b/docs-site/src/content/docs/fr/guides/integrations.md index 6a0a6d0dd3..c718801ddc 100644 --- a/docs-site/src/content/docs/fr/guides/integrations.md +++ b/docs-site/src/content/docs/fr/guides/integrations.md @@ -62,6 +62,12 @@ la prise en charge des outils pour chaque modèle. Les valeurs des autres fourni préservées, sans garantie pour les commentaires ou la mise en forme YAML. Le format est documenté sur [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). +Les exports Raycast en CLI et les téléchargements utilisent la destination et la politique +d’admission du serveur actif, y compris son listener de bouclage sans authentification. +`ocx ensure` ne réactualise pas Raycast depuis sa copie de configuration enregistrée, qui peut +différer du serveur actif. Le démarrage du serveur et la synchronisation explicite restent disponibles. + + Les chemins respectent les variables de remplacement propres à chaque client, lorsqu'elles existent. Pour OMP, la présence de `OMP_PROFILE` l'emporte sur `PI_PROFILE`, même si sa valeur est explicitement vide. Un profil nommé emploie `PI_CONFIG_DIR` comme nom de répertoire relatif au dossier personnel de l'utilisateur diff --git a/docs-site/src/content/docs/guides/integrations.md b/docs-site/src/content/docs/guides/integrations.md index e6230e4956..ea3c93f2dd 100644 --- a/docs-site/src/content/docs/guides/integrations.md +++ b/docs-site/src/content/docs/guides/integrations.md @@ -92,6 +92,12 @@ Provider values are preserved; YAML formatting and comments are not guaranteed t The format is documented at [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers). +Raycast CLI exports and dashboard downloads use the running server's destination and +admission policy, including a configured unauthenticated loopback listener. `ocx ensure` +does not refresh Raycast from its saved configuration snapshot: that can differ from the +running server. Server startup and explicit sync remain the catalog refresh paths. + + Cursor has a tab but is not one of these switches. Regular Cursor calls custom endpoints from its own backend, so a loopback proxy is unreachable without a public tunnel, and Cursor's separate Private Inference build is configured inside Cursor. The **Cursor** tab is read-only: diff --git a/docs-site/src/content/docs/tr/guides/integrations.md b/docs-site/src/content/docs/tr/guides/integrations.md index 145cd8c6bc..f068b0233f 100644 --- a/docs-site/src/content/docs/tr/guides/integrations.md +++ b/docs-site/src/content/docs/tr/guides/integrations.md @@ -66,6 +66,12 @@ değerleri korunur; YAML biçimlendirmesi ve yorumlarının korunması garanti e [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers) adresinde belgelenmiştir. +Raycast CLI dışa aktarmaları ve panel indirmeleri, yapılandırılmış kimlik doğrulamasız +geri döngü dinleyicisi dahil çalışan sunucunun adresini ve kabul politikasını kullanır. +`ocx ensure`, çalışan sunucudan farklı olabilecek kayıtlı yapılandırma kopyasıyla Raycast'i +yenilemez. Sunucu başlangıcı ve açık senkronizasyon katalog yenilemeye devam eder. + + Yollar, varsa her istemcinin kendi ortam geçersiz kılmalarını dikkate alır. OMP için `OMP_PROFILE`, açıkça boş olduğunda bile varlığıyla `PI_PROFILE`'a üstün gelir. Adlandırılmış bir profil, `PI_CONFIG_DIR`'i kullanıcının ev dizinine göre diff --git a/docs-site/src/content/docs/zh-tw/guides/integrations.md b/docs-site/src/content/docs/zh-tw/guides/integrations.md index 6a42ea8571..46b03df9a1 100644 --- a/docs-site/src/content/docs/zh-tw/guides/integrations.md +++ b/docs-site/src/content/docs/zh-tw/guides/integrations.md @@ -53,6 +53,11 @@ macOS 私有偏好設定僅提供 Pro 狀態提示;Windows 完全不讀取該 但不保證 YAML 格式與註解不變。格式說明見 [manual.raycast.com/ai/custom-providers](https://manual.raycast.com/ai/custom-providers)。 +Raycast CLI 匯出與儀表板下載會使用執行中伺服器的目標位址和准入規則,包含已設定的 +無驗證 loopback listener。`ocx ensure` 不會以可能與執行中伺服器不同的已儲存設定快照 +重新整理 Raycast;伺服器啟動與明確執行的同步仍會更新目錄。 + + 路徑遵循客戶端自己的環境覆寫(environment override)。對 OMP 而言,`OMP_PROFILE` 以存在與否優先於 `PI_PROFILE`,即使明確為空也一樣。具名 profile 會把 `PI_CONFIG_DIR` 當作相對於使用者家目錄的目錄名稱,並忽略 `PI_CODING_AGENT_DIR`;沒有具名 profile 時,`PI_CODING_AGENT_DIR` 勝出。OMP 支援 provider 層級的 headers,但這個最初的整合刻意只支援 loopback;遠端 `x-opencodex-api-key` 的連線設定被延後。搬移過的 `HERMES_HOME`、`KIMI_CODE_HOME` 與 `XDG_CONFIG_HOME` 路徑同樣會被遵循,而非猜測。表格列出每個客戶端的預設值。 對原生 OpenAI 模型,產生的 OMP 區塊會選用其模型層級的 Responses API,保留圖片輸入與 reasoning-effort 控制。路由模型則維持 provider 的 Chat Completions 方言,讓它們既有的 adapters 保持相容。 diff --git a/src/cli/export-command.ts b/src/cli/export-command.ts index c576435432..906065b2e8 100644 --- a/src/cli/export-command.ts +++ b/src/cli/export-command.ts @@ -122,10 +122,10 @@ export function exportModelsFromProxyRows( * Resolved ONCE and handed back to `runtimeRequest` as `baseUrl`, so the catalog and the * exported endpoint can never come from two different probes. */ -function proxyV1BaseUrl(root: string): string { +function proxyV1BaseUrl(root: string, config: OcxConfig): string { const url = new URL(root); const port = url.port ? Number(url.port) : url.protocol === "https:" ? 443 : 80; - return opencodeProxyBaseUrl(port, url.hostname); + return opencodeProxyBaseUrl(port, url.hostname, config); } function parseClient(args: string[]): ExportClientId { @@ -172,17 +172,29 @@ export async function handleExportCommand(argv: string[], deps: ExportCommandDep const spec = EXPORT_CLIENTS[client]; const root = await runtimeBaseUrl(deps); - const rows = await runtimeRequest("/api/models", {}, { ...deps, baseUrl: root }); - if (!Array.isArray(rows)) { - throw new RuntimeApiError("Management API returned an unexpected /api/models payload.", 502, rows); + let built: { document: unknown; text: string }; + if (client === "raycast") { + // The dial address alone cannot distinguish a wildcard authenticated bind + // from loopback. Let the live server resolve its admission/listener policy; + // saved config can differ from the process serving this request. + const exported = await runtimeRequest<{ + client: string; format: string; config: unknown; text: string; + }>("/api/client-config?client=raycast", {}, { ...deps, baseUrl: root }); + if (!exported || exported.client !== "raycast" || exported.format !== "yaml" + || typeof exported.text !== "string" || exported.config === undefined) { + throw new RuntimeApiError("Management API returned an unexpected Raycast export payload.", 502, null); + } + built = { document: exported.config, text: exported.text }; + } else { + const rows = await runtimeRequest("/api/models", {}, { ...deps, baseUrl: root }); + if (!Array.isArray(rows)) { + throw new RuntimeApiError("Management API returned an unexpected /api/models payload.", 502, rows); + } + // Discovery can persist selection; preserve the existing exporters' flow. + const config = (deps.configImpl ?? loadConfig)(); + const models = exportModelsFromProxyRows(rows, config); + built = buildClientConfigText(client, { baseUrl: proxyV1BaseUrl(root, config), models, config }); } - // Discovery can persist pending -> ready selection. Read from the caller's - // config source after the response, rather than filtering with a stale snapshot. - const config = (deps.configImpl ?? loadConfig)(); - const models = exportModelsFromProxyRows(rows, config); - // The text is the client's OWN format — YAML, TOML and JSON5 clients would - // otherwise receive a JSON rendering their parser reads differently. - const built = buildClientConfigText(client, { baseUrl: proxyV1BaseUrl(root), models, config }); const clientConfig = built.document; const text = built.text; diff --git a/src/cli/index.ts b/src/cli/index.ts index 9d9f08951c..663514a120 100755 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -580,7 +580,9 @@ async function handleEnsure(options: { existingIsSuccess?: boolean } = {}): Prom return null; }); if (synced?.status === "skipped") console.log(" Codex integration OFF; startup left Codex native."); - await refreshOwnedRaycastCatalog(config, live.port); + // Do not refresh Raycast from saved config here: live bind/admission and + // secondary-listener settings may differ. Explicit sync or server startup + // owns catalog refresh; ensure must not overwrite a working destination. // Ensure env file exists for already-running proxy (may have been deleted or pre-dates this feature). const systemEnv = await injectSystemEnv(live.port, config).catch(() => ({ injected: false })); reportShellHookFailure(reconcileShellHook(systemEnv.injected)); @@ -625,7 +627,8 @@ async function handleEnsure(options: { existingIsSuccess?: boolean } = {}): Prom return null; }); if (synced?.status === "skipped") console.log(" Codex integration OFF; startup left Codex native."); - await refreshOwnedRaycastCatalog(config, port); + // The child performs Raycast refresh with its actual startup config. The + // parent's pre-spawn snapshot is not authoritative for a client-file write. // The child opens /healthz before its best-effort roster reconcile. Await the same idempotent // operation in the parent so `ocx ensure` cannot report success while stale ocx-*.md files are // still observable. Always use the live port, including fallback-port starts. diff --git a/src/server/management/model-routes.ts b/src/server/management/model-routes.ts index 28d1bef0ec..dd84d8af8c 100644 --- a/src/server/management/model-routes.ts +++ b/src/server/management/model-routes.ts @@ -1,5 +1,6 @@ import { randomUUID } from "node:crypto"; import { readFileSync } from "node:fs"; +import { shouldInjectApiAuthHeader } from "../../codex/loopback-target"; /** * Codex parses a catalog entry's `input_modalities` as a closed enum, and one out-of-enum @@ -480,6 +481,13 @@ export async function handleModelRoutes(ctx: ManagementContext): Promise { expect(parsed.provider.opencodex!.options.baseURL).not.toContain(":10100/"); }); + test("existing OpenCode export also resolves the declared unauthenticated listener", async () => { + const proxy = fakeProxy(); + const result = await run(["--client", "opencode", "--json"], { + baseUrl: proxy.baseUrl, + config: config({ hostname: "0.0.0.0", unauthenticatedLoopbackListener: { enabled: true, port: 10237 } }), + }); + expect(result.code).toBe(0); + const parsed = JSON.parse(result.stdout) as { provider: Record }; + expect(parsed.provider.opencodex!.options.baseURL).toBe("http://127.0.0.1:10237/v1"); + }); + test("disabled rows never reach the exported config", async () => { const proxy = fakeProxy(); const result = await run(["--client", "pi", "--json"], { baseUrl: proxy.baseUrl }); @@ -543,3 +554,51 @@ describe("export allowlist parity", () => { ], cfg).map(row => row.namespaced)).toEqual(["slash/org-model"]); }); }); + +describe("Raycast export uses the live management admission policy", () => { + for (const secondary of [false, true]) { + test(`live wildcard bind with secondary=${secondary} wins over saved loopback config`, async () => { + const oldHome = process.env.OPENCODEX_HOME; + const oldCodexHome = process.env.CODEX_HOME; + const root = tempDir(); + process.env.OPENCODEX_HOME = join(root, "ocx"); + process.env.CODEX_HOME = join(root, "codex"); + mkdirSync(process.env.CODEX_HOME, { recursive: true }); + try { + const liveConfig = config({ + hostname: "0.0.0.0", + providers: { mock: { + adapter: "openai-chat", baseUrl: "http://127.0.0.1/v1", + liveModels: false, models: ["fixture-model"], + } }, + ...(secondary ? { unauthenticatedLoopbackListener: { enabled: true, port: 10237 } } : {}), + }); + const proxy = managementProxy(liveConfig); + const out = join(root, "providers.yaml"); + writeFileSync(out, "keep existing export\n"); + const result = await run(["--client", "raycast", "--json", "--out", out, "--force"], { + baseUrl: proxy.baseUrl, + // Deliberately contradict both live bind and secondary port. + config: config({ unauthenticatedLoopbackListener: { enabled: true, port: 10999 } }), + }); + if (secondary) { + expect(result.code).toBe(0); + const document = JSON.parse(result.stdout) as { providers: Array<{ base_url: string }> }; + expect(document.providers[0]!.base_url).toBe("http://127.0.0.1:10237/v1"); + expect(readFileSync(out, "utf8")).toContain("10237/v1"); + expect(readFileSync(out, "utf8")).not.toContain("10999"); + } else { + expect(result.code).not.toBe(0); + expect(result.stdout).toBe(""); + expect(result.stderr).toContain("non_loopback"); + expect(readFileSync(out, "utf8")).toBe("keep existing export\n"); + } + } finally { + if (oldHome === undefined) delete process.env.OPENCODEX_HOME; + else process.env.OPENCODEX_HOME = oldHome; + if (oldCodexHome === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = oldCodexHome; + } + }); + } +}); diff --git a/tests/clients/sync-client-integrations.test.ts b/tests/clients/sync-client-integrations.test.ts index 9050eecd3b..65dc41a2b3 100644 --- a/tests/clients/sync-client-integrations.test.ts +++ b/tests/clients/sync-client-integrations.test.ts @@ -662,18 +662,57 @@ test("the direct ocx sync command refreshes MCode, Pi, Raycast and server-owned expect(command).toContain('synced.status !== "refused"'); }); -test("startup and ensure refresh owned Raycast through the catalog coordinator", async () => { +test("server startup owns Raycast refresh; ensure does not reuse a saved-config snapshot", async () => { const src = await Bun.file(new URL("../../src/cli/index.ts", import.meta.url)).text(); const start = src.slice(src.indexOf("async function handleStart"), src.indexOf("function detachedStartEnvironment")); const ensure = src.slice(src.indexOf("async function handleEnsure"), src.indexOf("async function handleTrayProxyStart")); expect(src).toContain("refreshOwnedCatalogIntegrations"); expect(src).toContain('}, ["raycast"]);'); expect(start).toContain("await refreshOwnedRaycastCatalog(config, port)"); - expect(ensure).toContain("await refreshOwnedRaycastCatalog(config, live.port)"); - expect(ensure).toContain("await refreshOwnedRaycastCatalog(config, port)"); + expect(ensure).not.toContain("await refreshOwnedRaycastCatalog("); expect(src).not.toContain("refreshAllOwnedIntegrations"); }); +test("already-running ensure leaves Raycast untouched when saved host and listener policy diverge", async () => { + // Exercise the actual command body with external effects injected. Importing + // index.ts directly starts CLI dispatch, so isolate only handleEnsure here. + const src = await Bun.file(new URL("../../src/cli/index.ts", import.meta.url)).text(); + const command = src.slice(src.indexOf("async function handleEnsure"), src.indexOf("async function handleTrayProxyStart")); + const executable = new Bun.Transpiler({ loader: "ts" }).transformSync(command); + const root = mkdtempSync(join(tmpdir(), "ocx-ensure-raycast-divergence-")); + const configPath = join(root, "providers.yaml"); + const original = "providers:\n - id: opencodex\n base_url: http://127.0.0.1:10237/v1\n"; + writeFileSync(configPath, original); + const savedConfig = { + port: 10100, hostname: "192.0.2.40", providers: {}, defaultProvider: "mock", + unauthenticatedLoopbackListener: { enabled: true, port: 10999 }, + } as OcxConfig; + let refreshCalls = 0; + const deps = { + findProxyOwnerBeforeJournalRecovery: async () => ({ live: { hostname: "127.0.0.1", port: 10237 } }), + loadConfig: () => savedConfig, + codexAutoStartEnabled: () => true, + syncModelsToCodex: async () => ({ status: "skipped" }), + refreshOwnedRaycastCatalog: async () => { + refreshCalls += 1; + writeFileSync(configPath, "wrong saved destination"); + }, + injectSystemEnv: async () => ({ injected: true }), + reportShellHookFailure: () => {}, + reconcileShellHook: () => ({ state: "installed" }), + reconcileEnsureDesiredIntegrations: async () => {}, + console: { log: () => {}, error: () => {} }, + }; + try { + const ensure = new Function(...Object.keys(deps), `${executable}; return handleEnsure;`)(...Object.values(deps)) as () => Promise; + expect(await ensure()).toBe(true); + expect(refreshCalls).toBe(0); + expect(readFileSync(configPath, "utf8")).toBe(original); + } finally { + removeTreeWithRetry(root); + } +}); + test("identical explicit mutation keys join but cannot swallow a different apply or disable", async () => { let release!: () => void; const gate = new Promise(resolve => { release = resolve; }); diff --git a/tests/server/management-client-config-route.test.ts b/tests/server/management-client-config-route.test.ts index d3d91aebdf..9fcb92e81d 100644 --- a/tests/server/management-client-config-route.test.ts +++ b/tests/server/management-client-config-route.test.ts @@ -23,6 +23,7 @@ import { type McodeGeneratedConfig, type OpencodeGeneratedConfig, type PiGeneratedConfig, + type RaycastGeneratedConfig, } from "../../src/clients/config-export"; import type { OcxConfig } from "../../src/types"; import { catalogConvergenceFactory } from "../helpers/catalog-convergence"; @@ -215,6 +216,50 @@ describe("native Anthropic effort ladder reaches the Aside document", () => { }); }); describe("GET /api/client-config", () => { + for (const hostname of ["0.0.0.0", "::", "192.0.2.40"]) { + test(`Raycast export refuses authenticated bind ${hostname} before generating a document`, async () => { + const response = await clientConfigApi(baseConfig({ hostname }), "?client=raycast"); + expect(response.status).toBe(400); + const body = await response.json() as Record; + expect(body.reason).toBe("non_loopback"); + expect(body.config).toBeUndefined(); + expect(body.text).toBeUndefined(); + }); + } + + test("Raycast export uses the declared unauthenticated listener instead of the management port", async () => { + const response = await clientConfigApi(baseConfig({ + hostname: "0.0.0.0", + unauthenticatedLoopbackListener: { enabled: true, port: 10237 }, + }), "?client=raycast"); + expect(response.status).toBe(200); + const body = await response.json() as ClientConfigEnvelope; + const document = body.config as RaycastGeneratedConfig; + expect(document.providers[0]!.base_url).toBe("http://127.0.0.1:10237/v1"); + expect(document.providers[0]!.models.length).toBeGreaterThan(0); + expect(body.text).not.toContain(REAL_LOOKING_KEY); + expect(body.text).not.toContain("api_keys"); + }); + + test("OpenCode export keeps its envelope and uses the declared unauthenticated listener", async () => { + const response = await clientConfigApi(baseConfig({ + hostname: "0.0.0.0", unauthenticatedLoopbackListener: { enabled: true, port: 10237 }, + }), "?client=opencode"); + expect(response.status).toBe(200); + const body = await response.json() as ClientConfigEnvelope; + expect(body.client).toBe("opencode"); + expect((body.config as OpencodeGeneratedConfig).provider.opencodex!.options.baseURL) + .toBe("http://127.0.0.1:10237/v1"); + }); + + test("Raycast export uses the main port for an ordinary loopback bind", async () => { + const response = await clientConfigApi(baseConfig(), "?client=raycast"); + expect(response.status).toBe(200); + const body = await response.json() as ClientConfigEnvelope; + expect((body.config as RaycastGeneratedConfig).providers[0]!.base_url) + .toBe("http://127.0.0.1:10100/v1"); + }); + test("opencode envelope carries the shared builder's exact bytes", async () => { const config = baseConfig(); const response = await clientConfigApi(config, "?client=opencode"); From 22f39ff105bea7675a82076b44b30aaf109826df Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 08:10:12 +0900 Subject: [PATCH 080/221] test(responses): exercise empty effort ladder through valid ingress CI 34065098625 and 34065112182 exposed a numeric-effort fixture rejected by parseRequest before it reaches the adapter. Use schema-valid high effort to exercise provider-wide omission and input immutability; preserve strict ingress validation. No production change and no local suites. Co-authored-by: jamespan --- tests/responses/openai-responses-passthrough.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/responses/openai-responses-passthrough.test.ts b/tests/responses/openai-responses-passthrough.test.ts index 7e97217dc2..24bc8e0e02 100644 --- a/tests/responses/openai-responses-passthrough.test.ts +++ b/tests/responses/openai-responses-passthrough.test.ts @@ -598,13 +598,13 @@ describe("DeepSeek Responses endpoint contract", () => { } }); - test("a provider-wide empty ladder removes even non-string raw effort", () => { + test("a provider-wide empty ladder removes schema-valid raw effort", () => { const keyed = { adapter: "openai-responses", baseUrl: "https://example.test/v1", authMode: "key" as const }; - const raw = { model: "model", input: "ping", reasoning: { effort: 123, summary: "auto" } }; + const raw = { model: "model", input: "ping", reasoning: { effort: "high", summary: "auto" } }; const wire = JSON.parse(createResponsesPassthroughAdapter({ ...keyed, reasoningEfforts: [] }) .buildRequest(parseRequest(raw)).body); expect(wire.reasoning).toEqual({ summary: "auto" }); - expect(raw.reasoning.effort).toBe(123); + expect(raw.reasoning.effort).toBe("high"); }); test("empty-ladder repair preserves unknown, non-rankable and native forward effort behavior", () => { From 95edd0aec05043d2e162c30edea98e174ad284e9 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:47:42 +0900 Subject: [PATCH 081/221] fix(export): preserve live CLI destination despite saved listener drift (#3733) Restore non-Raycast CLI URL composition from the live root only. Raycast remains delegated to the authoritative client-config API; API behavior is unchanged. Replace the OpenCode saved-listener substitution test with a live 10100 versus saved 10999 regression. Tests and suites NOT RUN; git diff --check passed. Co-authored-by: Chanhee Lee --- src/cli/export-command.ts | 6 +++--- tests/cli/cli-export-command.test.ts | 23 +++++++++++++++-------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/cli/export-command.ts b/src/cli/export-command.ts index 906065b2e8..739889a026 100644 --- a/src/cli/export-command.ts +++ b/src/cli/export-command.ts @@ -122,10 +122,10 @@ export function exportModelsFromProxyRows( * Resolved ONCE and handed back to `runtimeRequest` as `baseUrl`, so the catalog and the * exported endpoint can never come from two different probes. */ -function proxyV1BaseUrl(root: string, config: OcxConfig): string { +function proxyV1BaseUrl(root: string): string { const url = new URL(root); const port = url.port ? Number(url.port) : url.protocol === "https:" ? 443 : 80; - return opencodeProxyBaseUrl(port, url.hostname, config); + return opencodeProxyBaseUrl(port, url.hostname); } function parseClient(args: string[]): ExportClientId { @@ -193,7 +193,7 @@ export async function handleExportCommand(argv: string[], deps: ExportCommandDep // Discovery can persist selection; preserve the existing exporters' flow. const config = (deps.configImpl ?? loadConfig)(); const models = exportModelsFromProxyRows(rows, config); - built = buildClientConfigText(client, { baseUrl: proxyV1BaseUrl(root, config), models, config }); + built = buildClientConfigText(client, { baseUrl: proxyV1BaseUrl(root), models, config }); } const clientConfig = built.document; const text = built.text; diff --git a/tests/cli/cli-export-command.test.ts b/tests/cli/cli-export-command.test.ts index 03bfd199a7..6d8a513558 100644 --- a/tests/cli/cli-export-command.test.ts +++ b/tests/cli/cli-export-command.test.ts @@ -204,15 +204,22 @@ describe("ocx export --json (accept criterion 1)", () => { expect(parsed.provider.opencodex!.options.baseURL).not.toContain(":10100/"); }); - test("existing OpenCode export also resolves the declared unauthenticated listener", async () => { - const proxy = fakeProxy(); - const result = await run(["--client", "opencode", "--json"], { - baseUrl: proxy.baseUrl, - config: config({ hostname: "0.0.0.0", unauthenticatedLoopbackListener: { enabled: true, port: 10237 } }), + test("OpenCode export keeps the live port when saved listener settings point at a future port", async () => { + const code = await handleExportCommand(["--client", "opencode", "--json"], { + baseUrl: "http://127.0.0.1:10100", + configImpl: () => config({ + hostname: "0.0.0.0", + unauthenticatedLoopbackListener: { enabled: true, port: 10999 }, + }), + fetchImpl: (async input => { + expect(String(input)).toBe("http://127.0.0.1:10100/api/models"); + return Response.json(ROWS); + }) as typeof fetch, }); - expect(result.code).toBe(0); - const parsed = JSON.parse(result.stdout) as { provider: Record }; - expect(parsed.provider.opencodex!.options.baseURL).toBe("http://127.0.0.1:10237/v1"); + expect(code).toBe(0); + const parsed = JSON.parse(stdout()) as { provider: Record }; + expect(parsed.provider.opencodex!.options.baseURL).toBe("http://127.0.0.1:10100/v1"); + expect(parsed.provider.opencodex!.options.baseURL).not.toContain(":10999/"); }); test("disabled rows never reach the exported config", async () => { From d175335943da2a2e64c5dac92a99a99295199335 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 08:12:44 +0900 Subject: [PATCH 082/221] test(container): verify first-start migrations before persistence baseline [skip ci] Remote source startup proved the expected tier/subagent migrations and schema-default persistence, followed by byte-stable second startup. Verify exact seed bytes before startup, six explicit migration/default additions at readiness, and an immutable post-start hash through bootstrap refusal and recreation. Co-authored-by: Buseong Kim Co-authored-by: Ingwannu --- scripts/ci/docker-smoke.ts | 51 +++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/scripts/ci/docker-smoke.ts b/scripts/ci/docker-smoke.ts index eb488cf3b1..e26b11de34 100644 --- a/scripts/ci/docker-smoke.ts +++ b/scripts/ci/docker-smoke.ts @@ -127,6 +127,7 @@ const token = randomBytes(32).toString("hex"); const replacement = randomBytes(32).toString("hex"); const sha256 = (value: string) => createHash("sha256").update(value).digest("hex"); let seededConfigHash = ""; +let readyConfigHash = ""; // Check the loader, including its schema-repair/default-provider fallback, before server startup // and again in each running container. This isolates synthetic inference, not all process egress. @@ -184,6 +185,9 @@ async function inspect() { const stateProbe = ` import { readFileSync, statSync, writeFileSync } from 'node:fs'; import { createHash } from 'node:crypto'; + import { isDeepStrictEqual } from 'node:util'; + const phase = await Bun.stdin.text(); + if (!['seed', 'first-ready', 'steady'].includes(phase)) throw new Error('invalid state phase'); ${fixtureConfigCheck} const homes = ['/home/bun/.opencodex', '/home/bun/.codex']; const uid = process.getuid(); @@ -202,14 +206,51 @@ const stateProbe = ` if (s.uid !== uid || (s.mode & 0o777) !== 0o600 || s.size > 65536) throw new Error('file permissions/size'); return createHash('sha256').update(readFileSync(path)).digest('hex'); }); + // The immutable shipped config was byte-verified before fixture creation. Reconstruct only + // the deliberate fixture route edits, then compare every original key on disk (not loader defaults). + const seed = JSON.parse(readFileSync('docker/config.json', 'utf8')); + seed.providers = { smoke: { adapter: 'openai-responses', baseUrl: 'http://127.0.0.1:9/v1', authMode: 'local', allowPrivateNetwork: true } }; + seed.defaultProvider = 'smoke'; + const persisted = JSON.parse(readFileSync(paths[0], 'utf8')); + const loaded = JSON.parse(JSON.stringify(effective)); + for (const key of Object.keys(seed)) { + for (const config of [persisted, loaded]) { + if (!Object.hasOwn(config, key) || !isDeepStrictEqual(config[key], seed[key])) throw new Error('seed semantics changed'); + } + } + // Independent oracle measured by isolated startup; update only for an intentional contract change. + // Do not derive expected values from runtime migration/default helpers. + const additions = { + appOwnedMemoryBudgetMb: 256, fastRows: true, managementUsageMaxReadBytes: 67108864, + openaiProviderTierVersion: 2, + subagentModels: ['gpt-6-astra', 'gpt-5.6-sol', 'gpt-5.6-terra', 'gpt-5.6-luna', 'gpt-5.5'], + subagentModelsVersion: 1, + }; + for (const config of [persisted, loaded]) { + if (Object.keys(config).some(key => !Object.hasOwn(seed, key) && !Object.hasOwn(additions, key))) throw new Error('unexpected startup config addition'); + for (const [key, expected] of Object.entries(additions)) { + if (phase !== 'seed' || Object.hasOwn(config, key)) { + if (!Object.hasOwn(config, key) || !isDeepStrictEqual(config[key], expected)) throw new Error('startup oracle mismatch'); + } + } + } + if (phase === 'seed' && Object.keys(persisted).some(key => !Object.hasOwn(seed, key))) throw new Error('premature seed addition'); console.log(JSON.stringify(hashes)); `; -async function state() { - const hashes = JSON.parse(await compose(["exec", "-T", "hub", "bun", "-e", stateProbe])) as string[]; +async function state(phase: "seed" | "first-ready" | "steady" = "steady") { + const invocation = phase === "seed" ? ["run", "--rm", "-T", "--no-deps"] : ["exec", "-T"]; + const hashes = JSON.parse(await compose([...invocation, "hub", "bun", "-e", stateProbe], phase)) as string[]; check(hashes.length === 3 && hashes.every(hash => /^[a-f0-9]{64}$/.test(hash)), "invalid state evidence"); - check(hashes[0] === seededConfigHash, "seeded config changed"); check(hashes[1] === sha256(`${token}\n`) && hashes[2] === sha256(fixture), "token/catalog changed"); + if (phase === "first-ready") { + check(!readyConfigHash, "post-start config baseline already established"); + // stateProbe has checked persisted/effective semantics and the independent startup oracle. + readyConfigHash = hashes[0]!; + } else { + check(hashes[0] === (phase === "seed" ? seededConfigHash : readyConfigHash), + phase === "seed" ? "seeded config changed before startup" : "post-start config changed"); + } return JSON.stringify(hashes); } @@ -353,11 +394,13 @@ async function main() { check(/^[a-f0-9]{64}$/.test(seededConfigHash), "invalid seeded config evidence"); progress("bootstrap throwaway token"); await compose(["run", "--rm", "-T", "--no-deps", "hub", "bun", "run", "docker/bootstrap-token.ts"], `${token}\n`); + progress("verify exact seed state before startup"); + await state("seed"); progress("start and check admission"); await compose(["up", "--no-build", "--wait", "--wait-timeout", "120", "hub"], undefined, 150_000); const first = await inspect(); await acceptance(first.url); - const before = await state(); + const before = await state("first-ready"); progress("refuse token replacement"); const refused = await run(["docker", ...composeArgs, "run", "--rm", "-T", "--no-deps", "hub", "bun", "run", "docker/bootstrap-token.ts"], `${replacement}\n`); From 68d90aa37d63e9c51a4d538d009633d0fd33d93b Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 08:43:01 +0900 Subject: [PATCH 083/221] docs(claude): describe redacted reasoning replay Carry the documentation-only tail of PR #3815 through 22135366225391494ca98301114486c85be466a4 across eight locales. Runtime and test trees remain identical to the verified protocol candidate. Co-authored-by: SB Yoon <44089734+yansigit@users.noreply.github.com> Co-authored-by: Yumi --- docs-site/src/content/docs/fr/guides/claude-code.md | 1 + docs-site/src/content/docs/guides/claude-code.md | 1 + docs-site/src/content/docs/ja/guides/claude-code.md | 1 + docs-site/src/content/docs/ko/guides/claude-code.md | 1 + docs-site/src/content/docs/ru/guides/claude-code.md | 1 + docs-site/src/content/docs/tr/guides/claude-code.md | 1 + docs-site/src/content/docs/zh-cn/guides/claude-code.md | 1 + docs-site/src/content/docs/zh-tw/guides/claude-code.md | 1 + 8 files changed, 8 insertions(+) diff --git a/docs-site/src/content/docs/fr/guides/claude-code.md b/docs-site/src/content/docs/fr/guides/claude-code.md index 7f1c0a54aa..2ae3940254 100644 --- a/docs-site/src/content/docs/fr/guides/claude-code.md +++ b/docs-site/src/content/docs/fr/guides/claude-code.md @@ -519,6 +519,7 @@ Sur l’adaptateur Anthropic prévu, les blocs signés non masqués (y compris t | Battement de coeur | `ping` | | Deltas de texte | `content_block_start` → `content_block_delta` (texte) → `content_block_stop` | | Résumé ou texte de raisonnement | Bloc `thinking` avec la signature relue, ou une enveloppe de secours `ocxr1` bornée | +| Raisonnement expurgé | Blocs `redacted_thinking` relus depuis l'enveloppe de raisonnement | | Trames d'appel de fonction | Bloc `tool_use` avec `input_json_delta` | | Événement terminal | `message_delta` → `message_stop` | | EOF avant la borne | style 502 `api_error` | diff --git a/docs-site/src/content/docs/guides/claude-code.md b/docs-site/src/content/docs/guides/claude-code.md index f1c1bfbfe1..14dbe92c81 100644 --- a/docs-site/src/content/docs/guides/claude-code.md +++ b/docs-site/src/content/docs/guides/claude-code.md @@ -533,6 +533,7 @@ name. | Heartbeat | `ping` | | Text deltas | `content_block_start` → `content_block_delta` (text) → `content_block_stop` | | Reasoning summary/text | `thinking` block with the replayed signature, or a bounded `ocxr1` fallback envelope | +| Redacted reasoning | `redacted_thinking` blocks replayed from the reasoning envelope | | Function-call frames | `tool_use` block with `input_json_delta` | | Terminal event | `message_delta` → `message_stop` | | EOF before terminal | 502-style `api_error` | diff --git a/docs-site/src/content/docs/ja/guides/claude-code.md b/docs-site/src/content/docs/ja/guides/claude-code.md index 2445e7fa3a..384c3f50df 100644 --- a/docs-site/src/content/docs/ja/guides/claude-code.md +++ b/docs-site/src/content/docs/ja/guides/claude-code.md @@ -387,6 +387,7 @@ role、`tool_use_id` のない `tool_result`、id/name のない `tool_use`、na | Heartbeat | `ping` | | テキスト delta | `content_block_start` → `content_block_delta`(text) → `content_block_stop` | | 推論要約/テキスト | 再生されたシグネチャ、または境界付き `ocxr1` フォールバックを持つ `thinking` ブロック | +| 秘匿化された推論 | 推論エンベロープから再生される `redacted_thinking` ブロック | | Function-call フレーム | `input_json_delta` を持つ `tool_use` ブロック | | 終了イベント | `message_delta` → `message_stop` | | 終了前に EOF | 502 形式 `api_error` | diff --git a/docs-site/src/content/docs/ko/guides/claude-code.md b/docs-site/src/content/docs/ko/guides/claude-code.md index 4e3535d821..676800d1e6 100644 --- a/docs-site/src/content/docs/ko/guides/claude-code.md +++ b/docs-site/src/content/docs/ko/guides/claude-code.md @@ -425,6 +425,7 @@ role, `tool_use_id` 없는 `tool_result`, id/name 없는 `tool_use`, name 없는 | Heartbeat | `ping` | | 텍스트 delta | `content_block_start` → `content_block_delta`(text) → `content_block_stop` | | 추론 요약/텍스트 | 재생된 서명 또는 제한된 `ocxr1` 폴백이 있는 `thinking` 블록 | +| 비공개 추론 | 추론 봉투에서 재생되는 `redacted_thinking` 블록 | | Function-call 프레임 | `input_json_delta`가 있는 `tool_use` 블록 | | 종료 이벤트 | `message_delta` → `message_stop` | | 종료 전에 EOF | 502 형식 `api_error` | diff --git a/docs-site/src/content/docs/ru/guides/claude-code.md b/docs-site/src/content/docs/ru/guides/claude-code.md index 847e79964a..60464bfb90 100644 --- a/docs-site/src/content/docs/ru/guides/claude-code.md +++ b/docs-site/src/content/docs/ru/guides/claude-code.md @@ -413,6 +413,7 @@ id/name; именованный `tool_choice` без имени. | Heartbeat | `ping` | | Текстовые дельты | `content_block_start` → `content_block_delta` (text) → `content_block_stop` | | Резюме/текст рассуждений | Блок `thinking` с повторно переданной подписью или ограниченным резервным конвертом `ocxr1` | +| Скрытое рассуждение | Блоки `redacted_thinking`, воспроизведённые из конверта рассуждений | | Кадры function-call | Блок `tool_use` с `input_json_delta` | | Завершающее событие | `message_delta` → `message_stop` | | EOF до завершающего события | `api_error` в стиле 502 | diff --git a/docs-site/src/content/docs/tr/guides/claude-code.md b/docs-site/src/content/docs/tr/guides/claude-code.md index f1c7fca438..4be81a4de8 100644 --- a/docs-site/src/content/docs/tr/guides/claude-code.md +++ b/docs-site/src/content/docs/tr/guides/claude-code.md @@ -602,6 +602,7 @@ kimlik/ad içermeyen `tool_use`; ad içermeyen adlandırılmış `tool_choice`. | Kalp atışı (Heartbeat) | `ping` | | Metin farkları | `content_block_start` → `content_block_delta` (metin) → `content_block_stop` | | Akıl yürütme özeti/metni | Tekrarlanan imzayı veya sınırlı bir `ocxr1` yedeğini taşıyan `thinking` bloğu | +| Gizli akıl yürütme | Akıl yürütme zarfından yeniden oynatılan `redacted_thinking` blokları | | Fonksiyon çağrısı çerçeveleri | `input_json_delta` ile `tool_use` bloğu | | Terminal olayı | `message_delta` → `message_stop` | | Terminalden önce EOF | 502 tarzı `api_error` | diff --git a/docs-site/src/content/docs/zh-cn/guides/claude-code.md b/docs-site/src/content/docs/zh-cn/guides/claude-code.md index 2b8c0bfa98..dd8bc740b8 100644 --- a/docs-site/src/content/docs/zh-cn/guides/claude-code.md +++ b/docs-site/src/content/docs/zh-cn/guides/claude-code.md @@ -364,6 +364,7 @@ role;`tool_result` 缺少 `tool_use_id`;`tool_use` 缺少 id/name;指定 | 心跳 | `ping` | | 文本增量 | `content_block_start` → `content_block_delta`(文本)→ `content_block_stop` | | 推理摘要/文本 | 带重放签名或有界 `ocxr1` 回退信封的 `thinking` 块 | +| 脱敏推理 | 从推理信封重放的 `redacted_thinking` 块 | | Function-call 帧 | 带 `input_json_delta` 的 `tool_use` 块 | | 终止事件 | `message_delta` → `message_stop` | | 在终止事件前 EOF | 502 风格的 `api_error` | diff --git a/docs-site/src/content/docs/zh-tw/guides/claude-code.md b/docs-site/src/content/docs/zh-tw/guides/claude-code.md index db1c779145..86a3ea0782 100644 --- a/docs-site/src/content/docs/zh-tw/guides/claude-code.md +++ b/docs-site/src/content/docs/zh-tw/guides/claude-code.md @@ -440,6 +440,7 @@ role;`tool_result` 缺少 `tool_use_id`;`tool_use` 缺少 id/name;指定 | 心跳 | `ping` | | 文字增量 | `content_block_start` → `content_block_delta`(文字)→ `content_block_stop` | | 推理摘要/文字 | 帶重播簽名或有界 `ocxr1` 備援信封的 `thinking` 塊 | +| 遮蔽推理 | 從推理信封重播的 `redacted_thinking` 塊 | | Function-call 幀 | 帶 `input_json_delta` 的 `tool_use` 塊 | | 終止事件 | `message_delta` → `message_stop` | | 在終止事件前 EOF | 502 風格的 `api_error` | From e87300809ce67a946ccf2059e80b19d435032738 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 08:49:52 +0900 Subject: [PATCH 084/221] docs(devlog): record verified protocol delivery and remainders --- .../260907_axis3_protocol/000_plan.md | 4 +++ .../260907_axis3_protocol/001_roadmap_lock.md | 0 .../010_prepare_and_verify.md | 0 .../260907_axis3_protocol/011_candidate.md | 0 .../260907_axis3_protocol/020_delivery.md | 15 +++++++++ .../021_delivery_record.md | 31 +++++++++++++++++++ .../260907_axis3_protocol/020_delivery.md | 7 ----- 7 files changed, 50 insertions(+), 7 deletions(-) rename devlog/{_plan => _fin}/260907_axis3_protocol/000_plan.md (90%) rename devlog/{_plan => _fin}/260907_axis3_protocol/001_roadmap_lock.md (100%) rename devlog/{_plan => _fin}/260907_axis3_protocol/010_prepare_and_verify.md (100%) rename devlog/{_plan => _fin}/260907_axis3_protocol/011_candidate.md (100%) create mode 100644 devlog/_fin/260907_axis3_protocol/020_delivery.md create mode 100644 devlog/_fin/260907_axis3_protocol/021_delivery_record.md delete mode 100644 devlog/_plan/260907_axis3_protocol/020_delivery.md diff --git a/devlog/_plan/260907_axis3_protocol/000_plan.md b/devlog/_fin/260907_axis3_protocol/000_plan.md similarity index 90% rename from devlog/_plan/260907_axis3_protocol/000_plan.md rename to devlog/_fin/260907_axis3_protocol/000_plan.md index 36cfe95772..d0511f46ec 100644 --- a/devlog/_plan/260907_axis3_protocol/000_plan.md +++ b/devlog/_fin/260907_axis3_protocol/000_plan.md @@ -11,3 +11,7 @@ Success: roadmap verified, accepted changes reviewed and remotely validated, com Acceptance: (1) thinking then text/tool then result retains order and genuine signatures; opaque blocks remain bounded and malformed/nested signatures fail closed. (2) Grok user agent receives ordinary Responses data without codex.rate_limits/codex.response.metadata, while proxy inspection and normal clients retain metadata. (3) valid external task seeds preserve text/order; absent metadata invalid tool outputs still reject. (4) no credential, admission, cache-retention default, provider/routing policy mutation. (5) final CI must really run relevant tests/typecheck, not skip/cancel or fabricate success. No local suite was run. Final failure permits lower-layer CI for localization; unrelated failures may defer delivery, never count as success. Sources: PRs https://github.com/lidge-jun/opencodex/pull/3815 and /pull/3816; issues /issues/3807 and /issues/3719. Current dev 137d6a727. Evidence snapshots under .tmp/axis3. Public notes contain no unreleased vulnerability detail; any new security investigation stays in scratch. + +## Terminal outcome + +Runtime scope delivered in3830–3832 with the evidence and explicit diagnostic remainders in021_delivery_record.md. Documentation-only completion retains the late source-author rows and archives this unit. Initial planning statements are historical; the delivery record is the outcome authority. diff --git a/devlog/_plan/260907_axis3_protocol/001_roadmap_lock.md b/devlog/_fin/260907_axis3_protocol/001_roadmap_lock.md similarity index 100% rename from devlog/_plan/260907_axis3_protocol/001_roadmap_lock.md rename to devlog/_fin/260907_axis3_protocol/001_roadmap_lock.md diff --git a/devlog/_plan/260907_axis3_protocol/010_prepare_and_verify.md b/devlog/_fin/260907_axis3_protocol/010_prepare_and_verify.md similarity index 100% rename from devlog/_plan/260907_axis3_protocol/010_prepare_and_verify.md rename to devlog/_fin/260907_axis3_protocol/010_prepare_and_verify.md diff --git a/devlog/_plan/260907_axis3_protocol/011_candidate.md b/devlog/_fin/260907_axis3_protocol/011_candidate.md similarity index 100% rename from devlog/_plan/260907_axis3_protocol/011_candidate.md rename to devlog/_fin/260907_axis3_protocol/011_candidate.md diff --git a/devlog/_fin/260907_axis3_protocol/020_delivery.md b/devlog/_fin/260907_axis3_protocol/020_delivery.md new file mode 100644 index 0000000000..714a9c0b8e --- /dev/null +++ b/devlog/_fin/260907_axis3_protocol/020_delivery.md @@ -0,0 +1,15 @@ +# Publish and deliver verified manual chain + +Prerequisite: wp1 accepted-source review and successful final-head remote validation, or source-grounded defer outcome. Publish ordinary PRs targeting dev then the parent branch, using every repository template section. Bodies name source PRs, own layer-only diff, exact final combined CI evidence and explicit lower-layer CI deferral per owner instruction. Do not attest local CI. Preserve original contributor trailers in commits; admin merge with merge commits preserves their identity. + +Read live native-stack membership and head/base identity before merge. Never register a native stack. Parent merges to dev first; retain its branch, retarget child to dev, verify current head and ancestry. If integration tree changes materially, refresh final combined CI before landing. Use --admin and --match-head-commit exact guard. Do not merge into the parent branch by mistake. Refresh origin/dev and prove each merge SHA ancestor. Close superseded source PRs only after equivalent fix is actually landed, with credit and replacement link. Keep #3807 and #3719 open if real reproduction/cache acceptance remains unmet. No release or deployment. + +Record final PR URLs, source-to-delivery mapping, commit authors/trailers, CI run and exact SHA, review verdicts, remaining limitations and preserved dirty-work evidence. No fabricated status checks. Completion: every candidate has an honest disposition, accepted work is landed, unresolved diagnostics explicitly deferred under user direction. + +## Delivery revalidation + +Previous D: all 24 real GitHub runtime producer jobs succeeded at final9b5b670db; same-head remote Bun1.4 full suite20897pass18skip0fail, focused405pass, docs build pass. Aggregate ci is still queued; do not claim the workflow complete or manufacture a status. Its only operation is combining those passed producer results. Maintainer explicitly authorized admin merge, and live dev rules expose no required_status_checks rule. Delivery may use the actual completed producer evidence with aggregation status explicitly disclosed; never waive an unrun or failed runtime producer. + +Carry late source docs #3815 through221353662: eight outbound redacted-reasoning table rows in the same eight locales. Prepared docs-only68d90aa37 has runtime/test trees identical to9b and remote docs build passed. After three runtime PRs land bottom-up, bring this docs-only tail and a final delivery record into a fourth ordinary PR. MOVE the completed owning unit from devlog/_plan/260907_axis3_protocol to devlog/_fin/260907_axis3_protocol and NEW021_delivery.md with actual merge/CI/source-credit evidence and deferred issues. No new runtime tests: exact code-tree equality plus docs build/hygiene are the applicable checks. + +Refresh dev and membership before each guarded admin merge; compare merged runtime tree with tested9b. Any unrelated concurrent dev change requires integration review and appropriate renewed evidence. Original #3815 and #3816 close only after their full carried changes (including docs tail) are landed. #3807 and #3719 remain open for the already recorded limits. diff --git a/devlog/_fin/260907_axis3_protocol/021_delivery_record.md b/devlog/_fin/260907_axis3_protocol/021_delivery_record.md new file mode 100644 index 0000000000..e27fd8b41b --- /dev/null +++ b/devlog/_fin/260907_axis3_protocol/021_delivery_record.md @@ -0,0 +1,31 @@ +# Axis 3 delivery record + +## Delivered runtime + +Ordinary PR chain, merged bottom-up with explicit owner admin authorization: + +| PR | Scope | Merge commit | +| --- | --- | --- | +| [3830](https://github.com/lidge-jun/opencodex/pull/3830) | Claude envelope foundation from #3815 | 2269e076d4222ada6ea3694fb8eed04f91a201d2 | +| [3831](https://github.com/lidge-jun/opencodex/pull/3831) | Grok strict-client projection from #3816 and SSE field correction | 07f8d70a75f088b19f4c9dd849e34034a88ab5f3 | +| [3832](https://github.com/lidge-jun/opencodex/pull/3832) | Replay boundaries, terminal overflow, established-history fixtures | 4349cf3cefdb5ed04575f49023ae34ffe6462e1c | + +Original contributors are retained in commits: SB Yoon and Yumi for #3815, Danh Thanh for #3816. Merge commits preserve the carried commits. The documentation-only tail of #3815 through221353662 is carried with both original contributor trailers in68d90aa37. + +## Verification + +- [Final candidate CI](https://github.com/lidge-jun/opencodex/actions/runs/34065721438) completed SUCCESS: all25 jobs at9b5b670db3e24ae5522c5d61e74c071c71257a26, including Linux, macOS shards/control and all six Windows shards. +- Same-head remote Linux Bun1.4.0 full suite:20897pass18skip0fail with `bun run test -- --parallel=1`; typecheck, privacy scan and documentation build passed. Focused protocol coverage:405pass1skip0fail. +- While CI ran, dev advanced to b65b9d8f2 with BigModel/Raycast changes. Conflict-free integration cc6afe2c97fb423363e99682b906bcb529478688 passed remote typecheck and633tests1skip0fail across15 relevant files, including shared passthrough/registry/layout guards. +- Actual runtime landing tree at4349cf3ce equals the integration tree ccaf0a0383cb3e8808e24576271c861625b506fb exactly. This is integration proof, not a claim that the earlier full CI ran on4349cf3ce. +- Independent Astra high source/security/integration reviews passed. The terminal-closure overflow finding was fixed before acceptance. New-test oracle mistakes found remotely were corrected without weakening exact assistant-array or pairing assertions. +- The earlier parallel remote run had21 catalog timeouts; isolated and final sequential runs passed, and final hosted CI passed. No separate root-cause fix is claimed. +- No local test suite or typecheck ran. All pushes used `--no-verify`. Native stacks and fabricated check statuses were not used. Automatic lower/intermediate CI was deferred or cancelled under the owner's combined-first direction. + +## Explicit remainders + +#3807 remains open: the demonstrated complete external-task envelope is already supported, and current-version raw reporter reproduction is unavailable. New ordinary, stored-ID continuation, v2-trigger and v1-compact fixtures preserve established history without relaxing missing-call-ID validation. + +#3719 remains open: live intended-Anthropic acceptance and controlled cache measurements are unverified. Locally hidden text through the Claude boundary and legacy combined-envelope streaming ordering remain outside the preservation claim. Existing compatibility enforcement, hidden display, authentication, routing and cache-retention defaults remain intact. + +The supplied dirty worktree and existing remote main checkout were preserved; execution used separate task worktrees. No release, deployment or account configuration change was made. diff --git a/devlog/_plan/260907_axis3_protocol/020_delivery.md b/devlog/_plan/260907_axis3_protocol/020_delivery.md deleted file mode 100644 index 050cc76d54..0000000000 --- a/devlog/_plan/260907_axis3_protocol/020_delivery.md +++ /dev/null @@ -1,7 +0,0 @@ -# Publish and deliver verified manual chain - -Prerequisite: wp1 accepted-source review and successful final-head remote validation, or source-grounded defer outcome. Publish ordinary PRs targeting dev then the parent branch, using every repository template section. Bodies name source PRs, own layer-only diff, exact final combined CI evidence and explicit lower-layer CI deferral per owner instruction. Do not attest local CI. Preserve original contributor trailers in commits; admin merge with merge commits preserves their identity. - -Read live native-stack membership and head/base identity before merge. Never register a native stack. Parent merges to dev first; retain its branch, retarget child to dev, verify current head and ancestry. If integration tree changes materially, refresh final combined CI before landing. Use --admin and --match-head-commit exact guard. Do not merge into the parent branch by mistake. Refresh origin/dev and prove each merge SHA ancestor. Close superseded source PRs only after equivalent fix is actually landed, with credit and replacement link. Keep #3807 and #3719 open if real reproduction/cache acceptance remains unmet. No release or deployment. - -Record final PR URLs, source-to-delivery mapping, commit authors/trailers, CI run and exact SHA, review verdicts, remaining limitations and preserved dirty-work evidence. No fabricated status checks. Completion: every candidate has an honest disposition, accepted work is landed, unresolved diagnostics explicitly deferred under user direction. From 91fba4b4cd3d31e79b7d404b3d201c7b9896f67d Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:41:25 +0900 Subject: [PATCH 085/221] ci: gate source-build Docker lifecycle verification [skip ci] Add Docker packaging paths to the existing CI scope, execute the isolated lifecycle smoke, and include it in the aggregate gate. Extend the workflow oracle and typecheck the new script. Final integration will be dispatched explicitly with lane=all; redundant lower-layer runs are intentionally skipped. Co-authored-by: Buseong Kim Co-authored-by: Ingwannu --- .github/workflows/ci.yml | 31 ++++++++++++++++- .../src/content/docs/guides/remote-hub.md | 6 ++++ tests/ci-workflows/ci-workflows.test.ts | 34 ++++++++++++++++++- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c15cb696a..a6c0e7ab1a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,10 @@ on: push: branches: [main, preview, dev] paths: + - "Dockerfile" + - "compose.yaml" + - ".dockerignore" + - "docker/**" - "src/**" - "bin/**" - "tests/**" @@ -180,6 +184,10 @@ jobs: # start the workflow so the aggregate check exists, while these # paths decide whether the expensive test jobs need to run. ci: + - 'Dockerfile' + - 'compose.yaml' + - '.dockerignore' + - 'docker/**' - 'src/**' - 'bin/**' - 'tests/**' @@ -423,6 +431,7 @@ jobs: run: | bun x tsc --noEmit bun x tsc --noEmit -p tests/tsconfig.doctor-service-memory-contract.json + bun x tsc --noEmit --strict --target ESNext --module ESNext --moduleResolution bundler --types bun-types --skipLibCheck scripts/ci/docker-smoke.ts - name: GUI tests run: cd gui && bun test --isolate tests @@ -908,6 +917,26 @@ jobs: bun run scripts/keyring-smoke.ts ' + # Exercise the source-build Compose contract, including real volume reuse. + # Host fixtures cannot prove image construction or container recreation. + docker-smoke: + name: docker smoke + needs: changes + if: github.event_name != 'pull_request' || needs.changes.outputs.ci == 'true' + runs-on: ubuntu-latest + timeout-minutes: 20 + steps: + - name: Checkout + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7 + with: + persist-credentials: false + + - name: Setup project Bun + uses: ./.github/actions/setup-project-bun + + - name: Build, start, and recreate the container + run: bun scripts/ci/docker-smoke.ts + npm-global-smoke: name: npm-global ${{ matrix.os }} needs: changes @@ -986,7 +1015,7 @@ jobs: # direct dependencies only, so a failing `select-windows-runner` would # otherwise reach this gate as nothing at all while its dependents report # `skipped` — which the gate is required to read as a deliberate skip. - needs: [changes, select-windows-runner, test, storage-policy, api-usage, gates, platform-macos, macos-control, platform-windows, keyring-smoke, npm-global-smoke] + needs: [changes, select-windows-runner, test, storage-policy, api-usage, gates, platform-macos, macos-control, platform-windows, keyring-smoke, docker-smoke, npm-global-smoke] runs-on: ubuntu-latest timeout-minutes: 5 steps: diff --git a/docs-site/src/content/docs/guides/remote-hub.md b/docs-site/src/content/docs/guides/remote-hub.md index 460fe4651d..6a2b2a33bd 100644 --- a/docs-site/src/content/docs/guides/remote-hub.md +++ b/docs-site/src/content/docs/guides/remote-hub.md @@ -291,6 +291,12 @@ unreadable, a non-loopback hub must not be accepted as ready. Never treat livene `docker compose down --volumes` as destructive: it deletes configuration, OAuth credentials, usage history, the data-plane token, and persisted Codex state together. +Cross-platform CI builds the source image and checks startup, data-plane token admission, and +container recreation using an isolated Compose project with throwaway credentials. It verifies that +both named volumes and a synthetic catalog survive replacement. This check does not validate a +real provider account, OAuth callback, custom mount migration, or every CPU architecture; perform +the authenticated routed-response check above for your deployment. + ## Rollback Inspect existing Serve mappings before changing them. `tailscale serve reset` removes every mapping diff --git a/tests/ci-workflows/ci-workflows.test.ts b/tests/ci-workflows/ci-workflows.test.ts index ec2c919c45..77192bbb48 100644 --- a/tests/ci-workflows/ci-workflows.test.ts +++ b/tests/ci-workflows/ci-workflows.test.ts @@ -506,17 +506,21 @@ describe("GitHub Actions hardening", () => { // allowlist. PRs always create the workflow and aggregate check; this list // decides whether the costly jobs run. Pin the entire list on both paths. const ciPaths = [ + ".dockerignore", ".gitattributes", ".github/workflows/ci.yml", ".github/workflows/enforce-pr-target.yml", ".github/workflows/release.yml", ".github/workflows/stale-needs-info.yml", ".npmignore", + "Dockerfile", "LICENSE", "README.md", "assets/**", "bin/**", "bun.lock", + "compose.yaml", + "docker/**", "gui/**", "package.json", "scripts/**", @@ -563,7 +567,7 @@ describe("GitHub Actions hardening", () => { expect(scopeIndex).toBeGreaterThan(filterIndex); const scopedCondition = "github.event_name != 'pull_request' || needs.changes.outputs.ci == 'true'"; - for (const jobName of ["test", "storage-policy", "gates", "platform-macos", "keyring-smoke"]) { + for (const jobName of ["test", "storage-policy", "gates", "platform-macos", "keyring-smoke", "docker-smoke"]) { const job = ci.jobs?.[jobName] as { needs?: string; if?: string } | undefined; expect(`${jobName}:${job?.needs}`).toBe(`${jobName}:changes`); expect(`${jobName}:${job?.if}`).toBe(`${jobName}:${scopedCondition}`); @@ -573,6 +577,34 @@ describe("GitHub Actions hardening", () => { expect(macosControlIf?.if).toBe("github.event_name == 'workflow_dispatch'"); }); + test("Docker smoke executes the source-build lifecycle and gates its result", async () => { + const ci = Bun.YAML.parse(await readText(".github/workflows/ci.yml")) as { + jobs?: Record; + steps?: Array<{ name?: string; run?: string; if?: string; "continue-on-error"?: boolean }>; + }>; + }; + const smoke = ci.jobs?.["docker-smoke"]; + expect(smoke?.["runs-on"]).toBe("ubuntu-latest"); + expect(smoke?.["timeout-minutes"]).toBe(20); + expect(smoke?.["continue-on-error"]).toBeUndefined(); + expect(smoke?.permissions).toBeUndefined(); // Inherits workflow contents:read. + const execution = smoke?.steps?.find(step => + hasExactShellCommand(step.run, "bun scripts/ci/docker-smoke.ts")); + expect(execution).toBeDefined(); + expect(execution?.if).toBeUndefined(); + expect(execution?.["continue-on-error"]).toBeUndefined(); + expect(ci.jobs?.ci?.needs).toContain("docker-smoke"); + const typecheck = ci.jobs?.gates?.steps?.find(step => step.name === "Typecheck"); + expect(hasExactShellCommand(typecheck?.run, + "bun x tsc --noEmit --strict --target ESNext --module ESNext --moduleResolution bundler --types bun-types --skipLibCheck scripts/ci/docker-smoke.ts", + )).toBe(true); + }); + test("cross-platform CI keeps the GUI lint and build gates", async () => { // Review finding (PR #97): the GUI build gate was silently dropped once; assert the // enhanced gate (PR #99) stays wired so broken GUI builds cannot merge unnoticed. From 15fa571554d8eda59b91ca05a931dcb98c2c8a2c Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 08:54:51 +0900 Subject: [PATCH 086/221] fix(container): retain routed catalog across managed recreation [skip ci] Real Docker CI exposed foreground shutdown stripping routed catalog rows despite persistent volumes. Declare the existing service lifecycle mode in the runtime image so Docker-managed stop/recreate preserves routed state. Keep the routed fixture and exact-byte checks. Two independent lifecycle/security reviews accepted this bounded packaging change; isolated CLI before/after reproduced the defect and preservation with service mode. Co-authored-by: Buseong Kim Co-authored-by: Ingwannu --- Dockerfile | 3 +++ .../025_container_lifecycle_mode.md | 10 ++++++++++ docs-site/src/content/docs/guides/remote-hub.md | 6 +++++- scripts/ci/docker-smoke.ts | 1 + tests/service/container-bootstrap.test.ts | 1 + 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 devlog/_plan/260907_platform_validation/025_container_lifecycle_mode.md diff --git a/Dockerfile b/Dockerfile index 1ed000743d..5987bfa991 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,10 @@ RUN cd gui && bun run build FROM ${BUN_IMAGE} AS runtime WORKDIR /home/bun/app +# Docker supervises this foreground process; retain routed state on stop/recreate. +# This uses the existing service lifecycle mode and does not install a service manager. ENV NODE_ENV=production \ + OCX_SERVICE=1 \ OPENCODEX_HOME=/home/bun/.opencodex \ CODEX_HOME=/home/bun/.codex \ OCX_API_TOKEN_FILE=/home/bun/.opencodex/service-api-token diff --git a/devlog/_plan/260907_platform_validation/025_container_lifecycle_mode.md b/devlog/_plan/260907_platform_validation/025_container_lifecycle_mode.md new file mode 100644 index 0000000000..c86f4fc765 --- /dev/null +++ b/devlog/_plan/260907_platform_validation/025_container_lifecycle_mode.md @@ -0,0 +1,10 @@ +# Container lifecycle mode + +Amendment after real Docker recreation verification. Docker supervises the foreground hub and must retain persisted routed state across replacement. + +MODIFY Dockerfile runtime ENV: set existing OCX_SERVICE=1, with no service manager installation or privilege change. Preserve image digest, foreground CMD, listener authentication, separate writable homes and read-only root. +MODIFY scripts/ci/docker-smoke.ts: assert the actual container process receives service lifecycle mode. Retain the routed synthetic slug and exact token/catalog/config hashes across graceful recreation. +MODIFY tests/service/container-bootstrap.test.ts: include the runtime ENV declaration in the existing packaging contract. +MODIFY docs-site/src/content/docs/guides/remote-hub.md: document service-mode foreground lifecycle, Compose restart/recreation, and the limit on other dashboard restart paths. + +Independent Astra high lifecycle/security review accepted the bounded packaging change. Actual remote CLI comparison confirmed preservation with service mode. Final image CI must prove the same real container lifecycle; no local tests or Docker execution. This does not change shared CLI cleanup, restart policy, or authentication code. diff --git a/docs-site/src/content/docs/guides/remote-hub.md b/docs-site/src/content/docs/guides/remote-hub.md index 2334303be7..460fe4651d 100644 --- a/docs-site/src/content/docs/guides/remote-hub.md +++ b/docs-site/src/content/docs/guides/remote-hub.md @@ -167,7 +167,11 @@ opencodex does not publish an official container image. The repository does main [`compose.yaml`](https://github.com/lidge-jun/opencodex/blob/main/compose.yaml), and a narrow `.dockerignore`. The build pins the multi-platform Bun 1.4.0 image index by digest, runs the proxy as the non-root `bun` user, keeps the root filesystem read-only, drops Linux capabilities, and publishes -only the data listener on the host's `127.0.0.1:10100` by default. +only the data listener on the host's `127.0.0.1:10100` by default. The foreground process uses +`OCX_SERVICE=1`, so stopping or recreating the container preserves routed Codex state instead +of restoring a native desktop configuration. Docker supplies supervision; no OS service manager +is installed in the image. Use Compose to restart/recreate the container; this does not extend +support to every dashboard restart path. The image seeds a first-run `hub` configuration that binds the container listener to `0.0.0.0`. Before the first normal start, stream a freshly generated data-plane token into the bootstrap helper. diff --git a/scripts/ci/docker-smoke.ts b/scripts/ci/docker-smoke.ts index e26b11de34..c2a7ec0ee2 100644 --- a/scripts/ci/docker-smoke.ts +++ b/scripts/ci/docker-smoke.ts @@ -190,6 +190,7 @@ const stateProbe = ` if (!['seed', 'first-ready', 'steady'].includes(phase)) throw new Error('invalid state phase'); ${fixtureConfigCheck} const homes = ['/home/bun/.opencodex', '/home/bun/.codex']; + if (process.env.OCX_SERVICE !== '1') throw new Error('image service lifecycle mode missing'); const uid = process.getuid(); if (uid === 0) throw new Error('root user'); const status = readFileSync('/proc/self/status', 'utf8'); diff --git a/tests/service/container-bootstrap.test.ts b/tests/service/container-bootstrap.test.ts index ada807d1d0..9eec8edd6b 100644 --- a/tests/service/container-bootstrap.test.ts +++ b/tests/service/container-bootstrap.test.ts @@ -63,6 +63,7 @@ describe("container deployment contract", () => { const runtime = readFileSync(repoPath("Dockerfile"), "utf8").split(" AS runtime")[1]!; expect(runtime).toContain("OPENCODEX_HOME=/home/bun/.opencodex"); expect(runtime).toContain("CODEX_HOME=/home/bun/.codex"); + expect(runtime).toContain("OCX_SERVICE=1"); expect(runtime).toContain("install -d -m 0700 -o bun -g bun /home/bun/.opencodex /home/bun/.codex"); expect(runtime).toContain('VOLUME ["/home/bun/.opencodex", "/home/bun/.codex"]'); expect(runtime).toContain("USER bun"); From 6f2ad1ef32c113ff5827c58959c85cefa923b15c Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:52:43 +0900 Subject: [PATCH 087/221] ci: select explicit-file typecheck mode for TypeScript 7 [skip ci] Final run 34064754947 passed root typechecks but rejected the standalone smoke-script command with TS5112. Explicit --ignoreConfig retains all strict script flags and preserves the existing root/project checks. Co-authored-by: Buseong Kim Co-authored-by: Ingwannu --- .github/workflows/ci.yml | 2 +- tests/ci-workflows/ci-workflows.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6c0e7ab1a..00abe5ec24 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -431,7 +431,7 @@ jobs: run: | bun x tsc --noEmit bun x tsc --noEmit -p tests/tsconfig.doctor-service-memory-contract.json - bun x tsc --noEmit --strict --target ESNext --module ESNext --moduleResolution bundler --types bun-types --skipLibCheck scripts/ci/docker-smoke.ts + bun x tsc --ignoreConfig --noEmit --strict --target ESNext --module ESNext --moduleResolution bundler --types bun-types --skipLibCheck scripts/ci/docker-smoke.ts - name: GUI tests run: cd gui && bun test --isolate tests diff --git a/tests/ci-workflows/ci-workflows.test.ts b/tests/ci-workflows/ci-workflows.test.ts index 77192bbb48..c967f9d4c0 100644 --- a/tests/ci-workflows/ci-workflows.test.ts +++ b/tests/ci-workflows/ci-workflows.test.ts @@ -601,7 +601,7 @@ describe("GitHub Actions hardening", () => { expect(ci.jobs?.ci?.needs).toContain("docker-smoke"); const typecheck = ci.jobs?.gates?.steps?.find(step => step.name === "Typecheck"); expect(hasExactShellCommand(typecheck?.run, - "bun x tsc --noEmit --strict --target ESNext --module ESNext --moduleResolution bundler --types bun-types --skipLibCheck scripts/ci/docker-smoke.ts", + "bun x tsc --ignoreConfig --noEmit --strict --target ESNext --module ESNext --moduleResolution bundler --types bun-types --skipLibCheck scripts/ci/docker-smoke.ts", )).toBe(true); }); From a3c2eb56216ac4f3331e7bc4b43b47e1d5d2ac6c Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 09:15:21 +0900 Subject: [PATCH 088/221] fix(anthropic): expire retained quota measurements at known resets [skip ci] Address #3825 review discussion_r3945728864. Retained standard and model-specific measurements become unknown after their known reset, including idle reads, hydration, persistence and joined failed probes. Reset-only headers cannot renew old usage. Keep unknown-reset behavior, probe clocks, unavailability and credential policy unchanged. Add real quota-evidence/manual-selection and persistence regressions; no local suites run per maintainer instruction. Original #3809 credit remains in ancestor f215f79b4. --- .../src/content/docs/guides/claude-code.md | 4 +- .../docs/reference/configuration/providers.md | 7 +- src/providers/quota.ts | 67 ++++- .../anthropic-ratelimit-headers.test.ts | 237 +++++++++++++++++- 4 files changed, 299 insertions(+), 16 deletions(-) diff --git a/docs-site/src/content/docs/guides/claude-code.md b/docs-site/src/content/docs/guides/claude-code.md index 2e841e205c..720a303b00 100644 --- a/docs-site/src/content/docs/guides/claude-code.md +++ b/docs-site/src/content/docs/guides/claude-code.md @@ -36,7 +36,9 @@ Operational contract when enabled: two the response carries is recorded for that account — each window independently, and a refusal counts as well as a success. Usage-aware selection works from ordinary traffic, without waiting for a dashboard poll. Headers preserve model-specific quota windows and do - not postpone usage probes or clear a failed usage probe's unavailable status. + not postpone usage probes or clear a failed usage probe's unavailable status. Measurements + whose known reset time has passed are discarded as unknown, including retained model-specific + windows. Values without a known reset are preserved; missing data is never reported as zero usage. - Affinity is **process-local** (lost on proxy restart). - **401/403** credential failures quarantine the account (`needsReauth`) so it is excluded from selection until re-authenticated. diff --git a/docs-site/src/content/docs/reference/configuration/providers.md b/docs-site/src/content/docs/reference/configuration/providers.md index c80176868e..710c069b24 100644 --- a/docs-site/src/content/docs/reference/configuration/providers.md +++ b/docs-site/src/content/docs/reference/configuration/providers.md @@ -446,7 +446,12 @@ of those two a given response carries is recorded against that account — each on refusals as well as successes. Usage-aware selection therefore works from the accounts you actually use, without waiting for the dashboard Providers page to poll them. These readings refresh the existing row rather than replacing it, so the model-scoped weekly bars that only the usage -endpoint reports are preserved. Header observations do not postpone usage probes or clear a failed +endpoint reports are preserved until their known reset time passes. Expired measurements become +unknown, including retained standard windows omitted by later headers. A reset-only header cannot +extend an older utilization measurement. Values with no known reset retain their existing behavior; +missing measurements are never replaced with zero usage. + +Header observations do not postpone usage probes or clear a failed probe's unavailable status. After restart, cached Anthropic observations remain available while the next quota read probes again, because the saved observations do not include the probe clock. diff --git a/src/providers/quota.ts b/src/providers/quota.ts index dbdb6699f7..5dcb69beb3 100644 --- a/src/providers/quota.ts +++ b/src/providers/quota.ts @@ -1552,6 +1552,37 @@ type AccountQuotaCacheEntry = { identity?: string; isCurrent?: () => boolean; }; +/** Expired measurements become unknown; missing reset evidence never implies a fresh allowance. */ +function normalizeAnthropicQuota(quota: ProviderQuota | null | undefined, now: number): ProviderQuota | null { + if (!quota) return null; + const expired = (resetAt: number | undefined): boolean => typeof resetAt === "number" + && Number.isFinite(resetAt) && resetAt > 0 && resetAt <= now; + let result = quota; + for (const [percent, reset] of [ + ["fiveHourPercent", "fiveHourResetAt"], + ["weeklyPercent", "weeklyResetAt"], + ["monthlyPercent", "monthlyResetAt"], + ] as const) { + if (!expired(quota[reset])) continue; + if (result === quota) result = { ...quota }; + delete result[percent]; + delete result[reset]; + } + // Persisted rows validate only the outer quota object, so custom data may be malformed. + if (quota.customWindows !== undefined) { + const windows = Array.isArray(quota.customWindows) ? quota.customWindows : []; + const retained = windows.filter(window => window !== null && typeof window === "object" + && typeof window.label === "string" && typeof window.percent === "number" + && Number.isFinite(window.percent) && !expired(window.resetAt)); + if (!Array.isArray(quota.customWindows) || retained.length !== windows.length) { + if (result === quota) result = { ...quota }; + if (retained.length) result.customWindows = retained; + else delete result.customWindows; + } + } + return hasQuotaRows(result) ? result : null; +} + const accountQuotaCache = new Map(); let explicitAccountEpoch = 0; @@ -1570,15 +1601,21 @@ function hydrateAccountQuotaCache(): void { for (const [key, quota] of readPersistedAccountQuotas()) { // Disk stores observation time, not the Anthropic usage probe's clock. if (!accountQuotaCache.has(key)) { - accountQuotaCache.set(key, { ts: key.startsWith("anthropic\u0000") ? 0 : quota.updatedAt, quota }); + const anthropic = key.startsWith("anthropic\u0000"); + accountQuotaCache.set(key, { + ts: anthropic ? 0 : quota.updatedAt, + quota: anthropic ? normalizeAnthropicQuota(quota, Date.now()) : quota, + }); } } } function persistAccountQuotaCache(): void { schedulePersistAccountQuotas(function* () { + const now = Date.now(); for (const [key, entry] of accountQuotaCache) { - if (entry.quota) yield [key, entry.quota] as [string, ProviderQuota]; + const quota = key.startsWith("anthropic\u0000") ? normalizeAnthropicQuota(entry.quota, now) : entry.quota; + if (quota) yield [key, quota] as [string, ProviderQuota]; } }); } @@ -1628,7 +1665,7 @@ function accountCacheKey(provider: string, accountId: string): string { export function getCachedProviderAccountQuota(provider: string, accountId: string): ProviderQuota | null { const entry = accountQuotaCache.get(accountCacheKey(provider, accountId)); if (entry?.isCurrent && !entry.isCurrent()) return null; - return entry?.quota ?? null; + return provider === "anthropic" ? normalizeAnthropicQuota(entry?.quota, Date.now()) : entry?.quota ?? null; } /** Test-only: seed or clear the per-account quota cache without probing upstream. */ @@ -1661,9 +1698,9 @@ export function parseAnthropicRateLimitHeaders(headers: Headers): ProviderQuota const weeklyResetAt = anthropicHeaderResetAt(headers.get("anthropic-ratelimit-unified-7d-reset")); return { ...(fiveHourPercent !== undefined ? { fiveHourPercent } : {}), - ...(fiveHourResetAt !== undefined ? { fiveHourResetAt } : {}), + ...(fiveHourPercent !== undefined && fiveHourResetAt !== undefined ? { fiveHourResetAt } : {}), ...(weeklyPercent !== undefined ? { weeklyPercent } : {}), - ...(weeklyResetAt !== undefined ? { weeklyResetAt } : {}), + ...(weeklyPercent !== undefined && weeklyResetAt !== undefined ? { weeklyResetAt } : {}), updatedAt: Date.now(), }; } @@ -1700,7 +1737,9 @@ export function recordAnthropicAccountQuotaFromHeaders( ...previous, // Headers do not prove that the last usage probe succeeded. ts: previous?.ts ?? 0, - quota: { ...(previous?.quota ?? {}), ...observed }, + quota: normalizeAnthropicQuota({ + ...normalizeAnthropicQuota(previous?.quota, observed.updatedAt), ...observed, + }, observed.updatedAt), }); persistAccountQuotaCache(); } @@ -1978,7 +2017,9 @@ async function fetchAccountQuota( const key = accountCacheKey(provider, accountId); const writerGeneration = captureConfigGeneration(); const cached = accountQuotaCache.get(key); - if (!forceRefresh && cached && Date.now() - cached.ts < ACCOUNT_QUOTA_TTL_MS) return cached; + if (!forceRefresh && cached && Date.now() - cached.ts < ACCOUNT_QUOTA_TTL_MS) { + return provider === "anthropic" ? { ...cached, quota: normalizeAnthropicQuota(cached.quota, Date.now()) } : cached; + } const joinable = accountQuotaInflight.get(key); if (joinable) return joinable; @@ -2016,7 +2057,8 @@ async function fetchAccountQuota( const entry: AccountQuotaCacheEntry = { ts: Date.now(), // Settle once for all joiners against observations committed during the probe. - quota: (provider === "anthropic" ? accountQuotaCache.get(key)?.quota : cached?.quota) ?? null, + quota: provider === "anthropic" + ? normalizeAnthropicQuota(accountQuotaCache.get(key)?.quota, Date.now()) : cached?.quota ?? null, unavailable: true, }; if (mayCommitAccountQuotaKey(key, writerGeneration)) { @@ -2026,7 +2068,9 @@ async function fetchAccountQuota( } return entry; } - const entry: AccountQuotaCacheEntry = { ts: Date.now(), quota }; + const entry: AccountQuotaCacheEntry = { + ts: Date.now(), quota: provider === "anthropic" ? normalizeAnthropicQuota(quota, Date.now()) : quota, + }; if (mayCommitAccountQuotaKey(key, writerGeneration)) { accountQuotaCache.set(key, entry); // Exhaustion state rides the SAME commit guard as the quota row: a probe from a @@ -2038,7 +2082,8 @@ async function fetchAccountQuota( } catch { const entry: AccountQuotaCacheEntry = { ts: Date.now(), - quota: (provider === "anthropic" ? accountQuotaCache.get(key)?.quota : cached?.quota) ?? null, + quota: provider === "anthropic" + ? normalizeAnthropicQuota(accountQuotaCache.get(key)?.quota, Date.now()) : cached?.quota ?? null, unavailable: true, }; if (mayCommitAccountQuotaKey(key, writerGeneration)) { @@ -2070,7 +2115,7 @@ export async function fetchProviderAccountQuotas( const entry = await fetchAccountQuota(provider, account.id, forceRefresh, providerConfig); const result: ProviderAccountQuota = { accountId: account.id, - quota: entry.quota, + quota: provider === "anthropic" ? normalizeAnthropicQuota(entry.quota, Date.now()) : entry.quota, ...(entry.unavailable ? { unavailable: true as const } : {}), }; if (!explicitAccountReader(provider)) return result; diff --git a/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts b/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts index 21ae2d8489..77989064ff 100644 --- a/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts +++ b/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts @@ -1,6 +1,6 @@ /** Anthropic response observations must preserve account usage and probe semantics. */ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; -import { mkdtempSync, writeFileSync } from "node:fs"; +import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test"; +import { mkdtempSync, readFileSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { @@ -9,8 +9,11 @@ import { forgetAnthropicFailoverQuorum, getAnthropicAccountHealthSnapshot, rotateAnthropicAccountOn429, + resetAnthropicRoutingForManualSelection, + resolveAnthropicAccountForSession, } from "../../../src/oauth/anthropic-routing"; import { projectStoredOAuthAccountHealth } from "../../../src/oauth/health"; +import { quotaEvidenceForCandidate } from "../../../src/routing/quota"; import { clearAccountQuotaCache, fetchProviderAccountQuotas, @@ -22,7 +25,7 @@ import { setCachedProviderAccountQuotaForTests, sweepExpiredProviderAccountQuotaRows, } from "../../../src/providers/quota"; -import { getAccountSet, saveCredential } from "../../../src/oauth/store"; +import { getAccountSet, saveCredential, setActiveAccount } from "../../../src/oauth/store"; import { clearPoolRotationState } from "../../../src/codex/pool-rotation"; import { removeTreeWithRetry } from "../../helpers/remove-tree"; import type { OcxConfig } from "../../../src/types"; @@ -526,3 +529,231 @@ describe("Anthropic malformed deadlines and partial windows", () => { }); }); }); + +describe("Anthropic known-reset expiry", () => { + const start = 1_800_000_000_000; + let now: number; + + beforeEach(() => { + now = start; + Date.now = () => now; + }); + + function observe(id: string, headers: Record = { + "anthropic-ratelimit-unified-5h-utilization": "0.41", + }): void { + recordAnthropicAccountQuotaFromHeaders(id, new Headers(headers), 0); + } + + test("headers expire only known elapsed custom windows without mutating their source", async () => { + const [id] = await seed(1); + const saved = { + fiveHourPercent: 10, + customWindows: [ + { label: "Opus", percent: 100, resetAt: start + 60_000 }, + { label: "Sonnet", percent: 90, resetAt: start + 600_000 }, + { label: "Fable", percent: 70 }, + { label: "Unknown reset", percent: 60, resetAt: 0 }, + ], + updatedAt: start, + }; + setCachedProviderAccountQuotaForTests("anthropic", id!, saved); + now += 120_000; + observe(id!); + const quota = getCachedProviderAccountQuota("anthropic", id!); + expect(quota?.customWindows).toEqual(saved.customWindows.slice(1)); + expect(quota?.fiveHourPercent).toBe(41); + expect(quota?.updatedAt).toBe(now); + expect(saved.customWindows).toHaveLength(4); + expect(saved.updatedAt).toBe(start); + now += 30_000; + observe(id!); + expect(getCachedProviderAccountQuota("anthropic", id!)?.customWindows).toEqual(saved.customWindows.slice(1)); + }); + + for (const [percent, reset, observedWindow] of [ + ["fiveHourPercent", "fiveHourResetAt", "7d"], + ["weeklyPercent", "weeklyResetAt", "5h"], + ["monthlyPercent", "monthlyResetAt", "5h"], + ] as const) { + test(`partial headers remove the expired ${percent} pair without inventing zero`, async () => { + const [id] = await seed(1); + setCachedProviderAccountQuotaForTests("anthropic", id!, { + [percent]: 100, [reset]: start + 60_000, updatedAt: start, + }); + now += 60_000; + observe(id!, { [`anthropic-ratelimit-unified-${observedWindow}-utilization`]: "0.2" }); + const quota = getCachedProviderAccountQuota("anthropic", id!); + expect(quota).not.toBeNull(); + expect(quota?.[percent]).toBeUndefined(); + expect(quota?.[reset]).toBeUndefined(); + }); + } + + test("standard windows without reset evidence remain known", async () => { + const [id] = await seed(1); + setCachedProviderAccountQuotaForTests("anthropic", id!, { weeklyPercent: 100, updatedAt: start }); + now += 120_000; + observe(id!); + expect(getCachedProviderAccountQuota("anthropic", id!)?.weeklyPercent).toBe(100); + }); + + test("a reset-only header cannot extend retained usage even before the original reset", async () => { + const [id] = await seed(1); + setCachedProviderAccountQuotaForTests("anthropic", id!, { + fiveHourPercent: 10, weeklyPercent: 100, weeklyResetAt: start + 60_000, updatedAt: start, + }); + now += 30_000; + observe(id!, { + "anthropic-ratelimit-unified-5h-utilization": "0.2", + "anthropic-ratelimit-unified-7d-utilization": "invalid", + "anthropic-ratelimit-unified-7d-reset": String((start + 600_000) / 1000), + }); + expect(getCachedProviderAccountQuota("anthropic", id!)?.weeklyResetAt).toBe(start + 60_000); + now += 30_000; + expect(getCachedProviderAccountQuota("anthropic", id!)?.weeklyPercent).toBeUndefined(); + expect(getCachedProviderAccountQuota("anthropic", id!)?.weeklyResetAt).toBeUndefined(); + observe(id!, { + "anthropic-ratelimit-unified-7d-utilization": "0.3", + "anthropic-ratelimit-unified-7d-reset": String((start + 600_000) / 1000), + }); + expect(getCachedProviderAccountQuota("anthropic", id!)).toMatchObject({ + weeklyPercent: 30, weeklyResetAt: start + 600_000, + }); + }); + + test("idle cache reads cross a reset without another observation or probe", async () => { + const [id] = await seed(1); + const quota = { customWindows: [{ label: "Opus", percent: 100, resetAt: start + 60_000 }], updatedAt: start }; + setCachedProviderAccountQuotaForTests("anthropic", id!, quota); + setCachedProviderAccountQuotaForTests("kiro", "untouched", quota); + const candidate = { provider: "anthropic", model: "claude-opus-4-6", accountRef: id! }; + now += 59_999; + expect(getCachedProviderAccountQuota("anthropic", id!)).toEqual(quota); + expect(quotaEvidenceForCandidate(candidate)).toMatchObject({ known: true, exhausted: true, headroom: 0 }); + now++; + expect(getCachedProviderAccountQuota("anthropic", id!)).toBeNull(); + expect(quotaEvidenceForCandidate(candidate)).toEqual({ known: false }); + const [row] = await fetchProviderAccountQuotas("anthropic"); + expect(row?.quota).toBeNull(); + expect(row?.unavailable).toBeUndefined(); + expect(getCachedProviderAccountQuota("kiro", "untouched")).toBe(quota); + }); + + test("expired Opus evidence stops suppressing an otherwise healthy manual selection", async () => { + const [a, b] = await seed(2); + setCachedProviderAccountQuotaForTests("anthropic", a!, { + fiveHourPercent: 30, customWindows: [{ label: "Opus", percent: 100, resetAt: start + 60_000 }], updatedAt: start, + }); + setCachedProviderAccountQuotaForTests("anthropic", b!, { fiveHourPercent: 11, updatedAt: start }); + await setActiveAccount("anthropic", a!); + resetAnthropicRoutingForManualSelection(a!); + const config = poolEnabled(); + config.anthropicAccountPool = { enabled: true, strategy: "quota", autoSwitchThreshold: 20 }; + const candidate = { provider: "anthropic", model: "claude-opus-4-6", accountRef: a! }; + expect(resolveAnthropicAccountForSession(null, config, now).accountId).toBe(b); + expect(quotaEvidenceForCandidate(candidate)).toMatchObject({ known: true, exhausted: true, headroom: 0 }); + now += 60_000; + expect(resolveAnthropicAccountForSession(null, config, now)).toMatchObject({ accountId: a, reason: "manual" }); + expect(quotaEvidenceForCandidate(candidate)).toMatchObject({ known: true, exhausted: false, headroom: 0.7 }); + }); + + for (const failure of ["http", "network"] as const) { + test(`joined ${failure} failures remove windows expiring during the shared probe`, async () => { + const [id] = await seed(1); + setCachedProviderAccountQuotaForTests("anthropic", id!, { + fiveHourPercent: 10, weeklyPercent: 100, weeklyResetAt: start + 60_000, + customWindows: [{ label: "Opus", percent: 100, resetAt: start + 60_000 }, { label: "Fable", percent: 63 }], + updatedAt: start, + }); + let started!: () => void; + const dispatched = new Promise(resolve => { started = resolve; }); + let finish!: (response: Response) => void; + let fail!: (error: Error) => void; + const response = new Promise((resolve, reject) => { finish = resolve; fail = reject; }); + let calls = 0; + globalThis.fetch = (async () => { calls++; started(); return response; }) as typeof fetch; + const first = fetchProviderAccountQuotas("anthropic", true); + await dispatched; + const second = fetchProviderAccountQuotas("anthropic", true); + now += 30_000; + observe(id!); + now += 30_000; + if (failure === "http") finish(new Response("busy", { status: 429 })); + else fail(new Error("offline")); + const [a, b] = await Promise.all([first, second]); + expect(calls).toBe(1); + expect(a).toEqual(b); + expect(a[0]?.unavailable).toBe(true); + expect(a[0]?.quota).toEqual({ fiveHourPercent: 41, customWindows: [{ label: "Fable", percent: 63 }], updatedAt: start + 30_000 }); + expect(getCachedProviderAccountQuota("anthropic", id!)).toEqual(a[0]?.quota); + expect((await fetchProviderAccountQuotas("anthropic"))[0]).toEqual(a[0]); + expect(calls).toBe(1); + }); + } + + test("restart cannot revive expired bars from a recently updated disk row", async () => { + const [id] = await seed(1); + now += 120_000; + writeFileSync(join(home, "provider-account-quota-cache.json"), JSON.stringify({ version: 1, rows: { + [`anthropic\u0000${id}`]: { + fiveHourPercent: 41, weeklyPercent: 100, weeklyResetAt: start + 60_000, + customWindows: [{ label: "Opus", percent: 100, resetAt: start + 60_000 }, { label: "Fable", percent: 63 }], + updatedAt: now, + }, + } })); + clearAccountQuotaCache(); + let calls = 0; + globalThis.fetch = (async () => { calls++; return new Response("busy", { status: 429 }); }) as typeof fetch; + const [row] = await fetchProviderAccountQuotas("anthropic"); + expect(calls).toBe(1); + expect(row?.unavailable).toBe(true); + expect(row?.quota).toEqual({ fiveHourPercent: 41, customWindows: [{ label: "Fable", percent: 63 }], updatedAt: now }); + }); + + for (const malformed of [null, {}, [null, "bad", { label: "invalid", percent: "100" }]]) { + test(`malformed persisted custom windows stay unknown without breaking other rows: ${JSON.stringify(malformed)}`, async () => { + const [id] = await seed(1); + writeFileSync(join(home, "provider-account-quota-cache.json"), JSON.stringify({ version: 1, rows: { + [`anthropic\u0000${id}`]: { customWindows: malformed, updatedAt: now }, + "kiro\u0000untouched": { monthlyPercent: 17, updatedAt: now }, + } })); + clearAccountQuotaCache(); + let calls = 0; + globalThis.fetch = (async () => { calls++; return new Response("busy", { status: 429 }); }) as typeof fetch; + const [row] = await fetchProviderAccountQuotas("anthropic"); + expect(calls).toBe(1); + expect(row?.quota).toBeNull(); + expect(row?.unavailable).toBe(true); + expect(getCachedProviderAccountQuota("kiro", "untouched")).toEqual({ monthlyPercent: 17, updatedAt: now }); + }); + } + + test("fresh utilization without a reset does not inherit an expired reset", async () => { + const [id] = await seed(1); + setCachedProviderAccountQuotaForTests("anthropic", id!, { + fiveHourPercent: 100, fiveHourResetAt: start + 60_000, updatedAt: start, + }); + now += 60_000; + observe(id!); + expect(getCachedProviderAccountQuota("anthropic", id!)).toEqual({ fiveHourPercent: 41, updatedAt: now }); + }); + + test("deferred persistence evaluates expiry at write time and leaves other providers intact", async () => { + const [id] = await seed(1); + const saved = { weeklyPercent: 100, weeklyResetAt: start + 60_000, updatedAt: start }; + setCachedProviderAccountQuotaForTests("anthropic", id!, saved); + setCachedProviderAccountQuotaForTests("kiro", "untouched", saved); + let flush!: () => void; + const timer = spyOn(globalThis, "setTimeout").mockImplementation(((callback: () => void) => { + flush = callback; + return 0 as unknown as ReturnType; + }) as typeof setTimeout); + try { observe(id!); } finally { timer.mockRestore(); } + now += 60_000; + flush(); + const disk = JSON.parse(readFileSync(join(home, "provider-account-quota-cache.json"), "utf8")); + expect(disk.rows[`anthropic\u0000${id}`]).toEqual({ fiveHourPercent: 41, updatedAt: start }); + expect(disk.rows["kiro\u0000untouched"]).toEqual(saved); + }); +}); From 54fcc688d7b23677892a01803fc07663fbdd2074 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 09:22:08 +0900 Subject: [PATCH 089/221] test(anthropic): keep probe fixtures inside live reset windows [skip ci] The attribution/cache tests used July 2026 quota reset dates, which correctly expire under the known-reset fix. Generate future reset dates from one clock snapshot; preserve all existing assertions. Explicit expiry tests retain fixed simulated boundaries. No local suites run. --- tests/providers/provider-account-quota.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/providers/provider-account-quota.test.ts b/tests/providers/provider-account-quota.test.ts index 989f55a410..1b940d71d0 100644 --- a/tests/providers/provider-account-quota.test.ts +++ b/tests/providers/provider-account-quota.test.ts @@ -33,9 +33,11 @@ async function seedTwoAccounts(): Promise { } function usageBody(fiveHour: number, sevenDay: number): string { + // These tests exercise current account measurements, not expired historical windows. + const now = Date.now(); return JSON.stringify({ - five_hour: { utilization: fiveHour, resets_at: "2026-07-05T12:00:00Z" }, - seven_day: { utilization: sevenDay, resets_at: "2026-07-08T12:00:00Z" }, + five_hour: { utilization: fiveHour, resets_at: new Date(now + 5 * 60 * 60_000).toISOString() }, + seven_day: { utilization: sevenDay, resets_at: new Date(now + 7 * 24 * 60 * 60_000).toISOString() }, }); } From d3c70f9d8c8cc6fced7a93577b93e8b141473ea3 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 09:44:37 +0900 Subject: [PATCH 090/221] fix(anthropic): normalize retained quota metadata and guard test transport [skip ci] Reject unusable custom labels/percentages, omit invalid reset metadata while retaining valid usage, and state the existing 60-second fallback. Guard unexpected test network calls with teardown-safe restoration. No new TTL or synthetic quota values. Addresses #3825 review findings; no local suite was run. --- .../src/content/docs/guides/claude-code.md | 2 +- .../docs/reference/configuration/providers.md | 2 +- src/providers/quota.ts | 38 ++++++++--- .../anthropic-quota-dispatch.test.ts | 64 +++++++++++++------ .../anthropic-ratelimit-headers.test.ts | 63 +++++++++++++++++- 5 files changed, 137 insertions(+), 32 deletions(-) diff --git a/docs-site/src/content/docs/guides/claude-code.md b/docs-site/src/content/docs/guides/claude-code.md index 720a303b00..4c5cc44b34 100644 --- a/docs-site/src/content/docs/guides/claude-code.md +++ b/docs-site/src/content/docs/guides/claude-code.md @@ -31,7 +31,7 @@ Operational contract when enabled: account within the same request (bounded). The cooldown uses a usable `Retry-After` when present, otherwise the latest valid reset time among windows Anthropic marks `rejected`, including weekly windows. Valid upstream deadlines are not shortened to a fixed cooldown ceiling. - A refusal with no usable deadline falls back to a default backoff. + A refusal with no usable deadline falls back to a 60-second default backoff. - Responses report the serving account's 5-hour and weekly utilization, and whichever of those two the response carries is recorded for that account — each window independently, and a refusal counts as well as a success. Usage-aware selection works from ordinary traffic, diff --git a/docs-site/src/content/docs/reference/configuration/providers.md b/docs-site/src/content/docs/reference/configuration/providers.md index 710c069b24..b4d7cb2094 100644 --- a/docs-site/src/content/docs/reference/configuration/providers.md +++ b/docs-site/src/content/docs/reference/configuration/providers.md @@ -437,7 +437,7 @@ When enabled, 429 records a cooldown and may rotate within the request. The cool from a usable `Retry-After`, otherwise from the latest valid reset time among rate-limit windows Anthropic reports as `rejected`, including weekly windows. Valid upstream deadlines are not shortened to a fixed cooldown ceiling; non-finite or unrepresentable deadlines are ignored. -A refusal with no usable deadline falls back to a short default backoff. Affinity is process-local +A refusal with no usable deadline falls back to a 60-second default backoff. Affinity is process-local and size-bounded. Credential 401/403 marks the account as needing reauthentication. If all eligible accounts are cooling, clients receive 429 with `Retry-After` when known, not an authentication error. diff --git a/src/providers/quota.ts b/src/providers/quota.ts index 5dcb69beb3..71644a9eae 100644 --- a/src/providers/quota.ts +++ b/src/providers/quota.ts @@ -1555,26 +1555,48 @@ type AccountQuotaCacheEntry = { /** Expired measurements become unknown; missing reset evidence never implies a fresh allowance. */ function normalizeAnthropicQuota(quota: ProviderQuota | null | undefined, now: number): ProviderQuota | null { if (!quota) return null; - const expired = (resetAt: number | undefined): boolean => typeof resetAt === "number" - && Number.isFinite(resetAt) && resetAt > 0 && resetAt <= now; + const validReset = (resetAt: unknown): resetAt is number => typeof resetAt === "number" + && Number.isFinite(resetAt) && resetAt > 0 && Number.isFinite(new Date(resetAt).getTime()); let result = quota; for (const [percent, reset] of [ ["fiveHourPercent", "fiveHourResetAt"], ["weeklyPercent", "weeklyResetAt"], ["monthlyPercent", "monthlyResetAt"], ] as const) { - if (!expired(quota[reset])) continue; + const resetAt = quota[reset]; + if (resetAt === undefined) continue; + const valid = validReset(resetAt); + if (valid && resetAt > now) continue; if (result === quota) result = { ...quota }; - delete result[percent]; + if (valid) delete result[percent]; delete result[reset]; } // Persisted rows validate only the outer quota object, so custom data may be malformed. if (quota.customWindows !== undefined) { const windows = Array.isArray(quota.customWindows) ? quota.customWindows : []; - const retained = windows.filter(window => window !== null && typeof window === "object" - && typeof window.label === "string" && typeof window.percent === "number" - && Number.isFinite(window.percent) && !expired(window.resetAt)); - if (!Array.isArray(quota.customWindows) || retained.length !== windows.length) { + const retained: ProviderQuotaWindow[] = []; + let changed = !Array.isArray(quota.customWindows); + for (const window of windows) { + if (!window || typeof window !== "object" || typeof window.label !== "string" || !window.label.trim() + || typeof window.percent !== "number" || !Number.isFinite(window.percent) + || window.percent < 0 || window.percent > 100) { + changed = true; + continue; + } + if (validReset(window.resetAt) && window.resetAt <= now) { + changed = true; + continue; + } + if (window.resetAt !== undefined && !validReset(window.resetAt)) { + const normalized = { ...window }; + delete normalized.resetAt; + retained.push(normalized); + changed = true; + } else { + retained.push(window); + } + } + if (changed) { if (result === quota) result = { ...quota }; if (retained.length) result.customWindows = retained; else delete result.customWindows; diff --git a/tests/adapters/anthropic/anthropic-quota-dispatch.test.ts b/tests/adapters/anthropic/anthropic-quota-dispatch.test.ts index 6442436fbb..09952ea5ab 100644 --- a/tests/adapters/anthropic/anthropic-quota-dispatch.test.ts +++ b/tests/adapters/anthropic/anthropic-quota-dispatch.test.ts @@ -13,10 +13,19 @@ import type { OcxConfig, OcxProviderConfig } from "../../../src/types"; import { removeTreeWithRetry } from "../../helpers/remove-tree"; const originalHome = process.env.OPENCODEX_HOME; +let originalFetch: typeof globalThis.fetch; +let unexpectedGlobalFetches = 0; let home: string; let sent: { authorization: string | null; apiKey: string | null; body: Record }[]; beforeEach(() => { + home = ""; + originalFetch = globalThis.fetch; + unexpectedGlobalFetches = 0; + globalThis.fetch = (async () => { + unexpectedGlobalFetches += 1; + throw new Error("Unexpected global fetch in Anthropic quota dispatch test"); + }) as typeof fetch; home = mkdtempSync(join(tmpdir(), "ocx-anthropic-quota-dispatch-")); process.env.OPENCODEX_HOME = home; sent = []; @@ -29,16 +38,25 @@ beforeEach(() => { }); afterEach(() => { - clearAnthropicAccountPoolState(); - forgetAnthropicFailoverQuorum(); - clearGenericFailoverHealth(); - // Cancel the debounced persistence before restoring the real home. - clearAccountQuotaCache(); - resetProviderQuotaReconcileStateForTests(); - clearResponseStateForTests(); - if (originalHome === undefined) delete process.env.OPENCODEX_HOME; - else process.env.OPENCODEX_HOME = originalHome; - removeTreeWithRetry(home); + try { + // Provider code may catch the guard's rejection; the attempted network call still fails the test. + expect(unexpectedGlobalFetches).toBe(0); + } finally { + try { + // Cancel the debounced persistence before restoring the real home. + clearAccountQuotaCache(); + clearAnthropicAccountPoolState(); + forgetAnthropicFailoverQuorum(); + clearGenericFailoverHealth(); + resetProviderQuotaReconcileStateForTests(); + clearResponseStateForTests(); + } finally { + globalThis.fetch = originalFetch; + if (originalHome === undefined) delete process.env.OPENCODEX_HOME; + else process.env.OPENCODEX_HOME = originalHome; + if (home) removeTreeWithRetry(home); + } + } }); function credential(index: number) { @@ -136,8 +154,9 @@ test("main A429 -> B200 records both physical responses against their sending ac return answer(body.stream === true); }); const response = await post(config); + const responseText = await response.text(); expect(response.status).toBe(200); - expect(await response.text()).toContain("The answer is complete."); + expect(responseText).toContain("The answer is complete."); expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); expectQuota(a!, 100, 61); expectQuota(b!, 23, 47); @@ -151,8 +170,8 @@ test("terminal 429 after both accounts are exhausted records both refused physic expectQuota(a!, 100, 61); return limited("0.89", "1"); })); - expect(response.status).toBe(429); await response.text(); + expect(response.status).toBe(429); expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); expectQuota(a!, 100, 61); expectQuota(b!, 89, 100); @@ -165,15 +184,16 @@ test("manual active switch while A is pending keeps A's measurement off B", asyn const config = configFor(() => { entered.resolve(); return returned.promise; }); const pending = post(config); await entered.promise; + let response!: Response; try { expect(sent[0]!.authorization).toBe(`Bearer ${credential(0).access}`); expect(await setActiveAccount("anthropic", b!)).toBe(true); } finally { returned.resolve(answer(false, "0.37", "0.53")); + response = await pending; + await response.text(); } - const response = await pending; expect(response.status).toBe(200); - await response.text(); expect(sent).toHaveLength(1); expect(getAccountSet("anthropic")!.activeAccountId).toBe(b!); expectQuota(a!, 37, 53); @@ -186,15 +206,16 @@ test("credential replacement while A is pending skips its old-generation respons const returned = deferred(); const pending = post(configFor(() => { entered.resolve(); return returned.promise; })); await entered.promise; + let response!: Response; try { expect(sent[0]!.authorization).toBe(`Bearer ${credential(0).access}`); await saveAccountCredential("anthropic", a!, { ...credential(0), access: "synthetic-replacement-access", refresh: "synthetic-replacement-refresh" }); } finally { returned.resolve(answer(false)); + response = await pending; + await response.text(); } - const response = await pending; expect(response.status).toBe(200); - await response.text(); expect(sent).toHaveLength(1); expect(getAccountSet("anthropic")!.accounts.find(row => row.id === a)!.credential.access).toBe("synthetic-replacement-access"); expect(getCachedProviderAccountQuota("anthropic", a!)).toBeNull(); @@ -208,8 +229,8 @@ const overriddenHeaders: { label: string; headers: Record; autho test.each(overriddenHeaders)("$label skips quota attribution even when a selected OAuth account exists", async ({ headers, authorization, apiKey }) => { const ids = await seed(); const response = await post(configFor(body => answer(body.stream === true), headers)); - expect(response.status).toBe(200); await response.text(); + expect(response.status).toBe(200); expect(sent).toHaveLength(1); expect(sent[0]).toMatchObject({ authorization, apiKey }); for (const id of ids) expect(getCachedProviderAccountQuota("anthropic", id)).toBeNull(); @@ -227,8 +248,9 @@ test("real web-search routed loop records A429 and B200 through fetchForRequest" }); config.webSearchSidecar = { backend: "anthropic", enabled: true }; const response = await post(config, { tools: [{ type: "web_search" }] }); + const responseText = await response.text(); expect(response.status).toBe(200); - expect(await response.text()).toContain("The answer is complete."); + expect(responseText).toContain("The answer is complete."); expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); expectQuota(a!, 100, 61); expectQuota(b!, 23, 47); @@ -252,8 +274,9 @@ test("real terminal continuation records A429 before retrying the continuation o input: "Please modify the file now", tools: [{ type: "function", name: "read_file", description: "read a file", parameters: { type: "object" } }], }); + const responseText = await response.text(); expect(response.status).toBe(200); - expect(await response.text()).toContain("The answer is complete."); + expect(responseText).toContain("The answer is complete."); expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); expectQuota(a!, 100, 61); expectQuota(b!, 23, 47); @@ -275,8 +298,9 @@ test("real image bridge routed loop records A429 and B200 through fetchForReques adapter: "openai-chat", baseUrl: "https://api.x.ai/v1", authMode: "key", apiKey: "synthetic-image-key", }; const response = await post(config, { stream: true, tools: [{ type: "image_generation" }] }); + const responseText = await response.text(); expect(response.status).toBe(200); - expect(await response.text()).toContain("The answer is complete."); + expect(responseText).toContain("The answer is complete."); expect(sent.map(row => row.authorization)).toEqual([`Bearer ${credential(0).access}`, `Bearer ${credential(1).access}`]); expectQuota(a!, 100, 61); expectQuota(b!, 23, 47); diff --git a/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts b/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts index 77989064ff..f1ad70542e 100644 --- a/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts +++ b/tests/adapters/anthropic/anthropic-ratelimit-headers.test.ts @@ -561,14 +561,56 @@ describe("Anthropic known-reset expiry", () => { now += 120_000; observe(id!); const quota = getCachedProviderAccountQuota("anthropic", id!); - expect(quota?.customWindows).toEqual(saved.customWindows.slice(1)); + const retained = [saved.customWindows[1], saved.customWindows[2], { label: "Unknown reset", percent: 60 }]; + expect(quota?.customWindows).toEqual(retained); expect(quota?.fiveHourPercent).toBe(41); expect(quota?.updatedAt).toBe(now); expect(saved.customWindows).toHaveLength(4); expect(saved.updatedAt).toBe(start); now += 30_000; observe(id!); - expect(getCachedProviderAccountQuota("anthropic", id!)?.customWindows).toEqual(saved.customWindows.slice(1)); + expect(getCachedProviderAccountQuota("anthropic", id!)?.customWindows).toEqual(retained); + }); + + test("custom windows reject empty labels and invalid percentages while preserving valid objects", async () => { + const [id] = await seed(1); + const valid = [{ label: "Opus", percent: 0 }, { label: "Sonnet", percent: 100, resetAt: start + 60_000 }]; + const saved = { customWindows: [ + ...valid, + { label: "", percent: 50 }, { label: " ", percent: 50 }, + { label: "negative", percent: -1 }, { label: "too high", percent: 101 }, + { label: "not finite", percent: Number.NaN }, { label: "infinite", percent: Infinity }, + ], updatedAt: start }; + setCachedProviderAccountQuotaForTests("anthropic", id!, saved); + const normalized = getCachedProviderAccountQuota("anthropic", id!); + expect(normalized?.customWindows).toEqual(valid); + expect(normalized?.customWindows?.[0]).toBe(valid[0]); + expect(saved.customWindows).toHaveLength(8); + setCachedProviderAccountQuotaForTests("anthropic", id!, normalized!); + expect(getCachedProviderAccountQuota("anthropic", id!)).toBe(normalized); + }); + + test("invalid reset metadata is removed without discarding valid usage", async () => { + const [id] = await seed(1); + const invalidResets = [0, -1, Number.NaN, Infinity, 8_640_000_000_000_001]; + const saved = { + fiveHourPercent: 40, fiveHourResetAt: 0, + weeklyPercent: 50, weeklyResetAt: Infinity, + monthlyPercent: 60, monthlyResetAt: 8_640_000_000_000_001, + customWindows: invalidResets.map((resetAt, index) => ({ label: `window-${index}`, percent: 70, resetAt })), + updatedAt: start, + }; + setCachedProviderAccountQuotaForTests("anthropic", id!, saved); + const normalized = getCachedProviderAccountQuota("anthropic", id!); + expect(normalized).toEqual({ + fiveHourPercent: 40, weeklyPercent: 50, monthlyPercent: 60, + customWindows: invalidResets.map((_, index) => ({ label: `window-${index}`, percent: 70 })), + updatedAt: start, + }); + expect(saved.customWindows[0]?.resetAt).toBe(0); + expect(saved.fiveHourResetAt).toBe(0); + setCachedProviderAccountQuotaForTests("anthropic", id!, normalized!); + expect(getCachedProviderAccountQuota("anthropic", id!)).toBe(normalized); }); for (const [percent, reset, observedWindow] of [ @@ -729,6 +771,23 @@ describe("Anthropic known-reset expiry", () => { }); } + test("persisted nonnumeric reset metadata does not erase otherwise valid windows", async () => { + const [id] = await seed(1); + writeFileSync(join(home, "provider-account-quota-cache.json"), JSON.stringify({ version: 1, rows: { + [`anthropic\u0000${id}`]: { + weeklyPercent: 80, weeklyResetAt: "unknown", + customWindows: [{ label: "Opus", percent: 70, resetAt: null }, { label: "Sonnet", percent: 60, resetAt: "later" }], + updatedAt: now, + }, + } })); + clearAccountQuotaCache(); + globalThis.fetch = (async () => new Response("busy", { status: 429 })) as typeof fetch; + const [row] = await fetchProviderAccountQuotas("anthropic"); + expect(row?.quota).toEqual({ weeklyPercent: 80, + customWindows: [{ label: "Opus", percent: 70 }, { label: "Sonnet", percent: 60 }], updatedAt: now }); + expect(row?.unavailable).toBe(true); + }); + test("fresh utilization without a reset does not inherit an expired reset", async () => { const [id] = await seed(1); setCachedProviderAccountQuotaForTests("anthropic", id!, { From 872f0e5aa714f6a2e757510195d1c038ac70e26d Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:41:57 +0900 Subject: [PATCH 091/221] fix(cli): explain which side of a version mismatch is older [skip ci] Address the diagnostic residual of #3464. Keep raw mismatch and placeholder behavior, compare valid SemVer precedence, and avoid false doctor match claims. No automatic service repair or request-policy change. Local suites omitted by owner instruction; final cumulative hosted CI pending. Reported-by: garysassano <10464497+garysassano@users.noreply.github.com> --- .../docs/ko/reference/cli/lifecycle.md | 13 +++ .../content/docs/reference/cli/lifecycle.md | 20 ++++- .../docs/ru/reference/cli/lifecycle.md | 13 +++ src/cli/doctor.ts | 4 +- src/cli/version-skew.ts | 39 ++++++++- tests/cli/cli-status-json.test.ts | 82 ++++++++++++++++++- tests/cli/cli-version-skew.test.ts | 70 +++++++++++++++- tests/codex-integration/doctor.test.ts | 63 +++++++++++++- 8 files changed, 291 insertions(+), 13 deletions(-) diff --git a/docs-site/src/content/docs/ko/reference/cli/lifecycle.md b/docs-site/src/content/docs/ko/reference/cli/lifecycle.md index 4847614674..068807025b 100644 --- a/docs-site/src/content/docs/ko/reference/cli/lifecycle.md +++ b/docs-site/src/content/docs/ko/reference/cli/lifecycle.md @@ -82,6 +82,19 @@ dedicated-provider history도 포함됩니다. 상태를 백업하고 이 전체 ### `ocx status [--json]` +status와 `ocx doctor`는 현재 CLI와 실행 중인 프록시의 버전을 비교합니다. CLI가 더 새로우면 +원하는 최신 설치로 프록시를 재시작하십시오. 백그라운드 서비스라면 `ocx service repair`를 +실행합니다(`ocx service restart`는 별칭). 프록시가 더 새로우면 CLI를 업그레이드하거나 +`PATH`가 원하는 설치를 가리키도록 수정하십시오. 이 진단은 서비스를 복구하거나 요청 허용 +여부를 바꾸지 않습니다. + +버전 문자열이 같거나 어느 쪽이 `unknown` / `0.0.0`이면 경고하지 않으며, 프록시 버전이 없어도 +경고하지 않습니다. doctor는 placeholder를 버전 일치로 확정하지 않습니다. 엄격한 SemVer로 +해석할 수 없는 서로 다른 문자열이나 build metadata만 다른 버전은 어느 쪽이 오래됐다고 +단정하지 않는 중립 경고를 표시합니다. 공백을 제거하거나 앞의 `v`를 정규화하지 않습니다. +JSON의 `versionSkew`에도 같은 안내가 들어가며 필드는 `cliVersion`, `proxyVersion`, `skewed`, +`warning` 그대로입니다. + 읽기 전용 진단 요약을 출력합니다. 프록시 PID, `/healthz` 도달 가능 여부, 대시보드 URL, 설정 경로, 기본 공급자, Codex 자동 시작 설정, 서비스 상태, shim 상태, 그리고 마스킹된 실제로 적용되는 Codex 홈이 포함됩니다. 명시적이고 높은 신뢰도의 Windows Orca 런타임 홈 시그니처만 diff --git a/docs-site/src/content/docs/reference/cli/lifecycle.md b/docs-site/src/content/docs/reference/cli/lifecycle.md index e75a2b6241..0dda487b3a 100644 --- a/docs-site/src/content/docs/reference/cli/lifecycle.md +++ b/docs-site/src/content/docs/reference/cli/lifecycle.md @@ -88,6 +88,19 @@ are left in place. ### `ocx status [--json]` +Status and `ocx doctor` compare this CLI's version with the running proxy. If the CLI is newer, +restart the proxy using the intended current installation; for a background service, run +`ocx service repair` (`ocx service restart` is an alias). If the proxy is newer, upgrade the CLI +or resolve `PATH` to the intended installation. These diagnostics do not repair the service or +change whether requests are allowed. + +Identical version strings and the `unknown` / `0.0.0` placeholders suppress the warning, as does +an absent proxy version. Doctor does not report placeholders as a confirmed match. Different +strings still produce a neutral warning when they cannot be strictly parsed as SemVer or differ +only in build metadata; neither side is called older. Versions are not trimmed and a leading `v` +is not normalized. JSON exposes the same advice in `versionSkew`, whose fields remain +`cliVersion`, `proxyVersion`, `skewed`, and `warning`. + Print a read-only diagnostic summary: proxy PID, `/healthz` reachability, dashboard URL, config path, default provider, Codex autostart setting, service state, shim state, and the redacted effective Codex home. Only the explicit, high-confidence Windows Orca runtime-home signature adds an actionable App-home @@ -261,9 +274,10 @@ bundled Bun paths are deliberately rediscovered after upgrades instead of being Definitions installed before this change still carry the old versioned paths and cannot migrate themselves — once the old executable is deleted, no opencodex code runs to fix it. Run `ocx service repair` once after upgrading; after that, each service start follows the launcher. -An already-running proxy is not replaced by an external upgrade: restart the service (or run -`ocx service repair`) so the new build serves, and treat a CLI/proxy version mismatch warning as -exactly that signal. +An already-running proxy is not replaced by an external upgrade: when the installed CLI is newer +than the running proxy, restart the service (or run `ocx service repair`) so the new build serves. +If the proxy is newer instead, check the CLI installation and `PATH` as described under +[`ocx status`](#ocx-status---json). | Subcommand | Action | | --- | --- | diff --git a/docs-site/src/content/docs/ru/reference/cli/lifecycle.md b/docs-site/src/content/docs/ru/reference/cli/lifecycle.md index 1ace7cc10f..7be5d5ad77 100644 --- a/docs-site/src/content/docs/ru/reference/cli/lifecycle.md +++ b/docs-site/src/content/docs/ru/reference/cli/lifecycle.md @@ -89,6 +89,19 @@ ocx eject back ### `ocx status [--json]` +Status и `ocx doctor` сравнивают версии текущего CLI и работающего прокси. Если CLI новее, +перезапустите прокси из нужной актуальной установки. Для фоновой службы используйте +`ocx service repair` (`ocx service restart` — её псевдоним). Если новее прокси, обновите CLI +или исправьте `PATH`, чтобы он указывал на нужную установку. Диагностика не ремонтирует службу +и не меняет разрешение запросов. + +При одинаковых строках версий, значениях `unknown` / `0.0.0` или отсутствии версии прокси +предупреждение подавляется. Doctor не считает placeholder подтверждённым совпадением. +Разные строки, которые нельзя строго разобрать как SemVer, и версии, отличающиеся только +build metadata, вызывают нейтральное предупреждение без указания устаревшей стороны. +Пробелы не удаляются, префикс `v` не нормализуется. JSON содержит ту же рекомендацию в +`versionSkew` с прежними полями `cliVersion`, `proxyVersion`, `skewed` и `warning`. + Печатает read-only диагностическую сводку: PID прокси, достижимость `/healthz`, URL дашборда, путь к конфигу, провайдера по умолчанию, настройку автозапуска Codex, состояние службы, состояние shim'а и redacted effective Codex home. Только явная и высокоуверенная сигнатура mismatch diff --git a/src/cli/doctor.ts b/src/cli/doctor.ts index 1ab4fe9f1b..d7148530a0 100644 --- a/src/cli/doctor.ts +++ b/src/cli/doctor.ts @@ -1157,11 +1157,11 @@ export async function runDoctor(args: string[] = []): Promise { // No extra probe -- findLiveProxy already carried the version back. { const { packageVersion } = await import("./help"); - const { computeVersionSkew } = await import("./version-skew"); + const { computeVersionSkew, isConfirmedVersionMatch } = await import("./version-skew"); const skew = computeVersionSkew(packageVersion(), live?.version); if (skew.skewed && skew.warning) { console.log(`!! ${skew.warning}`); - } else if (skew.proxyVersion !== null) { + } else if (isConfirmedVersionMatch(skew)) { console.log(`ok ocx ${skew.cliVersion} matches the running proxy`); } } diff --git a/src/cli/version-skew.ts b/src/cli/version-skew.ts index 588d29a307..48b71a51ee 100644 --- a/src/cli/version-skew.ts +++ b/src/cli/version-skew.ts @@ -1,5 +1,5 @@ /** - * CLI-versus-proxy version skew (#2701). + * CLI-versus-proxy version skew (#2701, #3464). * * The reported failure: `ocx` on PATH is an older install than the running proxy, so its * help describes commands the proxy does not have and its output describes a different @@ -9,6 +9,7 @@ * comparison instead of reimplementing it -- two diagnostics disagreeing about whether an * install is stale would be worse than neither reporting it. */ +import { parseStrictSemver, type StrictSemver } from "../lib/strict-semver"; /** Placeholder versions that mean "unknown", not "different". */ const PLACEHOLDERS = new Set(["unknown", "0.0.0"]); @@ -22,6 +23,30 @@ export interface VersionSkew { readonly warning: string | null; } +/** Suppressed comparisons are not confirmed matches, even when both placeholders agree. */ +export function isConfirmedVersionMatch(skew: VersionSkew): boolean { + return skew.proxyVersion === skew.cliVersion && !PLACEHOLDERS.has(skew.cliVersion); +} + +/** SemVer precedence ignores build metadata; raw equality is handled separately. */ +function compareVersions(cli: StrictSemver, proxy: StrictSemver): number { + for (let i = 0; i < cli.core.length; i++) { + if (cli.core[i]! !== proxy.core[i]!) return cli.core[i]! > proxy.core[i]! ? 1 : -1; + } + if (cli.prerelease.length === 0) return proxy.prerelease.length === 0 ? 0 : 1; + if (proxy.prerelease.length === 0) return -1; + for (let i = 0; i < Math.max(cli.prerelease.length, proxy.prerelease.length); i++) { + const left = cli.prerelease[i]; + const right = proxy.prerelease[i]; + if (left === right) continue; + if (left === undefined) return -1; + if (right === undefined) return 1; + if (typeof left !== typeof right) return typeof left === "bigint" ? -1 : 1; + return left > right ? 1 : -1; + } + return 0; +} + /** * Compare the running CLI against the live proxy. * @@ -36,11 +61,19 @@ export function computeVersionSkew(cliVersion: string, proxyVersion: string | un if (proxy === null || PLACEHOLDERS.has(proxy) || PLACEHOLDERS.has(cliVersion) || proxy === cliVersion) { return { cliVersion, proxyVersion: proxy, skewed: false, warning: null }; } + const cliSemver = parseStrictSemver(cliVersion); + const proxySemver = parseStrictSemver(proxy); + const order = cliSemver && proxySemver ? compareVersions(cliSemver, proxySemver) : 0; + const advice = order > 0 + ? "the running proxy is older than this CLI. Restart the proxy using the intended current installation. " + + "For a background service, run ocx service repair (ocx service restart is an alias)." + : order < 0 + ? "this ocx on PATH is older than the running proxy. Upgrade the CLI or resolve PATH to the intended installation." + : "the versions differ, but neither can be identified as older. Check which installations the CLI and proxy use."; return { cliVersion, proxyVersion: proxy, skewed: true, - warning: `CLI ${cliVersion} does not match the running proxy ${proxy} — this ocx on PATH is stale. ` - + "Its help and features describe a different build. Reinstall, or run the proxy's own binary.", + warning: `CLI ${cliVersion} does not match the running proxy ${proxy} — ${advice}`, }; } diff --git a/tests/cli/cli-status-json.test.ts b/tests/cli/cli-status-json.test.ts index 31371baa33..10ab4f110e 100644 --- a/tests/cli/cli-status-json.test.ts +++ b/tests/cli/cli-status-json.test.ts @@ -10,9 +10,11 @@ import { fileURLToPath } from "node:url"; import { isConnectionRefused, isUncleanExitEvidence, proxyHealthFailureReason, resolveStatusPid, selectListenTarget } from "../../src/cli/status"; import * as statusFacade from "../../src/cli/status"; import * as statusProbes from "../../src/cli/status-probes"; +import { packageVersion } from "../../src/cli/help"; +import { getDefaultConfig } from "../../src/config"; import { findDeadPid } from "../helpers/dead-pid"; import { removeTreeWithRetry } from "../helpers/remove-tree"; -import { STORE_BUDGET_MS } from "../helpers/test-budget"; +import { INTERNAL_DEADLINE_MS, SPAWN_BUDGET_MS, STORE_BUDGET_MS } from "../helpers/test-budget"; import { inspectClientRotationRecoveryGate, readClientConnectionState } from "../../src/client/state"; import * as lifecycleLock from "../../src/client/lifecycle-lock"; import { writeDesktopDisconnectReceipt } from "../../src/claude/desktop-remote-store"; @@ -28,6 +30,84 @@ function runStatusJson(opencodexHome: string) { }); } +describe("status version skew projection", () => { + test.each([ + ["0.0.1", "the running proxy is older"], + ["999999.0.0", "this ocx on PATH is older"], + [packageVersion(), null], + [`${packageVersion()}+skew-fixture`, "neither can be identified as older"], + ["not-a-version", "neither can be identified as older"], + ["unknown", null], + ["0.0.0", null], + [undefined, null], + ] as const)("projects proxy %s in JSON and human output", async (proxyVersion, expected) => { + const home = mkdtempSync(join(tmpdir(), "ocx-status-skew-")); + const codexHome = join(home, "codex"); + let server: ReturnType | undefined; + try { + // Explicit CODEX_HOME must exist before the CLI imports codex/paths.ts. + mkdirSync(codexHome, { recursive: true }); + server = Bun.serve({ + hostname: "127.0.0.1", port: 0, + fetch(request) { + return new URL(request.url).pathname === "/healthz" + ? Response.json({ service: "opencodex", status: "ok", version: proxyVersion, uptime: 1 }) + : new Response("not found", { status: 404 }); + }, + }); + writeFileSync(join(home, "config.json"), JSON.stringify({ + ...getDefaultConfig(), port: server.port, hostname: "127.0.0.1", codexAutoStart: false, + })); + for (const json of [true, false]) { + // Async child execution lets the fixture answer the real identity/health probes. + const child = Bun.spawn([process.execPath, cliPath, "status", ...(json ? ["--json"] : [])], { + cwd: repoRoot, + env: { ...process.env, OPENCODEX_HOME: home, CODEX_HOME: codexHome }, + stdout: "pipe", stderr: "pipe", + }); + let timedOut = false; + const timer = setTimeout(() => { + timedOut = true; + child.kill("SIGKILL"); + }, INTERNAL_DEADLINE_MS); + try { + const [stdout, stderr, exitCode] = await Promise.all([ + new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited, + ]); + expect(timedOut).toBe(false); + // Preserve both gates while surfacing the child error when startup fails. + expect({ exitCode, stderr }).toEqual({ exitCode: 0, stderr: "" }); + if (json) { + const parsed = JSON.parse(stdout); + expect(parsed.schemaVersion).toBe(1); + expect(Object.keys(parsed.versionSkew).sort()).toEqual(["cliVersion", "proxyVersion", "skewed", "warning"]); + expect(parsed.versionSkew.cliVersion).toBe(packageVersion()); + expect(parsed.versionSkew.proxyVersion).toBe(proxyVersion ?? null); + expect(parsed.versionSkew.skewed).toBe(expected !== null); + if (expected === null) expect(parsed.versionSkew.warning).toBeNull(); + else expect(parsed.versionSkew.warning).toContain(expected); + } else if (expected === null) { + expect(stdout).not.toContain("does not match the running proxy"); + } else { + expect(stdout).toContain(expected); + } + } finally { + clearTimeout(timer); + if (child.exitCode === null) child.kill("SIGKILL"); + await child.exited; + } + } + expect(existsSync(join(home, "ocx.pid"))).toBe(false); + } finally { + try { + await server?.stop(true); + } finally { + removeTreeWithRetry(home); + } + } + }, SPAWN_BUDGET_MS); +}); + function withRecoveryStatusFixture(work: (fixture: { home: string; lockDeps: { lockPath: string }; diff --git a/tests/cli/cli-version-skew.test.ts b/tests/cli/cli-version-skew.test.ts index 6e45f83c28..36fb6845f9 100644 --- a/tests/cli/cli-version-skew.test.ts +++ b/tests/cli/cli-version-skew.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "bun:test"; -import { computeVersionSkew } from "../../src/cli/version-skew"; +import { computeVersionSkew, isConfirmedVersionMatch } from "../../src/cli/version-skew"; import { packageVersion } from "../../src/cli/help"; /** @@ -7,20 +7,83 @@ import { packageVersion } from "../../src/cli/help"; * build, and nothing surfaced it because the CLI never compared the two versions. */ describe("version skew detection", () => { - test("reports skew when the proxy reports a different version", () => { + test("directs an older CLI to upgrade or resolve PATH", () => { const skew = computeVersionSkew("2.35.0", "2.36.1"); expect(skew.skewed).toBe(true); expect(skew.cliVersion).toBe("2.35.0"); expect(skew.proxyVersion).toBe("2.36.1"); expect(skew.warning).toContain("2.35.0"); expect(skew.warning).toContain("2.36.1"); - expect(skew.warning).toContain("stale"); + expect(skew.warning).toContain("this ocx on PATH is older"); + expect(skew.warning).toContain("Upgrade the CLI or resolve PATH"); + expect(skew.warning).not.toContain("ocx service repair"); + }); + + test("#3464 directs a newer CLI to restart the older proxy", () => { + const skew = computeVersionSkew("2.42.0", "2.10.1-preview.20260805"); + expect(skew).toEqual({ + cliVersion: "2.42.0", + proxyVersion: "2.10.1-preview.20260805", + skewed: true, + warning: "CLI 2.42.0 does not match the running proxy 2.10.1-preview.20260805 — " + + "the running proxy is older than this CLI. Restart the proxy using the intended current installation. " + + "For a background service, run ocx service repair (ocx service restart is an alias).", + }); + expect(skew.warning).not.toContain("this ocx on PATH is older"); + }); + + test.each([ + ["2.43.0", "2.43.0-preview.1"], + ["2.43.0-preview.10", "2.43.0-preview.2"], + ["2.43.0-preview.beta", "2.43.0-preview.10"], + ["2.43.0-preview.1", "2.43.0-preview"], + ["2.43.0-beta", "2.43.0-alpha"], + ["2.44.0-preview.1", "2.43.0"], + ["10.0.0", "9.99.99"], + ["2.43.1", "2.43.0"], + ["2.43.0-preview.9007199254740993", "2.43.0-preview.9007199254740992"], + ])("orders %s above %s in both directions", (newer, older) => { + expect(computeVersionSkew(newer, older).warning).toContain("the running proxy is older"); + expect(computeVersionSkew(older, newer).warning).toContain("this ocx on PATH is older"); + }); + + test.each([ + ["2.43.0+build.1", "2.43.0+build.2"], + ["2.43.0", "2.43.0+build.1"], + ["2.43.0-preview.1+a", "2.43.0-preview.1+b"], + ["invalid", "2.43.0"], + ["2.43", "2.43.0"], + ["v2.43.0", "2.43.0"], + [" 2.43.0", "2.43.0"], + ["2.43.0 ", "2.43.0"], + ["2.43.0-preview.01", "2.43.0-preview.1"], + ["", "2.43.0"], + ])("keeps raw unequal %s / %s neutral in both directions", (left, right) => { + for (const [cli, proxy] of [[left, right], [right, left]]) { + const skew = computeVersionSkew(cli!, proxy!); + expect(skew.cliVersion).toBe(cli); + expect(skew.proxyVersion).toBe(proxy); + expect(skew.skewed).toBe(true); + expect(skew.warning).toContain("neither can be identified as older"); + expect(skew.warning).not.toContain("ocx service repair"); + expect(isConfirmedVersionMatch(skew)).toBe(false); + } + }); + + test.each(["unknown", "0.0.0"])("suppresses %s on either side without confirming a match", placeholder => { + for (const [cli, proxy] of [[placeholder, "2.43.0"], ["2.43.0", placeholder], [placeholder, placeholder]]) { + const skew = computeVersionSkew(cli!, proxy!); + expect(skew.skewed).toBe(false); + expect(skew.warning).toBeNull(); + expect(isConfirmedVersionMatch(skew)).toBe(false); + } }); test("stays quiet when the versions match", () => { const skew = computeVersionSkew("2.35.0", "2.35.0"); expect(skew.skewed).toBe(false); expect(skew.warning).toBeNull(); + expect(isConfirmedVersionMatch(skew)).toBe(true); }); test("stays quiet when nothing is live", () => { @@ -28,6 +91,7 @@ describe("version skew detection", () => { expect(skew.skewed).toBe(false); expect(skew.proxyVersion).toBeNull(); expect(skew.warning).toBeNull(); + expect(isConfirmedVersionMatch(skew)).toBe(false); }); test("suppresses the warning when the proxy reports the 0.0.0 placeholder", () => { diff --git a/tests/codex-integration/doctor.test.ts b/tests/codex-integration/doctor.test.ts index 9fdb7ee30d..acb0f1b87e 100644 --- a/tests/codex-integration/doctor.test.ts +++ b/tests/codex-integration/doctor.test.ts @@ -1,4 +1,7 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test"; +import * as proxyLiveness from "../../src/server/proxy-liveness"; +import * as cliHelp from "../../src/cli/help"; +import { getDefaultConfig } from "../../src/config"; import { spawnSync } from "node:child_process"; import { existsSync, mkdirSync, mkdtempSync, utimesSync, writeFileSync } from "node:fs"; import { join } from "node:path"; @@ -32,6 +35,7 @@ import { } from "../../src/lib/local-management-capability"; import { findDeadPid } from "../helpers/dead-pid"; import { removeTreeWithRetry } from "../helpers/remove-tree"; +import { STORE_BUDGET_MS } from "../helpers/test-budget"; const TEST_DIR = join(import.meta.dir, ".tmp-doctor-test"); const TEST_CODEX_HOME = join(TEST_DIR, "codex"); @@ -780,6 +784,63 @@ describe("doctor abandoned response-state temps", () => { }); }); +describe("doctor version skew projection", () => { + test.each([ + ["2.42.0", "2.10.1-preview.20260805", "the running proxy is older"], + ["2.35.0", "2.36.1", "this ocx on PATH is older"], + ["2.43.0", "2.43.0", "ok ocx 2.43.0 matches the running proxy"], + ["2.43.0+a", "2.43.0+b", "neither can be identified as older"], + ["v2.43.0", "2.43.0", "neither can be identified as older"], + ["2.43.0", "unknown", null], + ["unknown", "2.43.0", null], + ["2.43.0", "0.0.0", null], + ["0.0.0", "0.0.0", null], + ["unknown", "unknown", null], + ["2.43.0", undefined, null], + ] as const)("projects CLI %s / proxy %s without false matches", async (cli, proxy, expected) => { + const home = mkdtempSync(join(tmpdir(), "ocx-doctor-skew-")); + const codexHome = join(home, "codex"); + const previousHome = process.env.OPENCODEX_HOME; + const previousCodexHome = process.env.CODEX_HOME; + const previousExitCode = process.exitCode; + const restore: Array<() => void> = []; + try { + // Runtime history diagnostics resolve and stat an explicit CODEX_HOME. + mkdirSync(codexHome, { recursive: true }); + process.env.OPENCODEX_HOME = home; + process.env.CODEX_HOME = codexHome; + writeFileSync(join(home, "config.json"), JSON.stringify({ ...getDefaultConfig(), port: 9, codexAutoStart: false })); + const logged: string[] = []; + const log = spyOn(console, "log").mockImplementation((...args: unknown[]) => { logged.push(args.map(String).join(" ")); }); + restore.push(() => log.mockRestore()); + const version = spyOn(cliHelp, "packageVersion").mockReturnValue(cli); + restore.push(() => version.mockRestore()); + // Other doctor sections probe upstream health; this diagnostic fixture must stay offline. + const fetch = spyOn(globalThis, "fetch").mockImplementation(async () => new Response(null, { status: 503 })); + restore.push(() => fetch.mockRestore()); + const proxyInfo: proxyLiveness.LiveProxy = { + pid: null, port: 9, hostname: "127.0.0.1", source: "config", ...(proxy === undefined ? {} : { version: proxy }), + }; + const live = spyOn(proxyLiveness, "findLiveProxy").mockResolvedValue(proxyInfo); + restore.push(() => live.mockRestore()); + await runDoctor([]); + const output = logged.join("\n"); + if (expected !== null) expect(output).toContain(expected); + else expect(output).not.toContain("does not match the running proxy"); + if (cli !== "2.43.0" || proxy !== "2.43.0") expect(output).not.toContain("matches the running proxy"); + if (expected === "the running proxy is older") expect(output).toContain("ocx service repair"); + } finally { + for (const cleanup of restore.reverse()) cleanup(); + process.exitCode = previousExitCode; + if (previousHome === undefined) delete process.env.OPENCODEX_HOME; + else process.env.OPENCODEX_HOME = previousHome; + if (previousCodexHome === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = previousCodexHome; + removeTreeWithRetry(home); + } + }, STORE_BUDGET_MS); +}); + describe("doctor reclaim wiring (end to end)", () => { // The formatter tests above cannot observe deletion. This covers the call site itself: // inverting the report/reclaim ternary in runDoctor must fail a test. From 2e8ef03428f8e619dc92b250fbbc5d5dd7ad53cb Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 07:42:20 +0900 Subject: [PATCH 092/221] fix(responses): classify encrypted task recovery failures Distinguish HTTP refusal, timeout, shared abort, transport failure and invalid output through the existing shared-flight cache. Preserve strict admission, success-only cache, wrapper APIs and caller-local cancellation. Addresses the diagnostic residual of #3661; multipart/retry policy stays deferred. Reported-by: Hu9956 <282876394+Hu9956@users.noreply.github.com> --- .../021_source_review.md | 7 ++ .../content/docs/reference/architecture.md | 14 ++- src/lib/bounded-body.ts | 29 +++-- .../responses/agent-task-recovery-cache.ts | 57 ++++++--- src/server/responses/agent-task-recovery.ts | 44 ++++--- structure/04_transports-and-sidecars.md | 14 ++- .../server/agent-task-recovery-cache.test.ts | 54 +++++++-- tests/server/agent-task-recovery.test.ts | 114 +++++++++++++++--- tests/server/bounded-body.test.ts | 62 +++++++++- 9 files changed, 327 insertions(+), 68 deletions(-) create mode 100644 devlog/_plan/260907_axis1_bugfixes/021_source_review.md diff --git a/devlog/_plan/260907_axis1_bugfixes/021_source_review.md b/devlog/_plan/260907_axis1_bugfixes/021_source_review.md new file mode 100644 index 0000000000..516a760813 --- /dev/null +++ b/devlog/_plan/260907_axis1_bugfixes/021_source_review.md @@ -0,0 +1,7 @@ +# wp1 source review + +Three bounded patches implemented with regression coverage. Hooke independently passed the physical-response quota observer wiring; Tesla independently passed quota/recovery security and source review with zero blockers. Version comparator and status/doctor projections inspected by main. All source workers report no local suite/typecheck/build execution. + +Quota source: #3809, Éverton Toffanetto; Co-authored-by included in f215f79b4. Version report: garysassano; Reported-by included in f91e3953a. Recovery report: Hu9956; Reported-by included in recovery commit. + +Source-only checks: git diff --check and documentation fence/whitespace inspection. These do not prove runtime correctness. wp2 final cumulative hosted CI is still mandatory. Final CI dispatch includes Windows because ordinary PR workflow omits it. No release/deploy workflow will be dispatched. diff --git a/docs-site/src/content/docs/reference/architecture.md b/docs-site/src/content/docs/reference/architecture.md index 8e1e361a81..e0fbc8bcba 100644 --- a/docs-site/src/content/docs/reference/architecture.md +++ b/docs-site/src/content/docs/reference/architecture.md @@ -233,7 +233,17 @@ response is not cacheable. Post-commit and 5xx errors keep the no-resend path. When encrypted agent-task recovery refuses a routed task, its existing 400 error can include a bounded `recovery_reason`: `unsupported_envelope`, -`admission_denied`, `recovery_unavailable`, `caller_cancelled`, or `input_changed`. -The field is omitted when no classified recovery result exists. +`admission_denied`, `recovery_unavailable`, `caller_cancelled`, `input_changed`, +`recovery_http_rejected`, `recovery_timeout`, `recovery_aborted`, +`recovery_transport_error`, or `recovery_invalid_output`. +HTTP rejection requires an observed non-success response. Invalid output includes +invalid UTF-8, oversized bodies, malformed or incomplete recovery streams, and +invalid or conflicting assignments. A caller's cancellation takes precedence over +an owned deadline, which takes precedence over decode/transport failures. +`recovery_aborted` describes a shared recovery cancelled independently of that caller. +Shared-flight waiters receive the same underlying failure unless individually cancelled; +only successful plaintext is cached. Diagnostics contain no upstream error or payload text. +The field is omitted when no classified recovery result exists, and existing combo +branches that return the original target failure keep that response. `recovery_unavailable` includes cache/singleflight capacity and does not prove an upstream request was attempted. No retry or broader envelope acceptance is enabled. diff --git a/src/lib/bounded-body.ts b/src/lib/bounded-body.ts index 4016a0a753..0975268560 100644 --- a/src/lib/bounded-body.ts +++ b/src/lib/bounded-body.ts @@ -212,13 +212,28 @@ export async function readBoundedResponseBytes( } } -function decodeUtf8(chunks: readonly Uint8Array[], fatal: boolean): string { +// Mark only exceptions thrown by our decoder, preserving their identity and TypeError contract. +// Timeout-path flushing may fail too; retain that origin so callers do not lose the deadline. +const decodeFailures = new WeakMap(); + +export function boundedBodyDecodeFailure(error: unknown): "invalid_utf8" | "timeout" | undefined { + return error !== null && typeof error === "object" ? decodeFailures.get(error) : undefined; +} + +function decodeUtf8(chunks: readonly Uint8Array[], fatal: boolean, timedOut = false): string { const decoder = new TextDecoder("utf-8", { fatal }); - let text = ""; - for (const chunk of chunks) text += decoder.decode(chunk, { stream: true }); - // Flush an incomplete trailing UTF-8 sequence deterministically. - text += decoder.decode(); - return text; + try { + let text = ""; + for (const chunk of chunks) text += decoder.decode(chunk, { stream: true }); + // Flush an incomplete trailing UTF-8 sequence deterministically. + text += decoder.decode(); + return text; + } catch (error) { + if (error !== null && typeof error === "object") { + decodeFailures.set(error, timedOut ? "timeout" : "invalid_utf8"); + } + throw error; + } } /** @@ -297,7 +312,7 @@ export async function readBoundedResponseBody( "TimeoutError", ); return { - text: decodeUtf8([retained.subarray(0, retainedBytes)], options.fatalUtf8 === true), + text: decodeUtf8([retained.subarray(0, retainedBytes)], options.fatalUtf8 === true, true), truncated: true, timedOut: true, totalTimedOut: outcome === TOTAL_TIMEOUT, diff --git a/src/server/responses/agent-task-recovery-cache.ts b/src/server/responses/agent-task-recovery-cache.ts index 93d0c1778b..398a0feba4 100644 --- a/src/server/responses/agent-task-recovery-cache.ts +++ b/src/server/responses/agent-task-recovery-cache.ts @@ -2,6 +2,20 @@ const MAX_CACHE_BYTES = 8 * 1024 * 1024; const MAX_CONCURRENT_RECOVERIES = 32; const CACHE_TTL_MS = 15 * 60 * 1000; +export type AgentTaskRecoveryResolutionFailureReason = + | "recovery_unavailable" + | "caller_cancelled" + | "recovery_http_rejected" + | "recovery_timeout" + | "recovery_aborted" + | "recovery_transport_error" + | "recovery_invalid_output"; + +/** Shared flights carry bounded failures; only successful plaintext enters the cache. */ +export type AgentTaskRecoveryResolution = + | { readonly recovered: true; readonly assignment: string } + | { readonly recovered: false; readonly reason: AgentTaskRecoveryResolutionFailureReason }; + interface RecoveryCacheEntry { assignment: string; bytes: number; @@ -11,7 +25,7 @@ interface RecoveryCacheEntry { interface RecoveryFlight { controller: AbortController; - promise: Promise; + promise: Promise; waiters: number; settled: boolean; } @@ -63,7 +77,7 @@ function insertRecoveryCacheEntry(key: string, assignment: string, maxEntries: n function startRecoveryFlight( key: string, maxEntries: number, - request: (signal: AbortSignal) => Promise, + request: (signal: AbortSignal) => Promise, ): RecoveryFlight | null { const active = RECOVERY_FLIGHTS.get(key); if (active) return active; @@ -72,15 +86,15 @@ function startRecoveryFlight( const controller = new AbortController(); const flight: RecoveryFlight = { controller, - promise: Promise.resolve(null), + promise: Promise.resolve({ recovered: false, reason: "recovery_unavailable" }), waiters: 0, settled: false, }; flight.promise = request(controller.signal) - .then((assignment) => { - if (!assignment || controller.signal.aborted) return null; - insertRecoveryCacheEntry(key, assignment, maxEntries); - return assignment; + .then((result): AgentTaskRecoveryResolution => { + if (controller.signal.aborted) return { recovered: false, reason: "recovery_aborted" }; + if (result.recovered) insertRecoveryCacheEntry(key, result.assignment, maxEntries); + return result; }) .finally(() => { flight.settled = true; @@ -93,14 +107,14 @@ function startRecoveryFlight( async function waitForRecoveryFlight( flight: RecoveryFlight, abortSignal?: AbortSignal, -): Promise { - if (abortSignal?.aborted) return null; +): Promise { + if (abortSignal?.aborted) return { recovered: false, reason: "caller_cancelled" }; flight.waiters += 1; let onAbort: (() => void) | undefined; try { if (!abortSignal) return await flight.promise; - const cancelled = new Promise((resolve) => { - onAbort = () => resolve(null); + const cancelled = new Promise((resolve) => { + onAbort = () => resolve({ recovered: false, reason: "caller_cancelled" }); abortSignal.addEventListener("abort", onAbort, { once: true }); if (abortSignal.aborted) onAbort(); }); @@ -120,12 +134,27 @@ export async function resolveCachedAgentTaskRecovery( request: (signal: AbortSignal) => Promise, abortSignal?: AbortSignal, ): Promise { - if (abortSignal?.aborted) return null; + const result = await resolveCachedAgentTaskRecoveryWithResult(key, maxEntries, async signal => { + const assignment = await request(signal); + return assignment + ? { recovered: true, assignment } + : { recovered: false, reason: "recovery_unavailable" }; + }, abortSignal); + return result.recovered ? result.assignment : null; +} + +export async function resolveCachedAgentTaskRecoveryWithResult( + key: string, + maxEntries: number, + request: (signal: AbortSignal) => Promise, + abortSignal?: AbortSignal, +): Promise { + if (abortSignal?.aborted) return { recovered: false, reason: "caller_cancelled" }; sweepRecoveryCache(Date.now(), maxEntries); const cached = RECOVERY_CACHE.get(key)?.assignment; - if (cached) return cached; + if (cached) return { recovered: true, assignment: cached }; const flight = startRecoveryFlight(key, maxEntries, request); - return flight ? waitForRecoveryFlight(flight, abortSignal) : null; + return flight ? waitForRecoveryFlight(flight, abortSignal) : { recovered: false, reason: "recovery_unavailable" }; } export function discardCachedAgentTaskRecovery(key: string): void { diff --git a/src/server/responses/agent-task-recovery.ts b/src/server/responses/agent-task-recovery.ts index 22b7a4e66b..a15a2563ca 100644 --- a/src/server/responses/agent-task-recovery.ts +++ b/src/server/responses/agent-task-recovery.ts @@ -1,14 +1,16 @@ import { createHash, createHmac, randomBytes } from "node:crypto"; import { decodeJwtPayload, extractAccountId } from "../../oauth/chatgpt"; import type { OcxConfig } from "../../types"; -import { readBoundedResponseBody } from "../../lib/bounded-body"; +import { boundedBodyDecodeFailure, readBoundedResponseBody } from "../../lib/bounded-body"; import { isApiAuthRequired, isProxyAdmissionSecret } from "../auth-cors"; import { structurallyValidFernetTokens } from "./encrypted-payload"; import { cachedAgentTaskRecovery, discardCachedAgentTaskRecovery, resetAgentTaskRecoveryCache, - resolveCachedAgentTaskRecovery, + resolveCachedAgentTaskRecoveryWithResult, + type AgentTaskRecoveryResolution, + type AgentTaskRecoveryResolutionFailureReason, } from "./agent-task-recovery-cache"; /** Experimental opt-in normalization through ChatGPT's fixed Codex endpoint. */ @@ -44,9 +46,8 @@ export interface AgentTaskRecoveryOptions { export type AgentTaskRecoveryFailureReason = | "unsupported_envelope" | "admission_denied" - // Includes cache capacity rejection; does not imply an upstream request was attempted. - | "recovery_unavailable" - | "caller_cancelled" + // recovery_unavailable includes capacity rejection, which does not imply an upstream attempt. + | AgentTaskRecoveryResolutionFailureReason | "input_changed"; export type AgentTaskRecoveryResult = @@ -436,7 +437,7 @@ async function requestRecovery( envelope: AgentEnvelope, options: AgentTaskRecoveryOptions, abortSignal?: AbortSignal, -): Promise { +): Promise { const controller = new AbortController(); const timeout = setTimeout( () => controller.abort(new DOMException("Agent task recovery timed out", "TimeoutError")), @@ -454,8 +455,11 @@ async function requestRecovery( redirect: "error", }); if (!response.ok) { - try { await response.body?.cancel(); } catch { /* already closed */ } - return null; + // A rejected or never-settling cancellation must not extend the recovery deadline. + try { void response.body?.cancel().catch(() => undefined); } catch { /* already closed */ } + if (abortSignal?.aborted) return { recovered: false, reason: "recovery_aborted" }; + if (controller.signal.aborted) return { recovered: false, reason: "recovery_timeout" }; + return { recovered: false, reason: "recovery_http_rejected" }; } const body = await readBoundedResponseBody(response, { signal, @@ -465,10 +469,18 @@ async function requestRecovery( inactivityTimeoutMs: options.timeoutMs ?? 45_000, firstByteTimeoutMs: options.timeoutMs ?? 45_000, }); - if (body.truncated || body.oversized || body.timedOut || !body.displaySafe) return null; - return assignmentFromRecoverySse(body.text, envelope); - } catch { - return null; + if (abortSignal?.aborted) return { recovered: false, reason: "recovery_aborted" }; + if (controller.signal.aborted || body.timedOut) return { recovered: false, reason: "recovery_timeout" }; + if (body.truncated || body.oversized || !body.displaySafe) return { recovered: false, reason: "recovery_invalid_output" }; + const assignment = assignmentFromRecoverySse(body.text, envelope); + return assignment === null + ? { recovered: false, reason: "recovery_invalid_output" } + : { recovered: true, assignment }; + } catch (error) { + if (abortSignal?.aborted) return { recovered: false, reason: "recovery_aborted" }; + const decodeFailure = boundedBodyDecodeFailure(error); + if (controller.signal.aborted || decodeFailure === "timeout") return { recovered: false, reason: "recovery_timeout" }; + return { recovered: false, reason: decodeFailure === "invalid_utf8" ? "recovery_invalid_output" : "recovery_transport_error" }; } finally { clearTimeout(timeout); } @@ -497,23 +509,23 @@ export async function recoverEncryptedAgentTaskWithResult( const admitted = admittedRecovery(req, input, config, context.parentThreadId); if (!admitted.admitted) return { recovered: false, reason: admitted.reason }; const { admission, cacheKey, envelope } = admitted.recovery; - const assignment = await resolveCachedAgentTaskRecovery( + const result = await resolveCachedAgentTaskRecoveryWithResult( cacheKey, options.cacheEntries ?? 200, signal => requestRecovery(admission, envelope, options, signal), context.abortSignal, ); - if (!assignment) { + if (!result.recovered) { return { recovered: false, - reason: context.abortSignal?.aborted ? "caller_cancelled" : "recovery_unavailable", + reason: context.abortSignal?.aborted ? "caller_cancelled" : result.reason, }; } if (context.abortSignal?.aborted) { discardCachedAgentTaskRecovery(cacheKey); return { recovered: false, reason: "caller_cancelled" }; } - if (!injectAssignment(input, envelope, assignment)) { + if (!injectAssignment(input, envelope, result.assignment)) { discardCachedAgentTaskRecovery(cacheKey); return { recovered: false, reason: "input_changed" }; } diff --git a/structure/04_transports-and-sidecars.md b/structure/04_transports-and-sidecars.md index 7e41dc2222..d27022c2ad 100644 --- a/structure/04_transports-and-sidecars.md +++ b/structure/04_transports-and-sidecars.md @@ -1719,7 +1719,17 @@ response is not cacheable. Post-commit and 5xx errors keep the no-resend path. When encrypted agent-task recovery refuses a routed task, its existing 400 error can include a bounded `recovery_reason`: `unsupported_envelope`, -`admission_denied`, `recovery_unavailable`, `caller_cancelled`, or `input_changed`. -The field is omitted when no classified recovery result exists. +`admission_denied`, `recovery_unavailable`, `caller_cancelled`, `input_changed`, +`recovery_http_rejected`, `recovery_timeout`, `recovery_aborted`, +`recovery_transport_error`, or `recovery_invalid_output`. +HTTP rejection requires an observed non-success response. Invalid output includes +invalid UTF-8, oversized bodies, malformed or incomplete recovery streams, and +invalid or conflicting assignments. A caller's cancellation takes precedence over +an owned deadline, which takes precedence over decode/transport failures. +`recovery_aborted` describes a shared recovery cancelled independently of that caller. +Shared-flight waiters receive the same underlying failure unless individually cancelled; +only successful plaintext is cached. Diagnostics contain no upstream error or payload text. +The field is omitted when no classified recovery result exists, and existing combo +branches that return the original target failure keep that response. `recovery_unavailable` includes cache/singleflight capacity and does not prove an upstream request was attempted. No retry or broader envelope acceptance is enabled. diff --git a/tests/server/agent-task-recovery-cache.test.ts b/tests/server/agent-task-recovery-cache.test.ts index 2ee994f8ce..35b5ba7050 100644 --- a/tests/server/agent-task-recovery-cache.test.ts +++ b/tests/server/agent-task-recovery-cache.test.ts @@ -29,16 +29,23 @@ describe("agent task recovery cache", () => { resetAgentTaskRecoveryCache(); }); - test("shared failure gives each waiter its own result without contaminating another key", async () => { + test.each([ + { kind: "http", reason: "recovery_http_rejected" }, + { kind: "reader", reason: "recovery_transport_error" }, + { kind: "decode", reason: "recovery_invalid_output" }, + ] as const)("shared $kind failure gives each waiter its own result without contaminating another key", async ({ kind, reason }) => { let release: (() => void) | undefined; const gate = new Promise(resolve => { release = resolve; }); let fetches = 0; globalThis.fetch = (async () => { const requestNumber = ++fetches; await gate; - return requestNumber === 1 - ? new Response("raw-failure-sentinel", { status: 503 }) - : new Response(recoverySse("Independent assignment.")); + if (requestNumber !== 1) return new Response(recoverySse("Independent assignment.")); + if (kind === "decode") return new Response(new Uint8Array([0xff])); + if (kind === "reader") return new Response(new ReadableStream({ + pull(controller) { controller.error(new TypeError("private-reader-failure")); }, + })); + return new Response("raw-failure-sentinel", { status: 503 }); }) as typeof fetch; const req = new Request("http://localhost/v1/responses", { headers: codexHeaders() }); const config = routedConfig(); @@ -53,8 +60,8 @@ describe("agent task recovery cache", () => { expect(fetches).toBe(2); release?.(); const [firstResult, secondResult, otherResult] = await Promise.all([first, second, other]); - expect(firstResult).toEqual({ recovered: false, reason: "recovery_unavailable" }); - expect(secondResult).toEqual({ recovered: false, reason: "recovery_unavailable" }); + expect(firstResult).toEqual({ recovered: false, reason }); + expect(secondResult).toEqual({ recovered: false, reason }); expect(firstResult).not.toBe(secondResult); expect(otherResult).toEqual({ recovered: true }); expect(firstInput).toEqual(encryptedInput()); @@ -68,6 +75,39 @@ describe("agent task recovery cache", () => { } }); + test("shared flight reset reports abort to surviving callers and never caches late plaintext", async () => { + let release!: () => void; + const gate = new Promise(resolve => { release = resolve; }); + let fetches = 0; + globalThis.fetch = (async () => { + fetches++; + await gate; + return new Response(recoverySse("private-late-assignment")); + }) as typeof fetch; + const req = new Request("http://localhost/v1/responses", { headers: codexHeaders() }); + const firstInput = encryptedInput(); + const secondInput = encryptedInput(); + const first = recoverEncryptedAgentTaskWithResult(req, firstInput, {}, routedConfig()); + const second = recoverEncryptedAgentTaskWithResult(req, secondInput, {}, routedConfig()); + try { + expect(fetches).toBe(1); + resetAgentTaskRecoveryCache(); + release(); + const results = await Promise.all([first, second]); + expect(results).toEqual([ + { recovered: false, reason: "recovery_aborted" }, + { recovered: false, reason: "recovery_aborted" }, + ]); + expect(results[0]).not.toBe(results[1]); + expect(firstInput).toEqual(encryptedInput()); + expect(secondInput).toEqual(encryptedInput()); + expect(agentTaskRecoveryCacheSnapshotForTests()).toEqual({ entries: 0, bytes: 0 }); + } finally { + release(); + await Promise.all([first, second]); + } + }); + for (const succeeds of [true, false]) { test(`caller cancellation stays local when the remaining waiter ${succeeds ? "succeeds" : "fails"}`, async () => { let release: (() => void) | undefined; @@ -95,7 +135,7 @@ describe("agent task recovery cache", () => { release?.(); expect(await second).toEqual(succeeds ? { recovered: true } - : { recovered: false, reason: "recovery_unavailable" }); + : { recovered: false, reason: "recovery_http_rejected" }); expect(fetches).toBe(1); expect(restoreCachedEncryptedAgentTasks(req, encryptedInput(), config)).toBe(succeeds ? 1 : 0); } finally { diff --git a/tests/server/agent-task-recovery.test.ts b/tests/server/agent-task-recovery.test.ts index ceb1c5b6b5..a168f2c364 100644 --- a/tests/server/agent-task-recovery.test.ts +++ b/tests/server/agent-task-recovery.test.ts @@ -1,4 +1,4 @@ -import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test"; import { createTranslatorBudget } from "../../src/lib/translator-budget"; import { warnAgentTaskRecoveryStartup } from "../../src/server"; import { @@ -7,6 +7,7 @@ import { recoverEncryptedAgentTaskWithResult, resetAgentTaskRecoveryState, restoreCachedEncryptedAgentTasks, + type AgentTaskRecoveryFailureReason, } from "../../src/server/responses/agent-task-recovery"; import { agentTaskRecoveryWaiterCountForTests } from "../../src/server/responses/agent-task-recovery-cache"; import { @@ -78,24 +79,36 @@ describe("agent task recovery (opt-in, default off)", () => { }); } - const failedRecoveries: Array<[string, () => Response]> = [ - ["HTTP 503", () => new Response("raw-error-sentinel", { status: 503 })], - ["network exception", () => { throw new Error("raw-error-sentinel"); }], - ["malformed SSE", () => new Response("data: {not-json}\n\n")], - ["missing completion", () => new Response(recoverySse("payload-sentinel").split("data: {\"type\":\"response.completed\"")[0])], - ["conflicting assignment", () => new Response(recoverySse("payload-sentinel") + recoveryCompletedSse("other-payload-sentinel"))], - ["failed terminal", () => new Response(recoverySse("payload-sentinel") + 'data: {"type":"response.failed","response":{"error":{"message":"raw-error-sentinel"}}}\n\n')], - ["incomplete terminal", () => new Response(recoverySse("payload-sentinel") + 'data: {"type":"response.incomplete"}\n\n')], - ["bare error", () => new Response(recoverySse("payload-sentinel") + 'data: {"type":"error","error":{"message":"raw-error-sentinel"}}\n\n')], + const failedRecoveries: Array<[string, () => Response, AgentTaskRecoveryFailureReason]> = [ + ["HTTP 401", () => new Response("private-error", { status: 401 }), "recovery_http_rejected"], + ["HTTP 403", () => new Response("private-error", { status: 403 }), "recovery_http_rejected"], + ["HTTP 429", () => new Response("private-error", { status: 429 }), "recovery_http_rejected"], + ["fetch TypeError", () => { throw new TypeError("private-error"); }, "recovery_transport_error"], + ["unowned TimeoutError", () => { throw new DOMException("private-error", "TimeoutError"); }, "recovery_transport_error"], + ["reader TypeError", () => new Response(new ReadableStream({ + pull(controller) { controller.error(new TypeError("private-reader-error")); }, + })), "recovery_transport_error"], + ["invalid UTF-8", () => new Response(new Uint8Array([0xff])), "recovery_invalid_output"], + ["trailing UTF-8", () => new Response(new Uint8Array([0xe2, 0x82])), "recovery_invalid_output"], + ["oversized body", () => new Response(new Uint8Array(4 * 1024 * 1024 + 1)), "recovery_invalid_output"], + ["invalid arguments", () => new Response(recoverySse("task").replace('{\\"assignment\\":\\"task\\"}', '{broken')), "recovery_invalid_output"], + ["HTTP 503", () => new Response("raw-error-sentinel", { status: 503 }), "recovery_http_rejected"], + ["network exception", () => { throw new Error("raw-error-sentinel"); }, "recovery_transport_error"], + ["malformed SSE", () => new Response("data: {not-json}\n\n"), "recovery_invalid_output"], + ["missing completion", () => new Response(recoverySse("payload-sentinel").split("data: {\"type\":\"response.completed\"")[0]), "recovery_invalid_output"], + ["conflicting assignment", () => new Response(recoverySse("payload-sentinel") + recoveryCompletedSse("other-payload-sentinel")), "recovery_invalid_output"], + ["failed terminal", () => new Response(recoverySse("payload-sentinel") + 'data: {"type":"response.failed","response":{"error":{"message":"raw-error-sentinel"}}}\n\n'), "recovery_invalid_output"], + ["incomplete terminal", () => new Response(recoverySse("payload-sentinel") + 'data: {"type":"response.incomplete"}\n\n'), "recovery_invalid_output"], + ["bare error", () => new Response(recoverySse("payload-sentinel") + 'data: {"type":"error","error":{"message":"raw-error-sentinel"}}\n\n'), "recovery_invalid_output"], // Exact-case events are also used by the pinned official Codex source. Recovery's // additional completed-status requirement remains deliberately stricter. - ["mixed-case completion", () => new Response(recoverySse("payload-sentinel").replace("response.completed", "Response.Completed"))], - ["mixed-case status", () => new Response(recoverySse("payload-sentinel").replace('"status":"completed"', '"status":"Completed"'))], - ["missing status", () => new Response(recoverySse("payload-sentinel").replace('"status":"completed",', ""))], - ["ciphertext assignment", () => new Response(recoverySse(FERNET_TASK))], + ["mixed-case completion", () => new Response(recoverySse("payload-sentinel").replace("response.completed", "Response.Completed")), "recovery_invalid_output"], + ["mixed-case status", () => new Response(recoverySse("payload-sentinel").replace('"status":"completed"', '"status":"Completed"')), "recovery_invalid_output"], + ["missing status", () => new Response(recoverySse("payload-sentinel").replace('"status":"completed",', "")), "recovery_invalid_output"], + ["ciphertext assignment", () => new Response(recoverySse(FERNET_TASK)), "recovery_invalid_output"], ]; - for (const [name, response] of failedRecoveries) { - test(`typed recovery keeps ${name} coarse and preserves false without retrying`, async () => { + for (const [name, response, reason] of failedRecoveries) { + test(`typed recovery classifies ${name} and preserves false without retrying`, async () => { const req = new Request("http://localhost/v1/responses", { headers: codexHeaders() }); const config = routedConfig(); let fetches = 0; @@ -103,7 +116,7 @@ describe("agent task recovery (opt-in, default off)", () => { const input = encryptedInput(); const original = structuredClone(input); expect(await recoverEncryptedAgentTaskWithResult(req, input, {}, config)) - .toEqual({ recovered: false, reason: "recovery_unavailable" }); + .toEqual({ recovered: false, reason }); expect(input).toEqual(original); expect(fetches).toBe(1); expect(restoreCachedEncryptedAgentTasks(req, encryptedInput(), config)).toBe(0); @@ -113,6 +126,69 @@ describe("agent task recovery (opt-in, default off)", () => { }); } + test.each(["pending", "rejecting"] as const)("HTTP refusal does not await %s body cancellation", async mode => { + let cancels = 0; + let reads = 0; + let releaseCancel: (() => void) | undefined; + const cancellation = new Promise(resolve => { releaseCancel = resolve; }); + globalThis.fetch = (async () => new Response(new ReadableStream({ + pull() { reads++; }, + cancel() { + cancels++; + return mode === "pending" ? cancellation : Promise.reject(new Error("private-cancel-error")); + }, + }, { highWaterMark: 0 }), { status: 503 })) as typeof fetch; + try { + const result = await recoverEncryptedAgentTaskWithResult( + new Request("http://localhost/v1/responses", { headers: codexHeaders() }), encryptedInput(), {}, routedConfig(), + ); + expect(result).toEqual({ recovered: false, reason: "recovery_http_rejected" }); + expect(cancels).toBe(1); + expect(reads).toBe(0); + } finally { + releaseCancel?.(); + } + }); + + test.each(["headers", "body", "caller"] as const)("owned deadline classification at %s preserves cancellation precedence", async site => { + const callbacks: Array<() => void> = []; + const timers = spyOn(globalThis, "setTimeout").mockImplementation(((callback: () => void) => { + callbacks.push(callback); + return 0 as unknown as ReturnType; + }) as typeof setTimeout); + const caller = new AbortController(); + let started!: () => void; + const ready = new Promise(resolve => { started = resolve; }); + let fetches = 0; + globalThis.fetch = ((_, init) => { + fetches++; + if (site === "body") return Promise.resolve(new Response(new ReadableStream({ + pull(controller) { + controller.enqueue(new Uint8Array([0xe2, 0x82])); + started(); + return new Promise(() => {}); + }, + }, { highWaterMark: 0 }))); + return new Promise((_resolve, reject) => { + init?.signal?.addEventListener("abort", () => reject(init.signal?.reason), { once: true }); + started(); + }); + }) as typeof fetch; + try { + const pending = recoverEncryptedAgentTaskWithResult( + new Request("http://localhost/v1/responses", { headers: codexHeaders() }), encryptedInput(), {}, routedConfig(), + { abortSignal: caller.signal }, + ); + await ready; + callbacks[0]!(); // Fire the owned deadline without wall-clock sleeps. + if (site === "caller") caller.abort(new TypeError("private-caller-error")); + expect(await pending).toEqual({ recovered: false, reason: site === "caller" ? "caller_cancelled" : "recovery_timeout" }); + expect(fetches).toBe(1); + } finally { + timers.mockRestore(); + } + }); + test("keeps the disabled fail-fast response byte-identical to the absent feature", async () => { const snapshot = async (config: ReturnType) => { let fetchCalls = 0; @@ -226,7 +302,7 @@ describe("agent task recovery (opt-in, default off)", () => { expect(response.status).toBe(400); expect(json.error?.code).toBe("unreadable_encrypted_agent_task"); - expect(json.error?.recovery_reason).toBe("recovery_unavailable"); + expect(json.error?.recovery_reason).toBe("recovery_invalid_output"); expect(fetchedUrls.length).toBeGreaterThan(0); expect(fetchedUrls[0]).toContain("chatgpt.com/backend-api/codex"); }); @@ -778,7 +854,7 @@ describe("agent task recovery (opt-in, default off)", () => { expect(fetchedUrls).toHaveLength(1); expect(fetchedUrls[0]).toContain("chatgpt.com/backend-api/codex/responses"); expect(await response.json()).toMatchObject({ - error: { code: "unreadable_encrypted_agent_task", recovery_reason: "recovery_unavailable" }, + error: { code: "unreadable_encrypted_agent_task", recovery_reason: "recovery_transport_error" }, }); }); }); diff --git a/tests/server/bounded-body.test.ts b/tests/server/bounded-body.test.ts index f5223d34a4..0bf5e0ae1b 100644 --- a/tests/server/bounded-body.test.ts +++ b/tests/server/bounded-body.test.ts @@ -1,7 +1,8 @@ -import { describe, expect, test } from "bun:test"; +import { describe, expect, spyOn, test } from "bun:test"; import { BOUNDED_BODY_MAX_BYTES, boundedBodyBufferGrowthsForTests, + boundedBodyDecodeFailure, readBoundedResponseBytes, readBoundedResponseBody, } from "../../src/lib/bounded-body"; @@ -21,6 +22,65 @@ function responseFromChunks(...chunks: Uint8Array[]): Response { } describe("readBoundedResponseBody", () => { + test("only actual decoder exceptions carry the decode discriminator", async () => { + for (const bytes of [new Uint8Array([0xff]), new Uint8Array([0xe2, 0x82])]) { + let caught: unknown; + try { await readBoundedResponseBody(responseFromChunks(bytes), { fatalUtf8: true }); } + catch (error) { caught = error; } + expect(caught).toBeInstanceOf(TypeError); + expect(boundedBodyDecodeFailure(caught)).toBe("invalid_utf8"); + } + const readerError = new TypeError("private-reader-error"); + const response = new Response(new ReadableStream({ pull(controller) { controller.error(readerError); } })); + let caught: unknown; + try { await readBoundedResponseBody(response, { fatalUtf8: true }); } + catch (error) { caught = error; } + expect(caught).toBe(readerError); + expect(boundedBodyDecodeFailure(caught)).toBeUndefined(); + }); + + test("fatal UTF-8 abort retains the exact caller reason without a decode mark", async () => { + const caller = new AbortController(); + const reason = new TypeError("private-caller-error"); + const pending = readBoundedResponseBody(new Response(new ReadableStream({})), { signal: caller.signal, fatalUtf8: true }); + caller.abort(reason); + let caught: unknown; + try { await pending; } catch (error) { caught = error; } + expect(caught).toBe(reason); + expect(boundedBodyDecodeFailure(caught)).toBeUndefined(); + }); + + test.each([0, 1])("fatal timeout flush retains deadline origin %s and cancels without waiting", async deadline => { + const callbacks: Array<() => void> = []; + const timers = spyOn(globalThis, "setTimeout").mockImplementation(((callback: () => void) => { + callbacks.push(callback); + return 0 as unknown as ReturnType; + }) as typeof setTimeout); + let stalled!: () => void; + const ready = new Promise(resolve => { stalled = resolve; }); + let pulls = 0; + let cancelled = false; + const response = new Response(new ReadableStream({ + pull(controller) { + if (pulls++ === 0) controller.enqueue(new Uint8Array([0xe2, 0x82])); + else { stalled(); return new Promise(() => {}); } + }, + cancel() { cancelled = true; return new Promise(() => {}); }, + }, { highWaterMark: 0 })); + try { + const pending = readBoundedResponseBody(response, { fatalUtf8: true }); + await ready; + callbacks[deadline === 0 ? 0 : callbacks.length - 1]!(); + let caught: unknown; + try { await pending; } catch (error) { caught = error; } + expect(caught).toBeInstanceOf(TypeError); + expect(boundedBodyDecodeFailure(caught)).toBe("timeout"); + expect(cancelled).toBe(true); + } finally { + timers.mockRestore(); + } + }); + test("the bounded JSON caller allows a full total deadline for its first byte", () => { expect(UPSTREAM_JSON_BODY_READ_OPTIONS.firstByteTimeoutMs) .toBe(UPSTREAM_JSON_BODY_READ_OPTIONS.totalTimeoutMs); From 2c8ec0bc3684d9079d0c2a50cb0ed5284c56d226 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 10:05:03 +0900 Subject: [PATCH 093/221] docs(devlog): close axis five display and CLI delivery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Record credited admin landings, successful feature CI, exact merged-tree focused checks, and the unresolved Mac timing/stall diagnosis. Co-authored-by: Éverton Toffanetto Co-authored-by: 투린 Co-authored-by: Zig Zag --- .../260907_axis5_display_cli/000_plan.md | 4 ++ .../001_roadmap_audit.md | 0 .../260907_axis5_display_cli/010_delivery.md | 0 .../260907_axis5_display_cli/020_delivery.md | 40 +++++++++++++++++++ 4 files changed, 44 insertions(+) rename devlog/{_plan => _fin}/260907_axis5_display_cli/000_plan.md (95%) rename devlog/{_plan => _fin}/260907_axis5_display_cli/001_roadmap_audit.md (100%) rename devlog/{_plan => _fin}/260907_axis5_display_cli/010_delivery.md (100%) create mode 100644 devlog/_fin/260907_axis5_display_cli/020_delivery.md diff --git a/devlog/_plan/260907_axis5_display_cli/000_plan.md b/devlog/_fin/260907_axis5_display_cli/000_plan.md similarity index 95% rename from devlog/_plan/260907_axis5_display_cli/000_plan.md rename to devlog/_fin/260907_axis5_display_cli/000_plan.md index 222ef89899..eb6ed46d27 100644 --- a/devlog/_plan/260907_axis5_display_cli/000_plan.md +++ b/devlog/_fin/260907_axis5_display_cli/000_plan.md @@ -31,3 +31,7 @@ Review-ready requirements remain visible; local suite prohibition is explicitly CI scope refinement: the discovered editor is the final layer so the final commit and PR diff include gui/**, activating GUI lint/build/artifact jobs. ci.yml gates always run GUI tests; docs deployment is NOT dispatched because it publishes. Public docs receive static source consistency inspection here, with docs build explicitly unverified unless an existing build-only remote path is available. CI scheduling refinement: lower-layer head commits may use GitHub documented [skip ci] to avoid push/pull_request suite launches; this yields missing/pending evidence, NOT green. Final head has no skip marker and receives lane=all workflow_dispatch. Source: https://docs.github.com/en/actions/how-tos/manage-workflow-runs/skip-workflow-runs (opened 2026-09-07). Admin merge records this explicit owner-requested lower-layer waiver. Do not propagate skip markers into integration merge messages. + +## Terminal status + +DONE: all three feature layers landed; see 020_delivery.md for exact commits, verification boundaries and deferred Mac test-runner investigation. diff --git a/devlog/_plan/260907_axis5_display_cli/001_roadmap_audit.md b/devlog/_fin/260907_axis5_display_cli/001_roadmap_audit.md similarity index 100% rename from devlog/_plan/260907_axis5_display_cli/001_roadmap_audit.md rename to devlog/_fin/260907_axis5_display_cli/001_roadmap_audit.md diff --git a/devlog/_plan/260907_axis5_display_cli/010_delivery.md b/devlog/_fin/260907_axis5_display_cli/010_delivery.md similarity index 100% rename from devlog/_plan/260907_axis5_display_cli/010_delivery.md rename to devlog/_fin/260907_axis5_display_cli/010_delivery.md diff --git a/devlog/_fin/260907_axis5_display_cli/020_delivery.md b/devlog/_fin/260907_axis5_display_cli/020_delivery.md new file mode 100644 index 0000000000..0b06325172 --- /dev/null +++ b/devlog/_fin/260907_axis5_display_cli/020_delivery.md @@ -0,0 +1,40 @@ +# Axis five delivery record + +Outcome: DONE on 2026-09-07. The three feature layers landed in dev through owner-authorized admin integration. Original contribution credit is present in both carried commits and merge commits. + +| Source | Delivery | Merge commit | +| --- | --- | --- | +| #3627 native OpenAI display names | #3820 | 1e16fe4c077ecf353d79c46873d8039d9176704d | +| #3780 provider list JSONL | #3821 | be24986e5ff8474ca6699895855f0ad9352e9d86 | +| #2716 discovered-model name editor | #3824 | 44c69fdd619b272066113388edd80f6c59b0682a | + +The source pull requests were closed after landing. The late #3627 head 81f150e4 added metadata wording already covered by the delivery; its runtime files were checked byte-for-byte against dev before closure. + +## Delivered behavior + +Native labels are reversible overlays on supported bare native rows. IDs, capabilities and routing remain intact; restoring a label still respects existing pinned Astra normalization. Both retained synchronization and convergence pass the same configuration map. + +JSONL emits one configured-provider object per line using the existing JSON fields. Both conflicting flag orders fail without stdout. Multi-provider parity and escaping are covered, and all translated CLI tables and generated capability documentation were updated. + +The editor preserves exact selectors, validates labels, supports reset, and recovers confirmed saves separately from failed refreshes and unknown transport outcomes. Stalled operations use the existing bounded-fetch mechanism. Draft reconciliation preserves the mounted dialog and focus behavior. Desktop/mobile Korean rendering and save/reset/validation/focus were driven against the compiled CI artifact with disposable fixtures. + +## Verification boundaries + +- Feature head f51ec2421c49df0fd4eac8a9a56a6283b426387d: [Cross-platform CI attempt 2](https://github.com/lidge-jun/opencodex/actions/runs/34068041704/attempts/2), 25 successful jobs. Dashboard tests: 1,737 passed, zero failed. Typecheck, lint, scans and build passed. +- Late platform base changes had zero overlap with the 39-file feature delta and passed [their 26-job CI](https://github.com/lidge-jun/opencodex/actions/runs/34068218011). Independent compatibility review checked the decompression diagnostics and container lifecycle interaction. +- Prospective merge tree 85c9b25818a93859a6d6fc824e2ed0678da46c8f passed 370 focused tests on isolated Linux with project Bun 1.4.0: 344 catalog/CLI tests and 26 editor tests, zero failures. The transmitted source archive SHA-256 was ae191e1f0a809e75c9c198bc92233964880541f6747e4603a47b2c180f773d49. +- The actual final runtime merge 44c69fdd619b272066113388edd80f6c59b0682a has exactly that tested tree. This is focused merged-tree evidence plus full feature-head CI, not a claim of full CI on the final merge commit. +- No local test suite, typecheck or build ran. Pushes used --no-verify. Lower-layer CI was deferred until a final-head failure, and no cancelled or missing check was presented as passing. +- Public documentation was source-reviewed. This axis did not run a documentation build. + +## Diagnostic disposition + +One Mac shard reached its 20-minute limit after an unchanged history-lock test. The full Mac control had two Cursor decoded-frame-silence assertion failures; the separately annotated server-auth stream reset was intentional and its test passed. Only the unsuccessful Mac jobs were replayed, with unchanged source and limits, and they passed. The [baseline control comparison](https://github.com/lidge-jun/opencodex/actions/runs/34069848260) also passed. These observations do not establish the stall or timing root cause. No threshold increase, assertion suppression, or unrelated harness fix was included; deeper investigation remains deferred. + +## Attribution + +- Éverton Toffanetto +- 투린 +- Zig Zag + +The preceding numbered files are the historical roadmap and audits; their original _plan locations refer to the planning phase before this closeout. From 0ccc6bdd5d4014f365451eb540bf89d44860f154 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 10:14:55 +0900 Subject: [PATCH 094/221] docs: keep delivery attribution without contact addresses [skip ci] --- devlog/_fin/260907_axis5_display_cli/020_delivery.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/devlog/_fin/260907_axis5_display_cli/020_delivery.md b/devlog/_fin/260907_axis5_display_cli/020_delivery.md index 0b06325172..7a2b76d0f8 100644 --- a/devlog/_fin/260907_axis5_display_cli/020_delivery.md +++ b/devlog/_fin/260907_axis5_display_cli/020_delivery.md @@ -33,8 +33,10 @@ One Mac shard reached its 20-minute limit after an unchanged history-lock test. ## Attribution -- Éverton Toffanetto -- 투린 -- Zig Zag +- Éverton Toffanetto +- 투린 +- Zig Zag + +Original author identities remain in the landed commits; this note lists names without contact addresses. The preceding numbered files are the historical roadmap and audits; their original _plan locations refer to the planning phase before this closeout. From b29bbb440aaf70b283445a9c37e194a4a4e6859a Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 10:51:00 +0900 Subject: [PATCH 095/221] fix(clients): preserve exact Aside file identities [skip ci] Use private BigInt stat identities so distinct legal 64-bit file IDs are not collapsed by Number conversion. Preserve all path/link/hardlink and directory replacement checks, manifest bounds, public IO types and serialization. Add semantic high-ID and native link controls with fixture-reachability checks. No local suite was run; the earlier Windows incident IDs remain unmeasured. --- scripts/test-layout/layout.json | 1 + src/clients/aside-profiles.ts | 15 ++- tests/clients/aside-profile-identity.test.ts | 132 +++++++++++++++++++ tests/fixtures/test-layout-expected.json | 1 + 4 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 tests/clients/aside-profile-identity.test.ts diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json index f560dffeb5..7547d467c7 100644 --- a/scripts/test-layout/layout.json +++ b/scripts/test-layout/layout.json @@ -239,6 +239,7 @@ "aside-profiles-routes.test.ts": "server", "aside-profiles.test.ts": "clients", "aside-profile-paths.test.ts": "clients", + "aside-profile-identity.test.ts": "clients", "aside-profile-sync-owner.test.ts": "clients", "assert-mergeable-review.test.ts": "ci-workflows", "auto-compact-budget.test.ts": "providers", diff --git a/src/clients/aside-profiles.ts b/src/clients/aside-profiles.ts index 31f13d9b76..770857611a 100644 --- a/src/clients/aside-profiles.ts +++ b/src/clients/aside-profiles.ts @@ -1,4 +1,4 @@ -import { lstatSync, readFileSync, readlinkSync, realpathSync, statSync, type Stats } from "node:fs"; +import { lstatSync, readFileSync, readlinkSync, realpathSync, statSync, type BigIntStats } from "node:fs"; import { homedir } from "node:os"; import { basename, dirname, isAbsolute, join, resolve } from "node:path"; import type { IntegrationIO } from "../integrations/config-io"; @@ -14,7 +14,7 @@ export interface AsideProfile { } const MAX_PROFILES = 128; -const MAX_MANIFEST_BYTES = 4 * 1024 * 1024; +const MAX_MANIFEST_BYTES = 4n * 1024n * 1024n; const MAX_LEAF_LINKS = 40; function refuse(message: string): never { @@ -30,9 +30,10 @@ function object(value: unknown): value is Record { return value !== null && typeof value === "object" && !Array.isArray(value); } -function inspect(path: string, follow = false): Stats | null { +function inspect(path: string, follow = false): BigIntStats | null { try { - return follow ? statSync(path) : lstatSync(path); + // File IDs can exceed Number's exact integer range; never round identities. + return follow ? statSync(path, { bigint: true }) : lstatSync(path, { bigint: true }); } catch (error) { if ((error as NodeJS.ErrnoException).code === "ENOENT") return null; return refuse("a filesystem boundary could not be inspected."); @@ -110,10 +111,10 @@ export function listAsideProfiles(env: NodeJS.ProcessEnv = process.env, home: st return readProfiles(root); } -type DirectoryIdentity = { path: string; dev: number; ino: number }; +type DirectoryIdentity = { path: string; dev: bigint; ino: bigint }; type Boundary = Array; -function sameIdentity(a: Pick, b: Pick): boolean { +function sameIdentity(a: Pick, b: Pick): boolean { return a.dev === b.dev && a.ino === b.ino; } @@ -162,7 +163,7 @@ function boundary(profile: AsideProfile, profiles: AsideProfile[], mutation: boo } if (absent) return identities; const leaf = inspect(profile.configPath); - if (leaf && (leaf.isSymbolicLink() || !leaf.isFile() || leaf.nlink > 1)) { + if (leaf && (leaf.isSymbolicLink() || !leaf.isFile() || leaf.nlink > 1n)) { refuse("the model catalog is a link, shared file or non-regular file."); } if (leaf && canonical(profile.configPath) !== join(parent!, "models.json")) { diff --git a/tests/clients/aside-profile-identity.test.ts b/tests/clients/aside-profile-identity.test.ts new file mode 100644 index 0000000000..771966a1c4 --- /dev/null +++ b/tests/clients/aside-profile-identity.test.ts @@ -0,0 +1,132 @@ +import { expect, spyOn, test } from "bun:test"; +import * as fs from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import type { IntegrationIO } from "../../src/integrations/config-io"; +import { removeTreeWithRetry } from "../helpers/remove-tree"; + +// Capture real delegates before spying. Only fixture inode values are controlled; +// existence, file type, link count, realpath and link resolution remain native. +const nativeLstat = fs.lstatSync; +const nativeStat = fs.statSync; +const FIRST_INODE = 2n ** 53n; +const SECOND_INODE = FIRST_INODE + 1n; + +test("Aside preserves high file identities without admitting shared targets or directory replacement", async () => { + const home = fs.mkdtempSync(join(tmpdir(), "ocx-aside-identity-")); + const root = join(home, ".aside"); + const paths = [0, 1].map(id => join(root, "u", String(id), "models.json")); + const identities = new Map(); + const reads = new Set(); + let observingBoundary = false; + const restoreSpies: Array<() => void> = []; + + function controlledStat(delegate: typeof fs.statSync, kind: "stat" | "lstat"): typeof fs.statSync { + // Preserve fs's overload contract: the native delegate determines the result + // type, including undefined for throwIfNoEntry:false and number vs bigint. + return ((path: fs.PathLike, options?: fs.StatOptions) => { + const stats = delegate(path, options); + const inode = typeof path === "string" ? identities.get(path) : undefined; + if (stats && inode !== undefined) { + if (observingBoundary) reads.add(`${kind}:${path}`); + // Mutate this fresh native result, retaining its prototype and method + // receiver. Spreading Stats would lose native isFile/isDirectory methods. + stats.ino = options?.bigint ? inode : Number(inode); + } + return stats; + }) as typeof fs.statSync; + } + + function observe(run: () => T): T { + reads.clear(); + observingBoundary = true; + try { return run(); } finally { observingBoundary = false; } + } + + try { + for (const id of [0, 1]) fs.mkdirSync(join(root, "u", String(id)), { recursive: true }); + fs.writeFileSync(join(root, "accounts.json"), JSON.stringify({ + currentAccountId: 0, accounts: [{ id: 0 }, { id: 1 }], + })); + for (const path of paths) fs.writeFileSync(path, "{}"); + // Controlled IDs must not hide a runtime lacking native BigInt stat support. + expect(typeof nativeStat(paths[0]!, { bigint: true }).ino).toBe("bigint"); + expect(typeof nativeLstat(paths[0]!, { bigint: true }).ino).toBe("bigint"); + const lstatSpy = spyOn(fs, "lstatSync"); + restoreSpies.push(() => lstatSpy.mockRestore()); + lstatSpy.mockImplementation(controlledStat(nativeLstat, "lstat")); + const statSpy = spyOn(fs, "statSync"); + restoreSpies.push(() => statSpy.mockRestore()); + statSpy.mockImplementation(controlledStat(nativeStat, "stat")); + + // Load after spies so the regression also covers the native named-import seam. + const { assertAsideProfileBoundary, guardAsideProfileIO, listAsideProfiles } = + await import("../../src/clients/aside-profiles"); + const [selected, peer] = listAsideProfiles({}, home); + if (!selected || !peer) throw new Error("fixture requires two profiles"); + const profiles = [selected, peer]; + expect(Number(FIRST_INODE)).toBe(Number(SECOND_INODE)); + expect(FIRST_INODE).not.toBe(SECOND_INODE); + expect(nativeStat(selected.configPath, { bigint: true }).dev) + .toBe(nativeStat(peer.configPath, { bigint: true }).dev); + // Distinct catalogs and directories are allowed even though their Number + // representations collide. + // Reads are recorded only DURING boundary calls, so a missed spy binding + // cannot silently turn this into a passing ordinary-filesystem test. + for (const target of ["configPath", "detectDir"] as const) { + identities.clear(); + identities.set(selected[target], FIRST_INODE); + identities.set(peer[target], SECOND_INODE); + for (const profile of profiles) { + const sibling = profile === selected ? peer : selected; + observe(() => expect(() => assertAsideProfileBoundary(profile, profiles, true)).not.toThrow()); + expect(reads.has(`lstat:${profile[target]}`)).toBe(true); + expect(reads.has(`stat:${sibling[target]}`)).toBe(true); + } + } + + identities.clear(); + identities.set(selected.detectDir, FIRST_INODE); + let delegatedReads = 0; + const io: IntegrationIO = { + readText: () => { delegatedReads++; return { kind: "text", text: "{}" }; }, + statKind: () => "file", + writeText: () => {}, removeFile: () => {}, mkdirp: () => {}, + now: () => 0, appendJournal: () => {}, putRecord: () => {}, dropRecord: () => {}, + }; + const guarded = observe(() => guardAsideProfileIO(selected, io, profiles)); + expect(reads.has(`lstat:${selected.detectDir}`)).toBe(true); + observe(() => expect(guarded.readText(selected.configPath)).toEqual({ kind: "text", text: "{}" })); + expect(reads.has(`lstat:${selected.detectDir}`)).toBe(true); + expect(delegatedReads).toBe(1); + identities.set(selected.detectDir, SECOND_INODE); + observe(() => expect(() => guarded.readText(selected.configPath)) + .toThrow("the account directory changed after the operation began.")); + expect(reads.has(`lstat:${selected.detectDir}`)).toBe(true); + expect(delegatedReads).toBe(1); + + // No synthetic IDs for these controls: real hardlinks and symlinks must + // continue to be refused by the same boundary, with native stat delegates. + identities.clear(); + fs.unlinkSync(peer.configPath); + fs.linkSync(selected.configPath, peer.configPath); + expect(nativeLstat(selected.configPath, { bigint: true }).nlink).toBe(2n); + for (const profile of profiles) { + expect(() => assertAsideProfileBoundary(profile, profiles, true)) + .toThrow("the model catalog is a link, shared file or non-regular file."); + } + fs.unlinkSync(peer.configPath); + fs.symlinkSync(selected.configPath, peer.configPath, "file"); + expect(nativeLstat(peer.configPath, { bigint: true }).isSymbolicLink()).toBe(true); + expect(() => assertAsideProfileBoundary(selected, profiles, true)) + .toThrow("account catalogs share a target."); + expect(() => assertAsideProfileBoundary(peer, profiles, true)) + .toThrow("the model catalog is a link, shared file or non-regular file."); + } finally { + observingBoundary = false; + identities.clear(); + reads.clear(); + for (const restore of restoreSpies.reverse()) restore(); + removeTreeWithRetry(home); + } +}); diff --git a/tests/fixtures/test-layout-expected.json b/tests/fixtures/test-layout-expected.json index 2a1cac7ec3..cac40976e1 100644 --- a/tests/fixtures/test-layout-expected.json +++ b/tests/fixtures/test-layout-expected.json @@ -74,6 +74,7 @@ "aside-profiles-routes.test.ts": "server", "aside-profiles.test.ts": "clients", "aside-profile-paths.test.ts": "clients", + "aside-profile-identity.test.ts": "clients", "aside-profile-sync-owner.test.ts": "clients", "assert-mergeable-review.test.ts": "ci-workflows", "auto-compact-budget.test.ts": "providers", From be112e4fae9596950f81fa1b039d5f1f5c365a5d Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 11:24:54 +0900 Subject: [PATCH 096/221] docs: close axis1 bug-fix delivery record [skip ci] --- .../260907_axis1_bugfixes/000_plan.md | 2 + .../260907_axis1_bugfixes/010_roadmap.md | 0 .../260907_axis1_bugfixes/011_audit.md | 0 .../260907_axis1_bugfixes/012_roadmap_lock.md | 0 .../020_bounded_fixes.md | 0 .../021_source_review.md | 0 .../260907_axis1_bugfixes/030_delivery.md | 0 .../031_delivery_record.md | 53 +++++++++++++++++++ 8 files changed, 55 insertions(+) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/000_plan.md (96%) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/010_roadmap.md (100%) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/011_audit.md (100%) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/012_roadmap_lock.md (100%) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/020_bounded_fixes.md (100%) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/021_source_review.md (100%) rename devlog/{_plan => _fin}/260907_axis1_bugfixes/030_delivery.md (100%) create mode 100644 devlog/_fin/260907_axis1_bugfixes/031_delivery_record.md diff --git a/devlog/_plan/260907_axis1_bugfixes/000_plan.md b/devlog/_fin/260907_axis1_bugfixes/000_plan.md similarity index 96% rename from devlog/_plan/260907_axis1_bugfixes/000_plan.md rename to devlog/_fin/260907_axis1_bugfixes/000_plan.md index 1fa7537164..ad0da69270 100644 --- a/devlog/_plan/260907_axis1_bugfixes/000_plan.md +++ b/devlog/_fin/260907_axis1_bugfixes/000_plan.md @@ -1,5 +1,7 @@ # Axis 1: measured bug fixes and failure diagnostics +Completed: see [031_delivery_record.md](031_delivery_record.md) for merged commits, final CI, attribution and deferrals. + Archetype: satisfy existing contracts. Trigger: owner assigned axis 1 (#3809, #3464, #3661). Goal: deliver reviewable fixes through a manual PR chain and merge the verified scope. Non-goals: new account/retry policy, auth defaults, multipart recovery, releases, native stacks, sibling edits. Stop: merged feasible scope plus explicit unresolved dispositions. Escalation: defer a policy-dependent or unreproducible slice; reclaim a worker slice after two failed packets. Evidence: this unit plus ignored `.tmp/axis1/` and `.codexclaw` receipts. Resources: task-owned worktree/branches and GitHub repository access; Astra high leaves within host capacity; no caller-specified token or wall-clock budget. Baseline: origin/dev 137d6a727; source PR #3809 at 4a1012359a522ddd6d7ff77203c9e5f3632d605c. Assigned 5cc8 checkout has pre-existing changes and remains untouched. Code lives in /tmp/ocx-axis1-20260907. diff --git a/devlog/_plan/260907_axis1_bugfixes/010_roadmap.md b/devlog/_fin/260907_axis1_bugfixes/010_roadmap.md similarity index 100% rename from devlog/_plan/260907_axis1_bugfixes/010_roadmap.md rename to devlog/_fin/260907_axis1_bugfixes/010_roadmap.md diff --git a/devlog/_plan/260907_axis1_bugfixes/011_audit.md b/devlog/_fin/260907_axis1_bugfixes/011_audit.md similarity index 100% rename from devlog/_plan/260907_axis1_bugfixes/011_audit.md rename to devlog/_fin/260907_axis1_bugfixes/011_audit.md diff --git a/devlog/_plan/260907_axis1_bugfixes/012_roadmap_lock.md b/devlog/_fin/260907_axis1_bugfixes/012_roadmap_lock.md similarity index 100% rename from devlog/_plan/260907_axis1_bugfixes/012_roadmap_lock.md rename to devlog/_fin/260907_axis1_bugfixes/012_roadmap_lock.md diff --git a/devlog/_plan/260907_axis1_bugfixes/020_bounded_fixes.md b/devlog/_fin/260907_axis1_bugfixes/020_bounded_fixes.md similarity index 100% rename from devlog/_plan/260907_axis1_bugfixes/020_bounded_fixes.md rename to devlog/_fin/260907_axis1_bugfixes/020_bounded_fixes.md diff --git a/devlog/_plan/260907_axis1_bugfixes/021_source_review.md b/devlog/_fin/260907_axis1_bugfixes/021_source_review.md similarity index 100% rename from devlog/_plan/260907_axis1_bugfixes/021_source_review.md rename to devlog/_fin/260907_axis1_bugfixes/021_source_review.md diff --git a/devlog/_plan/260907_axis1_bugfixes/030_delivery.md b/devlog/_fin/260907_axis1_bugfixes/030_delivery.md similarity index 100% rename from devlog/_plan/260907_axis1_bugfixes/030_delivery.md rename to devlog/_fin/260907_axis1_bugfixes/030_delivery.md diff --git a/devlog/_fin/260907_axis1_bugfixes/031_delivery_record.md b/devlog/_fin/260907_axis1_bugfixes/031_delivery_record.md new file mode 100644 index 0000000000..439c395f8b --- /dev/null +++ b/devlog/_fin/260907_axis1_bugfixes/031_delivery_record.md @@ -0,0 +1,53 @@ +# Axis 1 delivery record + +Terminal outcome: DONE for the authorized bounded bug/diagnostic scope, with the explicitly listed broader work deferred. Completed 2026-09-07. + +## Delivered + +- #3825 carries #3809 with serving-credential quota attribution, upstream deadline handling, probe-clock preservation and known-reset expiration. Invalid reset metadata does not erase otherwise valid usage; no new unknown-window TTL or synthetic zero was introduced. +- #3826 corrects CLI-versus-proxy version guidance in both directions and prevents false doctor match claims. +- #3827 exposes bounded recovery refusal/timeout/transport/invalid-output reasons through shared flights while preserving admission, success-only caching and caller-local cancellation. +- #3842 is supporting validation work: exact private BigInt file identities preserve existing Aside profile boundaries, including high-ID distinction and directory replacement detection. Public IO/serialization and link refusals remain unchanged. + +## Landing proof + +All four ordinary PRs were merged bottom-up with owner-authorized admin authority. No native stack was registered. Children were retargeted to dev before their parent branches could be automatically deleted. + +| PR | Reviewed layer head | Merge commit | +| --- | --- | --- | +| [#3825](https://github.com/lidge-jun/opencodex/pull/3825) | `d3c70f9d8c8cc6fced7a93577b93e8b141473ea3` | `85fbdb59621046da3db1839a5cce4c7260f99385` | +| [#3826](https://github.com/lidge-jun/opencodex/pull/3826) | `872f0e5aa714f6a2e757510195d1c038ac70e26d` | `860baaf9032fa7ea3030c78ab555608e3325a338` | +| [#3827](https://github.com/lidge-jun/opencodex/pull/3827) | `2e8ef03428f8e619dc92b250fbbc5d5dd7ad53cb` | `5a97db9b20f03a65e714ddc88d2523bea9aeacae` | +| [#3842](https://github.com/lidge-jun/opencodex/pull/3842) | `b29bbb440aaf70b283445a9c37e194a4a4e6859a` | `5fdf9bbdd9ff7657f0b6d7101697317d708af0e7` | + +The runtime integration commit is `5fdf9bbdd9ff7657f0b6d7101697317d708af0e7`. Its full tree `90a75118402d2f310393bef9ac3e4668cfcbdcfa` exactly matches the final combined validation candidate `9470fdb1bc9a02715a3760c36301d3d030a4e4fa`. A fresh fetch and ancestor check confirmed every merge on dev. The candidate included dev `bf85e675484a2391b94b2135bbebe739813a9621` plus all four layers. + +## Verification + +- [Cross-platform CI 34074350604](https://github.com/lidge-jun/opencodex/actions/runs/34074350604): all 26 jobs succeeded at the combined candidate, including Linux, macOS, Windows, Docker smoke, typecheck, privacy, build and operational checks. +- [Service lifecycle 34074351720](https://github.com/lidge-jun/opencodex/actions/runs/34074351720): Linux, macOS and Windows succeeded at the same candidate. +- Independent Astra high source/security audits covered the scoped implementations, merge interactions and exact-identity support. +- All current review threads on the four delivered PRs were resolved after runtime evidence was available. +- No local application test suite or local typecheck ran. Pushes used --no-verify; per-layer CI was deferred by explicit owner instruction. Cancelled and skipped checks were never represented as passing tests. +- Privacy scanning passed. Documentation static build produced 425 pages in 8.23 seconds at 2522264d5; its documentation subtree remained unchanged by the supporting identity fix. Dependencies were installed from the frozen lockfile with install scripts disabled. The build changed no tracked files. +- The assigned pre-existing working-tree changes were preserved; delivery used an isolated worktree. + +## Corrections and remaining limits + +Initial verification exposed incomplete test homes/default configuration and old calendar reset dates in current-measurement fixtures. Those fixtures were corrected without removing behavioral assertions. Known-expiry tests use explicit simulated time. Later review added expired-window handling, field normalization and a global test network guard. + +Imported axis-five closeout contact addresses blocked privacy scanning. [#3836](https://github.com/lidge-jun/opencodex/pull/3836) removed the addresses while retaining author names and all commit attribution; no scanner rule or allowlist was weakened. + +Earlier Windows Aside incidents reported an apparent shared catalog target. Their actual file IDs were not captured. The independently demonstrable Number-precision defect was corrected by #3842, and semantic/native regressions plus the previously failing route case passed in final CI. This does not retroactively prove every earlier incident's raw IDs or cause. + +An earlier Windows outbound-proxy test timed out at its existing 15-second bound. Its scoped test/transport files were unchanged and the stalled phase was not measured. No timeout increase or unrelated proxy repair was made; later passing execution is not a claim that the timing root cause was fixed. + +## Attribution and issue disposition + +Éverton Toffanetto's Co-authored-by trailer is retained in reachable commit `f215f79b4562735029ad5672a68bc6104e534b98`. The issue reporters garysassano and Hu9956 are acknowledged in the corresponding diagnostic commits. Merge commits preserve those commits and trailers. + +The original #3809 was confirmed closed with a landed-via-#3825 marker at final recheck. The initial carry source was 4a1012359; the original author subsequently updated the source PR, so this record does not claim a verbatim merge of its later head. + +#3464 remains open for its broader automatic-repair/request-policy requests. #3661 remains open for multipart reconstruction and recovery retry policy. Those choices were outside this delivery. No release, deployment, new account-selection strategy or authentication-default change was performed. + +The preceding numbered documents are historical plans and audits; their original _plan paths refer to the planning stage. From 2dd7b43a1625dc2c24480ae17651564324909413 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2026 03:34:54 +0000 Subject: [PATCH 097/221] chore(release): open dev at 2.47.0 before releasing 2.46.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bdf30eb215..0b2d5768c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bitkyc08/opencodex", - "version": "2.46.0", + "version": "2.47.0", "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code", "type": "module", "main": "./bin/package-main.mjs", From ec799db260fd6c2c2db8d2b027bdfd5e3a9a197d Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 14:22:47 +0900 Subject: [PATCH 098/221] docs(devlog): plan code-mode host contract for routed models --- .../000_plan.md | 141 ++++++++++++ .../010_pre_call_contract.md | 139 ++++++++++++ .../020_post_hoc_annotation.md | 208 ++++++++++++++++++ .../030_docs_and_delivery.md | 74 +++++++ 4 files changed, 562 insertions(+) create mode 100644 devlog/_plan/260907_code_mode_host_contract/000_plan.md create mode 100644 devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md create mode 100644 devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md create mode 100644 devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md diff --git a/devlog/_plan/260907_code_mode_host_contract/000_plan.md b/devlog/_plan/260907_code_mode_host_contract/000_plan.md new file mode 100644 index 0000000000..6f85ef9c4d --- /dev/null +++ b/devlog/_plan/260907_code_mode_host_contract/000_plan.md @@ -0,0 +1,141 @@ +# 000 — Code-mode host contract for routed models: plan + +## Loop-spec + +- Loop archetype: satisfy-spec repair (verifier-defined). No optimization loop. +- Trigger: xai/grok-4.6 retrospective (2026-09-07) on a routed native-Responses Codex session. The + model hit four Codex host contracts that OpenCodex neither states before the first call nor + explains after the failure, then abandoned the right tools for shell heredocs and sleep loops. +- Goal: a routed non-OpenAI model in Codex code mode learns the host's exact argument shape and + waiting protocol up front, and when it still trips, the tool result names the rule it broke. +- Non-goals: rewriting model JavaScript; repairing payloads (`apply-patch-envelope.ts`, + `code-mode-helper-compat.ts`, `bridge.ts`, `parser.ts` untouched); changing OpenAI/ChatGPT + destinations or compaction requests; Lab; GUI; release/version bumps. No local test suite, + typecheck, build, or install in this worktree (user instruction). Merge/release out of scope. +- Verifier: hosted `.github/workflows/ci.yml` on the exact PR head (test shards 1-4 + gates: + typecheck, privacy scan). Local: NOT RUN by instruction. Each conditional path names its + activation test in the decade docs; those tests ride the hosted shards. +- Stop condition: PR open against `dev` with exact-head CI green and receipt bound; then DONE. +- Memory artifact: this unit (`devlog/_plan/260907_code_mode_host_contract/`), the bound + goalplan `.codexclaw/goalplans/code-mode-host-contract-for-routed-models-shared/`, PR body. +- Expected terminal outcomes: DONE (PR open, CI green); NOOP if the contract already exists + (ruled out below); BLOCKED if GitHub/CI infrastructure fails after retries; UNSAFE if a change + would rewrite JavaScript or widen a fail-open write; NEEDS_HUMAN for merge. +- Escalation: main reclaims a slice after two distinct agents fail its packet; pushing a slice to + a worker requires a P-phase amendment. Every dispatch uses `gpt-6-astra` reasoning `high`. +- HOTL bounds: write scope is this worktree on `codex/code-mode-host-contract`; tools are + git/gh/rg/read + `tools.apply_patch`; no token or wall-clock budget was set by the user. + +## Incident (what actually broke) + +All four strings below were read from the installed Codex 0.153.2 binaries +(`codex` and `codex-code-mode-host`, `strings -n 8`), so the wording here is the host's, not a guess. + +| # | Model action | Host response | Where OpenCodex says nothing today | +|---|---|---|---| +| 1 | `tools.apply_patch({ input: "..." })` | `\`apply_patch\` expects a string input` | Nudge says "host-executed" and describes markers, never the argument type | +| 2 | patch built in a template literal opening with a newline | `The first line of the patch must be '*** Begin Patch'` (also `The last line of the patch must be '*** End Patch'`) | Nudge says "begin exactly with" but not that leading whitespace/newline counts | +| 3 | `for i in 1..20; sleep 1` inside one `exec_command` | (no error; the turn just blocks) | No sentence about `session_id` + `write_stdin` with empty `chars` | +| 4 | `import x from "..."` inside the isolate | `Unsupported import in exec: ...` | Cursor normalize matches lowercase `unsupported import in exec` only; shared nudge silent | + +After 1 and 2 the model stopped using `apply_patch` entirely. That is the same pattern +`devlog/_fin/260813_260813-nudge-apply-patch-forbid/` recorded: once the tool feels forbidden or +broken, routed models fall back to `python3`/`cat < --exit-status` on the PR head SHA | + +Single PR (one reviewable diff, ~150 source lines + tests); no stack (DEV-STACK-OPT-IN-01). + +## Accept criteria (goalplan c1–c4) + +- c1: pre-call guidance present in all three code-mode injection sites, absent for flat/OpenAI catalogs. +- c2: exec results carrying any of the four host markers are annotated on routed Responses, Kiro, Cursor; non-matching output byte-identical; already-annotated text not doubled. +- c3: PR open against `dev` with the template body; exact-head hosted CI success; receipt bound. +- c4: each A gate has an independent `gpt-6-astra` audit; `structure/04` and docs-site guide updated. + +## Verifiers (PLAN-VERIFIER-REAL-01) + +Local execution is forbidden for this unit, so every row below is NOT RUN locally and observed on +hosted CI. "Reads the target" is proven by import paths in the named test files: + +- `bun test tests/adapters/tool-catalog-nudge.test.ts` — imports `../../src/adapters/tool-catalog-nudge` and `exec-tool-result-normalize` (file lines 2-7). Reads wp1 target. +- `bun test tests/providers/cursor/cursor-tool-definitions.test.ts` — imports `tool-guidance` (line 762-ish `buildCursorToolGuidanceSystemNote`). Reads wp1 Cursor target. +- `bun test tests/responses/openai-responses-passthrough.test.ts` — imports `responses-code-mode` (line 5). Reads wp1+wp2 native target. +- `bun test tests/providers/kiro/kiro-adapter.test.ts` — imports `exec-tool-result-normalize` (line 16) and exercises `createKiroAdapter`. Reads wp1+wp2 Kiro target. +- `bun test tests/providers/cursor/cursor-toolresult-normalize.test.ts` — imports `tool-result-normalize`. Reads wp2 Cursor target. +- `bun test tests/adapters/exec-tool-result-normalize.test.ts` (NEW in wp2) — imports the shared module directly. +- `bun test tests/test-layout-tooling.test.ts` — reads `scripts/test-layout/layout.json` and `tests/fixtures/test-layout-expected.json`; fails if the new file is unregistered. +- `bun run typecheck`, `bun run privacy:scan` — CI `gates` job. + +## Enforcement bypass (PLAN-BYPASS-NAMED-01) + +This unit adds guidance, not enforcement. Tier: none (prose the model may ignore). Executing +surface: request translation in the adapters. Known bypass: the model disregards the sentence; +the host still rejects the call exactly as today. Residual risk: none beyond status quo; the +post-hoc annotation cannot make a failed call succeed. Wording: this is an "early warning", not +enforcement. Final layer: Codex host validation (unchanged). + +## SoT sync targets (SOT-SYNC-01) + +- `structure/04_transports-and-sidecars.md` paragraph at ~line 325 ("Native routed Responses code-mode turns also receive…") — extend with the host contract. +- `docs-site/src/content/docs/guides/codex-integration.md` "Routed local tools" section (~line 315) — one paragraph; translated locales are not edited (they must not contradict, and adding text to English only is additive). + diff --git a/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md b/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md new file mode 100644 index 0000000000..9b41dd1653 --- /dev/null +++ b/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md @@ -0,0 +1,139 @@ +# 010 — wp1: pre-call host contract sentence and its three injection sites + +Depends on 000_plan.md. Class C2 (conventional slice across an existing shared module and its +three known consumers; no new abstraction, no new seam). Loop archetype satisfy-spec. + +## MODIFY `src/adapters/exec-tool-result-normalize.ts` + +Append after `CODE_MODE_RESULT_ECHO_SENTENCE` (line ~117): + +```ts +/** + * The host rules a routed model most often breaks on its first code-mode edit or wait, stated + * BEFORE the call. Wording tracks the Codex host (0.153.2): `apply_patch` rejects a non-string + * argument with "expects a string input" and a body whose first line is not the marker with + * "The first line of the patch must be '*** Begin Patch'"; the isolate rejects ES imports with + * "Unsupported import in exec"; a long command yields a session_id for write_stdin polling. + * Live 2026-09-07: xai/grok-4.6 hit the first two, abandoned apply_patch for heredoc writes, + * blocked a turn in a shell sleep loop, and died once on an import. None of that is a model + * defect the proxy can repair (see devlog/_plan/260905_apply_patch_envelope_gap/010 MODE B); + * it is a contract the proxy had not stated. + */ +export const CODE_MODE_HOST_CONTRACT_SENTENCE = + "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; the string's first line must be exactly `*** Begin Patch` and its last line `*** End Patch` with no leading newline, indentation, or extra asterisks, so start the literal at the marker. The isolate has no `import`, `require`, or module loader — use only the `tools`, `text`, `notify`, `store`/`load`, and `ALL_TOOLS` globals. For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it with `tools.write_stdin({session_id, chars: \"\"})` on later calls instead of blocking a shell in a sleep loop."; +``` + +## MODIFY `src/adapters/tool-catalog-nudge.ts` + +Line 7 import: `import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "./exec-tool-result-normalize";` + +Line 124 code-mode branch. BEFORE (tail of the string): + +``` +... + CODE_MODE_RESULT_ECHO_SENTENCE + " Nested `tools.apply_patch(input)` is host-executed: ... rejected by Codex before the file is touched." +``` + +AFTER: + +``` +... + CODE_MODE_RESULT_ECHO_SENTENCE + " Nested `tools.apply_patch(input)` is host-executed: ... rejected by Codex before the file is touched. " + CODE_MODE_HOST_CONTRACT_SENTENCE +``` + +The flat-catalog branch (`If a listed tool exposes nested helpers…`) is unchanged: a shell bridge +echoes stdout and has no isolate, so the sentence would be false there. + +## MODIFY `src/adapters/cursor/tool-guidance.ts` + +Line 2 import: add `CODE_MODE_HOST_CONTRACT_SENTENCE`. + +Line 190 (`codeMode ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no \`require\`, …"`). BEFORE: + +```ts +codeMode + ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers." + : undefined, +``` + +AFTER: + +```ts +codeMode + ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers. " + CODE_MODE_HOST_CONTRACT_SENTENCE + : undefined, +``` + +## MODIFY `src/adapters/responses-code-mode.ts` + +Line 3 import: add `CODE_MODE_HOST_CONTRACT_SENTENCE`. + +Instructions (line ~46). BEFORE: + +```ts +instructions: instructions.includes(CODE_MODE_RESULT_ECHO_SENTENCE) + ? instructions : [instructions, CODE_MODE_RESULT_ECHO_SENTENCE].filter(Boolean).join("\n\n"), +``` + +AFTER (idempotent per sentence, so a replayed body that already carries the echo sentence but +not the contract gains only the missing one): + +```ts +instructions: appendMissing(instructions, [CODE_MODE_RESULT_ECHO_SENTENCE, CODE_MODE_HOST_CONTRACT_SENTENCE]), +``` + +with a module-local helper: + +```ts +function appendMissing(instructions: string, sentences: readonly string[]): string { + return sentences.reduce( + (acc, sentence) => acc.includes(sentence) ? acc : [acc, sentence].filter(Boolean).join("\n\n"), + instructions, + ); +} +``` + +The exec `input` parameter description (line 27) keeps only the echo sentence: it is a schema +string, and Kiro-style description limiters bound injected instructions, not parameter text, but +the contract is long and belongs in `instructions` where the existing test already asserts. + +Activation scenario: any routed native Responses request whose visible catalog has a bare freeform +`exec` and no bare shell bridge, to a non-OpenAI destination, not a compaction request — the +exact gate at `responses-code-mode.ts:35-37`. Observable effect: `wire.instructions` ends with the +contract sentence. + +## TESTS (updated in place; no new file in wp1) + +`tests/adapters/tool-catalog-nudge.test.ts` +- In `"defines nested helper names as non-callable unless separately listed"` add: + `expect(note).toContain(CODE_MODE_HOST_CONTRACT_SENTENCE);` and + `expect(note).toContain("write_stdin({session_id, chars: \"\"})");`. +- In `"keeps the generic nested-helper parent-tool rule when exec is not listed"` add + `expect(note).not.toContain("Host contract for the nested helpers");`. +- Import the new constant on line 7. + +`tests/providers/cursor/cursor-tool-definitions.test.ts` +- In `"teaches the nested-helper contract instead of a top-level shell bridge"` (line ~754) add + `expect(note).toContain("takes exactly one string");` and + `expect(note).toContain("write_stdin");`. +- In `"keeps flat-catalog shell-bridge guidance when a bare bridge is advertised"` add + `expect(note).not.toContain("Host contract for the nested helpers");`. + +`tests/responses/openai-responses-passthrough.test.ts` +- `"first native request carries the echo rule…"` line 54 BEFORE: + `expect(wire.instructions).toBe(\`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}\`);` + AFTER: + `expect(wire.instructions).toBe(\`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}\n\n${CODE_MODE_HOST_CONTRACT_SENTENCE}\`);` +- `"does not duplicate instructions…"` already asserts idempotence; add a case where the body's + instructions already contain the echo sentence and assert exactly one contract sentence is appended. +- `"official OpenAI and non-code-mode catalogs remain untouched"`: add + `expect(JSON.stringify(wire)).not.toContain("Host contract for the nested helpers")` inside the native loop. + +`tests/providers/kiro/kiro-adapter.test.ts` +- In `"names ALL_TOOLS when a freeform exec is advertised…"` (line ~1817) add + `expect(content).toContain("Host contract for the nested helpers");` — proves the sentence + survives Kiro's `boundedInjectedInstruction` (16 384 chars) on the real wire prompt. + +## Verification (C, hosted only) + +NOT RUN locally by instruction. Hosted CI shards run the four files above; `gates` runs typecheck +and privacy scan. Evidence: `gh run list --branch codex/code-mode-host-contract` + `gh run view --exit-status`. + diff --git a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md new file mode 100644 index 0000000000..105a592c2d --- /dev/null +++ b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md @@ -0,0 +1,208 @@ +# 020 — wp2: post-hoc annotation of host failures on exec results + +Depends on 010 (the pre-call sentence names the same rules this half explains after the fact; the +two must share wording, which is why both live in one module). Class C2. + +## MODIFY `src/adapters/exec-tool-result-normalize.ts` + +Append after `CODE_MODE_HOST_CONTRACT_SENTENCE`: + +```ts +/** + * Post-hoc half of the host contract: the four host strings a routed model reads inside a + * non-error exec result, each paired with the rule it broke. Markers are compared + * case-insensitively because the host writes "Unsupported import in exec: " while + * earlier Cursor guidance matched the lowercase form; one table, one owner, so the + * recovery text can never drift from the pre-call sentence above. + */ +export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; guidance: string }> = [ + { + marker: "expects a string input", + guidance: "tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.", + }, + { + marker: "the first line of the patch must be", + guidance: "The patch string must begin at `*** Begin Patch` with no leading newline, indentation, or extra asterisks; start the literal on the marker line.", + }, + { + marker: "the last line of the patch must be", + guidance: "The patch string must end with `*** End Patch` as its final line, with no trailing text or extra asterisks.", + }, + { + marker: "unsupported import in exec", + guidance: "Imports are not available in this exec context; use the injected globals (tools, text, notify, store, load, ALL_TOOLS) instead.", + }, +]; + +const HOST_FAILURE_RECOVERY_PREFIX = "[recovery: "; + +/** + * Append a one-line recovery hint when an exec-bridge result carries a known host failure string. + * Returns undefined when the result is not an exec-bridge tool, no marker matches, or a recovery + * line is already present, so callers keep their own fallback and never double-annotate. + */ +export function annotateCodeModeHostFailure( + text: string, + options: { toolName?: string; toolNamespace?: string } = {}, +): string | undefined { + if (!isCodexExecBridgeTool(options.toolName, options.toolNamespace)) return undefined; + if (text.includes(HOST_FAILURE_RECOVERY_PREFIX)) return undefined; + const lower = text.toLowerCase(); + const hit = CODE_MODE_HOST_FAILURE_GUIDANCE.find(({ marker }) => lower.includes(marker)); + return hit ? `${text}\n${HOST_FAILURE_RECOVERY_PREFIX}${hit.guidance}]` : undefined; +} +``` + +The Cursor guidance string for the import row is kept byte-identical to today's +(`"Imports are not available in this exec context; use the injected globals instead."` extended with +the global list) so `cursor-toolresult-normalize.test.ts:101` (`"injected globals"`) still matches. + +## MODIFY `src/adapters/responses-code-mode.ts` + +Line 55 BEFORE: + +```ts +const normalized = text === undefined ? undefined : normalizeEmptyExecToolResultText(text, { toolName: "exec" }); +``` + +AFTER: + +```ts +const normalized = text === undefined + ? undefined + : normalizeEmptyExecToolResultText(text, { toolName: "exec" }) + ?? annotateCodeModeHostFailure(text, { toolName: "exec" }); +``` + +Import `annotateCodeModeHostFailure` on line 3. Empty-wrapper first: an empty result can never +carry a marker, so the order is only for clarity. Activation: paired `custom_tool_call_output` +whose text contains e.g. `\`apply_patch\` expects a string input`; observable effect: output ends +with `[recovery: tools.apply_patch takes exactly one string argument…]`, and `input[0]` (the +program) is the same object reference as before. + +## MODIFY `src/adapters/kiro.ts` + +Line 47 import: add `annotateCodeModeHostFailure`. + +Lines 758-762 BEFORE: + +```ts +const normalizedExecText = normalizeEmptyExecToolResultText(text, { + toolName: tr.toolName, + toolNamespace: tr.toolNamespace, +}); +const resultText = normalizedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); +``` + +AFTER: + +```ts +const execOptions = { toolName: tr.toolName, toolNamespace: tr.toolNamespace }; +const normalizedExecText = normalizeEmptyExecToolResultText(text, execOptions) + ?? annotateCodeModeHostFailure(text, execOptions); +const resultText = normalizedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); +``` + +`rawGroupText` (line 774) already keeps `text` whenever `normalizedExecText !== EMPTY_EXEC_OUTPUT_MESSAGE`, +so the adjacent-result grouping path carries the RAW failure text; the annotated text is what the +single-result path emits. Line 774 is changed so a grouped result carries the annotated text too: + +BEFORE: `? text : undefined;` AFTER: `? (normalizedExecText ?? text) : undefined;` + +(For the empty-wrapper case `normalizedExecText === EMPTY_EXEC_OUTPUT_MESSAGE` short-circuits the +outer condition first, so that branch is unchanged.) + +## MODIFY `src/adapters/cursor/tool-result-normalize.ts` + +Import `CODE_MODE_HOST_FAILURE_GUIDANCE` from `../exec-tool-result-normalize`. + +`RUNTIME_FAILURE_GUIDANCE` (lines 50-67): DELETE the `unsupported import in exec` entry and spread +the shared table instead: + +```ts +const RUNTIME_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; guidance: string }> = [ + { marker: "SkyComputerUseError", guidance: "…" }, + { marker: "sky is not defined", guidance: "…" }, + { marker: "has already been declared", guidance: "…" }, + ...CODE_MODE_HOST_FAILURE_GUIDANCE, +]; +``` + +Loop at line 109 BEFORE: `if (text.includes(marker))` AFTER: compare against `text.toLowerCase()` +for the shared rows only — simplest correct form is to lowercase both sides for every row, since the +three Cursor markers contain no case-sensitive collisions (`SkyComputerUseError` lowercased still +matches only itself). Cursor policy (`isError: true` on a match) is unchanged; the shared helper is +not used here because Cursor owns its `isError` decision. + +## NEW `tests/adapters/exec-tool-result-normalize.test.ts` + +```ts +import { describe, expect, test } from "bun:test"; +import { + CODE_MODE_HOST_CONTRACT_SENTENCE, + CODE_MODE_HOST_FAILURE_GUIDANCE, + annotateCodeModeHostFailure, +} from "../../src/adapters/exec-tool-result-normalize"; + +describe("code-mode host failure annotation", () => { + test.each(CODE_MODE_HOST_FAILURE_GUIDANCE.map(row => [row.marker, row.guidance]))( + "annotates an exec result carrying %p", (marker, guidance) => { + const text = `Script failed\nOutput:\nError: ${marker.toUpperCase()}`; + const out = annotateCodeModeHostFailure(text, { toolName: "exec" }); + expect(out).toBe(`${text}\n[recovery: ${guidance}]`); + }); + + test("matches the host's real capitalisation for imports", () => { + const out = annotateCodeModeHostFailure("Unsupported import in exec: node:fs", { toolName: "exec" }); + expect(out).toContain("injected globals"); + }); + + test("leaves non-exec tools, non-matching text and already-annotated text alone", () => { + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "read_file" })).toBeUndefined(); + expect(annotateCodeModeHostFailure("all good", { toolName: "exec" })).toBeUndefined(); + const once = annotateCodeModeHostFailure("expects a string input", { toolName: "exec" })!; + expect(annotateCodeModeHostFailure(once, { toolName: "exec" })).toBeUndefined(); + }); + + test("every failure row is a rule the pre-call sentence already states", () => { + // One owner, two halves: a model must never be told one thing before the call and another after. + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("exactly one string"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("*** Begin Patch"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("*** End Patch"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("no `import`"); + }); +}); +``` + +Register: `scripts/test-layout/layout.json` → `explicit`: `"exec-tool-result-normalize.test.ts": "adapters"` +(alphabetical, after `"exec-…"` neighbours or before `"identity-…"`); same key in +`tests/fixtures/test-layout-expected.json`. `tests/test-layout-tooling.test.ts` names a missing one. + +## Updated tests + +`tests/responses/openai-responses-passthrough.test.ts` — add to the code-mode describe: + +```ts +test("annotates a paired exec result that carries a host failure string", () => { + const failure = "Script failed\nWall time 0.1 seconds\nOutput:\nError: `apply_patch` expects a string input"; + const body = raw(failure); + const wire = JSON.parse(createResponsesPassthroughAdapter(routed).buildRequest(parseRequest(body)).body); + expect(wire.input[1].output).toBe(`${failure}\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]`); + expect(JSON.parse(wire.input[0].arguments).input).toBe(body.input[0].input); +}); +``` + +`tests/providers/kiro/kiro-adapter.test.ts` — beside the `EMPTY_EXEC_OUTPUT_MESSAGE` case at +line ~336, add one toolResult with `toolName: "exec"` and content +`"The first line of the patch must be '*** Begin Patch'"`; assert the emitted Kiro tool-result +text ends with `[recovery: The patch string must begin at …]`. + +`tests/providers/cursor/cursor-toolresult-normalize.test.ts` — line 101 row stays; add +`["Unsupported import in exec: node:fs", "injected globals"]` and +`["\`apply_patch\` expects a string input", "exactly one string"]` to the `test.each` table. + +## Verification (C, hosted only) + +NOT RUN locally. Hosted shards run the new and updated files; `tests/test-layout-tooling.test.ts` +proves registration. Activation for each conditional row is the marker-specific test above. + diff --git a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md new file mode 100644 index 0000000000..8b7a848c69 --- /dev/null +++ b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md @@ -0,0 +1,74 @@ +# 030 — wp3: SoT sync, push, PR, exact-head CI receipt + +Depends on 020. Class C2 for the docs; the push/PR step is external state and is authorized by +the user for this branch only ("no verify로 푸시", "pr올려봐"). Merge is not authorized. + +## MODIFY `structure/04_transports-and-sidecars.md` + +After the paragraph ending "…or reconstruct output that the code-mode host never emitted." (~line 331) +add one paragraph: + +``` +Routed code-mode turns also carry the host contract for the nested helpers, stated in the same three +injection sites as the result-emission rule (shared catalog nudge, Cursor code-mode guidance, native +routed Responses instructions): `tools.apply_patch` takes one string whose first and last lines are +the bare patch markers, the isolate has no `import`/`require`, and a command that outlives +`yield_time_ms` is polled through `write_stdin` with empty `chars` rather than a shell sleep loop. +When a paired exec result still carries one of the host's failure strings ("expects a string +input", "The first line of the patch must be", "The last line of the patch must be", "Unsupported +import in exec"), the routed Responses, Kiro, and Cursor result paths append a one-line recovery +hint naming the broken rule. Both halves live in `src/adapters/exec-tool-result-normalize.ts` so +the pre-call and post-hoc wording cannot drift. Nothing rewrites the model's JavaScript or its +patch payload; the host still rejects the call exactly as before. +``` + +Add a Decision Log entry in the file's existing format (목적과 의도 / 기존 구현 및 제약 조건 / +검토한 주요 대안 / 선택한 방식 / 장점, 단점 및 영향) recording: purpose = stop routed models +abandoning apply_patch after two host rejections; alternatives = repair the argument shape in the +proxy (rejected: MODE B ambiguity, fail-open write), Cursor-only fix (rejected: incident was native +Responses); chosen = shared pair in one module; impact = longer system prompt on code-mode turns +(~600 chars), no behaviour change for OpenAI destinations or flat catalogs. + +## MODIFY `docs-site/src/content/docs/guides/codex-integration.md` + +In "Routed local tools" after the apply_patch conversion paragraph (~line 331) add: + +``` +Routed code-mode turns are also told the host's rules for the nested helpers before the first +call — `tools.apply_patch` takes one string starting at `*** Begin Patch`, the isolate has no +`import`, and long-running commands are polled with `write_stdin` — and when a result still +carries one of the host's failure messages, opencodex appends a one-line hint naming the rule. +The model's code and patch text are never rewritten. +``` + +Translated locales (7 files) are not edited; the English source gains a paragraph they do not +contradict. + +## Delivery steps (t3b) + +1. `git add -A devlog/_plan/260907_code_mode_host_contract src tests scripts structure docs-site` + — inspect `git diff --cached --stat` before every commit; only this unit's paths. +2. Commits already made per work-phase with `--no-verify` (wp0 docs, wp1, wp2, wp3 docs). +3. `git push --no-verify -u origin codex/code-mode-host-contract`. +4. `gh pr create --base dev --title "fix(code-mode): state the host contract for nested helpers and annotate host failures" --body-file .tmp/pr-body.md` + — body follows `.github/PULL_REQUEST_TEMPLATE.md` (Summary / Verification / Checklist), lists + local checks as NOT RUN, names hosted CI as the verifier. No `gui` mention (no screenshot rule). +5. Poll: `gh run list --branch codex/code-mode-host-contract --json databaseId,headSha,status,conclusion` + via `exec_command` short calls (each < 30 s); `gh run watch` is NOT used inside one call. +6. Receipt: at phase C, `cxc receipt test --session --cwd -- gh run view --exit-status` + where `` is the Cross-platform CI run whose `headSha` equals `git rev-parse HEAD`. + If the head moves (review fix), a fresh run and fresh receipt are required. + +## Verification (C) + +- `gh run view --exit-status` exit 0 on the exact head; `gh pr view --json headRefOid` equals HEAD. +- `gh pr checks ` lists test 1/4..4/4, gates, storage policy, api usage as pass. +- Local suite / typecheck / build: NOT RUN (instruction). + +## D record + +Append `040_delivery_record.md` with PR number, head SHA, CI run id, per-job results, what did not +improve (LOOP-PESSIMIST-01: prose cannot force compliance; effect on real Grok defect rate is +unmeasured until a live re-probe), and the residual: Anthropic/Google/OpenAI-chat/command-code +tool-result paths do not annotate host failures because they have no exec-result seam today. + From 041aec04af744c2243be3e67b4e30a64aafa598e Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 14:36:06 +0900 Subject: [PATCH 099/221] docs(devlog): fold audit round 1 into the code-mode host contract roadmap --- .../000_plan.md | 218 +++++++------ .../010_pre_call_contract.md | 206 +++++++----- .../020_post_hoc_annotation.md | 300 ++++++++++++------ .../030_docs_and_delivery.md | 74 +++-- 4 files changed, 481 insertions(+), 317 deletions(-) diff --git a/devlog/_plan/260907_code_mode_host_contract/000_plan.md b/devlog/_plan/260907_code_mode_host_contract/000_plan.md index 6f85ef9c4d..406c2c186d 100644 --- a/devlog/_plan/260907_code_mode_host_contract/000_plan.md +++ b/devlog/_plan/260907_code_mode_host_contract/000_plan.md @@ -1,141 +1,159 @@ # 000 — Code-mode host contract for routed models: plan +Revision 2 after audit round 1 (gpt-6-astra explorer, VERDICT: FAIL, 8 blockers). Synthesis and +dispositions are in the "Audit round 1" section at the end; the body below is the amended plan. + ## Loop-spec - Loop archetype: satisfy-spec repair (verifier-defined). No optimization loop. - Trigger: xai/grok-4.6 retrospective (2026-09-07) on a routed native-Responses Codex session. The - model hit four Codex host contracts that OpenCodex neither states before the first call nor - explains after the failure, then abandoned the right tools for shell heredocs and sleep loops. -- Goal: a routed non-OpenAI model in Codex code mode learns the host's exact argument shape and - waiting protocol up front, and when it still trips, the tool result names the rule it broke. -- Non-goals: rewriting model JavaScript; repairing payloads (`apply-patch-envelope.ts`, - `code-mode-helper-compat.ts`, `bridge.ts`, `parser.ts` untouched); changing OpenAI/ChatGPT - destinations or compaction requests; Lab; GUI; release/version bumps. No local test suite, - typecheck, build, or install in this worktree (user instruction). Merge/release out of scope. -- Verifier: hosted `.github/workflows/ci.yml` on the exact PR head (test shards 1-4 + gates: - typecheck, privacy scan). Local: NOT RUN by instruction. Each conditional path names its - activation test in the decade docs; those tests ride the hosted shards. -- Stop condition: PR open against `dev` with exact-head CI green and receipt bound; then DONE. -- Memory artifact: this unit (`devlog/_plan/260907_code_mode_host_contract/`), the bound - goalplan `.codexclaw/goalplans/code-mode-host-contract-for-routed-models-shared/`, PR body. -- Expected terminal outcomes: DONE (PR open, CI green); NOOP if the contract already exists - (ruled out below); BLOCKED if GitHub/CI infrastructure fails after retries; UNSAFE if a change - would rewrite JavaScript or widen a fail-open write; NEEDS_HUMAN for merge. + model hit Codex host contracts that OpenCodex neither states before the first call nor explains + after the failure, then abandoned the right tools for shell heredocs and sleep loops. +- Goal: a routed non-OpenAI model in Codex code mode learns the host's argument shape and waiting + protocol up front, and when it still trips, the exec result names the rule it broke. +- Non-goals: rewriting model JavaScript; new payload repair (`apply-patch-envelope.ts`, + `code-mode-helper-compat.ts`, `bridge.ts`, `parser.ts` untouched); OpenAI/ChatGPT destinations + or compaction requests; Lab; GUI; version bumps; annotation on Anthropic/Google/OpenAI-chat/ + command-code result paths (they have no exec-result seam today). No local test suite, typecheck, + build, or install in this worktree (user instruction). Merge/release out of scope. +- Verifier: hosted `.github/workflows/ci.yml` on the exact head of each pushed work-phase (PR + `pull_request` trigger; test shards 1-4 + `gates` typecheck/privacy). Local: NOT RUN. +- Stop condition: PR ready-for-review against `dev` with exact-head CI green and receipt bound. +- Memory artifact: this unit, the bound goalplan + `.codexclaw/goalplans/code-mode-host-contract-for-routed-models-shared/`, and the PR body. +- Expected terminal outcomes: DONE (PR open, CI green); NOOP ruled out below; BLOCKED if + GitHub/CI fails after retries; UNSAFE if a change would rewrite JavaScript or widen a fail-open + write; NEEDS_HUMAN for merge. - Escalation: main reclaims a slice after two distinct agents fail its packet; pushing a slice to - a worker requires a P-phase amendment. Every dispatch uses `gpt-6-astra` reasoning `high`. -- HOTL bounds: write scope is this worktree on `codex/code-mode-host-contract`; tools are - git/gh/rg/read + `tools.apply_patch`; no token or wall-clock budget was set by the user. - -## Incident (what actually broke) - -All four strings below were read from the installed Codex 0.153.2 binaries -(`codex` and `codex-code-mode-host`, `strings -n 8`), so the wording here is the host's, not a guess. + a worker requires a P-phase amendment. Every dispatch uses `gpt-6-astra`, reasoning `high`. +- HOTL bounds: write scope is this worktree on `codex/code-mode-host-contract`; push of that branch + and PR creation are authorized by the user; no token or wall-clock budget was set. -| # | Model action | Host response | Where OpenCodex says nothing today | -|---|---|---|---| -| 1 | `tools.apply_patch({ input: "..." })` | `\`apply_patch\` expects a string input` | Nudge says "host-executed" and describes markers, never the argument type | -| 2 | patch built in a template literal opening with a newline | `The first line of the patch must be '*** Begin Patch'` (also `The last line of the patch must be '*** End Patch'`) | Nudge says "begin exactly with" but not that leading whitespace/newline counts | -| 3 | `for i in 1..20; sleep 1` inside one `exec_command` | (no error; the turn just blocks) | No sentence about `session_id` + `write_stdin` with empty `chars` | -| 4 | `import x from "..."` inside the isolate | `Unsupported import in exec: ...` | Cursor normalize matches lowercase `unsupported import in exec` only; shared nudge silent | +## Incident and live host evidence -After 1 and 2 the model stopped using `apply_patch` entirely. That is the same pattern -`devlog/_fin/260813_260813-nudge-apply-patch-forbid/` recorded: once the tool feels forbidden or -broken, routed models fall back to `python3`/`cat <` (host string; capital U) | -`src/adapters/exec-tool-result-normalize.ts` already owns one "pair": a pre-call sentence -(`CODE_MODE_RESULT_ECHO_SENTENCE`) and a post-hoc repair (`EMPTY_EXEC_OUTPUT_MESSAGE`), kept in one -file so the two never drift. The pre-call sentence is injected by three consumers: +So the Grok report's "blank line before the template literal" was not itself the rejection; the +"first line" error fires for a decorated marker, a code fence, prose, or any non-marker first +token. The pre-call sentence and recovery hints below describe exactly that and do not claim the +host rejects surrounding whitespace. -- `src/adapters/tool-catalog-nudge.ts:124` (shared: Anthropic, Google, Kiro, OpenAI-chat, command-code) -- `src/adapters/cursor/tool-guidance.ts:187-190` (Cursor code-mode branch) -- `src/adapters/responses-code-mode.ts:27,47` (native routed Responses instructions + exec input description) +The fourth contract has no error string: a shell `for i in 1..20; sleep 1` inside one +`exec_command` simply blocks the call, while the host's own protocol is to let the call return a +`session_id` and poll with `tools.write_stdin({session_id, chars: ""})`. -and the post-hoc repair runs at: +After the two apply_patch rejections the model stopped using apply_patch entirely — the pattern +`devlog/_fin/260813_260813-nudge-apply-patch-forbid/` recorded: once the tool feels broken, routed +models fall back to `python3`/`cat < --exit-status` on the PR head SHA | +Each implementation phase ends with an authorized `git push --no-verify` and gets exact-head hosted +CI as its C verifier (audit blocker 5). The PR is opened as a draft at wp1 so `pull_request` CI +exists for every later head, and is marked ready in wp3. + +| WP | Doc | Slice | Depends on | C verifier | +|----|-----|-------|------------|-----------| +| wp0 | this file + 010/020/030 | docs-only roadmap | — | audit of the docs | +| wp1 | 010_pre_call_contract.md | shared sentence + three injection sites + tests; push; draft PR | wp0 | exact-head CI on the wp1 head | +| wp2 | 020_post_hoc_annotation.md | shared annotate helper + three result seams + tests; push | wp1 | exact-head CI on the wp2 head | +| wp3 | 030_docs_and_delivery.md | structure + docs-site sync, PR body, ready-for-review, receipt | wp2 | exact-head CI on the final head | -Single PR (one reviewable diff, ~150 source lines + tests); no stack (DEV-STACK-OPT-IN-01). +Single PR; no stack (DEV-STACK-OPT-IN-01). ## Accept criteria (goalplan c1–c4) - c1: pre-call guidance present in all three code-mode injection sites, absent for flat/OpenAI catalogs. -- c2: exec results carrying any of the four host markers are annotated on routed Responses, Kiro, Cursor; non-matching output byte-identical; already-annotated text not doubled. -- c3: PR open against `dev` with the template body; exact-head hosted CI success; receipt bound. +- c2: exec results carrying any of the four host markers are annotated on routed Responses, Kiro (single and grouped), Cursor (text only, `isError` unchanged); non-matching output byte-identical; already-annotated text not doubled on replay. +- c3: PR ready against `dev` with the template body; exact-head hosted CI success; receipt bound. - c4: each A gate has an independent `gpt-6-astra` audit; `structure/04` and docs-site guide updated. ## Verifiers (PLAN-VERIFIER-REAL-01) -Local execution is forbidden for this unit, so every row below is NOT RUN locally and observed on -hosted CI. "Reads the target" is proven by import paths in the named test files: +Local execution is forbidden for this unit, so every row is NOT RUN locally and observed on hosted +CI. "Reads the target" is proven by import chains: -- `bun test tests/adapters/tool-catalog-nudge.test.ts` — imports `../../src/adapters/tool-catalog-nudge` and `exec-tool-result-normalize` (file lines 2-7). Reads wp1 target. -- `bun test tests/providers/cursor/cursor-tool-definitions.test.ts` — imports `tool-guidance` (line 762-ish `buildCursorToolGuidanceSystemNote`). Reads wp1 Cursor target. -- `bun test tests/responses/openai-responses-passthrough.test.ts` — imports `responses-code-mode` (line 5). Reads wp1+wp2 native target. -- `bun test tests/providers/kiro/kiro-adapter.test.ts` — imports `exec-tool-result-normalize` (line 16) and exercises `createKiroAdapter`. Reads wp1+wp2 Kiro target. -- `bun test tests/providers/cursor/cursor-toolresult-normalize.test.ts` — imports `tool-result-normalize`. Reads wp2 Cursor target. -- `bun test tests/adapters/exec-tool-result-normalize.test.ts` (NEW in wp2) — imports the shared module directly. -- `bun test tests/test-layout-tooling.test.ts` — reads `scripts/test-layout/layout.json` and `tests/fixtures/test-layout-expected.json`; fails if the new file is unregistered. +- `tests/adapters/tool-catalog-nudge.test.ts` imports `../../src/adapters/tool-catalog-nudge` (line 2) and `exec-tool-result-normalize` (line 7). wp1 target. +- `tests/providers/cursor/cursor-tool-definitions.test.ts` imports `buildCursorToolGuidanceSystemNote` through `../../../src/adapters/cursor/tool-definitions` (lines 6-22), which re-exports `tool-guidance`. wp1 Cursor target. +- `tests/responses/openai-responses-passthrough.test.ts` imports `responses-code-mode` (line 5). wp1+wp2 native target. +- `tests/providers/kiro/kiro-adapter.test.ts` imports `exec-tool-result-normalize` (line 16) and drives `createKiroAdapter`. wp1+wp2 Kiro target. +- `tests/providers/cursor/cursor-toolresult-normalize.test.ts` imports `tool-result-normalize` (line 5). wp2 Cursor target. +- `tests/adapters/exec-tool-result-normalize.test.ts` (NEW, wp2) imports the shared module. +- `tests/test-layout-tooling.test.ts` reads `scripts/test-layout/layout.json` and `tests/fixtures/test-layout-expected.json`. - `bun run typecheck`, `bun run privacy:scan` — CI `gates` job. ## Enforcement bypass (PLAN-BYPASS-NAMED-01) -This unit adds guidance, not enforcement. Tier: none (prose the model may ignore). Executing -surface: request translation in the adapters. Known bypass: the model disregards the sentence; -the host still rejects the call exactly as today. Residual risk: none beyond status quo; the -post-hoc annotation cannot make a failed call succeed. Wording: this is an "early warning", not -enforcement. Final layer: Codex host validation (unchanged). +Guidance, not enforcement. Tier: none. Executing surface: adapter request translation. Known +bypass: the model ignores the sentence; the host rejects exactly as today. Residual risk: status +quo. Wording: "early warning". Final layer: Codex host validation (unchanged). ## SoT sync targets (SOT-SYNC-01) -- `structure/04_transports-and-sidecars.md` paragraph at ~line 325 ("Native routed Responses code-mode turns also receive…") — extend with the host contract. -- `docs-site/src/content/docs/guides/codex-integration.md` "Routed local tools" section (~line 315) — one paragraph; translated locales are not edited (they must not contradict, and adding text to English only is additive). +- `structure/04_transports-and-sidecars.md` paragraph at ~line 325 ("Native routed Responses code-mode turns also receive…") plus a Decision Log entry (full text in 030). +- `docs-site/src/content/docs/guides/codex-integration.md` "Routed local tools" (~line 331); translated locales untouched. + +## Audit round 1 — synthesis (REVIEW-SYNTHESIS-01) + +| # | Sev | Disposition | +|---|---|---| +| 1 Kiro grouping clobbers raw text | High | Folded: only the host annotation substitutes; grouped activation test added (020). | +| 2 Cursor false positives / case collisions | High | Folded: Cursor table untouched; exec-gated branch via shared helper; benign-content and case controls added (020). | +| 3 Cursor idempotence | Med | Folded: shared `[recovery: ` guard reached from Cursor; replay test with `isError:false` (020). | +| 4 Global whitelist false | Med | Folded: non-exhaustive list deferring to the exec description (010). | +| 5 No CI before wp3 | Med | Folded: push + draft PR at wp1, push at wp2, ready at wp3 (this file, 030). | +| 6 Elided strings | Med | Folded: full hunks and full Decision Log text (010/020/030). | +| 7 Anchor drift | Low | Folded: anchors refreshed against ec799db26; test import chain corrected. | +| 8 Docs overstate | Med | Folded: "this change" scope wording; three result paths named (030). | + +Root cause across 1-3: the roadmap treated "reuse the seam" as "spread into the seam" without +re-reading each seam's own policy. Round 2 re-audits with the same reviewer. diff --git a/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md b/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md index 9b41dd1653..e728a0aa1f 100644 --- a/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md +++ b/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md @@ -1,88 +1,90 @@ # 010 — wp1: pre-call host contract sentence and its three injection sites -Depends on 000_plan.md. Class C2 (conventional slice across an existing shared module and its -three known consumers; no new abstraction, no new seam). Loop archetype satisfy-spec. +Depends on 000_plan.md (rev 2). Class C2. Anchors verified against ec799db26. Ends with an +authorized push and a draft PR so exact-head CI exists for this and later heads. ## MODIFY `src/adapters/exec-tool-result-normalize.ts` -Append after `CODE_MODE_RESULT_ECHO_SENTENCE` (line ~117): +Insert after the `CODE_MODE_RESULT_ECHO_SENTENCE` declaration (its closing `;` is at line 117): ```ts + /** - * The host rules a routed model most often breaks on its first code-mode edit or wait, stated - * BEFORE the call. Wording tracks the Codex host (0.153.2): `apply_patch` rejects a non-string - * argument with "expects a string input" and a body whose first line is not the marker with - * "The first line of the patch must be '*** Begin Patch'"; the isolate rejects ES imports with - * "Unsupported import in exec"; a long command yields a session_id for write_stdin polling. - * Live 2026-09-07: xai/grok-4.6 hit the first two, abandoned apply_patch for heredoc writes, - * blocked a turn in a shell sleep loop, and died once on an import. None of that is a model - * defect the proxy can repair (see devlog/_plan/260905_apply_patch_envelope_gap/010 MODE B); - * it is a contract the proxy had not stated. + * Host rules a routed model most often breaks on its first code-mode edit or wait, stated BEFORE + * the call. Wording tracks the Codex host (0.153.2), probed live on 2026-09-07: a non-string + * argument to `apply_patch` throws "expects a string input"; a body whose first line is not the + * bare marker (decorated `*** Begin Patch ***`, a code fence, prose) throws "The first line of the + * patch must be '*** Begin Patch'" — surrounding newlines are tolerated; ES imports throw + * "Unsupported import in exec"; a command that outlives `yield_time_ms` returns `session_id` for + * `write_stdin` polling. xai/grok-4.6 hit the first two, abandoned apply_patch for heredoc writes, + * blocked a turn in a shell sleep loop, and died once on an import. None of that is repairable in + * the proxy (devlog/_plan/260905_apply_patch_envelope_gap/010 MODE B); it is a contract the proxy + * had not stated. */ export const CODE_MODE_HOST_CONTRACT_SENTENCE = - "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; the string's first line must be exactly `*** Begin Patch` and its last line `*** End Patch` with no leading newline, indentation, or extra asterisks, so start the literal at the marker. The isolate has no `import`, `require`, or module loader — use only the `tools`, `text`, `notify`, `store`/`load`, and `ALL_TOOLS` globals. For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it with `tools.write_stdin({session_id, chars: \"\"})` on later calls instead of blocking a shell in a sleep loop."; + "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; that string's first line must be the bare marker `*** Begin Patch` and its last line `*** End Patch`, with no code fence, prose, or extra asterisks around either marker. The isolate has no `import`, `require`, or module loader; use the globals the exec tool description lists (for example `tools`, `text`, `notify`, `store`/`load`, `ALL_TOOLS`). For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it on later calls with `tools.write_stdin({session_id, chars: \"\"})` instead of blocking a shell in a sleep loop."; ``` ## MODIFY `src/adapters/tool-catalog-nudge.ts` -Line 7 import: `import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "./exec-tool-result-normalize";` - -Line 124 code-mode branch. BEFORE (tail of the string): - -``` -... + CODE_MODE_RESULT_ECHO_SENTENCE + " Nested `tools.apply_patch(input)` is host-executed: ... rejected by Codex before the file is touched." +Line 8 BEFORE: +```ts +import { CODE_MODE_RESULT_ECHO_SENTENCE } from "./exec-tool-result-normalize"; ``` - AFTER: +```ts +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "./exec-tool-result-normalize"; +``` +Line 124 is one 1035-byte string ending in `rejected by Codex before the file is touched."`. +BEFORE (tail): +```ts +OpenCodex does not rewrite JavaScript inside exec, so extra asterisks on a marker line are rejected by Codex before the file is touched." ``` -... + CODE_MODE_RESULT_ECHO_SENTENCE + " Nested `tools.apply_patch(input)` is host-executed: ... rejected by Codex before the file is touched. " + CODE_MODE_HOST_CONTRACT_SENTENCE +AFTER (tail): +```ts +OpenCodex does not rewrite JavaScript inside exec, so extra asterisks on a marker line are rejected by Codex before the file is touched. " + CODE_MODE_HOST_CONTRACT_SENTENCE ``` - -The flat-catalog branch (`If a listed tool exposes nested helpers…`) is unchanged: a shell bridge -echoes stdout and has no isolate, so the sentence would be false there. +The flat-catalog branch (`"If a listed tool exposes nested helpers such as a tools.* API…"`) is unchanged. ## MODIFY `src/adapters/cursor/tool-guidance.ts` -Line 2 import: add `CODE_MODE_HOST_CONTRACT_SENTENCE`. - -Line 190 (`codeMode ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no \`require\`, …"`). BEFORE: - +Line 2 BEFORE: ```ts -codeMode - ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers." - : undefined, +import { CODE_MODE_RESULT_ECHO_SENTENCE } from "../exec-tool-result-normalize"; ``` - AFTER: +```ts +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "../exec-tool-result-normalize"; +``` +Lines 189-191 BEFORE (4-space indent as in source): +```ts + codeMode + ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers." + : undefined, +``` +AFTER: ```ts -codeMode - ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers. " + CODE_MODE_HOST_CONTRACT_SENTENCE - : undefined, + codeMode + ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers. " + CODE_MODE_HOST_CONTRACT_SENTENCE + : undefined, ``` ## MODIFY `src/adapters/responses-code-mode.ts` -Line 3 import: add `CODE_MODE_HOST_CONTRACT_SENTENCE`. - -Instructions (line ~46). BEFORE: - +Line 3 BEFORE: ```ts -instructions: instructions.includes(CODE_MODE_RESULT_ECHO_SENTENCE) - ? instructions : [instructions, CODE_MODE_RESULT_ECHO_SENTENCE].filter(Boolean).join("\n\n"), +import { CODE_MODE_RESULT_ECHO_SENTENCE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; ``` - -AFTER (idempotent per sentence, so a replayed body that already carries the echo sentence but -not the contract gains only the missing one): - +AFTER: ```ts -instructions: appendMissing(instructions, [CODE_MODE_RESULT_ECHO_SENTENCE, CODE_MODE_HOST_CONTRACT_SENTENCE]), +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; ``` -with a module-local helper: - +Insert before `/** Native routed Responses needs the same first-call/output contract… */` (line 33): ```ts +/** Append each sentence a replayed instructions string does not already carry, in order. */ function appendMissing(instructions: string, sentences: readonly string[]): string { return sentences.reduce( (acc, sentence) => acc.includes(sentence) ? acc : [acc, sentence].filter(Boolean).join("\n\n"), @@ -91,49 +93,95 @@ function appendMissing(instructions: string, sentences: readonly string[]): stri } ``` -The exec `input` parameter description (line 27) keeps only the echo sentence: it is a schema -string, and Kiro-style description limiters bound injected instructions, not parameter text, but -the contract is long and belongs in `instructions` where the existing test already asserts. +Lines 46-47 BEFORE (4-space indent): +```ts + instructions: instructions.includes(CODE_MODE_RESULT_ECHO_SENTENCE) + ? instructions : [instructions, CODE_MODE_RESULT_ECHO_SENTENCE].filter(Boolean).join("\n\n"), +``` +AFTER: +```ts + instructions: appendMissing(instructions, [CODE_MODE_RESULT_ECHO_SENTENCE, CODE_MODE_HOST_CONTRACT_SENTENCE]), +``` + +The exec `input` parameter description (line 27) keeps only the echo sentence; the contract belongs in +`instructions`, which the existing test asserts byte-exactly. -Activation scenario: any routed native Responses request whose visible catalog has a bare freeform -`exec` and no bare shell bridge, to a non-OpenAI destination, not a compaction request — the -exact gate at `responses-code-mode.ts:35-37`. Observable effect: `wire.instructions` ends with the -contract sentence. +Activation: routed native Responses request whose visible catalog has a bare freeform `exec` and no +bare shell bridge, non-OpenAI destination, not a compaction request (gate at lines 35-37). +Observable: `wire.instructions` ends with the contract sentence. -## TESTS (updated in place; no new file in wp1) +## TESTS (in place; no new file in wp1) `tests/adapters/tool-catalog-nudge.test.ts` -- In `"defines nested helper names as non-callable unless separately listed"` add: - `expect(note).toContain(CODE_MODE_HOST_CONTRACT_SENTENCE);` and - `expect(note).toContain("write_stdin({session_id, chars: \"\"})");`. -- In `"keeps the generic nested-helper parent-tool rule when exec is not listed"` add - `expect(note).not.toContain("Host contract for the nested helpers");`. -- Import the new constant on line 7. +- Line 7 import becomes `import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, EMPTY_EXEC_OUTPUT_MESSAGE } from "../../src/adapters/exec-tool-result-normalize";` +- In `"defines nested helper names as non-callable unless separately listed"` append: +```ts + // The host contract rides the same code-mode branch as the echo rule (Grok 2026-09-07). + expect(note).toContain(CODE_MODE_HOST_CONTRACT_SENTENCE); + expect(note).toContain("takes exactly one string"); + expect(note).toContain("write_stdin({session_id, chars: \"\"})"); +``` +- In `"keeps the generic nested-helper parent-tool rule when exec is not listed"` append: +```ts + expect(note).not.toContain("Host contract for the nested helpers"); +``` `tests/providers/cursor/cursor-tool-definitions.test.ts` -- In `"teaches the nested-helper contract instead of a top-level shell bridge"` (line ~754) add - `expect(note).toContain("takes exactly one string");` and - `expect(note).toContain("write_stdin");`. -- In `"keeps flat-catalog shell-bridge guidance when a bare bridge is advertised"` add - `expect(note).not.toContain("Host contract for the nested helpers");`. +- In `"teaches the nested-helper contract instead of a top-level shell bridge"` (starts line 754) append + after the `"OpenCodex does not rewrite JavaScript inside exec"` assertion: +```ts + expect(note).toContain("Host contract for the nested helpers"); + expect(note).toContain("takes exactly one string"); + expect(note).toContain("write_stdin"); +``` +- In `"keeps flat-catalog shell-bridge guidance when a bare bridge is advertised"` append: +```ts + expect(note).not.toContain("Host contract for the nested helpers"); +``` `tests/responses/openai-responses-passthrough.test.ts` -- `"first native request carries the echo rule…"` line 54 BEFORE: - `expect(wire.instructions).toBe(\`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}\`);` +- Line 6 import adds `CODE_MODE_HOST_CONTRACT_SENTENCE`. +- Line 54 BEFORE: +```ts + expect(wire.instructions).toBe(`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}`); +``` AFTER: - `expect(wire.instructions).toBe(\`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}\n\n${CODE_MODE_HOST_CONTRACT_SENTENCE}\`);` -- `"does not duplicate instructions…"` already asserts idempotence; add a case where the body's - instructions already contain the echo sentence and assert exactly one contract sentence is appended. -- `"official OpenAI and non-code-mode catalogs remain untouched"`: add - `expect(JSON.stringify(wire)).not.toContain("Host contract for the nested helpers")` inside the native loop. +```ts + expect(wire.instructions).toBe(`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}\n\n${CODE_MODE_HOST_CONTRACT_SENTENCE}`); +``` +- New test after `"does not duplicate instructions or explain an unpaired or unrelated result"`: +```ts + test("a replayed body that already carries the echo rule gains only the missing contract sentence", () => { + const body = { ...raw(), instructions: `Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}` }; + const parsed = parseRequest(body); + const first = normalizeResponsesCodeMode(body, parsed, routed) as typeof body; + expect(first.instructions).toBe(`${body.instructions}\n\n${CODE_MODE_HOST_CONTRACT_SENTENCE}`); + expect(first.instructions.split(CODE_MODE_RESULT_ECHO_SENTENCE).length).toBe(2); + const second = normalizeResponsesCodeMode(first, parsed, routed) as typeof body; + expect(second.instructions).toBe(first.instructions); + }); +``` +- In `"official OpenAI and non-code-mode catalogs remain untouched"`, inside the `for (const native…)` loop + append `expect(JSON.stringify(wire)).not.toContain("Host contract for the nested helpers");`. `tests/providers/kiro/kiro-adapter.test.ts` -- In `"names ALL_TOOLS when a freeform exec is advertised…"` (line ~1817) add - `expect(content).toContain("Host contract for the nested helpers");` — proves the sentence - survives Kiro's `boundedInjectedInstruction` (16 384 chars) on the real wire prompt. +- In `"names ALL_TOOLS when a freeform exec is advertised without a bare shell bridge"` (line 1817) append: +```ts + // Survives Kiro's 16 384-char injected-instruction bound on the real wire prompt. + expect(content).toContain("Host contract for the nested helpers"); +``` + +## Delivery for this phase + +`git add` only the files above; `git diff --cached --stat` first; commit `--no-verify`; then +`git push --no-verify -u origin codex/code-mode-host-contract` and +`gh pr create --draft --base dev --title "fix(code-mode): state the host contract for nested helpers and annotate host failures" --body-file .tmp/pr-body.md` +(body per template; Verification section says local checks NOT RUN, hosted CI is the verifier; +wp2/wp3 will extend it). ## Verification (C, hosted only) -NOT RUN locally by instruction. Hosted CI shards run the four files above; `gates` runs typecheck -and privacy scan. Evidence: `gh run list --branch codex/code-mode-host-contract` + `gh run view --exit-status`. +NOT RUN locally by instruction. Poll `gh run list --branch codex/code-mode-host-contract --json databaseId,headSha,status,conclusion,name` +in short `exec_command` calls; when the Cross-platform CI run for `git rev-parse HEAD` completes, +`cxc receipt test --session --cwd -- gh run view --exit-status`. diff --git a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md index 105a592c2d..b428121f5d 100644 --- a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md +++ b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md @@ -1,19 +1,19 @@ # 020 — wp2: post-hoc annotation of host failures on exec results -Depends on 010 (the pre-call sentence names the same rules this half explains after the fact; the -two must share wording, which is why both live in one module). Class C2. +Depends on 010 (same module, same wording). Class C2. Anchors verified against ec799db26 plus +the wp1 delta. Ends with an authorized push; the draft PR from wp1 picks up the new head. ## MODIFY `src/adapters/exec-tool-result-normalize.ts` -Append after `CODE_MODE_HOST_CONTRACT_SENTENCE`: +Insert after `CODE_MODE_HOST_CONTRACT_SENTENCE` (added in wp1): ```ts + /** * Post-hoc half of the host contract: the four host strings a routed model reads inside a - * non-error exec result, each paired with the rule it broke. Markers are compared - * case-insensitively because the host writes "Unsupported import in exec: " while - * earlier Cursor guidance matched the lowercase form; one table, one owner, so the - * recovery text can never drift from the pre-call sentence above. + * non-error exec result, each paired with the rule it broke. Matched case-insensitively because + * the host writes "Unsupported import in exec: " while Cursor's earlier marker was + * lowercase; one table, one owner, so this text and the pre-call sentence cannot drift. */ export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; guidance: string }> = [ { @@ -22,11 +22,11 @@ export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; gu }, { marker: "the first line of the patch must be", - guidance: "The patch string must begin at `*** Begin Patch` with no leading newline, indentation, or extra asterisks; start the literal on the marker line.", + guidance: "The patch string's first line must be the bare marker `*** Begin Patch` with no code fence, prose, or extra asterisks around it.", }, { marker: "the last line of the patch must be", - guidance: "The patch string must end with `*** End Patch` as its final line, with no trailing text or extra asterisks.", + guidance: "The patch string's last line must be the bare marker `*** End Patch` with no trailing text or extra asterisks.", }, { marker: "unsupported import in exec", @@ -38,8 +38,9 @@ const HOST_FAILURE_RECOVERY_PREFIX = "[recovery: "; /** * Append a one-line recovery hint when an exec-bridge result carries a known host failure string. - * Returns undefined when the result is not an exec-bridge tool, no marker matches, or a recovery - * line is already present, so callers keep their own fallback and never double-annotate. + * Returns undefined when the tool is not an exec bridge, no marker matches, or a recovery line is + * already present (a replayed annotated result must not grow a second one). Never touches error + * status: the host already decided whether the call failed. */ export function annotateCodeModeHostFailure( text: string, @@ -53,86 +54,114 @@ export function annotateCodeModeHostFailure( } ``` -The Cursor guidance string for the import row is kept byte-identical to today's -(`"Imports are not available in this exec context; use the injected globals instead."` extended with -the global list) so `cursor-toolresult-normalize.test.ts:101` (`"injected globals"`) still matches. - ## MODIFY `src/adapters/responses-code-mode.ts` -Line 55 BEFORE: +Line 3 import gains `annotateCodeModeHostFailure`. +Line 55 BEFORE (6-space indent): ```ts -const normalized = text === undefined ? undefined : normalizeEmptyExecToolResultText(text, { toolName: "exec" }); + const normalized = text === undefined ? undefined : normalizeEmptyExecToolResultText(text, { toolName: "exec" }); ``` - AFTER: - ```ts -const normalized = text === undefined - ? undefined - : normalizeEmptyExecToolResultText(text, { toolName: "exec" }) - ?? annotateCodeModeHostFailure(text, { toolName: "exec" }); + const normalized = text === undefined + ? undefined + : normalizeEmptyExecToolResultText(text, { toolName: "exec" }) + ?? annotateCodeModeHostFailure(text, { toolName: "exec" }); ``` - -Import `annotateCodeModeHostFailure` on line 3. Empty-wrapper first: an empty result can never -carry a marker, so the order is only for clarity. Activation: paired `custom_tool_call_output` -whose text contains e.g. `\`apply_patch\` expects a string input`; observable effect: output ends -with `[recovery: tools.apply_patch takes exactly one string argument…]`, and `input[0]` (the -program) is the same object reference as before. +Activation: paired `custom_tool_call_output` whose text contains `\`apply_patch\` expects a string input`; +observable: output ends with the recovery line, `input[0]` is the same object reference. ## MODIFY `src/adapters/kiro.ts` -Line 47 import: add `annotateCodeModeHostFailure`. - -Lines 758-762 BEFORE: - +Line 47 BEFORE: ```ts -const normalizedExecText = normalizeEmptyExecToolResultText(text, { - toolName: tr.toolName, - toolNamespace: tr.toolNamespace, -}); -const resultText = normalizedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); +import { EMPTY_EXEC_OUTPUT_MESSAGE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; ``` - AFTER: - ```ts -const execOptions = { toolName: tr.toolName, toolNamespace: tr.toolNamespace }; -const normalizedExecText = normalizeEmptyExecToolResultText(text, execOptions) - ?? annotateCodeModeHostFailure(text, execOptions); -const resultText = normalizedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); +import { EMPTY_EXEC_OUTPUT_MESSAGE, annotateCodeModeHostFailure, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; ``` -`rawGroupText` (line 774) already keeps `text` whenever `normalizedExecText !== EMPTY_EXEC_OUTPUT_MESSAGE`, -so the adjacent-result grouping path carries the RAW failure text; the annotated text is what the -single-result path emits. Line 774 is changed so a grouped result carries the annotated text too: - -BEFORE: `? text : undefined;` AFTER: `? (normalizedExecText ?? text) : undefined;` - -(For the empty-wrapper case `normalizedExecText === EMPTY_EXEC_OUTPUT_MESSAGE` short-circuits the -outer condition first, so that branch is unchanged.) +Lines 758-771 BEFORE (6-space indent): +```ts + const normalizedExecText = normalizeEmptyExecToolResultText(text, { + toolName: tr.toolName, + toolNamespace: tr.toolNamespace, + }); + const resultText = normalizedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); + const images = extractKiroImages(tr.content); + const toolUseId = normalizeToolId(tr.toolCallId); + const call = priorCalls.get(toolUseId); + if (!call || call.rawId !== tr.toolCallId) { + throw new Error(`Kiro history contains an orphaned tool result for call ${JSON.stringify(tr.toolCallId)}`); + } + // Keep real whitespace and failed wrappers, but no empty-success wrapper boilerplate. + const rawGroupText = text.length > 0 && (!text.trim() || normalizedExecText !== EMPTY_EXEC_OUTPUT_MESSAGE) + ? text : undefined; +``` +AFTER: +```ts + const execOptions = { toolName: tr.toolName, toolNamespace: tr.toolNamespace }; + const normalizedExecText = normalizeEmptyExecToolResultText(text, execOptions); + // A host failure string inside a non-empty exec result gets the rule it broke appended. This + // is the only substitution the grouping path below also carries: whitespace and empty/failed + // wrappers keep their existing raw policy. + const annotatedExecText = normalizedExecText === undefined ? annotateCodeModeHostFailure(text, execOptions) : undefined; + const resultText = normalizedExecText ?? annotatedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); + const images = extractKiroImages(tr.content); + const toolUseId = normalizeToolId(tr.toolCallId); + const call = priorCalls.get(toolUseId); + if (!call || call.rawId !== tr.toolCallId) { + throw new Error(`Kiro history contains an orphaned tool result for call ${JSON.stringify(tr.toolCallId)}`); + } + // Keep real whitespace and failed wrappers, but no empty-success wrapper boilerplate. + const rawGroupText = text.length > 0 && (!text.trim() || normalizedExecText !== EMPTY_EXEC_OUTPUT_MESSAGE) + ? (annotatedExecText ?? text) : undefined; +``` +`annotatedExecText` is defined only when `normalizedExecText` is undefined, i.e. the text is neither an +empty-success nor a failed-empty wrapper, so every existing grouping expectation +(`kiro-adapter.test.ts:1209` whitespace, `1252` raw failed wrapper) is unchanged by construction. ## MODIFY `src/adapters/cursor/tool-result-normalize.ts` -Import `CODE_MODE_HOST_FAILURE_GUIDANCE` from `../exec-tool-result-normalize`. - -`RUNTIME_FAILURE_GUIDANCE` (lines 50-67): DELETE the `unsupported import in exec` entry and spread -the shared table instead: +Imports (lines 12-18) gain `annotateCodeModeHostFailure`. `RUNTIME_FAILURE_GUIDANCE` (lines 50-67) and its +loop (lines 107-113) stay byte-identical: Cursor's marker semantics, case sensitivity and +`isError:true` policy are its own. +Lines 96-105 BEFORE (2-space indent): ```ts -const RUNTIME_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; guidance: string }> = [ - { marker: "SkyComputerUseError", guidance: "…" }, - { marker: "sky is not defined", guidance: "…" }, - { marker: "has already been declared", guidance: "…" }, - ...CODE_MODE_HOST_FAILURE_GUIDANCE, -]; + if (isCodexExecBridgeTool(options.toolName, options.toolNamespace) && isEmptyOrFailedExecWrapper(text.trim())) { + return { + // A `Script failed` wrapper is empty but NOT a success: reporting it as an empty success + // would erase the only failure signal. Text classification stays separate from Cursor's + // isError policy, which the Computer Use branch above owns. + text: isFailedEmptyExecWrapper(text.trim()) ? FAILED_EXEC_OUTPUT_MESSAGE : EMPTY_EXEC_OUTPUT_MESSAGE, + isError: false, + changed: true, + }; + } ``` - -Loop at line 109 BEFORE: `if (text.includes(marker))` AFTER: compare against `text.toLowerCase()` -for the shared rows only — simplest correct form is to lowercase both sides for every row, since the -three Cursor markers contain no case-sensitive collisions (`SkyComputerUseError` lowercased still -matches only itself). Cursor policy (`isError: true` on a match) is unchanged; the shared helper is -not used here because Cursor owns its `isError` decision. +AFTER (append one branch directly after that block): +```ts + if (isCodexExecBridgeTool(options.toolName, options.toolNamespace) && isEmptyOrFailedExecWrapper(text.trim())) { + return { + // A `Script failed` wrapper is empty but NOT a success: reporting it as an empty success + // would erase the only failure signal. Text classification stays separate from Cursor's + // isError policy, which the Computer Use branch above owns. + text: isFailedEmptyExecWrapper(text.trim()) ? FAILED_EXEC_OUTPUT_MESSAGE : EMPTY_EXEC_OUTPUT_MESSAGE, + isError: false, + changed: true, + }; + } + // A host failure string inside an exec-bridge result gets the rule it broke appended. The + // helper is exec-gated and refuses already-annotated text, so a replayed result does not grow + // a second line; Cursor's isError decision is left exactly as the caller passed it. + const hostFailure = annotateCodeModeHostFailure(text, options); + if (hostFailure !== undefined) return { text: hostFailure, isError, changed: true }; +``` +The existing `unsupported import in exec` row in `RUNTIME_FAILURE_GUIDANCE` still serves node_repl / +Computer Use tools; for exec-bridge tools the new branch runs first and carries the shared hint. ## NEW `tests/adapters/exec-tool-result-normalize.test.ts` @@ -144,65 +173,128 @@ import { annotateCodeModeHostFailure, } from "../../src/adapters/exec-tool-result-normalize"; +// Live host strings (Codex 0.153.2, probed 2026-09-07) and the rule each one names. The pre-call +// sentence and these rows are one contract in one module; a model must never be told one thing +// before the call and another after. describe("code-mode host failure annotation", () => { - test.each(CODE_MODE_HOST_FAILURE_GUIDANCE.map(row => [row.marker, row.guidance]))( - "annotates an exec result carrying %p", (marker, guidance) => { - const text = `Script failed\nOutput:\nError: ${marker.toUpperCase()}`; - const out = annotateCodeModeHostFailure(text, { toolName: "exec" }); - expect(out).toBe(`${text}\n[recovery: ${guidance}]`); - }); - - test("matches the host's real capitalisation for imports", () => { - const out = annotateCodeModeHostFailure("Unsupported import in exec: node:fs", { toolName: "exec" }); - expect(out).toContain("injected globals"); + test.each(CODE_MODE_HOST_FAILURE_GUIDANCE.map(row => [row.marker, row.guidance] as const))( + "annotates an exec result carrying %p regardless of case", + (marker, guidance) => { + const text = `Script failed\nWall time 0.1 seconds\nOutput:\nError: ${marker.toUpperCase()}`; + expect(annotateCodeModeHostFailure(text, { toolName: "exec" })).toBe(`${text}\n[recovery: ${guidance}]`); + }, + ); + + test("matches the host's real capitalisation and argument text", () => { + expect(annotateCodeModeHostFailure("Unsupported import in exec: node:fs", { toolName: "exec" })).toContain("injected globals"); + expect(annotateCodeModeHostFailure("Script error:\ntool `apply_patch` expects a string input", { toolName: "exec" })).toContain("exactly one string"); + expect(annotateCodeModeHostFailure( + "apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'", + { toolName: "exec_command" }, + )).toContain("bare marker `*** Begin Patch`"); }); - test("leaves non-exec tools, non-matching text and already-annotated text alone", () => { + test("leaves non-exec tools, non-matching text and already-annotated text byte-identical", () => { expect(annotateCodeModeHostFailure("expects a string input", { toolName: "read_file" })).toBeUndefined(); + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec_command", toolNamespace: "mcp__docker" })).toBeUndefined(); expect(annotateCodeModeHostFailure("all good", { toolName: "exec" })).toBeUndefined(); - const once = annotateCodeModeHostFailure("expects a string input", { toolName: "exec" })!; + const once = annotateCodeModeHostFailure("expects a string input", { toolName: "exec" }); + if (!once) throw new Error("expected one annotation"); expect(annotateCodeModeHostFailure(once, { toolName: "exec" })).toBeUndefined(); }); test("every failure row is a rule the pre-call sentence already states", () => { - // One owner, two halves: a model must never be told one thing before the call and another after. - expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("exactly one string"); - expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("*** Begin Patch"); - expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("*** End Patch"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("takes exactly one string"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("`*** Begin Patch`"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("`*** End Patch`"); expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("no `import`"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("write_stdin"); + // Never shows the decorated marker as a copyable literal (same rule as the nudge tests). + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).not.toContain("*** Begin Patch ***"); }); }); ``` -Register: `scripts/test-layout/layout.json` → `explicit`: `"exec-tool-result-normalize.test.ts": "adapters"` -(alphabetical, after `"exec-…"` neighbours or before `"identity-…"`); same key in -`tests/fixtures/test-layout-expected.json`. `tests/test-layout-tooling.test.ts` names a missing one. +Register in `scripts/test-layout/layout.json` `explicit` between +`"empty-tool-output-annotation.test.ts": "adapters",` (line 620) and its successor: +`"exec-tool-result-normalize.test.ts": "adapters",`; same key/value in +`tests/fixtures/test-layout-expected.json` in alphabetical position. The name matches no regex seed +(`"adapters"` seed is `^(?:bridge\.test\.ts|buffered|identity|run|tool|translator)-`), so the explicit +entry is required and `tests/test-layout-tooling.test.ts` names it if missing. ## Updated tests -`tests/responses/openai-responses-passthrough.test.ts` — add to the code-mode describe: +`tests/responses/openai-responses-passthrough.test.ts` — add inside the code-mode describe: +```ts + test("annotates a paired exec result that carries a host failure string without touching the program", () => { + const failure = "Script failed\nWall time 0.1 seconds\nOutput:\nScript error:\ntool `apply_patch` expects a string input"; + const body = raw(failure); + const wire = JSON.parse(createResponsesPassthroughAdapter(routed).buildRequest(parseRequest(body)).body); + expect(wire.input[1].output).toBe(`${failure}\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]`); + expect(JSON.parse(wire.input[0].arguments).input).toBe(body.input[0].input); + // Replayed history already carrying the hint is not annotated twice. + const replayed = raw(wire.input[1].output); + expect(normalizeResponsesCodeMode(replayed, parseRequest(replayed), routed)).toBe(replayed); + }); +``` +`tests/providers/kiro/kiro-adapter.test.ts` +- After `"an empty code-mode exec result carries the actionable reason…"` (line 323) add: ```ts -test("annotates a paired exec result that carries a host failure string", () => { - const failure = "Script failed\nWall time 0.1 seconds\nOutput:\nError: `apply_patch` expects a string input"; - const body = raw(failure); - const wire = JSON.parse(createResponsesPassthroughAdapter(routed).buildRequest(parseRequest(body)).body); - expect(wire.input[1].output).toBe(`${failure}\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]`); - expect(JSON.parse(wire.input[0].arguments).input).toBe(body.input[0].input); -}); + test("a code-mode exec result carrying a host failure string names the broken rule", async () => { + const execTool = { name: "exec", description: "Run JavaScript", parameters: { type: "object" } }; + const failure = "apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'"; + const messages = [ + { role: "user", content: "run it" }, + { role: "assistant", content: [{ type: "toolCall", id: "call-x", name: "exec", arguments: {} }] }, + { role: "toolResult", toolCallId: "call-x", toolName: "exec", content: failure, isError: false }, + ]; + const { body } = await createKiroAdapter(provider).buildRequest(parsedWith(messages, [execTool])); + const resultText = JSON.parse(body).conversationState.currentMessage.userInputMessage + .userInputMessageContext.toolResults[0].content[0].text; + expect(resultText).toBe(`${failure}\n[recovery: The patch string's first line must be the bare marker \`*** Begin Patch\` with no code fence, prose, or extra asterisks around it.]`); + }); +``` +- In the grouped-result table (the `execResult` cases around lines 1195-1262) add one case: +```ts + { + name: "host failure chunk in a multi group carries its recovery line beside raw siblings", + id: "call-host-failure-multi", + results: [execResult("call-host-failure-multi", " "), execResult("call-host-failure-multi", "tool `apply_patch` expects a string input"), execResult("call-host-failure-multi", failedExecWrapper)], + content: [{ text: " " }, { text: "tool `apply_patch` expects a string input\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]" }, { text: failedExecWrapper }], + status: "success", + forbidden: [EMPTY_EXEC_OUTPUT_MESSAGE, FAILED_EXEC_OUTPUT_MESSAGE, KIRO_EMPTY_TOOL_RESULT_MESSAGE], + }, +``` + This drives the grouping path with whitespace, an annotated chunk and a raw failed wrapper in one + group — the exact combination blocker 1 said the single-result test could not exercise. + +`tests/providers/cursor/cursor-toolresult-normalize.test.ts` — add after the `test.each` runtime-failure table: +```ts + test("an exec-bridge result carrying a host failure string gains the shared hint and keeps its isError", () => { + const out = normalizeCursorToolResultText("Unsupported import in exec: node:fs", { toolName: "exec" }); + expect(out.changed).toBe(true); + expect(out.isError).toBe(false); + expect(out.text).toContain("[recovery: Imports are not available in this exec context"); + // Replay of the annotated text with isError=false must not grow a second line. + expect(normalizeCursorToolResultText(out.text, { toolName: "exec" }).changed).toBe(false); + }); + + test("a non-exec tool whose successful output merely mentions a host phrase stays byte-identical", () => { + const doc = "The docs say apply_patch expects a string input."; + const out = normalizeCursorToolResultText(doc, { toolName: "read_file" }); + expect(out.changed).toBe(false); + expect(out.isError).toBe(false); + expect(out.text).toBe(doc); + }); ``` -`tests/providers/kiro/kiro-adapter.test.ts` — beside the `EMPTY_EXEC_OUTPUT_MESSAGE` case at -line ~336, add one toolResult with `toolName: "exec"` and content -`"The first line of the patch must be '*** Begin Patch'"`; assert the emitted Kiro tool-result -text ends with `[recovery: The patch string must begin at …]`. +## Delivery for this phase -`tests/providers/cursor/cursor-toolresult-normalize.test.ts` — line 101 row stays; add -`["Unsupported import in exec: node:fs", "injected globals"]` and -`["\`apply_patch\` expects a string input", "exactly one string"]` to the `test.each` table. +Stage only the files above (`git diff --cached --stat` first); commit `--no-verify`; push `--no-verify`. ## Verification (C, hosted only) -NOT RUN locally. Hosted shards run the new and updated files; `tests/test-layout-tooling.test.ts` -proves registration. Activation for each conditional row is the marker-specific test above. +NOT RUN locally. Exact-head Cross-platform CI on the wp2 head; receipt via +`cxc receipt test --session --cwd -- gh run view --exit-status`. diff --git a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md index 8b7a848c69..e0c0df7990 100644 --- a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md +++ b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md @@ -1,12 +1,13 @@ -# 030 — wp3: SoT sync, push, PR, exact-head CI receipt +# 030 — wp3: SoT sync, ready-for-review, exact-head CI receipt -Depends on 020. Class C2 for the docs; the push/PR step is external state and is authorized by -the user for this branch only ("no verify로 푸시", "pr올려봐"). Merge is not authorized. +Depends on 020. Class C2 for the docs. Push and PR creation are authorized by the user for this +branch ("no verify로 푸시", "pr올려봐"); the draft PR already exists from wp1. Merge is not authorized. ## MODIFY `structure/04_transports-and-sidecars.md` -After the paragraph ending "…or reconstruct output that the code-mode host never emitted." (~line 331) -add one paragraph: +Insert after the paragraph that ends "…or reconstruct output that the code-mode host never +emitted." (line 331), before the `[Decision Log]` that begins "목적과 의도: Keep Codex hosted web +search usable on xAI's public Responses endpoint…": ``` Routed code-mode turns also carry the host contract for the nested helpers, stated in the same three @@ -14,31 +15,37 @@ injection sites as the result-emission rule (shared catalog nudge, Cursor code-m routed Responses instructions): `tools.apply_patch` takes one string whose first and last lines are the bare patch markers, the isolate has no `import`/`require`, and a command that outlives `yield_time_ms` is polled through `write_stdin` with empty `chars` rather than a shell sleep loop. -When a paired exec result still carries one of the host's failure strings ("expects a string +When an exec-bridge result still carries one of the host's failure strings ("expects a string input", "The first line of the patch must be", "The last line of the patch must be", "Unsupported -import in exec"), the routed Responses, Kiro, and Cursor result paths append a one-line recovery -hint naming the broken rule. Both halves live in `src/adapters/exec-tool-result-normalize.ts` so -the pre-call and post-hoc wording cannot drift. Nothing rewrites the model's JavaScript or its -patch payload; the host still rejects the call exactly as before. +import in exec"), the native routed Responses, Kiro, and Cursor result paths append a one-line +recovery hint naming the broken rule; Cursor's error classification and Kiro's whitespace and +failed-wrapper grouping are unchanged. Both halves live in `src/adapters/exec-tool-result-normalize.ts` +so the pre-call and post-hoc wording cannot drift. This guidance and annotation change rewrites +neither the model's JavaScript nor its patch payload; the existing name-alias delimiter +normalization in `src/responses/code-mode-helper-compat.ts` is unchanged, and the host still rejects a +malformed call exactly as before. Anthropic, Google, OpenAI-chat and command-code result paths +have no exec-result seam today and are not annotated. + +[Decision Log] +- 목적과 의도: Stop routed models from abandoning `apply_patch` after the Codex host rejects an object argument or a decorated marker, and from blocking a turn in a shell sleep loop when the host offers `session_id` polling. +- 기존 구현 및 제약 조건: The shared nudge, Cursor guidance and native Responses instructions already carry the result-emission rule from `exec-tool-result-normalize.ts`, but none stated the helper's argument type, the marker rule, the import ban, or the polling protocol; `260905_apply_patch_envelope_gap` refused to rewrite JavaScript bodies (MODE B), so payload repair is off the table. +- 검토한 주요 대안: Repair the argument shape inside the proxy (rejected: same body ambiguity as MODE B and it turns a rejected write into a performed one); Cursor-only guidance (rejected: the incident was native routed Responses on xAI); annotate every adapter's tool results (rejected: Anthropic/Google/OpenAI-chat/command-code have no exec-result seam and would need a new one). +- 선택한 방식: One pre-call sentence and one marker→recovery table in the module that already owns the echo pair; inject the sentence at the three existing code-mode sites; annotate at the three existing exec-result seams with an exec-gated, idempotent helper that never changes error status. +- 다른 대안 대신 이 방식을 선택한 이유: The safe repair for a host contract the model broke is to state it before the call and name it after the failure; keeping both halves in one file is what keeps them consistent. +- 장점, 단점 및 영향: Code-mode system prompts grow by roughly 600 characters on routed turns; OpenAI destinations, flat catalogs and compaction requests are untouched. An exec result that legitimately prints one of the four phrases gains a recovery line, which is additive text and never an error flip. The effect on the live Grok defect rate is unmeasured until a re-probe. ``` -Add a Decision Log entry in the file's existing format (목적과 의도 / 기존 구현 및 제약 조건 / -검토한 주요 대안 / 선택한 방식 / 장점, 단점 및 영향) recording: purpose = stop routed models -abandoning apply_patch after two host rejections; alternatives = repair the argument shape in the -proxy (rejected: MODE B ambiguity, fail-open write), Cursor-only fix (rejected: incident was native -Responses); chosen = shared pair in one module; impact = longer system prompt on code-mode turns -(~600 chars), no behaviour change for OpenAI destinations or flat catalogs. - ## MODIFY `docs-site/src/content/docs/guides/codex-integration.md` -In "Routed local tools" after the apply_patch conversion paragraph (~line 331) add: +Insert after the paragraph ending "…and unrelated native custom payloads stay unchanged." (line 331): ``` Routed code-mode turns are also told the host's rules for the nested helpers before the first -call — `tools.apply_patch` takes one string starting at `*** Begin Patch`, the isolate has no -`import`, and long-running commands are polled with `write_stdin` — and when a result still -carries one of the host's failure messages, opencodex appends a one-line hint naming the rule. -The model's code and patch text are never rewritten. +call: `tools.apply_patch` takes one string whose first and last lines are the bare patch markers, +the isolate has no `import`, and long-running commands are polled through `write_stdin`. When an +exec result on the native routed Responses, Kiro, or Cursor path still carries one of the host's +failure messages, opencodex appends a one-line hint naming the rule. This change does not rewrite +the model's code or its patch text. ``` Translated locales (7 files) are not edited; the English source gains a paragraph they do not @@ -46,18 +53,17 @@ contradict. ## Delivery steps (t3b) -1. `git add -A devlog/_plan/260907_code_mode_host_contract src tests scripts structure docs-site` - — inspect `git diff --cached --stat` before every commit; only this unit's paths. -2. Commits already made per work-phase with `--no-verify` (wp0 docs, wp1, wp2, wp3 docs). -3. `git push --no-verify -u origin codex/code-mode-host-contract`. -4. `gh pr create --base dev --title "fix(code-mode): state the host contract for nested helpers and annotate host failures" --body-file .tmp/pr-body.md` - — body follows `.github/PULL_REQUEST_TEMPLATE.md` (Summary / Verification / Checklist), lists - local checks as NOT RUN, names hosted CI as the verifier. No `gui` mention (no screenshot rule). -5. Poll: `gh run list --branch codex/code-mode-host-contract --json databaseId,headSha,status,conclusion` - via `exec_command` short calls (each < 30 s); `gh run watch` is NOT used inside one call. -6. Receipt: at phase C, `cxc receipt test --session --cwd -- gh run view --exit-status` - where `` is the Cross-platform CI run whose `headSha` equals `git rev-parse HEAD`. - If the head moves (review fix), a fresh run and fresh receipt are required. +1. Stage only `structure/04_transports-and-sidecars.md`, `docs-site/.../codex-integration.md` and this unit's + devlog; inspect `git diff --cached --stat`; commit `--no-verify`; `git push --no-verify`. +2. Rewrite the PR body (`gh pr edit --body-file .tmp/pr-body.md`) to the final template: Summary + (problem, before/after, the four host strings), Verification (hosted CI run ids per head; local + suite/typecheck/build NOT RUN by instruction), Checklist ticked truthfully. No `gui` mention. +3. Poll `gh run list --branch codex/code-mode-host-contract --json databaseId,headSha,status,conclusion,name` + in short `exec_command` calls (each < 30 s) until the Cross-platform CI run whose `headSha` equals + `git rev-parse HEAD` completes; `gh run watch` is not used inside one call. +4. Receipt at phase C: `cxc receipt test --session --cwd -- gh run view --exit-status`. +5. `gh pr ready ` only after that receipt exists. If the head moves later, a fresh run and fresh + receipt are required before any further ready claim. ## Verification (C) From d375916ee2508cbd390c4edb556aeab65ed6ec42 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 14:42:10 +0900 Subject: [PATCH 100/221] docs(devlog): fold audit round 2 into the code-mode host contract roadmap --- .../000_plan.md | 29 ++++- .../010_pre_call_contract.md | 9 +- .../020_post_hoc_annotation.md | 105 ++++++++++++------ .../030_docs_and_delivery.md | 19 ++-- 4 files changed, 111 insertions(+), 51 deletions(-) diff --git a/devlog/_plan/260907_code_mode_host_contract/000_plan.md b/devlog/_plan/260907_code_mode_host_contract/000_plan.md index 406c2c186d..91c130df0a 100644 --- a/devlog/_plan/260907_code_mode_host_contract/000_plan.md +++ b/devlog/_plan/260907_code_mode_host_contract/000_plan.md @@ -77,18 +77,26 @@ New exports in `exec-tool-result-normalize.ts` (full text in 010/020): non-exhaustive), `session_id` + `write_stdin` polling. 2. `CODE_MODE_HOST_FAILURE_GUIDANCE` — marker → recovery rows for the four host strings, matched case-insensitively. -3. `annotateCodeModeHostFailure(text, {toolName, toolNamespace})` — gated by - `isCodexExecBridgeTool`, refuses text already carrying `[recovery: `, appends one recovery - line; else `undefined`. Pure, idempotent, byte-identical on the negative path. +3. `annotateCodeModeHostFailure(text, {toolName, toolNamespace})` — gated by a new, narrower + `isCodexCodeModeExecResult` (bare `exec` or its `opencodex-responses` display alias; flat shell + bridges and foreign MCP namespaces excluded because the four strings originate only in the + isolate), refuses text already carrying the exported `CODE_MODE_HOST_RECOVERY_PREFIX`, appends + one recovery line; else `undefined`. Pure, idempotent, byte-identical on the negative path. + The empty-output repair keeps its wider `isCodexExecBridgeTool` gate. Cursor keeps its own `RUNTIME_FAILURE_GUIDANCE` table and its `isError` policy byte-identical; it gains one exec-gated branch that inserts the shared annotation WITHOUT changing `isError` (audit blockers 2 and 3). Kiro substitutes the annotation only where it would otherwise carry the raw text, leaving whitespace and failed-wrapper grouping untouched (blocker 1). -Accepted residual: an exec result that legitimately prints one of the four phrases (e.g. `cat` of -this devlog) gains a recovery line. The line is additive text on an exec result and never changes -error status, and the gate excludes every non-exec tool. +Accepted residual: a code-mode exec result that legitimately prints one of the four phrases (e.g. +`cat` of this devlog) gains a recovery line. The line is additive text and never changes error +status; the gate excludes every non-code-mode tool, shell bridge, and foreign namespace. + +Marker wording: the live probe shows the host tolerates blank lines and indentation around the +markers and rejects a decorated or missing marker. Every sentence, recovery hint and doc paragraph +says "opens/closes with the bare marker line … blank lines or indentation are tolerated" and never +"the first character must be". Why prose and not repair: `devlog/_plan/260905_apply_patch_envelope_gap/010_disposition.md` refused rewriting JavaScript bodies (MODE B). An object argument inside a program has the same @@ -157,3 +165,12 @@ quo. Wording: "early warning". Final layer: Codex host validation (unchanged). Root cause across 1-3: the roadmap treated "reuse the seam" as "spread into the seam" without re-reading each seam's own policy. Round 2 re-audits with the same reviewer. +## Audit round 2 — synthesis + +| # | Sev | Disposition | +|---|---|---| +| 1 Cursor lowercase replay falls through to legacy loop | High | Folded: the exec-gated branch returns early on an already-annotated result; lowercase and capitalised replay tests assert text/isError/changed (020). | +| 2 Namespace-negative test contradicts the predicate; flat shells annotated | Med | Folded: new `isCodexCodeModeExecResult` gate; shell-bridge, foreign-namespace and Cursor-alias tests; docs say flat catalogs untouched and mean it (020/030). | +| 3 Responses replay `toBe(replayed)` cannot hold | Med | Folded: assert output-item and program identity plus deep-equal idempotence of successive passes (020). | +| 4 Marker wording contradicts whitespace probe | Med | Folded: "bare marker line … blank lines or indentation tolerated" in sentence, hints, structure and docs-site text (010/020/030). | +| 5 Off-by-one anchors | Low | Folded: 116, 32, 45-46, 97-106 (010/020). | diff --git a/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md b/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md index e728a0aa1f..c6d7e6b9aa 100644 --- a/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md +++ b/devlog/_plan/260907_code_mode_host_contract/010_pre_call_contract.md @@ -5,7 +5,7 @@ authorized push and a draft PR so exact-head CI exists for this and later heads. ## MODIFY `src/adapters/exec-tool-result-normalize.ts` -Insert after the `CODE_MODE_RESULT_ECHO_SENTENCE` declaration (its closing `;` is at line 117): +Insert after the `CODE_MODE_RESULT_ECHO_SENTENCE` declaration (its closing `;` is at line 116): ```ts @@ -22,7 +22,7 @@ Insert after the `CODE_MODE_RESULT_ECHO_SENTENCE` declaration (its closing `;` i * had not stated. */ export const CODE_MODE_HOST_CONTRACT_SENTENCE = - "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; that string's first line must be the bare marker `*** Begin Patch` and its last line `*** End Patch`, with no code fence, prose, or extra asterisks around either marker. The isolate has no `import`, `require`, or module loader; use the globals the exec tool description lists (for example `tools`, `text`, `notify`, `store`/`load`, `ALL_TOOLS`). For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it on later calls with `tools.write_stdin({session_id, chars: \"\"})` instead of blocking a shell in a sleep loop."; + "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; the patch text opens with the bare marker line `*** Begin Patch` and closes with the bare marker line `*** End Patch`, written without a code fence, prose, or extra asterisks on those lines (blank lines or indentation around the markers are tolerated; a decorated or missing marker is rejected). The isolate has no `import`, `require`, or module loader; use the globals the exec tool description lists (for example `tools`, `text`, `notify`, `store`/`load`, `ALL_TOOLS`). For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it on later calls with `tools.write_stdin({session_id, chars: \"\"})` instead of blocking a shell in a sleep loop."; ``` ## MODIFY `src/adapters/tool-catalog-nudge.ts` @@ -82,7 +82,7 @@ AFTER: import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; ``` -Insert before `/** Native routed Responses needs the same first-call/output contract… */` (line 33): +Insert before `/** Native routed Responses needs the same first-call/output contract… */` (line 32): ```ts /** Append each sentence a replayed instructions string does not already carry, in order. */ function appendMissing(instructions: string, sentences: readonly string[]): string { @@ -93,7 +93,7 @@ function appendMissing(instructions: string, sentences: readonly string[]): stri } ``` -Lines 46-47 BEFORE (4-space indent): +Lines 45-46 BEFORE (4-space indent): ```ts instructions: instructions.includes(CODE_MODE_RESULT_ECHO_SENTENCE) ? instructions : [instructions, CODE_MODE_RESULT_ECHO_SENTENCE].filter(Boolean).join("\n\n"), @@ -184,4 +184,3 @@ wp2/wp3 will extend it). NOT RUN locally by instruction. Poll `gh run list --branch codex/code-mode-host-contract --json databaseId,headSha,status,conclusion,name` in short `exec_command` calls; when the Cross-platform CI run for `git rev-parse HEAD` completes, `cxc receipt test --session --cwd -- gh run view --exit-status`. - diff --git a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md index b428121f5d..4bfa2df82d 100644 --- a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md +++ b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md @@ -22,11 +22,11 @@ export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; gu }, { marker: "the first line of the patch must be", - guidance: "The patch string's first line must be the bare marker `*** Begin Patch` with no code fence, prose, or extra asterisks around it.", + guidance: "The patch text must open with the bare marker line `*** Begin Patch`: no code fence, prose, or extra asterisks on that line (blank lines or indentation before it are tolerated).", }, { marker: "the last line of the patch must be", - guidance: "The patch string's last line must be the bare marker `*** End Patch` with no trailing text or extra asterisks.", + guidance: "The patch text must close with the bare marker line `*** End Patch`: no trailing text or extra asterisks on that line (blank lines after it are tolerated).", }, { marker: "unsupported import in exec", @@ -34,11 +34,26 @@ export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; gu }, ]; -const HOST_FAILURE_RECOVERY_PREFIX = "[recovery: "; +/** Prefix of every recovery line this module appends; callers use it to recognise replayed annotations. */ +export const CODE_MODE_HOST_RECOVERY_PREFIX = "[recovery: "; /** - * Append a one-line recovery hint when an exec-bridge result carries a known host failure string. - * Returns undefined when the tool is not an exec bridge, no marker matches, or a recovery line is + * The code-mode `exec` tool itself — bare, or under Cursor's `opencodex-responses` display namespace. + * The four host strings above originate only in that isolate, so flat shell bridges + * (`exec_command`, `shell`, …) and every foreign MCP namespace (`mcp__docker__exec`) are excluded: an + * unrelated server's output that happens to contain the phrase must not receive Codex guidance. + * Narrower than `isCodexExecBridgeTool` on purpose; the empty-output repair keeps the wider gate. + */ +export function isCodexCodeModeExecResult(toolName?: string, toolNamespace?: string): boolean { + if (!toolName) return false; + const lower = toolName.toLowerCase(); + if (toolNamespace) return toolNamespace.includes("opencodex-responses") && lower === "exec"; + return lower === "exec" || lower === "mcp__opencodex-responses__exec" || lower === "mcp_opencodex-responses_exec"; +} + +/** + * Append a one-line recovery hint when a code-mode exec result carries a known host failure string. + * Returns undefined when the tool is not the code-mode exec, no marker matches, or a recovery line is * already present (a replayed annotated result must not grow a second one). Never touches error * status: the host already decided whether the call failed. */ @@ -46,14 +61,17 @@ export function annotateCodeModeHostFailure( text: string, options: { toolName?: string; toolNamespace?: string } = {}, ): string | undefined { - if (!isCodexExecBridgeTool(options.toolName, options.toolNamespace)) return undefined; - if (text.includes(HOST_FAILURE_RECOVERY_PREFIX)) return undefined; + if (!isCodexCodeModeExecResult(options.toolName, options.toolNamespace)) return undefined; + if (text.includes(CODE_MODE_HOST_RECOVERY_PREFIX)) return undefined; const lower = text.toLowerCase(); const hit = CODE_MODE_HOST_FAILURE_GUIDANCE.find(({ marker }) => lower.includes(marker)); - return hit ? `${text}\n${HOST_FAILURE_RECOVERY_PREFIX}${hit.guidance}]` : undefined; + return hit ? `${text}\n${CODE_MODE_HOST_RECOVERY_PREFIX}${hit.guidance}]` : undefined; } ``` +Flat shell tools are deliberately not annotated: the strings come from the code-mode host, and the +"flat catalogs untouched" statement in the docs is therefore literally true. + ## MODIFY `src/adapters/responses-code-mode.ts` Line 3 import gains `annotateCodeModeHostFailure`. @@ -125,11 +143,12 @@ empty-success nor a failed-empty wrapper, so every existing grouping expectation ## MODIFY `src/adapters/cursor/tool-result-normalize.ts` -Imports (lines 12-18) gain `annotateCodeModeHostFailure`. `RUNTIME_FAILURE_GUIDANCE` (lines 50-67) and its +Imports (lines 12-18) gain `CODE_MODE_HOST_RECOVERY_PREFIX`, `annotateCodeModeHostFailure` and +`isCodexCodeModeExecResult`. `RUNTIME_FAILURE_GUIDANCE` (lines 50-67) and its loop (lines 107-113) stay byte-identical: Cursor's marker semantics, case sensitivity and `isError:true` policy are its own. -Lines 96-105 BEFORE (2-space indent): +Lines 97-106 BEFORE (2-space indent): ```ts if (isCodexExecBridgeTool(options.toolName, options.toolNamespace) && isEmptyOrFailedExecWrapper(text.trim())) { return { @@ -154,14 +173,19 @@ AFTER (append one branch directly after that block): changed: true, }; } - // A host failure string inside an exec-bridge result gets the rule it broke appended. The - // helper is exec-gated and refuses already-annotated text, so a replayed result does not grow - // a second line; Cursor's isError decision is left exactly as the caller passed it. - const hostFailure = annotateCodeModeHostFailure(text, options); - if (hostFailure !== undefined) return { text: hostFailure, isError, changed: true }; + // A host failure string inside a code-mode exec result gets the rule it broke appended, with + // Cursor's isError decision left exactly as the caller passed it. A replayed result that already + // carries a recovery line returns here unchanged: falling through would let the legacy loop + // below match the lowercase import marker a second time and flip isError. + if (isCodexCodeModeExecResult(options.toolName, options.toolNamespace)) { + if (text.includes(CODE_MODE_HOST_RECOVERY_PREFIX)) return { text, isError, changed: false }; + const hostFailure = annotateCodeModeHostFailure(text, options); + if (hostFailure !== undefined) return { text: hostFailure, isError, changed: true }; + } ``` The existing `unsupported import in exec` row in `RUNTIME_FAILURE_GUIDANCE` still serves node_repl / -Computer Use tools; for exec-bridge tools the new branch runs first and carries the shared hint. +Computer Use tools; for the code-mode exec the new branch runs first, carries the shared hint, and +terminates replay before the legacy loop can see it. ## NEW `tests/adapters/exec-tool-result-normalize.test.ts` @@ -190,13 +214,18 @@ describe("code-mode host failure annotation", () => { expect(annotateCodeModeHostFailure("Script error:\ntool `apply_patch` expects a string input", { toolName: "exec" })).toContain("exactly one string"); expect(annotateCodeModeHostFailure( "apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'", - { toolName: "exec_command" }, - )).toContain("bare marker `*** Begin Patch`"); + { toolName: "exec" }, + )).toContain("bare marker line `*** Begin Patch`"); }); - test("leaves non-exec tools, non-matching text and already-annotated text byte-identical", () => { + test("leaves non-exec tools, shell bridges, foreign namespaces, non-matching text and already-annotated text alone", () => { expect(annotateCodeModeHostFailure("expects a string input", { toolName: "read_file" })).toBeUndefined(); - expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec_command", toolNamespace: "mcp__docker" })).toBeUndefined(); + // Flat shell bridges never run the isolate, so the four strings cannot be theirs. + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec_command" })).toBeUndefined(); + // A foreign MCP server's own exec is not Codex's, even when its output quotes the phrase. + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__docker" })).toBeUndefined(); + // Cursor's display namespace for the same code-mode tool still counts. + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__opencodex-responses" })).toContain("[recovery:"); expect(annotateCodeModeHostFailure("all good", { toolName: "exec" })).toBeUndefined(); const once = annotateCodeModeHostFailure("expects a string input", { toolName: "exec" }); if (!once) throw new Error("expected one annotation"); @@ -232,9 +261,13 @@ entry is required and `tests/test-layout-tooling.test.ts` names it if missing. const wire = JSON.parse(createResponsesPassthroughAdapter(routed).buildRequest(parseRequest(body)).body); expect(wire.input[1].output).toBe(`${failure}\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]`); expect(JSON.parse(wire.input[0].arguments).input).toBe(body.input[0].input); - // Replayed history already carrying the hint is not annotated twice. + // Replayed history already carrying the hint is not annotated twice: the output item and the + // program keep their identity, and a second pass over the normalized body is a deep no-op. const replayed = raw(wire.input[1].output); - expect(normalizeResponsesCodeMode(replayed, parseRequest(replayed), routed)).toBe(replayed); + const once = normalizeResponsesCodeMode(replayed, parseRequest(replayed), routed) as typeof replayed; + expect(once.input[1]).toBe(replayed.input[1]); + expect(once.input[0]).toBe(replayed.input[0]); + expect(normalizeResponsesCodeMode(once, parseRequest(once), routed)).toEqual(once); }); ``` @@ -252,7 +285,7 @@ entry is required and `tests/test-layout-tooling.test.ts` names it if missing. const { body } = await createKiroAdapter(provider).buildRequest(parsedWith(messages, [execTool])); const resultText = JSON.parse(body).conversationState.currentMessage.userInputMessage .userInputMessageContext.toolResults[0].content[0].text; - expect(resultText).toBe(`${failure}\n[recovery: The patch string's first line must be the bare marker \`*** Begin Patch\` with no code fence, prose, or extra asterisks around it.]`); + expect(resultText).toBe(`${failure}\n[recovery: The patch text must open with the bare marker line \`*** Begin Patch\`: no code fence, prose, or extra asterisks on that line (blank lines or indentation before it are tolerated).]`); }); ``` - In the grouped-result table (the `execResult` cases around lines 1195-1262) add one case: @@ -271,13 +304,24 @@ entry is required and `tests/test-layout-tooling.test.ts` names it if missing. `tests/providers/cursor/cursor-toolresult-normalize.test.ts` — add after the `test.each` runtime-failure table: ```ts - test("an exec-bridge result carrying a host failure string gains the shared hint and keeps its isError", () => { - const out = normalizeCursorToolResultText("Unsupported import in exec: node:fs", { toolName: "exec" }); - expect(out.changed).toBe(true); - expect(out.isError).toBe(false); - expect(out.text).toContain("[recovery: Imports are not available in this exec context"); - // Replay of the annotated text with isError=false must not grow a second line. - expect(normalizeCursorToolResultText(out.text, { toolName: "exec" }).changed).toBe(false); + test.each(["Unsupported import in exec: node:fs", "unsupported import in exec: node:fs"])( + "a code-mode exec result carrying %p gains the shared hint, keeps its isError, and is not re-annotated on replay", + (payload) => { + const out = normalizeCursorToolResultText(payload, { toolName: "exec" }); + expect(out.changed).toBe(true); + expect(out.isError).toBe(false); + expect(out.text).toBe(`${payload}\n[recovery: Imports are not available in this exec context; use the injected globals (tools, text, notify, store, load, ALL_TOOLS) instead.]`); + // Replay through Responses history arrives with isError=false; the legacy lowercase marker + // row must not get a second look at it. + const replay = normalizeCursorToolResultText(out.text, { toolName: "exec", isError: false }); + expect(replay).toEqual({ text: out.text, isError: false, changed: false }); + }, + ); + + test("the legacy node_repl import row keeps its own isError policy", () => { + const out = normalizeCursorToolResultText("unsupported import in exec", { toolName: "js", toolNamespace: "mcp__node_repl" }); + expect(out.isError).toBe(true); + expect(out.text).toContain("injected globals"); }); test("a non-exec tool whose successful output merely mentions a host phrase stays byte-identical", () => { @@ -297,4 +341,3 @@ Stage only the files above (`git diff --cached --stat` first); commit `--no-veri NOT RUN locally. Exact-head Cross-platform CI on the wp2 head; receipt via `cxc receipt test --session --cwd -- gh run view --exit-status`. - diff --git a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md index e0c0df7990..f3fc8d2eef 100644 --- a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md +++ b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md @@ -12,14 +12,16 @@ search usable on xAI's public Responses endpoint…": ``` Routed code-mode turns also carry the host contract for the nested helpers, stated in the same three injection sites as the result-emission rule (shared catalog nudge, Cursor code-mode guidance, native -routed Responses instructions): `tools.apply_patch` takes one string whose first and last lines are -the bare patch markers, the isolate has no `import`/`require`, and a command that outlives +routed Responses instructions): `tools.apply_patch` takes one string that opens and closes with the +bare patch marker lines (blank lines or indentation around them are tolerated; a decorated or missing +marker is rejected), the isolate has no `import`/`require`, and a command that outlives `yield_time_ms` is polled through `write_stdin` with empty `chars` rather than a shell sleep loop. -When an exec-bridge result still carries one of the host's failure strings ("expects a string +When a code-mode exec result still carries one of the host's failure strings ("expects a string input", "The first line of the patch must be", "The last line of the patch must be", "Unsupported import in exec"), the native routed Responses, Kiro, and Cursor result paths append a one-line -recovery hint naming the broken rule; Cursor's error classification and Kiro's whitespace and -failed-wrapper grouping are unchanged. Both halves live in `src/adapters/exec-tool-result-normalize.ts` +recovery hint naming the broken rule; flat shell bridges and foreign MCP namespaces are never +annotated, and Cursor's error classification and Kiro's whitespace and failed-wrapper grouping are +unchanged. Both halves live in `src/adapters/exec-tool-result-normalize.ts` so the pre-call and post-hoc wording cannot drift. This guidance and annotation change rewrites neither the model's JavaScript nor its patch payload; the existing name-alias delimiter normalization in `src/responses/code-mode-helper-compat.ts` is unchanged, and the host still rejects a @@ -41,9 +43,9 @@ Insert after the paragraph ending "…and unrelated native custom payloads stay ``` Routed code-mode turns are also told the host's rules for the nested helpers before the first -call: `tools.apply_patch` takes one string whose first and last lines are the bare patch markers, -the isolate has no `import`, and long-running commands are polled through `write_stdin`. When an -exec result on the native routed Responses, Kiro, or Cursor path still carries one of the host's +call: `tools.apply_patch` takes one string that opens and closes with the bare patch marker lines, +the isolate has no `import`, and long-running commands are polled through `write_stdin`. When a +code-mode exec result on the native routed Responses, Kiro, or Cursor path still carries one of the host's failure messages, opencodex appends a one-line hint naming the rule. This change does not rewrite the model's code or its patch text. ``` @@ -77,4 +79,3 @@ Append `040_delivery_record.md` with PR number, head SHA, CI run id, per-job res improve (LOOP-PESSIMIST-01: prose cannot force compliance; effect on real Grok defect rate is unmeasured until a live re-probe), and the residual: Anthropic/Google/OpenAI-chat/command-code tool-result paths do not annotate host failures because they have no exec-result seam today. - From 3bcb9aa453a6567205d38409d955b3141ad977dd Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 14:45:42 +0900 Subject: [PATCH 101/221] docs(devlog): fold audit round 3 into the code-mode host contract roadmap --- .../000_plan.md | 29 +++++++- .../020_post_hoc_annotation.md | 73 +++++++++++++++---- .../030_docs_and_delivery.md | 6 +- 3 files changed, 88 insertions(+), 20 deletions(-) diff --git a/devlog/_plan/260907_code_mode_host_contract/000_plan.md b/devlog/_plan/260907_code_mode_host_contract/000_plan.md index 91c130df0a..0f9a8057fb 100644 --- a/devlog/_plan/260907_code_mode_host_contract/000_plan.md +++ b/devlog/_plan/260907_code_mode_host_contract/000_plan.md @@ -72,9 +72,10 @@ Not a NOOP. New exports in `exec-tool-result-normalize.ts` (full text in 010/020): -1. `CODE_MODE_HOST_CONTRACT_SENTENCE` — pre-call: one string argument, bare markers as first/last - line with nothing before or after them, no `import`/`require` (globals per the exec description, - non-exhaustive), `session_id` + `write_stdin` polling. +1. `CODE_MODE_HOST_CONTRACT_SENTENCE` — pre-call: one string argument; the patch opens and closes + with the bare marker lines (blank lines or indentation around them tolerated; decorated or + missing marker rejected); no `import`/`require` (globals per the exec description, + non-exhaustive); `session_id` + `write_stdin` polling. 2. `CODE_MODE_HOST_FAILURE_GUIDANCE` — marker → recovery rows for the four host strings, matched case-insensitively. 3. `annotateCodeModeHostFailure(text, {toolName, toolNamespace})` — gated by a new, narrower @@ -89,9 +90,21 @@ it gains one exec-gated branch that inserts the shared annotation WITHOUT changi (audit blockers 2 and 3). Kiro substitutes the annotation only where it would otherwise carry the raw text, leaving whitespace and failed-wrapper grouping untouched (blocker 1). +Code-mode context per seam: the native routed Responses seam already runs only after the body-level +code-mode gate (`responses-code-mode.ts:35-37`), so its annotation is exact. Kiro has +`codeModeExecName` in scope at the same call site (`kiro.ts:650`) and additionally requires it, so a +structured `exec` or an `exec` beside a shell bridge is never annotated there. Cursor's +`normalizeCursorToolResultText` is reached from six call sites without catalog context +(`protobuf-request.ts:392,842,1062,1097,1158,1272`); threading code-mode context through them is a +larger refactor than this unit, so Cursor coverage is name-based (exact `exec` under the +`opencodex-responses` provider). That is an accepted residual, recorded here and in the +structure doc: on Cursor a structured tool literally named `exec` whose output quotes one of the +four phrases would gain an additive recovery line with no error flip. + Accepted residual: a code-mode exec result that legitimately prints one of the four phrases (e.g. `cat` of this devlog) gains a recovery line. The line is additive text and never changes error -status; the gate excludes every non-code-mode tool, shell bridge, and foreign namespace. +status; the gate excludes every non-`exec` tool, every shell bridge, and every namespace other than +the exact `opencodex-responses` display aliases. Marker wording: the live probe shows the host tolerates blank lines and indentation around the markers and rejects a decorated or missing marker. Every sentence, recovery hint and doc paragraph @@ -174,3 +187,11 @@ re-reading each seam's own policy. Round 2 re-audits with the same reviewer. | 3 Responses replay `toBe(replayed)` cannot hold | Med | Folded: assert output-item and program identity plus deep-equal idempotence of successive passes (020). | | 4 Marker wording contradicts whitespace probe | Med | Folded: "bare marker line … blank lines or indentation tolerated" in sentence, hints, structure and docs-site text (010/020/030). | | 5 Off-by-one anchors | Low | Folded: 116, 32, 45-46, 97-106 (010/020). | + +## Audit round 3 — synthesis (GO-WITH-FIXES, blockers=3) + +| # | Sev | Disposition | +|---|---|---| +| 1 Bare `exec` name does not prove code mode | Med | Folded for Responses (body gate) and Kiro (`codeModeExecName` gate + structured/shell-bridge negative tests); accepted and narrowed for Cursor (name-based, additive text only) — see "Code-mode context per seam". | +| 2 Namespace `includes` admits foreign tools | Med | Folded: exact equality against `opencodex-responses` / `mcp__opencodex-responses` and the two flattened aliases; `mcp__foreign-opencodex-responses` negative and both flattened positives added (020). | +| 3 Summary retained the rejected whitespace claim | Low | Folded (this file, Design §1). | diff --git a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md index 4bfa2df82d..86430340c0 100644 --- a/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md +++ b/devlog/_plan/260907_code_mode_host_contract/020_post_hoc_annotation.md @@ -37,18 +37,26 @@ export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; gu /** Prefix of every recovery line this module appends; callers use it to recognise replayed annotations. */ export const CODE_MODE_HOST_RECOVERY_PREFIX = "[recovery: "; +/** Namespaces under which Cursor displays Codex's own Responses tools (see cursor/tool-naming.ts). */ +const CODEX_RESPONSES_DISPLAY_NAMESPACES: ReadonlySet = new Set(["opencodex-responses", "mcp__opencodex-responses"]); +/** Flattened spellings of the same code-mode exec when a client folds the namespace into the name. */ +const CODEX_CODE_MODE_EXEC_ALIASES: ReadonlySet = new Set(["exec", "mcp__opencodex-responses__exec", "mcp_opencodex-responses_exec"]); + /** - * The code-mode `exec` tool itself — bare, or under Cursor's `opencodex-responses` display namespace. - * The four host strings above originate only in that isolate, so flat shell bridges - * (`exec_command`, `shell`, …) and every foreign MCP namespace (`mcp__docker__exec`) are excluded: an - * unrelated server's output that happens to contain the phrase must not receive Codex guidance. - * Narrower than `isCodexExecBridgeTool` on purpose; the empty-output repair keeps the wider gate. + * The code-mode `exec` tool by NAME — bare, or under Codex's own `opencodex-responses` display + * namespace, matched exactly. The four host strings above originate only in that isolate, so flat + * shell bridges (`exec_command`, `shell`, …) and every other namespace (`mcp__docker`, + * `mcp__foreign-opencodex-responses`) are excluded: an unrelated server's output that quotes the + * phrase must not receive Codex guidance. Narrower than `isCodexExecBridgeTool` on purpose; the + * empty-output repair keeps the wider gate. Callers that KNOW the catalog shape (Kiro's + * `codeModeExecName`, the Responses body gate) add that check on top; this predicate alone cannot + * tell a structured tool named `exec` from the freeform one. */ export function isCodexCodeModeExecResult(toolName?: string, toolNamespace?: string): boolean { if (!toolName) return false; const lower = toolName.toLowerCase(); - if (toolNamespace) return toolNamespace.includes("opencodex-responses") && lower === "exec"; - return lower === "exec" || lower === "mcp__opencodex-responses__exec" || lower === "mcp_opencodex-responses_exec"; + if (toolNamespace !== undefined) return CODEX_RESPONSES_DISPLAY_NAMESPACES.has(toolNamespace) && lower === "exec"; + return CODEX_CODE_MODE_EXEC_ALIASES.has(lower); } /** @@ -122,10 +130,14 @@ AFTER: ```ts const execOptions = { toolName: tr.toolName, toolNamespace: tr.toolNamespace }; const normalizedExecText = normalizeEmptyExecToolResultText(text, execOptions); - // A host failure string inside a non-empty exec result gets the rule it broke appended. This - // is the only substitution the grouping path below also carries: whitespace and empty/failed + // A host failure string inside a non-empty exec result gets the rule it broke appended, but + // only when this request's emitted catalog is genuinely code mode (`codeModeExecName` above): + // a structured tool named exec, or exec beside a shell bridge, never ran the isolate. This is + // the only substitution the grouping path below also carries: whitespace and empty/failed // wrappers keep their existing raw policy. - const annotatedExecText = normalizedExecText === undefined ? annotateCodeModeHostFailure(text, execOptions) : undefined; + const annotatedExecText = normalizedExecText === undefined && codeModeExecName !== undefined + ? annotateCodeModeHostFailure(text, execOptions) + : undefined; const resultText = normalizedExecText ?? annotatedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); const images = extractKiroImages(tr.content); const toolUseId = normalizeToolId(tr.toolCallId); @@ -222,10 +234,19 @@ describe("code-mode host failure annotation", () => { expect(annotateCodeModeHostFailure("expects a string input", { toolName: "read_file" })).toBeUndefined(); // Flat shell bridges never run the isolate, so the four strings cannot be theirs. expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec_command" })).toBeUndefined(); - // A foreign MCP server's own exec is not Codex's, even when its output quotes the phrase. + // A foreign MCP server's own exec is not Codex's, even when its output quotes the phrase, and a + // namespace that merely CONTAINS the provider name is still foreign. expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__docker" })).toBeUndefined(); - // Cursor's display namespace for the same code-mode tool still counts. - expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__opencodex-responses" })).toContain("[recovery:"); + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__foreign-opencodex-responses" })).toBeUndefined(); + // Codex's own display namespaces and flattened aliases for the same code-mode tool still count. + for (const options of [ + { toolName: "exec", toolNamespace: "opencodex-responses" }, + { toolName: "exec", toolNamespace: "mcp__opencodex-responses" }, + { toolName: "mcp__opencodex-responses__exec" }, + { toolName: "mcp_opencodex-responses_exec" }, + ]) { + expect(annotateCodeModeHostFailure("expects a string input", options)).toContain("[recovery:"); + } expect(annotateCodeModeHostFailure("all good", { toolName: "exec" })).toBeUndefined(); const once = annotateCodeModeHostFailure("expects a string input", { toolName: "exec" }); if (!once) throw new Error("expected one annotation"); @@ -275,7 +296,8 @@ entry is required and `tests/test-layout-tooling.test.ts` names it if missing. - After `"an empty code-mode exec result carries the actionable reason…"` (line 323) add: ```ts test("a code-mode exec result carrying a host failure string names the broken rule", async () => { - const execTool = { name: "exec", description: "Run JavaScript", parameters: { type: "object" } }; + // freeform: the Kiro seam annotates only when the emitted catalog is genuinely code mode. + const execTool = { name: "exec", description: "Run JavaScript", freeform: true, parameters: { type: "object" } }; const failure = "apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'"; const messages = [ { role: "user", content: "run it" }, @@ -287,6 +309,29 @@ entry is required and `tests/test-layout-tooling.test.ts` names it if missing. .userInputMessageContext.toolResults[0].content[0].text; expect(resultText).toBe(`${failure}\n[recovery: The patch text must open with the bare marker line \`*** Begin Patch\`: no code fence, prose, or extra asterisks on that line (blank lines or indentation before it are tolerated).]`); }); + + test("a host failure string on a non-code-mode catalog stays raw", async () => { + const failure = "tool `apply_patch` expects a string input"; + const messages = [ + { role: "user", content: "run it" }, + { role: "assistant", content: [{ type: "toolCall", id: "call-x", name: "exec", arguments: {} }] }, + { role: "toolResult", toolCallId: "call-x", toolName: "exec", content: failure, isError: false }, + ]; + for (const tools of [ + // A structured tool that merely shares the name exec. + [{ name: "exec", description: "Run a shell string", parameters: { type: "object" } }], + // Freeform exec beside a bare shell bridge is the flat-catalog shape, not code mode. + [ + { name: "exec", description: "Run JavaScript", freeform: true, parameters: { type: "object" } }, + { name: "exec_command", description: "Run", parameters: { type: "object" } }, + ], + ]) { + const { body } = await createKiroAdapter(provider).buildRequest(parsedWith(messages, tools)); + const resultText = JSON.parse(body).conversationState.currentMessage.userInputMessage + .userInputMessageContext.toolResults[0].content[0].text; + expect(resultText).toBe(failure); + } + }); ``` - In the grouped-result table (the `execResult` cases around lines 1195-1262) add one case: ```ts diff --git a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md index f3fc8d2eef..8bd40668e0 100644 --- a/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md +++ b/devlog/_plan/260907_code_mode_host_contract/030_docs_and_delivery.md @@ -20,8 +20,10 @@ When a code-mode exec result still carries one of the host's failure strings ("e input", "The first line of the patch must be", "The last line of the patch must be", "Unsupported import in exec"), the native routed Responses, Kiro, and Cursor result paths append a one-line recovery hint naming the broken rule; flat shell bridges and foreign MCP namespaces are never -annotated, and Cursor's error classification and Kiro's whitespace and failed-wrapper grouping are -unchanged. Both halves live in `src/adapters/exec-tool-result-normalize.ts` +annotated, Responses and Kiro additionally require the request's verified code-mode catalog, Cursor +matches the exact `exec` name under its `opencodex-responses` provider without catalog context, and +Cursor's error classification and Kiro's whitespace and failed-wrapper grouping are unchanged. Both +halves live in `src/adapters/exec-tool-result-normalize.ts` so the pre-call and post-hoc wording cannot drift. This guidance and annotation change rewrites neither the model's JavaScript nor its patch payload; the existing name-alias delimiter normalization in `src/responses/code-mode-helper-compat.ts` is unchanged, and the host still rejects a From 5b70dddb0bdeba8d26b7844df63c70f796b9228c Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 14:46:34 +0900 Subject: [PATCH 102/221] docs(devlog): record live Codex host probe evidence for the code-mode contract --- .../001_host_probe_evidence.md | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 devlog/_plan/260907_code_mode_host_contract/001_host_probe_evidence.md diff --git a/devlog/_plan/260907_code_mode_host_contract/001_host_probe_evidence.md b/devlog/_plan/260907_code_mode_host_contract/001_host_probe_evidence.md new file mode 100644 index 0000000000..757ae63fe4 --- /dev/null +++ b/devlog/_plan/260907_code_mode_host_contract/001_host_probe_evidence.md @@ -0,0 +1,53 @@ +# 001 — Live host probe evidence (Codex 0.153.2, 2026-09-07) + +Research record backing the incident table in 000_plan.md. Every row was executed from this +session's own code-mode isolate (`custom_exec` → `tools.apply_patch`) against +`/Users/jun/.codex/worktrees/ec3e/opencodex/.tmp/`; scratch files were deleted afterwards. + +## Binary strings + +`strings -n 8` over the installed binaries under +`@openai/codex-darwin-arm64/vendor/aarch64-apple-darwin/bin/`: + +| Binary | String | +|---|---| +| `codex` | `\` expects a string input` (preceded by the tool name) | +| `codex` | `The first line of the patch must be '*** Begin Patch'` | +| `codex` | `The last line of the patch must be '*** End Patch'` | +| `codex` | `Script running with cell ID ` | +| `codex` | `Session identifier to pass to write_stdin when the process is still running.` | +| `codex` | `Bytes to write to stdin. Defaults to empty, which polls without writing.` | +| `codex-code-mode-host` | `Unsupported import in exec: ` and `unsupported import in exec` | + +## apply_patch argument probes + +| Argument passed to `tools.apply_patch` | Result | +|---|---| +| `{ input: "*** Begin Patch\n*** End Patch" }` | throws `tool \`apply_patch\` expects a string input` | +| `"*** Begin Patch ***\n*** Add File: …\n+z\n*** End Patch ***"` | throws `apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'` | +| `"\n*** Begin Patch\n*** Add File: …\n+x\n*** End Patch"` | accepted; file written | +| `"\n\n*** Begin Patch\n…"` | accepted; file written | +| `" *** Begin Patch\n…"` (two-space indent) | accepted; file written | +| `"…*** End Patch\n\n"` | accepted; file written | +| a patch with two operations on the same path | throws `invalid patch: multiple operations target ` | +| two `*** End Patch` lines (envelope pasted twice) | throws `The last line of the patch must be '*** End Patch'` | + +Conclusion carried into the wording: the host strips surrounding whitespace before checking the +marker lines, so "no leading newline" is not a rule. The rule is that the first non-blank line is +exactly `*** Begin Patch` and the last is exactly `*** End Patch`, undecorated. + +## Long-running command protocol + +The `exec_command` schema in this session: `yield_time_ms` "Wait before yielding output. Defaults to +10000 ms; effective range is 250-30000 ms"; `session_id` "Session identifier to pass to write_stdin +when the process is still running". `write_stdin`: `chars` "Defaults to empty, which polls without +writing"; empty polls wait 5000-300000 ms. A shell `for i in 1..20; sleep 1` inside one call +produces no error string; it simply spends the call's yield budget blocked. + +## Isolate globals + +The `exec` description in this session lists `exit`, `text`, `image`, `audio`, `generatedImage`, +`store`/`load`, `notify`, `setTimeout`/`clearTimeout`, `ALL_TOOLS`, `yield_control`, plus `tools.*`. +The list varies by client version, which is why the pre-call sentence names a few examples and +defers to the description rather than enumerating. + From adafd12f7721ba1e64d699caad48e8bdbb544239 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 14:49:39 +0900 Subject: [PATCH 103/221] fix(code-mode): state the host contract for nested helpers before the first call Routed models in Codex code mode learned apply_patch argument shape, the marker rule, the isolate import ban and session_id polling only by failing (xai/grok-4.6, 2026-09-07). State them once in exec-tool-result-normalize.ts beside the echo rule and inject at the three existing code-mode sites: shared nudge, Cursor guidance, native routed Responses instructions. --- src/adapters/cursor/tool-guidance.ts | 4 ++-- src/adapters/exec-tool-result-normalize.ts | 15 +++++++++++++++ src/adapters/responses-code-mode.ts | 13 ++++++++++--- src/adapters/tool-catalog-nudge.ts | 4 ++-- tests/adapters/tool-catalog-nudge.test.ts | 7 ++++++- .../cursor/cursor-tool-definitions.test.ts | 4 ++++ tests/providers/kiro/kiro-adapter.test.ts | 2 ++ .../openai-responses-passthrough.test.ts | 15 +++++++++++++-- 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/src/adapters/cursor/tool-guidance.ts b/src/adapters/cursor/tool-guidance.ts index 54ebcc86d1..87e63730ca 100644 --- a/src/adapters/cursor/tool-guidance.ts +++ b/src/adapters/cursor/tool-guidance.ts @@ -1,5 +1,5 @@ import type { OcxRequestOptions, OcxTool } from "../../types"; -import { CODE_MODE_RESULT_ECHO_SENTENCE } from "../exec-tool-result-normalize"; +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "../exec-tool-result-normalize"; import { CODEX_SHELL_BRIDGE_TOOL_NAMES, CODEX_TOOL_SEARCH_TOOL, CODEX_UNIFIED_EXEC_TOOL, clientSemanticToolNameFromCursorWire, cursorRequestAdvertisesApplyPatch, cursorRequestHasExecutionPath, cursorRequestHasShellAlias, cursorRequestUsesCodeMode, cursorToolAllowedByChoice, cursorToolWireName, isCodexShellBridgeToolName, isCursorExecutionPathTool, isCursorStructuredEditToolName } from "./tool-naming"; export const CURSOR_SHELL_ALIAS_SYSTEM_NOTE = @@ -187,7 +187,7 @@ export function buildCursorToolGuidanceSystemNote( ? `\`${CODEX_UNIFIED_EXEC_TOOL}\` is Codex code mode: its body is JavaScript evaluated in a V8 isolate, not a shell command and not Node. Shell, file edits, and MCP are nested helpers called INSIDE that body as \`await tools.(...)\`, for example \`await tools.exec_command({cmd: \"ls\"})\`. Read the tool description and the isolate global \`ALL_TOOLS\` (not \`tools.ALL_TOOLS\`) for helpers this turn provides; absence from the top-level catalog or from \`exec\`'s description is not absence. Those nested helpers are not themselves top-level tools, so do not call \`exec_command\` or \`shell_command\` at the top level here${codeModeOtherTopLevelNames.length > 0 ? `; every other tool this turn lists, including ${quotedNames(codeModeOtherTopLevelNames)}, remains callable at the top level as usual` : ""}. Nested \`tools.apply_patch(input)\` is host-executed: the string must begin exactly with \`*** Begin Patch\` and end with \`*** End Patch\`, each marker line being three asterisks, one space, the two words, then end of line with no further asterisks. OpenCodex does not rewrite JavaScript inside exec, so extra asterisks on a marker line are rejected by Codex before the file is touched.` : undefined, codeMode - ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers." + ? CODE_MODE_RESULT_ECHO_SENTENCE + " There is no `require`, no `module`, and no filesystem or network globals; reach the host only through the nested helpers. " + CODE_MODE_HOST_CONTRACT_SENTENCE : undefined, codeMode ? "NEVER attempt Cursor-native Shell, Read, Grep, List, or any tool absent from the catalog — they are not executed in this environment and every probe wastes a turn. The exec code cell (with its nested helpers) is the ONLY execution surface; go to it directly on the FIRST attempt and do not narrate switching surfaces." diff --git a/src/adapters/exec-tool-result-normalize.ts b/src/adapters/exec-tool-result-normalize.ts index c103808420..ad1969c229 100644 --- a/src/adapters/exec-tool-result-normalize.ts +++ b/src/adapters/exec-tool-result-normalize.ts @@ -115,6 +115,21 @@ export const EMPTY_EXEC_OUTPUT_MESSAGE = export const CODE_MODE_RESULT_ECHO_SENTENCE = "Nothing in the isolate is echoed automatically: a bare trailing `await tools.(...)` or final expression value is DISCARDED, and the cell reports empty output. Pass anything you need to read to `text(...)` (or `notify(...)`) in the same cell — for example `text(JSON.stringify(await tools.exec_command({cmd: 'ls'})))` — and treat an empty result as your own missing `text(...)` call rather than a failed command or lost context."; +/** + * Host rules a routed model most often breaks on its first code-mode edit or wait, stated BEFORE + * the call. Wording tracks the Codex host (0.153.2), probed live on 2026-09-07: a non-string + * argument to `apply_patch` throws "expects a string input"; a body whose first line is not the + * bare marker (decorated `*** Begin Patch ***`, a code fence, prose) throws "The first line of the + * patch must be '*** Begin Patch'" — surrounding newlines are tolerated; ES imports throw + * "Unsupported import in exec"; a command that outlives `yield_time_ms` returns `session_id` for + * `write_stdin` polling. xai/grok-4.6 hit the first two, abandoned apply_patch for heredoc writes, + * blocked a turn in a shell sleep loop, and died once on an import. None of that is repairable in + * the proxy (devlog/_plan/260905_apply_patch_envelope_gap/010 MODE B); it is a contract the proxy + * had not stated. + */ +export const CODE_MODE_HOST_CONTRACT_SENTENCE = + "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; the patch text opens with the bare marker line `*** Begin Patch` and closes with the bare marker line `*** End Patch`, written without a code fence, prose, or extra asterisks on those lines (blank lines or indentation around the markers are tolerated; a decorated or missing marker is rejected). The isolate has no `import`, `require`, or module loader; use the globals the exec tool description lists (for example `tools`, `text`, `notify`, `store`/`load`, `ALL_TOOLS`). For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it on later calls with `tools.write_stdin({session_id, chars: \"\"})` instead of blocking a shell in a sleep loop."; + /** * Codex exec / shell-bridge tool names (flat and MCP-prefixed display aliases). An empty result * here is almost always a code-mode cell that never called text()/notify(). diff --git a/src/adapters/responses-code-mode.ts b/src/adapters/responses-code-mode.ts index 25e51f204e..ebbab97fd9 100644 --- a/src/adapters/responses-code-mode.ts +++ b/src/adapters/responses-code-mode.ts @@ -1,6 +1,6 @@ import { toolChoiceToolPredicate, type OcxParsedRequest, type OcxProviderConfig } from "../types"; import { isOpenAiOperatedResponsesDestination } from "../providers/openai-tiers"; -import { CODE_MODE_RESULT_ECHO_SENTENCE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; import { isBareShellBridgeTool, isCodexCodeModeExecTool } from "./tool-catalog-nudge"; function record(value: unknown): value is Record { @@ -29,6 +29,14 @@ function withExecInputGuidance(tool: unknown): unknown { } } }; } +/** Append each sentence a replayed instructions string does not already carry, in order. */ +function appendMissing(instructions: string, sentences: readonly string[]): string { + return sentences.reduce( + (acc, sentence) => acc.includes(sentence) ? acc : [acc, sentence].filter(Boolean).join("\n\n"), + instructions, + ); +} + /** Native routed Responses needs the same first-call/output contract as translated adapters. */ export function normalizeResponsesCodeMode(body: unknown, parsed: OcxParsedRequest, provider: OcxProviderConfig): unknown { if (!record(body) || parsed._compactionRequest || isOpenAiOperatedResponsesDestination(provider)) return body; @@ -42,8 +50,7 @@ export function normalizeResponsesCodeMode(body: unknown, parsed: OcxParsedReque .map(item => item.call_id)); return { ...body, - instructions: instructions.includes(CODE_MODE_RESULT_ECHO_SENTENCE) - ? instructions : [instructions, CODE_MODE_RESULT_ECHO_SENTENCE].filter(Boolean).join("\n\n"), + instructions: appendMissing(instructions, [CODE_MODE_RESULT_ECHO_SENTENCE, CODE_MODE_HOST_CONTRACT_SENTENCE]), ...(Array.isArray(body.tools) ? { tools: body.tools.map(withExecInputGuidance) } : {}), ...(input ? { input: input.map(item => { if (!record(item)) return item; diff --git a/src/adapters/tool-catalog-nudge.ts b/src/adapters/tool-catalog-nudge.ts index 6e5659a78f..5b218f27e6 100644 --- a/src/adapters/tool-catalog-nudge.ts +++ b/src/adapters/tool-catalog-nudge.ts @@ -5,7 +5,7 @@ import { type OcxTool, type OcxProviderConfig, } from "../types"; -import { CODE_MODE_RESULT_ECHO_SENTENCE } from "./exec-tool-result-normalize"; +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE } from "./exec-tool-result-normalize"; // Tool names that exist only in OTHER agent harnesses (Claude Code and friends). Naming one // here tells a routed model not to call it unless this turn's catalog really lists it. @@ -121,7 +121,7 @@ export function buildNonOpenAIToolCatalogNudgeFromNames( "Call only listed names with their listed argument keys; do not invent, translate, or rename tools.", "Names mentioned only in instructions, tool descriptions, argument descriptions, or nested helper APIs are not additional top-level tools.", verifiedCodeModeExecName - ? "`" + verifiedCodeModeExecName + "` is Codex code mode: its body is JavaScript evaluated in a V8 isolate. Nested helpers are called INSIDE that body as `await tools.(...)`, for example `await tools.exec_command({cmd: \"ls\"})` or `await tools.codex_app__list_threads({})`. Absence from the top-level catalog or from `" + verifiedCodeModeExecName + "`'s description is not absence: deferred helpers stay callable on `tools.`. Discover them from the isolate global `ALL_TOOLS`, not `tools.ALL_TOOLS`. Do not skip an available nested helper because it is omitted from the listed top-level names. " + CODE_MODE_RESULT_ECHO_SENTENCE + " Nested `tools.apply_patch(input)` is host-executed: the string must begin exactly with `*** Begin Patch` and end with `*** End Patch`, each marker line being three asterisks, one space, the two words, then end of line with no further asterisks. OpenCodex does not rewrite JavaScript inside exec, so extra asterisks on a marker line are rejected by Codex before the file is touched." + ? "`" + verifiedCodeModeExecName + "` is Codex code mode: its body is JavaScript evaluated in a V8 isolate. Nested helpers are called INSIDE that body as `await tools.(...)`, for example `await tools.exec_command({cmd: \"ls\"})` or `await tools.codex_app__list_threads({})`. Absence from the top-level catalog or from `" + verifiedCodeModeExecName + "`'s description is not absence: deferred helpers stay callable on `tools.`. Discover them from the isolate global `ALL_TOOLS`, not `tools.ALL_TOOLS`. Do not skip an available nested helper because it is omitted from the listed top-level names. " + CODE_MODE_RESULT_ECHO_SENTENCE + " Nested `tools.apply_patch(input)` is host-executed: the string must begin exactly with `*** Begin Patch` and end with `*** End Patch`, each marker line being three asterisks, one space, the two words, then end of line with no further asterisks. OpenCodex does not rewrite JavaScript inside exec, so extra asterisks on a marker line are rejected by Codex before the file is touched. " + CODE_MODE_HOST_CONTRACT_SENTENCE : "If a listed tool exposes nested helpers such as a tools.* API, call the listed parent tool and use those helpers only inside that tool's input.", unavailableNeighborNames.length > 0 ? "Do not use neighboring-agent tool names " + quoteNames(unavailableNeighborNames) + " unless this turn's catalog lists those exact names." diff --git a/tests/adapters/tool-catalog-nudge.test.ts b/tests/adapters/tool-catalog-nudge.test.ts index 18fc5a301c..f875113a75 100644 --- a/tests/adapters/tool-catalog-nudge.test.ts +++ b/tests/adapters/tool-catalog-nudge.test.ts @@ -4,7 +4,7 @@ import { buildNonOpenAIToolCatalogNudgeFromNames, shouldInjectNonOpenAIToolCatalogNudge, } from "../../src/adapters/tool-catalog-nudge"; -import { CODE_MODE_RESULT_ECHO_SENTENCE, EMPTY_EXEC_OUTPUT_MESSAGE } from "../../src/adapters/exec-tool-result-normalize"; +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, EMPTY_EXEC_OUTPUT_MESSAGE } from "../../src/adapters/exec-tool-result-normalize"; import type { OcxTool } from "../../src/types"; describe("non-OpenAI tool catalog nudge", () => { @@ -80,6 +80,10 @@ describe("non-OpenAI tool catalog nudge", () => { expect(note).toContain("OpenCodex does not rewrite JavaScript inside exec"); expect(note).toContain("Nested `tools.apply_patch(input)` is host-executed"); expect(note).not.toContain("call the listed parent tool and use those helpers only inside that tool's input"); + // The host contract rides the same code-mode branch as the echo rule (Grok 2026-09-07). + expect(note).toContain(CODE_MODE_HOST_CONTRACT_SENTENCE); + expect(note).toContain("takes exactly one string"); + expect(note).toContain("write_stdin({session_id, chars: \"\"})"); }); test("keeps the generic nested-helper parent-tool rule when exec is not listed", () => { @@ -88,6 +92,7 @@ describe("non-OpenAI tool catalog nudge", () => { expect(note).toContain("call the listed parent tool and use those helpers only inside that tool's input"); expect(note).not.toContain("is Codex code mode"); expect(note).not.toContain("tools.ALL_TOOLS"); + expect(note).not.toContain("Host contract for the nested helpers"); }); test("detects a wire-renamed exec as code mode", () => { diff --git a/tests/providers/cursor/cursor-tool-definitions.test.ts b/tests/providers/cursor/cursor-tool-definitions.test.ts index 852936a2e5..fb15f0e7d6 100644 --- a/tests/providers/cursor/cursor-tool-definitions.test.ts +++ b/tests/providers/cursor/cursor-tool-definitions.test.ts @@ -771,6 +771,9 @@ describe("Cursor code mode tool guidance", () => { expect(note).toContain("no further asterisks"); expect(note).not.toContain("*** Begin Patch ***"); expect(note).toContain("OpenCodex does not rewrite JavaScript inside exec"); + expect(note).toContain("Host contract for the nested helpers"); + expect(note).toContain("takes exactly one string"); + expect(note).toContain("write_stdin"); // The flat-catalog shell-bridge guidance must NOT appear: naming a top-level // `exec_command` in code mode sends the model after a tool that does not exist. @@ -819,6 +822,7 @@ describe("Cursor code mode tool guidance", () => { expect(note).toContain("is the Codex Responses shell bridge for this turn"); expect(note).not.toContain("is Codex code mode"); expect(note).not.toContain("V8 isolate"); + expect(note).not.toContain("Host contract for the nested helpers"); }); }); diff --git a/tests/providers/kiro/kiro-adapter.test.ts b/tests/providers/kiro/kiro-adapter.test.ts index f4a9aa83e6..fbdeec50b2 100644 --- a/tests/providers/kiro/kiro-adapter.test.ts +++ b/tests/providers/kiro/kiro-adapter.test.ts @@ -1823,6 +1823,8 @@ describe("kiro code-mode catalog nudge", () => { // Reaches the ACTUAL Kiro wire prompt, not just the builder: the live 2026-08-28 session that // misread a blank result was a routed Kiro turn. expect(content).toContain("Nothing in the isolate is echoed automatically"); + // Survives Kiro's 16 384-char injected-instruction bound on the real wire prompt. + expect(content).toContain("Host contract for the nested helpers"); // The generic fallback must be gone, not merely accompanied. expect(content).not.toContain("If a listed tool exposes nested helpers such as a tools.* API"); }); diff --git a/tests/responses/openai-responses-passthrough.test.ts b/tests/responses/openai-responses-passthrough.test.ts index 24bc8e0e02..25ee2af5ac 100644 --- a/tests/responses/openai-responses-passthrough.test.ts +++ b/tests/responses/openai-responses-passthrough.test.ts @@ -3,7 +3,7 @@ import { createOpenAIChatAdapter } from "../../src/adapters/openai-chat"; import { createResponsesPassthroughAdapter as createResponsesPassthroughAdapterProduction } from "../../src/adapters/openai-responses"; import { openaiResponsesUrl } from "../../src/adapters/openai-responses-url"; import { normalizeResponsesCodeMode } from "../../src/adapters/responses-code-mode"; -import { CODE_MODE_RESULT_ECHO_SENTENCE, EMPTY_EXEC_OUTPUT_MESSAGE, FAILED_EXEC_OUTPUT_MESSAGE } from "../../src/adapters/exec-tool-result-normalize"; +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, EMPTY_EXEC_OUTPUT_MESSAGE, FAILED_EXEC_OUTPUT_MESSAGE } from "../../src/adapters/exec-tool-result-normalize"; import { chatCompletionsToResponsesBody } from "../../src/chat/inbound"; import { anthropicToResponsesBody } from "../../src/claude/inbound"; import { parseRequest } from "../../src/responses/parser"; @@ -51,7 +51,7 @@ describe("native routed code-mode result visibility", () => { const before = JSON.stringify(body); const request = createResponsesPassthroughAdapter(routed).buildRequest(parseRequest(body)); const wire = JSON.parse(request.body); - expect(wire.instructions).toBe(`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}`); + expect(wire.instructions).toBe(`Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}\n\n${CODE_MODE_HOST_CONTRACT_SENTENCE}`); expect(wire.tools.find((tool: { name: string }) => tool.name === "exec").parameters.properties.input.description) .toContain(CODE_MODE_RESULT_ECHO_SENTENCE); expect(JSON.stringify(body)).toBe(before); @@ -103,6 +103,16 @@ describe("native routed code-mode result visibility", () => { expect(second.instructions).toBe(first.instructions); }); + test("a replayed body that already carries the echo rule gains only the missing contract sentence", () => { + const body = { ...raw(), instructions: `Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}` }; + const parsed = parseRequest(body); + const first = normalizeResponsesCodeMode(body, parsed, routed) as typeof body; + expect(first.instructions).toBe(`${body.instructions}\n\n${CODE_MODE_HOST_CONTRACT_SENTENCE}`); + expect(first.instructions.split(CODE_MODE_RESULT_ECHO_SENTENCE).length).toBe(2); + const second = normalizeResponsesCodeMode(first, parsed, routed) as typeof body; + expect(second.instructions).toBe(first.instructions); + }); + test("official OpenAI and non-code-mode catalogs remain untouched", () => { const body = raw(); for (const native of [provider, { ...routed, baseUrl: "https://api.openai.com/v1" }]) { @@ -110,6 +120,7 @@ describe("native routed code-mode result visibility", () => { const wire = JSON.parse(createResponsesPassthroughAdapter(native).buildRequest(parseRequest(body)).body); expect(wire.instructions).toBe(body.instructions); expect(JSON.stringify(wire.tools)).not.toContain(CODE_MODE_RESULT_ECHO_SENTENCE); + expect(JSON.stringify(wire)).not.toContain("Host contract for the nested helpers"); } for (const tools of [ [{ type: "function", name: "exec", parameters: { type: "object" } }], From 163378050d75bda4bc6eb0821da9382e5a80c67a Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 15:04:40 +0900 Subject: [PATCH 104/221] fix(code-mode): name the broken host rule on exec results that carry a host failure string Post-hoc half of the host contract. Exec-bridge results carrying "expects a string input", "The first/last line of the patch must be", or "Unsupported import in exec" gain one recovery line on the native routed Responses, Kiro and Cursor result paths. Responses and Kiro additionally require the verified code-mode catalog; Cursor matches the exact exec name under its opencodex-responses provider and keeps its isError policy. Flat shell bridges, foreign namespaces, whitespace/failed-wrapper grouping and replayed annotations are untouched. --- scripts/test-layout/layout.json | 1 + src/adapters/cursor/tool-result-normalize.ts | 12 ++++ src/adapters/exec-tool-result-normalize.ts | 67 +++++++++++++++++++ src/adapters/kiro.ts | 20 ++++-- src/adapters/responses-code-mode.ts | 7 +- .../exec-tool-result-normalize.test.ts | 62 +++++++++++++++++ tests/fixtures/test-layout-expected.json | 1 + .../cursor-toolresult-normalize.test.ts | 28 ++++++++ tests/providers/kiro/kiro-adapter.test.ts | 62 +++++++++++++++++ .../openai-responses-passthrough.test.ts | 15 +++++ 10 files changed, 266 insertions(+), 9 deletions(-) create mode 100644 tests/adapters/exec-tool-result-normalize.test.ts diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json index 65ba23d900..60e0f22a0d 100644 --- a/scripts/test-layout/layout.json +++ b/scripts/test-layout/layout.json @@ -618,6 +618,7 @@ "empty-completion-guard.test.ts": "responses", "empty-completion-hardening.test.ts": "responses", "empty-tool-output-annotation.test.ts": "adapters", + "exec-tool-result-normalize.test.ts": "adapters", "ensure-desired-integrations-race.test.ts": "cli", "error-fidelity.test.ts": "server", "errors-adapter-failure.test.ts": "server", diff --git a/src/adapters/cursor/tool-result-normalize.ts b/src/adapters/cursor/tool-result-normalize.ts index fded734b93..edec3a14f4 100644 --- a/src/adapters/cursor/tool-result-normalize.ts +++ b/src/adapters/cursor/tool-result-normalize.ts @@ -10,9 +10,12 @@ */ import { + CODE_MODE_HOST_RECOVERY_PREFIX, EMPTY_EXEC_OUTPUT_MESSAGE, EMPTY_EXEC_OUTPUT_REGEX, FAILED_EXEC_OUTPUT_MESSAGE, + annotateCodeModeHostFailure, + isCodexCodeModeExecResult, isFailedEmptyExecWrapper, isCodexExecBridgeTool, } from "../exec-tool-result-normalize"; @@ -104,6 +107,15 @@ export function normalizeCursorToolResultText( changed: true, }; } + // A host failure string inside a code-mode exec result gets the rule it broke appended, with + // Cursor's isError decision left exactly as the caller passed it. A replayed result that already + // carries a recovery line returns here unchanged: falling through would let the legacy loop + // below match the lowercase import marker a second time and flip isError. + if (isCodexCodeModeExecResult(options.toolName, options.toolNamespace)) { + if (text.includes(CODE_MODE_HOST_RECOVERY_PREFIX)) return { text, isError, changed: false }; + const hostFailure = annotateCodeModeHostFailure(text, options); + if (hostFailure !== undefined) return { text: hostFailure, isError, changed: true }; + } if (!isError) { for (const { marker, guidance } of RUNTIME_FAILURE_GUIDANCE) { if (text.includes(marker)) { diff --git a/src/adapters/exec-tool-result-normalize.ts b/src/adapters/exec-tool-result-normalize.ts index ad1969c229..a6e4a3190a 100644 --- a/src/adapters/exec-tool-result-normalize.ts +++ b/src/adapters/exec-tool-result-normalize.ts @@ -130,6 +130,73 @@ export const CODE_MODE_RESULT_ECHO_SENTENCE = export const CODE_MODE_HOST_CONTRACT_SENTENCE = "Host contract for the nested helpers: `tools.apply_patch(patch)` takes exactly one string, never an object such as `{input: ...}`; the patch text opens with the bare marker line `*** Begin Patch` and closes with the bare marker line `*** End Patch`, written without a code fence, prose, or extra asterisks on those lines (blank lines or indentation around the markers are tolerated; a decorated or missing marker is rejected). The isolate has no `import`, `require`, or module loader; use the globals the exec tool description lists (for example `tools`, `text`, `notify`, `store`/`load`, `ALL_TOOLS`). For a command that may outlive `yield_time_ms`, let `tools.exec_command` return a `session_id` and poll it on later calls with `tools.write_stdin({session_id, chars: \"\"})` instead of blocking a shell in a sleep loop."; +/** + * Post-hoc half of the host contract: the four host strings a routed model reads inside a + * non-error exec result, each paired with the rule it broke. Matched case-insensitively because + * the host writes "Unsupported import in exec: " while Cursor's earlier marker was + * lowercase; one table, one owner, so this text and the pre-call sentence cannot drift. + */ +export const CODE_MODE_HOST_FAILURE_GUIDANCE: ReadonlyArray<{ marker: string; guidance: string }> = [ + { + marker: "expects a string input", + guidance: "tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.", + }, + { + marker: "the first line of the patch must be", + guidance: "The patch text must open with the bare marker line `*** Begin Patch`: no code fence, prose, or extra asterisks on that line (blank lines or indentation before it are tolerated).", + }, + { + marker: "the last line of the patch must be", + guidance: "The patch text must close with the bare marker line `*** End Patch`: no trailing text or extra asterisks on that line (blank lines after it are tolerated).", + }, + { + marker: "unsupported import in exec", + guidance: "Imports are not available in this exec context; use the injected globals (tools, text, notify, store, load, ALL_TOOLS) instead.", + }, +]; + +/** Prefix of every recovery line this module appends; callers use it to recognise replayed annotations. */ +export const CODE_MODE_HOST_RECOVERY_PREFIX = "[recovery: "; + +/** Namespaces under which Cursor displays Codex's own Responses tools (see cursor/tool-naming.ts). */ +const CODEX_RESPONSES_DISPLAY_NAMESPACES: ReadonlySet = new Set(["opencodex-responses", "mcp__opencodex-responses"]); +/** Flattened spellings of the same code-mode exec when a client folds the namespace into the name. */ +const CODEX_CODE_MODE_EXEC_ALIASES: ReadonlySet = new Set(["exec", "mcp__opencodex-responses__exec", "mcp_opencodex-responses_exec"]); + +/** + * The code-mode `exec` tool by NAME — bare, or under Codex's own `opencodex-responses` display + * namespace, matched exactly. The four host strings above originate only in that isolate, so flat + * shell bridges (`exec_command`, `shell`, …) and every other namespace (`mcp__docker`, + * `mcp__foreign-opencodex-responses`) are excluded: an unrelated server's output that quotes the + * phrase must not receive Codex guidance. Narrower than `isCodexExecBridgeTool` on purpose; the + * empty-output repair keeps the wider gate. Callers that KNOW the catalog shape (Kiro's + * `codeModeExecName`, the Responses body gate) add that check on top; this predicate alone cannot + * tell a structured tool named `exec` from the freeform one. + */ +export function isCodexCodeModeExecResult(toolName?: string, toolNamespace?: string): boolean { + if (!toolName) return false; + const lower = toolName.toLowerCase(); + if (toolNamespace !== undefined) return CODEX_RESPONSES_DISPLAY_NAMESPACES.has(toolNamespace) && lower === "exec"; + return CODEX_CODE_MODE_EXEC_ALIASES.has(lower); +} + +/** + * Append a one-line recovery hint when a code-mode exec result carries a known host failure string. + * Returns undefined when the tool is not the code-mode exec, no marker matches, or a recovery line is + * already present (a replayed annotated result must not grow a second one). Never touches error + * status: the host already decided whether the call failed. + */ +export function annotateCodeModeHostFailure( + text: string, + options: { toolName?: string; toolNamespace?: string } = {}, +): string | undefined { + if (!isCodexCodeModeExecResult(options.toolName, options.toolNamespace)) return undefined; + if (text.includes(CODE_MODE_HOST_RECOVERY_PREFIX)) return undefined; + const lower = text.toLowerCase(); + const hit = CODE_MODE_HOST_FAILURE_GUIDANCE.find(({ marker }) => lower.includes(marker)); + return hit ? `${text}\n${CODE_MODE_HOST_RECOVERY_PREFIX}${hit.guidance}]` : undefined; +} + /** * Codex exec / shell-bridge tool names (flat and MCP-prefixed display aliases). An empty result * here is almost always a code-mode cell that never called text()/notify(). diff --git a/src/adapters/kiro.ts b/src/adapters/kiro.ts index 200b1edb77..56ee632343 100644 --- a/src/adapters/kiro.ts +++ b/src/adapters/kiro.ts @@ -44,7 +44,7 @@ import { extractKiroImages, normalizeKiroImages, type KiroImage } from "./kiro-i import { sniffImageDimensions } from "./anthropic-image-guard"; import { fetchKiroWithRetry, noteKiroTransientThrottle } from "./kiro-retry"; import { convertKiroToolContext } from "./kiro-tools"; -import { EMPTY_EXEC_OUTPUT_MESSAGE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; +import { EMPTY_EXEC_OUTPUT_MESSAGE, annotateCodeModeHostFailure, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; import { identifyRoutedModel } from "./identity"; import { buildNonOpenAIToolCatalogNudgeFromNames, isBareShellBridgeTool, isCodexCodeModeExecTool } from "./tool-catalog-nudge"; import { @@ -755,11 +755,17 @@ export function buildKiroPayload( // the task instead of calling text()/notify(). Checked before `text.trim()` because the // wrapper form ("Script completed\nWall time ...\nOutput:\n") is non-blank and would // otherwise pass through as if it were real output. - const normalizedExecText = normalizeEmptyExecToolResultText(text, { - toolName: tr.toolName, - toolNamespace: tr.toolNamespace, - }); - const resultText = normalizedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); + const execOptions = { toolName: tr.toolName, toolNamespace: tr.toolNamespace }; + const normalizedExecText = normalizeEmptyExecToolResultText(text, execOptions); + // A host failure string inside a non-empty exec result gets the rule it broke appended, but + // only when this request's emitted catalog is genuinely code mode (`codeModeExecName` above): + // a structured tool named exec, or exec beside a shell bridge, never ran the isolate. This is + // the only substitution the grouping path below also carries: whitespace and empty/failed + // wrappers keep their existing raw policy. + const annotatedExecText = normalizedExecText === undefined && codeModeExecName !== undefined + ? annotateCodeModeHostFailure(text, execOptions) + : undefined; + const resultText = normalizedExecText ?? annotatedExecText ?? (text.trim() ? text : KIRO_EMPTY_TOOL_RESULT_MESSAGE); const images = extractKiroImages(tr.content); const toolUseId = normalizeToolId(tr.toolCallId); const call = priorCalls.get(toolUseId); @@ -768,7 +774,7 @@ export function buildKiroPayload( } // Keep real whitespace and failed wrappers, but no empty-success wrapper boilerplate. const rawGroupText = text.length > 0 && (!text.trim() || normalizedExecText !== EMPTY_EXEC_OUTPUT_MESSAGE) - ? text : undefined; + ? (annotatedExecText ?? text) : undefined; const last = turns.at(-1); if ( adjacentResult?.rawId === tr.toolCallId diff --git a/src/adapters/responses-code-mode.ts b/src/adapters/responses-code-mode.ts index ebbab97fd9..8e53481fa8 100644 --- a/src/adapters/responses-code-mode.ts +++ b/src/adapters/responses-code-mode.ts @@ -1,6 +1,6 @@ import { toolChoiceToolPredicate, type OcxParsedRequest, type OcxProviderConfig } from "../types"; import { isOpenAiOperatedResponsesDestination } from "../providers/openai-tiers"; -import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; +import { CODE_MODE_HOST_CONTRACT_SENTENCE, CODE_MODE_RESULT_ECHO_SENTENCE, annotateCodeModeHostFailure, normalizeEmptyExecToolResultText } from "./exec-tool-result-normalize"; import { isBareShellBridgeTool, isCodexCodeModeExecTool } from "./tool-catalog-nudge"; function record(value: unknown): value is Record { @@ -59,7 +59,10 @@ export function normalizeResponsesCodeMode(body: unknown, parsed: OcxParsedReque } if ((item.type !== "function_call_output" && item.type !== "custom_tool_call_output") || !execCalls.has(item.call_id)) return item; const text = textOnlyOutput(item.output); - const normalized = text === undefined ? undefined : normalizeEmptyExecToolResultText(text, { toolName: "exec" }); + const normalized = text === undefined + ? undefined + : normalizeEmptyExecToolResultText(text, { toolName: "exec" }) + ?? annotateCodeModeHostFailure(text, { toolName: "exec" }); return normalized === undefined ? item : { ...item, output: normalized }; }) } : {}), }; diff --git a/tests/adapters/exec-tool-result-normalize.test.ts b/tests/adapters/exec-tool-result-normalize.test.ts new file mode 100644 index 0000000000..a685ba6463 --- /dev/null +++ b/tests/adapters/exec-tool-result-normalize.test.ts @@ -0,0 +1,62 @@ +import { describe, expect, test } from "bun:test"; +import { + CODE_MODE_HOST_CONTRACT_SENTENCE, + CODE_MODE_HOST_FAILURE_GUIDANCE, + annotateCodeModeHostFailure, +} from "../../src/adapters/exec-tool-result-normalize"; + +// Live host strings (Codex 0.153.2, probed 2026-09-07) and the rule each one names. The pre-call +// sentence and these rows are one contract in one module; a model must never be told one thing +// before the call and another after. +describe("code-mode host failure annotation", () => { + test.each(CODE_MODE_HOST_FAILURE_GUIDANCE.map(row => [row.marker, row.guidance] as const))( + "annotates an exec result carrying %p regardless of case", + (marker, guidance) => { + const text = `Script failed\nWall time 0.1 seconds\nOutput:\nError: ${marker.toUpperCase()}`; + expect(annotateCodeModeHostFailure(text, { toolName: "exec" })).toBe(`${text}\n[recovery: ${guidance}]`); + }, + ); + + test("matches the host's real capitalisation and argument text", () => { + expect(annotateCodeModeHostFailure("Unsupported import in exec: node:fs", { toolName: "exec" })).toContain("injected globals"); + expect(annotateCodeModeHostFailure("Script error:\ntool `apply_patch` expects a string input", { toolName: "exec" })).toContain("exactly one string"); + expect(annotateCodeModeHostFailure( + "apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'", + { toolName: "exec" }, + )).toContain("bare marker line `*** Begin Patch`"); + }); + + test("leaves non-exec tools, shell bridges, foreign namespaces, non-matching text and already-annotated text alone", () => { + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "read_file" })).toBeUndefined(); + // Flat shell bridges never run the isolate, so the four strings cannot be theirs. + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec_command" })).toBeUndefined(); + // A foreign MCP server's own exec is not Codex's, even when its output quotes the phrase, and a + // namespace that merely CONTAINS the provider name is still foreign. + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__docker" })).toBeUndefined(); + expect(annotateCodeModeHostFailure("expects a string input", { toolName: "exec", toolNamespace: "mcp__foreign-opencodex-responses" })).toBeUndefined(); + // Codex's own display namespaces and flattened aliases for the same code-mode tool still count. + for (const options of [ + { toolName: "exec", toolNamespace: "opencodex-responses" }, + { toolName: "exec", toolNamespace: "mcp__opencodex-responses" }, + { toolName: "mcp__opencodex-responses__exec" }, + { toolName: "mcp_opencodex-responses_exec" }, + ]) { + expect(annotateCodeModeHostFailure("expects a string input", options)).toContain("[recovery:"); + } + expect(annotateCodeModeHostFailure("all good", { toolName: "exec" })).toBeUndefined(); + const once = annotateCodeModeHostFailure("expects a string input", { toolName: "exec" }); + if (!once) throw new Error("expected one annotation"); + expect(annotateCodeModeHostFailure(once, { toolName: "exec" })).toBeUndefined(); + }); + + test("every failure row is a rule the pre-call sentence already states", () => { + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("takes exactly one string"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("`*** Begin Patch`"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("`*** End Patch`"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("no `import`"); + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).toContain("write_stdin"); + // Never shows the decorated marker as a copyable literal (same rule as the nudge tests). + expect(CODE_MODE_HOST_CONTRACT_SENTENCE).not.toContain("*** Begin Patch ***"); + }); +}); + diff --git a/tests/fixtures/test-layout-expected.json b/tests/fixtures/test-layout-expected.json index cb554012ea..fe613ac71f 100644 --- a/tests/fixtures/test-layout-expected.json +++ b/tests/fixtures/test-layout-expected.json @@ -458,6 +458,7 @@ "errors-adapter-failure.test.ts": "server", "eventstream-decoder.test.ts": "responses", "exa-web-search.test.ts": "providers", + "exec-tool-result-normalize.test.ts": "adapters", "expand-user-path.test.ts": "config", "fast-row-ingress.test.ts": "providers", "fast-row-listing.test.ts": "codex-integration", diff --git a/tests/providers/cursor/cursor-toolresult-normalize.test.ts b/tests/providers/cursor/cursor-toolresult-normalize.test.ts index c62ad8e27b..610e5e578e 100644 --- a/tests/providers/cursor/cursor-toolresult-normalize.test.ts +++ b/tests/providers/cursor/cursor-toolresult-normalize.test.ts @@ -106,6 +106,34 @@ describe("normalizeCursorToolResultText (#1920/#1866 unit rows)", () => { expect(out.text).toContain(hint); }); + test.each(["Unsupported import in exec: node:fs", "unsupported import in exec: node:fs"])( + "a code-mode exec result carrying %p gains the shared hint, keeps its isError, and is not re-annotated on replay", + (payload) => { + const out = normalizeCursorToolResultText(payload, { toolName: "exec" }); + expect(out.changed).toBe(true); + expect(out.isError).toBe(false); + expect(out.text).toBe(`${payload}\n[recovery: Imports are not available in this exec context; use the injected globals (tools, text, notify, store, load, ALL_TOOLS) instead.]`); + // Replay through Responses history arrives with isError=false; the legacy lowercase marker + // row must not get a second look at it. + const replay = normalizeCursorToolResultText(out.text, { toolName: "exec", isError: false }); + expect(replay).toEqual({ text: out.text, isError: false, changed: false }); + }, + ); + + test("the legacy node_repl import row keeps its own isError policy", () => { + const out = normalizeCursorToolResultText("unsupported import in exec", { toolName: "js", toolNamespace: "mcp__node_repl" }); + expect(out.isError).toBe(true); + expect(out.text).toContain("injected globals"); + }); + + test("a non-exec tool whose successful output merely mentions a host phrase stays byte-identical", () => { + const doc = "The docs say apply_patch expects a string input."; + const out = normalizeCursorToolResultText(doc, { toolName: "read_file" }); + expect(out.changed).toBe(false); + expect(out.isError).toBe(false); + expect(out.text).toBe(doc); + }); + test("a non-computer-use tool with empty output stays byte-identical", () => { const out = normalizeCursorToolResultText("", { toolName: "read_file" }); expect(out.changed).toBe(false); diff --git a/tests/providers/kiro/kiro-adapter.test.ts b/tests/providers/kiro/kiro-adapter.test.ts index fbdeec50b2..947d6ad740 100644 --- a/tests/providers/kiro/kiro-adapter.test.ts +++ b/tests/providers/kiro/kiro-adapter.test.ts @@ -339,6 +339,68 @@ describe("kiro adapter — buildRequest", () => { } }); + test("a code-mode exec result carrying a host failure string names the broken rule", async () => { + // freeform: the Kiro seam annotates only when the emitted catalog is genuinely code mode. + const execTool = { name: "exec", description: "Run JavaScript", freeform: true, parameters: { type: "object" } }; + const failure = "apply_patch verification failed: invalid patch: The first line of the patch must be '*** Begin Patch'"; + const messages = [ + { role: "user", content: "run it" }, + { role: "assistant", content: [{ type: "toolCall", id: "call-x", name: "exec", arguments: {} }] }, + { role: "toolResult", toolCallId: "call-x", toolName: "exec", content: failure, isError: false }, + ]; + const { body } = await createKiroAdapter(provider).buildRequest(parsedWith(messages, [execTool])); + const resultText = JSON.parse(body).conversationState.currentMessage.userInputMessage + .userInputMessageContext.toolResults[0].content[0].text; + expect(resultText).toBe(`${failure}\n[recovery: The patch text must open with the bare marker line \`*** Begin Patch\`: no code fence, prose, or extra asterisks on that line (blank lines or indentation before it are tolerated).]`); + }); + + test("a host failure string on a non-code-mode catalog stays raw", async () => { + const failure = "tool `apply_patch` expects a string input"; + const messages = [ + { role: "user", content: "run it" }, + { role: "assistant", content: [{ type: "toolCall", id: "call-x", name: "exec", arguments: {} }] }, + { role: "toolResult", toolCallId: "call-x", toolName: "exec", content: failure, isError: false }, + ]; + for (const tools of [ + // A structured tool that merely shares the name exec. + [{ name: "exec", description: "Run a shell string", parameters: { type: "object" } }], + // Freeform exec beside a bare shell bridge is the flat-catalog shape, not code mode. + [ + { name: "exec", description: "Run JavaScript", freeform: true, parameters: { type: "object" } }, + { name: "exec_command", description: "Run", parameters: { type: "object" } }, + ], + ]) { + const { body } = await createKiroAdapter(provider).buildRequest(parsedWith(messages, tools)); + const resultText = JSON.parse(body).conversationState.currentMessage.userInputMessage + .userInputMessageContext.toolResults[0].content[0].text; + expect(resultText).toBe(failure); + } + }); + + test("a host failure chunk in a coalesced group carries its recovery line beside raw siblings", async () => { + // Whitespace and a failed-empty wrapper keep their raw grouping policy; only the chunk that + // carries a host failure string is substituted (the exact combination review round 1 named). + const execTool = { name: "exec", description: "Run JavaScript", freeform: true, parameters: { type: "object" } }; + const failedExecWrapper = "Script failed\nWall time 0.1 seconds\nOutput:\n"; + const hostFailure = "tool `apply_patch` expects a string input"; + const result = (content: string) => ({ role: "toolResult", toolCallId: "call-g", toolName: "exec", content, isError: false }); + const messages = [ + { role: "user", content: "run it" }, + { role: "assistant", content: [{ type: "toolCall", id: "call-g", name: "exec", arguments: {} }] }, + result(" "), result(hostFailure), result(failedExecWrapper), + ]; + const { body } = await createKiroAdapter(provider).buildRequest(parsedWith(messages, [execTool])); + const toolResults = JSON.parse(body).conversationState.currentMessage.userInputMessage + .userInputMessageContext.toolResults as Array<{ content: Array<{ text: string }>; status: string }>; + expect(toolResults).toHaveLength(1); + expect(toolResults[0].status).toBe("success"); + expect(toolResults[0].content).toEqual([ + { text: " " }, + { text: `${hostFailure}\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]` }, + { text: failedExecWrapper }, + ]); + }); + test("real exec output and empty non-exec results are left alone", async () => { // Review finding (Codex P2): a failed cell with no output is empty but NOT a success. The // success guidance would erase the only failure signal — reachable via Responses history, diff --git a/tests/responses/openai-responses-passthrough.test.ts b/tests/responses/openai-responses-passthrough.test.ts index 25ee2af5ac..df2d064cab 100644 --- a/tests/responses/openai-responses-passthrough.test.ts +++ b/tests/responses/openai-responses-passthrough.test.ts @@ -103,6 +103,21 @@ describe("native routed code-mode result visibility", () => { expect(second.instructions).toBe(first.instructions); }); + test("annotates a paired exec result that carries a host failure string without touching the program", () => { + const failure = "Script failed\nWall time 0.1 seconds\nOutput:\nScript error:\ntool `apply_patch` expects a string input"; + const body = raw(failure); + const wire = JSON.parse(createResponsesPassthroughAdapter(routed).buildRequest(parseRequest(body)).body); + expect(wire.input[1].output).toBe(`${failure}\n[recovery: tools.apply_patch takes exactly one string argument; pass the patch text itself, not an object such as {input: ...}.]`); + expect(JSON.parse(wire.input[0].arguments).input).toBe(body.input[0].input); + // Replayed history already carrying the hint is not annotated twice: the output item and the + // program keep their identity, and a second pass over the normalized body is a deep no-op. + const replayed = raw(wire.input[1].output); + const once = normalizeResponsesCodeMode(replayed, parseRequest(replayed), routed) as typeof replayed; + expect(once.input[1]).toBe(replayed.input[1]); + expect(once.input[0]).toBe(replayed.input[0]); + expect(normalizeResponsesCodeMode(once, parseRequest(once), routed)).toEqual(once); + }); + test("a replayed body that already carries the echo rule gains only the missing contract sentence", () => { const body = { ...raw(), instructions: `Keep this instruction.\n\n${CODE_MODE_RESULT_ECHO_SENTENCE}` }; const parsed = parseRequest(body); From 6bdcba5bff4196debf3cd159c7af3d34e35a24e0 Mon Sep 17 00:00:00 2001 From: JUN <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 15:27:23 +0900 Subject: [PATCH 105/221] docs: record the routed code-mode host contract Document the pre-call nested-helper contract and post-hoc host-failure annotation in the transports SoT and the Codex integration guide. This change does not rewrite model JavaScript or patch payloads. --- .../content/docs/guides/codex-integration.md | 7 +++++ structure/04_transports-and-sidecars.md | 28 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/docs-site/src/content/docs/guides/codex-integration.md b/docs-site/src/content/docs/guides/codex-integration.md index 64466b61a4..7d66e72c3f 100644 --- a/docs-site/src/content/docs/guides/codex-integration.md +++ b/docs-site/src/content/docs/guides/codex-integration.md @@ -330,6 +330,13 @@ Codex. Native custom calls and converted function calls use the same completion patch previews are held while their executable form is unresolved. JavaScript that merely contains patch text and unrelated native custom payloads stay unchanged. +Routed code-mode turns are also told the host's rules for the nested helpers before the first +call: `tools.apply_patch` takes one string that opens and closes with the bare patch marker lines, +the isolate has no `import`, and long-running commands are polled through `write_stdin`. When a +code-mode exec result on the native routed Responses, Kiro, or Cursor path still carries one of the host's +failure messages, opencodex appends a one-line hint naming the rule. This change does not rewrite +the model's code or its patch text. + Ordinary routed Responses function calls also use the original declared parameter schema at completion: integral floats in integer fields and integral numbers in string-only fields are normalized, while fractions and numeric unions stay unchanged. An explicitly empty completed diff --git a/structure/04_transports-and-sidecars.md b/structure/04_transports-and-sidecars.md index d27022c2ad..c568bb0151 100644 --- a/structure/04_transports-and-sidecars.md +++ b/structure/04_transports-and-sidecars.md @@ -330,6 +330,34 @@ whole result is examined; populated text, image/file parts, unpaired results, sh compaction and OpenAI-operated destinations are untouched. This does not rewrite valid JavaScript or reconstruct output that the code-mode host never emitted. +Routed code-mode turns also carry the host contract for the nested helpers, stated in the same three +injection sites as the result-emission rule (shared catalog nudge, Cursor code-mode guidance, native +routed Responses instructions): `tools.apply_patch` takes one string that opens and closes with the +bare patch marker lines (blank lines or indentation around them are tolerated; a decorated or missing +marker is rejected), the isolate has no `import`/`require`, and a command that outlives +`yield_time_ms` is polled through `write_stdin` with empty `chars` rather than a shell sleep loop. +When a code-mode exec result still carries one of the host's failure strings ("expects a string +input", "The first line of the patch must be", "The last line of the patch must be", "Unsupported +import in exec"), the native routed Responses, Kiro, and Cursor result paths append a one-line +recovery hint naming the broken rule; flat shell bridges and foreign MCP namespaces are never +annotated, Responses and Kiro additionally require the request's verified code-mode catalog, Cursor +matches the exact `exec` name under its `opencodex-responses` provider without catalog context, and +Cursor's error classification and Kiro's whitespace and failed-wrapper grouping are unchanged. Both +halves live in `src/adapters/exec-tool-result-normalize.ts` +so the pre-call and post-hoc wording cannot drift. This guidance and annotation change rewrites +neither the model's JavaScript nor its patch payload; the existing name-alias delimiter +normalization in `src/responses/code-mode-helper-compat.ts` is unchanged, and the host still rejects a +malformed call exactly as before. Anthropic, Google, OpenAI-chat and command-code result paths +have no exec-result seam today and are not annotated. + +[Decision Log] +- 목적과 의도: Stop routed models from abandoning `apply_patch` after the Codex host rejects an object argument or a decorated marker, and from blocking a turn in a shell sleep loop when the host offers `session_id` polling. +- 기존 구현 및 제약 조건: The shared nudge, Cursor guidance and native Responses instructions already carry the result-emission rule from `exec-tool-result-normalize.ts`, but none stated the helper's argument type, the marker rule, the import ban, or the polling protocol; `260905_apply_patch_envelope_gap` refused to rewrite JavaScript bodies (MODE B), so payload repair is off the table. +- 검토한 주요 대안: Repair the argument shape inside the proxy (rejected: same body ambiguity as MODE B and it turns a rejected write into a performed one); Cursor-only guidance (rejected: the incident was native routed Responses on xAI); annotate every adapter's tool results (rejected: Anthropic/Google/OpenAI-chat/command-code have no exec-result seam and would need a new one). +- 선택한 방식: One pre-call sentence and one marker→recovery table in the module that already owns the echo pair; inject the sentence at the three existing code-mode sites; annotate at the three existing exec-result seams with an exec-gated, idempotent helper that never changes error status. +- 다른 대안 대신 이 방식을 선택한 이유: The safe repair for a host contract the model broke is to state it before the call and name it after the failure; keeping both halves in one file is what keeps them consistent. +- 장점, 단점 및 영향: Code-mode system prompts grow by roughly 600 characters on routed turns; OpenAI destinations, flat catalogs and compaction requests are untouched. An exec result that legitimately prints one of the four phrases gains a recovery line, which is additive text and never an error flip. On Cursor, a structured tool literally named `exec` whose output quotes one of those phrases would also gain that line. The effect on the live Grok defect rate is unmeasured until a re-probe. + [Decision Log] - 목적과 의도: Keep Codex hosted web search usable on xAI's public Responses endpoint without forwarding private OpenAI-only fields that xAI rejects. - 기존 구현 및 제약 조건: Codex emits `external_web_access`, `search_context_size`, `search_content_types`, and `user_location`; xAI documents a live-only `web_search` tool with domain filters and image flags, while Codex cached mode explicitly forbids external access. From f1604c6b26bdb4326ae512f69fb46eb398c977b3 Mon Sep 17 00:00:00 2001 From: Ingwannu Date: Fri, 4 Sep 2026 21:20:40 +0000 Subject: [PATCH 106/221] docs(devlog): make CI completion check fail closed [skip ci] (cherry picked from commit e5bbd79ef70faeb258a8c13a4fc30c3d8bd1d588) Co-authored-by: Ingwannu <186453546+Ingwannu@users.noreply.github.com> --- .../090_outcome.md | 2 +- .../091_post_merge_audit.md | 31 ++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/devlog/_fin/260905_always_on_429_failover/090_outcome.md b/devlog/_fin/260905_always_on_429_failover/090_outcome.md index 3de38c8936..07e4399881 100644 --- a/devlog/_fin/260905_always_on_429_failover/090_outcome.md +++ b/devlog/_fin/260905_always_on_429_failover/090_outcome.md @@ -18,7 +18,7 @@ the tree rather than against the plan — the plan's own criteria were satisfied Two were defects the fix itself created (#3499, #3503), three were surfaces still describing the old contract (#3517, #3520, #3523), one closed the structural gap that let this unit ship two subset-rotator loops (#3512), and one cleaned up after a collision with concurrent maintainer -work (#3526). All are recorded in `091`. +work (#3526). The runtime post-merge findings and CI lessons are recorded in `091`. ## What changed diff --git a/devlog/_fin/260905_always_on_429_failover/091_post_merge_audit.md b/devlog/_fin/260905_always_on_429_failover/091_post_merge_audit.md index 490040325d..297213b2a3 100644 --- a/devlog/_fin/260905_always_on_429_failover/091_post_merge_audit.md +++ b/devlog/_fin/260905_always_on_429_failover/091_post_merge_audit.md @@ -67,14 +67,37 @@ The post-merge run on `dev` then showed `ci failure`, which was a genuinely alar out. It turned out to be cancellation by the maintainer's next merge two minutes later, not a real failure — every job read `cancelled`, not `failure`. -**Rule:** verify with the check-runs API and require zero `null` conclusions, not a pass count: +**Rule:** use the exact head SHA, require every expected aggregate or policy gate by name, and +also require zero non-terminal check runs. A missing check is not success. Paginate before treating +the returned set as complete: ```bash -gh api repos///commits//check-runs \ - --jq '[.check_runs[] | .conclusion] | group_by(.) | map({(.[0]//"null"): length}) | add' +set -o pipefail +gh api --paginate repos///commits//check-runs \ + | jq -se ' + [.[].check_runs[]] as $runs + | ["ci", "enforce-target", "hygiene", "react-doctor"] as $expected + | ($expected - [ + $runs[] + | select(.status == "completed" and .conclusion == "success") + | .name + ]) as $missing + | [ + $runs[] + | select(.status != "completed" or .conclusion == null) + | .name + ] as $pending + | if ($missing | length) == 0 and ($pending | length) == 0 + then {ready: true, expected: $expected} + else error("missing=\($missing) pending=\($pending)") + end' ``` -A clean result looks like `{"skipped":3,"success":24}` — no `null` key at all. +A clean result is `{"ready":true,...}` with exit status 0. This does not replace review-policy +checks such as confirming the approval belongs to the same head. Every `$expected` value is an +exact Checks API `.check_runs[].name`, not a workflow title or workflow-run name. If those required +check-run names change, update this list with the policy; silently accepting an absent name +recreates the original bug. The near-miss paid for itself: sweeping `dev` afterwards found a real defect. #3511 and #3513 landed concurrently, one moving `anthropic-quorum-cache.test.ts` into `tests/routing/` and the From 3e4a01c66bba66cf355c4e8562a349cc16a2fffc Mon Sep 17 00:00:00 2001 From: luvs01 <27862058+luvs01@users.noreply.github.com> Date: Mon, 7 Sep 2026 10:23:03 +0900 Subject: [PATCH 107/221] fix(kiro): gate request diagnostics behind the debug check [skip ci] `debugProviderDiagnostic` already returns early when provider debug is off, but its argument object is built by the caller first. The Kiro request path therefore ran `new TextEncoder().encode(body).length` over the entire serialized request body on every request, including when diagnostics were disabled, and then discarded the result inside the callee. Wrap the diagnostic call in `isDebugEnabled()` so the details are only constructed when they can actually be emitted. `src/adapters/openai-chat.ts` already guards its diagnostics the same way. The regression asserts that building a request performs no `TextEncoder` encode over the serialized payload while diagnostics are off; it fails without the guard and passes with it. (cherry picked from commit d5d711a7b9897bb8eee8364a5d8765b55206bf6f) Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/adapters/kiro.ts | 27 ++++++++++++++---------- tests/providers/kiro/kiro-stream.test.ts | 15 +++++++++++++ 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/adapters/kiro.ts b/src/adapters/kiro.ts index 56ee632343..4039142a8b 100644 --- a/src/adapters/kiro.ts +++ b/src/adapters/kiro.ts @@ -1,6 +1,7 @@ import { decodeEventStream } from "../lib/eventstream-decoder"; import { estimateTokens } from "../lib/token-estimate"; import { debugProviderDiagnostic } from "../lib/debug"; +import { isDebugEnabled } from "../lib/debug-settings"; import { resolveKiroApiRegion, resolveKiroRequestProfile } from "../oauth/kiro"; import { KIRO_MODEL_CONTEXT_WINDOWS, normalizeKiroModelId } from "../providers/kiro-models"; import { modelRecordValue } from "../reasoning-effort"; @@ -2120,17 +2121,21 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter const rawContextInputEstimate = estimateKiroPayloadInputTokens(built.payload, parsed.modelId); const contextInputEstimate = calibrateKiroEstimate(built.conversationId, rawContextInputEstimate); const body = JSON.stringify(built.payload); - debugProviderDiagnostic("kiro", "request", { - region, - requestedModel: parsed.modelId, - completionMode: built.completionMode, - bodyBytes: new TextEncoder().encode(body).length, - messageCount: kiroPayloadMessages(parsed).length, - toolCount: parsed.context.tools?.length ?? 0, - hasProfileArn: Boolean(profileArn), - wireClient, - hasPreviousResponseId: Boolean(parsed.previousResponseId), - }); + // Every field below is evaluated before the call, so an unguarded call re-encodes the + // whole request body on each request even when provider debug is off. Gate the details. + if (isDebugEnabled()) { + debugProviderDiagnostic("kiro", "request", { + region, + requestedModel: parsed.modelId, + completionMode: built.completionMode, + bodyBytes: new TextEncoder().encode(body).length, + messageCount: kiroPayloadMessages(parsed).length, + toolCount: parsed.context.tools?.length ?? 0, + hasProfileArn: Boolean(profileArn), + wireClient, + hasPreviousResponseId: Boolean(parsed.previousResponseId), + }); + } return { request: { url: kiroRuntimeEndpoint(provider, region), diff --git a/tests/providers/kiro/kiro-stream.test.ts b/tests/providers/kiro/kiro-stream.test.ts index b85c698ae1..1a9b7a6e02 100644 --- a/tests/providers/kiro/kiro-stream.test.ts +++ b/tests/providers/kiro/kiro-stream.test.ts @@ -196,6 +196,21 @@ describe("kiro adapter — parseStream", () => { expect(providerState).toEqual({ kiro: { conversationId: "returned-conversation-1" } }); }); + test("request diagnostics do not re-encode the body when provider debug is off", async () => { + const encodeSpy = spyOn(TextEncoder.prototype, "encode"); + try { + const adapter = createKiroAdapter(provider); + const before = encodeSpy.mock.calls.length; + await adapter.buildRequest(parsedWith([{ role: "user", content: "hi" }])); + const during = encodeSpy.mock.calls.slice(before); + // The diagnostic argument list is evaluated eagerly, so an unguarded call encodes the + // full serialized request body on every request even with diagnostics disabled. + expect(during.some(([value]) => typeof value === "string" && value.includes("conversationState"))).toBe(false); + } finally { + encodeSpy.mockRestore(); + } + }); + test("invalid returned message metadata cannot poison continuation state", async () => { const adapter = createKiroAdapter(provider); const request = await adapter.buildRequest(parsedWith([{ role: "user", content: "hi" }])); From 98564bdbfe6feace448eaf21cfbf424650c0bbf6 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:17:49 +0900 Subject: [PATCH 108/221] fix(copilot): route Responses-only GPT, Grok and MAI models correctly [skip ci] Carries PR #3840 (head 9a214529d, 5 commits squashed onto current dev): gpt-6-astra, Grok and MAI models on GitHub Copilot default to the Responses wire instead of Chat Completions, which returned unsupported_api_for_model. Docs scope the per-wire model lists and the discovery fallback test covers legacy overrides. (carried from https://github.com/lidge-jun/opencodex/pull/3840) Co-authored-by: chilung-cgu <215337896+chilung-cgu@users.noreply.github.com> --- .../src/content/docs/fr/guides/providers.md | 4 +- .../fr/reference/configuration/providers.md | 2 +- .../src/content/docs/guides/providers.md | 4 +- .../src/content/docs/ja/guides/providers.md | 4 +- .../ja/reference/configuration/providers.md | 2 +- .../src/content/docs/ko/guides/providers.md | 4 +- .../ko/reference/configuration/providers.md | 2 +- .../docs/reference/configuration/providers.md | 2 +- .../src/content/docs/ru/guides/providers.md | 6 +- .../ru/reference/configuration/providers.md | 2 +- .../src/content/docs/tr/guides/providers.md | 4 +- .../tr/reference/configuration/providers.md | 2 +- .../content/docs/zh-cn/guides/providers.md | 4 +- .../reference/configuration/providers.md | 2 +- .../content/docs/zh-tw/guides/providers.md | 4 +- src/providers/registry.ts | 5 ++ .../github-copilot-wire-defaults.test.ts | 76 +++++++++++++++---- 17 files changed, 90 insertions(+), 39 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/providers.md b/docs-site/src/content/docs/fr/guides/providers.md index 89b3a7c626..6ed7553957 100644 --- a/docs-site/src/content/docs/fr/guides/providers.md +++ b/docs-site/src/content/docs/fr/guides/providers.md @@ -543,8 +543,8 @@ flux d'appareil contre un jeton d'API Copilot de courte durée, et non contre un reste une passerelle à clé ou jeton d'abonnement sur son point de terminaison compatible OpenAI. **Cloudflare AI Gateway** exige que les identifiants de votre compte et de votre passerelle figurent dans l'URL. -Copilot présente un catalogue qui utilise plusieurs protocoles : sa famille GPT-5 (`gpt-5.3-codex`, `gpt-5.4`, -`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) rejette +Copilot présente un catalogue qui utilise plusieurs protocoles : ces modèles (`gpt-5.3-codex`, `gpt-5.4`, +`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) rejettent `/chat/completions` pour le trafic d'agent. opencodex route donc ces modèles sur l'API Responses par défaut, tandis que tous les autres modèles Copilot restent sur Chat Completions. L'ordre de priorité est le suivant : verrouillage explicite du protocole → entrée [`modelAdapters`](/fr/reference/configuration/providers/) définie diff --git a/docs-site/src/content/docs/fr/reference/configuration/providers.md b/docs-site/src/content/docs/fr/reference/configuration/providers.md index 32b6a28023..96d00e5668 100644 --- a/docs-site/src/content/docs/fr/reference/configuration/providers.md +++ b/docs-site/src/content/docs/fr/reference/configuration/providers.md @@ -116,7 +116,7 @@ sauvegarde dont le contenu diffère, puis réécrit en identifiants sans préfix | `modelReasoningEfforts?` | `Record` | Libellés propres à chaque modèle. Une liste vide masque le contrôle de l'effort. Comme pour `reasoningEfforts`, chaque échelle configurée avec l'adaptateur `google` déclare la capacité `thinkingLevel` ; les requêtes directes et Vertex sans image utilisent le chemin Gemini à plat, tandis que Cloud Code Assist l'envoie dans son enveloppe de requête. | | `modelSupportsReasoningSummaries?` | `Record` | Définissez un modèle sur `false` pour arrêter la publicité des résumés et supprimer les champs de livraison du résumé. | | `modelReasoningSummaryDelivery?` | `Record` | Énumération de livraison des réponses par modèle ; réécrit un champ de livraison existant. | -| `modelAdapters?` | `Record` | Remplacement du protocole `openai-chat` ou `openai-responses` par modèle pour les passerelles multiprotocoles. Les entrées explicites priment sur les valeurs par défaut du registre. Le préréglage OpenCode Go sélectionne Responses pour `gpt-5.6-luna` tout en laissant les modèles apparentés sur leurs protocoles documentés ; DeepSeek peut sélectionner Responses natif pour `deepseek-v4-flash` ; GitHub Copilot déclare des valeurs par défaut limitées à Responses pour sa famille GPT-5 (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`), car ces modèles rejettent `/chat/completions` pour le trafic des agents. Les modèles sans valeur intégrée par défaut, comme `gpt-5.4-nano`, peuvent être activés ici. Les services en amont à protocole unique et le transfert canonique ChatGPT rejettent ces remplacements. | +| `modelAdapters?` | `Record` | Remplacement du protocole `openai-chat` ou `openai-responses` par modèle pour les passerelles multiprotocoles. Les entrées explicites priment sur les valeurs par défaut du registre. Le préréglage OpenCode Go sélectionne Responses pour `gpt-5.6-luna` tout en laissant les modèles apparentés sur leurs protocoles documentés ; DeepSeek peut sélectionner Responses natif pour `deepseek-v4-flash` ; GitHub Copilot déclare des valeurs par défaut limitées à Responses pour ces modèles (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`), car ces modèles rejettent `/chat/completions` pour le trafic des agents. Les modèles sans valeur intégrée par défaut, comme `gpt-5.4-nano`, peuvent être activés ici. Les services en amont à protocole unique et le transfert canonique ChatGPT rejettent ces remplacements. | | Activation Responses xAI (tableau de bord) | interrupteur | Pour `xai` uniquement, définit ou efface atomiquement les entrées `modelAdapters` de `grok-4.5` et `grok-4.6`. Une seule entrée apparaît comme un état mixte jusqu’à la prochaine écriture. Les autres remplacements et le comportement des tiers restent inchangés. | | `xaiResponsesXSearch?` | `boolean` | Désactivé par défaut. Sur une destination xAI Responses, ajoute la déclaration `x_search` hébergée par le fournisseur uniquement lorsqu’un outil `web_search` actif subsiste après la normalisation finale de la requête. Les déclarations existantes ne sont pas dupliquées, les sélecteurs `tool_choice`/`allowed_tools` de l’appelant ne sont jamais élargis, et cette option est distincte des options `search.xSearch` du service auxiliaire de recherche web. | | `modelPreferHostedTools?` | `Record` | Activation explicite par modèle exact pour les passerelles Responses hors transfert qui réservent un espace de noms aux outils hébergés. Seul `["image_generation"]` est actuellement accepté ; le modèle correspondant doit utiliser le protocole `openai-responses` et prendre en charge cet outil hébergé. Le proxy supprime les déclarations clientes `image_gen` en conflit et réécrit leurs sélecteurs afin de préserver le choix d'outil de l'appelant. Pour les modèles virtuels `-pro` de l'API OpenAI, l'identifiant public sélectionné est comparé en premier et l'identifiant résolu du modèle de base sur le protocole sert de repli. `modelAdapters` résout d'abord l'identifiant public, puis celui de base ; la seconde résolution détermine le protocole final. Les autres modèles conservent le comportement normal des alias. | diff --git a/docs-site/src/content/docs/guides/providers.md b/docs-site/src/content/docs/guides/providers.md index 5e46979816..8a9477a759 100644 --- a/docs-site/src/content/docs/guides/providers.md +++ b/docs-site/src/content/docs/guides/providers.md @@ -669,8 +669,8 @@ device-flow login for a short-lived Copilot API token — not a pasted API key. a key/subscription-token gateway on its OpenAI-compatible endpoint. **Cloudflare AI Gateway** needs your account + gateway ids filled into the URL. -Copilot fronts a mixed-wire catalog: its GPT-5 family (`gpt-5.3-codex`, `gpt-5.4`, -`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) rejects +Copilot fronts a mixed-wire catalog: the following models (`gpt-5.3-codex`, `gpt-5.4`, +`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) reject `/chat/completions` for agent traffic, so opencodex routes those models over the Responses API by built-in default while every other Copilot model stays on chat completions. The precedence is: hard wire pin → your explicit diff --git a/docs-site/src/content/docs/ja/guides/providers.md b/docs-site/src/content/docs/ja/guides/providers.md index ae692e1e2c..db0bdb87b2 100644 --- a/docs-site/src/content/docs/ja/guides/providers.md +++ b/docs-site/src/content/docs/ja/guides/providers.md @@ -384,8 +384,8 @@ Amazon Bedrock ネイティブ API のような、これらの実装のいずれ **サブスクリプショントークン**(通常の API キーではない)で認証します。**Cloudflare AI Gateway** は URL にアカウント + ゲートウェイ ID を埋める必要があります。 -Copilot は混在 wire カタログを提供します。GPT-5 系モデル(`gpt-5.3-codex`、`gpt-5.4`、 -`gpt-5.4-mini`、`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`)はエージェント +Copilot は混在 wire カタログを提供します。モデル(`gpt-5.3-codex`、`gpt-5.4`、 +`gpt-5.4-mini`、`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`、`gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`)はエージェント 通信の `/chat/completions` を拒否するため、opencodex はこれらのモデルを組み込みデフォルトで Responses API 経由にルーティングし、他の Copilot モデルはすべて chat completions のままです。 優先順位は次のとおりです: ハード wire ピン → 明示的な diff --git a/docs-site/src/content/docs/ja/reference/configuration/providers.md b/docs-site/src/content/docs/ja/reference/configuration/providers.md index ddbb22d666..8938073e6c 100644 --- a/docs-site/src/content/docs/ja/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ja/reference/configuration/providers.md @@ -105,7 +105,7 @@ account を削除しても mapping は保持され、同じ id を再追加す | `modelReasoningEfforts?` | `Record` |モデルごとのラベル。空のリストは努力制御を非表示にします。 | | `modelSupportsReasoningSummaries?` | `Record` |モデルを `false` に設定して、概要の広告を停止し、概要配信フィールドを削除します。 | | `modelReasoningSummaryDelivery?` | `Record` |モデルごとの応答配信列挙型。既存の配信フィールドを書き換えます。 | -| `modelAdapters?` | `Record` | 混合配線ゲートウェイのモデルごとの `openai-chat` または `openai-responses` 配線オーバーライド。明示的なエントリはレジストリのデフォルトを破ります。DeepSeek のプリセットは `deepseek-v4-flash` のネイティブ Responses を選択でき、GitHub Copilot は GPT-5 ファミリー (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) を Responses 専用デフォルトとして宣言します。これらのモデルはエージェント トラフィックで `/chat/completions` を拒否するためです。`gpt-5.4-nano` のようなビルトイン デフォルトのないモデルはここでオプトインできます。単線アップストリーム ピンと正規の ChatGPT 転送はオーバーライドを拒否します。 | +| `modelAdapters?` | `Record` | 混合配線ゲートウェイのモデルごとの `openai-chat` または `openai-responses` 配線オーバーライド。明示的なエントリはレジストリのデフォルトを破ります。DeepSeek のプリセットは `deepseek-v4-flash` のネイティブ Responses を選択でき、GitHub Copilot は モデル (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) を Responses 専用デフォルトとして宣言します。これらのモデルはエージェント トラフィックで `/chat/completions` を拒否するためです。`gpt-5.4-nano` のようなビルトイン デフォルトのないモデルはここでオプトインできます。単線アップストリーム ピンと正規の ChatGPT 転送はオーバーライドを拒否します。 | | xAI Responses オプトイン(ダッシュボード) | スイッチ | `xai` のみで、`grok-4.5` と `grok-4.6` の `modelAdapters` エントリを原子的に設定または削除します。片方だけの場合は、次のスイッチ操作で両方が正規化されるまで混合状態を表示します。他のオーバーライドと tier 動作は変わりません。 | | `xaiResponsesXSearch?` | `boolean` | デフォルトでは無効です。xAI Responses の宛先では、最終的なリクエスト正規化後もライブの `web_search` ツールが残っている場合にのみ、プロバイダーがホストする `x_search` 宣言を追加します。既存の宣言は重複させず、呼び出し元の `tool_choice` / `allowed_tools` セレクターの範囲を拡張することもありません。また、これは `search.xSearch` オプションを持つウェブ検索サイドカーとは別です。 | | `modelPreferHostedTools?` | `Record` | hosted tool namespace を予約する非 forward Responses gateway 向けの完全一致モデル opt-in。現在は `["image_generation"]` のみを受け付けます。一致したモデルは `openai-responses` wire を使い、その hosted tool をサポートする必要があります。競合するクライアント `image_gen` 宣言を除去し、呼び出し元の tool choice を維持するため selector も書き換えます。OpenAI API の仮想 `-pro` モデルでは、まず選択した公開 ID に一致させ、解決後のベース wire-model ID をフォールバックとして使用します。`modelAdapters` は公開 ID、次にベース ID の順に解決し、後者の結果が最終 wire を決めます。未設定のモデルは通常の alias 動作を維持します。 | diff --git a/docs-site/src/content/docs/ko/guides/providers.md b/docs-site/src/content/docs/ko/guides/providers.md index c49ede4ec6..268e6e0cf1 100644 --- a/docs-site/src/content/docs/ko/guides/providers.md +++ b/docs-site/src/content/docs/ko/guides/providers.md @@ -375,8 +375,8 @@ Amazon Bedrock 네이티브 API처럼 이 구현 중 어느 것과도 맞지 않 **구독 토큰**(일반 API 키가 아님)으로 인증합니다. **Cloudflare AI Gateway**는 URL에 계정 + 게이트웨이 id를 채워야 합니다. -Copilot은 혼합 wire 카탈로그를 제공합니다. GPT-5 계열 모델(`gpt-5.3-codex`, `gpt-5.4`, -`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`)은 에이전트 +Copilot은 혼합 wire 카탈로그를 제공합니다. 모델(`gpt-5.3-codex`, `gpt-5.4`, +`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`)은 에이전트 트래픽에 대해 `/chat/completions`를 거부하므로 opencodex는 이 모델들을 내장 기본값으로 Responses API를 통해 라우팅하고, 다른 Copilot 모델은 모두 chat completions를 유지합니다. 우선순위는 하드 wire 핀 → 명시적 [`modelAdapters`](/ko/reference/configuration/providers/) diff --git a/docs-site/src/content/docs/ko/reference/configuration/providers.md b/docs-site/src/content/docs/ko/reference/configuration/providers.md index 160d313be3..2dda27e7bf 100644 --- a/docs-site/src/content/docs/ko/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ko/reference/configuration/providers.md @@ -105,7 +105,7 @@ managed map을 활성화하면 privacy-safe selector를 만들고, 이후 계정 | `modelReasoningEfforts?` | `Record` | 모델별 레이블입니다. 빈 목록이면 effort 제어를 숨깁니다. | | `modelSupportsReasoningSummaries?` | `Record` | 모델을 `false`로 두면 summary 광고를 멈추고 summary 전달 필드를 제거합니다. | | `modelReasoningSummaryDelivery?` | `Record` | 모델별 Responses 전달 enum입니다. 기존 delivery 필드를 다시 씁니다. | -| `modelAdapters?` | `Record` | 혼합 와이어 게이트웨이를 위한 모델별 `openai-chat` 또는 `openai-responses` 와이어 재정의입니다. 명시적 항목이 레지스트리 기본값보다 우선합니다. DeepSeek 프리셋은 `deepseek-v4-flash`에 네이티브 Responses를 선택할 수 있고, GitHub Copilot은 GPT-5 계열(`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`)을 Responses 전용 기본값으로 선언합니다. 이 모델들은 에이전트 트래픽에서 `/chat/completions`를 거부하기 때문입니다. `gpt-5.4-nano`처럼 기본값이 없는 모델은 여기서 직접 옵트인할 수 있습니다. 단일 와이어 상위 항목과 정식 ChatGPT forward는 재정의를 거부합니다. | +| `modelAdapters?` | `Record` | 혼합 와이어 게이트웨이를 위한 모델별 `openai-chat` 또는 `openai-responses` 와이어 재정의입니다. 명시적 항목이 레지스트리 기본값보다 우선합니다. DeepSeek 프리셋은 `deepseek-v4-flash`에 네이티브 Responses를 선택할 수 있고, GitHub Copilot은 모델(`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`)을 Responses 전용 기본값으로 선언합니다. 이 모델들은 에이전트 트래픽에서 `/chat/completions`를 거부하기 때문입니다. `gpt-5.4-nano`처럼 기본값이 없는 모델은 여기서 직접 옵트인할 수 있습니다. 단일 와이어 상위 항목과 정식 ChatGPT forward는 재정의를 거부합니다. | | xAI Responses 옵트인(대시보드) | 스위치 | `xai`에서만 `grok-4.5`와 `grok-4.6`의 `modelAdapters` 항목을 원자적으로 설정하거나 지웁니다. 한 항목만 있으면 다음 스위치 쓰기가 둘을 정규화할 때까지 혼합 상태로 표시됩니다. 다른 재정의와 티어 동작은 바뀌지 않습니다. | | `xaiResponsesXSearch?` | `boolean` | 기본적으로 비활성화됩니다. xAI Responses 대상에서는 최종 요청 정규화 후에도 실제 `web_search` 도구가 남아 있을 때만 공급자가 호스팅하는 `x_search` 선언을 추가합니다. 기존 선언은 중복하지 않고, 호출자의 `tool_choice`/`allowed_tools` 선택기 범위를 확장하지 않으며, 웹 검색 사이드카의 `search.xSearch` 옵션과는 별개입니다. | | `modelPreferHostedTools?` | `Record` | hosted tool namespace를 예약하는 non-forward Responses gateway용 정확한 모델 ID opt-in입니다. 현재 `["image_generation"]`만 허용하며, 일치하는 모델은 `openai-responses` wire를 사용하고 해당 hosted tool을 지원해야 합니다. 충돌하는 클라이언트 `image_gen` 선언을 제거하고 호출자의 tool choice를 유지하도록 selector도 다시 씁니다. OpenAI API 가상 `-pro` 모델은 선택한 공개 ID를 먼저 일치시키고, 해석된 기본 wire-model ID를 대체값으로 사용합니다. `modelAdapters`는 공개 ID를 먼저, 그 다음 기본 ID를 해석하며, 두 번째 결과가 최종 wire를 결정합니다. 설정하지 않은 모델은 일반 alias 동작을 유지합니다. | diff --git a/docs-site/src/content/docs/reference/configuration/providers.md b/docs-site/src/content/docs/reference/configuration/providers.md index 6aa8c78d00..b0792b7367 100644 --- a/docs-site/src/content/docs/reference/configuration/providers.md +++ b/docs-site/src/content/docs/reference/configuration/providers.md @@ -162,7 +162,7 @@ predictions. Explicit provider/model price overrides still take precedence. | `modelReasoningEfforts?` | `Record` | Per-model labels. An empty list hides effort control. As with `reasoningEfforts`, each configured `google`-adapter ladder asserts `thinkingLevel` capability; direct and Vertex non-image requests use the flat Gemini path, while Cloud Code Assist sends it under its request envelope. | | `modelSupportsReasoningSummaries?` | `Record` | Set a model to `false` to stop advertising summaries and strip summary-delivery fields. | | `modelReasoningSummaryDelivery?` | `Record` | Per-model Responses delivery enum; rewrites an existing delivery field. | -| `modelAdapters?` | `Record` | Per-model `openai-chat` or `openai-responses` wire override for mixed-wire gateways. Explicit entries beat registry defaults. The OpenCode Go preset selects Responses for `gpt-5.6-luna` while leaving sibling models on their documented wires; DeepSeek can select native Responses for `deepseek-v4-flash`; and GitHub Copilot declares Responses-only defaults for its GPT-5 family (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) because those models reject `/chat/completions` for agent traffic. Models without a built-in default (for example `gpt-5.4-nano`) can be opted in here. Single-wire upstream pins and canonical ChatGPT forward reject overrides. | +| `modelAdapters?` | `Record` | Per-model `openai-chat` or `openai-responses` wire override for mixed-wire gateways. Explicit entries beat registry defaults. The OpenCode Go preset selects Responses for `gpt-5.6-luna` while leaving sibling models on their documented wires; DeepSeek can select native Responses for `deepseek-v4-flash`; and GitHub Copilot declares Responses-only defaults for the following models (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) because those models reject `/chat/completions` for agent traffic. Models without a built-in default (for example `gpt-5.4-nano`) can be opted in here. Single-wire upstream pins and canonical ChatGPT forward reject overrides. | | xAI Chat Completions (dashboard / CLI) | switch | Grok 4.5/4.6 OAuth Responses requests default to Responses. Existing Chat overrides are migrated once on upgrade; later Chat choices are preserved. Turn on to select Chat for both models, off to select Responses. CLI: `ocx provider edit xai --xai-chat on` or `--xai-chat off` (running proxy required). Mixed means only one model currently uses Chat. Other overrides and tier policy stay unchanged. API-key and translated Chat/Anthropic defaults are unchanged. | | `xaiResponsesXSearch?` | `boolean` | Disabled by default. On an xAI Responses destination, append the provider-hosted `x_search` declaration only when a live `web_search` tool survives final request normalization. Existing declarations are not duplicated, caller `tool_choice`/`allowed_tools` selectors are never widened, and this is separate from the web-search sidecar's `search.xSearch` options. | | `modelPreferHostedTools?` | `Record` | Exact-model opt-in for non-forward Responses gateways that reserve a hosted-tool namespace. Currently accepts only `["image_generation"]`; a matching model must use the `openai-responses` wire and support that hosted tool. It removes colliding client `image_gen` declarations and rewrites their selectors to preserve caller tool choice. For OpenAI API virtual `-pro` models, the selected public ID is matched first and the resolved base wire-model ID is a fallback. `modelAdapters` resolves the public ID first, then the base ID; the second resolution determines the final wire. Other models retain normal alias behavior. | diff --git a/docs-site/src/content/docs/ru/guides/providers.md b/docs-site/src/content/docs/ru/guides/providers.md index e680f1bd91..80f00c0d63 100644 --- a/docs-site/src/content/docs/ru/guides/providers.md +++ b/docs-site/src/content/docs/ru/guides/providers.md @@ -416,9 +416,9 @@ Assist), `azure` / `azure-openai`, `kiro` и `cursor`. Проприетарны **GitLab Duo** остаётся шлюзом с ключом/токеном подписки на своей OpenAI-совместимой конечной точке. **Cloudflare AI Gateway** требует подставить в URL id аккаунта и шлюза. -Copilot предоставляет каталог со смешанными проводами: его семейство GPT-5 (`gpt-5.3-codex`, -`gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) -отклоняет `/chat/completions` для агентного трафика, поэтому opencodex по умолчанию +Copilot предоставляет каталог со смешанными проводами: модели (`gpt-5.3-codex`, +`gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) +отклоняют `/chat/completions` для агентного трафика, поэтому opencodex по умолчанию маршрутизирует эти модели через Responses API, а все остальные модели Copilot остаются на chat completions. Приоритет: жёсткий wire-пин → явная запись [`modelAdapters`](/ru/reference/configuration/providers/) → дефолт реестра → adapter всего diff --git a/docs-site/src/content/docs/ru/reference/configuration/providers.md b/docs-site/src/content/docs/ru/reference/configuration/providers.md index 7279179991..14a8b0a3ce 100644 --- a/docs-site/src/content/docs/ru/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ru/reference/configuration/providers.md @@ -118,7 +118,7 @@ cross-route credential fallback не существует. Строки API GPT- | `modelReasoningEfforts?` | `Record` | Label'ы по отдельным моделям. Пустой список скрывает управление effort. | | `modelSupportsReasoningSummaries?` | `Record` | Установите `false` для модели, чтобы перестать рекламировать summary и вырезать поля доставки summary. | | `modelReasoningSummaryDelivery?` | `Record` | Responses delivery enum по моделям; переписывает уже существующее поле delivery. | -| `modelAdapters?` | `Record` | Wire-override по модели для `openai-chat` или `openai-responses` в gateway с несколькими wire-форматами. Явные записи имеют приоритет над default'ами registry; preset DeepSeek может выбирать native Responses для `deepseek-v4-flash`, а GitHub Copilot объявляет Responses-only default'ы для семейства GPT-5 (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`), потому что эти модели отклоняют `/chat/completions` для агентного трафика. Модели без встроенного default'а (например, `gpt-5.4-nano`) можно включить здесь. Single-wire upstream pin'ы и canonical ChatGPT forward override не принимают. | +| `modelAdapters?` | `Record` | Wire-override по модели для `openai-chat` или `openai-responses` в gateway с несколькими wire-форматами. Явные записи имеют приоритет над default'ами registry; preset DeepSeek может выбирать native Responses для `deepseek-v4-flash`, а GitHub Copilot объявляет Responses-only default'ы для моделей (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`), потому что эти модели отклоняют `/chat/completions` для агентного трафика. Модели без встроенного default'а (например, `gpt-5.4-nano`) можно включить здесь. Single-wire upstream pin'ы и canonical ChatGPT forward override не принимают. | | Opt-in xAI Responses (панель) | переключатель | Только для `xai`: атомарно задаёт или удаляет записи `modelAdapters` для `grok-4.5` и `grok-4.6`. Одна запись отображается как смешанное состояние до следующего переключения. Остальные override и поведение tier не меняются. | | `xaiResponsesXSearch?` | `boolean` | По умолчанию отключено. Для назначения xAI Responses декларация `x_search`, размещённая у провайдера, добавляется только тогда, когда действующий инструмент `web_search` сохраняется после окончательной нормализации запроса. Существующие декларации не дублируются, селекторы вызывающей стороны `tool_choice`/`allowed_tools` никогда не расширяются, и эта настройка не связана с параметрами `search.xSearch` сайдкара веб-поиска. | | `modelPreferHostedTools?` | `Record` | Opt-in для точного model ID в non-forward Responses gateway, который резервирует namespace hosted tool. Сейчас допускается только `["image_generation"]`; совпавшая модель должна использовать wire `openai-responses` и поддерживать этот hosted tool. Прокси удаляет конфликтующие клиентские объявления `image_gen` и переписывает их selectors, сохраняя caller tool choice. Для виртуальных моделей OpenAI API `-pro` сначала сопоставляется выбранный публичный ID, а затем в качестве fallback используется ID базовой wire-модели. `modelAdapters` сначала разрешается по публичному ID, затем по базовому ID; второй результат определяет итоговый wire. Остальные модели сохраняют обычное alias-поведение. | diff --git a/docs-site/src/content/docs/tr/guides/providers.md b/docs-site/src/content/docs/tr/guides/providers.md index 6ff4f1c038..5943758e5a 100644 --- a/docs-site/src/content/docs/tr/guides/providers.md +++ b/docs-site/src/content/docs/tr/guides/providers.md @@ -589,8 +589,8 @@ login github-copilot`). **GitLab Duo**, OpenAI uyumlu uç noktasında bir anahtar/abonelik belirteci ağ geçidi olarak kalır. **Cloudflare AI Gateway**, URL'ye doldurulan hesap + ağ geçidi kimliklerinize ihtiyaç duyar. -Copilot karma hatlı bir katalog sunar: GPT-5 ailesi (`gpt-5.3-codex`, `gpt-5.4`, -`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) ajan +Copilot karma hatlı bir katalog sunar: modeller (`gpt-5.3-codex`, `gpt-5.4`, +`gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) ajan trafiği için `/chat/completions`'ı reddeder, bu nedenle opencodex yerleşik varsayılan olarak bu modelleri Responses API üzerinden yönlendirirken diğer tüm Copilot modelleri sohbet tamamlamalarında kalır. Öncelik sırası: sabit hat diff --git a/docs-site/src/content/docs/tr/reference/configuration/providers.md b/docs-site/src/content/docs/tr/reference/configuration/providers.md index 91cb923fc3..3e01051010 100644 --- a/docs-site/src/content/docs/tr/reference/configuration/providers.md +++ b/docs-site/src/content/docs/tr/reference/configuration/providers.md @@ -123,7 +123,7 @@ alanlı seçilmiş kimlikleri yalın kimliklere yeniden yazar. | `modelReasoningEfforts?` | `Record` | Model başına etiketler. Boş bir liste çaba denetimini gizler. `reasoningEfforts`'ta olduğu gibi, yapılandırılmış her `google` adaptör merdiveni `thinkingLevel` yeteneğini iddia eder; doğrudan ve Vertex görsel olmayan istekleri düz Gemini yolunu kullanırken, Cloud Code Assist bunu istek zarfı altında gönderir. | | `modelSupportsReasoningSummaries?` | `Record` | Özetlerin bildirilmesini durdurmak ve özet teslim alanlarını kaldırmak için bir modeli `false` olarak ayarlayın. | | `modelReasoningSummaryDelivery?` | `Record` | Model başına Responses teslim enum'ı; mevcut bir teslim alanını yeniden yazar. | -| `modelAdapters?` | `Record` | Karışık hatlı ağ geçitleri için model başına `openai-chat` veya `openai-responses` hat geçersiz kılma. Açık girdiler kayıt defteri varsayılanlarını yener. OpenCode Go önayarı, kardeş modelleri belgelenmiş hatlarında bırakırken `gpt-5.6-luna` için Responses'ı seçer; DeepSeek, `deepseek-v4-flash` için yerel Responses seçebilir; ve GitHub Copilot, GPT-5 ailesi (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`) için yalnızca Responses varsayılanlarını bildirir çünkü bu modeller ajan trafiği için `/chat/completions`'ı reddeder. Yerleşik varsayılanı olmayan modeller (örneğin `gpt-5.4-nano`) burada dahil edilebilir. Tek hatlı yukarı akış pinleri ve kurallı ChatGPT iletme geçersiz kılmaları reddeder. | +| `modelAdapters?` | `Record` | Karışık hatlı ağ geçitleri için model başına `openai-chat` veya `openai-responses` hat geçersiz kılma. Açık girdiler kayıt defteri varsayılanlarını yener. OpenCode Go önayarı, kardeş modelleri belgelenmiş hatlarında bırakırken `gpt-5.6-luna` için Responses'ı seçer; DeepSeek, `deepseek-v4-flash` için yerel Responses seçebilir; ve GitHub Copilot, modeller (`gpt-5.3-codex`, `gpt-5.4`, `gpt-5.4-mini`, `gpt-5.5`, `gpt-5.6-luna`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`) için yalnızca Responses varsayılanlarını bildirir çünkü bu modeller ajan trafiği için `/chat/completions`'ı reddeder. Yerleşik varsayılanı olmayan modeller (örneğin `gpt-5.4-nano`) burada dahil edilebilir. Tek hatlı yukarı akış pinleri ve kurallı ChatGPT iletme geçersiz kılmaları reddeder. | | xAI Responses katılımı (panel) | anahtar | Yalnızca `xai` için `grok-4.5` ve `grok-4.6` `modelAdapters` girdilerini atomik olarak ayarlar veya temizler. Tek girdi, sonraki anahtar yazımı ikisini eşitleyene kadar karma durum olarak görünür. Diğer geçersiz kılmalar ve katman davranışı değişmez. | | `xaiResponsesXSearch?` | `boolean` | Varsayılan olarak devre dışıdır. Bir xAI Responses hedefinde, yalnızca canlı bir `web_search` aracı son istek normalleştirmesinden sağ çıktığında sağlayıcı tarafından barındırılan `x_search` bildirimini ekler. Mevcut bildirimler yinelenmez, çağıranın `tool_choice`/`allowed_tools` seçicileri hiçbir zaman genişletilmez ve bu, web araması yardımcı hizmetinin `search.xSearch` seçeneklerinden ayrıdır. | | `modelPreferHostedTools?` | `Record` | Barındırılan bir araç ad alanı ayıran iletme harici Responses ağ geçitleri için tam model dahil etme. Şu anda yalnızca `["image_generation"]` kabul eder; eşleşen bir model `openai-responses` hattını kullanmalı ve bu barındırılan aracı desteklemelidir. Çakışan istemci `image_gen` bildirimlerini kaldırır ve arayan araç seçimini korumak için seçicilerini yeniden yazar. OpenAI API sanal `-pro` modelleri için önce seçilen genel kimlik eşleştirilir ve çözümlenen temel hat model kimliği bir geri dönüştür. `modelAdapters` önce genel kimliği, ardından temel kimliği çözer; ikinci çözümleme son hattı belirler. Diğer modeller normal takma ad davranışını korur. | diff --git a/docs-site/src/content/docs/zh-cn/guides/providers.md b/docs-site/src/content/docs/zh-cn/guides/providers.md index b4010cdae5..314894c3d1 100644 --- a/docs-site/src/content/docs/zh-cn/guides/providers.md +++ b/docs-site/src/content/docs/zh-cn/guides/providers.md @@ -359,8 +359,8 @@ GPT-5.6 Sol/Terra/Luna 会预置在提供商的回退列表中,因此即使实 使用 Bearer **订阅令牌**(而非普通 API 密钥)进行认证。 **Cloudflare AI Gateway** 需要将 account 和 gateway id 填入 URL。 -Copilot 提供混合 wire 目录:其 GPT-5 系列模型(`gpt-5.3-codex`、`gpt-5.4`、 -`gpt-5.4-mini`、`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`)会拒绝面向 +Copilot 提供混合 wire 目录:其模型(`gpt-5.3-codex`、`gpt-5.4`、 +`gpt-5.4-mini`、`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`、`gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`)会拒绝面向 agent 流量的 `/chat/completions`,因此 opencodex 默认将这些模型路由到 Responses API,而其他 Copilot 模型仍走 chat completions。优先级为:硬 wire 固定 → 显式 [`modelAdapters`](/zh-cn/reference/configuration/providers/) 条目 → 注册表默认值 → 提供商级 diff --git a/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md b/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md index f121d67bc0..32f2b52a69 100644 --- a/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md +++ b/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md @@ -105,7 +105,7 @@ selector,而不是分配一个新名称。 | `modelReasoningEfforts?` | `Record` | 按模型设置的标签。空列表会隐藏 effort 控件。 | | `modelSupportsReasoningSummaries?` | `Record` | 将某个模型设为 `false`,即可停止暴露摘要并移除摘要交付字段。 | | `modelReasoningSummaryDelivery?` | `Record` | 按模型设置的 Responses 交付枚举;会重写现有的 delivery 字段。 | -| `modelAdapters?` | `Record` | 按模型设置的 `openai-chat` 或 `openai-responses` 线协议覆盖项,用于混合线协议网关。显式条目优先于注册表默认值;DeepSeek 预设可以为 `deepseek-v4-flash` 选择原生 Responses,GitHub Copilot 则为 GPT-5 系列(`gpt-5.3-codex`、`gpt-5.4`、`gpt-5.4-mini`、`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`)声明了 Responses 专用默认值,因为这些模型在代理流量下会拒绝 `/chat/completions`。没有内置默认值的模型(例如 `gpt-5.4-nano`)可以在此手动启用。单一线协议上游固定项和规范 ChatGPT forward 会拒绝覆盖。 | +| `modelAdapters?` | `Record` | 按模型设置的 `openai-chat` 或 `openai-responses` 线协议覆盖项,用于混合线协议网关。显式条目优先于注册表默认值;DeepSeek 预设可以为 `deepseek-v4-flash` 选择原生 Responses,GitHub Copilot 则为 模型(`gpt-5.3-codex`、`gpt-5.4`、`gpt-5.4-mini`、`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`、`gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`)声明了 Responses 专用默认值,因为这些模型在代理流量下会拒绝 `/chat/completions`。没有内置默认值的模型(例如 `gpt-5.4-nano`)可以在此手动启用。单一线协议上游固定项和规范 ChatGPT forward 会拒绝覆盖。 | | xAI Responses 启用项(仪表板) | 开关 | 仅用于 `xai`,以原子方式设置或清除 `grok-4.5` 和 `grok-4.6` 的 `modelAdapters` 条目。若只存在一个条目,则显示混合状态,直到下次开关写入将两者统一。其他覆盖项和层级行为不变。 | | `xaiResponsesXSearch?` | `boolean` | 默认禁用。在 xAI Responses 目标上,仅当有效的 `web_search` 工具在最终请求规范化后仍保留时,才附加由提供方托管的 `x_search` 声明。不会重复已有声明,绝不会扩大调用方的 `tool_choice`/`allowed_tools` 选择范围,并且此项独立于网络搜索辅助服务的 `search.xSearch` 选项。 | | `modelPreferHostedTools?` | `Record` | 非 forward Responses gateway 的精确模型 ID opt-in,用于上游预留 hosted tool namespace 的情况。目前只支持 `["image_generation"]`;匹配模型必须使用 `openai-responses` wire 且支持该 hosted 工具。它会移除冲突的客户端 `image_gen` 声明,并改写其 selector 以保持调用方的 tool choice。对于 OpenAI API 的虚拟 `-pro` 模型,先匹配所选公开 ID,未命中时才使用解析出的基础 wire-model ID 作为回退。`modelAdapters` 会先按公开 ID、再按基础 ID 解析;后一次结果决定最终 wire。未配置模型保持普通 alias 行为。 | diff --git a/docs-site/src/content/docs/zh-tw/guides/providers.md b/docs-site/src/content/docs/zh-tw/guides/providers.md index d26d093b7e..a1b4483cf3 100644 --- a/docs-site/src/content/docs/zh-tw/guides/providers.md +++ b/docs-site/src/content/docs/zh-tw/guides/providers.md @@ -460,8 +460,8 @@ Antigravity/Cloud Code Assist 模式)、`azure` / `azure-openai`、`kiro`、 短效 Copilot API token,不是貼上 API key。**GitLab Duo** 仍是使用 OpenAI-compatible endpoint 的 key/subscription-token gateway。**Cloudflare AI Gateway** 需要在 URL 填入 account 與 gateway id。 -Copilot 的 catalog 混合多種 wire:GPT-5 family(`gpt-5.3-codex`、`gpt-5.4`、`gpt-5.4-mini`、 -`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`)會拒絕 agent traffic 的 +Copilot 的 catalog 混合多種 wire:模型(`gpt-5.3-codex`、`gpt-5.4`、`gpt-5.4-mini`、 +`gpt-5.5`、`gpt-5.6-luna`、`gpt-5.6-sol`、`gpt-5.6-terra`、`gpt-6-astra`, `grok-4.5`, `grok-4.6`, `mai-code-1.1-flash`, `mai-code-1-flash-picker`)會拒絕 agent traffic 的 `/chat/completions`,因此 opencodex 會依內建預設把這些模型路由到 Responses API;其他 Copilot 模型 仍使用 chat completions。優先順序為:hard wire pin → 你明確設定的 [`modelAdapters`](/zh-tw/reference/configuration/providers/) → registry default → provider-wide adapter。 diff --git a/src/providers/registry.ts b/src/providers/registry.ts index ef7cb59e00..b1f689a8bd 100644 --- a/src/providers/registry.ts +++ b/src/providers/registry.ts @@ -3081,6 +3081,11 @@ export const PROVIDER_REGISTRY: readonly ProviderRegistryEntry[] = [ "gpt-5.6-luna": "openai-responses", "gpt-5.6-sol": "openai-responses", "gpt-5.6-terra": "openai-responses", + "gpt-6-astra": "openai-responses", + "grok-4.5": "openai-responses", + "grok-4.6": "openai-responses", + "mai-code-1.1-flash": "openai-responses", + "mai-code-1-flash-picker": "openai-responses", }, note: "Experimental unofficial Copilot bridge. Logs in via GitHub device flow using the public VS Code OAuth client id, then exchanges for a short-lived Copilot API token (copilot_internal). Requires an active Copilot subscription. GitHub may tighten or revoke this path; do not send confidential material you would not paste into Copilot Chat.", }, diff --git a/tests/providers/github-copilot/github-copilot-wire-defaults.test.ts b/tests/providers/github-copilot/github-copilot-wire-defaults.test.ts index 29af09048d..50019d02cf 100644 --- a/tests/providers/github-copilot/github-copilot-wire-defaults.test.ts +++ b/tests/providers/github-copilot/github-copilot-wire-defaults.test.ts @@ -8,7 +8,10 @@ * flipped the wire back, so the end-to-end cases assert the captured upstream URL — * the externally observable wire. Pattern mirrors tests/providers/deepseek-inbound-wire.test.ts. */ -import { afterEach, describe, expect, test } from "bun:test"; +import { afterEach, describe, expect, spyOn, test } from "bun:test"; +import * as oauth from "../../../src/oauth"; +import { fetchProviderModels } from "../../../src/codex/catalog/provider-fetch"; +import { clearModelCache } from "../../../src/codex/model-cache"; import { providerConfigSeed } from "../../../src/providers/derive"; import { getProviderRegistryEntry } from "../../../src/providers/registry"; import { resolveWireProtocolOverride } from "../../../src/server/adapter-resolve"; @@ -23,11 +26,42 @@ const RESPONSES_ONLY = [ "gpt-5.6-luna", "gpt-5.6-sol", "gpt-5.6-terra", + "gpt-6-astra", + "grok-4.5", + "grok-4.6", + "mai-code-1.1-flash", + "mai-code-1-flash-picker", ] as const; const CHAT_SERVED = ["gpt-4o", "gpt-4.1", "gpt-4.1-mini", "claude-sonnet-4", "gemini-2.5-pro", "gpt-5-mini"] as const; const INBOUNDS = ["responses", "chat", "anthropic"] as const; +const DISCOVERY_ONLY = ["gpt-6-astra", "grok-4.5", "grok-4.6", "mai-code-1.1-flash", "mai-code-1-flash-picker"]; + +describe("Copilot discovery-only models do not widen the cold-start seed", () => { + for (const authMode of ["key", "oauth"] as const) { + test(`${authMode} discovery exposes new models but failure retains the configured seed`, async () => { + const auth = spyOn(oauth, "resolveModelsAuthToken").mockResolvedValue("test-token"); + const original = globalThis.fetch; + const provider = { ...providerConfigSeed(getProviderRegistryEntry("github-copilot")!), authMode, apiKey: "test-token" }; + try { + clearModelCache("github-copilot"); + globalThis.fetch = (async () => Response.json({ data: DISCOVERY_ONLY.map(id => ({ id })) })) as typeof fetch; + const live = await fetchProviderModels("github-copilot", { ...provider, fetch: globalThis.fetch } as OcxProviderConfig, 0); + expect(live.map(model => model.id).sort()).toEqual([...DISCOVERY_ONLY].sort()); + clearModelCache("github-copilot"); + globalThis.fetch = (async () => new Response("unavailable", { status: 503 })) as typeof fetch; + const fallback = await fetchProviderModels("github-copilot", { ...provider, fetch: globalThis.fetch } as OcxProviderConfig, 0); + expect(fallback.map(model => model.id).sort()).toEqual([...provider.models!].sort()); + for (const model of DISCOVERY_ONLY) expect(fallback.some(row => row.id === model)).toBe(false); + } finally { + globalThis.fetch = original; + auth.mockRestore(); + clearModelCache("github-copilot"); + } + }); + } +}); function copilotProvider(): OcxProviderConfig { // The entry's allowKeyAuthOverride lets tests use key auth instead of live OAuth. @@ -57,13 +91,15 @@ describe("Copilot chat-served models stay on the provider chat wire", () => { }); describe("explicit modelAdapters beat the registry default in both directions", () => { - test("opt-out: a listed Responses-default model pinned back to chat", () => { - const provider = { ...copilotProvider(), modelAdapters: { "gpt-5.4": "openai-chat" } }; - for (const inbound of INBOUNDS) { - expect(resolveWireProtocolOverride("github-copilot", "gpt-5.4", provider, inbound).adapter) - .toBe("openai-chat"); - } - }); + for (const model of RESPONSES_ONLY) { + test(`opt-out: ${model} pinned back to chat`, () => { + const provider = { ...copilotProvider(), modelAdapters: { [model]: "openai-chat" } }; + for (const inbound of INBOUNDS) { + expect(resolveWireProtocolOverride("github-copilot", model, provider, inbound).adapter) + .toBe("openai-chat"); + } + }); + } test("opt-in: an unlisted model mapped to Responses (the gpt-5.4-nano escape hatch)", () => { const provider = { ...copilotProvider(), modelAdapters: { "gpt-5.4-nano": "openai-responses" } }; @@ -81,13 +117,15 @@ describe("explicit modelAdapters beat the registry default in both directions", }); describe("the registry default is isolated to the copilot provider", () => { - test("a same-named model on another provider is untouched", () => { - const other: OcxProviderConfig = { adapter: "openai-chat", baseUrl: "https://example.com/v1", apiKey: "sk-test" }; - for (const inbound of INBOUNDS) { - expect(resolveWireProtocolOverride("some-custom", "gpt-5.4", other, inbound).adapter) - .toBe("openai-chat"); - } - }); + for (const model of RESPONSES_ONLY) { + test(`${model} on another provider is untouched`, () => { + const other: OcxProviderConfig = { adapter: "openai-chat", baseUrl: "https://example.com/v1", apiKey: "sk-test" }; + for (const inbound of INBOUNDS) { + expect(resolveWireProtocolOverride("some-custom", model, other, inbound).adapter) + .toBe("openai-chat"); + } + }); + } test("resolution preserves credentials and base URL through the copy", () => { const resolved = resolveWireProtocolOverride("github-copilot", "gpt-5.4", copilotProvider(), "responses"); @@ -143,6 +181,14 @@ describe("the wire default survives the handleResponses replay", () => { expect(url).not.toContain("/chat/completions"); }); + for (const model of ["gpt-6-astra", "grok-4.5", "grok-4.6", "mai-code-1.1-flash", "mai-code-1-flash-picker"]) { + for (const inbound of INBOUNDS) { + test(`${model} reaches /responses on ${inbound} inbound replay`, async () => { + expect(await drive(model, inbound)).toBe("https://api.githubcopilot.com/v1/responses"); + }); + } + } + test("gpt-4o still reaches /chat/completions", async () => { expect(await drive("gpt-4o", "responses")).toBe("https://api.githubcopilot.com/chat/completions"); }); From 6061dcce02bb8955dd8c4cfc353af3ed64082301 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:20:21 +0900 Subject: [PATCH 109/221] test(kiro): isolate and restore every debug setting the diagnostics gate reads [skip ci] Resolves the maintainer objection on #3837 (discussion_r3945935220): the shared setup cleared only OCX_DEBUG_FRAMES, so an inherited OCX_DEBUG=1 or a runtime debug override made the encoder-spy test fail legitimately. Snapshot OCX_DEBUG, OCX_DEBUG_FRAMES and the runtime override in beforeEach, clear them, and restore the exact previous values in afterEach. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- tests/providers/kiro/kiro-stream.test.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/providers/kiro/kiro-stream.test.ts b/tests/providers/kiro/kiro-stream.test.ts index 1a9b7a6e02..47dfaf1833 100644 --- a/tests/providers/kiro/kiro-stream.test.ts +++ b/tests/providers/kiro/kiro-stream.test.ts @@ -16,6 +16,11 @@ import { parseKiroEvent } from "../../../src/adapters/kiro-events"; import { resetKiroThrottleStateForTests } from "../../../src/adapters/kiro-retry"; import { resetKiroCalibration } from "../../../src/adapters/kiro-calibration"; import { buildResponseJSON } from "../../../src/bridge"; +import { + clearDebugSetting, + getDebugSettings, + setDebugSettings, +} from "../../../src/lib/debug-settings"; import { encodeMessage } from "../../../src/lib/eventstream-decoder"; import { estimateTokens } from "../../../src/lib/token-estimate"; import { createTranslatorBudget } from "../../../src/lib/translator-budget"; @@ -34,11 +39,16 @@ const origApiRegion = process.env.KIRO_API_REGION; const origArn = process.env.KIRO_PROFILE_ARN; const origCredsFile = process.env.KIRO_CREDS_FILE; const origCredentialsFile = process.env.KIRO_CREDENTIALS_FILE; -const origDebugFrames = process.env.OCX_DEBUG_FRAMES; +let origDebug: string | undefined; +let origDebugFrames: string | undefined; +let origDebugOverride: boolean | undefined; const realFetch = globalThis.fetch; let tmp: string; beforeEach(() => { + origDebug = process.env.OCX_DEBUG; + origDebugFrames = process.env.OCX_DEBUG_FRAMES; + origDebugOverride = getDebugSettings().runtimeOverride.debug; tmp = mkdtempSync(join(tmpdir(), "kiro-stream-")); process.env.HOME = tmp; process.env.KIRO_REGION = "us-east-1"; @@ -46,7 +56,9 @@ beforeEach(() => { delete process.env.KIRO_PROFILE_ARN; delete process.env.KIRO_CREDS_FILE; delete process.env.KIRO_CREDENTIALS_FILE; + delete process.env.OCX_DEBUG; delete process.env.OCX_DEBUG_FRAMES; + clearDebugSetting("debug"); }); afterEach(() => { globalThis.fetch = realFetch; @@ -57,7 +69,10 @@ afterEach(() => { if (origArn === undefined) delete process.env.KIRO_PROFILE_ARN; else process.env.KIRO_PROFILE_ARN = origArn; if (origCredsFile === undefined) delete process.env.KIRO_CREDS_FILE; else process.env.KIRO_CREDS_FILE = origCredsFile; if (origCredentialsFile === undefined) delete process.env.KIRO_CREDENTIALS_FILE; else process.env.KIRO_CREDENTIALS_FILE = origCredentialsFile; + if (origDebug === undefined) delete process.env.OCX_DEBUG; else process.env.OCX_DEBUG = origDebug; if (origDebugFrames === undefined) delete process.env.OCX_DEBUG_FRAMES; else process.env.OCX_DEBUG_FRAMES = origDebugFrames; + if (origDebugOverride === undefined) clearDebugSetting("debug"); + else setDebugSettings({ debug: origDebugOverride }); removeTreeWithRetry(tmp); }); From 25689e1ec3631ba2ca8735bb41d4fd4d366d44a4 Mon Sep 17 00:00:00 2001 From: luvs01 <27862058+luvs01@users.noreply.github.com> Date: Mon, 7 Sep 2026 10:54:56 +0900 Subject: [PATCH 110/221] fix(responses): bound the streaming citation marker span [skip ci] (cherry picked from commit 8ef77f773523ba3ec55202a79f5abad247166026) Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/responses/citation-markers.ts | 17 +++++++++++++++++ tests/responses/citation-markers.test.ts | 22 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/responses/citation-markers.ts b/src/responses/citation-markers.ts index 5fe58142cf..b65477b66e 100644 --- a/src/responses/citation-markers.ts +++ b/src/responses/citation-markers.ts @@ -68,6 +68,15 @@ export interface CitationMarkerFilter { flush(): string; } +/** + * Upper bound on the text withheld for one unterminated START. + * + * A real span is `cite` plus a few turn-scoped ids, so it is far under this. Without a + * bound, a backend that emits a START and never terminates it makes `held` grow for the + * whole response, and every later delta re-scans that accumulated prefix. + */ +const MAX_STREAMING_MARKER_SPAN_LENGTH = 4_096; + /** * Streaming filter. * @@ -75,6 +84,9 @@ export interface CitationMarkerFilter { * next — so a stateless per-delta strip would emit the tail of a span it never recognized. * This holds back the text from an unterminated START and releases it once the END arrives * (removed) or the stream ends (verbatim, so nothing the model actually said is lost). + * + * A span that grows past `MAX_STREAMING_MARKER_SPAN_LENGTH` is malformed ordinary text, so + * it is released verbatim instead of withheld; a later START can still open a valid span. */ export function createCitationMarkerFilter(): CitationMarkerFilter { // Text from an open START that has not been terminated yet. @@ -87,6 +99,11 @@ export function createCitationMarkerFilter(): CitationMarkerFilter { if (start === -1) return stripCitationMarkers(combined); const endAfterStart = combined.indexOf(CITATION_MARKER_END, start + 1); if (endAfterStart !== -1) return stripCitationMarkers(combined); + // Over the bound: this is not a citation span we will ever close. Emit it verbatim + // so neither the retained text nor the per-delta rescan grows without limit. + if (combined.length - start > MAX_STREAMING_MARKER_SPAN_LENGTH) { + return stripCitationMarkers(combined.slice(0, start)) + combined.slice(start); + } // The trailing span is still open: emit everything before it, hold the rest. held = combined.slice(start); return stripCitationMarkers(combined.slice(0, start)); diff --git a/tests/responses/citation-markers.test.ts b/tests/responses/citation-markers.test.ts index 0c1921750c..6145dbe688 100644 --- a/tests/responses/citation-markers.test.ts +++ b/tests/responses/citation-markers.test.ts @@ -87,4 +87,26 @@ describe("streaming citation marker filter (#3150)", () => { const filter = createCitationMarkerFilter(); expect(filter.push(`visible now ${S}cite`)).toBe("visible now "); }); + + test("an unterminated span past the bound is released instead of retained", () => { + // A backend that opens a span and never closes it must not make the filter accumulate + // the rest of the response, which every later delta would then re-scan. + const filter = createCitationMarkerFilter(); + let out = filter.push(`kept ${S}cite`); + expect(out).toBe("kept "); + for (let i = 0; i < 5_000; i += 1) out += filter.push("x"); + + // Everything after the malformed START is emitted verbatim, so nothing is lost, and + // flush() has nothing left to release. + expect(out).toBe(`kept ${S}cite${"x".repeat(5_000)}`); + expect(filter.flush()).toBe(""); + }); + + test("a later START still opens a valid span after a released malformed one", () => { + const filter = createCitationMarkerFilter(); + let out = filter.push(`a${S}${"y".repeat(5_000)}`); + out += filter.push(`${S}cite${P}turn1view0${E} tail`); + expect(out).toBe(`a${S}${"y".repeat(5_000)} tail`); + expect(filter.flush()).toBe(""); + }); }); From 00b74c7200ea5d33dbe495cc39788a91cbe4fd2b Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:22:45 +0900 Subject: [PATCH 111/221] fix(responses): keep an oversized citation span verbatim before a later marker in the same delta [skip ci] Resolves the unresolved major finding on #3843 (discussion_r3946034145): lastIndexOf selected the later START, its END made the whole-string strip pair the first START with that END, and the malformed text vanished. Walk START-delimited segments independently so a superseded or over-bound span is emitted verbatim and only a bounded trailing span is held for the next delta. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/responses/citation-markers.ts | 34 +++++++++++++++--------- tests/responses/citation-markers.test.ts | 8 ++++++ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/responses/citation-markers.ts b/src/responses/citation-markers.ts index b65477b66e..3e3943cad5 100644 --- a/src/responses/citation-markers.ts +++ b/src/responses/citation-markers.ts @@ -95,18 +95,29 @@ export function createCitationMarkerFilter(): CitationMarkerFilter { push(delta: string): string { const combined = held + delta; held = ""; - const start = combined.lastIndexOf(CITATION_MARKER_START); - if (start === -1) return stripCitationMarkers(combined); - const endAfterStart = combined.indexOf(CITATION_MARKER_END, start + 1); - if (endAfterStart !== -1) return stripCitationMarkers(combined); - // Over the bound: this is not a citation span we will ever close. Emit it verbatim - // so neither the retained text nor the per-delta rescan grows without limit. - if (combined.length - start > MAX_STREAMING_MARKER_SPAN_LENGTH) { - return stripCitationMarkers(combined.slice(0, start)) + combined.slice(start); + let start = combined.indexOf(CITATION_MARKER_START); + if (start === -1) return combined; + let out = combined.slice(0, start); + // Walk START-delimited segments independently so an earlier malformed START is never + // paired with a later span's END (the whole-string strip would do exactly that). + while (start !== -1) { + const nextStart = combined.indexOf(CITATION_MARKER_START, start + 1); + const segment = combined.slice(start, nextStart === -1 ? combined.length : nextStart); + const end = segment.indexOf(CITATION_MARKER_END, 1); + if (end !== -1) { + // A complete span: drop it, keep whatever trails it inside this segment. + out += segment.slice(end + 1); + } else if (nextStart === -1 && segment.length <= MAX_STREAMING_MARKER_SPAN_LENGTH) { + // Only a bounded trailing span can still be completed by a later delta. + held = segment; + } else { + // Superseded by a later START, or over the bound: ordinary text, emitted verbatim + // so neither the retained text nor the per-delta rescan grows without limit. + out += segment; + } + start = nextStart; } - // The trailing span is still open: emit everything before it, hold the rest. - held = combined.slice(start); - return stripCitationMarkers(combined.slice(0, start)); + return out; }, flush(): string { const rest = held; @@ -115,4 +126,3 @@ export function createCitationMarkerFilter(): CitationMarkerFilter { }, }; } - diff --git a/tests/responses/citation-markers.test.ts b/tests/responses/citation-markers.test.ts index 6145dbe688..dcc7f9abc6 100644 --- a/tests/responses/citation-markers.test.ts +++ b/tests/responses/citation-markers.test.ts @@ -109,4 +109,12 @@ describe("streaming citation marker filter (#3150)", () => { expect(out).toBe(`a${S}${"y".repeat(5_000)} tail`); expect(filter.flush()).toBe(""); }); + + test("an oversized malformed span survives a later valid marker in the same delta", () => { + const filter = createCitationMarkerFilter(); + const malformed = `${S}${"y".repeat(5_000)}`; + expect(filter.push(`a${span}${malformed}${S}cite${P}turn1view0${E} tail`)) + .toBe(`a${malformed} tail`); + expect(filter.flush()).toBe(""); + }); }); From 924b65799d32f22e1ec0bdb8cc216897bc8527ef Mon Sep 17 00:00:00 2001 From: luvs01 <27862058+luvs01@users.noreply.github.com> Date: Mon, 7 Sep 2026 11:02:32 +0900 Subject: [PATCH 112/221] fix(providers): refuse keychain restore across provider ownership [skip ci] (cherry picked from commit 73abec9a995d157e3acb55edfd7d8f082cc11aae) Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/providers/key-store.ts | 22 +++++++++++++++ tests/providers/provider-key-store.test.ts | 32 +++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/providers/key-store.ts b/src/providers/key-store.ts index 12e4ce6cb7..614fd3372f 100644 --- a/src/providers/key-store.ts +++ b/src/providers/key-store.ts @@ -64,6 +64,16 @@ function keychainAccount(reference: string): string { return reference.slice(KEYCHAIN_REFERENCE_PREFIX.length); } +/** + * A reference belongs to `name` only when its account is that provider's own active account + * or one of its pool accounts. `storeProviderKeyInKeychain` writes exactly those two shapes, + * so anything else in a provider's config names another provider's secret. + */ +function keychainReferenceBelongsToProvider(reference: string, name: string): boolean { + const account = keychainAccount(reference); + return account === name || account.startsWith(`${name}/`); +} + function readKeychain(account: string): string | undefined { const cached = resolvedCache.get(account); if (cached !== undefined) return cached; @@ -185,6 +195,18 @@ export function restoreProviderKeyFromKeychain(config: OcxConfig, name: string): const pool = provider.apiKeyPool ?? []; const resolved = new Map(); const refs = [provider.apiKey, ...pool.map(e => e.key)].filter(isKeychainReference); + // Restore reads a secret out of the keychain, writes it back to config as plaintext, and then + // DELETES the keychain item. Following a reference to another provider's account would both + // disclose that secret through this provider's config and destroy the real owner's credential, + // so refuse before anything is read or removed. + const foreign = refs.filter(ref => !keychainReferenceBelongsToProvider(ref, name)); + if (foreign.length > 0) { + return { + ok: false, + error: `provider "${name}" references a keychain account it does not own (${foreign.length} reference(s)); config left unchanged`, + status: 400, + }; + } for (const ref of refs) { const account = keychainAccount(ref); if (resolved.has(account)) continue; diff --git a/tests/providers/provider-key-store.test.ts b/tests/providers/provider-key-store.test.ts index 645920e32c..1197a1fea9 100644 --- a/tests/providers/provider-key-store.test.ts +++ b/tests/providers/provider-key-store.test.ts @@ -156,6 +156,37 @@ describe("store / restore", () => { expect(probeProviderKeychain().available).toBe(false); }); + test("restore refuses a reference to another provider's keychain account", () => { + const { store, factory } = fakeKeychain(); + setProviderKeychainEntryFactoryForTests(factory); + const config = loadConfig(); + config.providers.other = { adapter: "openai-chat", baseUrl: "https://other.example/v1", apiKey: POOL_SECRET }; + expect(storeProviderKeyInKeychain(config, "other")).toEqual({ ok: true, moved: 1 }); + expect(config.providers.other!.apiKey).toBe("keychain:other"); + + // Point "relay" at the account "other" owns. Restore would otherwise read that secret, + // write it into relay's config as plaintext, and delete the owner's keychain item. + config.providers.relay!.apiKey = "keychain:other"; + const result = restoreProviderKeyFromKeychain(config, "relay"); + expect(result.ok).toBe(false); + if (!result.ok) expect(result.status).toBe(400); + + expect(config.providers.relay!.apiKey).toBe("keychain:other"); + expect(readFileSync(join(testDir, "config.json"), "utf8")).not.toContain(POOL_SECRET); + // The real owner's secret is still in the keychain and still resolves for that provider. + expect(store.size).toBe(1); + expect(resolveProviderApiKey(config.providers.other!.apiKey)).toBe(POOL_SECRET); + }); + + test("restore still accepts a provider's own active and pool accounts", () => { + const { factory } = fakeKeychain(); + setProviderKeychainEntryFactoryForTests(factory); + const config = loadConfig(); + config.providers.relay!.apiKeyPool = [{ id: "a1", key: SECRET }, { id: "b2", key: POOL_SECRET }]; + expect(storeProviderKeyInKeychain(config, "relay")).toEqual({ ok: true, moved: 2 }); + expect(restoreProviderKeyFromKeychain(config, "relay")).toEqual({ ok: true, restored: 2 }); + }); + test("management route: GET reports store kind, POST store/restore round-trips", async () => { const { factory } = fakeKeychain(); setProviderKeychainEntryFactoryForTests(factory); @@ -192,4 +223,3 @@ describe("store / restore", () => { } }); }); - From 6eadb165873a33d8589e46bf5256a61524d82ec7 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:18:33 +0900 Subject: [PATCH 113/221] fix(management): expose the effective web-search sidecar enabled state GET and PUT /api/sidecar-settings return webSearch.model/backend/stream flags but omitted webSearch.enabled, so the dashboard could not tell whether the sidecar master switch was off. Serialize the effective value (unset reads as enabled) on both responses. Reimplements https://github.com/lidge-jun/opencodex/pull/2033 on current dev (the original branch is 1364 commits behind and its test moved to tests/vision/ under the test-layout split). Co-authored-by: louis-tepe <161487332+louis-tepe@users.noreply.github.com> --- src/server/management/config-routes.ts | 2 ++ .../vision/sidecar-settings-vision-controls.test.ts | 12 ++++++++++++ tests/vision/vision-anthropic.test.ts | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/server/management/config-routes.ts b/src/server/management/config-routes.ts index 4d551a886d..08f4b85d27 100644 --- a/src/server/management/config-routes.ts +++ b/src/server/management/config-routes.ts @@ -701,6 +701,7 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise { expect(config.visionSidecar).toEqual({ ...FULL_VISION, enabled: false }); }); + test("GET and PUT expose the effective web-search enabled state", async () => { + const unset = await getSidecarSettings(emptyConfig()); + expect((await unset.json() as { webSearch: { enabled: boolean } }).webSearch.enabled).toBe(true); + + const config = emptyConfig({ webSearchSidecar: { enabled: false } }); + const disabled = await getSidecarSettings(config); + expect((await disabled.json() as { webSearch: { enabled: boolean } }).webSearch.enabled).toBe(false); + + const response = await putSidecarSettings(config, { webSearch: { streamRoutedModelOutput: true } }); + expect((await response.json() as { webSearch: { enabled: boolean } }).webSearch.enabled).toBe(false); + }); + test("timeoutMs validation reuses the runtime bounds rather than a second contract", async () => { expect(resolveVisionTimeoutMs(undefined)).toBe(DEFAULT_VISION_TIMEOUT_MS); expect(resolveVisionTimeoutMs(MIN_VISION_TIMEOUT_MS)).toBe(MIN_VISION_TIMEOUT_MS); diff --git a/tests/vision/vision-anthropic.test.ts b/tests/vision/vision-anthropic.test.ts index ee4b01b421..086e5df7bb 100644 --- a/tests/vision/vision-anthropic.test.ts +++ b/tests/vision/vision-anthropic.test.ts @@ -339,7 +339,7 @@ describe("Anthropic vision planning and management config", () => { config, ); const getBody = await get!.json() as Record; - expect(getBody.webSearch).toEqual({ model: "claude-haiku-4-5", backend: "anthropic", streamRoutedModelOutput: false }); + expect(getBody.webSearch).toEqual({ enabled: true, model: "claude-haiku-4-5", backend: "anthropic", streamRoutedModelOutput: false }); expect(getBody.vision).toEqual({ enabled: true, model: "claude-sonnet-5", @@ -363,7 +363,7 @@ describe("Anthropic vision planning and management config", () => { ); expect(clear.status).toBe(200); const clearBody = await clear.json() as Record; - expect(clearBody.webSearch).toEqual({ model: "gpt-5.6-luna", streamRoutedModelOutput: false }); + expect(clearBody.webSearch).toEqual({ enabled: true, model: "gpt-5.6-luna", streamRoutedModelOutput: false }); expect(clearBody.vision).toEqual({ enabled: true, model: "gpt-5.4-mini", From 61a775ca2dcbe1fd7d7678901abea0351f8ef461 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:23:16 +0900 Subject: [PATCH 114/221] docs: record lane B manual delivery roadmap [skip ci] --- devlog/_plan/260907_release_train_b/000_plan.md | 11 +++++++++++ devlog/_plan/260907_release_train_b/010_carry.md | 3 +++ devlog/_plan/260907_release_train_b/020_carry.md | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 devlog/_plan/260907_release_train_b/000_plan.md create mode 100644 devlog/_plan/260907_release_train_b/010_carry.md create mode 100644 devlog/_plan/260907_release_train_b/020_carry.md diff --git a/devlog/_plan/260907_release_train_b/000_plan.md b/devlog/_plan/260907_release_train_b/000_plan.md new file mode 100644 index 0000000000..be31f8e242 --- /dev/null +++ b/devlog/_plan/260907_release_train_b/000_plan.md @@ -0,0 +1,11 @@ +# Lane B delivery roadmap + +Satisfy-spec HOTL, triggered by delegated release-train packet. Goal: prepare a manual #3856 -> #3849 carry chain for main-session integration. No merges, releases, installs, local tests/typechecks/builds, native stacks, or edits to other lane files. Resources: existing git/gh and astra reviewers; user set no token/cost/time limit. Stop after exact top-head remote CI success, independent security verdicts, and handoff evidence. BLOCKED means a concrete unresolved owner/security/CI condition; #3848 is DEFER until #3856 lands. Main reclaims after two distinct failed leaf packets; new worker scope requires plan amendment. + +Memory/evidence: this neutral roadmap, `.tmp/lane-b/` for all security work notes, `.codexclaw/` for FSM/goalplan. Escalate cross-lane conflicts to main. How-it-works English/ja/ko/ru/zh-cn ownership was explicitly assigned to B by main. No automatic peer writes beyond collision coordination. + +1. Docs-only roadmap audit and lock. +2. Carry quota activation original commits with cherry-pick -x and contributor trailers; inspect default-off, identity and pending-state contracts. Lower layer code verification is deferred to top CI by explicit user instruction; its D certifies carry preparation, not runtime success. +3. Carry Mihomo transport commit plus IPv6-only and canonical NO_PROXY/unsafe companion regressions. Publish manual chain, independently review final implementation, dispatch ci.yml lane=all only on top. Repair lower layers sequentially and cascade with rebase --update-refs. + +Verifier: gh workflow run ci.yml --ref codex/260907-b-mihomo-ipv6 -f lane=all; read exact head SHA and every job including Windows shards. Local product commands NOT RUN by user instruction. Inspect workflow definitions instead of executing local verifiers. No claims of live TUN validation; deterministic resolver/pinned transport tests are remote CI proof. diff --git a/devlog/_plan/260907_release_train_b/010_carry.md b/devlog/_plan/260907_release_train_b/010_carry.md new file mode 100644 index 0000000000..cde8f79785 --- /dev/null +++ b/devlog/_plan/260907_release_train_b/010_carry.md @@ -0,0 +1,3 @@ +# Quota activation carry + +Detailed working plan: `.tmp/lane-b/010_carry.md` (gitignored security work space). Public source and contributor provenance are recorded in the roadmap. Only published outcomes will be added here. diff --git a/devlog/_plan/260907_release_train_b/020_carry.md b/devlog/_plan/260907_release_train_b/020_carry.md new file mode 100644 index 0000000000..10d853e99e --- /dev/null +++ b/devlog/_plan/260907_release_train_b/020_carry.md @@ -0,0 +1,3 @@ +# Mihomo IPv6 carry + +Detailed working plan: `.tmp/lane-b/020_carry.md` (gitignored security work space). Public source and contributor provenance are recorded in the roadmap. Only published outcomes will be added here. From 1386e3d4a04b7a12eacea0ced74ed55307d6dfa3 Mon Sep 17 00:00:00 2001 From: Terry Tan Date: Sun, 6 Sep 2026 23:17:29 -0700 Subject: [PATCH 115/221] fix(codex): sustain quota window activation [skip ci] (cherry picked from commit 0da9f2ce0812c0dbf39d48077bfb038b2c526783) Co-authored-by: terrytan95 <10609214+terrytan95@users.noreply.github.com> --- .../docs/getting-started/how-it-works.mdx | 8 +- src/codex/auth-api.ts | 15 ++ src/codex/quota-auto-refresh-state.ts | 6 + src/codex/quota-auto-refresh.ts | 162 +++++++++++++++--- src/codex/warmup.ts | 4 + src/config.ts | 2 + src/types/config.ts | 3 + structure/08_openai-provider-tiers.md | 7 +- 8 files changed, 178 insertions(+), 29 deletions(-) diff --git a/docs-site/src/content/docs/getting-started/how-it-works.mdx b/docs-site/src/content/docs/getting-started/how-it-works.mdx index 0344037b75..b5995732b6 100644 --- a/docs-site/src/content/docs/getting-started/how-it-works.mdx +++ b/docs-site/src/content/docs/getting-started/how-it-works.mdx @@ -50,7 +50,13 @@ account before the request is forwarded upstream. The rule is intentionally spli its minimal non-stored account warmup request through the exact account whose window is due, coalesces simultaneous windows into one request, and durably persists both reset timestamps to prevent duplicate work after restarts. Paused accounts and accounts - requiring reauthentication are skipped; the next normal quota poll reports the activated window. + requiring reauthentication are skipped. Activation captures successful response quota headers; + opted-in idle accounts also refresh stale quota metadata at most once every five minutes, + without needing an open dashboard. Observed reset boundaries are retained across restarts + until completed, so a moving idle-window timestamp cannot erase a pending activation. + Metadata refresh uses the existing bounded authentication recovery; an inference 401 marks + the rejected credential for reauthentication instead of repeatedly spending retries on it. + Failures log only an opaque account label and a status-only reason. This is separate from reset-window routing: routing chooses an account for incoming work, while activation sends one request to a specific opted-in account only after its own reset is due. diff --git a/src/codex/auth-api.ts b/src/codex/auth-api.ts index 51e3fed303..8ab7f7418f 100644 --- a/src/codex/auth-api.ts +++ b/src/codex/auth-api.ts @@ -1835,6 +1835,21 @@ export async function listCodexAuthAccountsSnapshot( }; } +/** One opted-in account's metadata; reuse the bounded WHAM 401 recovery and generation fence. */ +export async function refreshCodexQuotaForActivation(config: OcxConfig, accountId: string): Promise { + if (accountId === MAIN_CODEX_ACCOUNT_ID) { + await fetchMainAccountInfoAttempt(true, 1, undefined, false, false); + return; + } + const account = configuredPoolAccount(config, accountId); + if (!account) return; + const writerGeneration = captureConfigGeneration(); + const result = await fetchPoolAccountQuota(accountId, true, account.plan); + if (result.needsReauth && result.credentialGeneration !== undefined) { + markAccountNeedsReauth(accountId, writerGeneration, result.credentialGeneration); + } +} + export async function listCodexAuthAccounts(config: OcxConfig, forceRefresh = false): Promise { return (await listCodexAuthAccountsSnapshot(config, forceRefresh)).accounts; } diff --git a/src/codex/quota-auto-refresh-state.ts b/src/codex/quota-auto-refresh-state.ts index 43bb606d63..72b7d5828c 100644 --- a/src/codex/quota-auto-refresh-state.ts +++ b/src/codex/quota-auto-refresh-state.ts @@ -4,13 +4,19 @@ export type CodexQuotaAutoRefreshWindows = { fiveHour?: number; weekly?: number export const completedByAccount = new Map(); export const retryAfterByAccount = new Map(); +export const scheduledByAccount = new Map(); +export const quotaRefreshAfterByAccount = new Map(); export function forgetCodexQuotaAutoRefreshAccount(accountId: string): void { completedByAccount.delete(accountId); retryAfterByAccount.delete(accountId); + scheduledByAccount.delete(accountId); + quotaRefreshAfterByAccount.delete(accountId); } export function resetCodexQuotaAutoRefreshStateForTests(): void { completedByAccount.clear(); retryAfterByAccount.clear(); + scheduledByAccount.clear(); + quotaRefreshAfterByAccount.clear(); } diff --git a/src/codex/quota-auto-refresh.ts b/src/codex/quota-auto-refresh.ts index 88291e0cdd..b61cc1467e 100644 --- a/src/codex/quota-auto-refresh.ts +++ b/src/codex/quota-auto-refresh.ts @@ -1,5 +1,5 @@ import { mutatePersistedConfig } from "../config"; -import { registerStateSweepAfterTick } from "../lib/state-store-sweeper"; +import { captureConfigGeneration, registerStateSweepAfterTick } from "../lib/state-store-sweeper"; import { isCanonicalOpenAiForwardProvider, OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers"; import { normalizeResetAt } from "../providers/quota-wire"; import { providerCodexAccountMode } from "../providers/registry"; @@ -7,17 +7,20 @@ import type { OcxConfig } from "../types"; import { isSelectableCodexPoolAccount } from "./account-id"; import { reconcileMainCodexAccountRuntimeState } from "./account-lifecycle"; import { isCodexAccountPaused } from "./account-pause"; -import { isAccountNeedsReauth } from "./account-runtime-state"; -import { getValidCodexToken } from "./account-store"; +import { isAccountNeedsReauth, markAccountNeedsReauth } from "./account-runtime-state"; +import { getValidCodexToken, isCodexAccountGenerationLive } from "./account-store"; +import { codexAccountLogLabel } from "./account-label"; import { getMainAccountToken, getValidMainAccountToken, MAIN_CODEX_ACCOUNT_ID } from "./main-account"; import { isMainAccountHardLocked } from "./main-account-hard-lock"; import { tryAcquireNativeMainProfileClaim } from "./native-main-admission"; import { withNativeMainSharedClaim } from "./native-main-claim"; import { resolveNativeProfileContext } from "./native-profile-store"; -import { getAccountQuota, type StoredAccountQuota } from "./quota"; -import { warmCodexAccount } from "./warmup"; +import { captureMainQuotaWriter } from "./main-account-cache"; +import { applyAccountQuotaFromUpstreamHeaders, getAccountQuota, type StoredAccountQuota } from "./quota"; +import { CodexWarmupError, codexWarmupFailureReason, warmCodexAccount } from "./warmup"; import { - completedByAccount, retryAfterByAccount, resetCodexQuotaAutoRefreshStateForTests, + completedByAccount, retryAfterByAccount, scheduledByAccount, quotaRefreshAfterByAccount, + resetCodexQuotaAutoRefreshStateForTests, type CodexQuotaAutoRefreshWindows, } from "./quota-auto-refresh-state"; export type { CodexQuotaAutoRefreshWindows } from "./quota-auto-refresh-state"; @@ -36,6 +39,7 @@ export interface CodexQuotaAutoRefreshStatus { export interface CodexQuotaAutoRefreshRunDeps { getQuota?: (accountId: string) => StoredAccountQuota | null; + refreshQuota?: (config: OcxConfig, accountId: string) => Promise; /** Only false means skipped; existing void callbacks still report a successful warmup. */ warmAccount?: (config: OcxConfig, accountId: string) => Promise; persistCompleted?: ( @@ -69,29 +73,83 @@ export function dueCodexQuotaAutoRefreshWindows( now: number, completed = completedByAccount.get(accountId), ): CodexQuotaAutoRefreshWindows | null { - if (!quota) return null; const saved = config.codexQuotaAutoRefresh?.[accountId]; + const scheduled = scheduledByAccount.get(accountId) ?? ( + saved?.nextFiveHourResetAt !== undefined || saved?.nextWeeklyResetAt !== undefined + ? { fiveHour: saved.nextFiveHourResetAt, weekly: saved.nextWeeklyResetAt } : undefined + ); const due: CodexQuotaAutoRefreshWindows = {}; - const shortResetAt = normalizeResetAt(quota.shortResetAt); - const weeklyResetAt = normalizeResetAt(quota.weeklyResetAt); + const shortResetAt = normalizeResetAt(scheduled ? scheduled.fiveHour : quota?.shortResetAt); + const weeklyResetAt = normalizeResetAt(scheduled ? scheduled.weekly : quota?.weeklyResetAt); if (saved?.fiveHour === true - && quota.shortWindowSeconds === FIVE_HOUR_WINDOW_SECONDS + && (scheduled?.fiveHour !== undefined || saved.nextFiveHourResetAt !== undefined + || quota?.shortWindowSeconds === FIVE_HOUR_WINDOW_SECONDS) && shortResetAt !== undefined && shortResetAt <= now - && normalizeResetAt(saved.lastFiveHourResetAt) !== shortResetAt - && normalizeResetAt(completed?.fiveHour) !== shortResetAt) { + && shortResetAt > (normalizeResetAt(saved.lastFiveHourResetAt) ?? -1) + && shortResetAt > (normalizeResetAt(completed?.fiveHour) ?? -1)) { due.fiveHour = shortResetAt; } if (saved?.weekly === true && weeklyResetAt !== undefined && weeklyResetAt <= now - && normalizeResetAt(saved.lastWeeklyResetAt) !== weeklyResetAt - && normalizeResetAt(completed?.weekly) !== weeklyResetAt) { + && weeklyResetAt > (normalizeResetAt(saved.lastWeeklyResetAt) ?? -1) + && weeklyResetAt > (normalizeResetAt(completed?.weekly) ?? -1)) { due.weekly = weeklyResetAt; } return due.fiveHour === undefined && due.weekly === undefined ? null : due; } +/** Retain the earliest uncompleted observation, including across process restarts. */ +function rememberWindows(config: OcxConfig, accountId: string, quota: StoredAccountQuota | null): void { + const saved = config.codexQuotaAutoRefresh?.[accountId]; + if (!saved) return; + const completed = completedByAccount.get(accountId); + const previous = scheduledByAccount.get(accountId) ?? { + fiveHour: normalizeResetAt(saved.nextFiveHourResetAt), + weekly: normalizeResetAt(saved.nextWeeklyResetAt), + }; + const next: CodexQuotaAutoRefreshWindows = {}; + for (const window of ["fiveHour", "weekly"] as const) { + if (!saved[window]) continue; + const done = normalizeResetAt(completed?.[window] + ?? (window === "fiveHour" ? saved.lastFiveHourResetAt : saved.lastWeeklyResetAt)); + const observed = normalizeResetAt(window === "fiveHour" + ? quota?.shortWindowSeconds === FIVE_HOUR_WINDOW_SECONDS ? quota.shortResetAt : undefined + : quota?.weeklyResetAt); + const candidates = [normalizeResetAt(previous[window]), observed] + .filter((value): value is number => value !== undefined && (done === undefined || value > done)); + if (candidates.length) next[window] = Math.min(...candidates); + } + scheduledByAccount.set(accountId, next); + if (normalizeResetAt(saved.nextFiveHourResetAt) === next.fiveHour + && normalizeResetAt(saved.nextWeeklyResetAt) === next.weekly) return; + try { + const outcome = mutatePersistedConfig(persisted => { + const current = persisted.codexQuotaAutoRefresh?.[accountId]; + if (!current) return { changed: false, value: null }; + const setting = { ...current }; + // A settings change that raced this sweep remains authoritative. + delete setting.nextFiveHourResetAt; + delete setting.nextWeeklyResetAt; + if (current.fiveHour && next.fiveHour !== undefined) setting.nextFiveHourResetAt = next.fiveHour; + if (current.weekly && next.weekly !== undefined) setting.nextWeeklyResetAt = next.weekly; + persisted.codexQuotaAutoRefresh = { ...persisted.codexQuotaAutoRefresh, [accountId]: setting }; + return { changed: true, value: setting }; + }); + if (outcome.status !== "unavailable" && outcome.value) { + config.codexQuotaAutoRefresh = { ...config.codexQuotaAutoRefresh, [accountId]: outcome.value }; + } + } catch { + // Keep the in-memory deadline and retry its narrow persistence on the next tick. + } +} + +async function refreshQuota(config: OcxConfig, accountId: string): Promise { + const { refreshCodexQuotaForActivation } = await import("./auth-api"); + await refreshCodexQuotaForActivation(config, accountId); +} + function mainWarmupRestricted(config: OcxConfig): boolean { return isMainAccountHardLocked(config) || isCodexAccountPaused(config, MAIN_CODEX_ACCOUNT_ID) @@ -99,8 +157,23 @@ function mainWarmupRestricted(config: OcxConfig): boolean { } async function warmAccount(config: OcxConfig, accountId: string): Promise { + const writerGeneration = captureConfigGeneration(); if (accountId !== MAIN_CODEX_ACCOUNT_ID) { - await warmCodexAccount(await getValidCodexToken(accountId)); + const token = await getValidCodexToken(accountId); + if (isCodexAccountPaused(config, accountId) || isAccountNeedsReauth(accountId)) return false; + try { + await warmCodexAccount({ ...token, onCompleted: headers => { + if (isCodexAccountGenerationLive(accountId, token.generation)) { + applyAccountQuotaFromUpstreamHeaders(accountId, headers, writerGeneration); + } + } }); + } catch (error) { + if (error instanceof CodexWarmupError && error.status === 401) { + markAccountNeedsReauth(accountId, writerGeneration, token.generation); + } + throw error; + } + if (!isCodexAccountGenerationLive(accountId, token.generation)) return false; return; } const lease = tryAcquireNativeMainProfileClaim(); @@ -116,7 +189,18 @@ async function warmAccount(config: OcxConfig, accountId: string): Promise { + if (writer) applyAccountQuotaFromUpstreamHeaders(accountId, headers, writerGeneration, writer); + } }); + } catch (error) { + if (error instanceof CodexWarmupError && error.status === 401 + && getMainAccountToken()?.accessToken === token.accessToken) { + markAccountNeedsReauth(accountId, writerGeneration); + } + throw error; + } }); } finally { lease.release(); @@ -175,30 +259,54 @@ export async function runCodexQuotaAutoRefresh( const quotaFor = deps.getQuota ?? getAccountQuota; const warm = deps.warmAccount ?? warmAccount; const persist = deps.persistCompleted ?? persistCompleted; + const refresh = deps.refreshQuota ?? refreshQuota; inFlight = (async () => { retryPendingMarkers(config, persist); const accountIds = [ MAIN_CODEX_ACCOUNT_ID, ...(config.codexAccounts ?? []).filter(isSelectableCodexPoolAccount).map(account => account.id), ]; - const due = accountIds.flatMap(accountId => { - if (isCodexAccountPaused(config, accountId) - || isAccountNeedsReauth(accountId) - || (accountId === MAIN_CODEX_ACCOUNT_ID && isMainAccountHardLocked(config)) - || (retryAfterByAccount.get(accountId) ?? 0) > now) return []; - const windows = dueCodexQuotaAutoRefreshWindows(config, accountId, quotaFor(accountId), now); - return windows ? [{ accountId, windows }] : []; - }); - for (let index = 0; index < due.length; index += CONCURRENCY) { - await Promise.all(due.slice(index, index + CONCURRENCY).map(async ({ accountId, windows }) => { + const eligible = (accountId: string) => { + const setting = config.codexQuotaAutoRefresh?.[accountId]; + const provider = config.providers[OPENAI_CODEX_PROVIDER_ID]; + return provider?.disabled !== true && isCanonicalOpenAiForwardProvider(provider) + && providerCodexAccountMode(OPENAI_CODEX_PROVIDER_ID, provider) === "pool" + && (accountId === MAIN_CODEX_ACCOUNT_ID || config.codexAccounts?.some( + account => account.id === accountId && isSelectableCodexPoolAccount(account))) + && (setting?.fiveHour === true || setting?.weekly === true) + && !isCodexAccountPaused(config, accountId) && !isAccountNeedsReauth(accountId) + && !(accountId === MAIN_CODEX_ACCOUNT_ID && isMainAccountHardLocked(config)); + }; + for (let index = 0; index < accountIds.length; index += CONCURRENCY) { + await Promise.all(accountIds.slice(index, index + CONCURRENCY).map(async accountId => { + if (!eligible(accountId)) return; + // Capture before WHAM can move an idle window's reset into the future. + rememberWindows(config, accountId, quotaFor(accountId)); + const quota = quotaFor(accountId); + if ((!quota || now - quota.updatedAt >= RETRY_MS) + && (quotaRefreshAfterByAccount.get(accountId) ?? 0) <= now) { + quotaRefreshAfterByAccount.set(accountId, now + RETRY_MS); + try { await refresh(config, accountId); } catch { /* Retry metadata at the bounded cadence. */ } + } + if (!eligible(accountId)) return; + rememberWindows(config, accountId, quotaFor(accountId)); + if ((retryAfterByAccount.get(accountId) ?? 0) > now) return; + const windows = dueCodexQuotaAutoRefreshWindows(config, accountId, quotaFor(accountId), now); + if (!windows) return; try { if (await warm(config, accountId) === false) return; retryAfterByAccount.delete(accountId); const completed = { ...completedByAccount.get(accountId), ...windows }; completedByAccount.set(accountId, completed); persist(config, accountId, completed); - } catch { + rememberWindows(config, accountId, quotaFor(accountId)); + } catch (error) { retryAfterByAccount.set(accountId, now + RETRY_MS); + const account = config.codexAccounts?.find(candidate => candidate.id === accountId); + const label = account ? codexAccountLogLabel(account) : "main"; + console.warn(`[codex-quota-auto-refresh] ${label}: ${codexWarmupFailureReason(error)}; ${ + isAccountNeedsReauth(accountId) ? "reauthentication required" : "retry in five minutes" + }`); } })); } diff --git a/src/codex/warmup.ts b/src/codex/warmup.ts index 51b52ac2ba..cc2f10ac55 100644 --- a/src/codex/warmup.ts +++ b/src/codex/warmup.ts @@ -22,6 +22,8 @@ export interface CodexWarmupOptions { chatgptAccountId: string; model?: string; timeoutMs?: number; + /** Publish quota headers only after a completed inference, never on a failed stream. */ + onCompleted?: (headers: Headers) => void; } const CODEX_RESPONSES_URL = "https://chatgpt.com/backend-api/codex/responses"; @@ -263,6 +265,8 @@ async function tryWarmup(options: CodexWarmupOptions, model: string): Promise {}); diff --git a/src/config.ts b/src/config.ts index d5ef05c33f..d25aa07ad2 100644 --- a/src/config.ts +++ b/src/config.ts @@ -856,6 +856,8 @@ const codexQuotaAutoRefreshEntrySchema = z.object({ weekly: z.boolean().optional(), lastFiveHourResetAt: z.number().finite().nonnegative().optional(), lastWeeklyResetAt: z.number().finite().nonnegative().optional(), + nextFiveHourResetAt: z.number().finite().nonnegative().optional(), + nextWeeklyResetAt: z.number().finite().nonnegative().optional(), }).strict(); const CODEX_QUOTA_AUTO_REFRESH_KEY_ERROR = "quota auto-refresh keys must be a Codex pool-account id or the main Codex account and cannot be reserved JavaScript object keys"; diff --git a/src/types/config.ts b/src/types/config.ts index ee97cdf9ac..31b5a52ceb 100644 --- a/src/types/config.ts +++ b/src/types/config.ts @@ -723,6 +723,9 @@ export interface OcxConfig { /** Upstream reset timestamps already activated, retained across restarts. */ lastFiveHourResetAt?: number; lastWeeklyResetAt?: number; + /** Observed boundaries retained until activation, even if an idle upstream clock moves. */ + nextFiveHourResetAt?: number; + nextWeeklyResetAt?: number; }>; /** * Selection order per account id, higher used earlier; absent = 0. Keyed by id diff --git a/structure/08_openai-provider-tiers.md b/structure/08_openai-provider-tiers.md index 1f838baeb5..834cbd46ee 100644 --- a/structure/08_openai-provider-tiers.md +++ b/structure/08_openai-provider-tiers.md @@ -75,7 +75,12 @@ plan-relevant window is freshly confirmed at exactly 100%; unknown and failed re `codexQuotaAutoRefresh` is a separate default-off spending intent. For each explicitly enabled account/window, the one-minute state sweep compares the cached upstream reset timestamp, sends the existing minimal non-stored warmup through that exact account once the timestamp is due, then -field-patches the completed timestamp; the next normal quota poll reports the activated window. +field-patches the completed timestamp. The next observed reset boundary is also retained in +`nextFiveHourResetAt` / `nextWeeklyResetAt` until completed; later idle-window metadata cannot +postpone it. Successful warmups publish quota headers under the captured credential/identity fence. +For opted-in accounts only, stale metadata is refreshed at most once per five minutes through +the existing WHAM recovery path, independently of dashboard traffic or reset notifications. +Inference 401s quarantine the rejected credential; failures log an opaque label and safe reason. Paused or reauthentication-required accounts are skipped, simultaneous 5-hour/weekly resets share one warmup, transient failures retry after five minutes, and account deletion removes its setting and completion markers. From c38677004f80605dd8628fb109e804169cbc2b7f Mon Sep 17 00:00:00 2001 From: Terry Tan Date: Mon, 7 Sep 2026 00:51:39 -0700 Subject: [PATCH 116/221] test(codex): cover quota activation regressions [skip ci] (cherry picked from commit 5d01860f23cabaedd68dd53a9c8e751a71ca2ba2) Co-authored-by: terrytan95 <10609214+terrytan95@users.noreply.github.com> --- .../docs/getting-started/how-it-works.mdx | 4 + .../docs/ja/getting-started/how-it-works.mdx | 16 +++ .../docs/ko/getting-started/how-it-works.mdx | 16 +++ .../docs/ru/getting-started/how-it-works.mdx | 19 +++ .../zh-cn/getting-started/how-it-works.mdx | 25 ++++ src/codex/quota-auto-refresh-state.ts | 2 + src/codex/quota-auto-refresh.ts | 11 ++ src/codex/warmup.ts | 1 + .../codex-quota-auto-refresh.test.ts | 116 ++++++++++++++++++ tests/codex-integration/codex-warmup.test.ts | 23 ++++ 10 files changed, 233 insertions(+) diff --git a/docs-site/src/content/docs/getting-started/how-it-works.mdx b/docs-site/src/content/docs/getting-started/how-it-works.mdx index b5995732b6..c75ffed90e 100644 --- a/docs-site/src/content/docs/getting-started/how-it-works.mdx +++ b/docs-site/src/content/docs/getting-started/how-it-works.mdx @@ -60,6 +60,10 @@ account before the request is forwarded upstream. The rule is intentionally spli This is separate from reset-window routing: routing chooses an account for incoming work, while activation sends one request to a specific opted-in account only after its own reset is due. +**Downgrade note:** Before running an older version, remove only `nextFiveHourResetAt` and +`nextWeeklyResetAt` from automatic activation settings. Older strict readers reject these new +fields and can disable the entire activation settings block. + ## Sub-agent model selection On a fresh install, `subagentModels` features `gpt-6-astra`, the GPT-5.6 Sol/Terra/Luna trio, and diff --git a/docs-site/src/content/docs/ja/getting-started/how-it-works.mdx b/docs-site/src/content/docs/ja/getting-started/how-it-works.mdx index 0970b0e7c0..2e0e87f1ee 100644 --- a/docs-site/src/content/docs/ja/getting-started/how-it-works.mdx +++ b/docs-site/src/content/docs/ja/getting-started/how-it-works.mdx @@ -39,6 +39,22 @@ Codex は OpenAI **Responses API** を使います。opencodex は HTTP と Serv `GET /api/codex-auth/accounts?refresh=1` でクォータを強制再照会できます。成功した上流 応答はクォータヘッダーを保存し、429 はアカウントをクールダウンに置き、401/403 は再認証必要状態としてマークします。 +- **アイドル状態の利用枠も自動開始できます。** 詳細設定の自動開始はデフォルトでオフです。 + 現在のメインアカウントと追加アカウントが報告する 5 時間枠・週間枠をまとめて切り替えます。 + 新しく追加したアカウントには自動で適用されません。Pool モードでは、期限が来たアカウントへ + 利用枠を消費する最小限の非保存リクエストを送ります。同時に期限が来た枠は 1 回にまとめ、 + 一時停止中・再認証が必要なアカウントやメインアカウントのハードロックは回避しません。 + 完了した応答のクォータヘッダーを保存し、有効なアイドルアカウントの古いメタデータも + 最大 5 分に 1 回更新するため、ダッシュボードを開いておく必要はありません。 + 観測済みの期限は完了まで再起動をまたいで保持し、後の照会で動く時刻に上書きされません。 + メタデータ照会は既存の回数制限付き認証回復を使い、推論の 401 は拒否された認証情報を + 再認証必要として扱います。失敗ログには不透明なアカウントラベルと安全な状態理由だけを記録します。 + これは入力リクエストのアカウント選択とは別の機能です。 + +**旧バージョンへ戻す場合:** 自動開始設定の `nextFiveHourResetAt` と `nextWeeklyResetAt` だけを +削除してから旧バージョンを起動してください。旧版の厳密な設定検証はこれらの新しいフィールドを +受け付けず、自動開始設定全体を無効にする場合があります。 + ## サブエージェントモデルの選択 新規インストールすると `subagentModels` のデフォルトで `gpt-6-astra`、GPT-5.6 Sol/Terra/Luna の 3 モデル、 diff --git a/docs-site/src/content/docs/ko/getting-started/how-it-works.mdx b/docs-site/src/content/docs/ko/getting-started/how-it-works.mdx index e2a75024d1..1538c701b3 100644 --- a/docs-site/src/content/docs/ko/getting-started/how-it-works.mdx +++ b/docs-site/src/content/docs/ko/getting-started/how-it-works.mdx @@ -39,6 +39,22 @@ pool 계정을 고를 수 있습니다. 규칙은 의도적으로 둘로 나뉩 `GET /api/codex-auth/accounts?refresh=1`로 할당량을 강제 재조회할 수 있습니다. 성공한 업스트림 응답은 할당량 헤더를 저장하고, 429는 계정을 cooldown에 넣으며, 401/403은 재인증 필요 상태로 표시합니다. +- **유휴 상태의 할당량 창도 자동으로 활성화할 수 있습니다.** 고급 설정의 자동 활성화는 기본적으로 + 꺼져 있으며 현재 메인 계정과 추가 계정이 보고하는 5시간·주간 창을 함께 제어합니다. + 새로 추가한 계정에는 자동 적용되지 않습니다. Pool 모드에서는 만료된 창의 정확한 계정으로 + 할당량을 소비하는 최소한의 비저장 요청을 보내며, 동시에 만료된 창은 요청 하나로 묶습니다. + 일시 중지 또는 재인증이 필요한 계정은 건너뛰고 메인 계정의 하드록도 준수합니다. + 완료 응답의 할당량 헤더를 반영하고, 활성화 대상인 유휴 계정의 오래된 메타데이터는 최대 5분에 + 한 번 갱신하므로 대시보드를 열어 둘 필요가 없습니다. 관측한 만료 시점은 활성화가 끝날 때까지 + 재시작 후에도 유지되어, 나중의 조회에서 시점이 밀려도 대기 작업을 잃지 않습니다. + 메타데이터 조회에는 기존의 횟수 제한 인증 복구를 사용합니다. 추론 401은 거부된 자격 증명을 + 재인증 필요로 표시하며, 실패 로그에는 불투명한 계정 라벨과 안전한 상태 사유만 기록합니다. + 이 기능은 들어오는 요청의 계정을 선택하는 라우팅과 별개입니다. + +**다운그레이드 안내:** 이전 버전을 실행하기 전에 자동 활성화 설정에서 `nextFiveHourResetAt`과 +`nextWeeklyResetAt`만 제거하세요. 이전 버전의 엄격한 설정 검증은 이 새 필드를 허용하지 않아 +자동 활성화 설정 전체를 비활성화할 수 있습니다. + ## Sub-agent 모델 선택 새로 설치하면 `subagentModels` 기본값으로 `gpt-6-astra`, GPT-5.6 Sol/Terra/Luna 세 모델, diff --git a/docs-site/src/content/docs/ru/getting-started/how-it-works.mdx b/docs-site/src/content/docs/ru/getting-started/how-it-works.mdx index d18b081b12..ceeff22531 100644 --- a/docs-site/src/content/docs/ru/getting-started/how-it-works.mdx +++ b/docs-site/src/content/docs/ru/getting-started/how-it-works.mdx @@ -43,6 +43,25 @@ Codex даже не догадывается, что общается не с Op провайдера сохраняют заголовки квоты, 429 отправляет аккаунт в кулдаун, а 401/403 помечает его как требующий повторной аутентификации. +- **Неиспользуемые окна квоты можно активировать автоматически.** В расширенных настройках эта + функция по умолчанию выключена и управляет доступными 5-часовыми и недельными окнами всех + текущих основных и добавленных аккаунтов. Новые аккаунты не включаются автоматически. + В режиме Pool после наступления срока отправляется минимальный несохраняемый запрос именно + через нужный аккаунт; он расходует квоту. Одновременные сбросы объединяются в один запрос. + Приостановленные аккаунты и аккаунты, требующие повторной аутентификации, пропускаются; + жёсткая блокировка основного аккаунта также соблюдается. Заголовки квоты успешного ответа + обновляют кеш, а устаревшие метаданные включённых подходящих аккаунтов обновляются не чаще + одного раза в пять минут даже без открытой панели. Наблюдаемые сроки сохраняются до завершения + активации, включая перезапуски, поэтому сдвиг времени при следующем опросе не удаляет ожидающую + работу. Опрос использует существующее ограниченное восстановление аутентификации; ответ 401 + на запрос модели помечает отклонённые учётные данные для повторной аутентификации. + В журнал ошибок попадают только непрозрачная метка аккаунта и безопасная причина состояния. + Активация отличается от выбора аккаунта для входящего запроса. + +**Возврат к старой версии:** перед её запуском удалите только `nextFiveHourResetAt` и +`nextWeeklyResetAt` из настроек автоматической активации. Строгий валидатор старой версии +не принимает эти новые поля и может отключить весь блок настроек активации. + ## Выбор модели для подагентов После чистой установки `subagentModels` включает `gpt-6-astra`, тройку GPT-5.6 Sol/Terra/Luna и diff --git a/docs-site/src/content/docs/zh-cn/getting-started/how-it-works.mdx b/docs-site/src/content/docs/zh-cn/getting-started/how-it-works.mdx index e90bcb38b8..d234dd1ff5 100644 --- a/docs-site/src/content/docs/zh-cn/getting-started/how-it-works.mdx +++ b/docs-site/src/content/docs/zh-cn/getting-started/how-it-works.mdx @@ -21,6 +21,31 @@ Codex 使用 OpenAI **Responses API**。opencodex 接收通过 HTTP 与 Server-S └─────────────────────────────────────────────────────────────────────┘ ``` +![Codex 多账号路由:已有线程保持账号绑定,新会话可以查询额度并选择使用量更低的健康账号。](../../../../assets/multi-auth-routing.svg) + +## Codex 认证账号选择 + +当选择的 provider 使用 ChatGPT/Codex 直通时,opencodex 可以在转发请求前从已保存的账号池中选择账号。 + +- **已有线程保持绑定。** 线程绑定到开始时所选的账号代次,长时间运行的 SSH、tmux 或移动端 + Codex 会话不会在正常对话过程中重新分配账号。 +- **新会话可以重新分配。** 新线程按 `accountPoolStrategy` 选择可用账号,默认为 `quota`,也支持 + `round-robin` 和 `fill-first`。`quota` 比较已知的 5 小时、每周和 30 天额度使用量,并在当前账号 + 超过 `autoSwitchThreshold` 时选择使用量更低的账号。冷却中或需要重新认证的账号会被跳过。 +- **额度和失败信号参与路由。** 仪表盘通过 `GET /api/codex-auth/accounts?refresh=1` 强制刷新额度。 + 成功的上游响应会更新额度头信息;429 使账号进入冷却,401/403 会将账号标记为需要重新认证。 +- **空闲额度窗口可以自动激活。** 高级设置中的自动激活默认关闭,统一控制当前主账号和附加账号 + 已报告的 5 小时及每周窗口;新添加账号不会自动启用。在 Pool 模式下,窗口到期后会通过对应账号 + 发送最小化、不保存的请求,并消耗少量额度;同时到期的窗口合并为一次请求。暂停、需要重新认证 + 的账号会被跳过,主账号硬锁限制也会得到遵守。成功响应的额度头会更新缓存;已启用且符合条件的 + 空闲账号还会每隔至少 5 分钟刷新过期的额度元数据,无需保持仪表盘打开。已观察到的到期时间会保留 + 至激活完成,重启或后续查询的时间变化不会丢失待处理窗口。元数据查询复用现有的有次数限制的认证 + 恢复逻辑;推理请求返回 401 时,被拒绝的凭据会标记为需要重新认证。失败日志仅记录不透明账号标签 + 和安全的状态原因。该功能独立于为传入请求选择账号的路由逻辑。 + +**降级说明:** 运行旧版本前,请仅移除自动激活设置中的 `nextFiveHourResetAt` 和 +`nextWeeklyResetAt`。旧版严格校验不接受这两个新字段,可能因此禁用整个自动激活设置块。 + ## Sub-agent 模型选择 全新安装会通过 `subagentModels` 在 Codex 的 sub-agent 选择器中优先显示 `gpt-6-astra`、GPT-5.6 diff --git a/src/codex/quota-auto-refresh-state.ts b/src/codex/quota-auto-refresh-state.ts index 72b7d5828c..75ebe0db64 100644 --- a/src/codex/quota-auto-refresh-state.ts +++ b/src/codex/quota-auto-refresh-state.ts @@ -7,6 +7,7 @@ export const retryAfterByAccount = new Map(); export const scheduledByAccount = new Map(); export const quotaRefreshAfterByAccount = new Map(); +/** Drop every activation record when its account is removed. */ export function forgetCodexQuotaAutoRefreshAccount(accountId: string): void { completedByAccount.delete(accountId); retryAfterByAccount.delete(accountId); @@ -14,6 +15,7 @@ export function forgetCodexQuotaAutoRefreshAccount(accountId: string): void { quotaRefreshAfterByAccount.delete(accountId); } +/** Clear the dependency-free activation bookkeeping for isolated tests. */ export function resetCodexQuotaAutoRefreshStateForTests(): void { completedByAccount.clear(); retryAfterByAccount.clear(); diff --git a/src/codex/quota-auto-refresh.ts b/src/codex/quota-auto-refresh.ts index b61cc1467e..bb3d001e2e 100644 --- a/src/codex/quota-auto-refresh.ts +++ b/src/codex/quota-auto-refresh.ts @@ -51,6 +51,7 @@ export interface CodexQuotaAutoRefreshRunDeps { let inFlight: Promise | null = null; +/** Report upstream window availability separately from persisted spending intent. */ export function codexQuotaAutoRefreshStatus( config: OcxConfig, accountId: string, @@ -66,6 +67,7 @@ export function codexQuotaAutoRefreshStatus( }; } +/** Select retained, enabled boundaries newer than both durable and in-memory completions. */ export function dueCodexQuotaAutoRefreshWindows( config: OcxConfig, accountId: string, @@ -145,17 +147,20 @@ function rememberWindows(config: OcxConfig, accountId: string, quota: StoredAcco } } +/** Load metadata recovery only when an opted-in account actually needs a probe. */ async function refreshQuota(config: OcxConfig, accountId: string): Promise { const { refreshCodexQuotaForActivation } = await import("./auth-api"); await refreshCodexQuotaForActivation(config, accountId); } +/** Keep billable main-account work behind the current pause, reauth and hard-lock policy. */ function mainWarmupRestricted(config: OcxConfig): boolean { return isMainAccountHardLocked(config) || isCodexAccountPaused(config, MAIN_CODEX_ACCOUNT_ID) || isAccountNeedsReauth(MAIN_CODEX_ACCOUNT_ID); } +/** Warm the exact account and fence quota/reauth publication to the dispatched credential. */ async function warmAccount(config: OcxConfig, accountId: string): Promise { const writerGeneration = captureConfigGeneration(); if (accountId !== MAIN_CODEX_ACCOUNT_ID) { @@ -207,6 +212,7 @@ async function warmAccount(config: OcxConfig, accountId: string): Promise, @@ -247,6 +254,7 @@ function retryPendingMarkers( } } +/** Coalesce sweeps, refresh stale metadata and activate due accounts with bounded concurrency. */ export async function runCodexQuotaAutoRefresh( config: OcxConfig, now = Date.now(), @@ -266,6 +274,7 @@ export async function runCodexQuotaAutoRefresh( MAIN_CODEX_ACCOUNT_ID, ...(config.codexAccounts ?? []).filter(isSelectableCodexPoolAccount).map(account => account.id), ]; + /** Recheck spending authorization after asynchronous metadata work. */ const eligible = (accountId: string) => { const setting = config.codexQuotaAutoRefresh?.[accountId]; const provider = config.providers[OPENAI_CODEX_PROVIDER_ID]; @@ -314,6 +323,7 @@ export async function runCodexQuotaAutoRefresh( return inFlight; } +/** Attach activation to the shared minute sweep and return its owner-scoped cleanup. */ export function registerCodexQuotaAutoRefreshWorker(config: OcxConfig): () => void { return registerStateSweepAfterTick({ name: "codex-quota-auto-refresh", @@ -321,6 +331,7 @@ export function registerCodexQuotaAutoRefreshWorker(config: OcxConfig): () => vo }); } +/** Clear scheduling and single-flight state between isolated test cases. */ export function resetCodexQuotaAutoRefreshForTests(): void { inFlight = null; resetCodexQuotaAutoRefreshStateForTests(); diff --git a/src/codex/warmup.ts b/src/codex/warmup.ts index cc2f10ac55..5af42490b4 100644 --- a/src/codex/warmup.ts +++ b/src/codex/warmup.ts @@ -215,6 +215,7 @@ async function drainWarmupSse(body: ReadableStream, signal: AbortSig } } +/** Bound one inference attempt and publish metadata only after a successful terminal event. */ async function tryWarmup(options: CodexWarmupOptions, model: string): Promise { const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS; if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 0 || timeoutMs > MAX_TIMEOUT_MS) { diff --git a/tests/codex-integration/codex-quota-auto-refresh.test.ts b/tests/codex-integration/codex-quota-auto-refresh.test.ts index 7bbe2ae73e..e0d765dea3 100644 --- a/tests/codex-integration/codex-quota-auto-refresh.test.ts +++ b/tests/codex-integration/codex-quota-auto-refresh.test.ts @@ -11,6 +11,7 @@ import { } from "../../src/codex/quota-auto-refresh"; import { clearAccountQuota, + getAccountQuota, setAccountQuotaFromParsed, type StoredAccountQuota, } from "../../src/codex/quota"; @@ -18,11 +19,30 @@ import { handleManagementAPI, type ManagementApiDeps } from "../../src/server/ma import { loadConfig, readConfigDiagnostics, validateConfigCandidate } from "../../src/config"; import type { OcxConfig } from "../../src/types"; import { startupHealthFixture } from "../helpers/startup-health"; +import { saveCodexAccountCredential } from "../../src/codex/account-store"; +import { clearAccountNeedsReauth, isAccountNeedsReauth } from "../../src/codex/account-runtime-state"; const NOW = 1_800_000_000_000; const RESET_SECONDS = NOW / 1000; let testHome = ""; let previousHome: string | undefined; +let previousFetch: typeof fetch; + +function writePoolCredential(accessToken = "activation-fixture") { + saveCodexAccountCredential("pool-a", { + accessToken, refreshToken: "activation-refresh-fixture", + expiresAt: NOW + 86_400_000, chatgptAccountId: "activation-workspace-fixture", + }); +} + +function completedWithQuota(resetAt: number) { + return new Response('data: {"type":"response.completed"}\n\n', { headers: { + "content-type": "text/event-stream", + "x-codex-primary-used-percent": "0", + "x-codex-primary-window-minutes": "300", + "x-codex-primary-reset-at": String(resetAt), + } }); +} function config(): OcxConfig { return { @@ -85,6 +105,7 @@ function putSettings(cfg: OcxConfig, value: unknown): Promise { } beforeEach(() => { + previousFetch = globalThis.fetch; previousHome = process.env.OPENCODEX_HOME; testHome = mkdtempSync(join(tmpdir(), "ocx-quota-auto-refresh-")); process.env.OPENCODEX_HOME = testHome; @@ -93,6 +114,8 @@ beforeEach(() => { }); afterEach(() => { + globalThis.fetch = previousFetch; + clearAccountNeedsReauth("pool-a"); clearAccountQuota(); resetCodexQuotaAutoRefreshForTests(); if (previousHome === undefined) delete process.env.OPENCODEX_HOME; @@ -101,6 +124,99 @@ afterEach(() => { }); describe("Codex quota window auto refresh", () => { + test("regression: successive idle windows use completed response quota headers", async () => { + const cfg = config(); + cfg.codexQuotaAutoRefresh = { "pool-a": { fiveHour: true } }; + writeFileSync(join(testHome, "config.json"), JSON.stringify(cfg)); + writePoolCredential(); + setAccountQuotaFromParsed("pool-a", quota({ shortPercent: 100 })); + let calls = 0; + globalThis.fetch = Object.assign(async () => completedWithQuota(RESET_SECONDS + ++calls * 18_000), + { preconnect: previousFetch.preconnect }); + const deps = { refreshQuota: async () => {} }; + await runCodexQuotaAutoRefresh(cfg, NOW, deps); + expect(getAccountQuota("pool-a")).toMatchObject({ shortPercent: 0, shortResetAt: RESET_SECONDS + 18_000 }); + resetCodexQuotaAutoRefreshForTests(); + await runCodexQuotaAutoRefresh(loadConfig(), NOW + 18_000_000, deps); + expect(calls).toBe(2); + expect(loadConfig().codexQuotaAutoRefresh?.["pool-a"]?.lastFiveHourResetAt).toBe(NOW + 18_000_000); + }); + + test("regression: failed windows survive shifted metadata and restart", async () => { + let cfg = config(); + writeFileSync(join(testHome, "config.json"), JSON.stringify(cfg)); + let observed = quota(); + let calls = 0; + const deps = { + getQuota: (id: string) => id === "pool-a" ? observed : null, + refreshQuota: async () => {}, + warmAccount: async () => { if (++calls === 1) throw new Error("fixture failure"); }, + }; + await runCodexQuotaAutoRefresh(cfg, NOW, deps); + expect(loadConfig().codexQuotaAutoRefresh?.["pool-a"]).toMatchObject({ + nextFiveHourResetAt: NOW, nextWeeklyResetAt: NOW, + }); + observed = quota({ shortResetAt: RESET_SECONDS + 18_000, weeklyResetAt: RESET_SECONDS + 604_800 }); + resetCodexQuotaAutoRefreshForTests(); + cfg = loadConfig(); + await runCodexQuotaAutoRefresh(cfg, NOW + 300_000, deps); + expect(calls).toBe(2); + expect(loadConfig().codexQuotaAutoRefresh?.["pool-a"]).toMatchObject({ + lastFiveHourResetAt: NOW, lastWeeklyResetAt: NOW, + }); + await runCodexQuotaAutoRefresh(cfg, NOW + 300_001, deps); + expect(calls).toBe(2); + }); + + test("regression: stale idle metadata refresh is bounded and disabled accounts do not probe", async () => { + const cfg = config(); + let probes = 0; + let warmups = 0; + const deps = { + getQuota: () => null, + refreshQuota: async () => { probes += 1; }, + warmAccount: async () => { warmups += 1; }, + }; + await runCodexQuotaAutoRefresh(cfg, NOW, deps); + await runCodexQuotaAutoRefresh(cfg, NOW + 299_999, deps); + expect(probes).toBe(1); + await runCodexQuotaAutoRefresh(cfg, NOW + 300_000, deps); + expect(probes).toBe(2); + cfg.codexQuotaAutoRefresh = {}; + await runCodexQuotaAutoRefresh(cfg, NOW + 600_000, deps); + expect(probes).toBe(2); + expect(warmups).toBe(0); + }); + + test("regression: inference 401 quarantines a time-valid bearer and stops retries", async () => { + const cfg = config(); + writePoolCredential(); + setAccountQuotaFromParsed("pool-a", quota()); + const request = spyOn(globalThis, "fetch").mockResolvedValue(new Response("{}", { status: 401 })); + try { + const deps = { refreshQuota: async () => {}, persistCompleted: recordMarkers }; + await runCodexQuotaAutoRefresh(cfg, NOW, deps); + expect(isAccountNeedsReauth("pool-a")).toBe(true); + await runCodexQuotaAutoRefresh(cfg, NOW + 300_000, deps); + expect(request).toHaveBeenCalledTimes(1); + expect(cfg.codexQuotaAutoRefresh?.["pool-a"]?.lastWeeklyResetAt).toBeUndefined(); + } finally { request.mockRestore(); } + }); + + test.each([200, 401])("regression: late HTTP %i cannot publish quota or quarantine replacement credentials", async status => { + const cfg = config(); + writePoolCredential(); + setAccountQuotaFromParsed("pool-a", quota({ shortPercent: 90 })); + globalThis.fetch = Object.assign(async () => { + writePoolCredential("replacement-fixture"); + return status === 200 ? completedWithQuota(RESET_SECONDS + 18_000) : new Response("{}", { status }); + }, { preconnect: previousFetch.preconnect }); + await runCodexQuotaAutoRefresh(cfg, NOW, { refreshQuota: async () => {}, persistCompleted: recordMarkers }); + expect(isAccountNeedsReauth("pool-a")).toBe(false); + expect(getAccountQuota("pool-a")).toMatchObject({ shortPercent: 90, shortResetAt: RESET_SECONDS }); + expect(cfg.codexQuotaAutoRefresh?.["pool-a"]?.lastFiveHourResetAt).toBeUndefined(); + }); + test("detects only reported 5-hour and weekly capabilities", () => { const cfg = config(); expect(codexQuotaAutoRefreshStatus(cfg, "pool-a", quota())).toEqual({ diff --git a/tests/codex-integration/codex-warmup.test.ts b/tests/codex-integration/codex-warmup.test.ts index 14dd1455ff..d186fb7221 100644 --- a/tests/codex-integration/codex-warmup.test.ts +++ b/tests/codex-integration/codex-warmup.test.ts @@ -12,6 +12,29 @@ afterEach(() => { }); describe("codex warmup", () => { + test("regression: failed streams never publish completion metadata", async () => { + let publications = 0; + globalThis.fetch = (async () => sseResponse('data: {"type":"response.failed"}\n\n')) as typeof fetch; + await expect(warmCodexAccount({ accessToken: "fixture", chatgptAccountId: "fixture", + onCompleted: () => { publications += 1; }, + })).rejects.toMatchObject({ code: "stream_failed" }); + expect(publications).toBe(0); + }); + + test("regression: metadata publication failure never retries completed inference", async () => { + let requests = 0; + let publications = 0; + globalThis.fetch = (async () => { + requests += 1; + return sseResponse('data: {"type":"response.completed"}\n\n'); + }) as typeof fetch; + await expect(warmCodexAccount({ accessToken: "fixture", chatgptAccountId: "fixture", + onCompleted: () => { publications += 1; throw new Error("fixture metadata failure"); }, + })).resolves.toBeUndefined(); + expect(publications).toBe(1); + expect(requests).toBe(1); + }); + test("posts a minimal gpt-5.4-mini Responses stream request and accepts response.completed", async () => { let body: Record | undefined; let auth: string | null = null; From 6bcf86492502e1db00a6f2888c4669298ee40403 Mon Sep 17 00:00:00 2001 From: yhualin Date: Mon, 7 Sep 2026 11:07:32 +0800 Subject: [PATCH 117/221] fix(transport): admit Mihomo IPv6 fake-IP under TUN transparency exception for canonical URLs (cherry picked from commit 38308625da4d2f88d4f4790c0b8ce0eccda13648) Co-authored-by: hualiny <82697947+hualiny@users.noreply.github.com> --- src/lib/provider-outbound.ts | 15 +++++++-------- tests/providers/provider-account-quota.test.ts | 4 ++-- tests/providers/provider-outbound.test.ts | 17 +++++++++++++++++ tests/providers/provider-quota.test.ts | 2 +- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/lib/provider-outbound.ts b/src/lib/provider-outbound.ts index 02bdbc2077..95341573d1 100644 --- a/src/lib/provider-outbound.ts +++ b/src/lib/provider-outbound.ts @@ -143,11 +143,12 @@ async function providerOutboundRequest( // below reason about the same value. `null` here means "no proxy fetch would actually use", // even if some other proxy variable is set. const effectiveProxy = effectiveProxyFor(parsed); - const allowMihomoIpv6FakeIp = effectiveProxy !== null && !noProxyMatches(parsed); + const isCanonicalUrl = dependencies.isCanonicalUrl ?? (() => false); + const allowMihomoIpv6FakeIp = (effectiveProxy !== null && !noProxyMatches(parsed)) + || transparentFakeIpException(url, parsed, isCanonicalUrl, name); const resolveAddresses = dependencies.resolveAddresses ?? resolvePublicAddresses; const pinnedGet = dependencies.pinnedGet ?? pinnedHttpGet; const pinnedPost = dependencies.pinnedPost ?? pinnedHttpPost; - const isCanonicalUrl = dependencies.isCanonicalUrl ?? (() => false); const allowPrivate = providerAllowsPrivateNetwork(name, provider); let resolved: Awaited>; try { @@ -169,11 +170,9 @@ async function providerOutboundRequest( // pinned to the registry destination independently. allowBenchmarkAddresses: (proxyConfigured && !noProxyMatches(parsed)) || transparentFakeIpException(url, parsed, isCanonicalUrl, name), - // Mihomo IPv6 fake-IP (fdfe:dcba:9876::/48) answers are admitted on a stricter gate - // than the benchmark range: the proxy must be the one fetch will use for this URL's - // scheme, and the request below is then bound to it explicitly (#3462). A ULA answer - // is otherwise indistinguishable from a real private host, so proxy presence alone - // is not enough. + // Mihomo IPv6 fake-IP (fdfe:dcba:9876::/48) answers are admitted either when bound + // to a scheme-matched proxy (#3462) or under the TUN transparency exception for a + // canonical registry/accounting destination. allowMihomoIpv6FakeIp, }); } catch (error) { @@ -191,7 +190,7 @@ async function providerOutboundRequest( warnProxyBoundaryOnce(); // When the Mihomo exception could have admitted an answer, pin the transport to the // proxy the admission assumed instead of letting fetch re-infer it from the environment. - const proxy = allowMihomoIpv6FakeIp ? effectiveProxy : undefined; + const proxy = (allowMihomoIpv6FakeIp && effectiveProxy) ? effectiveProxy : undefined; return globalThis.fetch(url, { ...init, method, redirect: "manual", ...(proxy ? { proxy } : {}) }); } if (proxyConfigured && resolved.privateNetwork && !noProxyMatches(parsed)) { diff --git a/tests/providers/provider-account-quota.test.ts b/tests/providers/provider-account-quota.test.ts index 1b940d71d0..e8e05de9d6 100644 --- a/tests/providers/provider-account-quota.test.ts +++ b/tests/providers/provider-account-quota.test.ts @@ -796,8 +796,8 @@ describe("google-antigravity per-account quota (#1082)", () => { expect(posted).toHaveLength(urls.length * 2); for (const url of urls) { expect(resolved.filter(row => row.url === url)).toEqual([ - { url, benchmark: true, private: false, mihomo: false }, - { url, benchmark: true, private: false, mihomo: false }, + { url, benchmark: true, private: false, mihomo: true }, + { url, benchmark: true, private: false, mihomo: true }, ]); } for (const [auth, project] of [["Bearer agy-first", "proj-first"], ["Bearer agy-second", "proj-second"]]) { diff --git a/tests/providers/provider-outbound.test.ts b/tests/providers/provider-outbound.test.ts index 2853e0e335..1e80634395 100644 --- a/tests/providers/provider-outbound.test.ts +++ b/tests/providers/provider-outbound.test.ts @@ -501,6 +501,23 @@ describe("#3462 Mihomo IPv6 fake-IP admission is gated on the scheme-matched pro expect(resolveOptions).toEqual([{ allowMihomoIpv6FakeIp: false }]); expect(fetchInits).toHaveLength(0); }); + + test("canonical destination without proxy env: admitted under TUN transparentFakeIpException", async () => { + for (const key of proxyKeys) delete process.env[key]; + const { providerOutboundGet } = await import("../../src/lib/provider-outbound"); + const resolveOptions: Captured[] = []; + const { dependencies, captured } = directDependencies(new Response(null, { status: 200 })); + dependencies.isCanonicalUrl = (name, url) => name === "opencode-go" && url === target; + dependencies.resolveAddresses = mock(async (_url: string, options?: Captured) => { + resolveOptions.push({ allowMihomoIpv6FakeIp: options?.allowMihomoIpv6FakeIp }); + return { hostname: "opencode.ai", addresses: [{ address: ULA, family: 6 }, { address: "198.18.0.1", family: 4 }], privateNetwork: false }; + }) as ProviderOutboundDependencies["resolveAddresses"]; + + const response = await providerOutboundGet("opencode-go", { baseUrl: "https://opencode.ai/zen/v1" }, target, {}, dependencies); + expect(response.status).toBe(200); + expect(resolveOptions).toEqual([{ allowMihomoIpv6FakeIp: true }]); + expect(captured.address).toBe("198.18.0.1"); + }); }); describe("effectiveProxyFor picks the variable Bun fetch actually honours", () => { diff --git a/tests/providers/provider-quota.test.ts b/tests/providers/provider-quota.test.ts index 9c12869b04..a8d4bef728 100644 --- a/tests/providers/provider-quota.test.ts +++ b/tests/providers/provider-quota.test.ts @@ -3159,7 +3159,7 @@ describe("fetchProviderQuotaReports", () => { }); const result = await fetchProviderQuotaReports(config(), true); const urls = fallback ? [summaryUrl, modelsUrl] : [summaryUrl]; - expect(resolved).toEqual(urls.map(url => ({ url, benchmark: true, private: false, mihomo: false }))); + expect(resolved).toEqual(urls.map(url => ({ url, benchmark: true, private: false, mihomo: true }))); expect(posted).toEqual(urls.map(url => ({ url, address: "198.18.56.214", tls: true, auth: "Bearer agy-canonical-access", body: JSON.stringify({ project: "agy-canonical-project" }), signal: true }))); expect(result.reports[0]?.source).toBe(fallback ? "google-antigravity:fetchAvailableModels" : "google-antigravity:retrieveUserQuotaSummary"); expect(result.reports[0]?.quota.customWindows).toEqual([{ label: "Gem", percent: fallback ? 25 : 40 }]); From bdd4e460e6ccede4623996fed74db1d32c786ab3 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:27:46 +0900 Subject: [PATCH 118/221] fix(transport): retain IPv6 pinning across proxy mismatches [skip ci] Co-authored-by: hualiny <82697947+hualiny@users.noreply.github.com> --- src/lib/provider-outbound.ts | 6 +- tests/fixtures/provider-outbound-mihomo.ts | 106 +++++++++++++++++++++ tests/providers/provider-outbound.test.ts | 12 +++ 3 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 tests/fixtures/provider-outbound-mihomo.ts diff --git a/src/lib/provider-outbound.ts b/src/lib/provider-outbound.ts index 95341573d1..334f46dad5 100644 --- a/src/lib/provider-outbound.ts +++ b/src/lib/provider-outbound.ts @@ -42,7 +42,7 @@ function pickPinnedAddress(addresses: Array<{ address: string; family: number }> * * Under TUN mode the packet path intercepts the fake-IP destination itself, so a * canonical registry destination whose local DNS answers include Clash fake-IP - * space (198.18.0.0/15) is reachable by pin-connecting through the TUN — no + * space (198.18.0.0/15 or fdfe:dcba:9876::/48) is reachable by pin-connecting through the TUN — no * outbound HTTP(S) proxy env is required. The exception is deliberately narrow: * * - hostname-only: a literal 198.18.x.x URL never reaches it (the literal gate @@ -186,7 +186,9 @@ async function providerOutboundRequest( warnProxyDnsDegradationOnce(); return globalThis.fetch(url, { ...init, method, redirect: "manual" }); } - if (proxyConfigured && !resolved.privateNetwork) { + // A canonical TUN exception with no scheme-matched proxy must retain the + // validated address, even when an unrelated HTTP_PROXY/ALL_PROXY is present. + if (proxyConfigured && !resolved.privateNetwork && (effectiveProxy !== null || !allowMihomoIpv6FakeIp)) { warnProxyBoundaryOnce(); // When the Mihomo exception could have admitted an answer, pin the transport to the // proxy the admission assumed instead of letting fetch re-infer it from the environment. diff --git a/tests/fixtures/provider-outbound-mihomo.ts b/tests/fixtures/provider-outbound-mihomo.ts new file mode 100644 index 0000000000..25eb6eb68f --- /dev/null +++ b/tests/fixtures/provider-outbound-mihomo.ts @@ -0,0 +1,106 @@ +import assert from "node:assert/strict"; +import { mock } from "bun:test"; +import type { ProviderOutboundDependencies } from "../../src/lib/provider-outbound"; +import { PROXY_ENV_KEYS } from "../../src/lib/proxy-env"; + +// Isolate the DNS module mock from other tests while exercising the real classifier. +let answers: { address: string; family: number }[] = []; +mock.module("node:dns/promises", () => ({ lookup: async () => answers })); +const { providerOutboundGet, providerOutboundPost, ProviderOutboundPolicyError } = await import("../../src/lib/provider-outbound"); +const target = "https://opencode.ai/zen/v1/models"; +const fake = { address: "fdfe:dcba:9876::1", family: 6 }; +const body = '{"project":"mihomo-fixture"}'; +let ipv6Pinned = 0; +let proxyBound = 0; +let denied = 0; + +for (const method of ["GET", "POST"] as const) { + async function attempt( + env: Record, + dns: typeof answers, + expected: "pinned" | "proxy" | "denied", + url = target, + proof: "canonical" | "missing" | "noncanonical" = "canonical", + ) { + for (const key of PROXY_ENV_KEYS.flatMap(key => [key, key.toLowerCase()])) delete process.env[key]; + Object.assign(process.env, env); + answers = dns; + let pinnedCalls = 0; + let fetchCalls = 0; + const originalFetch = globalThis.fetch; + const capture: NonNullable = async (requestUrl, address, _signal, options) => { + pinnedCalls++; + assert.equal(expected, "pinned"); + assert.equal(requestUrl, target); + assert.deepEqual(address, fake); + assert.equal(options?.rejectUnauthorized, true); + assert.equal(new Headers(options?.headers).get("authorization"), "Bearer mihomo-fixture"); + return new Response("pinned"); + }; + const dependencies: ProviderOutboundDependencies = { + ...(proof !== "missing" ? { isCanonicalUrl: (name: string, value: string) => proof === "canonical" && name === "opencode-go" && value === url } : {}), + pinnedGet: capture, + pinnedPost: async (requestUrl, address, requestBody, signal, options) => { + assert.equal(method, "POST"); + assert.equal(requestBody, body); + return capture(requestUrl, address, signal, options); + }, + }; + globalThis.fetch = Object.assign(async (input: Parameters[0], init?: RequestInit & { proxy?: string }) => { + fetchCalls++; + assert.equal(expected, "proxy"); + assert.equal(String(input), target); + assert.equal(init?.proxy, "http://127.0.0.1:7897"); + assert.equal(init?.redirect, "manual"); + assert.equal(init?.method, method); + if (method === "POST") assert.equal(init?.body, body); + return new Response("proxy"); + }, { preconnect: originalFetch.preconnect }); + try { + const provider = { baseUrl: "https://opencode.ai/zen/v1" }; + const init = { headers: { authorization: "Bearer mihomo-fixture" } }; + const request = method === "GET" + ? providerOutboundGet("opencode-go", provider, url, init, dependencies) + : providerOutboundPost("opencode-go", provider, url, { ...init, body }, dependencies); + if (expected === "denied") { + await assert.rejects(request, ProviderOutboundPolicyError); + assert.equal(pinnedCalls, 0); + assert.equal(fetchCalls, 0); + denied++; + } else { + assert.equal(await (await request).text(), expected); + assert.equal(pinnedCalls, expected === "pinned" ? 1 : 0); + assert.equal(fetchCalls, expected === "proxy" ? 1 : 0); + if (expected === "pinned") ipv6Pinned++; + else proxyBound++; + } + } finally { + globalThis.fetch = originalFetch; + } + } + + // TUN handles the validated IPv6 address even if unrelated proxy variables exist. + const directEnvs: Record[] = [{}, { HTTP_PROXY: "http://127.0.0.1:7897" }, { ALL_PROXY: "socks5://127.0.0.1:7891" }]; + for (const env of directEnvs) { + await attempt(env, [fake], "pinned"); + } + await attempt({ HTTPS_PROXY: "http://127.0.0.1:7897" }, [fake], "proxy"); + + for (const noProxy of ["opencode.ai", ".opencode.ai", "*"]) { + const noProxyEnvs: Record[] = [{ NO_PROXY: noProxy }, { NO_PROXY: noProxy, HTTPS_PROXY: "http://127.0.0.1:7897" }]; + for (const env of noProxyEnvs) { + await attempt(env, [fake], "denied"); + } + } + for (const address of ["127.0.0.1", "10.0.0.5", "169.254.169.254", "169.254.1.2", "::1", "fd00::1", "fe80::1", "::", "fdfe:dcba:9877::1"]) { + const unsafe = { address, family: address.includes(":") ? 6 : 4 }; + await attempt({}, [fake, unsafe], "denied"); + await attempt({}, [unsafe, fake], "denied"); + } + await attempt({}, [fake], "denied", target, "missing"); + await attempt({}, [fake], "denied", "https://custom.example/v1/models", "noncanonical"); + // Even an erroneous canonical proof cannot admit a literal fake IP. + await attempt({}, [fake], "denied", "https://[fdfe:dcba:9876::1]/v1/models"); +} + +console.log(JSON.stringify({ ipv6Pinned, proxyBound, denied })); diff --git a/tests/providers/provider-outbound.test.ts b/tests/providers/provider-outbound.test.ts index 1e80634395..dca53eefe4 100644 --- a/tests/providers/provider-outbound.test.ts +++ b/tests/providers/provider-outbound.test.ts @@ -5,6 +5,7 @@ import { join } from "node:path"; import type { ProviderOutboundDependencies } from "../../src/lib/provider-outbound"; import { PROXY_ENV_KEYS } from "../../src/lib/proxy-env"; import { removeTreeWithRetry } from "../helpers/remove-tree"; +import { fixturePath, repoRoot } from "../helpers/repo-root"; const proxyKeys = PROXY_ENV_KEYS.flatMap(key => [key, key.toLowerCase()]); const originalProxyEnv = Object.fromEntries(proxyKeys.map(key => [key, process.env[key]])); @@ -427,6 +428,17 @@ describe("#3462 Mihomo IPv6 fake-IP admission is gated on the scheme-matched pro const ULA = "fdfe:dcba:9876::7e"; const target = "https://opencode.ai/zen/v1/models"; + test("canonical IPv6-only TUN transport preserves pinning and rejects unsafe DNS answers", async () => { + const child = Bun.spawn([process.execPath, fixturePath("provider-outbound-mihomo.ts")], { + cwd: repoRoot(), stdout: "pipe", stderr: "pipe", + }); + const [stdout, stderr, exitCode] = await Promise.all([ + new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited, + ]); + if (exitCode !== 0) throw new Error(`Mihomo fixture exited ${exitCode}: ${stderr}`); + expect(JSON.parse(stdout.trim())).toEqual({ ipv6Pinned: 6, proxyBound: 2, denied: 54 }); + }); + async function run(env: Record, opts: { admit: boolean }) { for (const key of proxyKeys) delete process.env[key]; for (const [k, v] of Object.entries(env)) process.env[k] = v; From a814dd3aadace7d3bd0b8dd02b7e2b2705f5b196 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:40:45 +0900 Subject: [PATCH 119/221] test(transport): run DNS fixture in the Bun test loader [skip ci] Co-authored-by: hualiny <82697947+hualiny@users.noreply.github.com> --- tests/fixtures/provider-outbound-mihomo.ts | 7 ++++-- tests/providers/provider-outbound.test.ts | 29 +++++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/tests/fixtures/provider-outbound-mihomo.ts b/tests/fixtures/provider-outbound-mihomo.ts index 25eb6eb68f..e376d8246b 100644 --- a/tests/fixtures/provider-outbound-mihomo.ts +++ b/tests/fixtures/provider-outbound-mihomo.ts @@ -5,7 +5,8 @@ import { PROXY_ENV_KEYS } from "../../src/lib/proxy-env"; // Isolate the DNS module mock from other tests while exercising the real classifier. let answers: { address: string; family: number }[] = []; -mock.module("node:dns/promises", () => ({ lookup: async () => answers })); +let dnsCalls = 0; +mock.module("node:dns/promises", () => ({ lookup: async () => { dnsCalls++; return answers; } })); const { providerOutboundGet, providerOutboundPost, ProviderOutboundPolicyError } = await import("../../src/lib/provider-outbound"); const target = "https://opencode.ai/zen/v1/models"; const fake = { address: "fdfe:dcba:9876::1", family: 6 }; @@ -25,6 +26,7 @@ for (const method of ["GET", "POST"] as const) { for (const key of PROXY_ENV_KEYS.flatMap(key => [key, key.toLowerCase()])) delete process.env[key]; Object.assign(process.env, env); answers = dns; + dnsCalls = 0; let pinnedCalls = 0; let fetchCalls = 0; const originalFetch = globalThis.fetch; @@ -74,6 +76,7 @@ for (const method of ["GET", "POST"] as const) { if (expected === "pinned") ipv6Pinned++; else proxyBound++; } + assert.equal(dnsCalls, url.startsWith("https://[") ? 0 : 1, "hostname requests must use the isolated DNS mock"); } finally { globalThis.fetch = originalFetch; } @@ -103,4 +106,4 @@ for (const method of ["GET", "POST"] as const) { await attempt({}, [fake], "denied", "https://[fdfe:dcba:9876::1]/v1/models"); } -console.log(JSON.stringify({ ipv6Pinned, proxyBound, denied })); +console.log("MIHOMO_RESULT=" + JSON.stringify({ ipv6Pinned, proxyBound, denied })); diff --git a/tests/providers/provider-outbound.test.ts b/tests/providers/provider-outbound.test.ts index dca53eefe4..9907c23664 100644 --- a/tests/providers/provider-outbound.test.ts +++ b/tests/providers/provider-outbound.test.ts @@ -1,7 +1,8 @@ import { afterEach, describe, expect, mock, test } from "bun:test"; -import { mkdtempSync} from "node:fs"; +import { mkdtempSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; +import { pathToFileURL } from "node:url"; import type { ProviderOutboundDependencies } from "../../src/lib/provider-outbound"; import { PROXY_ENV_KEYS } from "../../src/lib/proxy-env"; import { removeTreeWithRetry } from "../helpers/remove-tree"; @@ -429,14 +430,24 @@ describe("#3462 Mihomo IPv6 fake-IP admission is gated on the scheme-matched pro const target = "https://opencode.ai/zen/v1/models"; test("canonical IPv6-only TUN transport preserves pinning and rejects unsafe DNS answers", async () => { - const child = Bun.spawn([process.execPath, fixturePath("provider-outbound-mihomo.ts")], { - cwd: repoRoot(), stdout: "pipe", stderr: "pipe", - }); - const [stdout, stderr, exitCode] = await Promise.all([ - new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited, - ]); - if (exitCode !== 0) throw new Error(`Mihomo fixture exited ${exitCode}: ${stderr}`); - expect(JSON.parse(stdout.trim())).toEqual({ ipv6Pinned: 6, proxyBound: 2, denied: 54 }); + const childDir = mkdtempSync(join(tmpdir(), "ocx-mihomo-test-")); + const childTest = join(childDir, "mihomo.test.ts"); + // Builtin module mocks are activated by Bun's test loader, not plain bun execution. + writeFileSync(childTest, `import { test } from "bun:test";\ntest("Mihomo matrix", async () => { await import(${JSON.stringify(pathToFileURL(fixturePath("provider-outbound-mihomo.ts")).href)}); });\n`); + try { + const child = Bun.spawn([process.execPath, "test", childTest], { + cwd: repoRoot(), stdout: "pipe", stderr: "pipe", + }); + const [stdout, stderr, exitCode] = await Promise.all([ + new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited, + ]); + if (exitCode !== 0) throw new Error(`Mihomo fixture exited ${exitCode}: ${stderr}`); + const result = stdout.split(/\r?\n/).find(line => line.startsWith("MIHOMO_RESULT=")); + expect(result).toBeDefined(); + expect(JSON.parse(result!.slice("MIHOMO_RESULT=".length))).toEqual({ ipv6Pinned: 6, proxyBound: 2, denied: 54 }); + } finally { + removeTreeWithRetry(childDir); + } }); async function run(env: Record, opts: { admit: boolean }) { From 3955e10402dd12298a2fd6bf7cf9040daa02eb44 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:25:42 +0900 Subject: [PATCH 120/221] fix(codex): fence main quota activation recovery [skip ci] Co-authored-by: terrytan95 <10609214+terrytan95@users.noreply.github.com> --- src/codex/auth-api.ts | 23 ++++- src/codex/quota-auto-refresh.ts | 19 +++- ...-quota-auto-refresh-main-admission.test.ts | 91 ++++++++++++++++++- 3 files changed, 126 insertions(+), 7 deletions(-) diff --git a/src/codex/auth-api.ts b/src/codex/auth-api.ts index 8ab7f7418f..6768c4fa09 100644 --- a/src/codex/auth-api.ts +++ b/src/codex/auth-api.ts @@ -1838,7 +1838,28 @@ export async function listCodexAuthAccountsSnapshot( /** One opted-in account's metadata; reuse the bounded WHAM 401 recovery and generation fence. */ export async function refreshCodexQuotaForActivation(config: OcxConfig, accountId: string): Promise { if (accountId === MAIN_CODEX_ACCOUNT_ID) { - await fetchMainAccountInfoAttempt(true, 1, undefined, false, false); + const lease = tryAcquireNativeMainProfileClaim(); + if (!lease) return; + try { + reconcileMainCodexAccountRuntimeState(); + if (isAccountNeedsReauth(accountId)) return; + const identityGeneration = captureMainAccountIdentityGeneration(); + const writerGeneration = captureConfigGeneration(); + try { + // Refresh may need an exclusive claim; prepare before WHAM takes its shared claim. + if (!await getValidMainAccountToken({ preserveReauth: true })) return; + } catch (error) { + if (error instanceof MainAccountTokenRefreshError && error.reason === "reauth" + && isMainAccountIdentityGenerationLive(identityGeneration)) { + markAccountNeedsReauth(accountId, writerGeneration); + } + return; + } + if (isAccountNeedsReauth(accountId)) return; + await fetchMainAccountInfoAttempt(true, 1, lease, false, false); + } finally { + lease.release(); + } return; } const account = configuredPoolAccount(config, accountId); diff --git a/src/codex/quota-auto-refresh.ts b/src/codex/quota-auto-refresh.ts index bb3d001e2e..26b88a886c 100644 --- a/src/codex/quota-auto-refresh.ts +++ b/src/codex/quota-auto-refresh.ts @@ -15,7 +15,7 @@ import { isMainAccountHardLocked } from "./main-account-hard-lock"; import { tryAcquireNativeMainProfileClaim } from "./native-main-admission"; import { withNativeMainSharedClaim } from "./native-main-claim"; import { resolveNativeProfileContext } from "./native-profile-store"; -import { captureMainQuotaWriter } from "./main-account-cache"; +import { getMainQuotaCredentialGeneration, observeMainQuotaCredential } from "./main-account-cache"; import { applyAccountQuotaFromUpstreamHeaders, getAccountQuota, type StoredAccountQuota } from "./quota"; import { CodexWarmupError, codexWarmupFailureReason, warmCodexAccount } from "./warmup"; import { @@ -194,18 +194,29 @@ async function warmAccount(config: OcxConfig, accountId: string): Promise { + reconcileMainCodexAccountRuntimeState(); + const current = getMainAccountToken(); + return current?.accessToken === token.accessToken + && current.chatgptAccountId === token.chatgptAccountId + && getMainQuotaCredentialGeneration() === credentialGeneration; + }; try { await warmCodexAccount({ ...token, onCompleted: headers => { - if (writer) applyAccountQuotaFromUpstreamHeaders(accountId, headers, writerGeneration, writer); + if (writer && credentialStillLive()) { + applyAccountQuotaFromUpstreamHeaders(accountId, headers, writerGeneration, writer); + } } }); } catch (error) { if (error instanceof CodexWarmupError && error.status === 401 - && getMainAccountToken()?.accessToken === token.accessToken) { + && credentialStillLive()) { markAccountNeedsReauth(accountId, writerGeneration); } throw error; } + if (!credentialStillLive()) return false; }); } finally { lease.release(); diff --git a/tests/codex-integration/codex-quota-auto-refresh-main-admission.test.ts b/tests/codex-integration/codex-quota-auto-refresh-main-admission.test.ts index d676690c09..88080d5a4d 100644 --- a/tests/codex-integration/codex-quota-auto-refresh-main-admission.test.ts +++ b/tests/codex-integration/codex-quota-auto-refresh-main-admission.test.ts @@ -10,7 +10,7 @@ import { getMainAccountHardLockStatus } from "../../src/codex/main-account-hard- import { setMainAccountPlan } from "../../src/codex/main-account"; import * as mainAccount from "../../src/codex/main-account"; import * as nativeClaim from "../../src/codex/native-main-claim"; -import { clearAccountQuota, flushQuotaObservationsForTests, setAccountQuotaFromParsed } from "../../src/codex/quota"; +import { clearAccountQuota, flushQuotaObservationsForTests, getAccountQuota, getMainPolicyQuota, setAccountQuotaFromParsed } from "../../src/codex/quota"; import { resetCodexQuotaAutoRefreshForTests, runCodexQuotaAutoRefresh, type CodexQuotaAutoRefreshWindows } from "../../src/codex/quota-auto-refresh"; import { getNativeMainProfileRequestCount, resetLifecycleDrainStateForTests } from "../../src/server/lifecycle"; import { flushConfigDirHardeningForTests } from "../../src/config/paths"; @@ -23,6 +23,7 @@ const RESET_SECONDS = 1_700_000_000; const RESET_MILLISECONDS = 1_700_000_000_000; const responsesUrl = "https://chatgpt.com/backend-api/codex/responses"; const tokenUrl = "https://auth.openai.com/oauth/token"; +const whamUrl = "https://chatgpt.com/backend-api/wham/usage"; let home: string; let previousHome: string | undefined; let previousCodexHome: string | undefined; @@ -71,7 +72,7 @@ function installFetch(handler: (url: string, init?: RequestInit) => Promise[0], init?: RequestInit) => { calls.push(String(input)); - expect([tokenUrl, responsesUrl]).toContain(String(input)); + expect([tokenUrl, responsesUrl, whamUrl]).toContain(String(input)); expect(getNativeMainProfileRequestCount()).toBe(1); return handler(String(input), init); }, { preconnect: previousFetch.preconnect }); @@ -137,6 +138,92 @@ afterEach(async () => { }); describe("quota auto-refresh native-main admission", () => { + test("stale metadata prepares an expired main token before WHAM and activation", async () => { + const cfg = config(); + writeMain(bearer(true)); + const cached = getAccountQuota(MAIN); + if (!cached) throw new Error("Expected cached main quota"); + cached.updatedAt = now - 300_000; + const fresh = bearer(); + const calls = installFetch(async (url, init) => { + if (url === tokenUrl) { + return Response.json({ access_token: fresh, refresh_token: "fixture-rotated", expires_in: 86_400 }); + } + expect(new Headers(init?.headers).get("authorization")).toBe(`Bearer ${fresh}`); + if (url === whamUrl) return Response.json({ plan_type: "plus", rate_limit: { + primary_window: { used_percent: 0, limit_window_seconds: 18_000, reset_at: RESET_SECONDS }, + secondary_window: { used_percent: 0, limit_window_seconds: 604_800, reset_at: RESET_SECONDS }, + } }); + return completedResponse(); + }); + await runCodexQuotaAutoRefresh(cfg, now, { persistCompleted: recordMarkers }); + expect(calls).toEqual([tokenUrl, whamUrl, responsesUrl]); + expect(isAccountNeedsReauth(MAIN)).toBe(false); + expect(cfg.codexQuotaAutoRefresh?.[MAIN]?.lastFiveHourResetAt).toBe(RESET_MILLISECONDS); + expect(getNativeMainProfileRequestCount()).toBe(0); + }); + + test.each(["bearer", "workspace", "missing"] as const)( + "%s replacement during main SSE cannot publish old quota or completion markers", async change => { + const cfg = config(); + const entered = deferred(); + let controller!: ReadableStreamDefaultController; + const calls = installFetch(async () => new Response(new ReadableStream({ + start(value) { controller = value; }, + pull() { entered.resolve(); }, + }), { headers: { + "content-type": "text/event-stream", + "x-codex-primary-used-percent": "0", + "x-codex-primary-window-minutes": "300", + "x-codex-primary-reset-at": String(RESET_SECONDS + 18_000), + } })); + const run = runCodexQuotaAutoRefresh(cfg, now, { persistCompleted: recordMarkers }); + try { + await Promise.race([entered.promise, run.then(() => { throw new Error("SSE was never reached"); })]); + const workspace = change === "workspace" ? "fixture-replacement-workspace" : accountId; + if (change === "missing") writeFileSync(join(home, "auth.json"), "{}"); + else writeMain("fixture-replacement-token", workspace); + reconcileMainCodexAccountRuntimeState(); + const writer = captureMainQuotaWriter(workspace); + if (!writer) throw new Error("Expected current quota owner"); + setAccountQuotaFromParsed(MAIN, { shortPercent: 77, shortWindowSeconds: 18_000, + shortResetAt: RESET_SECONDS + 900 }, undefined, writer); + const quotaBefore = { ...getAccountQuota(MAIN) }; + const policyBefore = { ...getMainPolicyQuota() }; + controller.enqueue(new TextEncoder().encode('data: {"type":"response.completed"}\n\n')); + controller.close(); + await run; + expect(calls).toEqual([responsesUrl]); + expect(getAccountQuota(MAIN)).toEqual(quotaBefore); + expect(getMainPolicyQuota()).toEqual(policyBefore); + expect(cfg.codexQuotaAutoRefresh?.[MAIN]?.lastFiveHourResetAt).toBeUndefined(); + expect(cfg.codexQuotaAutoRefresh?.[MAIN]?.lastWeeklyResetAt).toBeUndefined(); + expect(isAccountNeedsReauth(MAIN)).toBe(false); + expect(getNativeMainProfileRequestCount()).toBe(0); + } finally { + try { controller?.close(); } catch { /* Already closed after completion. */ } + await run; + } + }, + ); + + test("late main 401 cannot quarantine a replacement credential", async () => { + const cfg = config(); + const entered = deferred(); + const response = deferred(); + installFetch(async () => { entered.resolve(); return response.promise; }); + const run = runCodexQuotaAutoRefresh(cfg, now, { persistCompleted: recordMarkers }); + try { + await Promise.race([entered.promise, run.then(() => { throw new Error("Inference was never reached"); })]); + writeMain("fixture-replacement-token"); + response.resolve(new Response("{}", { status: 401 })); + await run; + expect(isAccountNeedsReauth(MAIN)).toBe(false); + expect(cfg.codexQuotaAutoRefresh?.[MAIN]?.lastWeeklyResetAt).toBeUndefined(); + expect(getNativeMainProfileRequestCount()).toBe(0); + } finally { response.resolve(new Response("{}", { status: 401 })); await run; } + }); + test("owned reconciliation activates retained99 before token preparation when current identity was not observed", async () => { const cfg = config(); const writer = captureMainQuotaWriter(accountId); From b67f452c49904dbda2e0be435c2e34d5a064172f Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:06:44 +0900 Subject: [PATCH 121/221] test(transport): pass the test-run lease to the child fixture [skip ci] Co-authored-by: hualiny <82697947+hualiny@users.noreply.github.com> --- tests/providers/provider-outbound.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/providers/provider-outbound.test.ts b/tests/providers/provider-outbound.test.ts index 9907c23664..54c82a5435 100644 --- a/tests/providers/provider-outbound.test.ts +++ b/tests/providers/provider-outbound.test.ts @@ -436,7 +436,7 @@ describe("#3462 Mihomo IPv6 fake-IP admission is gated on the scheme-matched pro writeFileSync(childTest, `import { test } from "bun:test";\ntest("Mihomo matrix", async () => { await import(${JSON.stringify(pathToFileURL(fixturePath("provider-outbound-mihomo.ts")).href)}); });\n`); try { const child = Bun.spawn([process.execPath, "test", childTest], { - cwd: repoRoot(), stdout: "pipe", stderr: "pipe", + cwd: repoRoot(), env: { ...process.env }, stdout: "pipe", stderr: "pipe", }); const [stdout, stderr, exitCode] = await Promise.all([ new Response(child.stdout).text(), new Response(child.stderr).text(), child.exited, From edd396c62ec349fa686309c1ee55e02ebad6b903 Mon Sep 17 00:00:00 2001 From: makesomethingshit Date: Mon, 7 Sep 2026 15:35:53 +0900 Subject: [PATCH 122/221] fix(opencode-go): carry session affinity through Pi native chat [skip ci] (cherry picked from commit fbb214f92a7dc75f89d0d835fdb95136d61f380a) Co-authored-by: makesomethingshit <246213378+makesomethingshit@users.noreply.github.com> (cherry picked from commit 7e45a95f70689dfe1eb313c4af9aecbf2c44cdb6) --- src/clients/config-export.ts | 2 + src/server/chat-completions.ts | 7 +++ src/server/responses/core.ts | 3 +- tests/config/client-config-export.test.ts | 6 ++- .../opencode-go-session-header.test.ts | 52 ++++++++++++++++++- 5 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/clients/config-export.ts b/src/clients/config-export.ts index 8fb42f311d..e1744c2209 100644 --- a/src/clients/config-export.ts +++ b/src/clients/config-export.ts @@ -695,6 +695,7 @@ export interface PiProviderBlock { baseUrl: string; api: string; apiKey: string; + compat?: { sendSessionAffinityHeaders: boolean }; models: PiModelEntry[]; } @@ -859,6 +860,7 @@ function buildPiClientConfig(ctx: ExportContext): PiGeneratedConfig { baseUrl: ctx.baseUrl, api: PI_API_DIALECT, apiKey: LOOPBACK_API_KEY_PLACEHOLDER, + compat: { sendSessionAffinityHeaders: true }, models, }, }, diff --git a/src/server/chat-completions.ts b/src/server/chat-completions.ts index e7fd04f42d..7e69010636 100644 --- a/src/server/chat-completions.ts +++ b/src/server/chat-completions.ts @@ -25,6 +25,8 @@ import { estimateTokens } from "../lib/token-estimate"; import { NoEligiblePolicyCandidateError, UnknownRoutingPolicyError, routeModel } from "../router"; import { evidenceFromBody } from "../routing/request-evidence"; import { resolveWireProtocolOverride } from "./adapter-resolve"; +import { resolveOpenCodeGoTransport } from "../providers/opencode-go-transport"; +import { normalizeLogConversationId, sessionLaneIdFromRequest } from "./request-log-conversation"; import type { OcxConfig } from "../types"; import { readJsonRequestBody } from "./request-decompress"; import { @@ -136,6 +138,8 @@ async function handleChatCompletionsWithBudget( let chatNativeRoute: ReturnType | null = null; try { const route = routeModel(config, chatBody.model as string, evidenceFromBody(chatBody)); + route.provider = resolveOpenCodeGoTransport(route.provider, + sessionLaneIdFromRequest(req.headers) ?? normalizeLogConversationId(req.headers.get("x-opencode-session"))); // Settle the wire once so every branch below reads the adapter this model will // actually use, not the provider-wide default (#404). route.provider = resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, "chat"); @@ -237,6 +241,9 @@ async function handleChatCompletionsWithBudget( return chatCompletionsErrorResponse(400, CODEX_RESERVE_HELPER_UNSUPPORTED_MESSAGE, "invalid_request_error"); } const headers = new Headers({ "content-type": "application/json" }); + // Internal bridge metadata; the Go resolver scopes and hashes it before upstream use. + const openCodeSession = req.headers.get("x-opencode-session"); + if (openCodeSession) headers.set("x-opencode-session", openCodeSession); for (const name of FORWARD_HEADERS) { if (name === "authorization" && !directRoute) continue; const value = req.headers.get(name); diff --git a/src/server/responses/core.ts b/src/server/responses/core.ts index 312af7ac43..594b444c8b 100644 --- a/src/server/responses/core.ts +++ b/src/server/responses/core.ts @@ -2304,7 +2304,8 @@ async function applyFinalRouteRequestNormalization(args: { // Settle the wire once so logging, fast-mode, auth, and sidecars read the adapter // this request will actually use (#404). - route.provider = resolveOpenCodeGoTransport(route.provider, sessionLaneIdFromRequest(req.headers)); + route.provider = resolveOpenCodeGoTransport(route.provider, + sessionLaneIdFromRequest(req.headers) ?? normalizeLogConversationId(req.headers.get("x-opencode-session"))); route.provider = resolveWireProtocolOverride(route.providerName, route.modelId, route.provider, inboundWire); if (preserveAnthropicResponseModel) parsed._responseModelId = responseModelId; logCtx.model = route.modelId; diff --git a/tests/config/client-config-export.test.ts b/tests/config/client-config-export.test.ts index 6a71813e9f..4d70790403 100644 --- a/tests/config/client-config-export.test.ts +++ b/tests/config/client-config-export.test.ts @@ -315,6 +315,7 @@ describe("Pi serializer (accept criterion 2)", () => { expect(provider.baseUrl).toBe(BASE_URL); expect(provider.api).toBe("openai-completions"); expect(provider.apiKey).toBe(LOOPBACK_API_KEY_PLACEHOLDER); + expect(provider.compat?.sendSessionAffinityHeaders).toBe(true); }); test("cost is omitted on every entry — zeros would assert routed models are free", () => { @@ -899,7 +900,7 @@ describe("EXPORT_CLIENTS registry", () => { `); }); - test("pi bytes are unchanged, to the last newline", () => { + test("pi bytes include session affinity, to the last newline", () => { const built = buildClientConfigText("pi", ctx({ config: cfg() })); expect(built.format).toBe("json"); expect(built.text).toBe(`{ @@ -908,6 +909,9 @@ describe("EXPORT_CLIENTS registry", () => { "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "opencodex-loopback", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", diff --git a/tests/providers/opencode-go-session-header.test.ts b/tests/providers/opencode-go-session-header.test.ts index 00684f065b..9b476760cd 100644 --- a/tests/providers/opencode-go-session-header.test.ts +++ b/tests/providers/opencode-go-session-header.test.ts @@ -3,6 +3,7 @@ import { providerConfigSeed } from "../../src/providers/derive"; import { resolveOpenCodeGoTransport } from "../../src/providers/opencode-go-transport"; import { getProviderRegistryEntry } from "../../src/providers/registry"; import { handleResponses } from "../../src/server/responses/core"; +import { handleChatCompletions } from "../../src/server/chat-completions"; import type { OcxConfig, OcxProviderConfig } from "../../src/types"; const MUSE_MODEL = "muse-spark-1.3-contributor"; @@ -52,6 +53,8 @@ async function captureRequest(input: { model?: string; child?: string; provider?: OcxProviderConfig; + nativeChat?: boolean; + headers?: Record; } = {}): Promise<{ url: string; headers: Headers }> { const providerName = input.providerName ?? "opencode-go"; const model = input.model ?? MUSE_MODEL; @@ -65,7 +68,15 @@ async function captureRequest(input: { const config = { providers: { [providerName]: input.provider ?? opencodeGo() }, } as unknown as OcxConfig; - const response = await handleResponses( + const response = input.nativeChat ? await handleChatCompletions( + new Request("http://localhost/v1/chat/completions", { + method: "POST", + headers: input.headers ?? codexHeaders(input.child), + body: JSON.stringify({ model: `${providerName}/${model}`, messages: [{ role: "user", content: "ping" }], stream: false }), + }), + config, + { model: "", provider: "" }, + ) : await handleResponses( new Request("http://localhost/v1/responses", { method: "POST", headers: codexHeaders(input.child), @@ -77,6 +88,7 @@ async function captureRequest(input: { ); expect(response.status).toBe(200); + await response.text(); expect(requests).toHaveLength(1); return requests[0]!; } @@ -85,6 +97,44 @@ describe("OpenCode Go session affinity (#3344)", () => { const originalFetch = globalThis.fetch; afterEach(() => { globalThis.fetch = originalFetch; }); + test("native Chat ingress preserves stable Go affinity and separates conversations", async () => { + const provider = opencodeGo(); + const input = { nativeChat: true, model: "omen-alpha", provider }; + const first = await captureRequest(input); + const continued = await captureRequest(input); + const sibling = await captureRequest({ ...input, child: "child-thread-b" }); + expect(first.url).toBe("https://opencode.ai/zen/go/v1/chat/completions"); + expect(first.headers.get(SESSION_HEADER)).toMatch(/^ocx_[0-9a-f]{32}$/); + expect(continued.headers.get(SESSION_HEADER)).toBe(first.headers.get(SESSION_HEADER)); + expect(sibling.headers.get(SESSION_HEADER)).not.toBe(first.headers.get(SESSION_HEADER)); + expect(provider.headers?.[SESSION_HEADER]).toBeUndefined(); + }); + + test("native Chat honors configured session headers on renamed Go providers", async () => { + const captured = await captureRequest({ + nativeChat: true, model: "omen-alpha", providerName: "renamed-go", + provider: opencodeGo({ headers: { "X-OpenCode-Session": "operator-session" } }), + }); + expect(captured.headers.get(SESSION_HEADER)).toBe("operator-session"); + }); + + test("uses a Pi session header without Codex headers on native and bridged Chat", async () => { + const headers = { "content-type": "application/json", "x-opencode-session": "pi-conversation-a" }; + const chat = await captureRequest({ nativeChat: true, model: "omen-alpha", headers }); + const bridged = await captureRequest({ nativeChat: true, model: MUSE_MODEL, headers }); + expect(chat.headers.get(SESSION_HEADER)).toMatch(/^ocx_[0-9a-f]{32}$/); + expect(chat.headers.get(SESSION_HEADER)).not.toContain("pi-conversation-a"); + expect(bridged.headers.get(SESSION_HEADER)).toBe(chat.headers.get(SESSION_HEADER)); + }); + + test("native Chat does not send Go affinity to an unrelated destination", async () => { + const captured = await captureRequest({ + nativeChat: true, model: "omen-alpha", providerName: "custom-go", + provider: opencodeGo({ baseUrl: "https://opencode.ai.evil.test/zen/go/v1" }), + }); + expect(captured.headers.has(SESSION_HEADER)).toBe(false); + }); + test("sends one stable opaque session header on Responses and Chat wires", async () => { const responses = await captureRequest({ model: MUSE_MODEL }); const chat = await captureRequest({ model: CHAT_MODEL }); From effba4c646408c8fd4b22936c820de37d370ce9e Mon Sep 17 00:00:00 2001 From: makesomethingshit Date: Mon, 7 Sep 2026 16:11:52 +0900 Subject: [PATCH 123/221] test(opencode-go): define inbound opaque session identity contract [skip ci] (cherry picked from commit 9f15a7c4139de294c5b0d7eddf50d885523f149e) Co-authored-by: makesomethingshit <246213378+makesomethingshit@users.noreply.github.com> (cherry picked from commit 65908008e52c5dca2eb1130d1c0cff0e0732873d) --- .../opencode-go-session-header.test.ts | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tests/providers/opencode-go-session-header.test.ts b/tests/providers/opencode-go-session-header.test.ts index 9b476760cd..b05e526e1c 100644 --- a/tests/providers/opencode-go-session-header.test.ts +++ b/tests/providers/opencode-go-session-header.test.ts @@ -1,9 +1,10 @@ import { afterEach, describe, expect, test } from "bun:test"; import { providerConfigSeed } from "../../src/providers/derive"; -import { resolveOpenCodeGoTransport } from "../../src/providers/opencode-go-transport"; +import { deriveOpenCodeGoSessionId, resolveOpenCodeGoTransport } from "../../src/providers/opencode-go-transport"; import { getProviderRegistryEntry } from "../../src/providers/registry"; import { handleResponses } from "../../src/server/responses/core"; import { handleChatCompletions } from "../../src/server/chat-completions"; +import { normalizeLogConversationId } from "../../src/server/request-log-conversation"; import type { OcxConfig, OcxProviderConfig } from "../../src/types"; const MUSE_MODEL = "muse-spark-1.3-contributor"; @@ -79,7 +80,7 @@ async function captureRequest(input: { ) : await handleResponses( new Request("http://localhost/v1/responses", { method: "POST", - headers: codexHeaders(input.child), + headers: input.headers ?? codexHeaders(input.child), body: JSON.stringify({ model: `${providerName}/${model}`, input: "ping", stream: false }), }), config, @@ -127,6 +128,27 @@ describe("OpenCode Go session affinity (#3344)", () => { expect(bridged.headers.get(SESSION_HEADER)).toBe(chat.headers.get(SESSION_HEADER)); }); + for (const session of ["client-session-a", "ocx_0123456789abcdef0123456789abcdef"]) { + test(`treats inbound ${session.startsWith("ocx_") ? "ocx-prefixed" : "raw"} identity as client input on every ingress`, async () => { + const headers = { "content-type": "application/json", [SESSION_HEADER]: session }; + const expected = deriveOpenCodeGoSessionId(normalizeLogConversationId(session)!); + const native = await captureRequest({ nativeChat: true, model: "omen-alpha", headers }); + const bridged = await captureRequest({ nativeChat: true, model: MUSE_MODEL, headers }); + const responses = await captureRequest({ model: MUSE_MODEL, headers }); + expect(native.url).toEndWith("/chat/completions"); + expect(bridged.url).toEndWith("/responses"); + for (const request of [native, bridged, responses]) { + expect(request.headers.get(SESSION_HEADER)).toBe(expected); + expect(request.headers.get(SESSION_HEADER)).not.toBe(session); + } + const override = await captureRequest({ + nativeChat: true, model: "omen-alpha", headers, + provider: opencodeGo({ headers: { "X-OpenCode-Session": session } }), + }); + expect(override.headers.get(SESSION_HEADER)).toBe(session); + }); + } + test("native Chat does not send Go affinity to an unrelated destination", async () => { const captured = await captureRequest({ nativeChat: true, model: "omen-alpha", providerName: "custom-go", From 5b3df2ed5a0b69677c739c937ab24f5eb6061f3e Mon Sep 17 00:00:00 2001 From: Ingwannu Date: Mon, 7 Sep 2026 06:35:43 +0000 Subject: [PATCH 124/221] fix: admit reasoning envelope allocations before materialization [skip ci] (cherry picked from commit 9bcb7748facfd5495f641044adcf8e0627f9fb26) Co-authored-by: Ingwannu <186453546+Ingwannu@users.noreply.github.com> --- .../content/docs/reference/proxy-formats.md | 6 + src/claude/inbound.ts | 27 ++++- src/lib/json-byte-size.ts | 61 ++++++++++ src/responses/reasoning-envelope.ts | 72 +++++++++--- src/server/claude-messages.ts | 5 +- structure/04_transports-and-sidecars.md | 17 +++ tests/responses/reasoning-envelope.test.ts | 111 +++++++++++++++++- 7 files changed, 269 insertions(+), 30 deletions(-) create mode 100644 src/lib/json-byte-size.ts diff --git a/docs-site/src/content/docs/reference/proxy-formats.md b/docs-site/src/content/docs/reference/proxy-formats.md index cb97ad7076..0c7b8257bc 100644 --- a/docs-site/src/content/docs/reference/proxy-formats.md +++ b/docs-site/src/content/docs/reference/proxy-formats.md @@ -278,6 +278,12 @@ These endpoints speak the Anthropic Messages dialect used by Claude Code and com Most requests are translated to Responses, routed normally, then translated back to Anthropic JSON or Anthropic SSE. +On translated Messages requests, reasoning replay shares the request's translation budget. +Envelope admission includes encoding/decoding copy overhead, not just the original signature +length. Requests exceeding this budget return HTTP 413 with `translation_buffer_limit`; +signatures and opaque reasoning data are never truncated to make a request fit. Native +Anthropic passthrough retains its separate body-size contract. + Base64 and URL image sources are translated in user messages and nested tool results. File-backed images (`source.type: "file"`) require native Anthropic passthrough; translated routes return a fixed HTTP 400 error asking for base64 or URL input. OpenCodex does not resolve another provider's diff --git a/src/claude/inbound.ts b/src/claude/inbound.ts index 5e876ca6cb..c2e3ded9b2 100644 --- a/src/claude/inbound.ts +++ b/src/claude/inbound.ts @@ -18,6 +18,7 @@ import { AnthropicRequestError, isRec, type Rec } from "./inbound-records"; import { resolveInboundModel, effortForThinkingBudget, effortFromOutputConfig, formatFromOutputConfig } from "./inbound-model-options"; import { systemToInstructions, toolsToResponses, toolChoiceToResponses } from "./inbound-content-options"; import { decodeReasoningEnvelope, encodeReasoningEnvelope, OCX_REASONING_PREFIX } from "../responses/reasoning-envelope"; +import { createTranslatorBudget, type TranslatorBudget } from "../lib/translator-budget"; @@ -210,7 +211,7 @@ function userMessageToItems(content: unknown, input: Rec[], elide: SkillElisionC pushUserMessage(input, pending); } -function assistantMessageToItems(content: unknown, input: Rec[]): void { +function assistantMessageToItems(content: unknown, input: Rec[], budget: TranslatorBudget): void { if (typeof content === "string") { if (content.length > 0) input.push({ type: "message", role: "assistant", content: [{ type: "output_text", text: content }] }); return; @@ -240,11 +241,12 @@ function assistantMessageToItems(content: unknown, input: Rec[]): void { const thinking = typeof raw.thinking === "string" ? raw.thinking : ""; const signature = typeof raw.signature === "string" ? raw.signature : ""; if (signature.startsWith(OCX_REASONING_PREFIX)) { - const owned = decodeReasoningEnvelope(signature); + const owned = decodeReasoningEnvelope(signature, budget); if (!owned) throw new AnthropicRequestError("malformed ocxr1 reasoning signature"); if (Object.hasOwn(owned, "sig")) throw new AnthropicRequestError("OpenCodex reasoning continuity cannot be replayed as an Anthropic signature"); } - const encrypted = signature.length === 0 ? undefined : signature.startsWith(OCX_REASONING_PREFIX) ? signature : encodeReasoningEnvelope({ sig: signature }); + const encrypted = signature.length === 0 ? undefined : signature.startsWith(OCX_REASONING_PREFIX) ? signature : encodeReasoningEnvelope({ sig: signature }, budget); + if (encrypted) budget.chargeRetained(2 * encrypted.length, { kind: "reasoning" }); if (thinking.length === 0 && !encrypted) break; input.push({ type: "reasoning", id: `rs_${crypto.randomUUID().replace(/-/g, "")}`, summary: thinking.length > 0 ? [{ type: "summary_text", text: thinking }] : [], ...(encrypted ? { encrypted_content: encrypted } : {}) }); break; @@ -252,7 +254,11 @@ function assistantMessageToItems(content: unknown, input: Rec[]): void { case "redacted_thinking": { flush(); const data = typeof raw.data === "string" ? raw.data : ""; - if (data.length > 0) input.push({ type: "reasoning", id: `rs_${crypto.randomUUID().replace(/-/g, "")}`, summary: [], encrypted_content: encodeReasoningEnvelope({ red: [data] }) }); + if (data.length > 0) { + const encrypted = encodeReasoningEnvelope({ red: [data] }, budget); + budget.chargeRetained(2 * encrypted.length, { kind: "reasoning" }); + input.push({ type: "reasoning", id: `rs_${crypto.randomUUID().replace(/-/g, "")}`, summary: [], encrypted_content: encrypted }); + } break; } default: @@ -294,7 +300,16 @@ export function anthropicToResponsesBody(raw: unknown, cc?: OcxClaudeCodeConfig) * OUT-OF-BODY tuple (audit 133 R3#1 — an in-body marker would leak upstream through * the native Responses forward and 400). */ -export function anthropicToResponsesTranslation(raw: unknown, cc?: OcxClaudeCodeConfig): ClaudeInboundTranslation { +export function anthropicToResponsesTranslation(raw: unknown, cc?: OcxClaudeCodeConfig, budget?: TranslatorBudget): ClaudeInboundTranslation { + const activeBudget = budget ?? createTranslatorBudget(); + try { + return translateAnthropicRequest(raw, cc, activeBudget); + } finally { + if (!budget) activeBudget.dispose(); + } +} + +function translateAnthropicRequest(raw: unknown, cc: OcxClaudeCodeConfig | undefined, budget: TranslatorBudget): ClaudeInboundTranslation { if (!isRec(raw)) throw new AnthropicRequestError("request body must be a JSON object"); if (typeof raw.model !== "string" || raw.model.length === 0) { throw new AnthropicRequestError("model is required"); @@ -315,7 +330,7 @@ export function anthropicToResponsesTranslation(raw: unknown, cc?: OcxClaudeCode for (const msg of raw.messages) { if (!isRec(msg)) throw new AnthropicRequestError("each message must be an object"); if (msg.role === "user") userMessageToItems(msg.content, input, elide); - else if (msg.role === "assistant") assistantMessageToItems(msg.content, input); + else if (msg.role === "assistant") assistantMessageToItems(msg.content, input, budget); else if (msg.role === "system") { const text = systemMessageText(msg.content); if (text.length > 0) systemParts.push(text); diff --git a/src/lib/json-byte-size.ts b/src/lib/json-byte-size.ts new file mode 100644 index 0000000000..d6398718fd --- /dev/null +++ b/src/lib/json-byte-size.ts @@ -0,0 +1,61 @@ +import { TRANSLATOR_MAX_TURN_BYTES, TranslatorBudgetExceededError } from "./translator-budget"; + +/** Measure plain JSON data without allocating its serialized string or UTF-8 copy. */ +export function jsonUtf8Bytes(value: unknown, limit = TRANSLATOR_MAX_TURN_BYTES): number { + let bytes = 0; + const add = (count: number) => { + if (count > limit - bytes) throw new TranslatorBudgetExceededError("request_copies", limit); + bytes += count; + }; + const string = (text: string) => { + // Every UTF-16 code unit needs at least one JSON UTF-8 byte; reject large inputs + // before walking them. Escapes and unpaired surrogates are counted below. + if (text.length + 2 > limit - bytes) throw new TranslatorBudgetExceededError("request_copies", limit); + add(2); + for (let i = 0; i < text.length; i++) { + const code = text.charCodeAt(i); + if (code === 0x22 || code === 0x5c || code === 8 || code === 9 || code === 10 || code === 12 || code === 13) add(2); + else if (code < 0x20) add(6); + else if (code < 0x80) add(1); + else if (code < 0x800) add(2); + else if (code >= 0xd800 && code <= 0xdbff) { + const next = text.charCodeAt(i + 1); + if (next >= 0xdc00 && next <= 0xdfff) { add(4); i++; } + else add(6); + } else if (code >= 0xdc00 && code <= 0xdfff) add(6); + else add(3); + } + }; + const visit = (item: unknown): void => { + if (item === null) { add(4); return; } + if (typeof item === "string") { string(item); return; } + if (typeof item === "boolean") { add(item ? 4 : 5); return; } + if (typeof item === "number") { add(Number.isFinite(item) ? String(item).length : 4); return; } + if (Array.isArray(item)) { + add(2); + for (let i = 0; i < item.length; i++) { + if (i > 0) add(1); + if (item[i] === undefined) add(4); + else visit(item[i]); + } + return; + } + if (typeof item === "object" && item !== null) { + add(2); + let first = true; + for (const key of Object.keys(item)) { + const field = (item as Record)[key]; + if (field === undefined) continue; + if (!first) add(1); + first = false; + string(key); + add(1); + visit(field); + } + return; + } + throw new TypeError("Expected plain JSON data for translation sizing"); + }; + visit(value); + return bytes; +} diff --git a/src/responses/reasoning-envelope.ts b/src/responses/reasoning-envelope.ts index 2a56563578..ba20e800ed 100644 --- a/src/responses/reasoning-envelope.ts +++ b/src/responses/reasoning-envelope.ts @@ -12,6 +12,9 @@ * passthrough scrub strips ocxr1 envelopes before native forwarding. */ +import { createTranslatorBudget, type TranslatorBudget } from "../lib/translator-budget"; +import { jsonUtf8Bytes } from "../lib/json-byte-size"; + export const OCX_REASONING_PREFIX = "ocxr1:"; export interface ReasoningEnvelope { @@ -32,30 +35,61 @@ export interface ReasoningEnvelope { krc?: string; } -export function encodeReasoningEnvelope(envelope: ReasoningEnvelope): string { - return OCX_REASONING_PREFIX + Buffer.from(JSON.stringify(envelope), "utf-8").toString("base64"); +export function encodeReasoningEnvelope(envelope: ReasoningEnvelope, budget?: TranslatorBudget): string { + const activeBudget = budget ?? createTranslatorBudget(); + try { + const jsonBytes = jsonUtf8Bytes(envelope); + const base64Bytes = 4 * Math.ceil(jsonBytes / 3); + // Reserve before materialization: UTF-16 JSON, UTF-8 buffer, base64 string, + // and the prefixed result may coexist. Returned-value ownership stays with + // callers, whose existing retained accounting must not be charged twice here. + const reservation = activeBudget.reserveTransient( + Math.max( + 3 * jsonBytes + 4 * base64Bytes + 2 * OCX_REASONING_PREFIX.length, + 8 * (OCX_REASONING_PREFIX.length + base64Bytes), + ), + { kind: "reasoning" }, + ); + try { + return OCX_REASONING_PREFIX + Buffer.from(JSON.stringify(envelope), "utf-8").toString("base64"); + } finally { + reservation.release(); + } + } finally { + if (!budget) activeBudget.dispose(); + } } /** Decode an ocxr1 envelope; returns null for native (OpenAI-encrypted) blobs or garbage. */ -export function decodeReasoningEnvelope(encryptedContent: string): ReasoningEnvelope | null { +export function decodeReasoningEnvelope(encryptedContent: string, budget?: TranslatorBudget): ReasoningEnvelope | null { if (!encryptedContent.startsWith(OCX_REASONING_PREFIX)) return null; + const activeBudget = budget ?? createTranslatorBudget(); try { - const parsed: unknown = JSON.parse(Buffer.from(encryptedContent.slice(OCX_REASONING_PREFIX.length), "base64").toString("utf-8")); - if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null; - const obj = parsed as { sig?: unknown; red?: unknown }; - const envelope: ReasoningEnvelope = {}; - if (typeof obj.sig === "string") envelope.sig = obj.sig; - if (Array.isArray(obj.red)) { - const red = obj.red.filter((r): r is string => typeof r === "string"); - if (red.length > 0) envelope.red = red; + // Also bound already-encoded replay before slicing, decoding, or parsing it. + // Eight bytes per code unit conservatively covers the string/buffer copies. + const reservation = activeBudget.reserveTransient(8 * encryptedContent.length, { kind: "reasoning" }); + try { + const parsed: unknown = JSON.parse(Buffer.from(encryptedContent.slice(OCX_REASONING_PREFIX.length), "base64").toString("utf-8")); + if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return null; + const obj = parsed as { sig?: unknown; red?: unknown }; + const envelope: ReasoningEnvelope = {}; + if (typeof obj.sig === "string") envelope.sig = obj.sig; + if (Array.isArray(obj.red)) { + const red = obj.red.filter((r): r is string => typeof r === "string"); + if (red.length > 0) envelope.red = red; + } + const txt = (parsed as { txt?: unknown }).txt; + const hasTxt = typeof txt === "string"; + if (hasTxt) envelope.txt = txt; + const krc = (parsed as { krc?: unknown }).krc; + if (typeof krc === "string" && krc.length > 0) envelope.krc = krc; + return envelope.sig || envelope.red || hasTxt || envelope.krc ? envelope : null; + } catch { + return null; + } finally { + reservation.release(); } - const txt = (parsed as { txt?: unknown }).txt; - const hasTxt = typeof txt === "string"; - if (hasTxt) envelope.txt = txt; - const krc = (parsed as { krc?: unknown }).krc; - if (typeof krc === "string" && krc.length > 0) envelope.krc = krc; - return envelope.sig || envelope.red || hasTxt || envelope.krc ? envelope : null; - } catch { - return null; + } finally { + if (!budget) activeBudget.dispose(); } } diff --git a/src/server/claude-messages.ts b/src/server/claude-messages.ts index 20bc14e195..a8af8896ff 100644 --- a/src/server/claude-messages.ts +++ b/src/server/claude-messages.ts @@ -7,6 +7,7 @@ * unchanged. The Responses output (SSE or JSON) is converted back to Anthropic shape. */ import { FORWARD_HEADERS } from "../adapters/openai-responses"; +import { jsonUtf8Bytes } from "../lib/json-byte-size"; import { sseFieldValue } from "../lib/sse-decoder"; import { enforceAnthropicImageLimits, sniffImageDimensions } from "../adapters/anthropic-image-guard"; import { normalizeAnthropicImages } from "../adapters/anthropic-image-normalize"; @@ -753,13 +754,13 @@ async function handleClaudeMessagesWithBudget( }; delete anthropicBody.thinking; } - const translation = anthropicToResponsesTranslation(anthropicBody, config.claudeCode); + const translation = anthropicToResponsesTranslation(anthropicBody, config.claudeCode, translatorBudget); internalBody = translation.body; // The Anthropic translator builds its body from model/input/store/stream plus sampling // fields only, so the caller intent is applied to the TRANSLATED body rather than the // inbound one. if (fastRow) internalBody.service_tier = "priority"; - translatorBudget.chargeRetained(new TextEncoder().encode(JSON.stringify(internalBody)).byteLength, { kind: "request_copies" }); + translatorBudget.chargeRetained(jsonUtf8Bytes(internalBody), { kind: "request_copies" }); cacheKeySource = translation.cacheKeySource; } catch (err) { const overflow = isTranslatorBudgetExceededError(err); diff --git a/structure/04_transports-and-sidecars.md b/structure/04_transports-and-sidecars.md index c568bb0151..256bd1eae5 100644 --- a/structure/04_transports-and-sidecars.md +++ b/structure/04_transports-and-sidecars.md @@ -1480,6 +1480,23 @@ Unsupported constraints remain in `description` as model guidance instead of dis ## Reasoning display parity (hideThinkingSummary) +Reasoning-envelope serialization uses preflight byte sizing and transient reservations before +creating JSON, UTF-8, or base64 copies. Encoding also admits the matching decode projection, so +a successfully encoded standalone envelope fits the standalone decoder's limit. Callers retain +ownership of returned values; the helper releases only its temporary reservation. Inbound +Anthropic translation carries one budget across all assistant blocks and accounts for retained +envelopes until the response lifecycle disposes it. Standalone translation owns a temporary +budget and disposes it on success or failure. Final translated-request sizing uses plain-JSON +measurement rather than allocating a serialized copy just to measure it. + +[Decision Log] +- 목적과 의도: Keep reasoning replay bounded while preserving opaque values exactly. +- 기존 구현 및 제약 조건: Reasoning continuity needs JSON/base64 envelopes, and existing callers already own retained accounting and typed overflow handling. +- 검토한 주요 대안: Per-field truncation, an independent fixed field limit, or shared transient admission plus cumulative inbound ownership. +- 선택한 방식: Reserve conservative copy projections in the envelope helpers and use the existing request budget across inbound blocks. +- 다른 대안 대신 이 방식을 선택한 이유: Truncation changes signed values; one field limit does not describe aggregate ownership. Existing budget errors retain the established HTTP and stream error contracts. +- 장점, 단점 및 영향: Normal replay is unchanged; envelope admission includes copy overhead and is stricter than a raw-string length ceiling. These are translator accounting limits, not a process-wide RSS guarantee. + `hideThinkingSummary` (request reasoning summary absent/"none" — the routed catalog default) is honored by BOTH reasoning paths: anthropic `thinking_delta` AND raw `reasoning_raw_delta` (openai-chat `reasoning_content`, kiro tags). Hidden reasoning emits an envelope-only reasoning diff --git a/tests/responses/reasoning-envelope.test.ts b/tests/responses/reasoning-envelope.test.ts index 2469b8e46b..4a26ce51db 100644 --- a/tests/responses/reasoning-envelope.test.ts +++ b/tests/responses/reasoning-envelope.test.ts @@ -1,7 +1,10 @@ -import { describe, expect, test } from "bun:test"; -import { anthropicToResponsesBody } from "../../src/claude/inbound"; -import { decodeReasoningEnvelope, encodeReasoningEnvelope } from "../../src/responses/reasoning-envelope"; +import { describe, expect, spyOn, test } from "bun:test"; +import { anthropicToResponsesBody, anthropicToResponsesTranslation } from "../../src/claude/inbound"; +import { decodeReasoningEnvelope, encodeReasoningEnvelope, OCX_REASONING_PREFIX, type ReasoningEnvelope } from "../../src/responses/reasoning-envelope"; import { responsesJsonToAnthropicMessage } from "../../src/claude/outbound"; +import { createTranslatorBudget, TranslatorBudgetExceededError, translatorObservedBufferSnapshot } from "../../src/lib/translator-budget"; +import { jsonUtf8Bytes } from "../../src/lib/json-byte-size"; +import * as budgets from "../../src/lib/translator-budget"; describe("reasoning and tool/result envelopes", () => { test("preserves ordered thinking blocks and genuine signatures", () => { @@ -77,3 +80,105 @@ describe("reasoning and tool/result envelopes", () => { expect(message.content).toEqual([{ type: "thinking", thinking: "", signature: "sig-only" }]); }); }); + +describe("reasoning allocation admission", () => { + test.each(["ascii", "\"\\\n\u0000", "한글😀", "\ud800", "\udc00", ""])('sizes JSON strings exactly: %j', value => { + const data = { sig: value, red: [value, ""], txt: value, krc: value, omitted: undefined }; + const expected = Buffer.byteLength(JSON.stringify(data)); + expect(jsonUtf8Bytes(data, expected)).toBe(expected); + expect(() => jsonUtf8Bytes(data, expected - 1)).toThrow(TranslatorBudgetExceededError); + }); + + test("sizes the translated plain-JSON vocabulary", () => { + const data = { arr: [undefined, null, true, false, 0, -0, 1e30, NaN, Infinity, { text: "x" }], absent: undefined }; + expect(jsonUtf8Bytes(data)).toBe(Buffer.byteLength(JSON.stringify(data))); + }); + + test.each([{ sig: "opaque" }, { red: ["one", "two"] }, { txt: "hidden" }, { krc: "opaque" }, { sig: "s", red: ["r"], txt: "t", krc: "k" }])( + "rejects before JSON/Buffer materialization and admits the exact projected boundary: %j", envelope => { + const json = JSON.stringify(envelope); + const size = Buffer.byteLength(json); + const base64Bytes = 4 * Math.ceil(size / 3); + const limit = Math.max(3 * size + 4 * base64Bytes + 2 * OCX_REASONING_PREFIX.length, 8 * (OCX_REASONING_PREFIX.length + base64Bytes)); + const budget = createTranslatorBudget({ maxTurnBytes: limit - 1 }); + const stringify = spyOn(JSON, "stringify"); + const from = spyOn(Buffer, "from"); + let error: unknown; + let serializations = 0; + let allocations = 0; + try { encodeReasoningEnvelope(envelope, budget); } catch (caught) { error = caught; } + finally { + serializations = stringify.mock.calls.length; + allocations = from.mock.calls.length; + stringify.mockRestore(); from.mockRestore(); + } + expect(error).toBeInstanceOf(TranslatorBudgetExceededError); + expect(serializations).toBe(0); + expect(allocations).toBe(0); + expect(budget.snapshot().currentBytes).toBe(0); + budget.dispose(); + const exact = createTranslatorBudget({ maxTurnBytes: limit }); + try { + const encoded = encodeReasoningEnvelope(envelope, exact); + expect(encoded).toBe(OCX_REASONING_PREFIX + Buffer.from(json).toString("base64")); + expect(decodeReasoningEnvelope(encoded, exact)).toEqual(envelope); + expect(exact.snapshot().currentBytes).toBe(0); + } finally { exact.dispose(); } + }, + ); + + test("bounds preencoded replay before decoding and preserves native blobs", () => { + const encoded = encodeReasoningEnvelope({ txt: "" }); + const budget = createTranslatorBudget({ maxTurnBytes: encoded.length * 8 - 1 }); + const from = spyOn(Buffer, "from"); + let error: unknown; + let allocations = 0; + try { decodeReasoningEnvelope(encoded, budget); } catch (caught) { error = caught; } + finally { allocations = from.mock.calls.length; from.mockRestore(); } + expect(error).toBeInstanceOf(TranslatorBudgetExceededError); + expect(allocations).toBe(0); + expect(decodeReasoningEnvelope("native-opaque", budget)).toBeNull(); + expect(budget.snapshot().currentBytes).toBe(0); + budget.dispose(); + const exact = createTranslatorBudget({ maxTurnBytes: encoded.length * 8 }); + try { expect(decodeReasoningEnvelope(encoded, exact)).toEqual({ txt: "" }); } + finally { exact.dispose(); } + }); + + test.each(["thinking", "redacted_thinking", "owned"])('accounts cumulatively for %s blocks across messages', type => { + const before = translatorObservedBufferSnapshot().currentBytes; + const block = type === "redacted_thinking" ? { type, data: "r" } + : { type: "thinking", thinking: "", signature: type === "owned" ? encodeReasoningEnvelope({ txt: "t" }) : "s" }; + const budget = createTranslatorBudget({ maxTurnBytes: 256 }); + try { + expect(() => anthropicToResponsesTranslation({ model: "m", messages: Array.from({ length: 8 }, () => ({ role: "assistant", content: [block] })) }, undefined, budget)) + .toThrow(TranslatorBudgetExceededError); + expect(budget.snapshot().highWaterBytes).toBeLessThanOrEqual(256); + } finally { budget.dispose(); } + expect(translatorObservedBufferSnapshot().currentBytes).toBe(before); + }); + + test.each(["thinking", "redacted_thinking", "owned"])("handler maps %s admission failure to 413 without dispatch and disposes its budget", async type => { + const { handleClaudeMessages } = await import("../../src/server/claude-messages"); + const signature = type === "owned" ? encodeReasoningEnvelope({ txt: "fixture" }) : "fixture"; + const content = type === "redacted_thinking" ? { type, data: "fixture" } + : { type: "thinking", thinking: "", signature }; + const request = new Request("http://localhost/v1/messages", { + method: "POST", headers: { "content-type": "application/json" }, + body: JSON.stringify({ model: "fixture/model", messages: [{ role: "assistant", content: [content] }] }), + }); + const beforeBytes = budgets.translatorObservedBufferSnapshot().currentBytes; + const beforeCount = budgets.translatorLiveBudgetCountForTests(); + const create = budgets.createTranslatorBudget; + const factory = spyOn(budgets, "createTranslatorBudget").mockImplementation(() => create({ maxTurnBytes: 64 })); + const upstream = spyOn(globalThis, "fetch").mockImplementation(async () => { throw new Error("unexpected upstream dispatch"); }); + try { + const response = await handleClaudeMessages(request, { port: 0, providers: {} }, { model: "", provider: "" }); + expect(response.status).toBe(413); + expect(await response.json()).toMatchObject({ type: "error", error: { type: "request_too_large", code: "translation_buffer_limit" } }); + expect(upstream).not.toHaveBeenCalled(); + expect(budgets.translatorObservedBufferSnapshot().currentBytes).toBe(beforeBytes); + expect(budgets.translatorLiveBudgetCountForTests()).toBe(beforeCount); + } finally { factory.mockRestore(); upstream.mockRestore(); } + }); +}); From eb8cc9ab735a3c2396cb5393bbf62dc473d5716e Mon Sep 17 00:00:00 2001 From: makesomethingshit Date: Mon, 7 Sep 2026 16:24:45 +0900 Subject: [PATCH 125/221] fix(pi): scope generated session affinity to the Pi client [skip ci] (cherry picked from commit 23d869350e9a90359f65624e41ae8e93797ae398) Co-authored-by: makesomethingshit <246213378+makesomethingshit@users.noreply.github.com> (cherry picked from commit 1e65ffd4bc9ba8befdf6e3546643b428106f4650) --- src/clients/config-export.ts | 8 ++++---- tests/clients/prime-client.test.ts | 20 ++++++++------------ tests/config/client-config-export.test.ts | 2 ++ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/clients/config-export.ts b/src/clients/config-export.ts index e1744c2209..6a94b74d70 100644 --- a/src/clients/config-export.ts +++ b/src/clients/config-export.ts @@ -817,7 +817,7 @@ export interface GajaeGeneratedConfig { * model. The rest of this contract (omitting `cost`) is still ours rather than * a claim about Pi's acceptance. */ -function buildPiClientConfig(ctx: ExportContext): PiGeneratedConfig { +function buildPiClientConfig(ctx: ExportContext, sendSessionAffinityHeaders = false): PiGeneratedConfig { const models: PiModelEntry[] = []; for (const model of normalizeExportModels(ctx.models)) { // Text is the one modality every routed model supports; anything richer must come @@ -860,7 +860,7 @@ function buildPiClientConfig(ctx: ExportContext): PiGeneratedConfig { baseUrl: ctx.baseUrl, api: PI_API_DIALECT, apiKey: LOOPBACK_API_KEY_PLACEHOLDER, - compat: { sendSessionAffinityHeaders: true }, + ...(sendSessionAffinityHeaders ? { compat: { sendSessionAffinityHeaders: true } } : {}), models, }, }, @@ -1033,7 +1033,7 @@ function buildOpencodeContribution(ctx: ExportContext): ManagedContribution { } function buildPiContribution(ctx: ExportContext): ManagedContribution { - const doc = buildPiClientConfig(ctx); + const doc = buildPiClientConfig(ctx, true); return singleFragment("pi", ["providers", OPENCODE_PROVIDER_ID], doc.providers[OPENCODE_PROVIDER_ID]); } @@ -1129,7 +1129,7 @@ export const EXPORT_CLIENTS: Record = { destination: env => piConfigPath(env), apiKeyEnv: "", exportHint: "Pi reads a non-secret placeholder from models.json; loopback needs no key.", - build: buildPiClientConfig, + build: ctx => buildPiClientConfig(ctx, true), format: "json", summarize: summarizePi, buildContribution: buildPiContribution, diff --git a/tests/clients/prime-client.test.ts b/tests/clients/prime-client.test.ts index c88c77508a..6c7c0a2f76 100644 --- a/tests/clients/prime-client.test.ts +++ b/tests/clients/prime-client.test.ts @@ -37,18 +37,14 @@ function context(): ExportContext { } describe("Prime Agent client config", () => { - /** - * The load-bearing claim of this client: Prime Agent is the pi coding agent - * under a different brand, so it reads the SAME models.json contract rather - * than a lookalike. Locking the two documents together is what keeps that - * claim true — if a future Pi-only change diverges, this fails here instead - * of silently shipping Prime users a config their agent rejects. - */ - test("generates byte-for-byte the document Pi generates", () => { - const prime = buildClientConfigText("prime", context()); - const pi = buildClientConfigText("pi", context()); - expect(prime.format).toBe("json"); - expect(prime.text).toBe(pi.text); + test("shares Pi's model contract without opting Prime into session headers", () => { + const prime = buildClientConfig("prime", context()) as PiGeneratedConfig; + const pi = buildClientConfig("pi", context()) as PiGeneratedConfig; + expect(pi.providers[OPENCODE_PROVIDER_ID]!.compat).toEqual({ sendSessionAffinityHeaders: true }); + delete pi.providers[OPENCODE_PROVIDER_ID]!.compat; + expect(prime).toEqual(pi); + expect(buildClientContribution("prime", context()).fragments[0]!.value) + .toEqual(prime.providers[OPENCODE_PROVIDER_ID]); }); test("adds only providers.opencodex, wired to the loopback proxy", () => { diff --git a/tests/config/client-config-export.test.ts b/tests/config/client-config-export.test.ts index 4d70790403..c5a5840b82 100644 --- a/tests/config/client-config-export.test.ts +++ b/tests/config/client-config-export.test.ts @@ -11,6 +11,7 @@ import { LOOPBACK_API_KEY_PLACEHOLDER, SCHEMA_REQUIRED_OUTPUT_BUDGET, buildClientConfig, + buildClientContribution, buildClientConfigText, isExportClientId, normalizeExportModels, @@ -316,6 +317,7 @@ describe("Pi serializer (accept criterion 2)", () => { expect(provider.api).toBe("openai-completions"); expect(provider.apiKey).toBe(LOOPBACK_API_KEY_PLACEHOLDER); expect(provider.compat?.sendSessionAffinityHeaders).toBe(true); + expect(buildClientContribution("pi", ctx()).fragments[0]!.value).toEqual(provider); }); test("cost is omitted on every entry — zeros would assert routed models are free", () => { From 75415170ba2e03398baa569972c4c444683e67fe Mon Sep 17 00:00:00 2001 From: lidge-jun <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:27:41 +0900 Subject: [PATCH 126/221] fix: admit final Claude request copies before serialization [skip ci] Co-authored-by: Ingwannu <186453546+Ingwannu@users.noreply.github.com> --- src/server/claude-messages.ts | 26 +++++++++---- tests/responses/reasoning-envelope.test.ts | 44 ++++++++++++++++++++-- 2 files changed, 59 insertions(+), 11 deletions(-) diff --git a/src/server/claude-messages.ts b/src/server/claude-messages.ts index a8af8896ff..c5c929c519 100644 --- a/src/server/claude-messages.ts +++ b/src/server/claude-messages.ts @@ -863,13 +863,25 @@ async function handleClaudeMessagesWithBudget( headers.set("session_id", uuidFromHex(internalBody.prompt_cache_key)); } } - const internalBodyJson = JSON.stringify(internalBody); - translatorBudget.chargeRetained(new TextEncoder().encode(internalBodyJson).byteLength, { kind: "request_copies" }); - const internalReq = new Request("http://localhost/v1/responses", { - method: "POST", - headers, - body: internalBodyJson, - }); + let internalReq: Request; + try { + // The UTF-16 JSON string and the Request's UTF-8 body coexist until dispatch. + const reservation = translatorBudget.reserveTransient(3 * jsonUtf8Bytes(internalBody), { kind: "request_copies" }); + try { + internalReq = new Request("http://localhost/v1/responses", { + method: "POST", + headers, + body: JSON.stringify(internalBody), + }); + reservation.commitRetained(); + } finally { + reservation.release(); + } + } catch (err) { + if (!isTranslatorBudgetExceededError(err)) throw err; + if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 413, { closeReason: "non_stream" }); + return anthropicErrorResponse(413, "request translation buffer exceeded the safe limit", "request_too_large", "translation_buffer_limit"); + } // Request-log wiring mirrors the /v1/responses route: native passthrough finalizes // via the terminal callbacks; routed streams get the Responses-vocabulary log tap diff --git a/tests/responses/reasoning-envelope.test.ts b/tests/responses/reasoning-envelope.test.ts index 4a26ce51db..27e21d5cff 100644 --- a/tests/responses/reasoning-envelope.test.ts +++ b/tests/responses/reasoning-envelope.test.ts @@ -160,8 +160,9 @@ describe("reasoning allocation admission", () => { test.each(["thinking", "redacted_thinking", "owned"])("handler maps %s admission failure to 413 without dispatch and disposes its budget", async type => { const { handleClaudeMessages } = await import("../../src/server/claude-messages"); - const signature = type === "owned" ? encodeReasoningEnvelope({ txt: "fixture" }) : "fixture"; - const content = type === "redacted_thinking" ? { type, data: "fixture" } + const payload = "fixture".repeat(128); + const signature = type === "owned" ? encodeReasoningEnvelope({ txt: payload }) : payload; + const content = type === "redacted_thinking" ? { type, data: payload } : { type: "thinking", thinking: "", signature }; const request = new Request("http://localhost/v1/messages", { method: "POST", headers: { "content-type": "application/json" }, @@ -170,15 +171,50 @@ describe("reasoning allocation admission", () => { const beforeBytes = budgets.translatorObservedBufferSnapshot().currentBytes; const beforeCount = budgets.translatorLiveBudgetCountForTests(); const create = budgets.createTranslatorBudget; - const factory = spyOn(budgets, "createTranslatorBudget").mockImplementation(() => create({ maxTurnBytes: 64 })); + const budget = create({ maxTurnBytes: 4096 }); + const reserve = spyOn(budget, "reserveTransient"); + const charge = spyOn(budget, "chargeRetained"); + const factory = spyOn(budgets, "createTranslatorBudget").mockReturnValue(budget); const upstream = spyOn(globalThis, "fetch").mockImplementation(async () => { throw new Error("unexpected upstream dispatch"); }); try { const response = await handleClaudeMessages(request, { port: 0, providers: {} }, { model: "", provider: "" }); expect(response.status).toBe(413); expect(await response.json()).toMatchObject({ type: "error", error: { type: "request_too_large", code: "translation_buffer_limit" } }); expect(upstream).not.toHaveBeenCalled(); + expect(reserve.mock.calls.some(([, scope]) => scope.kind === "reasoning")).toBe(true); + expect(charge.mock.calls.filter(([, scope]) => scope.kind === "request_copies")).toHaveLength(0); expect(budgets.translatorObservedBufferSnapshot().currentBytes).toBe(beforeBytes); expect(budgets.translatorLiveBudgetCountForTests()).toBe(beforeCount); - } finally { factory.mockRestore(); upstream.mockRestore(); } + } finally { factory.mockRestore(); upstream.mockRestore(); reserve.mockRestore(); charge.mockRestore(); budget.dispose(); } }); + test("final request-copy admission returns 413 before serialization and disposes the budget", async () => { + const { handleClaudeMessages } = await import("../../src/server/claude-messages"); + const request = new Request("http://localhost/v1/messages", { + method: "POST", headers: { "content-type": "application/json" }, + body: JSON.stringify({ model: "fixture/model", messages: [{ role: "user", content: "x".repeat(200) }] }), + }); + const beforeBytes = budgets.translatorObservedBufferSnapshot().currentBytes; + const beforeCount = budgets.translatorLiveBudgetCountForTests(); + const budget = budgets.createTranslatorBudget({ maxTurnBytes: 512 }); + const reserve = spyOn(budget, "reserveTransient"); + const charge = spyOn(budget, "chargeRetained"); + const factory = spyOn(budgets, "createTranslatorBudget").mockReturnValue(budget); + const stringify = spyOn(JSON, "stringify"); + const upstream = spyOn(globalThis, "fetch").mockImplementation(async () => { throw new Error("unexpected upstream dispatch"); }); + try { + const response = await handleClaudeMessages(request, { port: 0, providers: {} }, { model: "", provider: "" }); + expect(response.status).toBe(413); + expect(await response.json()).toMatchObject({ type: "error", error: { type: "request_too_large", code: "translation_buffer_limit" } }); + expect(charge.mock.calls.filter(([, scope]) => scope.kind === "request_copies")).toHaveLength(1); + expect(reserve.mock.calls.filter(([, scope]) => scope.kind === "request_copies")).toHaveLength(1); + expect(stringify.mock.calls.some(([value]) => value && typeof value === "object" && "input" in value)).toBe(false); + expect(upstream).not.toHaveBeenCalled(); + expect(budgets.translatorObservedBufferSnapshot().currentBytes).toBe(beforeBytes); + expect(budgets.translatorLiveBudgetCountForTests()).toBe(beforeCount); + } finally { + factory.mockRestore(); stringify.mockRestore(); upstream.mockRestore(); + reserve.mockRestore(); charge.mockRestore(); budget.dispose(); + } + }); + }); From 697a500339f323157ff20370e6be6bb65803e318 Mon Sep 17 00:00:00 2001 From: lidge-jun <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:29:47 +0900 Subject: [PATCH 127/221] test: pin Go affinity identity and header precedence [skip ci] Co-authored-by: makesomethingshit <246213378+makesomethingshit@users.noreply.github.com> --- .../opencode-go-session-header.test.ts | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/tests/providers/opencode-go-session-header.test.ts b/tests/providers/opencode-go-session-header.test.ts index b05e526e1c..ab28c8475f 100644 --- a/tests/providers/opencode-go-session-header.test.ts +++ b/tests/providers/opencode-go-session-header.test.ts @@ -1,10 +1,9 @@ import { afterEach, describe, expect, test } from "bun:test"; import { providerConfigSeed } from "../../src/providers/derive"; -import { deriveOpenCodeGoSessionId, resolveOpenCodeGoTransport } from "../../src/providers/opencode-go-transport"; +import { resolveOpenCodeGoTransport } from "../../src/providers/opencode-go-transport"; import { getProviderRegistryEntry } from "../../src/providers/registry"; import { handleResponses } from "../../src/server/responses/core"; import { handleChatCompletions } from "../../src/server/chat-completions"; -import { normalizeLogConversationId } from "../../src/server/request-log-conversation"; import type { OcxConfig, OcxProviderConfig } from "../../src/types"; const MUSE_MODEL = "muse-spark-1.3-contributor"; @@ -128,10 +127,13 @@ describe("OpenCode Go session affinity (#3344)", () => { expect(bridged.headers.get(SESSION_HEADER)).toBe(chat.headers.get(SESSION_HEADER)); }); - for (const session of ["client-session-a", "ocx_0123456789abcdef0123456789abcdef"]) { + // Fixed vectors independently calculated with SHA-256, including the domain separator. + for (const [session, expected] of [ + ["client-session-a", "ocx_516d593899f34b7baca2db37c7b0c8c5"], + ["ocx_0123456789abcdef0123456789abcdef", "ocx_60bcbfb9a85d3dc23b9b2b1cef3b0882"], + ] as const) { test(`treats inbound ${session.startsWith("ocx_") ? "ocx-prefixed" : "raw"} identity as client input on every ingress`, async () => { const headers = { "content-type": "application/json", [SESSION_HEADER]: session }; - const expected = deriveOpenCodeGoSessionId(normalizeLogConversationId(session)!); const native = await captureRequest({ nativeChat: true, model: "omen-alpha", headers }); const bridged = await captureRequest({ nativeChat: true, model: MUSE_MODEL, headers }); const responses = await captureRequest({ model: MUSE_MODEL, headers }); @@ -149,6 +151,23 @@ describe("OpenCode Go session affinity (#3344)", () => { }); } + test("operator override precedes the Codex lane, which precedes client fallback on every ingress", async () => { + const headers = { ...codexHeaders(), [SESSION_HEADER]: "different-client-fallback" }; + for (const ingress of [ + { nativeChat: true, model: "omen-alpha" }, + { nativeChat: true, model: MUSE_MODEL }, + { model: MUSE_MODEL }, + ]) { + const codex = await captureRequest({ ...ingress, headers }); + expect(codex.headers.get(SESSION_HEADER)).toBe("ocx_67b70584fb755130286eff5488a3be9d"); + const operator = await captureRequest({ + ...ingress, headers, + provider: opencodeGo({ headers: { "X-OpenCode-Session": "different-operator-override" } }), + }); + expect(operator.headers.get(SESSION_HEADER)).toBe("different-operator-override"); + } + }); + test("native Chat does not send Go affinity to an unrelated destination", async () => { const captured = await captureRequest({ nativeChat: true, model: "omen-alpha", providerName: "custom-go", From e0e8d26bb86927fac378d88807f191843a9cf339 Mon Sep 17 00:00:00 2001 From: lidge-jun <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:31:24 +0900 Subject: [PATCH 128/221] fix: fall back from native compact 404 to routed compaction [skip ci] Reimplements only the residual compaction portion of #3769; quota attribution remains the implementation already landed through #3791. Co-authored-by: ideabib <221318067+ideabib@users.noreply.github.com> --- .../content/docs/reference/proxy-formats.md | 7 + src/server/responses/compact.ts | 5 +- .../responses-compaction-routing.test.ts | 141 ++++++++++++++++++ 3 files changed, 151 insertions(+), 2 deletions(-) diff --git a/docs-site/src/content/docs/reference/proxy-formats.md b/docs-site/src/content/docs/reference/proxy-formats.md index 0c7b8257bc..593c8ae7a3 100644 --- a/docs-site/src/content/docs/reference/proxy-formats.md +++ b/docs-site/src/content/docs/reference/proxy-formats.md @@ -405,6 +405,13 @@ conversation. | Canonical ChatGPT or official OpenAI route | Forwards the request to the native `/responses/compact` endpoint with the resolved account and model authentication | | Other routed model | Runs an internal, non-streaming, no-tools compaction turn with a `compaction_trigger`; requires exactly one synthetic `compaction` item whose `encrypted_content` is an `ocx1:` envelope; decodes that summary into v1 replacement history | +If the native compact endpoint returns HTTP 404, OpenCodex retries compaction through a regular +Responses turn with the same model selector and session headers. Canonical ChatGPT fallback +turns use upstream SSE; the compact caller still receives JSON. A completed native opaque +compaction item is preserved, while an `ocx1:` summary is decoded into replacement user history. +Failed or incomplete fallback turns return an error instead of replacement history. Other +native compact statuses retain their existing handling. + Codex names a bare OpenAI-family model (for example `gpt-5.6-sol`) for its compaction turns regardless of which provider the operator routes ordinary turns to. Ordinary requests reserve such ids for the canonical `openai` provider. On the compaction surface only — `POST diff --git a/src/server/responses/compact.ts b/src/server/responses/compact.ts index c914dcb4b2..4e7481bb2e 100644 --- a/src/server/responses/compact.ts +++ b/src/server/responses/compact.ts @@ -1094,7 +1094,8 @@ export async function handleResponsesCompact( } } } - return buffered; + // A native compact 404 falls back to a regular Responses compaction turn. + if (buffered.status !== 404) return buffered; } finally { releaseUpstreamHostAdmission(compactHostAdmissionLease); releaseCodexAuthContextProbeLease(authCtx); @@ -1111,7 +1112,7 @@ export async function handleResponsesCompact( // the completed event back into the v1 compact JSON contract below. Combo-dispatched // turns also go out as SSE: failover can land on a canonical child that rejects a // non-streaming turn, and every combo-capable provider already serves streaming traffic. - stream: accountGatedCompactWireModel || route.combo ? true : false, + stream: isCanonicalOpenAiForwardProvider(route.provider) || accountGatedCompactWireModel || route.combo ? true : false, input: [...inputItems, { type: "compaction_trigger" }], }; const internalHeaders = new Headers({ "content-type": "application/json" }); diff --git a/tests/responses/responses-compaction-routing.test.ts b/tests/responses/responses-compaction-routing.test.ts index a787024d95..2a1f69be1e 100644 --- a/tests/responses/responses-compaction-routing.test.ts +++ b/tests/responses/responses-compaction-routing.test.ts @@ -9,6 +9,7 @@ import { mkdtempSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { handleResponses, handleResponsesCompact } from "../../src/server/responses"; +import { OPAQUE_COMPACTION_NOTE, SUMMARY_PREFIX } from "../../src/responses/compaction"; import { looksLikeBackendCiphertext } from "../../src/server/responses/encrypted-payload"; import * as adapterResolveModule from "../../src/server/adapter-resolve"; import * as visionModule from "../../src/vision"; @@ -948,6 +949,146 @@ describe("compact alternate-account attempt (#913)", () => { }); } + for (const [model, account] of [["gpt-5.5", "pool-a"], ["side/gpt-5.5", "pool-b"]] as const) { + test(`native 404 falls back to canonical SSE with ${model} account and session identity`, async () => { + await withPoolEnv("ocx-compact-404-canonical-", async config => { + config.codexAccountNamespaces = { side: "pool-b" }; + const item = { type: "compaction", id: "cmp_native_3769", encrypted_content: "native-opaque-3769" }; + const calls: Array<{ url: string; headers: Headers; body: Record }> = []; + globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => { + const request = new Request(input, init); + calls.push({ url: request.url, headers: request.headers, body: await request.json() as Record }); + if (request.url.endsWith("/responses/compact")) return Response.json({ detail: "Not Found" }, { status: 404 }); + return sseResponse([{ type: "response.completed", response: { + id: "resp_compact_3769", status: "completed", output: [item], + } }]); + }) as typeof fetch; + const headers = { "session-id": "compact-3769-session", "thread-id": `compact-3769-${account}`, "x-codex-parent-thread-id": "compact-3769-parent" }; + const response = await handleResponsesCompact(compactionRequest({ + model, input: [{ role: "user", content: "retain this history" }], + }, undefined, headers), config, { model: "", provider: "" }); + expect(response.status).toBe(200); + expect(response.headers.get("content-type")).toContain("application/json"); + expect(await response.json()).toEqual({ output: [item] }); + expect(calls.map(call => call.url)).toEqual([ + "https://chatgpt.com/backend-api/codex/responses/compact", + "https://chatgpt.com/backend-api/codex/responses", + ]); + expect(calls[1]!.body.stream).toBe(true); + expect(calls[1]!.body.model).toBe("gpt-5.5"); + expect((calls[1]!.body.input as Array<{ type?: string }>).filter(value => value.type === "compaction_trigger")).toHaveLength(1); + for (const call of calls) { + expect(call.headers.get("authorization")).toBe(`Bearer ${account}-access-token`); + expect(call.headers.get("chatgpt-account-id")).toBe(account === "pool-a" ? "pool_acc_a" : "pool_acc_b"); + for (const [name, value] of Object.entries(headers)) expect(call.headers.get(name)).toBe(value); + } + }); + }); + } + + test("official key-auth native 404 decodes synthetic fallback into replacement user history", async () => { + const config = { providers: { "openai-apikey": { + adapter: "openai-responses", baseUrl: "https://api.openai.com/v1", authMode: "key", apiKey: "test-key", + } } } as OcxConfig; + const calls: Array<{ url: string; body: Record }> = []; + globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => { + const request = new Request(input, init); + calls.push({ url: request.url, body: await request.json() as Record }); + return request.url.endsWith("/responses/compact") + ? Response.json({ detail: "Not Found" }, { status: 404 }) + : jsonResponse(completedPayload("handoff-3769")); + }) as typeof fetch; + const response = await handleResponsesCompact(compactionRequest({ + model: "openai-apikey/gpt-5.5", input: [{ role: "user", content: "retain-3769" }], + tools: [{ type: "function", name: "shell", parameters: { type: "object" } }], + }), config, { model: "", provider: "" }); + expect(response.status).toBe(200); + expect(await response.json()).toEqual({ output: [ + { type: "message", role: "user", content: [{ type: "input_text", text: "retain-3769" }] }, + { type: "message", role: "user", content: [{ type: "input_text", text: `${SUMMARY_PREFIX}\nhandoff-3769` }] }, + ] }); + expect(calls.map(call => call.url)).toEqual(["https://api.openai.com/v1/responses/compact", "https://api.openai.com/v1/responses"]); + expect(calls[1]!.body.tools).toBeUndefined(); + expect(JSON.stringify(calls[1]!.body.input)).not.toContain("compaction_trigger"); + expect(JSON.stringify(calls[1]!.body.input)).toContain("CONTEXT CHECKPOINT COMPACTION"); + }); + + for (const status of [200, 400]) { + test(`native compact ${status} retains its body without the 404 fallback`, async () => { + await withPoolEnv("ocx-compact-404-control-", async config => { + const payload = status === 200 ? { output: [{ type: "compaction", encrypted_content: "native-control" }] } : { error: { message: "invalid compact" } }; + const urls: string[] = []; + globalThis.fetch = (async (input: string | URL | Request) => { + urls.push(typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url); + return Response.json(payload, { status }); + }) as typeof fetch; + const response = await handleResponsesCompact(compactionRequest({ model: "gpt-5.5", input: [] }), config, { model: "", provider: "" }); + expect(response.status).toBe(status); + expect(await response.json()).toEqual(payload); + expect(urls).toEqual(["https://chatgpt.com/backend-api/codex/responses/compact"]); + }); + }); + } + + for (const status of ["failed", "incomplete"] as const) { + test(`native 404 followed by ${status} SSE does not install replacement history`, async () => { + await withPoolEnv("ocx-compact-404-terminal-", async config => { + let calls = 0; + globalThis.fetch = (async () => { + calls++; + if (calls === 1) return Response.json({ detail: "Not Found" }, { status: 404 }); + return sseResponse([{ type: `response.${status}`, response: { + id: "resp_compact_rejected_3769", status, output: [], + } }]); + }) as typeof fetch; + const response = await handleResponsesCompact(compactionRequest({ model: "gpt-5.5", input: [] }), config, { model: "", provider: "" }); + expect(response.status).toBe(502); + const payload = await response.json() as { output?: unknown; error?: unknown }; + expect(payload.output).toBeUndefined(); + expect(payload.error).toBeDefined(); + expect(calls).toBe(2); + }); + }); + } + + test("404 fallback records the compaction serving account for subsequent opaque replay", async () => { + await withPoolEnv("ocx-compact-404-replay-", async config => { + config.codexAccountNamespaces = { side: "pool-b", first: "pool-a" }; + const headers = { "thread-id": `compact-replay-${crypto.randomUUID()}` }; + const item = { type: "compaction", encrypted_content: "native-account-b-3769" }; + const calls: Array<{ body: Record; headers: Headers }> = []; + let compacting = false; + globalThis.fetch = (async (input: string | URL | Request, init?: RequestInit) => { + const request = new Request(input, init); + if (request.url.endsWith("/responses/compact")) return Response.json({ detail: "Not Found" }, { status: 404 }); + calls.push({ body: await request.json() as Record, headers: request.headers }); + return sseResponse([{ type: "response.completed", response: compacting + ? { id: "resp_identity_compact_3769", status: "completed", output: [item] } + : completedPayload("ordinary turn") }]); + }) as typeof fetch; + const turn = async (model: string, input: unknown[]) => { + const response = await handleResponses(compactionRequest({ model, input, stream: true, store: false }, undefined, headers), config, { model: "", provider: "" }); + expect(response.status).toBe(200); + await response.text(); + }; + await turn("first/gpt-5.5", [{ role: "user", content: "seed account A" }]); + compacting = true; + const compact = await handleResponsesCompact(compactionRequest({ model: "side/gpt-5.5", input: [{ role: "user", content: "compact on B" }] }, undefined, headers), config, { model: "", provider: "" }); + expect(compact.status).toBe(200); + const output = (await compact.json() as { output: unknown[] }).output; + expect(output).toEqual([item]); + compacting = false; + await turn("side/gpt-5.5", [...output, { role: "user", content: "continue on B" }]); + expect(calls.at(-1)!.headers.get("authorization")).toBe("Bearer pool-b-access-token"); + expect(JSON.stringify(calls.at(-1)!.body.input)).toContain("native-account-b-3769"); + await turn("first/gpt-5.5", [...output, { role: "user", content: "switch back to A" }]); + expect(calls.at(-1)!.headers.get("authorization")).toBe("Bearer pool-a-access-token"); + expect(JSON.stringify(calls.at(-1)!.body.input)).not.toContain("native-account-b-3769"); + expect(JSON.stringify(calls.at(-1)!.body.input)).toContain(OPAQUE_COMPACTION_NOTE); + expect(calls).toHaveLength(4); + }); + }); + test("native compact headers followed by a stalled body return 504 without retry and release account cleanup", async () => { await withPoolEnv("ocx-compact-body-deadline-", async config => { config.stallTimeoutSec = 2; From d8b18b1ecb013f46585c9e6dadac0b95caa49836 Mon Sep 17 00:00:00 2001 From: lidge-jun <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:49:44 +0900 Subject: [PATCH 129/221] fix: share envelope admission budgets and release transient request copies [skip ci] Thread live budgets through bridge and outbound callers, keep abnormal bridge cleanup on the typed overflow path, and retain only the constructed request body after serialization. Sync the authorized adapter and reference locale contracts. Co-authored-by: Ingwannu <186453546+Ingwannu@users.noreply.github.com> --- .../docs/ja/reference/proxy-formats.md | 5 + .../docs/ko/reference/proxy-formats.md | 5 + .../src/content/docs/reference/adapters.md | 4 + .../docs/ru/reference/proxy-formats.md | 6 + .../docs/zh-cn/reference/proxy-formats.md | 4 + src/bridge.ts | 64 ++++--- src/claude/outbound.ts | 10 +- src/server/claude-messages.ts | 13 +- tests/responses/reasoning-envelope.test.ts | 163 +++++++++++++++++- 9 files changed, 241 insertions(+), 33 deletions(-) diff --git a/docs-site/src/content/docs/ja/reference/proxy-formats.md b/docs-site/src/content/docs/ja/reference/proxy-formats.md index 68d7ce5c75..8f0a03bc09 100644 --- a/docs-site/src/content/docs/ja/reference/proxy-formats.md +++ b/docs-site/src/content/docs/ja/reference/proxy-formats.md @@ -131,6 +131,11 @@ WebSocket が無効になっている場合、アップグレード試行では これらのエンドポイントは、Claude Code および互換性のあるクライアントによって使用される Anthropic Messages 言語を話します。ほとんどのリクエストはレスポンスに変換され、通常どおりルーティングされてから、Anthropic JSON または Anthropic SSE に変換されます。 +変換される Messages リクエストでは、推論の再送もリクエスト共通の変換バジェットを使います。 +この制限にはエンコード・デコード時のコピー分も含まれます。超過時は +`translation_buffer_limit` を伴う HTTP 413 を返し、署名や不透明な推論データを切り詰めません。 +ネイティブ Anthropic パススルーには、別の本文サイズ制限が適用されます。 + ネイティブ Anthropic パススルーは、次のすべてが当てはまる場合にのみ適格です。 - ネイティブ パススルーはクロード コード設定で無効になっていません。 diff --git a/docs-site/src/content/docs/ko/reference/proxy-formats.md b/docs-site/src/content/docs/ko/reference/proxy-formats.md index f7ff7f5f27..7837ae4d22 100644 --- a/docs-site/src/content/docs/ko/reference/proxy-formats.md +++ b/docs-site/src/content/docs/ko/reference/proxy-formats.md @@ -174,6 +174,11 @@ SSE 객체, choice delta, `finish_reason`이 있는 종료 choice, `data: [DONE] 이 엔드포인트는 Claude Code와 호환 클라이언트가 사용하는 Anthropic Messages 방언을 말합니다. 대부분의 요청은 Responses로 변환되어 일반적으로 라우팅된 뒤, Anthropic JSON 또는 Anthropic SSE로 다시 변환됩니다. +변환되는 Messages 요청의 reasoning 재전송은 요청 전체의 번역 예산을 공유합니다. 이 예산에는 +인코딩·디코딩 과정에서 생기는 복사본도 포함됩니다. 한도를 초과하면 `translation_buffer_limit`과 +HTTP 413을 반환하며, 한도에 맞추려고 서명이나 불투명 reasoning 데이터를 자르지 않습니다. +네이티브 Anthropic passthrough에는 별도의 본문 크기 제한이 적용됩니다. + 네이티브 Anthropic passthrough는 다음이 모두 참일 때만 적용됩니다. - Claude Code 설정에서 native passthrough가 비활성화되어 있지 않습니다. diff --git a/docs-site/src/content/docs/reference/adapters.md b/docs-site/src/content/docs/reference/adapters.md index 03c56f329b..b1d6029ca9 100644 --- a/docs-site/src/content/docs/reference/adapters.md +++ b/docs-site/src/content/docs/reference/adapters.md @@ -195,6 +195,10 @@ header and does not guarantee a provider cache hit. **Auth:** `key` (`x-api-key` by default, or `Authorization: Bearer` with `apiKeyTransport: "bearer"`) or `oauth` (Bearer + `anthropic-beta`, for Claude Pro/Max). - Converts messages to Anthropic content blocks (text, base64 image, `tool_use`, `thinking`). +- Translated Anthropic Messages reasoning replay shares the request translation budget, including + encoding/decoding copy overhead. Requests exceeding it return HTTP 413 with + `translation_buffer_limit`; signatures and opaque reasoning data are never truncated to fit. + Native Anthropic passthrough uses its separate body-size contract. - **Extended thinking math:** Anthropic requires `max_tokens > thinking.budget_tokens`. The adapter maps reasoning effort to a budget (minimal 1024 … max 32000), then computes a safe `max_tokens` with output headroom, and **drops `temperature`/`top_p`** when thinking is enabled (Anthropic forbids diff --git a/docs-site/src/content/docs/ru/reference/proxy-formats.md b/docs-site/src/content/docs/ru/reference/proxy-formats.md index 26d4db5709..a3ef007784 100644 --- a/docs-site/src/content/docs/ru/reference/proxy-formats.md +++ b/docs-site/src/content/docs/ru/reference/proxy-formats.md @@ -179,6 +179,12 @@ adapter, вместо тихого изменения смысла вернёт клиенты. Большинство запросов переводится в Responses, маршрутизируется обычным образом, а затем обратно в Anthropic JSON или Anthropic SSE. +Повторная передача reasoning в преобразуемых запросах Messages использует общий бюджет +преобразования запроса, включая копии при кодировании и декодировании. При превышении лимита +возвращается HTTP 413 с `translation_buffer_limit`; подписи и непрозрачные данные reasoning +не обрезаются для соблюдения лимита. Для нативного Anthropic passthrough действует отдельный +контракт ограничения размера тела. + Нативный Anthropic passthrough допустим только когда одновременно выполняются все условия: - native passthrough не отключён в конфигурации Claude Code; diff --git a/docs-site/src/content/docs/zh-cn/reference/proxy-formats.md b/docs-site/src/content/docs/zh-cn/reference/proxy-formats.md index 21948d6264..9736aeaff9 100644 --- a/docs-site/src/content/docs/zh-cn/reference/proxy-formats.md +++ b/docs-site/src/content/docs/zh-cn/reference/proxy-formats.md @@ -149,6 +149,10 @@ choice 增量、带 `finish_reason` 的终止 choice,以及 `data: [DONE]`。 这些端点使用 Claude Code 和兼容客户端所采用的 Anthropic Messages 方言。大多数请求会被转换为 Responses,按常规路由,然后再转换回 Anthropic JSON 或 Anthropic SSE。 +转换后的 Messages 请求在重放推理数据时共享整个请求的转换预算,其中包含编码和解码产生的副本开销。 +超出预算时返回 HTTP 413 和 `translation_buffer_limit`,不会为了满足限制而截断签名或不透明推理数据。 +原生 Anthropic 透传使用独立的请求体大小限制。 + 只有在满足以下全部条件时,原生 Anthropic 透传才有资格启用: - Claude Code 配置中尚未禁用原生透传; diff --git a/src/bridge.ts b/src/bridge.ts index ff044a5e52..20e7c3fe09 100644 --- a/src/bridge.ts +++ b/src/bridge.ts @@ -493,7 +493,7 @@ export function bridgeToResponsesSSE( const previousBytes = pendingSignatureBytes + pendingRedacted.reduce((sum, value) => sum + bytesOf(value), 0) + (hiddenText ? hiddenThinkingBytes : 0); - const encoded = encodeReasoningEnvelope(envelope); + const encoded = encodeReasoningEnvelope(envelope, budget); const reservation = budget?.reserveTransient(bytesOf(encoded), { kind: "reasoning" }); pendingSignature = undefined; pendingSignatureBytes = 0; @@ -533,7 +533,7 @@ export function bridgeToResponsesSSE( if (!hiddenRawReasoningText) return; rawReasoningForNextToolCall = hiddenRawReasoningText; const previousBytes = hiddenRawReasoningBytes; - const encrypted = encodeReasoningEnvelope({ txt: hiddenRawReasoningText }); + const encrypted = encodeReasoningEnvelope({ txt: hiddenRawReasoningText }, budget); const reservation = budget?.reserveTransient(bytesOf(encrypted), { kind: "reasoning" }); hiddenRawReasoningText = ""; hiddenRawReasoningBytes = 0; @@ -556,7 +556,7 @@ export function bridgeToResponsesSSE( const flushKiroRedactedReasoning = () => { if (!pendingKiroRedacted) return; const previousBytes = pendingKiroRedactedBytes; - const encrypted = encodeReasoningEnvelope({ krc: pendingKiroRedacted }); + const encrypted = encodeReasoningEnvelope({ krc: pendingKiroRedacted }, budget); const reservation = budget?.reserveTransient(bytesOf(encrypted), { kind: "reasoning" }); pendingKiroRedacted = undefined; pendingKiroRedactedBytes = 0; @@ -902,6 +902,16 @@ export function bridgeToResponsesSSE( gated = true; stepping = false; }; + const attemptTerminationCleanup = (action: () => void): boolean => { + try { + action(); + return !terminated && !closed; + } catch (error) { + if (!isTranslatorBudgetExceededError(error)) throw error; + terminateForTranslatorOverflow(error); + return false; + } + }; const step = async () => { if (stepping || closed) return; stepping = true; @@ -1415,10 +1425,12 @@ export function bridgeToResponsesSSE( return; } if (!terminated) { - flushHiddenRawReasoning(); - if (currentToolCall) failCurrentToolCall(); - if (currentWebSearch) closeCurrentWebSearch("failed", []); - releasePendingWebSources(); + if (!attemptTerminationCleanup(() => { + flushHiddenRawReasoning(); + if (currentToolCall) failCurrentToolCall(); + if (currentWebSearch) closeCurrentWebSearch("failed", []); + releasePendingWebSources(); + })) return; const failure = responseError( 500, "proxy_error", @@ -1448,13 +1460,15 @@ export function bridgeToResponsesSSE( if (!terminated) { // The adapter generator ended without an explicit done/error event. Mark as incomplete // rather than completed so Codex can distinguish a clean finish from a truncated stream. - if (currentMsg) closeCurrentMessage(); - if (currentReasoning) closeCurrentReasoning(); - if (currentRawReasoning) closeCurrentRawReasoning(); - flushHiddenRawReasoning(); - if (currentToolCall) failCurrentToolCall(); - if (currentWebSearch) closeCurrentWebSearch("failed", []); - releasePendingWebSources(); + if (!attemptTerminationCleanup(() => { + if (currentMsg) closeCurrentMessage(); + if (currentReasoning) closeCurrentReasoning(); + if (currentRawReasoning) closeCurrentRawReasoning(); + flushHiddenRawReasoning(); + if (currentToolCall) failCurrentToolCall(); + if (currentWebSearch) closeCurrentWebSearch("failed", []); + releasePendingWebSources(); + })) return; options?.onUsage?.(undefined); await awaitThoughtSignatureDurability(); emit("response.incomplete", { @@ -1493,13 +1507,15 @@ export function bridgeToResponsesSSE( upstreamActivity = false; stallTicks = 0; } else if (++stallTicks >= maxStallTicks) { - if (currentMsg) closeCurrentMessage(); - if (currentReasoning) closeCurrentReasoning(); - if (currentRawReasoning) closeCurrentRawReasoning(); - flushHiddenRawReasoning(); - if (currentToolCall) failCurrentToolCall(); - if (currentWebSearch) closeCurrentWebSearch("failed", []); - releasePendingWebSources(); + if (!attemptTerminationCleanup(() => { + if (currentMsg) closeCurrentMessage(); + if (currentReasoning) closeCurrentReasoning(); + if (currentRawReasoning) closeCurrentRawReasoning(); + flushHiddenRawReasoning(); + if (currentToolCall) failCurrentToolCall(); + if (currentWebSearch) closeCurrentWebSearch("failed", []); + releasePendingWebSources(); + })) return; // #1926 gap 2 residual: this beat callback is synchronous, so the durability // barrier is not awaited on the stall-timeout kill path. The in-memory store is // already updated; only a crash between here and the queued write loses it, @@ -1728,7 +1744,7 @@ function buildResponseJSONWithBudget( if (batchRedacted.length > 0) envelope.red = batchRedacted; const hidden = options?.hideThinkingSummary === true; if (hidden && currentSummaryReasoning && (envelope.sig || envelope.red)) envelope.txt = currentSummaryReasoning; - const encrypted = envelope.sig || envelope.red || envelope.txt ? encodeReasoningEnvelope(envelope) : undefined; + const encrypted = envelope.sig || envelope.red || envelope.txt ? encodeReasoningEnvelope(envelope, budget) : undefined; const sourceBytes = currentSummaryReasoningBytes + batchSignatureBytes + batchRedactedBytes; batchSignature = undefined; batchSignatureBytes = 0; @@ -1756,7 +1772,7 @@ function buildResponseJSONWithBudget( // Same contract as the streaming path: no visible reasoning, txt-only envelope round-trip. pushOutput({ type: "reasoning", id: `rs_${uuid()}`, summary: [], - encrypted_content: encodeReasoningEnvelope({ txt: currentRawReasoning }), + encrypted_content: encodeReasoningEnvelope({ txt: currentRawReasoning }, budget), }, currentRawReasoningBytes, "reasoning"); currentRawReasoning = ""; currentRawReasoningBytes = 0; @@ -2044,7 +2060,7 @@ function buildResponseJSONWithBudget( // pushOutput reserves the item itself and releases the retained raw blob it replaces. pushOutput({ type: "reasoning", id: `rs_${uuid()}`, summary: [], - encrypted_content: encodeReasoningEnvelope({ krc: batchKiroRedacted }), + encrypted_content: encodeReasoningEnvelope({ krc: batchKiroRedacted }, budget), }, batchKiroRedactedBytes, "reasoning"); batchKiroRedacted = undefined; batchKiroRedactedBytes = 0; diff --git a/src/claude/outbound.ts b/src/claude/outbound.ts index ac06afac2d..1975d5b390 100644 --- a/src/claude/outbound.ts +++ b/src/claude/outbound.ts @@ -308,7 +308,7 @@ export function responsesSseToAnthropicSse( open.webSearchArgsEmitted = true; } if (open.kind === "thinking") { - const signature = open.reasoningSig ?? encodeReasoningEnvelope({ txt: open.thinkingBuf ?? "" }); + const signature = open.reasoningSig ?? encodeReasoningEnvelope({ txt: open.thinkingBuf ?? "" }, translatorBudget); emit("content_block_delta", { type: "content_block_delta", index: open.index, delta: { type: "signature_delta", signature }, @@ -561,7 +561,7 @@ export function responsesSseToAnthropicSse( else if (open && open.kind === "text" && item.type === "message") closeOpenBlock(); else if (item.type === "reasoning") { const encrypted = typeof item.encrypted_content === "string" ? item.encrypted_content : ""; - const env = encrypted ? decodeReasoningEnvelope(encrypted) : null; + const env = encrypted ? decodeReasoningEnvelope(encrypted, translatorBudget) : null; const red = env?.red ?? []; if (env?.sig && open?.kind !== "thinking") ensureBlock("thinking"); if (open?.kind === "thinking") { @@ -785,7 +785,7 @@ export function responsesSseToAnthropicSse( } /** Non-streaming: /v1/responses JSON -> Anthropic message JSON. */ -export function responsesJsonToAnthropicMessage(json: unknown, model: string): Rec { +export function responsesJsonToAnthropicMessage(json: unknown, model: string, translatorBudget?: TranslatorBudget): Rec { const body = isRec(json) ? json : {}; const output = Array.isArray(body.output) ? body.output : []; const content: Rec[] = []; @@ -817,14 +817,14 @@ export function responsesJsonToAnthropicMessage(json: unknown, model: string): R } } const encrypted = typeof raw.encrypted_content === "string" ? raw.encrypted_content : ""; - const env = encrypted ? decodeReasoningEnvelope(encrypted) : null; + const env = encrypted ? decodeReasoningEnvelope(encrypted, translatorBudget) : null; // Legacy combined envelopes place redacted blocks before the signed block, // matching the Anthropic adapter. New bridge output uses separate items. for (const data of env?.red ?? []) content.push({ type: "redacted_thinking", data }); // env.txt may be locally hidden text. Do not expose it here or manufacture // a new signed continuity carrier; hidden-summary replay remains limited. if (parts.length > 0 || env?.sig) { - content.push({ type: "thinking", thinking: parts.join("\n\n"), signature: env?.sig ?? encodeReasoningEnvelope({ txt: parts.join("\n\n") }) }); + content.push({ type: "thinking", thinking: parts.join("\n\n"), signature: env?.sig ?? encodeReasoningEnvelope({ txt: parts.join("\n\n") }, translatorBudget) }); } break; } diff --git a/src/server/claude-messages.ts b/src/server/claude-messages.ts index c5c929c519..f6906de7e0 100644 --- a/src/server/claude-messages.ts +++ b/src/server/claude-messages.ts @@ -866,17 +866,18 @@ async function handleClaudeMessagesWithBudget( let internalReq: Request; try { // The UTF-16 JSON string and the Request's UTF-8 body coexist until dispatch. - const reservation = translatorBudget.reserveTransient(3 * jsonUtf8Bytes(internalBody), { kind: "request_copies" }); + const bodyBytes = jsonUtf8Bytes(internalBody); + const reservation = translatorBudget.reserveTransient(3 * bodyBytes, { kind: "request_copies" }); try { internalReq = new Request("http://localhost/v1/responses", { method: "POST", headers, body: JSON.stringify(internalBody), }); - reservation.commitRetained(); } finally { reservation.release(); } + translatorBudget.chargeRetained(bodyBytes, { kind: "request_copies" }); } catch (err) { if (!isTranslatorBudgetExceededError(err)) throw err; if (logIds) addFinalRequestLog(logIds.requestId, logIds.start, logCtx, 413, { closeReason: "non_stream" }); @@ -1019,7 +1020,13 @@ async function handleClaudeMessagesWithBudget( } return anthropicErrorResponse(502, error?.message ?? "upstream request failed", "api_error"); } - const message = responsesJsonToAnthropicMessage(json, requestedModel); + let message: Rec; + try { + message = responsesJsonToAnthropicMessage(json, requestedModel, translatorBudget); + } catch (err) { + if (!isTranslatorBudgetExceededError(err)) throw err; + return anthropicErrorResponse(413, "upstream translation buffer exceeded the safe limit", "request_too_large", "translation_buffer_limit"); + } if ((message as Rec).type === "error") { return new Response(JSON.stringify(message), { status: 529, diff --git a/tests/responses/reasoning-envelope.test.ts b/tests/responses/reasoning-envelope.test.ts index 27e21d5cff..6ffc2d750f 100644 --- a/tests/responses/reasoning-envelope.test.ts +++ b/tests/responses/reasoning-envelope.test.ts @@ -1,7 +1,9 @@ import { describe, expect, spyOn, test } from "bun:test"; +import { bridgeToResponsesSSE, buildResponseJSON } from "../../src/bridge"; +import type { AdapterEvent } from "../../src/types"; import { anthropicToResponsesBody, anthropicToResponsesTranslation } from "../../src/claude/inbound"; import { decodeReasoningEnvelope, encodeReasoningEnvelope, OCX_REASONING_PREFIX, type ReasoningEnvelope } from "../../src/responses/reasoning-envelope"; -import { responsesJsonToAnthropicMessage } from "../../src/claude/outbound"; +import { responsesJsonToAnthropicMessage, responsesSseToAnthropicSse } from "../../src/claude/outbound"; import { createTranslatorBudget, TranslatorBudgetExceededError, translatorObservedBufferSnapshot } from "../../src/lib/translator-budget"; import { jsonUtf8Bytes } from "../../src/lib/json-byte-size"; import * as budgets from "../../src/lib/translator-budget"; @@ -217,4 +219,163 @@ describe("reasoning allocation admission", () => { } }); + test("successful Request construction retains only its UTF-8 body after releasing temporary copies", async () => { + const { handleClaudeMessages } = await import("../../src/server/claude-messages"); + const request = new Request("http://localhost/v1/messages", { + method: "POST", headers: { "content-type": "application/json" }, + body: JSON.stringify({ model: "fixture/model", messages: [{ role: "user", content: "hello" }] }), + }); + const budget = budgets.createTranslatorBudget({ maxTurnBytes: 4096 }); + const originalCharge = budget.chargeRetained.bind(budget); + const copies: Array<{ bytes: number; before: number; after: number }> = []; + const charge = spyOn(budget, "chargeRetained").mockImplementation((bytes, scope) => { + const before = budget.snapshot().currentBytes; + originalCharge(bytes, scope); + if (scope.kind === "request_copies") copies.push({ bytes, before, after: budget.snapshot().currentBytes }); + }); + const reserve = spyOn(budget, "reserveTransient"); + const factory = spyOn(budgets, "createTranslatorBudget").mockReturnValue(budget); + const stringify = spyOn(JSON, "stringify"); + try { + const response = await handleClaudeMessages(request, { port: 0, providers: {} }, { model: "", provider: "" }); + expect(response.status).toBe(404); // Serialization succeeded; the synthetic model is deliberately absent. + await response.text(); + const serialized = stringify.mock.calls.find(([value]) => value && typeof value === "object" && "input" in value)?.[0]; + expect(serialized).toBeDefined(); + const expected = Buffer.byteLength(JSON.stringify(serialized)); + expect(copies).toHaveLength(2); + expect(copies[1]!.bytes).toBe(expected); + expect(copies[1]!.before).toBe(copies[0]!.after); + expect(reserve.mock.calls.filter(([, scope]) => scope.kind === "request_copies").map(([bytes]) => bytes)).toEqual([3 * expected]); + expect(budget.snapshot().currentBytes).toBe(0); + } finally { stringify.mockRestore(); factory.mockRestore(); reserve.mockRestore(); charge.mockRestore(); budget.dispose(); } + }); + + for (const event of [ + { type: "thinking_signature", signature: "r".repeat(256) }, + { type: "redacted_thinking", data: "r".repeat(256) }, + { type: "reasoning_raw_delta", text: "r".repeat(256) }, + { type: "kiro_redacted_reasoning", data: "r".repeat(256) }, + ] as const) { + for (const mode of ["batch", "stream"] as const) { + test(`${mode} ${event.type} admits envelope copies against the already charged turn`, async () => { + const budget = createTranslatorBudget({ maxTurnBytes: 4096 }); + budget.chargeRetained(2048, { kind: "request_copies" }); + const stringify = spyOn(JSON, "stringify"); + try { + const events: AdapterEvent[] = [event, { type: "done" }]; + if (mode === "batch") { + expect(() => buildResponseJSON(events, "fixture/model", { translatorBudget: budget, hideThinkingSummary: true })) + .toThrow(TranslatorBudgetExceededError); + } else { + async function* source() { yield* events; } + const wire = await new Response(bridgeToResponsesSSE(source(), "fixture/model", undefined, undefined, undefined, undefined, undefined, + { translatorBudget: budget, hideThinkingSummary: true })).text(); + expect(wire).toContain('"code":"translation_buffer_limit"'); + expect(wire).not.toContain('event: response.completed'); + } + expect(stringify.mock.calls.some(([value]) => value && typeof value === "object" + && ("sig" in value || "txt" in value || "red" in value || "krc" in value))).toBe(false); + } finally { stringify.mockRestore(); budget.dispose(); } + }); + } + } + + for (const encoded of [false, true]) { + test(`JSON outbound ${encoded ? "decoding" : "encoding"} uses the caller budget before allocation`, () => { + const item = encoded + ? { type: "reasoning", encrypted_content: encodeReasoningEnvelope({ sig: "r".repeat(256) }), summary: [] } + : { type: "reasoning", summary: [{ type: "summary_text", text: "r".repeat(256) }] }; + const budget = createTranslatorBudget({ maxTurnBytes: 4096 }); + budget.chargeRetained(2048, { kind: "request_copies" }); + const from = spyOn(Buffer, "from"); + try { + expect(() => responsesJsonToAnthropicMessage({ output: [item] }, "fixture/model", budget)).toThrow(TranslatorBudgetExceededError); + expect(from).not.toHaveBeenCalled(); + } finally { from.mockRestore(); budget.dispose(); } + }); + } + + for (const ending of ["throw", "eof", "stall"] as const) { + for (const overflow of [false, true]) { + test(`hidden reasoning ${ending} cleanup ${overflow ? "reports one budget failure" : "preserves its admitted terminal"}`, async () => { + const budget = createTranslatorBudget({ maxTurnBytes: overflow ? 4096 : 65536 }); + budget.chargeRetained(2048, { kind: "request_copies" }); + const accumulated = Promise.withResolvers(); + const pending = Promise.withResolvers>(); + let reads = 0; + let returns = 0; + let cancelled = 0; + let clears = 0; + let beat = () => {}; + const source: AsyncIterableIterator = { + [Symbol.asyncIterator]() { return this; }, + async next() { + if (++reads === 1) return { done: false, value: { type: "reasoning_raw_delta", text: "r".repeat(256) } }; + accumulated.resolve(); + if (ending === "throw") throw new Error("synthetic generator failure"); + if (ending === "eof") return { done: true, value: undefined }; + return pending.promise; + }, + async return() { returns++; pending.resolve({ done: true, value: undefined }); return { done: true, value: undefined }; }, + }; + const stringify = spyOn(JSON, "stringify"); + try { + const stream = bridgeToResponsesSSE(source, "fixture/model", undefined, undefined, undefined, + () => { cancelled++; }, 500, { + translatorBudget: budget, hideThinkingSummary: true, stallTimeoutSec: 1, + timers: { setInterval(callback) { beat = callback; return 1; }, clearInterval() { clears++; beat = () => {}; } }, + }); + const result = new Response(stream).text(); + await accumulated.promise; + if (ending === "stall") { beat(); beat(); beat(); } + const wire = await result; + const envelopes = stringify.mock.calls.filter(([value]) => value && typeof value === "object" && "txt" in value); + expect(wire.match(/data: \[DONE\]/g)).toHaveLength(1); + expect(wire).not.toContain("event: response.completed"); + expect(clears).toBe(1); + if (overflow) { + expect(envelopes).toHaveLength(0); + expect(wire.match(/event: response.failed/g)).toHaveLength(1); + expect(wire).toContain('"code":"translation_buffer_limit"'); + expect(wire).not.toContain("event: response.incomplete"); + expect(cancelled).toBe(1); + expect(returns).toBe(1); + } else { + expect(envelopes).toHaveLength(1); + expect(wire).not.toContain("translation_buffer_limit"); + expect(wire.match(new RegExp(`event: response.${ending === "throw" ? "failed" : "incomplete"}`, "g"))).toHaveLength(1); + expect(cancelled).toBe(ending === "eof" ? 0 : 1); + } + } finally { stringify.mockRestore(); pending.resolve({ done: true, value: undefined }); budget.dispose(); } + }); + } + } + + for (const encoded of [false, true]) { + test(`SSE outbound ${encoded ? "decoding" : "encoding"} admits against its live turn budget`, async () => { + const text = "r".repeat(512); + const events = encoded ? [{ type: "response.output_item.done", item: { + type: "reasoning", encrypted_content: encodeReasoningEnvelope({ sig: text }), summary: [], + } }] : [ + { type: "response.reasoning_summary_text.delta", delta: text }, + { type: "response.completed", response: { status: "completed", output: [] } }, + ]; + const frames = events.map(event => new TextEncoder().encode(`event: ${event.type}\ndata: ${JSON.stringify(event)}\n\n`)); + const budget = createTranslatorBudget({ maxTurnBytes: 8192 }); + budget.chargeRetained(4096, { kind: "request_copies" }); + const reserve = spyOn(budget, "reserveTransient"); + const from = spyOn(Buffer, "from"); + try { + const upstream = new ReadableStream({ start(controller) { frames.forEach(frame => controller.enqueue(frame)); controller.close(); } }); + const wire = await new Response(responsesSseToAnthropicSse(upstream, "fixture/model", { translatorBudget: budget, pingIntervalMs: 0 })).text(); + expect(reserve.mock.calls.some(([bytes, scope]) => scope.kind === "reasoning" && bytes > 4096)).toBe(true); + expect(from).not.toHaveBeenCalled(); + expect(wire.match(/event: error/g)).toHaveLength(1); + expect(wire).toContain('"code":"translation_buffer_limit"'); + expect(wire).not.toContain("event: message_stop"); + } finally { reserve.mockRestore(); from.mockRestore(); budget.dispose(); } + }); + } + }); From feb1855df91e5db351699d959d88d7e6c21c0f93 Mon Sep 17 00:00:00 2001 From: lidge-jun <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:59:23 +0900 Subject: [PATCH 130/221] docs: include Pi session affinity in every guide example [skip ci] Co-authored-by: makesomethingshit <246213378+makesomethingshit@users.noreply.github.com> --- docs-site/src/content/docs/fr/guides/pi.md | 5 +++++ docs-site/src/content/docs/guides/pi.md | 5 +++++ docs-site/src/content/docs/ja/guides/pi.md | 5 +++++ docs-site/src/content/docs/ko/guides/pi.md | 5 +++++ docs-site/src/content/docs/ru/guides/pi.md | 5 +++++ docs-site/src/content/docs/tr/guides/pi.md | 5 +++++ docs-site/src/content/docs/zh-cn/guides/pi.md | 5 +++++ docs-site/src/content/docs/zh-tw/guides/pi.md | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/docs-site/src/content/docs/fr/guides/pi.md b/docs-site/src/content/docs/fr/guides/pi.md index eab8960063..030d91679c 100644 --- a/docs-site/src/content/docs/fr/guides/pi.md +++ b/docs-site/src/content/docs/fr/guides/pi.md @@ -27,6 +27,9 @@ d’exportation de la variable d’environnement et le nombre de modèles dotés "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -41,6 +44,8 @@ d’exportation de la variable d’environnement et le nombre de modèles dotés } ``` +Les fournisseurs Pi générés activent `compat.sendSessionAffinityHeaders`. Conservez ce réglage lors de la fusion ou de la modification manuelle du fournisseur : Pi transmet un identifiant de session stable, dont OpenCodex dérive l’affinité pour la destination canonique OpenCode Go. Pi peut omettre cet identifiant lorsque `cacheRetention` vaut `none`. + Les identifiants de modèle sont les sélecteurs canoniques du proxy : les modèles routés apparaissent donc sous la forme `provider/model` (`anthropic/claude-opus-5`) et les slugs natifs OpenAI restent sans préfixe (`gpt-5.6-sol`). Le `name` suffixe — `(anthropic)`, `(native)`, `(routed)` — permet de distinguer, dans le sélecteur de Pi, deux modèles de même nom diff --git a/docs-site/src/content/docs/guides/pi.md b/docs-site/src/content/docs/guides/pi.md index c44b97f12a..f44e4be381 100644 --- a/docs-site/src/content/docs/guides/pi.md +++ b/docs-site/src/content/docs/guides/pi.md @@ -27,6 +27,9 @@ export line, and how many models carry authoritative context limits. "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -41,6 +44,8 @@ export line, and how many models carry authoritative context limits. } ``` +Generated Pi providers enable `compat.sendSessionAffinityHeaders`. Keep this flag when merging or manually editing the provider: Pi supplies a stable session identity and OpenCodex derives canonical OpenCode Go affinity from it. Pi may omit the identity when `cacheRetention` is `none`. + Model ids are the proxy's canonical selectors, so routed models appear as `provider/model` (`anthropic/claude-opus-5`) and native OpenAI slugs stay unprefixed (`gpt-5.6-sol`). The `name` suffix — `(anthropic)`, `(native)`, `(routed)` — is what makes two same-named models from diff --git a/docs-site/src/content/docs/ja/guides/pi.md b/docs-site/src/content/docs/ja/guides/pi.md index 788fe48c60..9b637e84e4 100644 --- a/docs-site/src/content/docs/ja/guides/pi.md +++ b/docs-site/src/content/docs/ja/guides/pi.md @@ -23,6 +23,9 @@ ocx export --client pi "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -37,6 +40,8 @@ ocx export --client pi } ``` +生成される Pi プロバイダーでは `compat.sendSessionAffinityHeaders` が有効です。設定をマージしたり手動で編集したりする際も、このフラグを保持してください。Pi が送る安定したセッション識別子から、OpenCodex が正規の OpenCode Go 接続先用の affinity を生成します。`cacheRetention` が `none` の場合、Pi は識別子を送信しないことがあります。 + モデル ID はプロキシの正規セレクターであるため、ルーティングされたモデルは `provider/model` (`anthropic/claude-opus-5`) として表示され、ネイティブ OpenAI スラグはプレフィックスなし (`gpt-5.6-sol`) のままになります。 `name` サフィックス (`(anthropic)`、`(native)`、`(routed)`) により、異なるアップストリームの 2 つの同じ名前のモデルが Pi のピッカーで区別できるようになります。 ## どこへ行くのか diff --git a/docs-site/src/content/docs/ko/guides/pi.md b/docs-site/src/content/docs/ko/guides/pi.md index 648d71060e..6bda9c2b36 100644 --- a/docs-site/src/content/docs/ko/guides/pi.md +++ b/docs-site/src/content/docs/ko/guides/pi.md @@ -27,6 +27,9 @@ ocx export --client pi "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -41,6 +44,8 @@ ocx export --client pi } ``` +생성된 Pi provider에는 `compat.sendSessionAffinityHeaders`가 활성화됩니다. provider를 병합하거나 직접 수정할 때 이 설정을 유지하세요. Pi가 안정적인 세션 식별자를 보내면 OpenCodex가 이를 바탕으로 정규 OpenCode Go 대상의 affinity를 계산합니다. `cacheRetention`이 `none`이면 Pi가 식별자를 보내지 않을 수 있습니다. + 모델 id는 프록시의 정규 선택자이므로, 라우팅된 모델은 `provider/model` (`anthropic/claude-opus-5`) 형태로 나타나고, 네이티브 OpenAI slug는 접두사 없이 (`gpt-5.6-sol`) 유지됩니다. `name` 접미사인 `(anthropic)`, `(native)`, `(routed)`는 diff --git a/docs-site/src/content/docs/ru/guides/pi.md b/docs-site/src/content/docs/ru/guides/pi.md index 0960ecf49a..e36a73da7e 100644 --- a/docs-site/src/content/docs/ru/guides/pi.md +++ b/docs-site/src/content/docs/ru/guides/pi.md @@ -27,6 +27,9 @@ ocx export --client pi "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -41,6 +44,8 @@ ocx export --client pi } ``` +В создаваемой конфигурации Pi включён `compat.sendSessionAffinityHeaders`. Сохраняйте этот флаг при объединении или ручном редактировании провайдера: Pi передаёт стабильный идентификатор сессии, из которого OpenCodex формирует affinity для канонического OpenCode Go. При `cacheRetention: none` Pi может не передавать идентификатор. + Id моделей — это канонические селекторы прокси, поэтому маршрутизируемые модели появляются как `provider/model` (`anthropic/claude-opus-5`), а нативные slug OpenAI остаются без префикса (`gpt-5.6-sol`). Суффикс в `name` — `(anthropic)`, `(native)`, `(routed)` — как раз и позволяет diff --git a/docs-site/src/content/docs/tr/guides/pi.md b/docs-site/src/content/docs/tr/guides/pi.md index 0741f7be51..fe6044de28 100644 --- a/docs-site/src/content/docs/tr/guides/pi.md +++ b/docs-site/src/content/docs/tr/guides/pi.md @@ -31,6 +31,9 @@ export line, and how many models carry authoritative context limits. "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -45,6 +48,8 @@ export line, and how many models carry authoritative context limits. } ``` +Oluşturulan Pi sağlayıcılarında `compat.sendSessionAffinityHeaders` etkinleştirilir. Sağlayıcıyı birleştirirken veya elle düzenlerken bu ayarı koruyun: Pi sabit bir oturum kimliği gönderir ve OpenCodex bu kimlikten kanonik OpenCode Go hedefi için oturum yakınlığı üretir. `cacheRetention` değeri `none` olduğunda Pi kimliği göndermeyebilir. + Model ids are the proxy's canonical selectors, so routed models appear as `provider/model` (`anthropic/claude-opus-5`) and native OpenAI slugs stay unprefixed diff --git a/docs-site/src/content/docs/zh-cn/guides/pi.md b/docs-site/src/content/docs/zh-cn/guides/pi.md index ad868e3194..c9ebf7b4a6 100644 --- a/docs-site/src/content/docs/zh-cn/guides/pi.md +++ b/docs-site/src/content/docs/zh-cn/guides/pi.md @@ -23,6 +23,9 @@ ocx export --client pi "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -37,6 +40,8 @@ ocx export --client pi } ``` +生成的 Pi 提供方配置启用了 `compat.sendSessionAffinityHeaders`。合并或手动编辑提供方时请保留该设置:Pi 提供稳定的会话标识,OpenCodex 据此为规范的 OpenCode Go 目标生成会话亲和标识。`cacheRetention` 为 `none` 时,Pi 可能不发送会话标识。 + 模型 id 是代理的规范选择器,因此已路由模型会显示为 `provider/model`(`anthropic/claude-opus-5`),而原生 OpenAI slug 会保持不带前缀(`gpt-5.6-sol`)。`name` 后缀 - `(anthropic)`、`(native)`、`(routed)` - 负责让两个同名但来自不同上游的模型在 Pi 的选择器中可区分。 ## 放置位置 diff --git a/docs-site/src/content/docs/zh-tw/guides/pi.md b/docs-site/src/content/docs/zh-tw/guides/pi.md index 0353338574..d8e9b62510 100644 --- a/docs-site/src/content/docs/zh-tw/guides/pi.md +++ b/docs-site/src/content/docs/zh-tw/guides/pi.md @@ -23,6 +23,9 @@ ocx export --client pi "baseUrl": "http://127.0.0.1:10100/v1", "api": "openai-completions", "apiKey": "$OPENCODEX_API_KEY", + "compat": { + "sendSessionAffinityHeaders": true + }, "models": [ { "id": "anthropic/claude-opus-5", @@ -37,6 +40,8 @@ ocx export --client pi } ``` +產生的 Pi 供應商設定會啟用 `compat.sendSessionAffinityHeaders`。合併或手動編輯供應商時請保留此設定:Pi 提供穩定的工作階段識別碼,OpenCodex 據此為標準 OpenCode Go 目標產生工作階段親和識別碼。當 `cacheRetention` 為 `none` 時,Pi 可能不傳送識別碼。 + 模型 id 是代理的規範選擇器,因此路由模型顯示為 `provider/model`(`anthropic/claude-opus-5`),而原生 OpenAI slug 保持無前綴(`gpt-5.6-sol`)。`name` 後綴 — `(anthropic)`、`(native)`、`(routed)` — 正是讓來自不同上游的兩個同名模型在 Pi 的 picker 中可區分的關鍵。 ## 放置位置 From c84cc3b3e076b6c49cf93a6ca267f6303a698f5b Mon Sep 17 00:00:00 2001 From: lidge-jun <243035832+lidge-jun@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:33:18 +0900 Subject: [PATCH 131/221] docs: describe native compact 404 fallback in route table [skip ci] Co-authored-by: ideabib <221318067+ideabib@users.noreply.github.com> --- docs-site/src/content/docs/reference/proxy-formats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-site/src/content/docs/reference/proxy-formats.md b/docs-site/src/content/docs/reference/proxy-formats.md index 593c8ae7a3..1f2e589252 100644 --- a/docs-site/src/content/docs/reference/proxy-formats.md +++ b/docs-site/src/content/docs/reference/proxy-formats.md @@ -402,7 +402,7 @@ conversation. | Route type | Behavior | | --- | --- | -| Canonical ChatGPT or official OpenAI route | Forwards the request to the native `/responses/compact` endpoint with the resolved account and model authentication | +| Canonical ChatGPT or official OpenAI route | Tries the native `/responses/compact` endpoint with the resolved account and model authentication; HTTP 404 falls back to a regular Responses compaction turn | | Other routed model | Runs an internal, non-streaming, no-tools compaction turn with a `compaction_trigger`; requires exactly one synthetic `compaction` item whose `encrypted_content` is an `ocx1:` envelope; decodes that summary into v1 replacement history | If the native compact endpoint returns HTTP 404, OpenCodex retries compaction through a regular From e96b5c52e05e9fd6f5b9cb4aedc96b171f4a4872 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:19:06 +0900 Subject: [PATCH 132/221] fix(responses): make whole-string citation stripping agree with the streaming filter After #3868 the streaming filter keeps a malformed START verbatim when a later START opens a real span, but stripCitationMarkers still paired the first START with that later span's END and deleted everything between. bridge.ts re-strips the accumulated text for output_text.done and output_item.done, so the terminal text disagreed with the concatenated deltas. Walk START-delimited segments in the whole-string path too, and share the 4096 span bound with the whole-string path (an over-bound span that is terminated late is malformed text in both), and assert delta-vs-whole equality across several chunkings. Found by the lane A fresh-base composition audit on dev d00615d56. Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/responses/citation-markers.ts | 53 +++++++++++++----------- tests/responses/citation-markers.test.ts | 33 +++++++++++++++ 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/src/responses/citation-markers.ts b/src/responses/citation-markers.ts index 3e3943cad5..9c56c7a197 100644 --- a/src/responses/citation-markers.ts +++ b/src/responses/citation-markers.ts @@ -42,23 +42,24 @@ export function hasCitationMarker(text: string): boolean { */ export function stripCitationMarkers(text: string): string { if (!text.includes(CITATION_MARKER_START)) return text; - let out = ""; - let index = 0; - for (;;) { - const start = text.indexOf(CITATION_MARKER_START, index); - if (start === -1) { - out += text.slice(index); - return out; - } - const end = text.indexOf(CITATION_MARKER_END, start + 1); - if (end === -1) { - // Unterminated: keep the rest verbatim. - out += text.slice(index); - return out; - } - out += text.slice(index, start); - index = end + 1; + // Walk START-delimited segments exactly like the streaming filter below: a START whose + // own segment (up to the next START) contains an END within the span bound is a span and + // is removed; a START that is superseded by another START before any END, or whose span + // exceeds MAX_CITATION_SPAN_LENGTH, is malformed text and stays verbatim. Pairing an + // earlier malformed START with a later span's END would delete real answer text and, + // worse, disagree with what the streaming deltas already emitted (#3843). The bound is + // shared with the streaming filter for the same reason: a span it has already released + // as over-bound must not be swallowed here when the END finally arrives. + let start = text.indexOf(CITATION_MARKER_START); + let out = text.slice(0, start); + while (start !== -1) { + const nextStart = text.indexOf(CITATION_MARKER_START, start + 1); + const segment = text.slice(start, nextStart === -1 ? text.length : nextStart); + const end = segment.indexOf(CITATION_MARKER_END, 1); + out += end === -1 || end + 1 > MAX_CITATION_SPAN_LENGTH ? segment : segment.slice(end + 1); + start = nextStart; } + return out; } export interface CitationMarkerFilter { @@ -69,13 +70,16 @@ export interface CitationMarkerFilter { } /** - * Upper bound on the text withheld for one unterminated START. + * Upper bound on the length of a citation span (START through END inclusive), and therefore + * on the text the streaming filter withholds for one unterminated START. * * A real span is `cite` plus a few turn-scoped ids, so it is far under this. Without a * bound, a backend that emits a START and never terminates it makes `held` grow for the - * whole response, and every later delta re-scans that accumulated prefix. + * whole response, and every later delta re-scans that accumulated prefix. The whole-string + * strip applies the same bound so both paths classify a span identically regardless of how + * the text was chunked. */ -const MAX_STREAMING_MARKER_SPAN_LENGTH = 4_096; +const MAX_CITATION_SPAN_LENGTH = 4_096; /** * Streaming filter. @@ -85,7 +89,7 @@ const MAX_STREAMING_MARKER_SPAN_LENGTH = 4_096; * This holds back the text from an unterminated START and releases it once the END arrives * (removed) or the stream ends (verbatim, so nothing the model actually said is lost). * - * A span that grows past `MAX_STREAMING_MARKER_SPAN_LENGTH` is malformed ordinary text, so + * A span that grows past `MAX_CITATION_SPAN_LENGTH` is malformed ordinary text, so * it is released verbatim instead of withheld; a later START can still open a valid span. */ export function createCitationMarkerFilter(): CitationMarkerFilter { @@ -104,15 +108,16 @@ export function createCitationMarkerFilter(): CitationMarkerFilter { const nextStart = combined.indexOf(CITATION_MARKER_START, start + 1); const segment = combined.slice(start, nextStart === -1 ? combined.length : nextStart); const end = segment.indexOf(CITATION_MARKER_END, 1); - if (end !== -1) { + if (end !== -1 && end + 1 <= MAX_CITATION_SPAN_LENGTH) { // A complete span: drop it, keep whatever trails it inside this segment. out += segment.slice(end + 1); - } else if (nextStart === -1 && segment.length <= MAX_STREAMING_MARKER_SPAN_LENGTH) { + } else if (end === -1 && nextStart === -1 && segment.length <= MAX_CITATION_SPAN_LENGTH) { // Only a bounded trailing span can still be completed by a later delta. held = segment; } else { - // Superseded by a later START, or over the bound: ordinary text, emitted verbatim - // so neither the retained text nor the per-delta rescan grows without limit. + // Superseded by a later START, or over the bound (with or without a late END): + // ordinary text, emitted verbatim so neither the retained text nor the per-delta + // rescan grows without limit. out += segment; } start = nextStart; diff --git a/tests/responses/citation-markers.test.ts b/tests/responses/citation-markers.test.ts index dcc7f9abc6..b0d92d0fad 100644 --- a/tests/responses/citation-markers.test.ts +++ b/tests/responses/citation-markers.test.ts @@ -52,6 +52,15 @@ describe("citation marker stripping (#3150)", () => { expect(stripCitationMarkers(`a${P}b`)).toBe(`a${P}b`); expect(stripCitationMarkers(`a${E}b`)).toBe(`a${E}b`); }); + + test("a malformed START before a later valid span is kept, not paired with that span's END", () => { + // Whole-string stripping must agree with the streaming filter: the malformed prefix + // survives and only the real span is removed (bridge re-strips the accumulated text + // for output_text.done, so any disagreement would make done != concatenated deltas). + const malformed = `${S}${"y".repeat(5_000)}`; + expect(stripCitationMarkers(`a${malformed}${S}cite${P}turn1view0${E} tail`)).toBe(`a${malformed} tail`); + expect(stripCitationMarkers(`a${S}cite${S}cite${P}turn1view0${E}b`)).toBe(`a${S}citeb`); + }); }); describe("streaming citation marker filter (#3150)", () => { @@ -117,4 +126,28 @@ describe("streaming citation marker filter (#3150)", () => { .toBe(`a${malformed} tail`); expect(filter.flush()).toBe(""); }); + + test("concatenated streaming output equals whole-string stripping for every chunking", () => { + // The bridge emits deltas through the filter and then re-strips the accumulated text for + // output_text.done / output_item.done, so the two contracts must produce identical text. + const malformed = `${S}${"y".repeat(5_000)}`; + const inputs = [ + `a${span}${malformed}${S}cite${P}turn1view0${E} tail`, + `kept ${S}cite${"x".repeat(5_000)}`, + `a${S}cite${S}cite${P}turn1view0${E}b`, + `a${span}b${S}cite${P}turn2view0${E}c`, + // An over-bound span that is eventually terminated: the streaming filter has already + // released it verbatim, so whole-string stripping must keep it too. + `late ${S}${"z".repeat(4_096)}${E} end`, + // Exactly at the bound (4096 chars START..END inclusive) is still a span. + `edge ${S}${"z".repeat(4_094)}${E} end`, + ]; + for (const input of inputs) { + for (const size of [1, 7, 4_097, input.length]) { + const chunks: string[] = []; + for (let i = 0; i < input.length; i += size) chunks.push(input.slice(i, i + size)); + expect(drain(chunks)).toBe(stripCitationMarkers(input)); + } + } + }); }); From 413600dc79817a34d141d5f8037fc1495b456aa1 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 20:04:47 +0900 Subject: [PATCH 133/221] docs(providers): describe OpenCode Go session affinity and the Pi compat flag [skip ci] Docs hunk from the #3858 carry (#3880) that lane A handed off because guides/providers.md is owned by the main lane in this train. Co-authored-by: makesomethingshit <246213378+makesomethingshit@users.noreply.github.com> --- docs-site/src/content/docs/guides/providers.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs-site/src/content/docs/guides/providers.md b/docs-site/src/content/docs/guides/providers.md index 8a9477a759..7ac2e4502b 100644 --- a/docs-site/src/content/docs/guides/providers.md +++ b/docs-site/src/content/docs/guides/providers.md @@ -379,6 +379,22 @@ free-experimentation model. | Cloudflare AI Gateway | `https://gateway.ai.cloudflare.com/v1/{account-id}/{gateway}/anthropic` | | …and more | opencode zen, Vercel AI Gateway, Venice, NanoGPT, Synthetic, Qianfan, Alibaba, Parallel, ZenMux, LiteLLM | +**OpenCode Go** requires a stable session identifier for routing. OpenCodex derives +its Go session header from Codex thread/session headers, or from a client's +`x-opencode-session` header when Codex headers are absent. This applies to direct +Chat Completions requests and requests bridged to Responses. Even an `ocx_`-prefixed +inbound value is treated as client input and +hashed into Go affinity; the internal bridge carries the original value, so native +Chat, bridged Chat, and Responses derive the same result. Explicit provider-config +session headers are operator overrides and are sent unchanged. Clients must keep the +identifier stable within a conversation and distinct across conversations; requests +without a session identifier cannot receive automatic session affinity. +Generated Pi provider configurations enable `compat.sendSessionAffinityHeaders` +so Pi sends its per-session identity to the proxy. Existing manually managed Pi +configurations can set this option on their `opencodex` provider as well. +Pi can omit session affinity when `cacheRetention` is `none`; enable cache retention +when a stable upstream session is required. + **OpenCode Zen** (`opencode-zen`) and the keyless **OpenCode Free** preset share `https://opencode.ai/zen/v1`. Free models on that gateway often hit a short-window burst limit around 15–20 requests/minute (community-measured; OpenCode does not publish RPM). From 451fbffb02407cd73e9cf62bff6c40ad09ba3e12 Mon Sep 17 00:00:00 2001 From: x3M3x Date: Wed, 2 Sep 2026 03:42:09 +0400 Subject: [PATCH 134/221] feat gui: expose subagent fallback settings [skip ci] (cherry picked from commit b0d86fa3be8aec324974dc4471d5a98b35102459) Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> --- .../SubagentDelegationSection.tsx | 33 ++++++++++++ .../SubagentsWorkspace.tsx | 14 +++++ gui/src/i18n/de.ts | 6 +++ gui/src/i18n/en.ts | 6 +++ gui/src/i18n/fr.ts | 6 +++ gui/src/i18n/ja.ts | 6 +++ gui/src/i18n/ko.ts | 6 +++ gui/src/i18n/ru.ts | 6 +++ gui/src/i18n/tr.ts | 6 +++ gui/src/i18n/zh-TW.ts | 6 +++ gui/src/i18n/zh.ts | 6 +++ gui/src/pages/Subagents.tsx | 53 ++++++++++++++++--- 12 files changed, 147 insertions(+), 7 deletions(-) diff --git a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx index 46c0447a7c..7c3b0e9425 100644 --- a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx +++ b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx @@ -28,6 +28,13 @@ export interface SubagentDelegationSectionProps { onUltraModeSave: (patch: UltraModePatch) => void; ultraLoadFailed: boolean; onUltraModeRetry: () => void; + fallback: string[]; + fallbackPollMs: number; + fallbackBusy: boolean; + availableModels: string[]; + onFallbackChange: (models: string[]) => void; + onFallbackPollMsChange: (pollMs: number) => void; + onFallbackSave: () => void; } export default function SubagentDelegationSection({ @@ -44,6 +51,7 @@ export default function SubagentDelegationSection({ onUltraModeSave, ultraLoadFailed, onUltraModeRetry, + fallback, fallbackPollMs, fallbackBusy, availableModels, onFallbackChange, onFallbackPollMsChange, onFallbackSave, }: SubagentDelegationSectionProps) { const t = useT(); // A present empty/whitespace hint is an upstream override that suppresses the @@ -97,6 +105,31 @@ export default function SubagentDelegationSection({

Ba>p$xU-%CZ15eSXiGGY@+Ad1CW%9 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%0DYP=M4x*Sq0Ks2}hf7Oo=n+dCXl5zSJW~oZja| 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%0DEd-b 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 z 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

+
+
+
{t("sub.fallbackLabel")}
+
{t("sub.fallbackHint")}
+
+
+ {fallback.map((modelName, index) => ( +
+ {index + 1}. {modelName} + + + +
+ ))} + + + +
+
+
{t("dash.syncCodexSubagentDefaults")}
diff --git a/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx b/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx index a22bd2a305..30b722b2bf 100644 --- a/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx +++ b/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx @@ -37,6 +37,12 @@ export interface SubagentsWorkspaceProps { onToggle: (m: string) => void; onMove: (i: number, dir: -1 | 1) => void; onSave: () => void; + fallback: string[]; + fallbackPollMs: number; + fallbackBusy: boolean; + onFallbackChange: (models: string[]) => void; + onFallbackPollMsChange: (pollMs: number) => void; + onFallbackSave: () => void; delegation: { model: string; effort: string; @@ -63,6 +69,7 @@ export default function SubagentsWorkspace({ onToggle, onMove, onSave, + fallback, fallbackPollMs, fallbackBusy, onFallbackChange, onFallbackPollMsChange, onFallbackSave, delegation, }: SubagentsWorkspaceProps) { const t = useT(); @@ -237,6 +244,13 @@ export default function SubagentsWorkspace({ onUltraModeSave={delegation.onUltraModeSave} ultraLoadFailed={delegation.ultraLoadFailed} onUltraModeRetry={delegation.onUltraModeRetry} + fallback={fallback} + fallbackPollMs={fallbackPollMs} + fallbackBusy={fallbackBusy} + availableModels={available} + onFallbackChange={onFallbackChange} + onFallbackPollMsChange={onFallbackPollMsChange} + onFallbackSave={onFallbackSave} />
diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 74533a04d3..8985d342a0 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -686,6 +686,12 @@ export const de: Record = { "sub.ultraModeLoadFail": "Ultra-Modus-Einstellungen konnten nicht geladen werden — läuft der Proxy?", "sub.ultraModeSaveFail": "Ultra-Modus-Einstellungen konnten nicht gespeichert werden", "sub.ultraModeSaved": "Ultra-Modus gespeichert. Gilt für neue Codex-Sitzungen.", + "sub.fallbackLabel": "Fallback-Kette für Sub-Agenten", + "sub.fallbackHint": "Geordnete Modelle, die versucht werden, wenn ein Sub-Agent-Modell nicht verfügbar ist oder fehlschlägt.", + "sub.fallbackAdd": "Fallback-Modell hinzufügen…", + "sub.fallbackPoll": "Intervall der Verfügbarkeitsprüfung", + "sub.fallbackSaved": "Fallback-Einstellungen für Sub-Agenten gespeichert.", + "sub.fallbackSaveFailed": "Fallback-Einstellungen konnten nicht gespeichert werden", "logs.title": "Anfrage-Protokolle", "logs.tabLogs": "Protokolle", "logs.tabDebug": "Diagnose", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 2197dcb735..a33c195e82 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -329,6 +329,12 @@ export const en = { "dash.visionTimeout": "Timeout", "dash.visionTimeoutInvalid": "Enter an integer from {min} to {max} milliseconds.", "dash.visionAdvancedPopover": "Advanced vision settings", + "sub.fallbackLabel": "Sub-agent fallback chain", + "sub.fallbackHint": "Ordered models tried when a sub-agent model is unavailable or fails.", + "sub.fallbackAdd": "Add fallback model…", + "sub.fallbackPoll": "Availability check interval", + "sub.fallbackSaved": "Sub-agent fallback settings saved.", + "sub.fallbackSaveFailed": "Failed to save fallback settings", "dash.shadowCallIntercept": "Shadow Call Intercept", "dash.shadowCallInterceptHint": "Intercepts Codex App's background helper calls ({models}) for title generation and commit messages and redirects them to your chosen model.", "dash.shadowCallWarning": "⚠ When enabled, ALL requests for {models} will be replaced with the selected model.", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index cca4b70347..fa32925c02 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -319,6 +319,12 @@ export const fr: Record = { "dash.visionTimeout": "Délai d’expiration", "dash.visionTimeoutInvalid": "Saisissez un entier compris entre {min} et {max} millisecondes.", "dash.visionAdvancedPopover": "Paramètres de vision avancés", + "sub.fallbackLabel": "Chaîne de secours des sous-agents", + "sub.fallbackHint": "Modèles essayés dans l’ordre lorsqu’un modèle de sous-agent est indisponible ou échoue.", + "sub.fallbackAdd": "Ajouter un modèle de secours…", + "sub.fallbackPoll": "Intervalle de vérification de disponibilité", + "sub.fallbackSaved": "Paramètres de secours des sous-agents enregistrés.", + "sub.fallbackSaveFailed": "Échec de l’enregistrement des paramètres de secours", "dash.shadowCallIntercept": "Interception des appels fantômes", "dash.shadowCallInterceptHint": "Intercepte les appels auxiliaires en arrière-plan de l’application Codex ({models}) pour générer les titres et les messages de commit, puis les redirige vers le modèle choisi.", "dash.shadowCallWarning": "⚠ Lorsque cette option est activée, TOUTES les requêtes destinées à {models} sont remplacées par le modèle sélectionné.", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 97aa85a6fb..81cd40bca9 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -646,6 +646,12 @@ export const ja: Record = { "sub.ultraModeLoadFail": "ウルトラモード設定を読み込めませんでした — プロキシは実行中ですか?", "sub.ultraModeSaveFail": "ウルトラモード設定の保存に失敗しました", "sub.ultraModeSaved": "ウルトラモードを保存しました。新しい Codex セッションから適用されます。", + "sub.fallbackLabel": "サブエージェントのフォールバックチェーン", + "sub.fallbackHint": "サブエージェントモデルが利用できないか失敗した場合に順番に試すモデルです。", + "sub.fallbackAdd": "フォールバックモデルを追加…", + "sub.fallbackPoll": "利用可能性チェック間隔", + "sub.fallbackSaved": "サブエージェントのフォールバック設定を保存しました。", + "sub.fallbackSaveFailed": "フォールバック設定の保存に失敗しました", // logs "logs.title": "リクエストログ", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 4e66544528..35a726e6ba 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -703,6 +703,12 @@ export const ko: Record = { "sub.ultraModeLoadFail": "울트라 모드 설정을 불러오지 못했습니다 — 프록시가 실행 중인가요?", "sub.ultraModeSaveFail": "울트라 모드 설정 저장에 실패했습니다", "sub.ultraModeSaved": "울트라 모드가 저장되었습니다. 새 Codex 세션부터 적용됩니다.", + "sub.fallbackLabel": "서브에이전트 폴백 체인", + "sub.fallbackHint": "서브에이전트 모델을 사용할 수 없거나 실패할 때 순서대로 시도할 모델입니다.", + "sub.fallbackAdd": "폴백 모델 추가…", + "sub.fallbackPoll": "가용성 확인 간격", + "sub.fallbackSaved": "서브에이전트 폴백 설정을 저장했습니다.", + "sub.fallbackSaveFailed": "폴백 설정을 저장하지 못했습니다", // logs "logs.title": "요청 로그", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index e7f199a06a..a7cc5f72e8 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -701,6 +701,12 @@ export const ru: Record = { "sub.ultraModeLoadFail": "Не удалось загрузить настройки ультра-режима — работает ли прокси?", "sub.ultraModeSaveFail": "Не удалось сохранить настройки ультра-режима", "sub.ultraModeSaved": "Ультра-режим сохранён. Применяется к новым сеансам Codex.", + "sub.fallbackLabel": "Цепочка резервных моделей субагента", + "sub.fallbackHint": "Модели, которые последовательно пробуются, если модель субагента недоступна или завершается ошибкой.", + "sub.fallbackAdd": "Добавить резервную модель…", + "sub.fallbackPoll": "Интервал проверки доступности", + "sub.fallbackSaved": "Настройки резервных моделей субагента сохранены.", + "sub.fallbackSaveFailed": "Не удалось сохранить настройки резервных моделей", // logs "logs.title": "Журнал запросов", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index 8c8f9ff802..5c0ade9077 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -708,6 +708,12 @@ export const tr: Record = { "sub.ultraModeLoadFail": "Ultra modu ayarları yüklenemedi — proxy çalışıyor mu?", "sub.ultraModeSaveFail": "Ultra modu ayarları kaydedilemedi", "sub.ultraModeSaved": "Ultra modu kaydedildi. Yeni Codex oturumlarına uygulanır.", + "sub.fallbackLabel": "Alt ajan yedek zinciri", + "sub.fallbackHint": "Alt ajan modeli kullanılamadığında veya başarısız olduğunda sırayla denenecek modeller.", + "sub.fallbackAdd": "Yedek model ekle…", + "sub.fallbackPoll": "Kullanılabilirlik kontrol aralığı", + "sub.fallbackSaved": "Alt ajan yedek ayarları kaydedildi.", + "sub.fallbackSaveFailed": "Yedek ayarlar kaydedilemedi", // logs "logs.title": "İstek Günlükleri", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index eeec289911..cae0175057 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -555,6 +555,12 @@ export const zhTW: Record = { "sub.ultraModeLoadFail": "無法載入超級模式設定 — 代理是否在執行?", "sub.ultraModeSaveFail": "儲存超級模式設定失敗", "sub.ultraModeSaved": "超級模式已儲存。適用於新的 Codex 會話。", + "sub.fallbackLabel": "子代理備援鏈", + "sub.fallbackHint": "子代理模型無法使用或失敗時,依序嘗試的模型。", + "sub.fallbackAdd": "新增備援模型…", + "sub.fallbackPoll": "可用性檢查間隔", + "sub.fallbackSaved": "子代理備援設定已儲存。", + "sub.fallbackSaveFailed": "備援設定儲存失敗", "logs.title": "請求日誌", "logs.tabLogs": "日誌", "logs.tabDebug": "除錯", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index a62e9b2d6b..ce44edc693 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -696,6 +696,12 @@ export const zh: Record = { "sub.ultraModeLoadFail": "无法加载超级模式设置 — 代理是否在运行?", "sub.ultraModeSaveFail": "保存超级模式设置失败", "sub.ultraModeSaved": "超级模式已保存。适用于新的 Codex 会话。", + "sub.fallbackLabel": "子代理回退链", + "sub.fallbackHint": "子代理模型不可用或失败时按顺序尝试的模型。", + "sub.fallbackAdd": "添加回退模型…", + "sub.fallbackPoll": "可用性检查间隔", + "sub.fallbackSaved": "子代理回退设置已保存。", + "sub.fallbackSaveFailed": "保存回退设置失败", // logs "logs.title": "请求日志", diff --git a/gui/src/pages/Subagents.tsx b/gui/src/pages/Subagents.tsx index 6b54d39ffd..299c9306fe 100644 --- a/gui/src/pages/Subagents.tsx +++ b/gui/src/pages/Subagents.tsx @@ -8,7 +8,7 @@ import { useDataSurface } from "../data-surface"; import { DataSurfaceSkeleton } from "../components/data-surface"; import { useSubagentDelegation, type UltraModePatch, type UltraModeState } from "./use-subagent-delegation"; -type CachedSubagents = { available: string[]; chosen: string[] }; +type CachedSubagents = { available: string[]; chosen: string[]; fallback: string[]; pollMs: number }; function seedSubagents(cacheKey: string): CachedSubagents | null { return readSessionListCache(cacheKey); @@ -19,6 +19,9 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const cacheKey = `ocx.subagents.v1:${apiBase}`; const cached = seedSubagents(cacheKey); const [chosen, setChosen] = useState(() => cached?.chosen ?? []); + const [fallback, setFallback] = useState(() => cached?.fallback ?? []); + const [fallbackPollMs, setFallbackPollMs] = useState(() => cached?.pollMs ?? 60000); + const [fallbackBusy, setFallbackBusy] = useState(false); const [status, setStatus] = useState(""); const [ok, setOk] = useState(false); const [busy, setBusy] = useState(false); @@ -117,16 +120,24 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const loadSubagents = useCallback(async (signal?: AbortSignal): Promise => { // The resource layer's deadline abort must reach the wire — a signal dropped // here is a store that can only settle by race timeout. - const res = await fetch(`${apiBase}/api/subagent-models`, { signal }); - const response = await readJsonOrThrow<{ available?: string[]; chosen?: string[] }>(res, t("sub.loadFail")); - if (!response) throw new Error(t("sub.loadFail")); - const available = response.available ?? []; + const [rosterRes, fallbackRes] = await Promise.all([ + fetch(`${apiBase}/api/subagent-models`, { signal }), + fetch(`${apiBase}/api/subagent-model-fallback`, { signal }), + ]); + const response = await readJsonOrThrow<{ available?: string[]; chosen?: string[] }>(rosterRes, t("sub.loadFail")); + const fallbackResponse = await readJsonOrThrow<{ available?: string[]; models?: string[]; pollMs?: number }>(fallbackRes, t("sub.loadFail")); + if (!response || !fallbackResponse) throw new Error(t("sub.loadFail")); + const available = response.available ?? fallbackResponse.available ?? []; const availableSet = new Set(available); const next = { available, chosen: (response.chosen ?? []).filter(model => availableSet.has(model)), + fallback: (fallbackResponse.models ?? []).filter(model => availableSet.has(model)), + pollMs: fallbackResponse.pollMs ?? 60000, }; setChosen(next.chosen); + setFallback(next.fallback); + setFallbackPollMs(next.pollMs); writeSessionListCache(cacheKey, next); return next; }, [apiBase, cacheKey, t]); @@ -174,7 +185,7 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const d = await readJsonOrThrow<{ applied?: string[] }>(r, t("sub.saveFailed")); const applied = d?.applied ?? chosen; if (d?.applied) setChosen(d.applied); - writeSessionListCache(cacheKey, { available, chosen: applied }); + writeSessionListCache(cacheKey, { available, chosen: applied, fallback, pollMs: fallbackPollMs }); setOk(true); setStatus(t("sub.saved", { n: applied.length, cmd: "ocx sync" })); } catch (error) { @@ -186,6 +197,28 @@ export default function Subagents({ apiBase }: { apiBase: string }) { } }; + const saveFallback = async () => { + if (fallbackBusy) return; + setFallbackBusy(true); + try { + const r = await fetch(`${apiBase}/api/subagent-model-fallback`, { + method: "PUT", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ models: fallback, pollMs: fallbackPollMs }), + }); + const d = await readJsonOrThrow<{ models?: string[]; pollMs?: number }>(r, t("sub.fallbackSaveFailed")); + if (d?.models) setFallback(d.models); + if (d?.pollMs) setFallbackPollMs(d.pollMs); + setOk(true); + setStatus(t("sub.fallbackSaved")); + } catch (error) { + setOk(false); + setStatus(error instanceof Error && error.message ? error.message : t("sub.networkError")); + } finally { + setFallbackBusy(false); + } + }; + // The skeleton owns the live region while this resource has no content yet. if (state.showSkeleton && !snapshot) { return ; @@ -214,7 +247,13 @@ export default function Subagents({ apiBase }: { apiBase: string }) { busy={busy} onToggle={toggle} onMove={move} - onSave={() => { void save(); }} + onSave={() => { void save(); }} + fallback={fallback} + fallbackPollMs={fallbackPollMs} + fallbackBusy={fallbackBusy} + onFallbackChange={setFallback} + onFallbackPollMsChange={setFallbackPollMs} + onFallbackSave={() => { void saveFallback(); }} delegation={{ model: delegation.model, effort: delegation.effort, From 2e6ef45530353cdf78d08b39cc3d914ea0139ed9 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:22:48 +0900 Subject: [PATCH 135/221] docs: record lane C manual-chain roadmap [skip ci] --- devlog/_plan/260907_lane_c/000_plan.md | 7 + devlog/_plan/260907_lane_c/010_web_search.md | 155 +++++++ devlog/_plan/260907_lane_c/020_vision.md | 135 +++++++ devlog/_plan/260907_lane_c/030_health.md | 119 ++++++ devlog/_plan/260907_lane_c/040_desktop.md | 404 +++++++++++++++++++ devlog/_plan/260907_lane_c/050_fallback.md | 368 +++++++++++++++++ 6 files changed, 1188 insertions(+) create mode 100644 devlog/_plan/260907_lane_c/000_plan.md create mode 100644 devlog/_plan/260907_lane_c/010_web_search.md create mode 100644 devlog/_plan/260907_lane_c/020_vision.md create mode 100644 devlog/_plan/260907_lane_c/030_health.md create mode 100644 devlog/_plan/260907_lane_c/040_desktop.md create mode 100644 devlog/_plan/260907_lane_c/050_fallback.md diff --git a/devlog/_plan/260907_lane_c/000_plan.md b/devlog/_plan/260907_lane_c/000_plan.md new file mode 100644 index 0000000000..d26120ae29 --- /dev/null +++ b/devlog/_plan/260907_lane_c/000_plan.md @@ -0,0 +1,7 @@ +# Lane C release train roadmap + +Satisfy-spec HOTL, explicitly delegated by release-train main task. Goal: prepare five manual dependent PRs for main-session landing. No merge/release/publish/main/preview changes; no local tests, typecheck, build or install. All such checks NOT RUN. Remote Cross-platform CI dispatch lane=all at top head is the verifier. Stop after exact-head green CI, Astra review verdicts, screenshots, credit and SHA handoff; unresolved material blockers are reported with evidence. No user-specified token/cost/time bound. Tools: local scoped git/files, gh read/PR/push/CI, Astra explorer audits and browser inspection. New security findings stay in .tmp/lane-c. Main owns config-routes.ts; no edits there. Escalate cross-owner collisions; reclaim delegated slices after two distinct worker failures. + +Dependency order: roadmap → 3839 → 3841 → 3863 → 3860 → 3252/1533 → top CI and handoff. Lower-layer commit subjects include [skip ci]; stack:null. Every carry uses cherry-pick -x and source PR author Co-authored-by. Existing configuration field contracts are reused. Rollback is revert of a layer with descendant cascade, within main-authorized integration. Current source and read-only git/gh are evidence; no claimed local execution of product verifiers. Public original diffs are recorded in decade documents; private audit notes stay in scratch. + +Main steering: all gui/src/i18n/*.ts are append-only multiwriter; C adds namespaced keys at feature-section ends, never edits/deletes existing keys. Final cascade resolves append collisions. diff --git a/devlog/_plan/260907_lane_c/010_web_search.md b/devlog/_plan/260907_lane_c/010_web_search.md new file mode 100644 index 0000000000..ccb7217ea3 --- /dev/null +++ b/devlog/_plan/260907_lane_c/010_web_search.md @@ -0,0 +1,155 @@ +# 3839 implementation contract + +Carry public source patch with -x. Add deterministic 64KiB SSE and HTTP error-body regressions including cancel that never settles. Preserve complete prefix frames and discard incomplete tail. Tests use public run/parse APIs and controlled byte streams. + +Validation: local tests/typecheck/build/install NOT RUN by instruction. Read diff and source; top remote CI exercises changed test paths. Each conditional branch listed above is exercised by controlled fixtures; screenshot inspects GUI state. No new enforcement layer; existing API guards remain authoritative. + +## Public source diff (MODIFY/NEW paths) + +```diff +diff --git a/src/web-search/anthropic-executor.ts b/src/web-search/anthropic-executor.ts +index 1eb206afa..cd3893900 100644 +--- a/src/web-search/anthropic-executor.ts ++++ b/src/web-search/anthropic-executor.ts +@@ -5,7 +5,11 @@ import { CLAUDE_CODE_HEADERS, claudeCodeSessionId } from "../adapters/client-fin + import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort"; + import { sidecarEnter } from "../lib/sidecar-tracker"; + import { applyUpstreamRecoveryInit, fetchWithResetRetry } from "../lib/upstream-retry"; +-import type { WebSearchSource } from "./parse"; ++import { ++ MAX_SIDECAR_RESPONSE_BYTES, ++ cancelReaderWithoutWaiting, ++ type WebSearchSource, ++} from "./parse"; + import { BASE_INSTRUCTION, IMAGE_INSTRUCTION, type SidecarOutcome, type SidecarSettings } from "./executor"; + + /** Hardcoded per-turn search bound handed to the server tool (mirrors the loop's maxSearches intent). */ +@@ -17,6 +21,33 @@ function isRec(v: unknown): v is Record { + return !!v && typeof v === "object" && !Array.isArray(v); + } + ++/** Read at most `MAX_SIDECAR_RESPONSE_BYTES` of an untrusted upstream body, then stop reading. */ ++async function readBoundedText(res: Response): Promise { ++ if (!res.body) return ""; ++ const reader = res.body.getReader(); ++ const decoder = new TextDecoder(); ++ let out = ""; ++ let seen = 0; ++ try { ++ for (;;) { ++ const { done, value } = await reader.read(); ++ if (done) break; ++ const remaining = MAX_SIDECAR_RESPONSE_BYTES - seen; ++ const accepted = value.byteLength <= remaining ? value : value.subarray(0, remaining); ++ seen += accepted.byteLength; ++ out += decoder.decode(accepted, { stream: true }); ++ if (seen >= MAX_SIDECAR_RESPONSE_BYTES) { ++ cancelReaderWithoutWaiting(reader, "sidecar error body byte limit reached"); ++ break; ++ } ++ } ++ out += decoder.decode(); ++ } catch { ++ /* a failed error-body read must not mask the HTTP status we are about to report */ ++ } ++ return out; ++} ++ + /** + * Fold an Anthropic Messages SSE stream (a web_search_20250305 turn) into a WebSearchResult. + * +@@ -41,6 +72,7 @@ export async function parseAnthropicSidecarSSE(res: Response): Promise): void => { + const type = typeof data.type === "string" ? data.type : ""; +@@ -82,15 +114,27 @@ export async function parseAnthropicSidecarSSE(res: Response): Promise= MAX_SIDECAR_RESPONSE_BYTES) { ++ // Keep the frames already folded above, drop the unterminated tail, and do not wait on ++ // upstream teardown. ++ cancelReaderWithoutWaiting(reader, "sidecar response byte limit reached"); ++ buffer = ""; ++ break; ++ } + } + // Flush the decoder and process any final unterminated frame (a stream that ends without \n\n). + buffer = (buffer + decoder.decode()).replace(/\r\n/g, "\n"); +@@ -177,7 +221,9 @@ export async function runAnthropicWebSearch( + // (found investigating #1419). + const detachBodyGuard = cancelBodyOnAbort(res.body, linkedSignal.signal); + if (!res.ok) { +- const t = await res.text().catch(() => ""); ++ // Untrusted upstream error bodies are only used for an auth-failure message, so read a ++ // bounded prefix instead of buffering an arbitrarily large response. ++ const t = await readBoundedText(res); + detachBodyGuard(); + console.warn(`[web-search] anthropic sidecar HTTP ${res.status} for query "${query.slice(0, 80)}" (${Date.now() - t0}ms)`); + if (res.status === 401) { +diff --git a/src/web-search/parse.ts b/src/web-search/parse.ts +index 757c309f3..7ba5d2607 100644 +--- a/src/web-search/parse.ts ++++ b/src/web-search/parse.ts +@@ -193,7 +193,7 @@ function fromOutputArray(output: OutputItem[], seen: Set): WebSearchResu + return { text, sources }; + } + +-function cancelReaderWithoutWaiting( ++export function cancelReaderWithoutWaiting( + reader: ReadableStreamDefaultReader, + reason: string, + ): void { +diff --git a/tests/web-search/web-search-anthropic.test.ts b/tests/web-search/web-search-anthropic.test.ts +index f5b7f1df2..33f2616cc 100644 +--- a/tests/web-search/web-search-anthropic.test.ts ++++ b/tests/web-search/web-search-anthropic.test.ts +@@ -130,6 +130,27 @@ describe("parseAnthropicSidecarSSE", () => { + expect(out.error).toBeDefined(); + }); + ++ test("an unterminated frame cannot buffer the stream without bound", async () => { ++ // A sidecar that never emits a frame separator: without a cap the parser would accumulate ++ // the whole stream in memory before it could fold anything. ++ let produced = 0; ++ let cancelled = false; ++ const chunk = new TextEncoder().encode(`data: {"filler":"${"x".repeat(64 * 1024)}"}`); ++ const body = new ReadableStream({ ++ pull(c) { ++ if (produced > 8 * 1024 * 1024) { c.close(); return; } ++ produced += chunk.byteLength; ++ c.enqueue(chunk); ++ }, ++ cancel() { cancelled = true; }, ++ }); ++ const out = await parseAnthropicSidecarSSE(new Response(body, { status: 200 })); ++ expect(cancelled).toBe(true); ++ // The cap stops the read long before the producer would have finished on its own. ++ expect(produced).toBeLessThan(1024 * 1024); ++ expect(out.text).toBe(""); ++ }); ++ + test("empty results (content:[]) with answer text is a success, not an error", async () => { + const res = sseResponse([ + { type: "content_block_start", index: 0, content_block: { type: "web_search_tool_result", tool_use_id: "srvtoolu_3", content: [] } }, + +``` diff --git a/devlog/_plan/260907_lane_c/020_vision.md b/devlog/_plan/260907_lane_c/020_vision.md new file mode 100644 index 0000000000..9dab5d18e2 --- /dev/null +++ b/devlog/_plan/260907_lane_c/020_vision.md @@ -0,0 +1,135 @@ +# 3841 implementation contract + +Carry public source patch with -x. Add 64KiB HTTP error-body and non-settling cancel regressions. Preserve complete description frames before cap; discard unfinished frame even at exact cap; retain downstream clamp. No credential-policy changes. + +Validation: local tests/typecheck/build/install NOT RUN by instruction. Read diff and source; top remote CI exercises changed test paths. Each conditional branch listed above is exercised by controlled fixtures; screenshot inspects GUI state. No new enforcement layer; existing API guards remain authoritative. + +## Public source diff (MODIFY/NEW paths) + +```diff +diff --git a/src/vision/anthropic-describe.ts b/src/vision/anthropic-describe.ts +index 4f41017ef..280096f03 100644 +--- a/src/vision/anthropic-describe.ts ++++ b/src/vision/anthropic-describe.ts +@@ -10,6 +10,8 @@ import type { DescribeOutcome, VisionSettings } from "./describe"; + const ANTHROPIC_VISION_MAX_TOKENS = 1024; + const ALLOWED_IMAGE_MIME = new Set(["image/png", "image/jpeg", "image/jpg", "image/webp", "image/gif"]); + const MAX_IMAGE_BYTES = 20 * 1024 * 1024; ++/** Bound the sidecar SSE stream and its untrusted error body; the description is clamped downstream. */ ++const MAX_SIDECAR_RESPONSE_BYTES = 64 * 1024; + const DESCRIBE_INSTRUCTION = + "You are a vision describer for a text-only model that cannot see the image. Describe the image " + + "thoroughly and factually so that model can fully reason about it: transcribe any visible text " + +@@ -43,6 +45,34 @@ function buildImageBlock(imageUrl: string): { block?: AnthropicImageBlock; error + return { error: "unsupported image URL scheme (expected data: or https:)" }; + } + ++/** Read at most `MAX_SIDECAR_RESPONSE_BYTES` of an untrusted upstream body, then stop reading. */ ++async function readBoundedText(res: Response): Promise { ++ if (!res.body) return ""; ++ const reader = res.body.getReader(); ++ const decoder = new TextDecoder(); ++ let out = ""; ++ let seen = 0; ++ try { ++ for (;;) { ++ const { done, value } = await reader.read(); ++ if (done) break; ++ const remaining = MAX_SIDECAR_RESPONSE_BYTES - seen; ++ const accepted = value.byteLength <= remaining ? value : value.subarray(0, remaining); ++ seen += accepted.byteLength; ++ out += decoder.decode(accepted, { stream: true }); ++ if (seen >= MAX_SIDECAR_RESPONSE_BYTES) { ++ try { void reader.cancel("vision sidecar error body byte limit reached").catch(() => undefined); } ++ catch { /* best-effort body teardown */ } ++ break; ++ } ++ } ++ out += decoder.decode(); ++ } catch { ++ /* a failed error-body read must not mask the HTTP status we are about to report */ ++ } ++ return out; ++} ++ + /** Fold Anthropic Messages text deltas into one description. Malformed frames are ignored. */ + export async function parseAnthropicVisionSSE(res: Response): Promise { + if (!res.body) return { text: "", error: "anthropic vision sidecar returned no response body" }; +@@ -52,6 +82,7 @@ export async function parseAnthropicVisionSSE(res: Response): Promise { + let dataLine = ""; +@@ -76,12 +107,24 @@ export async function parseAnthropicVisionSSE(res: Response): Promise= MAX_SIDECAR_RESPONSE_BYTES) { ++ // Keep the frames folded above, drop the unterminated tail, and do not wait on teardown. ++ try { void reader.cancel("vision sidecar response byte limit reached").catch(() => undefined); } ++ catch { /* best-effort body teardown */ } ++ buffer = ""; ++ break; ++ } + } + buffer = (buffer + decoder.decode()).replace(/\r\n/g, "\n"); + if (buffer.trim()) processFrame(buffer); +@@ -164,7 +207,8 @@ export async function describeImageAnthropic( + { abortSignal: linkedSignal.signal, label: "vision-sidecar-anthropic" }, + ); + if (!res.ok) { +- const responseText = await res.text().catch(() => ""); ++ // The body is untrusted and only feeds one auth-failure message, so read a bounded prefix. ++ const responseText = await readBoundedText(res); + console.warn(`[vision] anthropic sidecar HTTP ${res.status} (${Date.now() - startedAt}ms)`); + if (res.status === 401) { + return { text: "", error: `anthropic vision sidecar auth failed: ${publicOAuthAuthenticationErrorMessage(new Error(responseText))}` }; +diff --git a/tests/vision/vision-anthropic.test.ts b/tests/vision/vision-anthropic.test.ts +index ee4b01b42..30ed17af9 100644 +--- a/tests/vision/vision-anthropic.test.ts ++++ b/tests/vision/vision-anthropic.test.ts +@@ -225,6 +225,27 @@ describe("Anthropic vision executor", () => { + expect(result).toEqual({ text: "first second" }); + }); + ++ test("an unterminated frame cannot buffer the stream without bound", async () => { ++ // A sidecar that never emits a frame separator: without a cap the parser accumulates the ++ // whole response in memory before it can fold anything. ++ let produced = 0; ++ let cancelled = false; ++ const chunk = new TextEncoder().encode(`data: {"filler":"${"x".repeat(64 * 1024)}"}`); ++ const body = new ReadableStream({ ++ pull(c) { ++ if (produced > 8 * 1024 * 1024) { c.close(); return; } ++ produced += chunk.byteLength; ++ c.enqueue(chunk); ++ }, ++ cancel() { cancelled = true; }, ++ }); ++ const out = await parseAnthropicVisionSSE(new Response(body, { status: 200 })); ++ expect(cancelled).toBe(true); ++ // The cap stops the read long before the producer would have finished on its own. ++ expect(produced).toBeLessThan(1024 * 1024); ++ expect(out.text).toBe(""); ++ }); ++ + test("malformed and terminal-error streams degrade to explicit errors", async () => { + const malformed = await parseAnthropicVisionSSE(sseResponse(["{not-json", { type: "message_stop" }])); + expect(malformed.text).toBe(""); + +``` diff --git a/devlog/_plan/260907_lane_c/030_health.md b/devlog/_plan/260907_lane_c/030_health.md new file mode 100644 index 0000000000..2e01551e34 --- /dev/null +++ b/devlog/_plan/260907_lane_c/030_health.md @@ -0,0 +1,119 @@ +# 3863 implementation contract + +Carry with -x excluding config-routes.ts. getStartupHealthSnapshot returns fresh cached value unchanged; stale/empty read schedules refresh and returns immediately. Catch rejected or synchronously thrown detached probe and retain stale conservative health; invalidation generation cannot overwrite newer reading. Replace 100ms production settings assertion with controlled probe fixtures. Exact route wiring remains main responsibility. + +Validation: local tests/typecheck/build/install NOT RUN by instruction. Read diff and source; top remote CI exercises changed test paths. Each conditional branch listed above is exercised by controlled fixtures; screenshot inspects GUI state. No new enforcement layer; existing API guards remain authoritative. + +## Public source diff (MODIFY/NEW paths) + +```diff +diff --git a/src/server/management/config-routes.ts b/src/server/management/config-routes.ts +index 4d551a886..9ddd02300 100644 +--- a/src/server/management/config-routes.ts ++++ b/src/server/management/config-routes.ts +@@ -107,7 +107,7 @@ import type { PersistedUsageAttempt } from "../../usage/log"; + import { isAllowedRequestOrigin, jsonResponse, providerManagementConfigError, publicProviderBaseUrl, safeConfigDTO } from "../auth-cors"; + import { withProviderServiceTierDTO } from "./provider-capability-config"; + import { applySystemEnvToggle } from "../system-env"; +-import { getCachedStartupHealth, invalidateStartupHealthCache } from "../startup-health-cache"; ++import { getCachedStartupHealth, getStartupHealthSnapshot, invalidateStartupHealthCache } from "../startup-health-cache"; + import { runWindowsTrayAction } from "../windows-tray-control"; + import { runStartupInstallAction, type StartupInstallAction } from "../startup-action-control"; + import { displayCodexRuntimePath, effortClampAppliesToRuntime, loadLastEffortClamp, resolveCodexRuntime } from "../../codex/runtime"; +@@ -329,7 +329,9 @@ export async function handleConfigRoutes(ctx: ManagementContext): Promise Promise; + } + ++/** ++ * Return the last completed probe immediately and refresh it in the background. ++ * ++ * Settings are consumed by several dashboard controls. They must not block on a ++ * Windows service-manager probe; the dedicated /api/startup-health route owns ++ * the fresh, bounded diagnostic read. ++ */ ++export function getStartupHealthSnapshot( ++ config: Pick, ++ deps: StartupHealthCacheDeps = {}, ++): StartupHealth { ++ const now = deps.now ?? Date.now; ++ if (!cached || now() - cached.timestamp >= CACHE_TTL_MS) refreshInBackground(config, deps); ++ return cached ? markStartupHealthDiagnosticStale(cached.value) : conservativeFallback(config); ++} ++ + export function markStartupHealthDiagnosticStale(value: StartupHealth): StartupHealth { + if (!value.localRoutingDependency) return { ...value, diagnosticStale: true }; + return { +diff --git a/tests/service/autostart-health.test.ts b/tests/service/autostart-health.test.ts +index 639f1b34c..48bb7b539 100644 +--- a/tests/service/autostart-health.test.ts ++++ b/tests/service/autostart-health.test.ts +@@ -3,7 +3,7 @@ import { deriveStartupHealth, formatStartupRoutingDetail, startupHealthSummary } + import { unusedProxyWarningLines } from "../../src/cli/status"; + import { classifyCodexRouting, hasInjectedCodexRouting } from "../../src/codex/inject"; + import { handleManagementAPI } from "../../src/server/management-api"; +-import { getCachedStartupHealth, invalidateStartupHealthCache, markStartupHealthDiagnosticStale } from "../../src/server/startup-health-cache"; ++import { getCachedStartupHealth, getStartupHealthSnapshot, invalidateStartupHealthCache, markStartupHealthDiagnosticStale } from "../../src/server/startup-health-cache"; + import type { OcxConfig } from "../../src/types"; + + const base = { +@@ -277,6 +277,43 @@ describe("Codex startup health", () => { + await pendingProbe; + invalidateStartupHealthCache(); + }); ++ ++ test("settings snapshot starts a probe without waiting for it", async () => { ++ invalidateStartupHealthCache(); ++ let releaseProbe!: (value: ReturnType) => void; ++ const pendingProbe = new Promise>(resolve => { ++ releaseProbe = resolve; ++ }); ++ ++ const health = getStartupHealthSnapshot( ++ { codexAutoStart: true }, ++ { probe: async () => pendingProbe }, ++ ); ++ ++ expect(health.diagnosticStale).toBe(true); ++ releaseProbe(deriveStartupHealth({ ...base, routingKind: "native" })); ++ await pendingProbe; ++ invalidateStartupHealthCache(); ++ }); ++ ++ test("settings GET uses the non-blocking startup-health snapshot in production", async () => { ++ invalidateStartupHealthCache(); ++ const url = new URL("http://localhost/api/settings"); ++ ++ const response = await Promise.race([ ++ handleManagementAPI( ++ new Request(url), ++ url, ++ { port: 10100, providers: {}, defaultProvider: "openai", codexAutoStart: true } as OcxConfig, ++ ), ++ new Promise(resolve => setTimeout(() => resolve(null), 100)), ++ ]); ++ ++ expect(response?.status).toBe(200); ++ const body = await response!.json() as { startupHealth?: { diagnosticStale?: boolean } }; ++ expect(body.startupHealth?.diagnosticStale).toBe(true); ++ invalidateStartupHealthCache(); ++ }); + }); + import { ManagementRequest as Request } from "../helpers/management-auth"; + + +``` diff --git a/devlog/_plan/260907_lane_c/040_desktop.md b/devlog/_plan/260907_lane_c/040_desktop.md new file mode 100644 index 0000000000..ad7fb60177 --- /dev/null +++ b/devlog/_plan/260907_lane_c/040_desktop.md @@ -0,0 +1,404 @@ +# 3860 implementation contract + +Carry source patch plus skipped-sync correction with -x. Default false/absent OFF, true remains true; persist preference before sync and surface sync failures. All nine locales and existing screenshot. Independent auth boundary review confirms remote admission/upstream credentials unchanged. + +Validation: local tests/typecheck/build/install NOT RUN by instruction. Read diff and source; top remote CI exercises changed test paths. Each conditional branch listed above is exercised by controlled fixtures; screenshot inspects GUI state. No new enforcement layer; existing API guards remain authoritative. + +## Public source diff (MODIFY/NEW paths) + +```diff +diff --git a/docs-site/src/content/docs/guides/codex-integration.md b/docs-site/src/content/docs/guides/codex-integration.md +index 7d66e72c3..ff2df04fd 100644 +--- a/docs-site/src/content/docs/guides/codex-integration.md ++++ b/docs-site/src/content/docs/guides/codex-integration.md +@@ -215,6 +215,15 @@ HTTP/SSE. + + ### Authless Codex Desktop (opt-in) + ++In **Dashboard → Overview**, **Open Codex without signing in** controls this existing ++opt-in preference. The switch defaults to **off** when the setting is absent or false; ++an existing explicit `codexDesktopAuthless: true` stays enabled. The dashboard saves ++the preference and runs a full sync. Restart Codex Desktop after changing it. ++If synchronization fails, the saved preference remains and the dashboard shows the error; ++retry **Sync** before restarting. Account-gated Desktop features may be unavailable ++when enabled. Upstream credentials, local eligibility, remote admission authentication ++and user-owned gateway settings retain their existing requirements. ++ + Codex Desktop shows its ChatGPT login screen whenever the active provider requires OpenAI auth. If + your OpenCodex setup never uses ChatGPT credentials (routed providers only, or a blocked + `chatgpt.com`), you can opt out of that gate: +diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts +index 5faab4b35..495104bd4 100644 +--- a/gui/src/i18n/de.ts ++++ b/gui/src/i18n/de.ts +@@ -299,6 +299,8 @@ export const de: Record = { + "models.staleBanner": "Codex zeigt eine ältere Modellliste als dieser Katalog. Starte Codex neu, um sie neu zu laden.", + "dash.codexAutoStart": "opencodex mit Codex starten", + "dash.codexAutoStartHint": "Erlaubt einem installierten Launcher-Shim, ocx ensure auszuführen. Diese Einstellung installiert keinen Neustartschutz; prüfe den effektiven Zustand unter Startsicherheit.", ++ "dash.codexDesktopAuthless": "Codex ohne Anmeldung öffnen", ++ "dash.codexDesktopAuthlessHint": "Standardmäßig aus. Überspringt die separate Desktop-Anmeldung bei geeigneten lokalen Verbindungen. Zugangsdaten für den Anbieter bleiben erforderlich. Codex nach einer Änderung neu starten. Kontogebundene Desktop-Funktionen können fehlen.", + "dash.searchModel": "Such-Sidecar-Modell", + "dash.searchModelHint": "Modell für web_search bei nicht über OpenAI gerouteten Modellen. Erfordert ChatGPT-Login.", + "dash.searchReasoning": "Such-Reasoning-Aufwand", +diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts +index c71208942..22a380785 100644 +--- a/gui/src/i18n/en.ts ++++ b/gui/src/i18n/en.ts +@@ -311,6 +311,8 @@ export const en = { + "models.staleBanner": "Codex is showing an older model list than this catalog. Restart Codex to reload it.", + "dash.codexAutoStart": "Start opencodex with Codex", + "dash.codexAutoStartHint": "Allows an installed launcher shim to run ocx ensure. This setting does not install restart protection; check Startup safety for the effective state.", ++ "dash.codexDesktopAuthless": "Open Codex without signing in", ++ "dash.codexDesktopAuthlessHint": "Off by default. Skip the separate Desktop sign-in for eligible local connections. Upstream credentials are still required. Restart Codex after changing this setting. Account-gated Desktop features may be unavailable.", + "dash.searchModel": "Search sidecar model", + "dash.searchModelHint": "Model used for web_search on non-OpenAI routed models. Requires ChatGPT login.", + "dash.searchReasoning": "Search reasoning effort", +diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts +index e1b3519ef..9f0f26517 100644 +--- a/gui/src/i18n/fr.ts ++++ b/gui/src/i18n/fr.ts +@@ -301,6 +301,8 @@ export const fr: Record = { + "models.staleBanner": "Codex affiche une liste de modèles plus ancienne que ce catalogue. Redémarrez Codex pour la recharger.", + "dash.codexAutoStart": "Démarrer opencodex avec Codex", + "dash.codexAutoStartHint": "Permet à un mécanisme de lancement installé d’exécuter ocx ensure. Ce réglage n’installe pas de protection au redémarrage ; consultez Sécurité du démarrage pour connaître l’état effectif.", ++ "dash.codexDesktopAuthless": "Ouvrir Codex sans se connecter", ++ "dash.codexDesktopAuthlessHint": "Désactivé par défaut. Ignore la connexion Desktop séparée pour les connexions locales admissibles. Les identifiants du fournisseur restent nécessaires. Redémarrez Codex après toute modification. Certaines fonctions Desktop liées au compte peuvent être indisponibles.", + "dash.searchModel": "Modèle auxiliaire de recherche", + "dash.searchModelHint": "Modèle utilisé pour web_search sur les modèles routés autres qu’OpenAI. Nécessite une connexion à ChatGPT.", + "dash.searchReasoning": "Effort de raisonnement pour la recherche", +diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts +index cf9483158..55a6fe249 100644 +--- a/gui/src/i18n/ja.ts ++++ b/gui/src/i18n/ja.ts +@@ -308,6 +308,8 @@ export const ja: Record = { + "models.staleBanner": "Codex はこのカタログより古いモデル一覧を表示しています。Codex を再起動すると読み直されます。", + "dash.codexAutoStart": "Codex と一緒に opencodex を起動", + "dash.codexAutoStartHint": "インストール済み launcher shim に ocx ensure の実行を許可します。この設定だけでは再起動保護はインストールされません。起動安全性で実際の状態を確認してください。", ++ "dash.codexDesktopAuthless": "ログインせずに Codex を開く", ++ "dash.codexDesktopAuthlessHint": "既定ではオフです。対象のローカル接続で Desktop の個別ログインを省略します。上流プロバイダーの認証情報は引き続き必要です。変更後は Codex を再起動してください。アカウントに依存する Desktop 機能が利用できない場合があります。", + "dash.searchModel": "検索サイドカーモデル", + "dash.searchModelHint": "非 OpenAI ルーティングモデルで web_search に使うモデル。ChatGPT ログインが必要です。", + "dash.searchReasoning": "検索の推論負荷", +diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts +index c1959482b..19285b150 100644 +--- a/gui/src/i18n/ko.ts ++++ b/gui/src/i18n/ko.ts +@@ -303,6 +303,8 @@ export const ko: Record = { + "models.staleBanner": "Codex가 이 카탈로그보다 오래된 모델 목록을 보여주고 있습니다. Codex를 재시작하면 새로 읽습니다.", + "dash.codexAutoStart": "Codex 실행 시 opencodex 시작", + "dash.codexAutoStartHint": "설치된 launcher shim이 ocx ensure를 실행하도록 허용합니다. 이 설정은 재부팅 보호를 설치하지 않으므로 시작 안전성에서 실제 상태를 확인하세요.", ++ "dash.codexDesktopAuthless": "로그인 없이 Codex 열기", ++ "dash.codexDesktopAuthlessHint": "기본값은 꺼짐입니다. 지원되는 로컬 연결에서 별도의 Desktop 로그인을 건너뜁니다. 업스트림 인증 정보는 여전히 필요합니다. 변경 후 Codex를 다시 시작하세요. 계정에 연결된 Desktop 기능을 사용하지 못할 수 있습니다.", + "dash.searchModel": "서치 사이드카 모델", + "dash.searchModelHint": "비-OpenAI 라우팅 모델의 web_search에 사용되는 모델입니다. ChatGPT 로그인 필요.", + "dash.searchReasoning": "서치 추론 강도", +diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts +index 0109f5ebd..87704912a 100644 +--- a/gui/src/i18n/ru.ts ++++ b/gui/src/i18n/ru.ts +@@ -308,6 +308,8 @@ export const ru: Record = { + "models.staleBanner": "Codex показывает список моделей старее этого каталога. Перезапустите Codex, чтобы перечитать его.", + "dash.codexAutoStart": "Запускать opencodex вместе с Codex", + "dash.codexAutoStartHint": "Разрешает установленному launcher shim выполнять ocx ensure. Эта настройка не устанавливает защиту перезапуска; проверьте фактическое состояние в разделе безопасности запуска.", ++ "dash.codexDesktopAuthless": "Открывать Codex без входа", ++ "dash.codexDesktopAuthlessHint": "По умолчанию выключено. Пропускает отдельный вход в Desktop для допустимых локальных подключений. Учётные данные провайдера по-прежнему нужны. После изменения перезапустите Codex. Функции Desktop, связанные с аккаунтом, могут быть недоступны.", + "dash.searchModel": "Модель сайдкара поиска", + "dash.searchModelHint": "Модель, используемая для web_search на маршрутизируемых моделях, отличных от OpenAI. Требуется вход в аккаунт ChatGPT.", + "dash.searchReasoning": "Уровень рассуждений для поиска", +diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts +index fa8b8e9c2..807eeae32 100644 +--- a/gui/src/i18n/tr.ts ++++ b/gui/src/i18n/tr.ts +@@ -309,6 +309,8 @@ export const tr: Record = { + "models.staleBanner": "Codex, bu katalogdan daha eski bir model listesi gösteriyor. Yeniden okumak için Codex'i yeniden başlatın.", + "dash.codexAutoStart": "opencodex'i Codex ile başlat", + "dash.codexAutoStartHint": "Yüklü bir shim'in ocx ensure çalıştırmasına izin verir. Arka plan servisi veya yeniden başlatma koruması kurmaz; sistem durumu için Başlatma Güvenliği'ne bakın.", ++ "dash.codexDesktopAuthless": "Codex’i oturum açmadan başlat", ++ "dash.codexDesktopAuthlessHint": "Varsayılan olarak kapalıdır. Uygun yerel bağlantılarda ayrı Desktop oturum açma adımını atlar. Sağlayıcı kimlik bilgileri yine gereklidir. Değişiklikten sonra Codex’i yeniden başlatın. Hesaba bağlı Desktop özellikleri kullanılamayabilir.", + "dash.searchModel": "Arama yan araç modeli", + "dash.searchModelHint": "OpenAI dışı yönlendirilen modellerde web_search için kullanılan model. ChatGPT girişi gerektirir.", + "dash.searchReasoning": "Arama akıl yürütme çabası", +diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts +index 3bc246543..62e1f0711 100644 +--- a/gui/src/i18n/zh-TW.ts ++++ b/gui/src/i18n/zh-TW.ts +@@ -200,6 +200,8 @@ export const zhTW: Record = { + "models.staleBanner": "Codex 顯示的模型清單比目前的目錄舊。重新啟動 Codex 即可重新讀取。", + "dash.codexAutoStart": "隨 Codex 啟動 opencodex", + "dash.codexAutoStartHint": "允許已安裝的 launcher shim 執行 ocx ensure。此設定不會安裝重新啟動保護;請在啟動安全中檢查實際狀態。", ++ "dash.codexDesktopAuthless": "無需登入即可開啟 Codex", ++ "dash.codexDesktopAuthlessHint": "預設關閉。為符合條件的本機連線略過獨立的 Desktop 登入。仍需上游供應商憑證。變更後請重新啟動 Codex。依賴帳戶的 Desktop 功能可能無法使用。", + "dash.searchModel": "搜尋附屬模型", + "dash.searchModelHint": "用於非 OpenAI 路由模型的 web_search 的模型。需要 ChatGPT 登入。", + "dash.searchReasoning": "搜尋推理強度", +diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts +index b10c48688..994691442 100644 +--- a/gui/src/i18n/zh.ts ++++ b/gui/src/i18n/zh.ts +@@ -303,6 +303,8 @@ export const zh: Record = { + "models.staleBanner": "Codex 显示的模型列表比当前目录旧。重启 Codex 即可重新读取。", + "dash.codexAutoStart": "随 Codex 启动 opencodex", + "dash.codexAutoStartHint": "允许已安装的 launcher shim 运行 ocx ensure。此设置不会安装重启保护;请在启动安全中检查实际状态。", ++ "dash.codexDesktopAuthless": "无需登录即可打开 Codex", ++ "dash.codexDesktopAuthlessHint": "默认关闭。为符合条件的本地连接跳过单独的 Desktop 登录。仍需上游提供商凭据。更改后请重启 Codex。依赖账户的 Desktop 功能可能不可用。", + "dash.searchModel": "搜索附属模型", + "dash.searchModelHint": "用于非 OpenAI 路由模型的 web_search 的模型。需要 ChatGPT 登录。", + "dash.searchReasoning": "搜索推理强度", +diff --git a/gui/src/pages/dashboard-overview-sections.tsx b/gui/src/pages/dashboard-overview-sections.tsx +index 8da531f97..6606c4f56 100644 +--- a/gui/src/pages/dashboard-overview-sections.tsx ++++ b/gui/src/pages/dashboard-overview-sections.tsx +@@ -163,7 +163,7 @@ export function DashboardInjectionPanel({ d }: { apiBase: string; d: Dash }) { + + export function DashboardMaintenancePanel({ d }: { d: Dash }) { + const { +- t, runSync, syncing, updateTriggerRef, openUpdateDialog, updateLoading, updateOpen, ++ t, runSync, syncing, settingsSaving, updateTriggerRef, openUpdateDialog, updateLoading, updateOpen, + syncResult, syncError, updateJob, reconnecting, clearSyncFeedback, + } = d; + const syncHoldsWarning = !!syncResult && ( +@@ -211,7 +211,7 @@ export function DashboardMaintenancePanel({ d }: { d: Dash }) { +
{t("dash.syncModelsHint")}
+
+
+- +
+ + ++
++
++
++
{t("dash.codexDesktopAuthless")}
++
{t("dash.codexDesktopAuthlessHint")}
++ {settings?.catalogRefreshPending &&
{t("codexAuth.catalogRefreshPending")}
} ++
++ ++
++
++ +
+ {/* Both sidecar cards wear the DashboardInjectionPanel shell: the PANEL is + the flex row, copy left, controls right. */} +diff --git a/gui/src/pages/dashboard-shared.ts b/gui/src/pages/dashboard-shared.ts +index 0793a7def..d24051028 100644 +--- a/gui/src/pages/dashboard-shared.ts ++++ b/gui/src/pages/dashboard-shared.ts +@@ -48,6 +48,8 @@ export interface ProviderInfo { name: string; adapter: string; baseUrl: string; + export interface ModelInfo { id: string; provider: string; namespaced: string; owned_by?: string; reasoningEfforts?: string[] } + export interface SettingsData { + codexAutoStart: boolean; ++ codexDesktopAuthless?: boolean; ++ catalogRefreshPending?: boolean; + /** Whether a login may open a browser on the machine running the proxy. */ + oauthOpenBrowser?: boolean; + port: number; +diff --git a/gui/src/pages/use-dashboard-data.ts b/gui/src/pages/use-dashboard-data.ts +index 6f84950ce..6da776ea1 100644 +--- a/gui/src/pages/use-dashboard-data.ts ++++ b/gui/src/pages/use-dashboard-data.ts +@@ -607,23 +607,24 @@ export function useDashboardData(apiBase: string) { + finally { setInjectionSaving(false); } + }; + +- const toggleCodexAutoStart = async () => { +- if (!settings || settingsSaving) return; +- const next = !settings.codexAutoStart; ++ const toggleCodexSetting = async (key: "codexAutoStart" | "codexDesktopAuthless") => { ++ if (!settings || settingsSaving || syncing) return; ++ const next = !(settings[key] ?? (key === "codexAutoStart")); + setSettingsSaving(true); + settingsMutationInFlightRef.current = true; +- setSettings({ ...settings, codexAutoStart: next }); ++ setSettings({ ...settings, [key]: next }); + try { + const res = await fetch(`${apiBase}/api/settings`, { + method: "PUT", + headers: { "Content-Type": "application/json" }, +- body: JSON.stringify({ codexAutoStart: next }), ++ body: JSON.stringify({ [key]: next }), + }); +- const data = await requireJson<{ codexAutoStart: boolean; startupHealth?: SettingsData["startupHealth"] }>(res, "save failed"); ++ const data = await requireJson(res, "save failed"); + settingsMutationEpochRef.current += 1; +- setSettings(prev => prev ? { ...prev, codexAutoStart: data.codexAutoStart, startupHealth: data.startupHealth ?? prev.startupHealth } : prev); ++ setSettings(prev => prev ? { ...prev, [key]: data[key], catalogRefreshPending: key === "codexDesktopAuthless" ? data.catalogRefreshPending : prev.catalogRefreshPending, startupHealth: data.startupHealth ?? prev.startupHealth } : prev); ++ if (key === "codexDesktopAuthless") await runSync(); + } catch { +- setSettings(prev => prev ? { ...prev, codexAutoStart: !next } : prev); ++ setSettings(prev => prev ? { ...prev, [key]: !next } : prev); + setError(true); + } finally { + settingsMutationInFlightRef.current = false; +@@ -631,6 +632,9 @@ export function useDashboardData(apiBase: string) { + } + }; + ++ const toggleCodexAutoStart = () => toggleCodexSetting("codexAutoStart"); ++ const toggleCodexDesktopAuthless = () => toggleCodexSetting("codexDesktopAuthless"); ++ + // Clears the sync result/error in this hook. The dashboard toast owns its own dismissal + // timer but must publish the dismissal here: syncResult/syncError live above the dashboard + // tabs, so a component-local flag alone would let a stale result remount as a fresh toast +@@ -649,6 +653,7 @@ export function useDashboardData(apiBase: string) { + const res = await fetch(`${apiBase}/api/sync`, { method: "POST" }); + const data = await requireJson(res, "sync failed"); + setSyncResult(data); ++ setSettings(prev => prev ? { ...prev, catalogRefreshPending: false } : prev); + if (data.projectConfigGrouped) setProjectConfigWarnings(data.projectConfigGrouped); + } catch (err) { + setSyncError(err instanceof Error ? err.message : String(err)); +@@ -789,7 +794,7 @@ export function useDashboardData(apiBase: string) { + effortCapHelpTriggerRef, updateTriggerRef, maHelpTriggerRef, shadowCallHelpTriggerRef, + effortCapHelpDialogRef, updateDialogRef, maHelpDialogRef, shadowCallHelpDialogRef, + filteredGroups, sidecarModels, visionModels, +- saveSidecar, saveShadowCall, switchMaMode, toggleCodexAutoStart, runSync, clearSyncFeedback, ++ saveSidecar, saveShadowCall, switchMaMode, toggleCodexAutoStart, toggleCodexDesktopAuthless, runSync, clearSyncFeedback, + fetchUpdateCheck, closeUpdateDialog, openUpdateDialog, changeUpdateChannel, runUpdate, + }; + } +diff --git a/gui/tests/vision-sidecar-dashboard.test.tsx b/gui/tests/vision-sidecar-dashboard.test.tsx +index dc762de58..994a40912 100644 +--- a/gui/tests/vision-sidecar-dashboard.test.tsx ++++ b/gui/tests/vision-sidecar-dashboard.test.tsx +@@ -12,7 +12,7 @@ import { LanguageProvider } from "../src/i18n/provider"; + import { DashboardSidecarPanels } from "../src/pages/dashboard-overview-sections"; + import type { SidecarData, SidecarPatch } from "../src/pages/dashboard-shared"; + import { mergeSidecarSetting } from "../src/pages/dashboard-shared"; +-import type { useDashboardData } from "../src/pages/use-dashboard-data"; ++import { useDashboardData } from "../src/pages/use-dashboard-data"; + + const globals = ["document", "window", "navigator", "IS_REACT_ACT_ENVIRONMENT"] as const; + let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; +@@ -382,4 +382,79 @@ test("model and reasoning saves still omit enabled, limit, and timeout", async ( + expect(patches).toHaveLength(2); + expect(patches[1]).toEqual({ vision: { reasoning: "high" } }); + assertVisionControlFieldsOmitted(patches[1]!); +-}); +\ No newline at end of file ++}); ++ ++test("Desktop login switch defaults off, preserves explicit opt-in, and disables while saving", async () => { ++ const { d } = harness(); ++ let clicks = 0; ++ d.toggleCodexDesktopAuthless = async () => { clicks += 1; }; ++ d.settings = { codexAutoStart: true, port: 10100, hostname: "127.0.0.1" }; ++ await mount(d); ++ const toggle = () => host.querySelector(`button[aria-label="${en["dash.codexDesktopAuthless"]}"]`)!; ++ expect(toggle().getAttribute("aria-pressed")).toBe("false"); ++ d.settings.codexDesktopAuthless = true; ++ await mount(d); ++ expect(toggle().getAttribute("aria-pressed")).toBe("true"); ++ await act(async () => { toggle().click(); }); ++ expect(clicks).toBe(1); ++ d.settings.codexDesktopAuthless = false; ++ d.settings.catalogRefreshPending = true; ++ d.settingsSaving = true; ++ await mount(d); ++ expect(toggle().getAttribute("aria-pressed")).toBe("false"); ++ expect(toggle().disabled).toBe(true); ++ expect(host.textContent).toContain(en["codexAuth.catalogRefreshPending"]); ++}); ++ ++ ++test.each([undefined, false, true])("Desktop login preference %s persists before full sync; sync failure keeps the saved preference", async (initial) => { ++ const originalFetch = globalThis.fetch; ++ const writes: Array<{ path: string; body: unknown }> = []; ++ let latest: Dash | undefined; ++ let saved = initial; ++ const apiBase = `/authless-test-${String(initial)}`; ++ globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { ++ const path = String(input); ++ if (init?.method === "PUT") { ++ const body = JSON.parse(String(init.body)); ++ writes.push({ path, body }); ++ if (body.codexDesktopAuthless !== undefined) { ++ saved = body.codexDesktopAuthless; ++ return Response.json({ codexDesktopAuthless: saved, catalogRefreshPending: true }); ++ } ++ return Response.json({ codexAutoStart: body.codexAutoStart, catalogRefreshPending: false }); ++ } ++ if (path.endsWith("/api/sync")) { ++ writes.push({ path, body: null }); ++ return Response.json({ error: "sync unavailable" }, { status: 503 }); ++ } ++ if (path.endsWith("/api/settings")) { ++ return Response.json({ codexAutoStart: true, codexDesktopAuthless: saved, port: 10100, hostname: "127.0.0.1" }); ++ } ++ return Response.json({}, { status: 503 }); ++ }) as typeof fetch; ++ function Harness() { latest = useDashboardData(apiBase); return null; } ++ try { ++ const { createRoot } = await import("react-dom/client"); ++ await act(async () => { ++ root = createRoot(host); ++ root.render(); ++ }); ++ expect(latest?.settings?.codexDesktopAuthless).toBe(initial); ++ await act(async () => { await latest!.toggleCodexDesktopAuthless(); }); ++ expect(writes).toEqual([ ++ { path: `${apiBase}/api/settings`, body: { codexDesktopAuthless: !initial } }, ++ { path: `${apiBase}/api/sync`, body: null }, ++ ]); ++ expect(latest?.settings?.codexDesktopAuthless).toBe(!initial); ++ expect(latest?.syncError).toBe("sync unavailable"); ++ expect(latest?.settings?.catalogRefreshPending).toBe(true); ++ await act(async () => { await latest!.toggleCodexAutoStart(); }); ++ expect(latest?.settings?.codexAutoStart).toBe(false); ++ expect(latest?.settings?.catalogRefreshPending).toBe(true); ++ } finally { ++ await act(async () => { root?.unmount(); }); ++ root = null; ++ globalThis.fetch = originalFetch; ++ } ++}); +diff --git a/tests/codex-integration/codex-inject.test.ts b/tests/codex-integration/codex-inject.test.ts +index 84ac5f67b..b6be3c2f6 100644 +--- a/tests/codex-integration/codex-inject.test.ts ++++ b/tests/codex-integration/codex-inject.test.ts +@@ -31,8 +31,8 @@ describe("Codex config injection", () => { + }); + + describe("authless Codex Desktop opt-in (#1107)", () => { +- test("default target on loopback stays Design B and byte-identical", () => { +- const target = standaloneCodexRoutingTarget(10100, {}); ++ test.each([undefined, false])("disabled preference %s on loopback stays Design B and byte-identical", (codexDesktopAuthless) => { ++ const target = standaloneCodexRoutingTarget(10100, { codexDesktopAuthless }); + expect(target.desktopAuthless).toBeUndefined(); + expect(buildProfileFile(target, null)).toBe(buildProfileFile(10100, null)); + expect(buildProviderTableBlock(target)).toContain("requires_openai_auth = true"); + +``` + +Audit amendment: clear catalogRefreshPending only if sync status is affirmative success, not HTTP 200 skipped. Add skipped/no-write regression. diff --git a/devlog/_plan/260907_lane_c/050_fallback.md b/devlog/_plan/260907_lane_c/050_fallback.md new file mode 100644 index 0000000000..6bf165a96c --- /dev/null +++ b/devlog/_plan/260907_lane_c/050_fallback.md @@ -0,0 +1,368 @@ +# 3252 implementation contract + +Carry source commits with -x. Preserve configured fallback models absent from availability. Add focused GUI tests for add/remove/reorder/save and unavailable model round-trip. Reuse existing /api/v2 (enabled, multiAgentMode, keepNativeChatGptOnV1) and report recovery enabled/eligibility as unknown when the server does not expose it, never fabricate recovery settings state for contextual native-parent/routed-child V2 guidance. Never infer all workflows are native; warn conditionally, show disabled/eligible/experimental/unknown state truthfully, link issue 92. No roster-reuse switch. Update all locales and codex-integration docs; actual UI screenshot. New PR body is valid Markdown, removes unsupported roster-switch claims. + +Validation: local tests/typecheck/build/install NOT RUN by instruction. Read diff and source; top remote CI exercises changed test paths. Each conditional branch listed above is exercised by controlled fixtures; screenshot inspects GUI state. No new enforcement layer; existing API guards remain authoritative. + +## Public source diff (MODIFY/NEW paths) + +```diff +diff --git a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx +index 46c0447a7..7c3b0e942 100644 +--- a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx ++++ b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx +@@ -28,6 +28,13 @@ export interface SubagentDelegationSectionProps { + onUltraModeSave: (patch: UltraModePatch) => void; + ultraLoadFailed: boolean; + onUltraModeRetry: () => void; ++ fallback: string[]; ++ fallbackPollMs: number; ++ fallbackBusy: boolean; ++ availableModels: string[]; ++ onFallbackChange: (models: string[]) => void; ++ onFallbackPollMsChange: (pollMs: number) => void; ++ onFallbackSave: () => void; + } + + export default function SubagentDelegationSection({ +@@ -44,6 +51,7 @@ export default function SubagentDelegationSection({ + onUltraModeSave, + ultraLoadFailed, + onUltraModeRetry, ++ fallback, fallbackPollMs, fallbackBusy, availableModels, onFallbackChange, onFallbackPollMsChange, onFallbackSave, + }: SubagentDelegationSectionProps) { + const t = useT(); + // A present empty/whitespace hint is an upstream override that suppresses the +@@ -97,6 +105,31 @@ export default function SubagentDelegationSection({ +
+ + ++
++
++
{t("sub.fallbackLabel")}
++
{t("sub.fallbackHint")}
++
++
++ {fallback.map((modelName, index) => ( ++
++ {index + 1}. {modelName} ++ ++ ++ ++
++ ))} ++ ++ ++ ++
++
++ +
+
+
{t("dash.syncCodexSubagentDefaults")}
+diff --git a/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx b/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx +index a22bd2a30..30b722b2b 100644 +--- a/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx ++++ b/gui/src/components/subagents-workspace/SubagentsWorkspace.tsx +@@ -37,6 +37,12 @@ export interface SubagentsWorkspaceProps { + onToggle: (m: string) => void; + onMove: (i: number, dir: -1 | 1) => void; + onSave: () => void; ++ fallback: string[]; ++ fallbackPollMs: number; ++ fallbackBusy: boolean; ++ onFallbackChange: (models: string[]) => void; ++ onFallbackPollMsChange: (pollMs: number) => void; ++ onFallbackSave: () => void; + delegation: { + model: string; + effort: string; +@@ -63,6 +69,7 @@ export default function SubagentsWorkspace({ + onToggle, + onMove, + onSave, ++ fallback, fallbackPollMs, fallbackBusy, onFallbackChange, onFallbackPollMsChange, onFallbackSave, + delegation, + }: SubagentsWorkspaceProps) { + const t = useT(); +@@ -237,6 +244,13 @@ export default function SubagentsWorkspace({ + onUltraModeSave={delegation.onUltraModeSave} + ultraLoadFailed={delegation.ultraLoadFailed} + onUltraModeRetry={delegation.onUltraModeRetry} ++ fallback={fallback} ++ fallbackPollMs={fallbackPollMs} ++ fallbackBusy={fallbackBusy} ++ availableModels={available} ++ onFallbackChange={onFallbackChange} ++ onFallbackPollMsChange={onFallbackPollMsChange} ++ onFallbackSave={onFallbackSave} + /> + +
+diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts +index 429379396..2bb0b10c1 100644 +--- a/gui/src/i18n/de.ts ++++ b/gui/src/i18n/de.ts +@@ -672,6 +672,12 @@ export const de: Record = { + "sub.ultraModeLoadFail": "Ultra-Modus-Einstellungen konnten nicht geladen werden — läuft der Proxy?", + "sub.ultraModeSaveFail": "Ultra-Modus-Einstellungen konnten nicht gespeichert werden", + "sub.ultraModeSaved": "Ultra-Modus gespeichert. Gilt für neue Codex-Sitzungen.", ++ "sub.fallbackLabel": "Fallback-Kette für Sub-Agenten", ++ "sub.fallbackHint": "Geordnete Modelle, die versucht werden, wenn ein Sub-Agent-Modell nicht verfügbar ist oder fehlschlägt.", ++ "sub.fallbackAdd": "Fallback-Modell hinzufügen…", ++ "sub.fallbackPoll": "Intervall der Verfügbarkeitsprüfung", ++ "sub.fallbackSaved": "Fallback-Einstellungen für Sub-Agenten gespeichert.", ++ "sub.fallbackSaveFailed": "Fallback-Einstellungen konnten nicht gespeichert werden", + "logs.title": "Anfrage-Protokolle", + "logs.tabLogs": "Protokolle", + "logs.tabDebug": "Diagnose", +diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts +index 9cbf8699f..e1346616a 100644 +--- a/gui/src/i18n/en.ts ++++ b/gui/src/i18n/en.ts +@@ -315,6 +315,12 @@ export const en = { + "dash.visionTimeout": "Timeout", + "dash.visionTimeoutInvalid": "Enter an integer from {min} to {max} milliseconds.", + "dash.visionAdvancedPopover": "Advanced vision settings", ++ "sub.fallbackLabel": "Sub-agent fallback chain", ++ "sub.fallbackHint": "Ordered models tried when a sub-agent model is unavailable or fails.", ++ "sub.fallbackAdd": "Add fallback model…", ++ "sub.fallbackPoll": "Availability check interval", ++ "sub.fallbackSaved": "Sub-agent fallback settings saved.", ++ "sub.fallbackSaveFailed": "Failed to save fallback settings", + "dash.shadowCallIntercept": "Shadow Call Intercept", + "dash.shadowCallInterceptHint": "Intercepts Codex App's background helper calls ({models}) for title generation and commit messages and redirects them to your chosen model.", + "dash.shadowCallWarning": "⚠ When enabled, ALL requests for {models} will be replaced with the selected model.", +diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts +index ec171e627..d5d29b0be 100644 +--- a/gui/src/i18n/fr.ts ++++ b/gui/src/i18n/fr.ts +@@ -305,6 +305,12 @@ export const fr: Record = { + "dash.visionTimeout": "Délai d’expiration", + "dash.visionTimeoutInvalid": "Saisissez un entier compris entre {min} et {max} millisecondes.", + "dash.visionAdvancedPopover": "Paramètres de vision avancés", ++ "sub.fallbackLabel": "Chaîne de secours des sous-agents", ++ "sub.fallbackHint": "Modèles essayés dans l’ordre lorsqu’un modèle de sous-agent est indisponible ou échoue.", ++ "sub.fallbackAdd": "Ajouter un modèle de secours…", ++ "sub.fallbackPoll": "Intervalle de vérification de disponibilité", ++ "sub.fallbackSaved": "Paramètres de secours des sous-agents enregistrés.", ++ "sub.fallbackSaveFailed": "Échec de l’enregistrement des paramètres de secours", + "dash.shadowCallIntercept": "Interception des appels fantômes", + "dash.shadowCallInterceptHint": "Intercepte les appels auxiliaires en arrière-plan de l’application Codex ({models}) pour générer les titres et les messages de commit, puis les redirige vers le modèle choisi.", + "dash.shadowCallWarning": "⚠ Lorsque cette option est activée, TOUTES les requêtes destinées à {models} sont remplacées par le modèle sélectionné.", +diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts +index c71bd7a04..747438bdc 100644 +--- a/gui/src/i18n/ja.ts ++++ b/gui/src/i18n/ja.ts +@@ -632,6 +632,12 @@ export const ja: Record = { + "sub.ultraModeLoadFail": "ウルトラモード設定を読み込めませんでした — プロキシは実行中ですか?", + "sub.ultraModeSaveFail": "ウルトラモード設定の保存に失敗しました", + "sub.ultraModeSaved": "ウルトラモードを保存しました。新しい Codex セッションから適用されます。", ++ "sub.fallbackLabel": "サブエージェントのフォールバックチェーン", ++ "sub.fallbackHint": "サブエージェントモデルが利用できないか失敗した場合に順番に試すモデルです。", ++ "sub.fallbackAdd": "フォールバックモデルを追加…", ++ "sub.fallbackPoll": "利用可能性チェック間隔", ++ "sub.fallbackSaved": "サブエージェントのフォールバック設定を保存しました。", ++ "sub.fallbackSaveFailed": "フォールバック設定の保存に失敗しました", + + // logs + "logs.title": "リクエストログ", +diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts +index 63ac30442..ecc0e4560 100644 +--- a/gui/src/i18n/ko.ts ++++ b/gui/src/i18n/ko.ts +@@ -689,6 +689,12 @@ export const ko: Record = { + "sub.ultraModeLoadFail": "울트라 모드 설정을 불러오지 못했습니다 — 프록시가 실행 중인가요?", + "sub.ultraModeSaveFail": "울트라 모드 설정 저장에 실패했습니다", + "sub.ultraModeSaved": "울트라 모드가 저장되었습니다. 새 Codex 세션부터 적용됩니다.", ++ "sub.fallbackLabel": "서브에이전트 폴백 체인", ++ "sub.fallbackHint": "서브에이전트 모델을 사용할 수 없거나 실패할 때 순서대로 시도할 모델입니다.", ++ "sub.fallbackAdd": "폴백 모델 추가…", ++ "sub.fallbackPoll": "가용성 확인 간격", ++ "sub.fallbackSaved": "서브에이전트 폴백 설정을 저장했습니다.", ++ "sub.fallbackSaveFailed": "폴백 설정을 저장하지 못했습니다", + + // logs + "logs.title": "요청 로그", +diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts +index 9f220ba2b..852eb4467 100644 +--- a/gui/src/i18n/ru.ts ++++ b/gui/src/i18n/ru.ts +@@ -687,6 +687,12 @@ export const ru: Record = { + "sub.ultraModeLoadFail": "Не удалось загрузить настройки ультра-режима — работает ли прокси?", + "sub.ultraModeSaveFail": "Не удалось сохранить настройки ультра-режима", + "sub.ultraModeSaved": "Ультра-режим сохранён. Применяется к новым сеансам Codex.", ++ "sub.fallbackLabel": "Цепочка резервных моделей субагента", ++ "sub.fallbackHint": "Модели, которые последовательно пробуются, если модель субагента недоступна или завершается ошибкой.", ++ "sub.fallbackAdd": "Добавить резервную модель…", ++ "sub.fallbackPoll": "Интервал проверки доступности", ++ "sub.fallbackSaved": "Настройки резервных моделей субагента сохранены.", ++ "sub.fallbackSaveFailed": "Не удалось сохранить настройки резервных моделей", + + // logs + "logs.title": "Журнал запросов", +diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts +index aee152cd3..71d9e7313 100644 +--- a/gui/src/i18n/tr.ts ++++ b/gui/src/i18n/tr.ts +@@ -694,6 +694,12 @@ export const tr: Record = { + "sub.ultraModeLoadFail": "Ultra modu ayarları yüklenemedi — proxy çalışıyor mu?", + "sub.ultraModeSaveFail": "Ultra modu ayarları kaydedilemedi", + "sub.ultraModeSaved": "Ultra modu kaydedildi. Yeni Codex oturumlarına uygulanır.", ++ "sub.fallbackLabel": "Alt ajan yedek zinciri", ++ "sub.fallbackHint": "Alt ajan modeli kullanılamadığında veya başarısız olduğunda sırayla denenecek modeller.", ++ "sub.fallbackAdd": "Yedek model ekle…", ++ "sub.fallbackPoll": "Kullanılabilirlik kontrol aralığı", ++ "sub.fallbackSaved": "Alt ajan yedek ayarları kaydedildi.", ++ "sub.fallbackSaveFailed": "Yedek ayarlar kaydedilemedi", + + // logs + "logs.title": "İstek Günlükleri", +diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts +index 39c9e2f0b..50659c2e6 100644 +--- a/gui/src/i18n/zh-TW.ts ++++ b/gui/src/i18n/zh-TW.ts +@@ -541,6 +541,12 @@ export const zhTW: Record = { + "sub.ultraModeLoadFail": "無法載入超級模式設定 — 代理是否在執行?", + "sub.ultraModeSaveFail": "儲存超級模式設定失敗", + "sub.ultraModeSaved": "超級模式已儲存。適用於新的 Codex 會話。", ++ "sub.fallbackLabel": "子代理備援鏈", ++ "sub.fallbackHint": "子代理模型無法使用或失敗時,依序嘗試的模型。", ++ "sub.fallbackAdd": "新增備援模型…", ++ "sub.fallbackPoll": "可用性檢查間隔", ++ "sub.fallbackSaved": "子代理備援設定已儲存。", ++ "sub.fallbackSaveFailed": "備援設定儲存失敗", + "logs.title": "請求日誌", + "logs.tabLogs": "日誌", + "logs.tabDebug": "除錯", +diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts +index 1ba4cabfa..ded94d699 100644 +--- a/gui/src/i18n/zh.ts ++++ b/gui/src/i18n/zh.ts +@@ -682,6 +682,12 @@ export const zh: Record = { + "sub.ultraModeLoadFail": "无法加载超级模式设置 — 代理是否在运行?", + "sub.ultraModeSaveFail": "保存超级模式设置失败", + "sub.ultraModeSaved": "超级模式已保存。适用于新的 Codex 会话。", ++ "sub.fallbackLabel": "子代理回退链", ++ "sub.fallbackHint": "子代理模型不可用或失败时按顺序尝试的模型。", ++ "sub.fallbackAdd": "添加回退模型…", ++ "sub.fallbackPoll": "可用性检查间隔", ++ "sub.fallbackSaved": "子代理回退设置已保存。", ++ "sub.fallbackSaveFailed": "保存回退设置失败", + + // logs + "logs.title": "请求日志", +diff --git a/gui/src/pages/Subagents.tsx b/gui/src/pages/Subagents.tsx +index 6b54d39ff..299c9306f 100644 +--- a/gui/src/pages/Subagents.tsx ++++ b/gui/src/pages/Subagents.tsx +@@ -8,7 +8,7 @@ import { useDataSurface } from "../data-surface"; + import { DataSurfaceSkeleton } from "../components/data-surface"; + import { useSubagentDelegation, type UltraModePatch, type UltraModeState } from "./use-subagent-delegation"; + +-type CachedSubagents = { available: string[]; chosen: string[] }; ++type CachedSubagents = { available: string[]; chosen: string[]; fallback: string[]; pollMs: number }; + + function seedSubagents(cacheKey: string): CachedSubagents | null { + return readSessionListCache(cacheKey); +@@ -19,6 +19,9 @@ export default function Subagents({ apiBase }: { apiBase: string }) { + const cacheKey = `ocx.subagents.v1:${apiBase}`; + const cached = seedSubagents(cacheKey); + const [chosen, setChosen] = useState(() => cached?.chosen ?? []); ++ const [fallback, setFallback] = useState(() => cached?.fallback ?? []); ++ const [fallbackPollMs, setFallbackPollMs] = useState(() => cached?.pollMs ?? 60000); ++ const [fallbackBusy, setFallbackBusy] = useState(false); + const [status, setStatus] = useState(""); + const [ok, setOk] = useState(false); + const [busy, setBusy] = useState(false); +@@ -117,16 +120,24 @@ export default function Subagents({ apiBase }: { apiBase: string }) { + const loadSubagents = useCallback(async (signal?: AbortSignal): Promise => { + // The resource layer's deadline abort must reach the wire — a signal dropped + // here is a store that can only settle by race timeout. +- const res = await fetch(`${apiBase}/api/subagent-models`, { signal }); +- const response = await readJsonOrThrow<{ available?: string[]; chosen?: string[] }>(res, t("sub.loadFail")); +- if (!response) throw new Error(t("sub.loadFail")); +- const available = response.available ?? []; ++ const [rosterRes, fallbackRes] = await Promise.all([ ++ fetch(`${apiBase}/api/subagent-models`, { signal }), ++ fetch(`${apiBase}/api/subagent-model-fallback`, { signal }), ++ ]); ++ const response = await readJsonOrThrow<{ available?: string[]; chosen?: string[] }>(rosterRes, t("sub.loadFail")); ++ const fallbackResponse = await readJsonOrThrow<{ available?: string[]; models?: string[]; pollMs?: number }>(fallbackRes, t("sub.loadFail")); ++ if (!response || !fallbackResponse) throw new Error(t("sub.loadFail")); ++ const available = response.available ?? fallbackResponse.available ?? []; + const availableSet = new Set(available); + const next = { + available, + chosen: (response.chosen ?? []).filter(model => availableSet.has(model)), ++ fallback: (fallbackResponse.models ?? []).filter(model => availableSet.has(model)), ++ pollMs: fallbackResponse.pollMs ?? 60000, + }; + setChosen(next.chosen); ++ setFallback(next.fallback); ++ setFallbackPollMs(next.pollMs); + writeSessionListCache(cacheKey, next); + return next; + }, [apiBase, cacheKey, t]); +@@ -174,7 +185,7 @@ export default function Subagents({ apiBase }: { apiBase: string }) { + const d = await readJsonOrThrow<{ applied?: string[] }>(r, t("sub.saveFailed")); + const applied = d?.applied ?? chosen; + if (d?.applied) setChosen(d.applied); +- writeSessionListCache(cacheKey, { available, chosen: applied }); ++ writeSessionListCache(cacheKey, { available, chosen: applied, fallback, pollMs: fallbackPollMs }); + setOk(true); + setStatus(t("sub.saved", { n: applied.length, cmd: "ocx sync" })); + } catch (error) { +@@ -186,6 +197,28 @@ export default function Subagents({ apiBase }: { apiBase: string }) { + } + }; + ++ const saveFallback = async () => { ++ if (fallbackBusy) return; ++ setFallbackBusy(true); ++ try { ++ const r = await fetch(`${apiBase}/api/subagent-model-fallback`, { ++ method: "PUT", ++ headers: { "Content-Type": "application/json" }, ++ body: JSON.stringify({ models: fallback, pollMs: fallbackPollMs }), ++ }); ++ const d = await readJsonOrThrow<{ models?: string[]; pollMs?: number }>(r, t("sub.fallbackSaveFailed")); ++ if (d?.models) setFallback(d.models); ++ if (d?.pollMs) setFallbackPollMs(d.pollMs); ++ setOk(true); ++ setStatus(t("sub.fallbackSaved")); ++ } catch (error) { ++ setOk(false); ++ setStatus(error instanceof Error && error.message ? error.message : t("sub.networkError")); ++ } finally { ++ setFallbackBusy(false); ++ } ++ }; ++ + // The skeleton owns the live region while this resource has no content yet. + if (state.showSkeleton && !snapshot) { + return ; +@@ -214,7 +247,13 @@ export default function Subagents({ apiBase }: { apiBase: string }) { + busy={busy} + onToggle={toggle} + onMove={move} +- onSave={() => { void save(); }} ++ onSave={() => { void save(); }} ++ fallback={fallback} ++ fallbackPollMs={fallbackPollMs} ++ fallbackBusy={fallbackBusy} ++ onFallbackChange={setFallback} ++ onFallbackPollMsChange={setFallbackPollMs} ++ onFallbackSave={() => { void saveFallback(); }} + delegation={{ + model: delegation.model, + effort: delegation.effort, + +``` + +Audit amendment: cache server-confirmed fallback values after fallback Save; roster Save preserves committed fallback snapshot, never draft. Add independent-save and remount regressions. Existing dashboard density, CSS tokens, Select and icon library retained; no concept art needed for utility editor. From eb5ff6c582d694db96e94e5d0a58ed5dbc6843f3 Mon Sep 17 00:00:00 2001 From: Robin Bially <7304732+RobinBially@users.noreply.github.com> Date: Mon, 7 Sep 2026 09:57:05 +0200 Subject: [PATCH 136/221] feat(gui): add opt-in Codex Desktop sign-in toggle [skip ci] (cherry picked from commit 0f21769f346e64c2c6b2a03ff8d09b3deaab9562) Co-authored-by: RobinBially <7304732+RobinBially@users.noreply.github.com> --- .../content/docs/guides/codex-integration.md | 9 ++ docs/pr-assets/codex-desktop-opt-in.jpg | Bin 0 -> 29051 bytes gui/src/i18n/de.ts | 2 + gui/src/i18n/en.ts | 2 + gui/src/i18n/fr.ts | 2 + gui/src/i18n/ja.ts | 2 + gui/src/i18n/ko.ts | 2 + gui/src/i18n/ru.ts | 2 + gui/src/i18n/tr.ts | 2 + gui/src/i18n/zh-TW.ts | 2 + gui/src/i18n/zh.ts | 2 + gui/src/pages/dashboard-overview-sections.tsx | 28 ++++++- gui/src/pages/dashboard-shared.ts | 2 + gui/src/pages/use-dashboard-data.ts | 23 +++-- gui/tests/vision-sidecar-dashboard.test.tsx | 79 +++++++++++++++++- tests/codex-integration/codex-inject.test.ts | 4 +- 16 files changed, 146 insertions(+), 17 deletions(-) create mode 100644 docs/pr-assets/codex-desktop-opt-in.jpg diff --git a/docs-site/src/content/docs/guides/codex-integration.md b/docs-site/src/content/docs/guides/codex-integration.md index 7d66e72c3f..ff2df04fdd 100644 --- a/docs-site/src/content/docs/guides/codex-integration.md +++ b/docs-site/src/content/docs/guides/codex-integration.md @@ -215,6 +215,15 @@ HTTP/SSE. ### Authless Codex Desktop (opt-in) +In **Dashboard → Overview**, **Open Codex without signing in** controls this existing +opt-in preference. The switch defaults to **off** when the setting is absent or false; +an existing explicit `codexDesktopAuthless: true` stays enabled. The dashboard saves +the preference and runs a full sync. Restart Codex Desktop after changing it. +If synchronization fails, the saved preference remains and the dashboard shows the error; +retry **Sync** before restarting. Account-gated Desktop features may be unavailable +when enabled. Upstream credentials, local eligibility, remote admission authentication +and user-owned gateway settings retain their existing requirements. + Codex Desktop shows its ChatGPT login screen whenever the active provider requires OpenAI auth. If your OpenCodex setup never uses ChatGPT credentials (routed providers only, or a blocked `chatgpt.com`), you can opt out of that gate: diff --git a/docs/pr-assets/codex-desktop-opt-in.jpg b/docs/pr-assets/codex-desktop-opt-in.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d06203e7113cc54e87b1272e272d8f943c5b4805 GIT binary patch literal 29051 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 literal 0 HcmV?d00001 diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 5faab4b356..495104bd42 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -299,6 +299,8 @@ export const de: Record = { "models.staleBanner": "Codex zeigt eine ältere Modellliste als dieser Katalog. Starte Codex neu, um sie neu zu laden.", "dash.codexAutoStart": "opencodex mit Codex starten", "dash.codexAutoStartHint": "Erlaubt einem installierten Launcher-Shim, ocx ensure auszuführen. Diese Einstellung installiert keinen Neustartschutz; prüfe den effektiven Zustand unter Startsicherheit.", + "dash.codexDesktopAuthless": "Codex ohne Anmeldung öffnen", + "dash.codexDesktopAuthlessHint": "Standardmäßig aus. Überspringt die separate Desktop-Anmeldung bei geeigneten lokalen Verbindungen. Zugangsdaten für den Anbieter bleiben erforderlich. Codex nach einer Änderung neu starten. Kontogebundene Desktop-Funktionen können fehlen.", "dash.searchModel": "Such-Sidecar-Modell", "dash.searchModelHint": "Modell für web_search bei nicht über OpenAI gerouteten Modellen. Erfordert ChatGPT-Login.", "dash.searchReasoning": "Such-Reasoning-Aufwand", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index c71208942f..22a3807858 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -311,6 +311,8 @@ export const en = { "models.staleBanner": "Codex is showing an older model list than this catalog. Restart Codex to reload it.", "dash.codexAutoStart": "Start opencodex with Codex", "dash.codexAutoStartHint": "Allows an installed launcher shim to run ocx ensure. This setting does not install restart protection; check Startup safety for the effective state.", + "dash.codexDesktopAuthless": "Open Codex without signing in", + "dash.codexDesktopAuthlessHint": "Off by default. Skip the separate Desktop sign-in for eligible local connections. Upstream credentials are still required. Restart Codex after changing this setting. Account-gated Desktop features may be unavailable.", "dash.searchModel": "Search sidecar model", "dash.searchModelHint": "Model used for web_search on non-OpenAI routed models. Requires ChatGPT login.", "dash.searchReasoning": "Search reasoning effort", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index e1b3519ef1..9f0f265173 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -301,6 +301,8 @@ export const fr: Record = { "models.staleBanner": "Codex affiche une liste de modèles plus ancienne que ce catalogue. Redémarrez Codex pour la recharger.", "dash.codexAutoStart": "Démarrer opencodex avec Codex", "dash.codexAutoStartHint": "Permet à un mécanisme de lancement installé d’exécuter ocx ensure. Ce réglage n’installe pas de protection au redémarrage ; consultez Sécurité du démarrage pour connaître l’état effectif.", + "dash.codexDesktopAuthless": "Ouvrir Codex sans se connecter", + "dash.codexDesktopAuthlessHint": "Désactivé par défaut. Ignore la connexion Desktop séparée pour les connexions locales admissibles. Les identifiants du fournisseur restent nécessaires. Redémarrez Codex après toute modification. Certaines fonctions Desktop liées au compte peuvent être indisponibles.", "dash.searchModel": "Modèle auxiliaire de recherche", "dash.searchModelHint": "Modèle utilisé pour web_search sur les modèles routés autres qu’OpenAI. Nécessite une connexion à ChatGPT.", "dash.searchReasoning": "Effort de raisonnement pour la recherche", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index cf94831583..55a6fe2495 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -308,6 +308,8 @@ export const ja: Record = { "models.staleBanner": "Codex はこのカタログより古いモデル一覧を表示しています。Codex を再起動すると読み直されます。", "dash.codexAutoStart": "Codex と一緒に opencodex を起動", "dash.codexAutoStartHint": "インストール済み launcher shim に ocx ensure の実行を許可します。この設定だけでは再起動保護はインストールされません。起動安全性で実際の状態を確認してください。", + "dash.codexDesktopAuthless": "ログインせずに Codex を開く", + "dash.codexDesktopAuthlessHint": "既定ではオフです。対象のローカル接続で Desktop の個別ログインを省略します。上流プロバイダーの認証情報は引き続き必要です。変更後は Codex を再起動してください。アカウントに依存する Desktop 機能が利用できない場合があります。", "dash.searchModel": "検索サイドカーモデル", "dash.searchModelHint": "非 OpenAI ルーティングモデルで web_search に使うモデル。ChatGPT ログインが必要です。", "dash.searchReasoning": "検索の推論負荷", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index c1959482b7..19285b150e 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -303,6 +303,8 @@ export const ko: Record = { "models.staleBanner": "Codex가 이 카탈로그보다 오래된 모델 목록을 보여주고 있습니다. Codex를 재시작하면 새로 읽습니다.", "dash.codexAutoStart": "Codex 실행 시 opencodex 시작", "dash.codexAutoStartHint": "설치된 launcher shim이 ocx ensure를 실행하도록 허용합니다. 이 설정은 재부팅 보호를 설치하지 않으므로 시작 안전성에서 실제 상태를 확인하세요.", + "dash.codexDesktopAuthless": "로그인 없이 Codex 열기", + "dash.codexDesktopAuthlessHint": "기본값은 꺼짐입니다. 지원되는 로컬 연결에서 별도의 Desktop 로그인을 건너뜁니다. 업스트림 인증 정보는 여전히 필요합니다. 변경 후 Codex를 다시 시작하세요. 계정에 연결된 Desktop 기능을 사용하지 못할 수 있습니다.", "dash.searchModel": "서치 사이드카 모델", "dash.searchModelHint": "비-OpenAI 라우팅 모델의 web_search에 사용되는 모델입니다. ChatGPT 로그인 필요.", "dash.searchReasoning": "서치 추론 강도", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 0109f5ebdc..87704912ac 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -308,6 +308,8 @@ export const ru: Record = { "models.staleBanner": "Codex показывает список моделей старее этого каталога. Перезапустите Codex, чтобы перечитать его.", "dash.codexAutoStart": "Запускать opencodex вместе с Codex", "dash.codexAutoStartHint": "Разрешает установленному launcher shim выполнять ocx ensure. Эта настройка не устанавливает защиту перезапуска; проверьте фактическое состояние в разделе безопасности запуска.", + "dash.codexDesktopAuthless": "Открывать Codex без входа", + "dash.codexDesktopAuthlessHint": "По умолчанию выключено. Пропускает отдельный вход в Desktop для допустимых локальных подключений. Учётные данные провайдера по-прежнему нужны. После изменения перезапустите Codex. Функции Desktop, связанные с аккаунтом, могут быть недоступны.", "dash.searchModel": "Модель сайдкара поиска", "dash.searchModelHint": "Модель, используемая для web_search на маршрутизируемых моделях, отличных от OpenAI. Требуется вход в аккаунт ChatGPT.", "dash.searchReasoning": "Уровень рассуждений для поиска", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index fa8b8e9c25..807eeae32b 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -309,6 +309,8 @@ export const tr: Record = { "models.staleBanner": "Codex, bu katalogdan daha eski bir model listesi gösteriyor. Yeniden okumak için Codex'i yeniden başlatın.", "dash.codexAutoStart": "opencodex'i Codex ile başlat", "dash.codexAutoStartHint": "Yüklü bir shim'in ocx ensure çalıştırmasına izin verir. Arka plan servisi veya yeniden başlatma koruması kurmaz; sistem durumu için Başlatma Güvenliği'ne bakın.", + "dash.codexDesktopAuthless": "Codex’i oturum açmadan başlat", + "dash.codexDesktopAuthlessHint": "Varsayılan olarak kapalıdır. Uygun yerel bağlantılarda ayrı Desktop oturum açma adımını atlar. Sağlayıcı kimlik bilgileri yine gereklidir. Değişiklikten sonra Codex’i yeniden başlatın. Hesaba bağlı Desktop özellikleri kullanılamayabilir.", "dash.searchModel": "Arama yan araç modeli", "dash.searchModelHint": "OpenAI dışı yönlendirilen modellerde web_search için kullanılan model. ChatGPT girişi gerektirir.", "dash.searchReasoning": "Arama akıl yürütme çabası", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 3bc246543a..62e1f07110 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -200,6 +200,8 @@ export const zhTW: Record = { "models.staleBanner": "Codex 顯示的模型清單比目前的目錄舊。重新啟動 Codex 即可重新讀取。", "dash.codexAutoStart": "隨 Codex 啟動 opencodex", "dash.codexAutoStartHint": "允許已安裝的 launcher shim 執行 ocx ensure。此設定不會安裝重新啟動保護;請在啟動安全中檢查實際狀態。", + "dash.codexDesktopAuthless": "無需登入即可開啟 Codex", + "dash.codexDesktopAuthlessHint": "預設關閉。為符合條件的本機連線略過獨立的 Desktop 登入。仍需上游供應商憑證。變更後請重新啟動 Codex。依賴帳戶的 Desktop 功能可能無法使用。", "dash.searchModel": "搜尋附屬模型", "dash.searchModelHint": "用於非 OpenAI 路由模型的 web_search 的模型。需要 ChatGPT 登入。", "dash.searchReasoning": "搜尋推理強度", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index b10c48688d..9946914426 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -303,6 +303,8 @@ export const zh: Record = { "models.staleBanner": "Codex 显示的模型列表比当前目录旧。重启 Codex 即可重新读取。", "dash.codexAutoStart": "随 Codex 启动 opencodex", "dash.codexAutoStartHint": "允许已安装的 launcher shim 运行 ocx ensure。此设置不会安装重启保护;请在启动安全中检查实际状态。", + "dash.codexDesktopAuthless": "无需登录即可打开 Codex", + "dash.codexDesktopAuthlessHint": "默认关闭。为符合条件的本地连接跳过单独的 Desktop 登录。仍需上游提供商凭据。更改后请重启 Codex。依赖账户的 Desktop 功能可能不可用。", "dash.searchModel": "搜索附属模型", "dash.searchModelHint": "用于非 OpenAI 路由模型的 web_search 的模型。需要 ChatGPT 登录。", "dash.searchReasoning": "搜索推理强度", diff --git a/gui/src/pages/dashboard-overview-sections.tsx b/gui/src/pages/dashboard-overview-sections.tsx index 8da531f97c..6606c4f560 100644 --- a/gui/src/pages/dashboard-overview-sections.tsx +++ b/gui/src/pages/dashboard-overview-sections.tsx @@ -163,7 +163,7 @@ export function DashboardInjectionPanel({ d }: { apiBase: string; d: Dash }) { export function DashboardMaintenancePanel({ d }: { d: Dash }) { const { - t, runSync, syncing, updateTriggerRef, openUpdateDialog, updateLoading, updateOpen, + t, runSync, syncing, settingsSaving, updateTriggerRef, openUpdateDialog, updateLoading, updateOpen, syncResult, syncError, updateJob, reconnecting, clearSyncFeedback, } = d; const syncHoldsWarning = !!syncResult && ( @@ -211,7 +211,7 @@ export function DashboardMaintenancePanel({ d }: { d: Dash }) {
{t("dash.syncModelsHint")}
-
+
+
+
+
{t("dash.codexDesktopAuthless")}
+
{t("dash.codexDesktopAuthlessHint")}
+ {settings?.catalogRefreshPending &&
{t("codexAuth.catalogRefreshPending")}
} +
+ +
+
+
{/* Both sidecar cards wear the DashboardInjectionPanel shell: the PANEL is the flex row, copy left, controls right. */} diff --git a/gui/src/pages/dashboard-shared.ts b/gui/src/pages/dashboard-shared.ts index 0793a7def2..d240510286 100644 --- a/gui/src/pages/dashboard-shared.ts +++ b/gui/src/pages/dashboard-shared.ts @@ -48,6 +48,8 @@ export interface ProviderInfo { name: string; adapter: string; baseUrl: string; export interface ModelInfo { id: string; provider: string; namespaced: string; owned_by?: string; reasoningEfforts?: string[] } export interface SettingsData { codexAutoStart: boolean; + codexDesktopAuthless?: boolean; + catalogRefreshPending?: boolean; /** Whether a login may open a browser on the machine running the proxy. */ oauthOpenBrowser?: boolean; port: number; diff --git a/gui/src/pages/use-dashboard-data.ts b/gui/src/pages/use-dashboard-data.ts index 6f84950ce1..6da776ea18 100644 --- a/gui/src/pages/use-dashboard-data.ts +++ b/gui/src/pages/use-dashboard-data.ts @@ -607,23 +607,24 @@ export function useDashboardData(apiBase: string) { finally { setInjectionSaving(false); } }; - const toggleCodexAutoStart = async () => { - if (!settings || settingsSaving) return; - const next = !settings.codexAutoStart; + const toggleCodexSetting = async (key: "codexAutoStart" | "codexDesktopAuthless") => { + if (!settings || settingsSaving || syncing) return; + const next = !(settings[key] ?? (key === "codexAutoStart")); setSettingsSaving(true); settingsMutationInFlightRef.current = true; - setSettings({ ...settings, codexAutoStart: next }); + setSettings({ ...settings, [key]: next }); try { const res = await fetch(`${apiBase}/api/settings`, { method: "PUT", headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ codexAutoStart: next }), + body: JSON.stringify({ [key]: next }), }); - const data = await requireJson<{ codexAutoStart: boolean; startupHealth?: SettingsData["startupHealth"] }>(res, "save failed"); + const data = await requireJson(res, "save failed"); settingsMutationEpochRef.current += 1; - setSettings(prev => prev ? { ...prev, codexAutoStart: data.codexAutoStart, startupHealth: data.startupHealth ?? prev.startupHealth } : prev); + setSettings(prev => prev ? { ...prev, [key]: data[key], catalogRefreshPending: key === "codexDesktopAuthless" ? data.catalogRefreshPending : prev.catalogRefreshPending, startupHealth: data.startupHealth ?? prev.startupHealth } : prev); + if (key === "codexDesktopAuthless") await runSync(); } catch { - setSettings(prev => prev ? { ...prev, codexAutoStart: !next } : prev); + setSettings(prev => prev ? { ...prev, [key]: !next } : prev); setError(true); } finally { settingsMutationInFlightRef.current = false; @@ -631,6 +632,9 @@ export function useDashboardData(apiBase: string) { } }; + const toggleCodexAutoStart = () => toggleCodexSetting("codexAutoStart"); + const toggleCodexDesktopAuthless = () => toggleCodexSetting("codexDesktopAuthless"); + // Clears the sync result/error in this hook. The dashboard toast owns its own dismissal // timer but must publish the dismissal here: syncResult/syncError live above the dashboard // tabs, so a component-local flag alone would let a stale result remount as a fresh toast @@ -649,6 +653,7 @@ export function useDashboardData(apiBase: string) { const res = await fetch(`${apiBase}/api/sync`, { method: "POST" }); const data = await requireJson(res, "sync failed"); setSyncResult(data); + setSettings(prev => prev ? { ...prev, catalogRefreshPending: false } : prev); if (data.projectConfigGrouped) setProjectConfigWarnings(data.projectConfigGrouped); } catch (err) { setSyncError(err instanceof Error ? err.message : String(err)); @@ -789,7 +794,7 @@ export function useDashboardData(apiBase: string) { effortCapHelpTriggerRef, updateTriggerRef, maHelpTriggerRef, shadowCallHelpTriggerRef, effortCapHelpDialogRef, updateDialogRef, maHelpDialogRef, shadowCallHelpDialogRef, filteredGroups, sidecarModels, visionModels, - saveSidecar, saveShadowCall, switchMaMode, toggleCodexAutoStart, runSync, clearSyncFeedback, + saveSidecar, saveShadowCall, switchMaMode, toggleCodexAutoStart, toggleCodexDesktopAuthless, runSync, clearSyncFeedback, fetchUpdateCheck, closeUpdateDialog, openUpdateDialog, changeUpdateChannel, runUpdate, }; } diff --git a/gui/tests/vision-sidecar-dashboard.test.tsx b/gui/tests/vision-sidecar-dashboard.test.tsx index dc762de58f..994a409126 100644 --- a/gui/tests/vision-sidecar-dashboard.test.tsx +++ b/gui/tests/vision-sidecar-dashboard.test.tsx @@ -12,7 +12,7 @@ import { LanguageProvider } from "../src/i18n/provider"; import { DashboardSidecarPanels } from "../src/pages/dashboard-overview-sections"; import type { SidecarData, SidecarPatch } from "../src/pages/dashboard-shared"; import { mergeSidecarSetting } from "../src/pages/dashboard-shared"; -import type { useDashboardData } from "../src/pages/use-dashboard-data"; +import { useDashboardData } from "../src/pages/use-dashboard-data"; const globals = ["document", "window", "navigator", "IS_REACT_ACT_ENVIRONMENT"] as const; let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; @@ -382,4 +382,79 @@ test("model and reasoning saves still omit enabled, limit, and timeout", async ( expect(patches).toHaveLength(2); expect(patches[1]).toEqual({ vision: { reasoning: "high" } }); assertVisionControlFieldsOmitted(patches[1]!); -}); \ No newline at end of file +}); + +test("Desktop login switch defaults off, preserves explicit opt-in, and disables while saving", async () => { + const { d } = harness(); + let clicks = 0; + d.toggleCodexDesktopAuthless = async () => { clicks += 1; }; + d.settings = { codexAutoStart: true, port: 10100, hostname: "127.0.0.1" }; + await mount(d); + const toggle = () => host.querySelector(`button[aria-label="${en["dash.codexDesktopAuthless"]}"]`)!; + expect(toggle().getAttribute("aria-pressed")).toBe("false"); + d.settings.codexDesktopAuthless = true; + await mount(d); + expect(toggle().getAttribute("aria-pressed")).toBe("true"); + await act(async () => { toggle().click(); }); + expect(clicks).toBe(1); + d.settings.codexDesktopAuthless = false; + d.settings.catalogRefreshPending = true; + d.settingsSaving = true; + await mount(d); + expect(toggle().getAttribute("aria-pressed")).toBe("false"); + expect(toggle().disabled).toBe(true); + expect(host.textContent).toContain(en["codexAuth.catalogRefreshPending"]); +}); + + +test.each([undefined, false, true])("Desktop login preference %s persists before full sync; sync failure keeps the saved preference", async (initial) => { + const originalFetch = globalThis.fetch; + const writes: Array<{ path: string; body: unknown }> = []; + let latest: Dash | undefined; + let saved = initial; + const apiBase = `/authless-test-${String(initial)}`; + globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { + const path = String(input); + if (init?.method === "PUT") { + const body = JSON.parse(String(init.body)); + writes.push({ path, body }); + if (body.codexDesktopAuthless !== undefined) { + saved = body.codexDesktopAuthless; + return Response.json({ codexDesktopAuthless: saved, catalogRefreshPending: true }); + } + return Response.json({ codexAutoStart: body.codexAutoStart, catalogRefreshPending: false }); + } + if (path.endsWith("/api/sync")) { + writes.push({ path, body: null }); + return Response.json({ error: "sync unavailable" }, { status: 503 }); + } + if (path.endsWith("/api/settings")) { + return Response.json({ codexAutoStart: true, codexDesktopAuthless: saved, port: 10100, hostname: "127.0.0.1" }); + } + return Response.json({}, { status: 503 }); + }) as typeof fetch; + function Harness() { latest = useDashboardData(apiBase); return null; } + try { + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root = createRoot(host); + root.render(); + }); + expect(latest?.settings?.codexDesktopAuthless).toBe(initial); + await act(async () => { await latest!.toggleCodexDesktopAuthless(); }); + expect(writes).toEqual([ + { path: `${apiBase}/api/settings`, body: { codexDesktopAuthless: !initial } }, + { path: `${apiBase}/api/sync`, body: null }, + ]); + expect(latest?.settings?.codexDesktopAuthless).toBe(!initial); + expect(latest?.syncError).toBe("sync unavailable"); + expect(latest?.settings?.catalogRefreshPending).toBe(true); + await act(async () => { await latest!.toggleCodexAutoStart(); }); + expect(latest?.settings?.codexAutoStart).toBe(false); + expect(latest?.settings?.catalogRefreshPending).toBe(true); + } finally { + await act(async () => { root?.unmount(); }); + root = null; + globalThis.fetch = originalFetch; + } +}); diff --git a/tests/codex-integration/codex-inject.test.ts b/tests/codex-integration/codex-inject.test.ts index 84ac5f67b6..b6be3c2f69 100644 --- a/tests/codex-integration/codex-inject.test.ts +++ b/tests/codex-integration/codex-inject.test.ts @@ -31,8 +31,8 @@ describe("Codex config injection", () => { }); describe("authless Codex Desktop opt-in (#1107)", () => { - test("default target on loopback stays Design B and byte-identical", () => { - const target = standaloneCodexRoutingTarget(10100, {}); + test.each([undefined, false])("disabled preference %s on loopback stays Design B and byte-identical", (codexDesktopAuthless) => { + const target = standaloneCodexRoutingTarget(10100, { codexDesktopAuthless }); expect(target.desktopAuthless).toBeUndefined(); expect(buildProfileFile(target, null)).toBe(buildProfileFile(10100, null)); expect(buildProviderTableBlock(target)).toContain("requires_openai_auth = true"); From 2b14053ff625e1750583269829bbbecf0a100b6c Mon Sep 17 00:00:00 2001 From: x3M3x Date: Wed, 2 Sep 2026 09:49:07 +0400 Subject: [PATCH 137/221] docs: add subagent fallback settings screenshot [skip ci] (cherry picked from commit aba57a074941b7cdae3074eca9a0256d0621eb22) Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> --- .../subagent-fallback-settings.png | Bin 0 -> 215189 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs-site/public/pr-screenshots/subagent-fallback-settings.png diff --git a/docs-site/public/pr-screenshots/subagent-fallback-settings.png b/docs-site/public/pr-screenshots/subagent-fallback-settings.png new file mode 100644 index 0000000000000000000000000000000000000000..04f72f140cd0d904d63ff72f9da7e0a0300e1a5e GIT binary patch literal 215189 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

UR?jC!(*%I%`utfvcyOR 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 Date: Mon, 7 Sep 2026 10:34:15 +0900 Subject: [PATCH 138/221] fix(web-search): bound the Anthropic sidecar SSE and error bodies [skip ci] `parseAnthropicSidecarSSE` folded frames only when it found a `\n\n` separator, and appended every decoded chunk to `buffer` until then. An upstream that streams without ever emitting a separator therefore grew the buffer for the whole response. The non-OK branch had the same shape: it read the untrusted error body with an unbounded `res.text()` just to build one auth-failure message. Reuse the existing `MAX_SIDECAR_RESPONSE_BYTES` cap and the reader-cancel helper that `parseSidecarSSE` already applies in the same folder, so both paths stop reading at the same 64 KiB bound. Frames folded before the cap are kept; only the unterminated tail is dropped. `cancelReaderWithoutWaiting` is exported for this, unchanged. The regression drives a stream that never terminates a frame and asserts the read is cancelled well before the producer finishes. It fails without the cap and passes with it. (cherry picked from commit c25bdab6dd955bc2ccfb9f952403009ac560b13e) Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/web-search/anthropic-executor.ts | 52 +++++++++++++++++-- src/web-search/parse.ts | 2 +- tests/web-search/web-search-anthropic.test.ts | 21 ++++++++ 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/src/web-search/anthropic-executor.ts b/src/web-search/anthropic-executor.ts index 1eb206afa8..cd3893900c 100644 --- a/src/web-search/anthropic-executor.ts +++ b/src/web-search/anthropic-executor.ts @@ -5,7 +5,11 @@ import { CLAUDE_CODE_HEADERS, claudeCodeSessionId } from "../adapters/client-fin import { signalWithTimeout, cancelBodyOnAbort } from "../lib/abort"; import { sidecarEnter } from "../lib/sidecar-tracker"; import { applyUpstreamRecoveryInit, fetchWithResetRetry } from "../lib/upstream-retry"; -import type { WebSearchSource } from "./parse"; +import { + MAX_SIDECAR_RESPONSE_BYTES, + cancelReaderWithoutWaiting, + type WebSearchSource, +} from "./parse"; import { BASE_INSTRUCTION, IMAGE_INSTRUCTION, type SidecarOutcome, type SidecarSettings } from "./executor"; /** Hardcoded per-turn search bound handed to the server tool (mirrors the loop's maxSearches intent). */ @@ -17,6 +21,33 @@ function isRec(v: unknown): v is Record { return !!v && typeof v === "object" && !Array.isArray(v); } +/** Read at most `MAX_SIDECAR_RESPONSE_BYTES` of an untrusted upstream body, then stop reading. */ +async function readBoundedText(res: Response): Promise { + if (!res.body) return ""; + const reader = res.body.getReader(); + const decoder = new TextDecoder(); + let out = ""; + let seen = 0; + try { + for (;;) { + const { done, value } = await reader.read(); + if (done) break; + const remaining = MAX_SIDECAR_RESPONSE_BYTES - seen; + const accepted = value.byteLength <= remaining ? value : value.subarray(0, remaining); + seen += accepted.byteLength; + out += decoder.decode(accepted, { stream: true }); + if (seen >= MAX_SIDECAR_RESPONSE_BYTES) { + cancelReaderWithoutWaiting(reader, "sidecar error body byte limit reached"); + break; + } + } + out += decoder.decode(); + } catch { + /* a failed error-body read must not mask the HTTP status we are about to report */ + } + return out; +} + /** * Fold an Anthropic Messages SSE stream (a web_search_20250305 turn) into a WebSearchResult. * @@ -41,6 +72,7 @@ export async function parseAnthropicSidecarSSE(res: Response): Promise): void => { const type = typeof data.type === "string" ? data.type : ""; @@ -82,15 +114,27 @@ export async function parseAnthropicSidecarSSE(res: Response): Promise= MAX_SIDECAR_RESPONSE_BYTES) { + // Keep the frames already folded above, drop the unterminated tail, and do not wait on + // upstream teardown. + cancelReaderWithoutWaiting(reader, "sidecar response byte limit reached"); + buffer = ""; + break; + } } // Flush the decoder and process any final unterminated frame (a stream that ends without \n\n). buffer = (buffer + decoder.decode()).replace(/\r\n/g, "\n"); @@ -177,7 +221,9 @@ export async function runAnthropicWebSearch( // (found investigating #1419). const detachBodyGuard = cancelBodyOnAbort(res.body, linkedSignal.signal); if (!res.ok) { - const t = await res.text().catch(() => ""); + // Untrusted upstream error bodies are only used for an auth-failure message, so read a + // bounded prefix instead of buffering an arbitrarily large response. + const t = await readBoundedText(res); detachBodyGuard(); console.warn(`[web-search] anthropic sidecar HTTP ${res.status} for query "${query.slice(0, 80)}" (${Date.now() - t0}ms)`); if (res.status === 401) { diff --git a/src/web-search/parse.ts b/src/web-search/parse.ts index 757c309f3e..7ba5d2607c 100644 --- a/src/web-search/parse.ts +++ b/src/web-search/parse.ts @@ -193,7 +193,7 @@ function fromOutputArray(output: OutputItem[], seen: Set): WebSearchResu return { text, sources }; } -function cancelReaderWithoutWaiting( +export function cancelReaderWithoutWaiting( reader: ReadableStreamDefaultReader, reason: string, ): void { diff --git a/tests/web-search/web-search-anthropic.test.ts b/tests/web-search/web-search-anthropic.test.ts index f5b7f1df26..33f2616cc2 100644 --- a/tests/web-search/web-search-anthropic.test.ts +++ b/tests/web-search/web-search-anthropic.test.ts @@ -130,6 +130,27 @@ describe("parseAnthropicSidecarSSE", () => { expect(out.error).toBeDefined(); }); + test("an unterminated frame cannot buffer the stream without bound", async () => { + // A sidecar that never emits a frame separator: without a cap the parser would accumulate + // the whole stream in memory before it could fold anything. + let produced = 0; + let cancelled = false; + const chunk = new TextEncoder().encode(`data: {"filler":"${"x".repeat(64 * 1024)}"}`); + const body = new ReadableStream({ + pull(c) { + if (produced > 8 * 1024 * 1024) { c.close(); return; } + produced += chunk.byteLength; + c.enqueue(chunk); + }, + cancel() { cancelled = true; }, + }); + const out = await parseAnthropicSidecarSSE(new Response(body, { status: 200 })); + expect(cancelled).toBe(true); + // The cap stops the read long before the producer would have finished on its own. + expect(produced).toBeLessThan(1024 * 1024); + expect(out.text).toBe(""); + }); + test("empty results (content:[]) with answer text is a success, not an error", async () => { const res = sseResponse([ { type: "content_block_start", index: 0, content_block: { type: "web_search_tool_result", tool_use_id: "srvtoolu_3", content: [] } }, From c1f96f0a5af6bf98e663d287eeffaabcdb0d0028 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:25:44 +0900 Subject: [PATCH 139/221] fix(gui): retain pending Desktop preference when sync is skipped [skip ci] Co-authored-by: RobinBially <7304732+RobinBially@users.noreply.github.com> --- gui/src/i18n/de.ts | 4 +-- gui/src/i18n/en.ts | 4 +-- gui/src/i18n/fr.ts | 4 +-- gui/src/i18n/ja.ts | 4 +-- gui/src/i18n/ko.ts | 4 +-- gui/src/i18n/ru.ts | 4 +-- gui/src/i18n/tr.ts | 4 +-- gui/src/i18n/zh-TW.ts | 4 +-- gui/src/i18n/zh.ts | 4 +-- gui/src/pages/dashboard-shared.ts | 1 + gui/src/pages/use-dashboard-data.ts | 4 ++- gui/tests/vision-sidecar-dashboard.test.tsx | 27 +++++++++++++++++++++ 12 files changed, 49 insertions(+), 19 deletions(-) diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 495104bd42..74533a04d3 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -299,8 +299,6 @@ export const de: Record = { "models.staleBanner": "Codex zeigt eine ältere Modellliste als dieser Katalog. Starte Codex neu, um sie neu zu laden.", "dash.codexAutoStart": "opencodex mit Codex starten", "dash.codexAutoStartHint": "Erlaubt einem installierten Launcher-Shim, ocx ensure auszuführen. Diese Einstellung installiert keinen Neustartschutz; prüfe den effektiven Zustand unter Startsicherheit.", - "dash.codexDesktopAuthless": "Codex ohne Anmeldung öffnen", - "dash.codexDesktopAuthlessHint": "Standardmäßig aus. Überspringt die separate Desktop-Anmeldung bei geeigneten lokalen Verbindungen. Zugangsdaten für den Anbieter bleiben erforderlich. Codex nach einer Änderung neu starten. Kontogebundene Desktop-Funktionen können fehlen.", "dash.searchModel": "Such-Sidecar-Modell", "dash.searchModelHint": "Modell für web_search bei nicht über OpenAI gerouteten Modellen. Erfordert ChatGPT-Login.", "dash.searchReasoning": "Such-Reasoning-Aufwand", @@ -2471,6 +2469,8 @@ export const de: Record = { "dash.visionTimeout": "Timeout", "dash.visionTimeoutInvalid": "Geben Sie eine ganze Zahl von {min} bis {max} Millisekunden ein.", "dash.visionAdvancedPopover": "Erweiterte Vision-Einstellungen", + "dash.codexDesktopAuthless": "Codex ohne Anmeldung öffnen", + "dash.codexDesktopAuthlessHint": "Standardmäßig aus. Überspringt die separate Desktop-Anmeldung bei geeigneten lokalen Verbindungen. Zugangsdaten für den Anbieter bleiben erforderlich. Codex nach einer Änderung neu starten. Kontogebundene Desktop-Funktionen können fehlen.", "models.newPolicyGlobal": "Neue Modelle zunächst deaktivieren", "models.newPolicyProvider": "Richtlinie für neue Modelle", "models.newPolicy_inherit": "Übernehmen", "models.newPolicy_off": "Aus", "models.newPolicy_on": "An", "models.newBadge": "NEU", "models.newCount": "{count} neu, aus", "models.aliases": "Aliase", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 22a3807858..2197dcb735 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -311,8 +311,6 @@ export const en = { "models.staleBanner": "Codex is showing an older model list than this catalog. Restart Codex to reload it.", "dash.codexAutoStart": "Start opencodex with Codex", "dash.codexAutoStartHint": "Allows an installed launcher shim to run ocx ensure. This setting does not install restart protection; check Startup safety for the effective state.", - "dash.codexDesktopAuthless": "Open Codex without signing in", - "dash.codexDesktopAuthlessHint": "Off by default. Skip the separate Desktop sign-in for eligible local connections. Upstream credentials are still required. Restart Codex after changing this setting. Account-gated Desktop features may be unavailable.", "dash.searchModel": "Search sidecar model", "dash.searchModelHint": "Model used for web_search on non-OpenAI routed models. Requires ChatGPT login.", "dash.searchReasoning": "Search reasoning effort", @@ -577,6 +575,8 @@ export const en = { "models.keepNativeOnV1Hint": "ChatGPT encrypts v2 child tasks only when a ChatGPT-native parent stays on v2, so Grok and Claude cannot read them. Turn this on to keep Sol/Terra on v1 and avoid that encryption. Routed parents keep v2.", "models.v2Help": "Controls the multi-agent surface for all models.\n\nv1: Classic single-thread agent. Every model uses the v1 collab surface.\nbase: Upstream defaults — sol/terra use v2, luna uses v1, others follow the codex feature flag.\nv2: Multi-thread agent with spawn_agent. Every model uses the v2 collab surface.\n\nOn v2, Keep ChatGPT on v1 leaves Sol/Terra on the v1 surface so they can still spawn Grok or Claude. ChatGPT encrypts v2 child tasks; routed models cannot read them. Routed parents stay on v2.\n\nChanges apply to new sessions.", "dash.multiAgent": "Sub-agent", + "dash.codexDesktopAuthless": "Open Codex without signing in", + "dash.codexDesktopAuthlessHint": "Off by default. Skip the separate Desktop sign-in for eligible local connections. Upstream credentials are still required. Restart Codex after changing this setting. Account-gated Desktop features may be unavailable.", "models.v2Conflict": "[agents] max_threads is set — codex will refuse to start; remove it from config.toml", "models.v2Applied": "Sub-agent mode updated — applies to new sessions (restart the Codex app to refresh the picker)", "models.v2ThreadsLabel": "Max threads", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index 9f0f265173..cca4b70347 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -301,8 +301,6 @@ export const fr: Record = { "models.staleBanner": "Codex affiche une liste de modèles plus ancienne que ce catalogue. Redémarrez Codex pour la recharger.", "dash.codexAutoStart": "Démarrer opencodex avec Codex", "dash.codexAutoStartHint": "Permet à un mécanisme de lancement installé d’exécuter ocx ensure. Ce réglage n’installe pas de protection au redémarrage ; consultez Sécurité du démarrage pour connaître l’état effectif.", - "dash.codexDesktopAuthless": "Ouvrir Codex sans se connecter", - "dash.codexDesktopAuthlessHint": "Désactivé par défaut. Ignore la connexion Desktop séparée pour les connexions locales admissibles. Les identifiants du fournisseur restent nécessaires. Redémarrez Codex après toute modification. Certaines fonctions Desktop liées au compte peuvent être indisponibles.", "dash.searchModel": "Modèle auxiliaire de recherche", "dash.searchModelHint": "Modèle utilisé pour web_search sur les modèles routés autres qu’OpenAI. Nécessite une connexion à ChatGPT.", "dash.searchReasoning": "Effort de raisonnement pour la recherche", @@ -562,6 +560,8 @@ export const fr: Record = { "models.keepNativeOnV1Hint": "ChatGPT chiffre les tâches enfants v2 uniquement lorsqu’un parent natif ChatGPT reste sur v2, de sorte que Grok et Claude ne peuvent pas les lire. Activez cette option pour garder Sol/Terra sur v1 et éviter ce chiffrement. Les parents routés restent sur v2.", "models.v2Help": "Contrôle l’interface multi-agent pour tous les modèles.\n\nv1 : agent classique à fil unique. Tous les modèles utilisent l’interface collab v1.\nbase : valeurs par défaut en amont — sol/terra utilisent v2, luna utilise v1 et les autres suivent l’indicateur de fonctionnalité codex.\nv2 : agent multifil avec spawn_agent. Tous les modèles utilisent l’interface collab v2.\n\nEn v2, « Garder ChatGPT sur v1 » laisse Sol/Terra sur l’interface v1 afin qu’ils puissent encore lancer Grok ou Claude. ChatGPT chiffre les tâches enfants v2 ; les modèles routés ne peuvent pas les lire. Les parents routés restent sur v2.\n\nLes modifications s’appliquent aux nouvelles sessions.", "dash.multiAgent": "Sous-agent", + "dash.codexDesktopAuthless": "Ouvrir Codex sans se connecter", + "dash.codexDesktopAuthlessHint": "Désactivé par défaut. Ignore la connexion Desktop séparée pour les connexions locales admissibles. Les identifiants du fournisseur restent nécessaires. Redémarrez Codex après toute modification. Certaines fonctions Desktop liées au compte peuvent être indisponibles.", "models.v2Conflict": "[agents] max_threads est défini — codex refusera de démarrer ; supprimez-le de config.toml", "models.v2Applied": "Mode sous-agent mis à jour — s’applique aux nouvelles sessions (redémarrez l’application Codex pour actualiser le sélecteur)", "models.v2ThreadsLabel": "Nombre maximal de fils", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 55a6fe2495..97aa85a6fb 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -308,8 +308,6 @@ export const ja: Record = { "models.staleBanner": "Codex はこのカタログより古いモデル一覧を表示しています。Codex を再起動すると読み直されます。", "dash.codexAutoStart": "Codex と一緒に opencodex を起動", "dash.codexAutoStartHint": "インストール済み launcher shim に ocx ensure の実行を許可します。この設定だけでは再起動保護はインストールされません。起動安全性で実際の状態を確認してください。", - "dash.codexDesktopAuthless": "ログインせずに Codex を開く", - "dash.codexDesktopAuthlessHint": "既定ではオフです。対象のローカル接続で Desktop の個別ログインを省略します。上流プロバイダーの認証情報は引き続き必要です。変更後は Codex を再起動してください。アカウントに依存する Desktop 機能が利用できない場合があります。", "dash.searchModel": "検索サイドカーモデル", "dash.searchModelHint": "非 OpenAI ルーティングモデルで web_search に使うモデル。ChatGPT ログインが必要です。", "dash.searchReasoning": "検索の推論負荷", @@ -2492,6 +2490,8 @@ export const ja: Record = { "dash.visionTimeout": "タイムアウト", "dash.visionTimeoutInvalid": "{min} から {max} ミリ秒の整数を入力してください。", "dash.visionAdvancedPopover": "詳細なビジョン設定", + "dash.codexDesktopAuthless": "ログインせずに Codex を開く", + "dash.codexDesktopAuthlessHint": "既定ではオフです。対象のローカル接続で Desktop の個別ログインを省略します。上流プロバイダーの認証情報は引き続き必要です。変更後は Codex を再起動してください。アカウントに依存する Desktop 機能が利用できない場合があります。", "models.newPolicyGlobal": "新しいモデルを無効で追加", "models.newPolicyProvider": "新しいモデルのポリシー", "models.newPolicy_inherit": "継承", "models.newPolicy_off": "オフ", "models.newPolicy_on": "オン", "models.newBadge": "新着", "models.newCount": "新着 {count} 件、オフ", "models.aliases": "エイリアス", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 19285b150e..4e66544528 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -303,8 +303,6 @@ export const ko: Record = { "models.staleBanner": "Codex가 이 카탈로그보다 오래된 모델 목록을 보여주고 있습니다. Codex를 재시작하면 새로 읽습니다.", "dash.codexAutoStart": "Codex 실행 시 opencodex 시작", "dash.codexAutoStartHint": "설치된 launcher shim이 ocx ensure를 실행하도록 허용합니다. 이 설정은 재부팅 보호를 설치하지 않으므로 시작 안전성에서 실제 상태를 확인하세요.", - "dash.codexDesktopAuthless": "로그인 없이 Codex 열기", - "dash.codexDesktopAuthlessHint": "기본값은 꺼짐입니다. 지원되는 로컬 연결에서 별도의 Desktop 로그인을 건너뜁니다. 업스트림 인증 정보는 여전히 필요합니다. 변경 후 Codex를 다시 시작하세요. 계정에 연결된 Desktop 기능을 사용하지 못할 수 있습니다.", "dash.searchModel": "서치 사이드카 모델", "dash.searchModelHint": "비-OpenAI 라우팅 모델의 web_search에 사용되는 모델입니다. ChatGPT 로그인 필요.", "dash.searchReasoning": "서치 추론 강도", @@ -2493,6 +2491,8 @@ export const ko: Record = { "dash.visionTimeout": "제한 시간", "dash.visionTimeoutInvalid": "{min}에서 {max} 밀리초 사이의 정수를 입력하세요.", "dash.visionAdvancedPopover": "고급 비전 설정", + "dash.codexDesktopAuthless": "로그인 없이 Codex 열기", + "dash.codexDesktopAuthlessHint": "기본값은 꺼짐입니다. 지원되는 로컬 연결에서 별도의 Desktop 로그인을 건너뜁니다. 업스트림 인증 정보는 여전히 필요합니다. 변경 후 Codex를 다시 시작하세요. 계정에 연결된 Desktop 기능을 사용하지 못할 수 있습니다.", "models.newPolicyGlobal": "새 모델을 비활성화 상태로 추가", "models.newPolicyProvider": "새 모델 정책", "models.newPolicy_inherit": "상속", "models.newPolicy_off": "끔", "models.newPolicy_on": "켬", "models.newBadge": "신규", "models.newCount": "신규 {count}개, 꺼짐", "models.aliases": "별칭", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 87704912ac..e7f199a06a 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -308,8 +308,6 @@ export const ru: Record = { "models.staleBanner": "Codex показывает список моделей старее этого каталога. Перезапустите Codex, чтобы перечитать его.", "dash.codexAutoStart": "Запускать opencodex вместе с Codex", "dash.codexAutoStartHint": "Разрешает установленному launcher shim выполнять ocx ensure. Эта настройка не устанавливает защиту перезапуска; проверьте фактическое состояние в разделе безопасности запуска.", - "dash.codexDesktopAuthless": "Открывать Codex без входа", - "dash.codexDesktopAuthlessHint": "По умолчанию выключено. Пропускает отдельный вход в Desktop для допустимых локальных подключений. Учётные данные провайдера по-прежнему нужны. После изменения перезапустите Codex. Функции Desktop, связанные с аккаунтом, могут быть недоступны.", "dash.searchModel": "Модель сайдкара поиска", "dash.searchModelHint": "Модель, используемая для web_search на маршрутизируемых моделях, отличных от OpenAI. Требуется вход в аккаунт ChatGPT.", "dash.searchReasoning": "Уровень рассуждений для поиска", @@ -2494,6 +2492,8 @@ export const ru: Record = { "dash.visionTimeout": "Таймаут", "dash.visionTimeoutInvalid": "Введите целое число от {min} до {max} миллисекунд.", "dash.visionAdvancedPopover": "Дополнительные настройки изображений", + "dash.codexDesktopAuthless": "Открывать Codex без входа", + "dash.codexDesktopAuthlessHint": "По умолчанию выключено. Пропускает отдельный вход в Desktop для допустимых локальных подключений. Учётные данные провайдера по-прежнему нужны. После изменения перезапустите Codex. Функции Desktop, связанные с аккаунтом, могут быть недоступны.", "models.newPolicyGlobal": "Добавлять новые модели выключенными", "models.newPolicyProvider": "Политика новых моделей", "models.newPolicy_inherit": "Наследовать", "models.newPolicy_off": "Выкл.", "models.newPolicy_on": "Вкл.", "models.newBadge": "НОВАЯ", "models.newCount": "Новых: {count}, выкл.", "models.aliases": "Псевдонимы", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index 807eeae32b..8c8f9ff802 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -309,8 +309,6 @@ export const tr: Record = { "models.staleBanner": "Codex, bu katalogdan daha eski bir model listesi gösteriyor. Yeniden okumak için Codex'i yeniden başlatın.", "dash.codexAutoStart": "opencodex'i Codex ile başlat", "dash.codexAutoStartHint": "Yüklü bir shim'in ocx ensure çalıştırmasına izin verir. Arka plan servisi veya yeniden başlatma koruması kurmaz; sistem durumu için Başlatma Güvenliği'ne bakın.", - "dash.codexDesktopAuthless": "Codex’i oturum açmadan başlat", - "dash.codexDesktopAuthlessHint": "Varsayılan olarak kapalıdır. Uygun yerel bağlantılarda ayrı Desktop oturum açma adımını atlar. Sağlayıcı kimlik bilgileri yine gereklidir. Değişiklikten sonra Codex’i yeniden başlatın. Hesaba bağlı Desktop özellikleri kullanılamayabilir.", "dash.searchModel": "Arama yan araç modeli", "dash.searchModelHint": "OpenAI dışı yönlendirilen modellerde web_search için kullanılan model. ChatGPT girişi gerektirir.", "dash.searchReasoning": "Arama akıl yürütme çabası", @@ -2494,6 +2492,8 @@ export const tr: Record = { "dash.visionTimeout": "Zaman aşımı", "dash.visionTimeoutInvalid": "{min} ile {max} milisaniye arasında bir tam sayı girin.", "dash.visionAdvancedPopover": "Gelişmiş görsel ayarları", + "dash.codexDesktopAuthless": "Codex’i oturum açmadan başlat", + "dash.codexDesktopAuthlessHint": "Varsayılan olarak kapalıdır. Uygun yerel bağlantılarda ayrı Desktop oturum açma adımını atlar. Sağlayıcı kimlik bilgileri yine gereklidir. Değişiklikten sonra Codex’i yeniden başlatın. Hesaba bağlı Desktop özellikleri kullanılamayabilir.", "models.newPolicyGlobal": "Yeni modeller devre dışı başlasın", "models.newPolicyProvider": "Yeni model ilkesi", "models.newPolicy_inherit": "Devral", "models.newPolicy_off": "Kapalı", "models.newPolicy_on": "Açık", "models.newBadge": "YENİ", "models.newCount": "{count} yeni, kapalı", "models.aliases": "Takma adlar", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 62e1f07110..eeec289911 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -200,8 +200,6 @@ export const zhTW: Record = { "models.staleBanner": "Codex 顯示的模型清單比目前的目錄舊。重新啟動 Codex 即可重新讀取。", "dash.codexAutoStart": "隨 Codex 啟動 opencodex", "dash.codexAutoStartHint": "允許已安裝的 launcher shim 執行 ocx ensure。此設定不會安裝重新啟動保護;請在啟動安全中檢查實際狀態。", - "dash.codexDesktopAuthless": "無需登入即可開啟 Codex", - "dash.codexDesktopAuthlessHint": "預設關閉。為符合條件的本機連線略過獨立的 Desktop 登入。仍需上游供應商憑證。變更後請重新啟動 Codex。依賴帳戶的 Desktop 功能可能無法使用。", "dash.searchModel": "搜尋附屬模型", "dash.searchModelHint": "用於非 OpenAI 路由模型的 web_search 的模型。需要 ChatGPT 登入。", "dash.searchReasoning": "搜尋推理強度", @@ -2456,6 +2454,8 @@ export const zhTW: Record = { "dash.visionTimeout": "逾時", "dash.visionTimeoutInvalid": "請輸入 {min} 到 {max} 毫秒之間的整數。", "dash.visionAdvancedPopover": "進階視覺設定", + "dash.codexDesktopAuthless": "無需登入即可開啟 Codex", + "dash.codexDesktopAuthlessHint": "預設關閉。為符合條件的本機連線略過獨立的 Desktop 登入。仍需上游供應商憑證。變更後請重新啟動 Codex。依賴帳戶的 Desktop 功能可能無法使用。", "models.newPolicyGlobal": "新模型預設停用", "models.newPolicyProvider": "新模型策略", "models.newPolicy_inherit": "繼承", "models.newPolicy_off": "關閉", "models.newPolicy_on": "開啟", "models.newBadge": "新增", "models.newCount": "{count} 個新增,已關閉", "models.aliases": "別名", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 9946914426..a62e9b2d6b 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -303,8 +303,6 @@ export const zh: Record = { "models.staleBanner": "Codex 显示的模型列表比当前目录旧。重启 Codex 即可重新读取。", "dash.codexAutoStart": "随 Codex 启动 opencodex", "dash.codexAutoStartHint": "允许已安装的 launcher shim 运行 ocx ensure。此设置不会安装重启保护;请在启动安全中检查实际状态。", - "dash.codexDesktopAuthless": "无需登录即可打开 Codex", - "dash.codexDesktopAuthlessHint": "默认关闭。为符合条件的本地连接跳过单独的 Desktop 登录。仍需上游提供商凭据。更改后请重启 Codex。依赖账户的 Desktop 功能可能不可用。", "dash.searchModel": "搜索附属模型", "dash.searchModelHint": "用于非 OpenAI 路由模型的 web_search 的模型。需要 ChatGPT 登录。", "dash.searchReasoning": "搜索推理强度", @@ -2492,6 +2490,8 @@ export const zh: Record = { "dash.visionTimeout": "超时", "dash.visionTimeoutInvalid": "请输入 {min} 到 {max} 毫秒之间的整数。", "dash.visionAdvancedPopover": "高级视觉设置", + "dash.codexDesktopAuthless": "无需登录即可打开 Codex", + "dash.codexDesktopAuthlessHint": "默认关闭。为符合条件的本地连接跳过单独的 Desktop 登录。仍需上游提供商凭据。更改后请重启 Codex。依赖账户的 Desktop 功能可能不可用。", "models.newPolicyGlobal": "新模型默认停用", "models.newPolicyProvider": "新模型策略", "models.newPolicy_inherit": "继承", "models.newPolicy_off": "关闭", "models.newPolicy_on": "开启", "models.newBadge": "新增", "models.newCount": "{count} 个新增,已关闭", "models.aliases": "别名", diff --git a/gui/src/pages/dashboard-shared.ts b/gui/src/pages/dashboard-shared.ts index d240510286..b6914586b6 100644 --- a/gui/src/pages/dashboard-shared.ts +++ b/gui/src/pages/dashboard-shared.ts @@ -128,6 +128,7 @@ export type Installer = "npm" | "bun" | "source"; export type UpdateJobStatus = "running" | "restarting" | "succeeded" | "failed"; export interface SyncResult { ok: boolean; + status?: "applied" | "skipped" | "catalog-only" | "refused"; added: number; catalogPath: string | null; catalogExists: boolean; diff --git a/gui/src/pages/use-dashboard-data.ts b/gui/src/pages/use-dashboard-data.ts index 6da776ea18..e87e6494bd 100644 --- a/gui/src/pages/use-dashboard-data.ts +++ b/gui/src/pages/use-dashboard-data.ts @@ -653,7 +653,9 @@ export function useDashboardData(apiBase: string) { const res = await fetch(`${apiBase}/api/sync`, { method: "POST" }); const data = await requireJson(res, "sync failed"); setSyncResult(data); - setSettings(prev => prev ? { ...prev, catalogRefreshPending: false } : prev); + if (data.ok && data.status === "applied") { + setSettings(prev => prev ? { ...prev, catalogRefreshPending: false } : prev); + } if (data.projectConfigGrouped) setProjectConfigWarnings(data.projectConfigGrouped); } catch (err) { setSyncError(err instanceof Error ? err.message : String(err)); diff --git a/gui/tests/vision-sidecar-dashboard.test.tsx b/gui/tests/vision-sidecar-dashboard.test.tsx index 994a409126..386196cc77 100644 --- a/gui/tests/vision-sidecar-dashboard.test.tsx +++ b/gui/tests/vision-sidecar-dashboard.test.tsx @@ -458,3 +458,30 @@ test.each([undefined, false, true])("Desktop login preference %s persists before globalThis.fetch = originalFetch; } }); + + +test.each(["skipped", "catalog-only", "applied"])("Desktop preference pending state follows %s sync application evidence", async (syncStatus) => { + const originalFetch = globalThis.fetch; + let latest: Dash | undefined; + const apiBase = `/authless-sync-${syncStatus}`; + globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { + const path = String(input); + if (init?.method === "PUT") return Response.json({ codexDesktopAuthless: true, catalogRefreshPending: true }); + if (path.endsWith("/api/sync")) return Response.json({ ok: true, status: syncStatus, message: syncStatus }); + if (path.endsWith("/api/settings")) return Response.json({ codexAutoStart: true, codexDesktopAuthless: false, port: 10100, hostname: "127.0.0.1" }); + return Response.json({}, { status: 503 }); + }) as typeof fetch; + function Harness() { latest = useDashboardData(apiBase); return null; } + try { + const { createRoot } = await import("react-dom/client"); + await act(async () => { root = createRoot(host); root.render(); }); + await act(async () => { await latest!.toggleCodexDesktopAuthless(); }); + expect(latest?.settings?.codexDesktopAuthless).toBe(true); + expect(latest?.settings?.catalogRefreshPending).toBe(syncStatus !== "applied"); + expect(latest?.syncResult?.status).toBe(syncStatus); + } finally { + await act(async () => { root?.unmount(); }); + root = null; + globalThis.fetch = originalFetch; + } +}); From f8d3545a0d77ab625f090e6e13f7924760e098d5 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:30:58 +0900 Subject: [PATCH 140/221] fix(gui): preserve fallback choices and explain native-parent V2 compatibility [skip ci] Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> --- .../content/docs/guides/codex-integration.md | 7 + .../SubagentDelegationSection.tsx | 53 ++- gui/src/i18n/de.ts | 18 +- gui/src/i18n/en.ts | 18 +- gui/src/i18n/fr.ts | 18 +- gui/src/i18n/ja.ts | 18 +- gui/src/i18n/ko.ts | 6 + gui/src/i18n/ru.ts | 18 +- gui/src/i18n/tr.ts | 6 + gui/src/i18n/zh-TW.ts | 18 +- gui/src/i18n/zh.ts | 18 +- gui/src/pages/Subagents.tsx | 29 +- gui/src/pages/use-subagent-delegation.ts | 2 + gui/src/styles-subagents-workspace.css | 13 + gui/tests/multi-agent-guidance.test.tsx | 9 +- gui/tests/subagents-fallback.test.tsx | 422 ++++++++++++++++++ 16 files changed, 613 insertions(+), 60 deletions(-) create mode 100644 gui/tests/subagents-fallback.test.tsx diff --git a/docs-site/src/content/docs/guides/codex-integration.md b/docs-site/src/content/docs/guides/codex-integration.md index ff2df04fdd..f5592c0a72 100644 --- a/docs-site/src/content/docs/guides/codex-integration.md +++ b/docs-site/src/content/docs/guides/codex-integration.md @@ -586,3 +586,10 @@ ocx restore back # point plain Codex at the running proxy again When opencodex runs as a managed [background service](/reference/cli/#ocx-service), it sets `OCX_SERVICE=1` so a service-driven restart does **not** thrash the Codex config — only an explicit `ocx stop` / `ocx service stop` restores native Codex. + + +### Sub-agent fallback and V2 compatibility + +In **Subagents → Delegation settings**, edit the ordered fallback chain and its availability polling interval (5000–600000 ms), then save it separately from the featured roster. A configured target that is no longer advertised remains in the chain until you remove it. The roster and fallback chain are separate settings; this editor does not make the roster replace the fallback policy. + +When a routed preferred model may receive V2 work from a native ChatGPT parent, the panel explains the upstream encrypted-task limitation. Readable tasks from routed parents are unaffected. The guidance uses `/api/v2` mode and native V1 pin state; the current API does not expose recovery activation or request-specific eligibility, so the panel reports those as unknown. V1/plaintext-compatible delegation remains an alternative. Experimental V2 recovery, where eligible and explicitly enabled, adds quota usage, latency, backend dependence and possible fidelity loss; it does not repair the upstream protocol. See [sub-agent surfaces](/guides/sub-agent-surface/) and [the upstream limitation](https://github.com/lidge-jun/opencodex/issues/92). diff --git a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx index 7c3b0e9425..dbbbd99948 100644 --- a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx +++ b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx @@ -8,7 +8,7 @@ */ import { useState } from "react"; import { Select, Tooltip } from "../../ui"; -import { IconInfo } from "../../icons"; +import { IconArrowDown, IconArrowUp, IconInfo, IconX } from "../../icons"; import { useT, type TKey } from "../../i18n/shared"; import { formatNamespacedModelId } from "../../provider-icons"; import type { DelegationPatch, DelegationModelOption } from "../../pages/use-subagent-delegation"; @@ -58,6 +58,19 @@ export default function SubagentDelegationSection({ // Proactive message, so it must render as OFF (and the toggle can install the // preset). Only a nonblank hint is "on". const ultraOn = (ultraMode.hintText ?? "").trim().length > 0; + const routedPreferred = available.some(option => option.namespaced === model + && !(option.provider === "openai" && option.namespaced === option.model)); + const nativeMayUseV2 = ultraMode.enabled || (ultraMode.multiAgentMode !== "v1" + && !(ultraMode.multiAgentMode === "v2" && ultraMode.keepNativeChatGptOnV1)); + const showV2Compatibility = !ultraLoadFailed && ultraMode.loaded === true && routedPreferred && nativeMayUseV2; + const validPollMs = Number.isInteger(fallbackPollMs) && fallbackPollMs >= 5000 && fallbackPollMs <= 600000; + const moveFallback = (index: number, direction: -1 | 1) => { + const next = [...fallback]; + const target = index + direction; + if (fallbackBusy || target < 0 || target >= next.length) return; + [next[index], next[target]] = [next[target], next[index]]; + onFallbackChange(next); + }; return (

@@ -105,6 +118,17 @@ export default function SubagentDelegationSection({
+ {showV2Compatibility && ( +
+ )} +
{t("sub.fallbackLabel")}
@@ -112,21 +136,26 @@ export default function SubagentDelegationSection({
{fallback.map((modelName, index) => ( -
- {index + 1}. {modelName} - - - +
+ {index + 1}. {modelName} + {!availableModels.includes(modelName) && {t("sub.fallbackUnavailable")}} + + + + + +
))} - + onFallbackPollMsChange(Number(e.target.value) || 60000)} disabled={fallbackBusy} /> ms + onFallbackPollMsChange(Number(e.target.value))} disabled={fallbackBusy} aria-invalid={!validPollMs} /> ms - + {!validPollMs &&
{t("sub.fallbackPollInvalid")}
} +
diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 8985d342a0..4145cb8032 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -686,12 +686,6 @@ export const de: Record = { "sub.ultraModeLoadFail": "Ultra-Modus-Einstellungen konnten nicht geladen werden — läuft der Proxy?", "sub.ultraModeSaveFail": "Ultra-Modus-Einstellungen konnten nicht gespeichert werden", "sub.ultraModeSaved": "Ultra-Modus gespeichert. Gilt für neue Codex-Sitzungen.", - "sub.fallbackLabel": "Fallback-Kette für Sub-Agenten", - "sub.fallbackHint": "Geordnete Modelle, die versucht werden, wenn ein Sub-Agent-Modell nicht verfügbar ist oder fehlschlägt.", - "sub.fallbackAdd": "Fallback-Modell hinzufügen…", - "sub.fallbackPoll": "Intervall der Verfügbarkeitsprüfung", - "sub.fallbackSaved": "Fallback-Einstellungen für Sub-Agenten gespeichert.", - "sub.fallbackSaveFailed": "Fallback-Einstellungen konnten nicht gespeichert werden", "logs.title": "Anfrage-Protokolle", "logs.tabLogs": "Protokolle", "logs.tabDebug": "Diagnose", @@ -2414,6 +2408,18 @@ export const de: Record = { "sub.sections": "Subagent-Abschnitte", "sub.delegation.model": "Zuerst aufgerufenes Modell", "sub.delegation.modelHint": "Das Modell, zu dem Codex zuerst greift, wenn es Arbeit übergibt. Oben steht, wen es überhaupt aufrufen darf; hier wählst du den Ersten davon.", + "sub.fallbackLabel": "Fallback-Kette für Sub-Agenten", + "sub.fallbackHint": "Geordnete Modelle, die versucht werden, wenn ein Sub-Agent-Modell nicht verfügbar ist oder fehlschlägt.", + "sub.fallbackAdd": "Fallback-Modell hinzufügen…", + "sub.fallbackPoll": "Intervall der Verfügbarkeitsprüfung", + "sub.fallbackSaved": "Fallback-Einstellungen für Sub-Agenten gespeichert.", + "sub.fallbackSaveFailed": "Fallback-Einstellungen konnten nicht gespeichert werden", + "sub.fallbackUnavailable": "Derzeit nicht gelistet; bleibt in der Kette.", + "sub.fallbackPollInvalid": "Eine ganze Zahl von 5000 bis 600000 ms eingeben.", + "sub.v2Compatibility.title": "V2-Kompatibilität nativer Eltern", + "sub.v2Compatibility.risk": "Delegiert ein nativer ChatGPT-Elternagent über V2 an dieses geroutete Modell, kann die Aufgabe verschlüsselt sein und vor der Ausführung scheitern. Lesbare Aufgaben gerouteter Eltern sind nicht betroffen.", + "sub.v2Compatibility.recoveryUnknown": "Dieser Server meldet weder Aktivierung noch Eignung der Wiederherstellung. V1/Klartext verwenden oder experimentelle V2-Wiederherstellung nur bei Eignung aktivieren. Sie kostet Kontingent und Latenz, hängt vom Backend ab und kann Wiedergabetreue verlieren; das Upstream-Protokoll bleibt unverändert.", + "sub.v2Compatibility.details": "Details zur Kompatibilität", "dash.syncModelsHint": "Schreibt Codex' Modellkatalog anhand deiner verbundenen Provider neu.", "dash.syncRun": "Jetzt synchronisieren", "lab.title": "Kompatibilitäts-Labor", diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index a33c195e82..2a31ec7947 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -329,12 +329,6 @@ export const en = { "dash.visionTimeout": "Timeout", "dash.visionTimeoutInvalid": "Enter an integer from {min} to {max} milliseconds.", "dash.visionAdvancedPopover": "Advanced vision settings", - "sub.fallbackLabel": "Sub-agent fallback chain", - "sub.fallbackHint": "Ordered models tried when a sub-agent model is unavailable or fails.", - "sub.fallbackAdd": "Add fallback model…", - "sub.fallbackPoll": "Availability check interval", - "sub.fallbackSaved": "Sub-agent fallback settings saved.", - "sub.fallbackSaveFailed": "Failed to save fallback settings", "dash.shadowCallIntercept": "Shadow Call Intercept", "dash.shadowCallInterceptHint": "Intercepts Codex App's background helper calls ({models}) for title generation and commit messages and redirects them to your chosen model.", "dash.shadowCallWarning": "⚠ When enabled, ALL requests for {models} will be replaced with the selected model.", @@ -725,6 +719,18 @@ export const en = { "sub.workspace.selectModel": "Select a model", "sub.workspace.selectModelDesc": "Pick a model from the list to see details and feature it for spawn_agent.", "sub.workspace.selector": "Public selector", + "sub.fallbackLabel": "Sub-agent fallback chain", + "sub.fallbackHint": "Ordered models tried when a sub-agent model is unavailable or fails.", + "sub.fallbackAdd": "Add fallback model…", + "sub.fallbackPoll": "Availability check interval", + "sub.fallbackSaved": "Sub-agent fallback settings saved.", + "sub.fallbackSaveFailed": "Failed to save fallback settings", + "sub.fallbackUnavailable": "Not currently advertised; kept in the chain.", + "sub.fallbackPollInvalid": "Enter an integer from 5000 to 600000 ms.", + "sub.v2Compatibility.title": "Native-parent V2 compatibility", + "sub.v2Compatibility.risk": "If a native ChatGPT parent delegates to this routed model using V2, its task may be encrypted and fail before execution. Readable tasks from routed parents are unaffected.", + "sub.v2Compatibility.recoveryUnknown": "Recovery enabled/eligibility state is not exposed by this server. Use V1/plaintext-compatible delegation, or enable experimental V2 recovery only if eligible. Recovery adds quota, latency, backend dependence and possible fidelity loss; it does not fix the upstream protocol.", + "sub.v2Compatibility.details": "Compatibility details", // logs "logs.title": "Request Logs", diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index fa32925c02..753982c1bf 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -319,12 +319,6 @@ export const fr: Record = { "dash.visionTimeout": "Délai d’expiration", "dash.visionTimeoutInvalid": "Saisissez un entier compris entre {min} et {max} millisecondes.", "dash.visionAdvancedPopover": "Paramètres de vision avancés", - "sub.fallbackLabel": "Chaîne de secours des sous-agents", - "sub.fallbackHint": "Modèles essayés dans l’ordre lorsqu’un modèle de sous-agent est indisponible ou échoue.", - "sub.fallbackAdd": "Ajouter un modèle de secours…", - "sub.fallbackPoll": "Intervalle de vérification de disponibilité", - "sub.fallbackSaved": "Paramètres de secours des sous-agents enregistrés.", - "sub.fallbackSaveFailed": "Échec de l’enregistrement des paramètres de secours", "dash.shadowCallIntercept": "Interception des appels fantômes", "dash.shadowCallInterceptHint": "Intercepte les appels auxiliaires en arrière-plan de l’application Codex ({models}) pour générer les titres et les messages de commit, puis les redirige vers le modèle choisi.", "dash.shadowCallWarning": "⚠ Lorsque cette option est activée, TOUTES les requêtes destinées à {models} sont remplacées par le modèle sélectionné.", @@ -708,6 +702,18 @@ export const fr: Record = { "sub.workspace.selectModel": "Sélectionner un modèle", "sub.workspace.selectModelDesc": "Choisissez un modèle dans la liste pour afficher ses détails et le mettre à la une pour spawn_agent.", "sub.workspace.selector": "Sélecteur public", + "sub.fallbackLabel": "Chaîne de secours des sous-agents", + "sub.fallbackHint": "Modèles essayés dans l’ordre lorsqu’un modèle de sous-agent est indisponible ou échoue.", + "sub.fallbackAdd": "Ajouter un modèle de secours…", + "sub.fallbackPoll": "Intervalle de vérification de disponibilité", + "sub.fallbackSaved": "Paramètres de secours des sous-agents enregistrés.", + "sub.fallbackSaveFailed": "Échec de l’enregistrement des paramètres de secours", + "sub.fallbackUnavailable": "Absent du catalogue actuel ; conservé dans la chaîne.", + "sub.fallbackPollInvalid": "Saisissez un entier de 5000 à 600000 ms.", + "sub.v2Compatibility.title": "Compatibilité V2 du parent natif", + "sub.v2Compatibility.risk": "Si un parent ChatGPT natif délègue à ce modèle routé via V2, la tâche peut être chiffrée et échouer avant son exécution. Les tâches lisibles des parents routés ne sont pas affectées.", + "sub.v2Compatibility.recoveryUnknown": "Ce serveur ne fournit pas l’activation ni l’éligibilité de la récupération. Utilisez V1/texte clair, ou activez la récupération V2 expérimentale uniquement si éligible. Elle ajoute quota, latence, dépendance au backend et risque de perte de fidélité ; elle ne corrige pas le protocole amont.", + "sub.v2Compatibility.details": "Détails de compatibilité", "logs.title": "Journaux des requêtes", "logs.tabLogs": "Journaux", "logs.tabDebug": "Débogage", diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 81cd40bca9..300d1f8c51 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -646,12 +646,6 @@ export const ja: Record = { "sub.ultraModeLoadFail": "ウルトラモード設定を読み込めませんでした — プロキシは実行中ですか?", "sub.ultraModeSaveFail": "ウルトラモード設定の保存に失敗しました", "sub.ultraModeSaved": "ウルトラモードを保存しました。新しい Codex セッションから適用されます。", - "sub.fallbackLabel": "サブエージェントのフォールバックチェーン", - "sub.fallbackHint": "サブエージェントモデルが利用できないか失敗した場合に順番に試すモデルです。", - "sub.fallbackAdd": "フォールバックモデルを追加…", - "sub.fallbackPoll": "利用可能性チェック間隔", - "sub.fallbackSaved": "サブエージェントのフォールバック設定を保存しました。", - "sub.fallbackSaveFailed": "フォールバック設定の保存に失敗しました", // logs "logs.title": "リクエストログ", @@ -2435,6 +2429,18 @@ export const ja: Record = { "sub.sections": "サブエージェントのセクション", "sub.delegation.model": "最初に呼ぶモデル", "sub.delegation.modelHint": "Codex が作業を任せるとき、最初に呼ぶモデルです。上のおすすめが呼べる候補で、ここで選んだものがその中の第一候補になります。", + "sub.fallbackLabel": "サブエージェントのフォールバックチェーン", + "sub.fallbackHint": "サブエージェントモデルが利用できないか失敗した場合に順番に試すモデルです。", + "sub.fallbackAdd": "フォールバックモデルを追加…", + "sub.fallbackPoll": "利用可能性チェック間隔", + "sub.fallbackSaved": "サブエージェントのフォールバック設定を保存しました。", + "sub.fallbackSaveFailed": "フォールバック設定の保存に失敗しました", + "sub.fallbackUnavailable": "現在の一覧にはありませんが、チェーンに保持されます。", + "sub.fallbackPollInvalid": "5000〜600000 ms の整数を入力してください。", + "sub.v2Compatibility.title": "ネイティブ親の V2 互換性", + "sub.v2Compatibility.risk": "ネイティブ ChatGPT 親が V2 でこのルーティングモデルに委任すると、タスクが暗号化され実行前に失敗する場合があります。ルーティング親からの読み取り可能なタスクは影響を受けません。", + "sub.v2Compatibility.recoveryUnknown": "このサーバーは復旧の有効状態や適格性を公開していません。V1・平文互換の委任を使うか、適格な場合のみ実験的 V2 復旧を有効にしてください。復旧にはクォータ、遅延、バックエンド依存、忠実度低下の可能性があり、上流プロトコルは修正されません。", + "sub.v2Compatibility.details": "互換性の詳細", "dash.syncModelsHint": "接続済みのプロバイダーをもとに Codex のモデルカタログを書き直します。", "dash.syncRun": "今すぐ同期", "lab.title": "Compatibility Lab", diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 35a726e6ba..42c000c6bb 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -709,6 +709,12 @@ export const ko: Record = { "sub.fallbackPoll": "가용성 확인 간격", "sub.fallbackSaved": "서브에이전트 폴백 설정을 저장했습니다.", "sub.fallbackSaveFailed": "폴백 설정을 저장하지 못했습니다", + "sub.fallbackUnavailable": "현재 목록에 없지만 체인에 유지됩니다.", + "sub.fallbackPollInvalid": "5000~600000ms 범위의 정수를 입력하세요.", + "sub.v2Compatibility.title": "네이티브 부모의 V2 호환성", + "sub.v2Compatibility.risk": "네이티브 ChatGPT 부모가 V2로 이 라우팅 모델에 위임하면 작업이 암호화되어 실행 전에 실패할 수 있습니다. 라우팅 부모가 보내는 읽을 수 있는 작업에는 영향이 없습니다.", + "sub.v2Compatibility.recoveryUnknown": "이 서버는 복구 활성화 여부와 사용 가능 상태를 제공하지 않습니다. V1·평문 호환 위임을 사용하거나, 조건을 충족할 때만 실험적 V2 복구를 켜세요. 복구에는 할당량·지연·백엔드 의존성과 원문 충실도 손실 가능성이 따르며, 업스트림 프로토콜을 고치지는 않습니다.", + "sub.v2Compatibility.details": "호환성 자세히 보기", // logs "logs.title": "요청 로그", diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index a7cc5f72e8..51fcaef210 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -701,12 +701,6 @@ export const ru: Record = { "sub.ultraModeLoadFail": "Не удалось загрузить настройки ультра-режима — работает ли прокси?", "sub.ultraModeSaveFail": "Не удалось сохранить настройки ультра-режима", "sub.ultraModeSaved": "Ультра-режим сохранён. Применяется к новым сеансам Codex.", - "sub.fallbackLabel": "Цепочка резервных моделей субагента", - "sub.fallbackHint": "Модели, которые последовательно пробуются, если модель субагента недоступна или завершается ошибкой.", - "sub.fallbackAdd": "Добавить резервную модель…", - "sub.fallbackPoll": "Интервал проверки доступности", - "sub.fallbackSaved": "Настройки резервных моделей субагента сохранены.", - "sub.fallbackSaveFailed": "Не удалось сохранить настройки резервных моделей", // logs "logs.title": "Журнал запросов", @@ -2437,6 +2431,18 @@ export const ru: Record = { "sub.sections": "Разделы подагентов", "sub.delegation.model": "Модель, которую вызывать первой", "sub.delegation.modelHint": "Модель, к которой Codex обращается первой, когда передаёт работу. Список выше — кого он вообще может вызвать, а здесь выбирается первый в очереди.", + "sub.fallbackLabel": "Цепочка резервных моделей субагента", + "sub.fallbackHint": "Модели, которые последовательно пробуются, если модель субагента недоступна или завершается ошибкой.", + "sub.fallbackAdd": "Добавить резервную модель…", + "sub.fallbackPoll": "Интервал проверки доступности", + "sub.fallbackSaved": "Настройки резервных моделей субагента сохранены.", + "sub.fallbackSaveFailed": "Не удалось сохранить настройки резервных моделей", + "sub.fallbackUnavailable": "Сейчас отсутствует в каталоге; сохранена в цепочке.", + "sub.fallbackPollInvalid": "Введите целое число от 5000 до 600000 мс.", + "sub.v2Compatibility.title": "Совместимость V2 с нативным родителем", + "sub.v2Compatibility.risk": "Если нативный родитель ChatGPT делегирует этой маршрутизируемой модели через V2, задача может быть зашифрована и завершиться ошибкой до выполнения. Читаемые задачи маршрутизируемых родителей не затрагиваются.", + "sub.v2Compatibility.recoveryUnknown": "Сервер не сообщает, включено ли восстановление и доступно ли оно. Используйте V1/открытый текст или включите экспериментальное восстановление V2 только при соответствии условиям. Оно расходует квоту, увеличивает задержку, зависит от бэкенда и может снизить точность; исходный протокол не исправляется.", + "sub.v2Compatibility.details": "Подробнее о совместимости", "dash.syncModelsHint": "Перезаписывает каталог моделей Codex по подключённым провайдерам.", "dash.syncRun": "Синхронизировать", "lab.title": "Compatibility Lab", diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index 5c0ade9077..c764bf11ca 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -714,6 +714,12 @@ export const tr: Record = { "sub.fallbackPoll": "Kullanılabilirlik kontrol aralığı", "sub.fallbackSaved": "Alt ajan yedek ayarları kaydedildi.", "sub.fallbackSaveFailed": "Yedek ayarlar kaydedilemedi", + "sub.fallbackUnavailable": "Şu anda listelenmiyor; zincirde korunur.", + "sub.fallbackPollInvalid": "5000–600000 ms arasında bir tam sayı girin.", + "sub.v2Compatibility.title": "Yerel üst ajanın V2 uyumluluğu", + "sub.v2Compatibility.risk": "Yerel ChatGPT üst ajanı V2 ile bu yönlendirilmiş modele görev verirse görev şifrelenmiş olabilir ve yürütülmeden başarısız olabilir. Yönlendirilmiş üst ajanların okunabilir görevleri etkilenmez.", + "sub.v2Compatibility.recoveryUnknown": "Bu sunucu kurtarmanın etkinliğini veya uygunluğunu bildirmez. V1/düz metin kullanın ya da deneysel V2 kurtarmayı yalnızca uygunsa açın. Kurtarma kota, gecikme, arka uç bağımlılığı ve aslına uygunluk kaybı getirebilir; üst sistem protokolünü düzeltmez.", + "sub.v2Compatibility.details": "Uyumluluk ayrıntıları", // logs "logs.title": "İstek Günlükleri", diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index cae0175057..ab6aedd67a 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -555,12 +555,6 @@ export const zhTW: Record = { "sub.ultraModeLoadFail": "無法載入超級模式設定 — 代理是否在執行?", "sub.ultraModeSaveFail": "儲存超級模式設定失敗", "sub.ultraModeSaved": "超級模式已儲存。適用於新的 Codex 會話。", - "sub.fallbackLabel": "子代理備援鏈", - "sub.fallbackHint": "子代理模型無法使用或失敗時,依序嘗試的模型。", - "sub.fallbackAdd": "新增備援模型…", - "sub.fallbackPoll": "可用性檢查間隔", - "sub.fallbackSaved": "子代理備援設定已儲存。", - "sub.fallbackSaveFailed": "備援設定儲存失敗", "logs.title": "請求日誌", "logs.tabLogs": "日誌", "logs.tabDebug": "除錯", @@ -1972,6 +1966,18 @@ export const zhTW: Record = { "sub.sections": "子代理分區", "sub.delegation.model": "優先調用的模型", "sub.delegation.modelHint": "Codex 分派工作時最先調用的模型。上面的推薦是可調用的名單,這裡選的是其中第一順位。", + "sub.fallbackLabel": "子代理備援鏈", + "sub.fallbackHint": "子代理模型無法使用或失敗時,依序嘗試的模型。", + "sub.fallbackAdd": "新增備援模型…", + "sub.fallbackPoll": "可用性檢查間隔", + "sub.fallbackSaved": "子代理備援設定已儲存。", + "sub.fallbackSaveFailed": "備援設定儲存失敗", + "sub.fallbackUnavailable": "目前未列出,仍保留在回退鏈中。", + "sub.fallbackPollInvalid": "請輸入 5000 到 600000 ms 之間的整數。", + "sub.v2Compatibility.title": "原生父代理的 V2 相容性", + "sub.v2Compatibility.risk": "原生 ChatGPT 父代理透過 V2 委派給此路由模型時,任務可能被加密並在執行前失敗。路由父代理傳送的可讀任務不受影響。", + "sub.v2Compatibility.recoveryUnknown": "此伺服器未提供復原功能的啟用或適用狀態。請使用 V1/明文相容委派,或僅在符合條件時啟用實驗性 V2 復原。復原會增加配額消耗、延遲、後端依賴及保真度損失風險,並不修復上游協定。", + "sub.v2Compatibility.details": "相容性詳情", "debug.loadFailed": "無法載入偵錯設定。", "provider.name.volcengine": "Volcengine Ark", "provider.name.volcengineCodingPlan": "Volcengine Ark Coding Plan", diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index ce44edc693..052f449855 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -696,12 +696,6 @@ export const zh: Record = { "sub.ultraModeLoadFail": "无法加载超级模式设置 — 代理是否在运行?", "sub.ultraModeSaveFail": "保存超级模式设置失败", "sub.ultraModeSaved": "超级模式已保存。适用于新的 Codex 会话。", - "sub.fallbackLabel": "子代理回退链", - "sub.fallbackHint": "子代理模型不可用或失败时按顺序尝试的模型。", - "sub.fallbackAdd": "添加回退模型…", - "sub.fallbackPoll": "可用性检查间隔", - "sub.fallbackSaved": "子代理回退设置已保存。", - "sub.fallbackSaveFailed": "保存回退设置失败", // logs "logs.title": "请求日志", @@ -2435,6 +2429,18 @@ export const zh: Record = { "sub.sections": "子代理分区", "sub.delegation.model": "优先调用的模型", "sub.delegation.modelHint": "Codex 分派工作时最先调用的模型。上面的推荐是可调用的名单,这里选的是其中第一顺位。", + "sub.fallbackLabel": "子代理回退链", + "sub.fallbackHint": "子代理模型不可用或失败时按顺序尝试的模型。", + "sub.fallbackAdd": "添加回退模型…", + "sub.fallbackPoll": "可用性检查间隔", + "sub.fallbackSaved": "子代理回退设置已保存。", + "sub.fallbackSaveFailed": "保存回退设置失败", + "sub.fallbackUnavailable": "当前未列出,仍保留在回退链中。", + "sub.fallbackPollInvalid": "请输入 5000 到 600000 ms 之间的整数。", + "sub.v2Compatibility.title": "原生父代理的 V2 兼容性", + "sub.v2Compatibility.risk": "原生 ChatGPT 父代理通过 V2 委派给此路由模型时,任务可能被加密并在执行前失败。路由父代理发送的可读任务不受影响。", + "sub.v2Compatibility.recoveryUnknown": "此服务器未提供恢复功能的启用或适用状态。请使用 V1/明文兼容委派,或仅在符合条件时启用实验性 V2 恢复。恢复会增加配额消耗、延迟、后端依赖及保真度损失风险,并不修复上游协议。", + "sub.v2Compatibility.details": "兼容性详情", "dash.syncModelsHint": "按已连接的提供商重写 Codex 的模型目录。", "dash.syncRun": "立即同步", "lab.title": "Compatibility Lab", diff --git a/gui/src/pages/Subagents.tsx b/gui/src/pages/Subagents.tsx index 299c9306fe..cbdb138e33 100644 --- a/gui/src/pages/Subagents.tsx +++ b/gui/src/pages/Subagents.tsx @@ -22,6 +22,8 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const [fallback, setFallback] = useState(() => cached?.fallback ?? []); const [fallbackPollMs, setFallbackPollMs] = useState(() => cached?.pollMs ?? 60000); const [fallbackBusy, setFallbackBusy] = useState(false); + const fallbackSaveInFlight = useRef(false); + const committed = useRef(cached); const [status, setStatus] = useState(""); const [ok, setOk] = useState(false); const [busy, setBusy] = useState(false); @@ -49,12 +51,15 @@ export default function Subagents({ apiBase }: { apiBase: string }) { enabled?: boolean; multiAgentMode?: "v1" | "default" | "v2"; multiAgentModeHintText?: string | null; + keepNativeChatGptOnV1?: boolean; }>(res, t("sub.ultraModeLoadFail")); if (!data) return false; if (signal?.aborted || generation !== ultraLoadGeneration.current || currentUltraApiBase.current !== apiBase) return false; setUltraLoadFailed(false); setUltraMode({ enabled: data.enabled ?? false, + loaded: true, + keepNativeChatGptOnV1: data.keepNativeChatGptOnV1 === true, hintText: data.multiAgentModeHintText ?? null, // Ultra mode replaces Codex's effort-derived policy for every model. The // `default` surface still preserves upstream V1 pins (for example luna), @@ -132,9 +137,12 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const next = { available, chosen: (response.chosen ?? []).filter(model => availableSet.has(model)), - fallback: (fallbackResponse.models ?? []).filter(model => availableSet.has(model)), + // Configured targets remain editable even when discovery no longer advertises them. + fallback: fallbackResponse.models ?? [], pollMs: fallbackResponse.pollMs ?? 60000, }; + if (signal?.aborted) throw signal.reason; + committed.current = next; setChosen(next.chosen); setFallback(next.fallback); setFallbackPollMs(next.pollMs); @@ -185,7 +193,9 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const d = await readJsonOrThrow<{ applied?: string[] }>(r, t("sub.saveFailed")); const applied = d?.applied ?? chosen; if (d?.applied) setChosen(d.applied); - writeSessionListCache(cacheKey, { available, chosen: applied, fallback, pollMs: fallbackPollMs }); + const next = { available, chosen: applied, fallback: committed.current?.fallback ?? [], pollMs: committed.current?.pollMs ?? 60000 }; + committed.current = next; + writeSessionListCache(cacheKey, next); setOk(true); setStatus(t("sub.saved", { n: applied.length, cmd: "ocx sync" })); } catch (error) { @@ -198,8 +208,11 @@ export default function Subagents({ apiBase }: { apiBase: string }) { }; const saveFallback = async () => { - if (fallbackBusy) return; + if (fallbackSaveInFlight.current || !Number.isInteger(fallbackPollMs) || fallbackPollMs < 5000 || fallbackPollMs > 600000) return; + fallbackSaveInFlight.current = true; + const requestApiBase = apiBase; setFallbackBusy(true); + setStatus(""); try { const r = await fetch(`${apiBase}/api/subagent-model-fallback`, { method: "PUT", @@ -207,14 +220,20 @@ export default function Subagents({ apiBase }: { apiBase: string }) { body: JSON.stringify({ models: fallback, pollMs: fallbackPollMs }), }); const d = await readJsonOrThrow<{ models?: string[]; pollMs?: number }>(r, t("sub.fallbackSaveFailed")); - if (d?.models) setFallback(d.models); - if (d?.pollMs) setFallbackPollMs(d.pollMs); + if (currentUltraApiBase.current !== requestApiBase) return; + if (!d || !Array.isArray(d.models) || typeof d.pollMs !== "number") throw new Error(t("sub.fallbackSaveFailed")); + setFallback(d.models); + setFallbackPollMs(d.pollMs); + const next = { available, chosen: committed.current?.chosen ?? [], fallback: d.models, pollMs: d.pollMs }; + committed.current = next; + writeSessionListCache(cacheKey, next); setOk(true); setStatus(t("sub.fallbackSaved")); } catch (error) { setOk(false); setStatus(error instanceof Error && error.message ? error.message : t("sub.networkError")); } finally { + fallbackSaveInFlight.current = false; setFallbackBusy(false); } }; diff --git a/gui/src/pages/use-subagent-delegation.ts b/gui/src/pages/use-subagent-delegation.ts index 716eb11482..9baa5baa9a 100644 --- a/gui/src/pages/use-subagent-delegation.ts +++ b/gui/src/pages/use-subagent-delegation.ts @@ -21,6 +21,8 @@ export type DelegationPatch = { /** Ultra mode (Proactive delegation for every model/effort) via /api/v2. */ export type UltraModeState = { + loaded?: boolean; + keepNativeChatGptOnV1?: boolean; enabled: boolean; hintText: string | null; multiAgentV2Enabled: boolean; diff --git a/gui/src/styles-subagents-workspace.css b/gui/src/styles-subagents-workspace.css index c6292077b7..a9f9466ce7 100644 --- a/gui/src/styles-subagents-workspace.css +++ b/gui/src/styles-subagents-workspace.css @@ -575,3 +575,16 @@ } } } + + +/* Fallback targets keep their identifiers readable next to row actions. */ +.swi-fallback-controls { display: flex; flex-direction: column; align-items: stretch; gap: var(--space-2); flex: 1 1 55%; min-width: 0; } +.swi-fallback-row { display: flex; align-items: center; justify-content: space-between; gap: var(--space-2); } +.swi-fallback-model { min-width: 0; overflow-wrap: anywhere; } +.swi-fallback-model .setting-hint { display: block; } +.swi-fallback-actions { display: inline-flex; flex-shrink: 0; } +.swi-fallback-controls > .btn { align-self: flex-end; } +@media (max-width: 640px) { + .swi-fallback-editor { flex-direction: column; } + .swi-fallback-controls { width: 100%; } +} diff --git a/gui/tests/multi-agent-guidance.test.tsx b/gui/tests/multi-agent-guidance.test.tsx index 16470385b8..8907406f0e 100644 --- a/gui/tests/multi-agent-guidance.test.tsx +++ b/gui/tests/multi-agent-guidance.test.tsx @@ -65,7 +65,14 @@ function props(overrides: Partial = {}): Props { guidanceEnabled: false, syncCodexDefaults: true, onSave: (patch) => { requests.push(patch); }, - ultraMode: { enabled: false, hintText: null, multiAgentV2Enabled: false }, + ultraMode: { enabled: false, hintText: null, multiAgentV2Enabled: false, multiAgentMode: "default" }, + fallback: [], + fallbackPollMs: 60000, + fallbackBusy: false, + availableModels: [], + onFallbackChange: () => {}, + onFallbackPollMsChange: () => {}, + onFallbackSave: () => {}, ultraSaving: false, onUltraModeSave: () => {}, ultraLoadFailed: false, diff --git a/gui/tests/subagents-fallback.test.tsx b/gui/tests/subagents-fallback.test.tsx new file mode 100644 index 0000000000..20badc4980 --- /dev/null +++ b/gui/tests/subagents-fallback.test.tsx @@ -0,0 +1,422 @@ +import { afterEach, beforeEach, expect, test } from "bun:test"; +import { Window } from "happy-dom"; +import { act } from "react"; +import type { Root } from "react-dom/client"; +import { clearClientResourceStoresForTests } from "../src/client-resource"; +import { en } from "../src/i18n/en"; +import { LanguageProvider } from "../src/i18n/provider"; +import Subagents from "../src/pages/Subagents"; +import { readSessionListCache } from "../src/session-list-cache"; + +const CACHE_KEY = "ocx.subagents.v1:"; +const FALLBACK_PATH = "/api/subagent-model-fallback"; +const ROSTER_PATH = "/api/subagent-models"; +const UNAVAILABLE_MODEL = "retired-provider/configured-model"; +const globals = [ + "document", "window", "navigator", "localStorage", "sessionStorage", "fetch", "IS_REACT_ACT_ENVIRONMENT", +] as const; + +type CachedSubagents = { available: string[]; chosen: string[]; fallback: string[]; pollMs: number }; +type FallbackSettings = { models: string[]; pollMs: number }; +type SentRequest = { path: string; method: string; init?: RequestInit }; +type V2Settings = { + enabled: boolean; + multiAgentMode: "v1" | "default" | "v2"; + multiAgentModeHintText: string | null; + keepNativeChatGptOnV1: boolean; +}; + +let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; +let testWindow: Window; +let container: HTMLElement; +let root: Root | null = null; +let requests: SentRequest[]; +let available: string[]; +let chosen: string[]; +let fallbackSettings: FallbackSettings; +let failFallbackPut: boolean; +let v2Settings: V2Settings; +let preferredModel: string | null; +let fallbackGetGate: Promise | null; + +beforeEach(() => { + clearClientResourceStoresForTests(); + previousGlobals = Object.fromEntries(globals.map(key => [key, Object.getOwnPropertyDescriptor(globalThis, key)])) as typeof previousGlobals; + testWindow = new Window({ url: "http://localhost/" }); + Object.defineProperty(testWindow.navigator, "language", { configurable: true, value: "en-US" }); + Object.defineProperties(globalThis, { + document: { configurable: true, value: testWindow.document }, + window: { configurable: true, value: testWindow }, + navigator: { configurable: true, value: testWindow.navigator }, + localStorage: { configurable: true, value: testWindow.localStorage }, + sessionStorage: { configurable: true, value: testWindow.sessionStorage }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true }, + }); + + requests = []; + available = ["a-1", "a-2", "a-3"]; + chosen = ["a-1"]; + fallbackSettings = { models: ["a-2"], pollMs: 45_000 }; + failFallbackPut = false; + v2Settings = { enabled: true, multiAgentMode: "v2", multiAgentModeHintText: null, keepNativeChatGptOnV1: false }; + preferredModel = null; + fallbackGetGate = null; + Object.defineProperty(globalThis, "fetch", { + configurable: true, + value: async (input: RequestInfo | URL, init?: RequestInit) => { + const path = new URL(String(input), "http://localhost/").pathname; + const method = init?.method ?? "GET"; + requests.push({ path, method, init }); + // Match agent-settings-routes: fallback uses models, roster uses chosen/applied. + if (path === FALLBACK_PATH && method === "GET") { + if (fallbackGetGate) await fallbackGetGate; + return Response.json({ ...fallbackSettings, available }); + } + if (path === FALLBACK_PATH && method === "PUT") { + if (failFallbackPut) return Response.json({ error: "Fallback settings could not be persisted" }, { status: 500 }); + fallbackSettings = JSON.parse(String(init?.body)) as FallbackSettings; + return Response.json({ ok: true, ...fallbackSettings }); + } + if (path === ROSTER_PATH && method === "GET") return Response.json({ available, chosen }); + if (path === ROSTER_PATH && method === "PUT") { + chosen = (JSON.parse(String(init?.body)) as { models: string[] }).models; + return Response.json({ applied: chosen }); + } + if (path === "/api/v2" && method === "GET") { + return Response.json(v2Settings); + } + if (path === "/api/injection-model" && method === "GET") { + return Response.json({ + model: preferredModel, + effort: null, + available: [ + { provider: "openai", model: "gpt-5.4", namespaced: "gpt-5.4" }, + { provider: "anthropic", model: "claude-sonnet-4-6", namespaced: "anthropic/claude-sonnet-4-6" }, + ], + efforts: [], + }); + } + throw new Error(`Unexpected request: ${method} ${path}`); + }, + }); + container = testWindow.document.createElement("div") as unknown as HTMLElement; + testWindow.document.body.appendChild(container); +}); + +afterEach(async () => { + try { + if (root) { + const current = root; + await act(async () => { current.unmount(); }); + root = null; + } + } finally { + clearClientResourceStoresForTests(); + testWindow.close(); + for (const key of globals) { + const descriptor = previousGlobals[key]; + if (descriptor) Object.defineProperty(globalThis, key, descriptor); + else Reflect.deleteProperty(globalThis, key); + } + } +}); + +async function mount() { + // Match sibling input tests: initialize ReactDOM's event support after installing the DOM. + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root = createRoot(container); + root.render(); + }); + expect(requests.some(request => request.path === FALLBACK_PATH && request.method === "GET")).toBe(true); + expect(editor()).toBeTruthy(); +} + +function editor(): HTMLElement { + const element = container.querySelector(".swi-fallback-editor"); + if (!element) throw new Error("Fallback editor not found"); + return element; +} + +function rows(): HTMLElement[] { + return Array.from(editor().querySelectorAll(".swi-fallback-row")); +} + +function expectOrder(models: string[]) { + expect(rows()).toHaveLength(models.length); + models.forEach((model, index) => { + // The model span can also contain the unavailable-model warning. + expect(rows()[index]?.querySelector("span")?.textContent?.trim().startsWith(`${index + 1}. ${model}`)).toBe(true); + expect(rowButton(index, "sub.removeAria", model)).toBeTruthy(); + }); +} + +function labelledButton(scope: ParentNode, label: string): HTMLButtonElement { + const button = Array.from(scope.querySelectorAll("button")) + .find(candidate => candidate.getAttribute("aria-label") === label); + if (!button) throw new Error(`Button not found: ${label}`); + return button; +} + +function rowButton(index: number, key: "sub.moveUp" | "sub.moveDown" | "sub.removeAria", model: string) { + const row = rows()[index]; + if (!row) throw new Error(`Fallback row not found: ${index}`); + return labelledButton(row, en[key].replace("{m}", model)); +} + +function saveButton(scope: ParentNode = editor()): HTMLButtonElement { + const button = Array.from(scope.querySelectorAll("button")) + .find(candidate => candidate.textContent?.trim() === en["common.save"]); + if (!button) throw new Error("Save button not found"); + return button; +} + +async function click(button: HTMLButtonElement) { + expect(button.disabled).toBe(false); + await act(async () => { button.click(); }); +} + +async function addFallback(model: string) { + const trigger = labelledButton(editor(), en["sub.fallbackAdd"]); + expect(trigger.getAttribute("role")).toBe("combobox"); + await click(trigger); + // Select portals its listbox into document.body, outside the page container. + const listbox = testWindow.document.getElementById(trigger.getAttribute("aria-controls") ?? ""); + if (!listbox) throw new Error("Fallback model listbox not found"); + const option = Array.from(listbox.querySelectorAll('[role="option"]')) + .find(candidate => candidate.textContent?.trim() === model); + if (!option) throw new Error(`Fallback option not found: ${model}`); + await click(option as unknown as HTMLButtonElement); + expect(trigger.getAttribute("aria-expanded")).toBe("false"); +} + +function pollInput(): HTMLInputElement { + const input = editor().querySelector('input[type="number"]'); + if (!input) throw new Error("Fallback polling interval input not found"); + return input; +} + +async function changePollMs(value: number) { + await act(async () => { + const input = pollInput(); + Object.getOwnPropertyDescriptor(testWindow.HTMLInputElement.prototype, "value")!.set!.call(input, String(value)); + input.dispatchEvent(new testWindow.Event("input", { bubbles: true })); + input.dispatchEvent(new testWindow.Event("change", { bubbles: true })); + }); +} + +function putBodies(path = FALLBACK_PATH): unknown[] { + return requests.filter(request => request.path === path && request.method === "PUT") + .map(request => JSON.parse(String(request.init?.body)) as unknown); +} + +function cached(): CachedSubagents | null { + return readSessionListCache(CACHE_KEY); +} + +test("preserves an unavailable configured fallback ID on load and save", async () => { + fallbackSettings = { models: [UNAVAILABLE_MODEL, "a-2"], pollMs: 45_000 }; + expect(available).not.toContain(UNAVAILABLE_MODEL); + await mount(); + + expectOrder([UNAVAILABLE_MODEL, "a-2"]); + expect(rows()[0]?.textContent).toContain(en["sub.fallbackUnavailable"]); + expect(rows()[1]?.textContent).not.toContain(en["sub.fallbackUnavailable"]); + expect(cached()?.fallback).toEqual([UNAVAILABLE_MODEL, "a-2"]); + await click(saveButton()); + expect(putBodies()).toEqual([{ models: [UNAVAILABLE_MODEL, "a-2"], pollMs: 45_000 }]); + expectOrder([UNAVAILABLE_MODEL, "a-2"]); + expect(container.textContent).toContain(en["sub.fallbackSaved"]); +}); + +test("adds, reorders in both directions, and removes fallback models before saving their exact order", async () => { + await mount(); + await addFallback("a-3"); + expectOrder(["a-2", "a-3"]); + expect(rowButton(0, "sub.moveUp", "a-2").disabled).toBe(true); + expect(rowButton(1, "sub.moveDown", "a-3").disabled).toBe(true); + + await click(rowButton(1, "sub.moveUp", "a-3")); + expectOrder(["a-3", "a-2"]); + await click(rowButton(0, "sub.moveDown", "a-3")); + expectOrder(["a-2", "a-3"]); + await addFallback("a-1"); + await click(rowButton(0, "sub.removeAria", "a-2")); + expectOrder(["a-3", "a-1"]); + expect(putBodies()).toEqual([]); + + await click(saveButton()); + expect(putBodies()).toEqual([{ models: ["a-3", "a-1"], pollMs: 45_000 }]); + expect(putBodies(ROSTER_PATH)).toEqual([]); +}); + +test("removes only the selected duplicate fallback occurrence by index", async () => { + fallbackSettings.models = ["a-2", "a-1", "a-2", "a-3"]; + await mount(); + expectOrder(["a-2", "a-1", "a-2", "a-3"]); + + await click(rowButton(2, "sub.removeAria", "a-2")); + expectOrder(["a-2", "a-1", "a-3"]); + await click(saveButton()); + expect(putBodies()).toEqual([{ models: ["a-2", "a-1", "a-3"], pollMs: 45_000 }]); +}); + +test("a failed fallback PUT retains the editable draft and leaves the committed cache unchanged", async () => { + await mount(); + const committed = cached(); + expect(committed).toEqual({ available, chosen: ["a-1"], fallback: ["a-2"], pollMs: 45_000 }); + await addFallback("a-3"); + await changePollMs(90_000); + failFallbackPut = true; + await click(saveButton()); + + expect(putBodies()).toEqual([{ models: ["a-2", "a-3"], pollMs: 90_000 }]); + expectOrder(["a-2", "a-3"]); + expect(pollInput().value).toBe("90000"); + expect(container.textContent).toContain("Fallback settings could not be persisted"); + expect(container.textContent).not.toContain(en["sub.fallbackSaved"]); + expect(saveButton().disabled).toBe(false); + expect(cached()).toEqual(committed); + + failFallbackPut = false; + await click(saveButton()); + expect(putBodies()).toEqual([ + { models: ["a-2", "a-3"], pollMs: 90_000 }, + { models: ["a-2", "a-3"], pollMs: 90_000 }, + ]); + expect(cached()?.fallback).toEqual(["a-2", "a-3"]); + expect(cached()?.pollMs).toBe(90_000); +}); + +test("a successful fallback save updates committed session data without committing a roster draft", async () => { + await mount(); + await click(labelledButton(container, en["sub.workspace.addToFeatured"].replace("{m}", "a-3"))); + await addFallback("a-3"); + await changePollMs(120_000); + await click(saveButton()); + + expect(putBodies()).toEqual([{ models: ["a-2", "a-3"], pollMs: 120_000 }]); + expect(putBodies(ROSTER_PATH)).toEqual([]); + expect(cached()).toEqual({ available, chosen: ["a-1"], fallback: ["a-2", "a-3"], pollMs: 120_000 }); + expectOrder(["a-2", "a-3"]); + expect(container.querySelectorAll(".swi-featured-row").length).toBe(2); +}); + +test("independent roster Save never caches an unsaved fallback draft", async () => { + await mount(); + await addFallback("a-3"); + await changePollMs(90_000); + await click(labelledButton(container, en["sub.workspace.addToFeatured"].replace("{m}", "a-3"))); + const rosterSaveRow = container.querySelector(".swi-save-row"); + if (!rosterSaveRow) throw new Error("Roster Save row not found"); + await click(saveButton(rosterSaveRow)); + + expect(putBodies(ROSTER_PATH)).toEqual([{ models: ["a-1", "a-3"] }]); + expect(putBodies()).toEqual([]); + expect(cached()).toEqual({ available, chosen: ["a-1", "a-3"], fallback: ["a-2"], pollMs: 45_000 }); + expectOrder(["a-2", "a-3"]); + expect(pollInput().value).toBe("90000"); + + // Saving the fallback afterward must retain the already committed roster. + await click(saveButton()); + expect(putBodies()).toEqual([{ models: ["a-2", "a-3"], pollMs: 90_000 }]); + expect(cached()).toEqual({ available, chosen: ["a-1", "a-3"], fallback: ["a-2", "a-3"], pollMs: 90_000 }); +}); + +test("remount shows the committed fallback and roster while a fresh fallback GET is pending", async () => { + await mount(); + await addFallback("a-3"); + await changePollMs(120_000); + await click(saveButton()); + + // A later roster save must not commit these newer fallback edits. + await click(rowButton(0, "sub.removeAria", "a-2")); + await changePollMs(90_000); + await click(labelledButton(container, en["sub.workspace.addToFeatured"].replace("{m}", "a-3"))); + const rosterSaveRow = container.querySelector(".swi-save-row"); + if (!rosterSaveRow) throw new Error("Roster Save row not found"); + await click(saveButton(rosterSaveRow)); + expectOrder(["a-3"]); + expect(pollInput().value).toBe("90000"); + + const current = root!; + await act(async () => { current.unmount(); }); + root = null; + // Keep sessionStorage, but discard the resource store so it cannot mask a stale session seed. + clearClientResourceStoresForTests(); + const getsBefore = requests.filter(request => request.path === FALLBACK_PATH && request.method === "GET").length; + let releaseGet!: () => void; + fallbackGetGate = new Promise(resolve => { releaseGet = resolve; }); + try { + await mount(); + expect(requests.filter(request => request.path === FALLBACK_PATH && request.method === "GET")).toHaveLength(getsBefore + 1); + // These assertions run before the fresh GET can return any data. + expectOrder(["a-2", "a-3"]); + expect(pollInput().value).toBe("120000"); + expect(Array.from(container.querySelectorAll(".swi-featured-name"), node => node.textContent?.trim())) + .toEqual(["a-1", "a-3"]); + expect(cached()).toEqual({ available, chosen: ["a-1", "a-3"], fallback: ["a-2", "a-3"], pollMs: 120_000 }); + } finally { + await act(async () => { releaseGet(); }); + fallbackGetGate = null; + } + expectOrder(["a-2", "a-3"]); + expect(pollInput().value).toBe("120000"); +}); + +test("invalid polling intervals disable Save without a PUT or cache mutation, and a valid interval recovers", async () => { + await mount(); + const committed = cached(); + for (const interval of [0, 4_999, 600_001, 5_000.5]) { + await changePollMs(interval); + expect(pollInput().getAttribute("aria-invalid")).toBe("true"); + expect(editor().querySelector('[role="alert"]')?.textContent).toContain(en["sub.fallbackPollInvalid"]); + expect(saveButton().disabled).toBe(true); + await act(async () => { saveButton().click(); }); + expect(putBodies()).toEqual([]); + expect(cached()).toEqual(committed); + } + + await changePollMs(5_000); + expect(pollInput().getAttribute("aria-invalid")).toBe("false"); + expect(editor().querySelector('[role="alert"]')).toBeNull(); + await click(saveButton()); + expect(putBodies()).toEqual([{ models: ["a-2"], pollMs: 5_000 }]); + expect(cached()?.pollMs).toBe(5_000); +}); + +const compatibilityCases: Array<{ + name: string; + model: string; + enabled: boolean; + mode: V2Settings["multiAgentMode"]; + keepNative: boolean; + warning: boolean; +}> = [ + { name: "native preferred model", model: "gpt-5.4", enabled: true, mode: "v2", keepNative: false, warning: false }, + { name: "routed preferred model on the default surface", model: "anthropic/claude-sonnet-4-6", enabled: false, mode: "default", keepNative: false, warning: true }, + { name: "routed preferred model on V1", model: "anthropic/claude-sonnet-4-6", enabled: false, mode: "v1", keepNative: false, warning: false }, + { name: "forced V2 preserving native V1 with global V2 disabled", model: "anthropic/claude-sonnet-4-6", enabled: false, mode: "v2", keepNative: true, warning: false }, + { name: "global V2 enabled despite native V1 preservation", model: "anthropic/claude-sonnet-4-6", enabled: true, mode: "v2", keepNative: true, warning: true }, +]; + +test.each(compatibilityCases)("V2 compatibility guidance: $name", async ({ model, enabled, mode, keepNative, warning }) => { + preferredModel = model; + v2Settings = { enabled, multiAgentMode: mode, multiAgentModeHintText: null, keepNativeChatGptOnV1: keepNative }; + await mount(); + + const note = container.querySelector('.swi-v2-compatibility[role="note"]'); + if (warning) { + expect(note).toBeTruthy(); + expect(note?.textContent).toContain(en["sub.v2Compatibility.title"]); + expect(note?.textContent).toContain(en["sub.v2Compatibility.risk"]); + // The response exposes no recovery state: guidance must explicitly say it is unknown. + expect(note?.textContent).toContain(en["sub.v2Compatibility.recoveryUnknown"]); + expect(note?.querySelector("a")?.getAttribute("href")).toBe("https://github.com/lidge-jun/opencodex/issues/92"); + expect(note?.querySelector('[role="switch"], [aria-pressed], input[type="checkbox"]')).toBeNull(); + } else { + expect(note).toBeNull(); + expect(container.textContent).not.toContain(en["sub.v2Compatibility.recoveryUnknown"]); + } + expect(requests.filter(request => request.method !== "GET")).toEqual([]); +}); From 71315281bdbb3131104911508d1cce0f70a8e7d3 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:23:15 +0900 Subject: [PATCH 141/221] docs: pin lane C health wiring handoff [skip ci] --- devlog/_plan/260907_lane_c/030_health.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/devlog/_plan/260907_lane_c/030_health.md b/devlog/_plan/260907_lane_c/030_health.md index 2e01551e34..eaeb4bbcd6 100644 --- a/devlog/_plan/260907_lane_c/030_health.md +++ b/devlog/_plan/260907_lane_c/030_health.md @@ -117,3 +117,7 @@ index 639f1b34c..48bb7b539 100644 ``` + +## Main-owned route handoff + +At current dev, settings GET uses `startupHealth: await readStartupHealth(config)` at `src/server/management/config-routes.ts:332`. M changes only this settings read to the exported immediate snapshot and retains the dedicated `/api/startup-health` bounded read. Settings PUT at line 625 is separately present; it must remain reviewed explicitly rather than blindly replaced. C does not modify either call site. From 2b158e9bada538a6f3779ae47154ba150554218b Mon Sep 17 00:00:00 2001 From: luvs01 <27862058+luvs01@users.noreply.github.com> Date: Mon, 7 Sep 2026 10:50:46 +0900 Subject: [PATCH 142/221] fix(vision): bound the Anthropic vision sidecar SSE and error bodies [skip ci] (cherry picked from commit 55b009bdec123a79924a9c40c97f94bf49e62591) Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- src/vision/anthropic-describe.ts | 48 +++++++++++++++++++++++++-- tests/vision/vision-anthropic.test.ts | 21 ++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/src/vision/anthropic-describe.ts b/src/vision/anthropic-describe.ts index 4f41017ef5..280096f033 100644 --- a/src/vision/anthropic-describe.ts +++ b/src/vision/anthropic-describe.ts @@ -10,6 +10,8 @@ import type { DescribeOutcome, VisionSettings } from "./describe"; const ANTHROPIC_VISION_MAX_TOKENS = 1024; const ALLOWED_IMAGE_MIME = new Set(["image/png", "image/jpeg", "image/jpg", "image/webp", "image/gif"]); const MAX_IMAGE_BYTES = 20 * 1024 * 1024; +/** Bound the sidecar SSE stream and its untrusted error body; the description is clamped downstream. */ +const MAX_SIDECAR_RESPONSE_BYTES = 64 * 1024; const DESCRIBE_INSTRUCTION = "You are a vision describer for a text-only model that cannot see the image. Describe the image " + "thoroughly and factually so that model can fully reason about it: transcribe any visible text " + @@ -43,6 +45,34 @@ function buildImageBlock(imageUrl: string): { block?: AnthropicImageBlock; error return { error: "unsupported image URL scheme (expected data: or https:)" }; } +/** Read at most `MAX_SIDECAR_RESPONSE_BYTES` of an untrusted upstream body, then stop reading. */ +async function readBoundedText(res: Response): Promise { + if (!res.body) return ""; + const reader = res.body.getReader(); + const decoder = new TextDecoder(); + let out = ""; + let seen = 0; + try { + for (;;) { + const { done, value } = await reader.read(); + if (done) break; + const remaining = MAX_SIDECAR_RESPONSE_BYTES - seen; + const accepted = value.byteLength <= remaining ? value : value.subarray(0, remaining); + seen += accepted.byteLength; + out += decoder.decode(accepted, { stream: true }); + if (seen >= MAX_SIDECAR_RESPONSE_BYTES) { + try { void reader.cancel("vision sidecar error body byte limit reached").catch(() => undefined); } + catch { /* best-effort body teardown */ } + break; + } + } + out += decoder.decode(); + } catch { + /* a failed error-body read must not mask the HTTP status we are about to report */ + } + return out; +} + /** Fold Anthropic Messages text deltas into one description. Malformed frames are ignored. */ export async function parseAnthropicVisionSSE(res: Response): Promise { if (!res.body) return { text: "", error: "anthropic vision sidecar returned no response body" }; @@ -52,6 +82,7 @@ export async function parseAnthropicVisionSSE(res: Response): Promise { let dataLine = ""; @@ -76,12 +107,24 @@ export async function parseAnthropicVisionSSE(res: Response): Promise= MAX_SIDECAR_RESPONSE_BYTES) { + // Keep the frames folded above, drop the unterminated tail, and do not wait on teardown. + try { void reader.cancel("vision sidecar response byte limit reached").catch(() => undefined); } + catch { /* best-effort body teardown */ } + buffer = ""; + break; + } } buffer = (buffer + decoder.decode()).replace(/\r\n/g, "\n"); if (buffer.trim()) processFrame(buffer); @@ -164,7 +207,8 @@ export async function describeImageAnthropic( { abortSignal: linkedSignal.signal, label: "vision-sidecar-anthropic" }, ); if (!res.ok) { - const responseText = await res.text().catch(() => ""); + // The body is untrusted and only feeds one auth-failure message, so read a bounded prefix. + const responseText = await readBoundedText(res); console.warn(`[vision] anthropic sidecar HTTP ${res.status} (${Date.now() - startedAt}ms)`); if (res.status === 401) { return { text: "", error: `anthropic vision sidecar auth failed: ${publicOAuthAuthenticationErrorMessage(new Error(responseText))}` }; diff --git a/tests/vision/vision-anthropic.test.ts b/tests/vision/vision-anthropic.test.ts index 086e5df7bb..05df35662e 100644 --- a/tests/vision/vision-anthropic.test.ts +++ b/tests/vision/vision-anthropic.test.ts @@ -225,6 +225,27 @@ describe("Anthropic vision executor", () => { expect(result).toEqual({ text: "first second" }); }); + test("an unterminated frame cannot buffer the stream without bound", async () => { + // A sidecar that never emits a frame separator: without a cap the parser accumulates the + // whole response in memory before it can fold anything. + let produced = 0; + let cancelled = false; + const chunk = new TextEncoder().encode(`data: {"filler":"${"x".repeat(64 * 1024)}"}`); + const body = new ReadableStream({ + pull(c) { + if (produced > 8 * 1024 * 1024) { c.close(); return; } + produced += chunk.byteLength; + c.enqueue(chunk); + }, + cancel() { cancelled = true; }, + }); + const out = await parseAnthropicVisionSSE(new Response(body, { status: 200 })); + expect(cancelled).toBe(true); + // The cap stops the read long before the producer would have finished on its own. + expect(produced).toBeLessThan(1024 * 1024); + expect(out.text).toBe(""); + }); + test("malformed and terminal-error streams degrade to explicit errors", async () => { const malformed = await parseAnthropicVisionSSE(sseResponse(["{not-json", { type: "message_stop" }])); expect(malformed.text).toBe(""); From 9d8d11abdee0151c2a283ff4c3ace728a02a0455 Mon Sep 17 00:00:00 2001 From: x3M3x <98298256+x3M3x@users.noreply.github.com> Date: Mon, 7 Sep 2026 18:24:13 +0900 Subject: [PATCH 143/221] fix(service): carry startup-health cache portion of #3863 [skip ci] Path-filtered source commit: 960621616c439e69b967981c290f2377ba9465fa. Config-route wiring excluded under lane ownership. Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> (cherry picked from commit 197bf2e2bff362b9a135389741f1acf91670ded0) --- src/server/startup-health-cache.ts | 16 +++++++++++ tests/service/autostart-health.test.ts | 39 +++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/src/server/startup-health-cache.ts b/src/server/startup-health-cache.ts index 70380eb4ed..571d81b549 100644 --- a/src/server/startup-health-cache.ts +++ b/src/server/startup-health-cache.ts @@ -50,6 +50,22 @@ export interface StartupHealthCacheDeps { ) => Promise; } +/** + * Return the last completed probe immediately and refresh it in the background. + * + * Settings are consumed by several dashboard controls. They must not block on a + * Windows service-manager probe; the dedicated /api/startup-health route owns + * the fresh, bounded diagnostic read. + */ +export function getStartupHealthSnapshot( + config: Pick, + deps: StartupHealthCacheDeps = {}, +): StartupHealth { + const now = deps.now ?? Date.now; + if (!cached || now() - cached.timestamp >= CACHE_TTL_MS) refreshInBackground(config, deps); + return cached ? markStartupHealthDiagnosticStale(cached.value) : conservativeFallback(config); +} + export function markStartupHealthDiagnosticStale(value: StartupHealth): StartupHealth { if (!value.localRoutingDependency) return { ...value, diagnosticStale: true }; return { diff --git a/tests/service/autostart-health.test.ts b/tests/service/autostart-health.test.ts index 639f1b34c3..48bb7b5395 100644 --- a/tests/service/autostart-health.test.ts +++ b/tests/service/autostart-health.test.ts @@ -3,7 +3,7 @@ import { deriveStartupHealth, formatStartupRoutingDetail, startupHealthSummary } import { unusedProxyWarningLines } from "../../src/cli/status"; import { classifyCodexRouting, hasInjectedCodexRouting } from "../../src/codex/inject"; import { handleManagementAPI } from "../../src/server/management-api"; -import { getCachedStartupHealth, invalidateStartupHealthCache, markStartupHealthDiagnosticStale } from "../../src/server/startup-health-cache"; +import { getCachedStartupHealth, getStartupHealthSnapshot, invalidateStartupHealthCache, markStartupHealthDiagnosticStale } from "../../src/server/startup-health-cache"; import type { OcxConfig } from "../../src/types"; const base = { @@ -277,6 +277,43 @@ describe("Codex startup health", () => { await pendingProbe; invalidateStartupHealthCache(); }); + + test("settings snapshot starts a probe without waiting for it", async () => { + invalidateStartupHealthCache(); + let releaseProbe!: (value: ReturnType) => void; + const pendingProbe = new Promise>(resolve => { + releaseProbe = resolve; + }); + + const health = getStartupHealthSnapshot( + { codexAutoStart: true }, + { probe: async () => pendingProbe }, + ); + + expect(health.diagnosticStale).toBe(true); + releaseProbe(deriveStartupHealth({ ...base, routingKind: "native" })); + await pendingProbe; + invalidateStartupHealthCache(); + }); + + test("settings GET uses the non-blocking startup-health snapshot in production", async () => { + invalidateStartupHealthCache(); + const url = new URL("http://localhost/api/settings"); + + const response = await Promise.race([ + handleManagementAPI( + new Request(url), + url, + { port: 10100, providers: {}, defaultProvider: "openai", codexAutoStart: true } as OcxConfig, + ), + new Promise(resolve => setTimeout(() => resolve(null), 100)), + ]); + + expect(response?.status).toBe(200); + const body = await response!.json() as { startupHealth?: { diagnosticStale?: boolean } }; + expect(body.startupHealth?.diagnosticStale).toBe(true); + invalidateStartupHealthCache(); + }); }); import { ManagementRequest as Request } from "../helpers/management-auth"; From 734d41c528039a29b4002d455405afacfecf922c Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:31:54 +0900 Subject: [PATCH 144/221] fix(gui): retain unapplied Desktop status across settings polls [skip ci] Co-authored-by: RobinBially <7304732+RobinBially@users.noreply.github.com> --- gui/src/pages/use-dashboard-data.ts | 7 ++++++- gui/tests/vision-sidecar-dashboard.test.tsx | 9 +++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gui/src/pages/use-dashboard-data.ts b/gui/src/pages/use-dashboard-data.ts index e87e6494bd..8634e7caa8 100644 --- a/gui/src/pages/use-dashboard-data.ts +++ b/gui/src/pages/use-dashboard-data.ts @@ -361,7 +361,12 @@ export function useDashboardData(apiBase: string) { useEffect(() => { const data = settingsPoll.data; if (!data) return; - if (data.settings !== undefined) setSettings(data.settings); + if (data.settings !== undefined) { + const next = data.settings; + // GET settings does not report application receipts. Keep a saved preference's + // pending indication until an affirmative sync result clears it. + setSettings(prev => ({ ...next, catalogRefreshPending: prev?.catalogRefreshPending === true || next.catalogRefreshPending })); + } // Latest-wins: only seed from settings when no newer dedicated probe has committed // while this settings poll was in flight. Always merge against the live ref. if ( diff --git a/gui/tests/vision-sidecar-dashboard.test.tsx b/gui/tests/vision-sidecar-dashboard.test.tsx index 386196cc77..738ed866e6 100644 --- a/gui/tests/vision-sidecar-dashboard.test.tsx +++ b/gui/tests/vision-sidecar-dashboard.test.tsx @@ -13,6 +13,7 @@ import { DashboardSidecarPanels } from "../src/pages/dashboard-overview-sections import type { SidecarData, SidecarPatch } from "../src/pages/dashboard-shared"; import { mergeSidecarSetting } from "../src/pages/dashboard-shared"; import { useDashboardData } from "../src/pages/use-dashboard-data"; +import { setClientResourceData } from "../src/client-resource"; const globals = ["document", "window", "navigator", "IS_REACT_ACT_ENVIRONMENT"] as const; let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; @@ -479,6 +480,14 @@ test.each(["skipped", "catalog-only", "applied"])("Desktop preference pending st expect(latest?.settings?.codexDesktopAuthless).toBe(true); expect(latest?.settings?.catalogRefreshPending).toBe(syncStatus !== "applied"); expect(latest?.syncResult?.status).toBe(syncStatus); + // A fresh settings poll has no application receipt and cannot erase pending. + await act(async () => { + setClientResourceData(`dashboard-settings:${apiBase}`, { + settings: { codexAutoStart: true, codexDesktopAuthless: true, port: 10100, hostname: "127.0.0.1" }, + }); + }); + expect(latest?.settings?.codexDesktopAuthless).toBe(true); + expect(latest?.settings?.catalogRefreshPending === true).toBe(syncStatus !== "applied"); } finally { await act(async () => { root?.unmount(); }); root = null; From ffcd7abbaa210fad6ab235047d190248c5d6d52d Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:36:13 +0900 Subject: [PATCH 145/221] fix(gui): guard fallback hydration races and preserve row focus [skip ci] Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> --- .../SubagentDelegationSection.tsx | 40 ++++- gui/src/pages/Subagents.tsx | 42 +++-- gui/tests/subagents-fallback.test.tsx | 151 +++++++++++++++++- 3 files changed, 214 insertions(+), 19 deletions(-) diff --git a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx index dbbbd99948..6fe043461c 100644 --- a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx +++ b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx @@ -6,7 +6,7 @@ * better next to the roster it affects: the roster picks who may be called, this picks who * gets called first. */ -import { useState } from "react"; +import { useLayoutEffect, useRef, useState } from "react"; import { Select, Tooltip } from "../../ui"; import { IconArrowDown, IconArrowUp, IconInfo, IconX } from "../../icons"; import { useT, type TKey } from "../../i18n/shared"; @@ -63,12 +63,36 @@ export default function SubagentDelegationSection({ const nativeMayUseV2 = ultraMode.enabled || (ultraMode.multiAgentMode !== "v1" && !(ultraMode.multiAgentMode === "v2" && ultraMode.keepNativeChatGptOnV1)); const showV2Compatibility = !ultraLoadFailed && ultraMode.loaded === true && routedPreferred && nativeMayUseV2; + const fallbackControlsRef = useRef(null); + const nextRowId = useRef(0); + const rowIdentity = useRef>([]); + // Reuse each configured occurrence across reorder; duplicates have distinct IDs. + if (rowIdentity.current.length !== fallback.length || rowIdentity.current.some((row, i) => row.model !== fallback[i])) { + const remaining = [...rowIdentity.current]; + rowIdentity.current = fallback.map(modelName => { + const old = remaining.findIndex(row => row.model === modelName); + return old >= 0 ? remaining.splice(old, 1)[0] : { model: modelName, id: nextRowId.current++ }; + }); + } + const pendingFocus = useRef<{ row: number; action: string } | null>(null); + useLayoutEffect(() => { + const target = pendingFocus.current; + if (!target) return; + pendingFocus.current = null; + const row = fallbackControlsRef.current?.querySelectorAll(".swi-fallback-row")[target.row]; + const action = row?.querySelector(`button[data-action="${target.action}"]:not(:disabled)`) + ?? row?.querySelector("button:not(:disabled)") + ?? fallbackControlsRef.current?.querySelector('button[role="combobox"]'); + action?.focus(); + }, [fallback]); const validPollMs = Number.isInteger(fallbackPollMs) && fallbackPollMs >= 5000 && fallbackPollMs <= 600000; const moveFallback = (index: number, direction: -1 | 1) => { const next = [...fallback]; const target = index + direction; if (fallbackBusy || target < 0 || target >= next.length) return; [next[index], next[target]] = [next[target], next[index]]; + [rowIdentity.current[index], rowIdentity.current[target]] = [rowIdentity.current[target], rowIdentity.current[index]]; + pendingFocus.current = { row: target, action: direction === -1 ? "up" : "down" }; onFallbackChange(next); }; @@ -134,16 +158,20 @@ export default function SubagentDelegationSection({
{t("sub.fallbackLabel")}
{t("sub.fallbackHint")}
-
+
{fallback.map((modelName, index) => ( -
+
{index + 1}. {modelName} {!availableModels.includes(modelName) && {t("sub.fallbackUnavailable")}} - - - + + +
))} diff --git a/gui/src/pages/Subagents.tsx b/gui/src/pages/Subagents.tsx index cbdb138e33..cf9f1b33d0 100644 --- a/gui/src/pages/Subagents.tsx +++ b/gui/src/pages/Subagents.tsx @@ -8,7 +8,7 @@ import { useDataSurface } from "../data-surface"; import { DataSurfaceSkeleton } from "../components/data-surface"; import { useSubagentDelegation, type UltraModePatch, type UltraModeState } from "./use-subagent-delegation"; -type CachedSubagents = { available: string[]; chosen: string[]; fallback: string[]; pollMs: number }; +type CachedSubagents = { available: string[]; chosen: string[]; fallback?: string[]; pollMs?: number }; function seedSubagents(cacheKey: string): CachedSubagents | null { return readSessionListCache(cacheKey); @@ -22,6 +22,9 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const [fallback, setFallback] = useState(() => cached?.fallback ?? []); const [fallbackPollMs, setFallbackPollMs] = useState(() => cached?.pollMs ?? 60000); const [fallbackBusy, setFallbackBusy] = useState(false); + const [fallbackLoaded, setFallbackLoaded] = useState(() => Array.isArray(cached?.fallback) && Number.isInteger(cached?.pollMs)); + const fallbackRevision = useRef(0); + const rosterRevision = useRef(0); const fallbackSaveInFlight = useRef(false); const committed = useRef(cached); const [status, setStatus] = useState(""); @@ -125,6 +128,8 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const loadSubagents = useCallback(async (signal?: AbortSignal): Promise => { // The resource layer's deadline abort must reach the wire — a signal dropped // here is a store that can only settle by race timeout. + const rosterReadRevision = rosterRevision.current; + const fallbackReadRevision = fallbackRevision.current; const [rosterRes, fallbackRes] = await Promise.all([ fetch(`${apiBase}/api/subagent-models`, { signal }), fetch(`${apiBase}/api/subagent-model-fallback`, { signal }), @@ -134,18 +139,23 @@ export default function Subagents({ apiBase }: { apiBase: string }) { if (!response || !fallbackResponse) throw new Error(t("sub.loadFail")); const available = response.available ?? fallbackResponse.available ?? []; const availableSet = new Set(available); + const rosterCurrent = rosterReadRevision === rosterRevision.current && !saveInFlight.current; + const fallbackCurrent = fallbackReadRevision === fallbackRevision.current && !fallbackSaveInFlight.current; const next = { available, - chosen: (response.chosen ?? []).filter(model => availableSet.has(model)), + chosen: rosterCurrent ? (response.chosen ?? []).filter(model => availableSet.has(model)) : committed.current?.chosen ?? [], // Configured targets remain editable even when discovery no longer advertises them. - fallback: fallbackResponse.models ?? [], - pollMs: fallbackResponse.pollMs ?? 60000, + fallback: fallbackCurrent ? fallbackResponse.models ?? [] : committed.current?.fallback ?? [], + pollMs: fallbackCurrent ? fallbackResponse.pollMs ?? 60000 : committed.current?.pollMs ?? 60000, }; if (signal?.aborted) throw signal.reason; committed.current = next; - setChosen(next.chosen); - setFallback(next.fallback); - setFallbackPollMs(next.pollMs); + if (rosterCurrent) setChosen(next.chosen); + if (fallbackCurrent) { + setFallback(next.fallback); + setFallbackPollMs(next.pollMs); + setFallbackLoaded(true); + } writeSessionListCache(cacheKey, next); return next; }, [apiBase, cacheKey, t]); @@ -166,10 +176,12 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const toggle = (m: string) => { if (busy) return; setStatus(""); + rosterRevision.current += 1; setChosen(prev => prev.includes(m) ? prev.filter(x => x !== m) : (prev.length >= FEATURED_MAX ? prev : [...prev, m])); }; const move = (i: number, dir: -1 | 1) => { if (busy) return; + rosterRevision.current += 1; setChosen(prev => { const next = [...prev]; const j = i + dir; @@ -182,6 +194,7 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const save = async () => { if (busy || saveInFlight.current) return; saveInFlight.current = true; + rosterRevision.current += 1; setBusy(true); setStatus(""); try { @@ -191,9 +204,11 @@ export default function Subagents({ apiBase }: { apiBase: string }) { body: JSON.stringify({ models: chosen }), }); const d = await readJsonOrThrow<{ applied?: string[] }>(r, t("sub.saveFailed")); + rosterRevision.current += 1; const applied = d?.applied ?? chosen; if (d?.applied) setChosen(d.applied); - const next = { available, chosen: applied, fallback: committed.current?.fallback ?? [], pollMs: committed.current?.pollMs ?? 60000 }; + // A legacy roster-only seed does not prove that an empty fallback was loaded. + const next = { ...committed.current, available, chosen: applied }; committed.current = next; writeSessionListCache(cacheKey, next); setOk(true); @@ -208,8 +223,9 @@ export default function Subagents({ apiBase }: { apiBase: string }) { }; const saveFallback = async () => { - if (fallbackSaveInFlight.current || !Number.isInteger(fallbackPollMs) || fallbackPollMs < 5000 || fallbackPollMs > 600000) return; + if (!fallbackLoaded || fallbackSaveInFlight.current || !Number.isInteger(fallbackPollMs) || fallbackPollMs < 5000 || fallbackPollMs > 600000) return; fallbackSaveInFlight.current = true; + fallbackRevision.current += 1; const requestApiBase = apiBase; setFallbackBusy(true); setStatus(""); @@ -222,6 +238,7 @@ export default function Subagents({ apiBase }: { apiBase: string }) { const d = await readJsonOrThrow<{ models?: string[]; pollMs?: number }>(r, t("sub.fallbackSaveFailed")); if (currentUltraApiBase.current !== requestApiBase) return; if (!d || !Array.isArray(d.models) || typeof d.pollMs !== "number") throw new Error(t("sub.fallbackSaveFailed")); + fallbackRevision.current += 1; setFallback(d.models); setFallbackPollMs(d.pollMs); const next = { available, chosen: committed.current?.chosen ?? [], fallback: d.models, pollMs: d.pollMs }; @@ -260,6 +277,7 @@ export default function Subagents({ apiBase }: { apiBase: string }) {
{status && {status}} {state.showError && {t("sub.loadFail")}} + {!fallbackLoaded && state.showError && } { void save(); }} fallback={fallback} fallbackPollMs={fallbackPollMs} - fallbackBusy={fallbackBusy} - onFallbackChange={setFallback} - onFallbackPollMsChange={setFallbackPollMs} + fallbackBusy={fallbackBusy || !fallbackLoaded} + onFallbackChange={models => { fallbackRevision.current += 1; setFallback(models); }} + onFallbackPollMsChange={pollMs => { fallbackRevision.current += 1; setFallbackPollMs(pollMs); }} onFallbackSave={() => { void saveFallback(); }} delegation={{ model: delegation.model, diff --git a/gui/tests/subagents-fallback.test.tsx b/gui/tests/subagents-fallback.test.tsx index 20badc4980..ad794b8261 100644 --- a/gui/tests/subagents-fallback.test.tsx +++ b/gui/tests/subagents-fallback.test.tsx @@ -16,7 +16,7 @@ const globals = [ "document", "window", "navigator", "localStorage", "sessionStorage", "fetch", "IS_REACT_ACT_ENVIRONMENT", ] as const; -type CachedSubagents = { available: string[]; chosen: string[]; fallback: string[]; pollMs: number }; +type CachedSubagents = { available: string[]; chosen: string[]; fallback?: string[]; pollMs?: number }; type FallbackSettings = { models: string[]; pollMs: number }; type SentRequest = { path: string; method: string; init?: RequestInit }; type V2Settings = { @@ -38,6 +38,7 @@ let failFallbackPut: boolean; let v2Settings: V2Settings; let preferredModel: string | null; let fallbackGetGate: Promise | null; +let pendingFallbackResponse: Promise | null; beforeEach(() => { clearClientResourceStoresForTests(); @@ -61,6 +62,7 @@ beforeEach(() => { v2Settings = { enabled: true, multiAgentMode: "v2", multiAgentModeHintText: null, keepNativeChatGptOnV1: false }; preferredModel = null; fallbackGetGate = null; + pendingFallbackResponse = null; Object.defineProperty(globalThis, "fetch", { configurable: true, value: async (input: RequestInfo | URL, init?: RequestInit) => { @@ -69,6 +71,11 @@ beforeEach(() => { requests.push({ path, method, init }); // Match agent-settings-routes: fallback uses models, roster uses chosen/applied. if (path === FALLBACK_PATH && method === "GET") { + if (pendingFallbackResponse) { + const pending = pendingFallbackResponse; + pendingFallbackResponse = null; + return pending; + } if (fallbackGetGate) await fallbackGetGate; return Response.json({ ...fallbackSettings, available }); } @@ -250,6 +257,51 @@ test("adds, reorders in both directions, and removes fallback models before savi expect(putBodies(ROSTER_PATH)).toEqual([]); }); +test("keyboard moves retain row focus and removal moves focus to the next row or add control", async () => { + fallbackSettings.models = ["a-1", "a-2", "a-3"]; + await mount(); + + const activateWithEnter = async (button: HTMLButtonElement) => { + expect(button.disabled).toBe(false); + await act(async () => { + button.focus(); + expect(testWindow.document.activeElement).toBe(button); + button.dispatchEvent(new testWindow.KeyboardEvent("keydown", { key: "Enter", code: "Enter", bubbles: true })); + // happy-dom does not synthesize native button activation from Enter. Supply the + // keyboard-generated click (detail 0) explicitly; this test covers focus restoration. + button.dispatchEvent(new testWindow.MouseEvent("click", { bubbles: true, detail: 0 })); + button.dispatchEvent(new testWindow.KeyboardEvent("keyup", { key: "Enter", code: "Enter", bubbles: true })); + }); + }; + + const middleRow = rows()[1]; + await activateWithEnter(rowButton(1, "sub.moveDown", "a-2")); + expectOrder(["a-1", "a-3", "a-2"]); + expect(rows()[2]).toBe(middleRow); + expect(rowButton(2, "sub.moveDown", "a-2").disabled).toBe(true); + // The requested direction is disabled at the boundary; focus an enabled action + // in the moved row, rather than the neighboring row or document.body. + expect(testWindow.document.activeElement).toBe(rowButton(2, "sub.moveUp", "a-2")); + + await activateWithEnter(rowButton(2, "sub.moveUp", "a-2")); + expectOrder(["a-1", "a-2", "a-3"]); + expect(rows()[1]).toBe(middleRow); + expect(testWindow.document.activeElement).toBe(rowButton(1, "sub.moveUp", "a-2")); + + await activateWithEnter(rowButton(1, "sub.removeAria", "a-2")); + expectOrder(["a-1", "a-3"]); + expect(testWindow.document.activeElement).toBe(rowButton(1, "sub.removeAria", "a-3")); + + await activateWithEnter(rowButton(1, "sub.removeAria", "a-3")); + expectOrder(["a-1"]); + expect(testWindow.document.activeElement).toBe(rowButton(0, "sub.removeAria", "a-1")); + + await activateWithEnter(rowButton(0, "sub.removeAria", "a-1")); + expectOrder([]); + expect(testWindow.document.activeElement).toBe(labelledButton(editor(), en["sub.fallbackAdd"])); + expect(putBodies()).toEqual([]); +}); + test("removes only the selected duplicate fallback occurrence by index", async () => { fallbackSettings.models = ["a-2", "a-1", "a-2", "a-3"]; await mount(); @@ -364,6 +416,103 @@ test("remount shows the committed fallback and roster while a fresh fallback GET expect(pollInput().value).toBe("120000"); }); +test("a legacy cache keeps fallback disabled through GET failure, roster Save, and remount", async () => { + const legacyCache = { available, chosen: ["a-1"] }; + testWindow.sessionStorage.setItem(CACHE_KEY, JSON.stringify(legacyCache)); + let releaseGet!: (response: Response) => void; + pendingFallbackResponse = new Promise(resolve => { releaseGet = resolve; }); + + const assertBlocked = async (expectedCache = legacyCache) => { + expect(labelledButton(editor(), en["sub.fallbackAdd"]).disabled).toBe(true); + expect(pollInput().disabled).toBe(true); + expect(saveButton().disabled).toBe(true); + expect(Array.from(editor().querySelectorAll("input, button")) + .every(control => control.disabled)).toBe(true); + await act(async () => { saveButton().click(); }); + expect(putBodies()).toEqual([]); + expect(cached()).toEqual(expectedCache); + expect(cached()).not.toHaveProperty("fallback"); + expect(cached()).not.toHaveProperty("pollMs"); + // A failed read must never turn the page's empty placeholder into a saved empty chain. + expect(fallbackSettings).toEqual({ models: ["a-2"], pollMs: 45_000 }); + }; + + try { + await mount(); + expect(rows()).toHaveLength(0); + expect(pendingFallbackResponse).toBeNull(); + await assertBlocked(); + } finally { + await act(async () => { + releaseGet(Response.json({ error: "Fallback discovery failed" }, { status: 503 })); + }); + } + expect(container.textContent).toContain(en["sub.loadFail"]); + await assertBlocked(); + + await click(labelledButton(container, en["sub.workspace.addToFeatured"].replace("{m}", "a-3"))); + const rosterSaveRow = container.querySelector(".swi-save-row"); + if (!rosterSaveRow) throw new Error("Roster Save row not found"); + await click(saveButton(rosterSaveRow)); + const savedRosterCache = { available, chosen: ["a-1", "a-3"] }; + expect(putBodies(ROSTER_PATH)).toEqual([{ models: ["a-1", "a-3"] }]); + await assertBlocked(savedRosterCache); + + const current = root!; + await act(async () => { current.unmount(); }); + root = null; + clearClientResourceStoresForTests(); + const getsBefore = requests.filter(request => request.path === FALLBACK_PATH && request.method === "GET").length; + pendingFallbackResponse = new Promise(resolve => { releaseGet = resolve; }); + try { + await mount(); + expect(requests.filter(request => request.path === FALLBACK_PATH && request.method === "GET")).toHaveLength(getsBefore + 1); + expect(pendingFallbackResponse).toBeNull(); + await assertBlocked(savedRosterCache); + } finally { + await act(async () => { + releaseGet(Response.json({ error: "Fallback discovery still unavailable" }, { status: 503 })); + }); + } + expect(container.textContent).toContain(en["sub.loadFail"]); + await assertBlocked(savedRosterCache); + expect(putBodies(ROSTER_PATH)).toEqual([{ models: ["a-1", "a-3"] }]); +}); + +test.each([false, true])("a captured old fallback GET cannot overwrite a newer draft or save (saved=%s)", async (saveNewer) => { + const committedA = { available, chosen: ["a-1"], fallback: ["a-2"], pollMs: 45_000 }; + testWindow.sessionStorage.setItem(CACHE_KEY, JSON.stringify(committedA)); + // Serialize A before any edit or PUT. Reading mutable fallbackSettings after the gate + // would accidentally return B and let the stale-response regression pass. + const capturedOldResponse = Response.json({ models: ["a-2"], pollMs: 45_000, available }); + let releaseGet!: (response: Response) => void; + pendingFallbackResponse = new Promise(resolve => { releaseGet = resolve; }); + const committedB = { available, chosen: ["a-1"], fallback: ["a-3"], pollMs: 90_000 }; + + try { + await mount(); + expect(pendingFallbackResponse).toBeNull(); + expectOrder(["a-2"]); + await addFallback("a-3"); + await click(rowButton(0, "sub.removeAria", "a-2")); + await changePollMs(90_000); + if (saveNewer) await click(saveButton()); + expectOrder(["a-3"]); + expect(pollInput().value).toBe("90000"); + expect(cached()).toEqual(saveNewer ? committedB : committedA); + } finally { + await act(async () => { releaseGet(capturedOldResponse); }); + } + + // The delayed GET has now settled; both UI fields and the committed session seed + // must retain their respective newer-draft / newer-save semantics. + expect(capturedOldResponse.bodyUsed).toBe(true); + expectOrder(["a-3"]); + expect(pollInput().value).toBe("90000"); + expect(cached()).toEqual(saveNewer ? committedB : committedA); + expect(putBodies()).toEqual(saveNewer ? [{ models: ["a-3"], pollMs: 90_000 }] : []); +}); + test("invalid polling intervals disable Save without a PUT or cache mutation, and a valid interval recovers", async () => { await mount(); const committed = cached(); From 51b44371860b2ec933d66de1b68ca790be3b81fb Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:23:39 +0900 Subject: [PATCH 146/221] test(web-search): cover bounded partial frames and detached cancellation [skip ci] Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- tests/web-search/web-search-anthropic.test.ts | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/tests/web-search/web-search-anthropic.test.ts b/tests/web-search/web-search-anthropic.test.ts index 33f2616cc2..980eacddaa 100644 --- a/tests/web-search/web-search-anthropic.test.ts +++ b/tests/web-search/web-search-anthropic.test.ts @@ -193,6 +193,26 @@ describe("parseAnthropicSidecarSSE", () => { }); }); +describe("Anthropic sidecar byte boundaries", () => { + test.each([64 * 1024, 80 * 1024])("preserves complete prefix frames at %i bytes without awaiting cancel", async (size) => { + const prefix = `data: ${JSON.stringify({ type: "content_block_delta", delta: { type: "text_delta", text: "prefix 한글" } })}\n\n`; + const tail = `data: ${JSON.stringify({ type: "content_block_delta", delta: { type: "text_delta", text: "discard" } })}`; + const encoder = new TextEncoder(); + // The final unterminated frame is syntactically valid exactly at the cap. + // EOF flush must not fold it after cancellation. + const body = prefix + ":" + "x".repeat(64 * 1024 - encoder.encode(prefix + "\n\n" + tail).length - 1) + "\n\n" + tail; + const bytes = encoder.encode(body + "z".repeat(size - 64 * 1024)); + let cancelled = false; + const res = new Response(new ReadableStream({ + start(controller) { controller.enqueue(bytes); }, + cancel() { cancelled = true; return new Promise(() => {}); }, + }, { highWaterMark: 0 })); + const out = await parseAnthropicSidecarSSE(res); + expect(cancelled).toBe(true); + expect(out).toEqual({ text: "prefix 한글", sources: [] }); + }); +}); + describe("runAnthropicWebSearch request shape", () => { const originalFetch = globalThis.fetch; afterEach(() => { @@ -200,6 +220,21 @@ describe("runAnthropicWebSearch request shape", () => { oauthAccessError = undefined; }); + test.each([401, 503])("bounds HTTP %i error bodies and never awaits non-settling cancellation", async (status) => { + let reads = 0; + let cancelled = false; + globalThis.fetch = (async () => new Response(new ReadableStream({ + pull(controller) { reads += 1; controller.enqueue(new Uint8Array(4096).fill(120)); }, + cancel() { cancelled = true; return new Promise(() => {}); }, + }, { highWaterMark: 0 }), { status })) as typeof fetch; + const out = await runAnthropicWebSearch("bounded fixture", "anthropic", anthropicProvider, + { model: "claude-sonnet-5", reasoning: "low", timeoutMs: 5000, describeImages: false }); + expect(reads).toBe(16); + expect(cancelled).toBe(true); + expect(out.error).toBe(status === 401 + ? `anthropic sidecar auth failed: ${PUBLIC_OAUTH_ERROR}` : "sidecar HTTP 503"); + }); + test("projects OAuth, upstream-auth, and transport failures onto safe public errors", async () => { oauthAccessError = new Error(`credential read failed at ${AUTH_ERROR_CANARY}`); const credentialFailure = await runAnthropicWebSearch( From 8eaa5641902b84bec6c97a94de6c2fe6d810c31d Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:24:12 +0900 Subject: [PATCH 147/221] test(vision): pin capped descriptions and non-settling error-body cancel [skip ci] Co-authored-by: luvs01 <27862058+luvs01@users.noreply.github.com> --- tests/vision/vision-anthropic.test.ts | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tests/vision/vision-anthropic.test.ts b/tests/vision/vision-anthropic.test.ts index 05df35662e..0c0ef3c095 100644 --- a/tests/vision/vision-anthropic.test.ts +++ b/tests/vision/vision-anthropic.test.ts @@ -73,6 +73,34 @@ describe("Anthropic vision executor", () => { oauthAccessError = undefined; }); + test.each([64 * 1024, 80 * 1024])("keeps only complete partial description frames at %i bytes without waiting for cancel", async (size) => { + const prefix = `data: ${JSON.stringify({ type: "content_block_delta", delta: { type: "text_delta", text: "partial 한글" } })}\n\n`; + const tail = `data: ${JSON.stringify({ type: "content_block_delta", delta: { type: "text_delta", text: "discard" } })}`; + const encoder = new TextEncoder(); + const body = prefix + ":" + "x".repeat(64 * 1024 - encoder.encode(prefix + "\n\n" + tail).length - 1) + "\n\n" + tail; + let cancelled = false; + const out = await parseAnthropicVisionSSE(new Response(new ReadableStream({ + start(controller) { controller.enqueue(encoder.encode(body + "z".repeat(size - 64 * 1024))); }, + cancel() { cancelled = true; return new Promise(() => {}); }, + }, { highWaterMark: 0 }))); + expect(cancelled).toBe(true); + expect(out).toEqual({ text: "partial 한글" }); + }); + + test.each([401, 503])("bounds HTTP %i error bodies even when cancellation never settles", async (status) => { + let reads = 0; + let cancelled = false; + globalThis.fetch = (async () => new Response(new ReadableStream({ + pull(controller) { reads += 1; controller.enqueue(new Uint8Array(4096).fill(120)); }, + cancel() { cancelled = true; return new Promise(() => {}); }, + }, { highWaterMark: 0 }), { status })) as typeof fetch; + const out = await describeImageAnthropic(DATA_IMAGE, "high", "", "anthropic-vision-test", anthropicProvider, settings); + expect(reads).toBe(16); + expect(cancelled).toBe(true); + expect(out.error).toBe(status === 401 + ? `anthropic vision sidecar auth failed: ${PUBLIC_OAUTH_ERROR}` : "anthropic vision sidecar HTTP 503"); + }); + test("projects OAuth, upstream-auth, and transport failures onto safe replacement errors", async () => { oauthAccessError = new Error(`credential read failed at ${AUTH_ERROR_CANARY}`); const credentialFailure = await describeImageAnthropic( From 91b54b79bc780011031b00354621cc9fcaef360e Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:25:01 +0900 Subject: [PATCH 148/221] fix(service): preserve fresh health and contain detached probe failures [skip ci] Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> --- src/server/startup-health-cache.ts | 26 ++++++---- tests/service/autostart-health.test.ts | 72 +++++++++++++++++++++----- 2 files changed, 75 insertions(+), 23 deletions(-) diff --git a/src/server/startup-health-cache.ts b/src/server/startup-health-cache.ts index 571d81b549..2c12e0bbc3 100644 --- a/src/server/startup-health-cache.ts +++ b/src/server/startup-health-cache.ts @@ -62,7 +62,8 @@ export function getStartupHealthSnapshot( deps: StartupHealthCacheDeps = {}, ): StartupHealth { const now = deps.now ?? Date.now; - if (!cached || now() - cached.timestamp >= CACHE_TTL_MS) refreshInBackground(config, deps); + if (cached && now() - cached.timestamp < CACHE_TTL_MS) return cached.value; + refreshInBackground(config, deps); return cached ? markStartupHealthDiagnosticStale(cached.value) : conservativeFallback(config); } @@ -150,15 +151,20 @@ function refreshInBackground( ): void { if (inflight) return; const startedGeneration = generation; - const probe = (deps.probe ?? runProbe)(config).then(value => { - if (startedGeneration === generation) { - cached = { timestamp: (deps.now ?? Date.now)(), value }; - } - return value; - }); - inflight = probe.finally(() => { - if (inflight === probe || startedGeneration === generation) inflight = null; - }); + const probe: Promise = Promise.resolve() + .then(() => (deps.probe ?? runProbe)(config)) + .then(value => { + if (startedGeneration === generation) { + cached = { timestamp: (deps.now ?? Date.now)(), value }; + } + return value; + }) + .catch(() => cached ? markStartupHealthDiagnosticStale(cached.value) : conservativeFallback(config)) + .finally(() => { + // An invalidated probe must never clear the newer generation's flight. + if (inflight === probe) inflight = null; + }); + inflight = probe; } /** Stale-while-revalidate: service-manager probes never hold open a model/UI request. */ diff --git a/tests/service/autostart-health.test.ts b/tests/service/autostart-health.test.ts index 48bb7b5395..213a118e2b 100644 --- a/tests/service/autostart-health.test.ts +++ b/tests/service/autostart-health.test.ts @@ -296,22 +296,68 @@ describe("Codex startup health", () => { invalidateStartupHealthCache(); }); - test("settings GET uses the non-blocking startup-health snapshot in production", async () => { + test("snapshot preserves fresh protection and returns expired protection before a controlled probe settles", async () => { invalidateStartupHealthCache(); - const url = new URL("http://localhost/api/settings"); + let now = 1_000; + const config = { codexAutoStart: true }; + const protectedHealth = deriveStartupHealth({ ...base, serviceInstalled: true, serviceViable: true, serviceEnabled: true, serviceRunning: true }); + await getCachedStartupHealth(config, { now: () => now, probe: async () => protectedHealth, waitForProbe: probe => probe }); + let calls = 0; + let release!: (value: typeof protectedHealth) => void; + const pending = new Promise(resolve => { release = resolve; }); + const deps = { now: () => now, probe: () => { calls += 1; return pending; }, waitForProbe: (probe: Promise) => probe }; + expect(getStartupHealthSnapshot(config, deps)).toBe(protectedHealth); + expect(calls).toBe(0); + now += 30_000; + const snapshot = getStartupHealthSnapshot(config, deps); + expect(snapshot).toMatchObject({ diagnosticStale: true, status: "at-risk", rebootSafe: false }); + // Snapshot has returned while the manually controlled probe remains unresolved. + expect(getStartupHealthSnapshot(config, deps)).toEqual(snapshot); + const fresh = getCachedStartupHealth(config, deps); + const replacement = deriveStartupHealth({ ...base, routingKind: "custom-remote" }); + release(replacement); + expect(await fresh).toBe(replacement); + expect(calls).toBe(1); + invalidateStartupHealthCache(); + }); - const response = await Promise.race([ - handleManagementAPI( - new Request(url), - url, - { port: 10100, providers: {}, defaultProvider: "openai", codexAutoStart: true } as OcxConfig, - ), - new Promise(resolve => setTimeout(() => resolve(null), 100)), - ]); + test.each(["reject", "throw"])("detached snapshot probe handles %s and permits a later retry", async (failure) => { + invalidateStartupHealthCache(); + const config = { codexAutoStart: true }; + const failed = getStartupHealthSnapshot(config, { probe: () => { + if (failure === "throw") throw new Error("controlled probe failure"); + return Promise.reject(new Error("controlled probe failure")); + } }); + expect(failed.diagnosticStale).toBe(true); + const settled = await getCachedStartupHealth(config, { waitForProbe: probe => probe }); + expect(settled.diagnosticStale).toBe(true); + const replacement = deriveStartupHealth({ ...base, routingKind: "native" }); + expect(await getCachedStartupHealth(config, { probe: async () => replacement, waitForProbe: probe => probe })).toBe(replacement); + invalidateStartupHealthCache(); + }); - expect(response?.status).toBe(200); - const body = await response!.json() as { startupHealth?: { diagnosticStale?: boolean } }; - expect(body.startupHealth?.diagnosticStale).toBe(true); + test("invalidated probe cannot replace or clear a newer flight", async () => { + invalidateStartupHealthCache(); + const config = { codexAutoStart: true }; + type Health = ReturnType; + let oldRelease!: (value: Health) => void; + let newRelease!: (value: Health) => void; + const oldProbe = new Promise(resolve => { oldRelease = resolve; }); + const newProbe = new Promise(resolve => { newRelease = resolve; }); + getStartupHealthSnapshot(config, { probe: () => oldProbe }); + const oldWait = getCachedStartupHealth(config, { waitForProbe: probe => probe }); + invalidateStartupHealthCache(); + getStartupHealthSnapshot(config, { probe: () => newProbe }); + const newer = getCachedStartupHealth(config, { waitForProbe: probe => probe }); + oldRelease(deriveStartupHealth(base)); + await oldWait; + let spuriousCalls = 0; + getStartupHealthSnapshot(config, { probe: async () => { spuriousCalls += 1; return deriveStartupHealth(base); } }); + const expected = deriveStartupHealth({ ...base, routingKind: "native" }); + newRelease(expected); + expect(await newer).toBe(expected); + expect(getStartupHealthSnapshot(config)).toBe(expected); + expect(spuriousCalls).toBe(0); invalidateStartupHealthCache(); }); }); From abbdb227f385443228656c8440282187cb5dec75 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:07:56 +0900 Subject: [PATCH 149/221] docs: translate code-mode host rules; docs handoff from lane E [skip ci] --- devlog/_plan/260907_lane_c/040_desktop.md | 4 ++++ docs-site/src/content/docs/fr/guides/codex-integration.md | 8 ++++++++ docs-site/src/content/docs/ja/guides/codex-integration.md | 8 ++++++++ docs-site/src/content/docs/ko/guides/codex-integration.md | 7 +++++++ docs-site/src/content/docs/ru/guides/codex-integration.md | 8 ++++++++ docs-site/src/content/docs/tr/guides/codex-integration.md | 8 ++++++++ .../src/content/docs/zh-cn/guides/codex-integration.md | 6 ++++++ .../src/content/docs/zh-tw/guides/codex-integration.md | 6 ++++++ 8 files changed, 55 insertions(+) diff --git a/devlog/_plan/260907_lane_c/040_desktop.md b/devlog/_plan/260907_lane_c/040_desktop.md index ad7fb60177..4eb4ebffd5 100644 --- a/devlog/_plan/260907_lane_c/040_desktop.md +++ b/devlog/_plan/260907_lane_c/040_desktop.md @@ -402,3 +402,7 @@ index 84ac5f67b..b6be3c2f6 100644 ``` Audit amendment: clear catalogRefreshPending only if sync status is affirmative success, not HTTP 200 skipped. Add skipped/no-write regression. + +## Lane E documentation handoff + +After run 34106956362 reported a GUI lint failure, include the separately prepared code-mode host-rule translations in the seven fr/ja/ko/ru/tr/zh-cn/zh-tw Codex integration guides. The patch adds 51 documentation lines matching the existing English paragraph; it does not modify runtime code or provider guides. Apply on the Desktop layer, record `docs handoff from lane E` and `[skip ci]` in its own commit, then cascade the fallback layer and dispatch the top CI again. Local documentation install/build remains NOT RUN. diff --git a/docs-site/src/content/docs/fr/guides/codex-integration.md b/docs-site/src/content/docs/fr/guides/codex-integration.md index 02ffa8a211..a351adeae5 100644 --- a/docs-site/src/content/docs/fr/guides/codex-integration.md +++ b/docs-site/src/content/docs/fr/guides/codex-integration.md @@ -233,6 +233,14 @@ opencodex encode cette déclaration et son historique sous forme d'outil de fonc cycle de vie diffusé de l'appel de fonction en `custom_tool_call` avant que Codex ne le reçoive. Le routage natif par transfert OpenAI et l'outil personnalisé `apply_patch`, qui est pris en charge, restent inchangés. +Avant le premier appel, les tours routés en mode code reçoivent aussi les règles de l'hôte pour les +outils auxiliaires imbriqués : `tools.apply_patch` prend une seule chaîne qui commence et se termine +par les lignes de marqueur de patch seules, sans habillage ; l'isolate ne dispose pas de `import`, +et les commandes longues sont interrogées via `write_stdin`. Lorsqu'un résultat exec en mode code +sur le chemin natif Responses routé, Kiro ou Cursor contient encore l'un des messages d'échec de +l'hôte, opencodex ajoute une indication d'une ligne qui nomme la règle. Cette modification ne +réécrit ni le code du modèle ni le texte de son patch. + Le fournisseur sélectionné doit prendre en charge les appels de fonctions ou d'outils. Un fournisseur purement textuel dépourvu de cette prise en charge ne peut pas utiliser `exec`, Browser ni Computer Use. Les lignes OpenAI natives conservent leur mode d'outil en amont. diff --git a/docs-site/src/content/docs/ja/guides/codex-integration.md b/docs-site/src/content/docs/ja/guides/codex-integration.md index d1d977b35c..46c33320f2 100644 --- a/docs-site/src/content/docs/ja/guides/codex-integration.md +++ b/docs-site/src/content/docs/ja/guides/codex-integration.md @@ -147,6 +147,14 @@ Codex の `exec` custom-tool grammar を受け付けない key-auth Responses pr `custom_tool_call` へ復元します。ネイティブ OpenAI の forward routing と、対応済みの `apply_patch` custom tool は 変更されません。 +ルーティングされた code-mode のターンには、最初の呼び出し前に、ネストされたヘルパーに関する +ホストの規則も伝えられます。`tools.apply_patch` は、装飾を付けないパッチマーカー行で始まり、 +同様のマーカー行で終わる単一の文字列を受け取ります。isolate では `import` を使用できず、 +長時間実行されるコマンドは `write_stdin` でポーリングします。ネイティブのルーティング済み Responses、 +Kiro、または Cursor の経路で、code-mode の exec 結果にホストの失敗メッセージがまだ含まれている場合、 +opencodex は該当する規則を示す 1 行のヒントを追加します。この変更でモデルのコードやパッチのテキストを +書き換えることはありません。 + 選択した provider は function/tool calling をサポートしている必要があります。tool call に対応しない text-only provider では `exec`、Browser、Computer Use は使用できません。ネイティブ OpenAI の項目は上流の tool mode を そのまま維持します。 diff --git a/docs-site/src/content/docs/ko/guides/codex-integration.md b/docs-site/src/content/docs/ko/guides/codex-integration.md index 44551de837..1f324adaf2 100644 --- a/docs-site/src/content/docs/ko/guides/codex-integration.md +++ b/docs-site/src/content/docs/ko/guides/codex-integration.md @@ -149,6 +149,13 @@ history를 업스트림 function tool로 인코딩한 다음 스트리밍된 fun `custom_tool_call`로 복원합니다. 네이티브 OpenAI forward routing과 지원되는 `apply_patch` custom tool은 변경되지 않습니다. +라우팅된 code-mode 턴에는 첫 호출 전에 중첩 helper에 대한 호스트 규칙도 전달됩니다. +`tools.apply_patch`는 별도 장식 없이 패치 마커만 있는 줄로 시작하고 끝나는 하나의 문자열을 받습니다. +isolate에서는 `import`를 사용할 수 없으며, 오래 실행되는 명령은 `write_stdin`으로 폴링합니다. +네이티브 라우팅 Responses, Kiro 또는 Cursor 경로의 code-mode exec 결과에 호스트의 실패 메시지 중 +하나가 여전히 포함되어 있으면, opencodex는 해당 규칙을 명시하는 한 줄짜리 힌트를 덧붙입니다. +이 변경은 모델의 코드나 패치 텍스트를 다시 작성하지 않습니다. + 선택한 provider는 function/tool calling을 지원해야 합니다. tool call을 지원하지 않는 text-only provider에서는 `exec`, Browser 또는 Computer Use를 사용할 수 없습니다. 네이티브 OpenAI 항목은 업스트림 tool mode를 그대로 유지합니다. diff --git a/docs-site/src/content/docs/ru/guides/codex-integration.md b/docs-site/src/content/docs/ru/guides/codex-integration.md index 9707a3ea44..23581e56f6 100644 --- a/docs-site/src/content/docs/ru/guides/codex-integration.md +++ b/docs-site/src/content/docs/ru/guides/codex-integration.md @@ -224,6 +224,14 @@ opencodex кодирует объявление и историю как functio потоковый lifecycle function call в `custom_tool_call` до передачи в Codex. Нативная forward- маршрутизация OpenAI и поддерживаемый custom tool `apply_patch` остаются без изменений. +Перед первым вызовом маршрутизируемые ходы в code-mode также получают правила хоста для вложенных +вспомогательных инструментов: `tools.apply_patch` принимает одну строку, которая начинается и +заканчивается отдельными строками маркеров патча без дополнительного оформления; в isolate нет +`import`, а длительные команды опрашиваются через `write_stdin`. Если результат exec в code-mode +на нативном маршрутизируемом пути Responses, Kiro или Cursor всё ещё содержит одно из сообщений +хоста об ошибке, opencodex добавляет однострочную подсказку с указанием правила. Это изменение +не переписывает код модели или текст её патча. + Выбранный provider должен поддерживать function/tool calling. Text-only provider без tool calls не может использовать `exec`, Browser или Computer Use. Нативные записи OpenAI сохраняют свой upstream tool mode без изменений. diff --git a/docs-site/src/content/docs/tr/guides/codex-integration.md b/docs-site/src/content/docs/tr/guides/codex-integration.md index 02fae0f468..d13af52274 100644 --- a/docs-site/src/content/docs/tr/guides/codex-integration.md +++ b/docs-site/src/content/docs/tr/guides/codex-integration.md @@ -262,6 +262,14 @@ fonksiyon aracı olarak kodlar, ardından akışlı fonksiyon çağrısı yaşam Codex görmeden önce `custom_tool_call`'a geri yükler. Yerel OpenAI iletme yönlendirmesi ve desteklenen `apply_patch` özel aracı değişmeden kalır. +Yönlendirilen code-mode turlarına, ilk çağrıdan önce iç içe geçmiş yardımcılar için geçerli olan +ana makine kuralları da bildirilir: `tools.apply_patch`, yalnızca yama işaretçilerinden oluşan +satırlarla başlayan ve biten tek bir dize alır; isolate içinde `import` yoktur ve uzun süren +komutlar `write_stdin` üzerinden yoklanır. Yerel yönlendirilmiş Responses, Kiro veya Cursor yolundaki +bir code-mode exec sonucu hâlâ ana makinenin hata mesajlarından birini içeriyorsa opencodex, +ilgili kuralı belirten tek satırlık bir ipucu ekler. Bu değişiklik modelin kodunu veya yama metnini +yeniden yazmaz. + Seçilen sağlayıcı fonksiyon/araç çağrısını desteklemelidir. Araç çağrısı desteği olmayan salt metin bir sağlayıcı `exec`, Tarayıcı veya Bilgisayar Kullanımını kullanamaz. Yerel OpenAI satırları yukarı akış araç modunu değiştirmeden tutar. diff --git a/docs-site/src/content/docs/zh-cn/guides/codex-integration.md b/docs-site/src/content/docs/zh-cn/guides/codex-integration.md index 552c0c3f53..0c3df0c0e2 100644 --- a/docs-site/src/content/docs/zh-cn/guides/codex-integration.md +++ b/docs-site/src/content/docs/zh-cn/guides/codex-integration.md @@ -196,6 +196,12 @@ Codex 显示的模型来自一个磁盘上的 catalog(默认是 `$CODEX_HOME/o 历史记录编码成上游 function tool,再在 Codex 收到结果前,把流式 function-call lifecycle 还原成 `custom_tool_call`。原生 OpenAI forward routing 和已支持的 `apply_patch` custom tool 保持不变。 +路由的 code-mode 轮次还会在首次调用前收到宿主对嵌套辅助工具的规则:`tools.apply_patch` +接收一个字符串,首尾必须是没有额外包装的独立补丁标记行;isolate 中没有 `import`,长时间运行的 +命令通过 `write_stdin` 轮询。如果原生路由 Responses、Kiro 或 Cursor 路径上的 code-mode exec +结果仍包含宿主的某条失败消息,opencodex 会追加一行提示,指出对应规则。此变更不会重写模型的 +代码或补丁文本。 + 所选 provider 必须支持 function/tool calling。不支持 tool call 的 text-only provider 无法使用 `exec`、 Browser 或 Computer Use。原生 OpenAI 条目会保持其上游 tool mode 不变。 diff --git a/docs-site/src/content/docs/zh-tw/guides/codex-integration.md b/docs-site/src/content/docs/zh-tw/guides/codex-integration.md index f371457be9..44ee5bbb3b 100644 --- a/docs-site/src/content/docs/zh-tw/guides/codex-integration.md +++ b/docs-site/src/content/docs/zh-tw/guides/codex-integration.md @@ -201,6 +201,12 @@ metadata,使用 Codex 的 `low | medium | high | xhigh | max | ultra` 檔位 歷史編碼成上游 function tool,再於 Codex 看見前將串流 function-call lifecycle 還原成 `custom_tool_call`。原生 OpenAI forward 路由與受支援的 `apply_patch` custom tool 維持不變。 +路由的 code-mode 回合也會在首次呼叫前收到主機對巢狀輔助工具的規則:`tools.apply_patch` +接收一個字串,開頭與結尾必須是沒有額外包裝的獨立補丁標記行;isolate 中沒有 `import`,長時間執行的 +命令透過 `write_stdin` 輪詢。如果原生路由 Responses、Kiro 或 Cursor 路徑上的 code-mode exec +結果仍包含主機的某則失敗訊息,opencodex 會附加一行提示,指出對應規則。這項變更不會重寫模型的 +程式碼或補丁文字。 + 所選 provider 必須支援 function/tool calling。不支援 tool call 的純文字 provider 無法使用 `exec`、 Browser 或 Computer Use。原生 OpenAI 列保留上游 tool mode 不變。 From f1b8f2d2f1edee55b68202469f86a5334710688d Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:07:57 +0900 Subject: [PATCH 150/221] fix(gui): keep fallback render identities in state [skip ci] CI 34106956362 gates101697798420: remove render-time ref access and dynamic selector construction while preserving occurrence identity and keyboard focus. Co-authored-by: x3M3x <98298256+x3M3x@users.noreply.github.com> --- .../SubagentDelegationSection.tsx | 35 ++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx index 6fe043461c..a1b405c2d9 100644 --- a/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx +++ b/gui/src/components/subagents-workspace/SubagentDelegationSection.tsx @@ -64,15 +64,22 @@ export default function SubagentDelegationSection({ && !(ultraMode.multiAgentMode === "v2" && ultraMode.keepNativeChatGptOnV1)); const showV2Compatibility = !ultraLoadFailed && ultraMode.loaded === true && routedPreferred && nativeMayUseV2; const fallbackControlsRef = useRef(null); - const nextRowId = useRef(0); - const rowIdentity = useRef>([]); - // Reuse each configured occurrence across reorder; duplicates have distinct IDs. - if (rowIdentity.current.length !== fallback.length || rowIdentity.current.some((row, i) => row.model !== fallback[i])) { - const remaining = [...rowIdentity.current]; - rowIdentity.current = fallback.map(modelName => { + const [identity, setIdentity] = useState(() => ({ + models: fallback, + rows: fallback.map((rowModel, id) => ({ model: rowModel, id })), + nextId: fallback.length, + })); + let rows = identity.rows; + // Keys are render state. Guarded prop reconciliation retains each occurrence; + // event handlers move the same identities with their corresponding models. + if (identity.models !== fallback) { + const remaining = [...identity.rows]; + let nextId = identity.nextId; + rows = fallback.map(modelName => { const old = remaining.findIndex(row => row.model === modelName); - return old >= 0 ? remaining.splice(old, 1)[0] : { model: modelName, id: nextRowId.current++ }; + return old >= 0 ? remaining.splice(old, 1)[0] : { model: modelName, id: nextId++ }; }); + setIdentity({ models: fallback, rows, nextId }); } const pendingFocus = useRef<{ row: number; action: string } | null>(null); useLayoutEffect(() => { @@ -80,7 +87,8 @@ export default function SubagentDelegationSection({ if (!target) return; pendingFocus.current = null; const row = fallbackControlsRef.current?.querySelectorAll(".swi-fallback-row")[target.row]; - const action = row?.querySelector(`button[data-action="${target.action}"]:not(:disabled)`) + const enabledActions = row?.querySelectorAll("button[data-action]:not(:disabled)"); + const action = Array.from(enabledActions ?? []).find(button => button.dataset.action === target.action) ?? row?.querySelector("button:not(:disabled)") ?? fallbackControlsRef.current?.querySelector('button[role="combobox"]'); action?.focus(); @@ -91,7 +99,9 @@ export default function SubagentDelegationSection({ const target = index + direction; if (fallbackBusy || target < 0 || target >= next.length) return; [next[index], next[target]] = [next[target], next[index]]; - [rowIdentity.current[index], rowIdentity.current[target]] = [rowIdentity.current[target], rowIdentity.current[index]]; + const nextRows = [...rows]; + [nextRows[index], nextRows[target]] = [nextRows[target], nextRows[index]]; + setIdentity({ ...identity, models: next, rows: nextRows }); pendingFocus.current = { row: target, action: direction === -1 ? "up" : "down" }; onFallbackChange(next); }; @@ -160,7 +170,7 @@ export default function SubagentDelegationSection({
{fallback.map((modelName, index) => ( -
+
{index + 1}. {modelName} {!availableModels.includes(modelName) && {t("sub.fallbackUnavailable")}} @@ -168,9 +178,10 @@ export default function SubagentDelegationSection({
From 1ca1a56615e779407e85bcda93f2e27f280d8a26 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:24:07 +0900 Subject: [PATCH 151/221] fix(release): recover registry reads after acknowledged publication [skip ci] --- .github/workflows/release.yml | 40 ++++++--- tests/ci-workflows/ci-workflows.test.ts | 105 ++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 685a13876b..339de6d9ea 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -334,40 +334,56 @@ jobs: } - name: Publish (or dry-run) + id: publication env: DRY_RUN: ${{ inputs.dry-run }} NPM_DIST_TAG: ${{ inputs.tag }} run: | + set -euo pipefail if [ "$DRY_RUN" = "true" ]; then echo "::notice::DRY RUN — building + packing, not publishing" npm run prepublishOnly npm pack --dry-run else npm publish --tag "$NPM_DIST_TAG" --access public + echo "published=true" >> "$GITHUB_OUTPUT" fi - # Confirm the registry actually has the new version (real publishes only). + # Publication is acknowledged before registry reads, which can lag or fail. + # Recover only observation failures in this run; never retry npm publish. - name: Post-publish registry smoke - if: ${{ inputs.dry-run != true }} + id: registry-smoke + if: ${{ inputs.dry-run != true && steps.publication.outputs.published == 'true' }} env: RELEASE_VERSION: ${{ inputs.version }} + PUBLISHED: ${{ steps.publication.outputs.published }} run: | - for attempt in $(seq 1 30); do - if VERSION=$(npm view "@bitkyc08/opencodex@${RELEASE_VERSION}" version 2>/dev/null); then + set -euo pipefail + test "$PUBLISHED" = "true" || { + echo "::error::No successful publication receipt; refusing registry recovery" + exit 1 + } + for attempt in $(seq 1 6); do + if VERSION=$(timeout --kill-after=2s 10s npm view "@bitkyc08/opencodex@${RELEASE_VERSION}" version --fetch-retries=0 --fetch-timeout=8000 2>/dev/null); then + if [ "$VERSION" != "$RELEASE_VERSION" ]; then + echo "::error::Registry returned an unexpected version; refusing to create a release" + exit 1 + fi echo "registry version=$VERSION" - test "$VERSION" = "$RELEASE_VERSION" - npm dist-tag ls @bitkyc08/opencodex + echo "verification=verified" >> "$GITHUB_OUTPUT" + echo "Registry verified @bitkyc08/opencodex@${RELEASE_VERSION}." >> "$GITHUB_STEP_SUMMARY" + timeout --kill-after=2s 10s npm dist-tag ls @bitkyc08/opencodex --fetch-retries=0 --fetch-timeout=8000 || echo "::warning::Could not read npm dist-tags; exact version was verified" exit 0 fi - echo "::notice::@bitkyc08/opencodex@${RELEASE_VERSION} not visible in npm registry yet (attempt $attempt/30)" - sleep 10 + echo "::notice::Registry lookup not confirmed (attempt $attempt/6)" + if [ "$attempt" -lt 6 ]; then sleep 5; fi done - echo "::error::npm registry smoke failed after 30 attempts" - npm view @bitkyc08/opencodex versions dist-tags --json || true - exit 1 + echo "verification=pending" >> "$GITHUB_OUTPUT" + echo "::warning::npm publish succeeded, but registry verification remains pending; continuing GitHub release creation without republishing" + echo "Publication acknowledged for @bitkyc08/opencodex@${RELEASE_VERSION}; registry verification pending after bounded reads. Inspect the registry before announcing availability. Do not republish this version." >> "$GITHUB_STEP_SUMMARY" - name: Create GitHub release - if: ${{ inputs.dry-run != true }} + if: ${{ inputs.dry-run != true && steps.publication.outputs.published == 'true' }} env: GH_TOKEN: ${{ github.token }} RELEASE_VERSION: ${{ inputs.version }} diff --git a/tests/ci-workflows/ci-workflows.test.ts b/tests/ci-workflows/ci-workflows.test.ts index c967f9d4c0..d2bef0d24f 100644 --- a/tests/ci-workflows/ci-workflows.test.ts +++ b/tests/ci-workflows/ci-workflows.test.ts @@ -1,5 +1,8 @@ import { describe, expect, test } from "bun:test"; import { fileURLToPath } from "node:url"; +import { mkdtempSync, readFileSync, writeFileSync, rmSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; import { SCRIPT_BINDINGS, callsTo, @@ -5514,3 +5517,105 @@ describe("gui exhaustive-deps suppression stays scoped and effective", () => { expect(models).not.toContain("react-doctor-disable-next-line"); }); }); + + +interface PublicationStep { name: string; id?: string; if?: string; run?: string } +async function publicationSteps(): Promise { + const yaml = Bun.YAML.parse(await readText(".github/workflows/release.yml")) as { + jobs: { publish: { steps: PublicationStep[] } }; + }; + return yaml.jobs.publish.steps; +} + +test("release recovery requires same-run publication and preserves successful-step gating", async () => { + const steps = await publicationSteps(); + const publish = steps.find(step => step.name === "Publish (or dry-run)")!; + const smoke = steps.find(step => step.name === "Post-publish registry smoke")!; + const release = steps.find(step => step.name === "Create GitHub release")!; + expect(publish.id).toBe("publication"); + expect(smoke.id).toBe("registry-smoke"); + for (const step of [smoke, release]) { + expect(step.if).toBe("${{ inputs.dry-run != true && steps.publication.outputs.published == 'true' }}"); + } + expect(steps.indexOf(publish)).toBeLessThan(steps.indexOf(smoke)); + expect(steps.indexOf(smoke)).toBeLessThan(steps.indexOf(release)); +}); + +// This executes the ubuntu-latest release job's Bash, not the Windows runtime. +// Structural workflow guards above still execute on every platform. +test.skipIf(process.platform === "win32")("release shell recovers only unverified reads after acknowledged publication", async () => { + const steps = await publicationSteps(); + const publish = steps.find(step => step.name === "Publish (or dry-run)")!.run!; + const smoke = steps.find(step => step.name === "Post-publish registry smoke")!.run!; + const scenarios = [ + { mode: "match", dry: false, status: 0, receipt: true, verification: "verified", reads: 1 }, + { mode: "delayed", dry: false, status: 0, receipt: true, verification: "verified", reads: 3 }, + { mode: "unavailable", dry: false, status: 0, receipt: true, verification: "pending", reads: 6 }, + { mode: "timeout", dry: false, status: 0, receipt: true, verification: "pending", reads: 6 }, + { mode: "wrong", dry: false, status: 1, receipt: true, verification: "", reads: 1 }, + { mode: "empty", dry: false, status: 1, receipt: true, verification: "", reads: 1 }, + { mode: "dist-failure", dry: false, status: 0, receipt: true, verification: "verified", reads: 1 }, + { mode: "publish-failure", dry: false, status: 23, receipt: false, verification: "", reads: 0 }, + { mode: "match", dry: true, status: 0, receipt: false, verification: "", reads: 0 }, + { mode: "missing-receipt", dry: false, status: 1, receipt: false, verification: "", reads: 0 }, + ]; + for (const scenario of scenarios) { + const dir = mkdtempSync(join(tmpdir(), "ocx-publication-")); + const output = join(dir, "output"); + const summary = join(dir, "summary"); + const calls = join(dir, "calls"); + for (const path of [output, summary, calls]) writeFileSync(path, ""); + const prelude = String.raw` + npm() { + echo "$*" >> "$CALLS" + case "$1" in + publish) [ "$SCENARIO" != "publish-failure" ] || return 23 ;; + view) + count=$(cat "$COUNTER" 2>/dev/null || echo 0) + count=$((count + 1)); echo "$count" > "$COUNTER" + case "$SCENARIO" in + unavailable) return 1 ;; + timeout) return 124 ;; + delayed) [ "$count" -ge 3 ] || return 1 ;; + wrong) echo 0.0.0; return 0 ;; + empty) return 0 ;; + esac + echo "$RELEASE_VERSION" ;; + dist-tag) [ "$SCENARIO" != "dist-failure" ] || return 1 ;; + esac + } + timeout() { + # The wrapper is stubbed, but its production process bounds are asserted. + [ "$1" = "--kill-after=2s" ] && [ "$2" = "10s" ] || return 99 + shift 2; "$@" + } + sleep() { echo "sleep $*" >> "$CALLS"; } + `; + try { + const script = prelude + (scenario.mode === "missing-receipt" ? "" : publish) + '\n' + + (scenario.dry ? "" : `PUBLISHED=$(sed -n 's/^published=//p' "$GITHUB_OUTPUT")\n${smoke}`); + const child = Bun.spawn(["bash", "--noprofile", "--norc", "-e", "-o", "pipefail", "-c", script], { + env: { ...process.env, SCENARIO: scenario.mode, DRY_RUN: String(scenario.dry), + NPM_DIST_TAG: "latest", RELEASE_VERSION: "9.8.7", GITHUB_OUTPUT: output, + GITHUB_STEP_SUMMARY: summary, CALLS: calls, COUNTER: join(dir, "counter") }, + stdin: "ignore", stdout: "pipe", stderr: "pipe", + }); + const [status, stdout, stderr] = await Promise.all([ + child.exited, new Response(child.stdout).text(), new Response(child.stderr).text(), + ]); + expect({ scenario: scenario.mode, status, stderr }).toEqual({ scenario: scenario.mode, status: scenario.status, stderr: "" }); + const receipt = readFileSync(output, "utf8"); + const log = readFileSync(calls, "utf8").trim().split("\n"); + expect(receipt.includes("published=true")).toBe(scenario.receipt); + expect(receipt.includes("verification=")).toBe(scenario.verification !== ""); + if (scenario.verification) expect(receipt).toContain(`verification=${scenario.verification}`); + expect(log.filter(line => line.startsWith("view "))).toHaveLength(scenario.reads); + expect(log.filter(line => line.startsWith("publish "))).toHaveLength(scenario.dry || scenario.mode === "missing-receipt" ? 0 : 1); + if (scenario.verification === "pending") { + expect(stdout).toContain("::warning::npm publish succeeded"); + expect(readFileSync(summary, "utf8")).toContain("registry verification pending"); + expect(log.filter(line => line === "sleep 5")).toHaveLength(5); + } + } finally { rmSync(dir, { recursive: true, force: true }); } + } +}); From 56f356d65f153533164e52c549e77baa0e7a8650 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:07:45 +0900 Subject: [PATCH 152/221] fix(release): bind registry checks to package metadata [skip ci] --- .github/workflows/release.yml | 9 +++++---- tests/ci-workflows/ci-workflows.test.ts | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 339de6d9ea..7b565b6800 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -363,16 +363,17 @@ jobs: echo "::error::No successful publication receipt; refusing registry recovery" exit 1 } + pkg_name="$(node -p "require('./package.json').name")" for attempt in $(seq 1 6); do - if VERSION=$(timeout --kill-after=2s 10s npm view "@bitkyc08/opencodex@${RELEASE_VERSION}" version --fetch-retries=0 --fetch-timeout=8000 2>/dev/null); then + if VERSION=$(timeout --kill-after=2s 10s npm view "${pkg_name}@${RELEASE_VERSION}" version --fetch-retries=0 --fetch-timeout=8000 2>/dev/null); then if [ "$VERSION" != "$RELEASE_VERSION" ]; then echo "::error::Registry returned an unexpected version; refusing to create a release" exit 1 fi echo "registry version=$VERSION" echo "verification=verified" >> "$GITHUB_OUTPUT" - echo "Registry verified @bitkyc08/opencodex@${RELEASE_VERSION}." >> "$GITHUB_STEP_SUMMARY" - timeout --kill-after=2s 10s npm dist-tag ls @bitkyc08/opencodex --fetch-retries=0 --fetch-timeout=8000 || echo "::warning::Could not read npm dist-tags; exact version was verified" + echo "Registry verified ${pkg_name}@${RELEASE_VERSION}." >> "$GITHUB_STEP_SUMMARY" + timeout --kill-after=2s 10s npm dist-tag ls "$pkg_name" --fetch-retries=0 --fetch-timeout=8000 || echo "::warning::Could not read npm dist-tags; exact version was verified" exit 0 fi echo "::notice::Registry lookup not confirmed (attempt $attempt/6)" @@ -380,7 +381,7 @@ jobs: done echo "verification=pending" >> "$GITHUB_OUTPUT" echo "::warning::npm publish succeeded, but registry verification remains pending; continuing GitHub release creation without republishing" - echo "Publication acknowledged for @bitkyc08/opencodex@${RELEASE_VERSION}; registry verification pending after bounded reads. Inspect the registry before announcing availability. Do not republish this version." >> "$GITHUB_STEP_SUMMARY" + echo "Publication acknowledged for ${pkg_name}@${RELEASE_VERSION}; registry verification pending after bounded reads. Inspect the registry before announcing availability. Do not republish this version." >> "$GITHUB_STEP_SUMMARY" - name: Create GitHub release if: ${{ inputs.dry-run != true && steps.publication.outputs.published == 'true' }} diff --git a/tests/ci-workflows/ci-workflows.test.ts b/tests/ci-workflows/ci-workflows.test.ts index d2bef0d24f..b098220521 100644 --- a/tests/ci-workflows/ci-workflows.test.ts +++ b/tests/ci-workflows/ci-workflows.test.ts @@ -5519,7 +5519,7 @@ describe("gui exhaustive-deps suppression stays scoped and effective", () => { }); -interface PublicationStep { name: string; id?: string; if?: string; run?: string } +interface PublicationStep { name: string; id?: string; if?: string; run?: string; env?: Record } async function publicationSteps(): Promise { const yaml = Bun.YAML.parse(await readText(".github/workflows/release.yml")) as { jobs: { publish: { steps: PublicationStep[] } }; @@ -5534,6 +5534,7 @@ test("release recovery requires same-run publication and preserves successful-st const release = steps.find(step => step.name === "Create GitHub release")!; expect(publish.id).toBe("publication"); expect(smoke.id).toBe("registry-smoke"); + expect(smoke.env?.PUBLISHED).toBe("${{ steps.publication.outputs.published }}"); for (const step of [smoke, release]) { expect(step.if).toBe("${{ inputs.dry-run != true && steps.publication.outputs.published == 'true' }}"); } @@ -5566,6 +5567,7 @@ test.skipIf(process.platform === "win32")("release shell recovers only unverifie const calls = join(dir, "calls"); for (const path of [output, summary, calls]) writeFileSync(path, ""); const prelude = String.raw` + node() { echo "@fixture/renamed"; } npm() { echo "$*" >> "$CALLS" case "$1" in @@ -5609,7 +5611,12 @@ test.skipIf(process.platform === "win32")("release shell recovers only unverifie expect(receipt.includes("published=true")).toBe(scenario.receipt); expect(receipt.includes("verification=")).toBe(scenario.verification !== ""); if (scenario.verification) expect(receipt).toContain(`verification=${scenario.verification}`); - expect(log.filter(line => line.startsWith("view "))).toHaveLength(scenario.reads); + const reads = log.filter(line => line.startsWith("view ")); + expect(reads).toHaveLength(scenario.reads); + for (const read of reads) expect(read).toBe("view @fixture/renamed@9.8.7 version --fetch-retries=0 --fetch-timeout=8000"); + const tags = log.filter(line => line.startsWith("dist-tag ")); + expect(tags).toEqual(scenario.verification === "verified" + ? ["dist-tag ls @fixture/renamed --fetch-retries=0 --fetch-timeout=8000"] : []); expect(log.filter(line => line.startsWith("publish "))).toHaveLength(scenario.dry || scenario.mode === "missing-receipt" ? 0 : 1); if (scenario.verification === "pending") { expect(stdout).toContain("::warning::npm publish succeeded"); From 609105cf9148ca18decfc81e8d1859e30af3aff9 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:22:37 +0900 Subject: [PATCH 153/221] docs: plan lane D manual release chain [skip ci] --- devlog/_plan/260907_lane_d/000_plan.md | 32 +++++++++++++++++++ devlog/_plan/260907_lane_d/010_thinking.md | 24 ++++++++++++++ devlog/_plan/260907_lane_d/020_receipt.md | 12 +++++++ .../_plan/260907_lane_d/030_account_prices.md | 13 ++++++++ .../_plan/260907_lane_d/040_price_editor.md | 23 +++++++++++++ .../_plan/260907_lane_d/050_usage_ranges.md | 30 +++++++++++++++++ 6 files changed, 134 insertions(+) create mode 100644 devlog/_plan/260907_lane_d/000_plan.md create mode 100644 devlog/_plan/260907_lane_d/010_thinking.md create mode 100644 devlog/_plan/260907_lane_d/020_receipt.md create mode 100644 devlog/_plan/260907_lane_d/030_account_prices.md create mode 100644 devlog/_plan/260907_lane_d/040_price_editor.md create mode 100644 devlog/_plan/260907_lane_d/050_usage_ranges.md diff --git a/devlog/_plan/260907_lane_d/000_plan.md b/devlog/_plan/260907_lane_d/000_plan.md new file mode 100644 index 0000000000..97f6761463 --- /dev/null +++ b/devlog/_plan/260907_lane_d/000_plan.md @@ -0,0 +1,32 @@ +# Lane D release-train roadmap + +Satisfy-spec HOTL for delegated recommendations #16 → #17 → #15 → #21 → #25. +Goal: independently audited manual dependent PRs ready for main-session integration. +Scope: Claude outbound, display-name dialog, usage costs/overlays/summary, usage GUI, +plus directly required CLI/API/tests/docs. i18n files are append-only shared per main's +2026-09-07 correction. No other lane-owned files; no merge/release/main/preview. +No local test/typecheck/build/install. Remote ci.yml lane=all at final top SHA is +sole product verifier. Local source and diff checks are not execution evidence. +No user token or wall-clock bound supplied. Use existing repo/GitHub authorization. +Stop: top-head green with reviewer verdicts and layer PR/SHA evidence; otherwise +record exact DEFER/BLOCKED reasons without claiming implementation passes. +Memory/evidence: this unit plus .tmp/lane-d for review drafts. Unpublished security +material stays in scratch. Reclaim failed delegated work after two distinct agents; +other-lane file collision requires main coordination. + +## Dependency and publication map + +| Phase | Item | Outcome | Branch | +|---|---|---|---| +| 0 | Roadmap | Lock all diff plans before code | first layer docs | +| 1 | #3719 slice | Legacy redacted-before-signed SSE/JSON parity | codex/260907-d1-thinking | +| 2 | receipt guard | Prevent new intent while recovery is pending | codex/260907-d2-receipt | +| 3 | #3817 | Exact account identity resolves provider overlays | codex/260907-d3-account-prices | +| 4 | #3667 | Price editor + CLI + authoritative explicit zero | codex/260907-d4-price-editor | +| 5 | #3379 slice / #2956 | Inclusive custom usage bounds + GUI | codex/260907-d5-usage-ranges | +| 6 | readiness | Fresh top CI, screenshots and implementation audits | top branch | + +All lower subjects include [skip ci]; every push uses --no-verify. Native stack null. +Only phase 6 dispatches ci.yml lane=all; failures get Astra-high exact-log diagnosis, +fixes on their owning layer and rebase --update-refs cascade. Main alone merges. +#3719 and #3379 stay open. #2956 credit uses verified GitHub author identity. diff --git a/devlog/_plan/260907_lane_d/010_thinking.md b/devlog/_plan/260907_lane_d/010_thinking.md new file mode 100644 index 0000000000..e321ac03ce --- /dev/null +++ b/devlog/_plan/260907_lane_d/010_thinking.md @@ -0,0 +1,24 @@ +# 010 Thinking ordering +MODIFY src/claude/outbound.ts ensureBlock/closeOpenBlock and reasoning done. +Before: thinking start/deltas are emitted immediately; done closes thinking then red. +After: retain already-budgeted thinking text, defer its start/index/delta until close; +reasoning done emits red blocks before flushing pending signed thinking. Preserve text +and tool order, hidden env.txt non-disclosure, genuine signature and budget release. +MODIFY tests/claude-integration/claude-outbound.test.ts: compare collected SSE against +literal expected content and JSON for combined envelopes with preceding deltas, +multiple summary parts/red blocks, text prefix, signed-only, red-only. Check sequential +non-overlapping block indices and cancellation/overflow existing assertions. +Independent Astra audit must resolve streaming latency and allocation implications. + +Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. + +## A audit fold-back +Astra Dirac found two blockers: unmatched-item reordering and closure memory overlap. +Track bounded reasoningItemKey separately from part identity; flush on changed explicit +item identity, and close unrelated pending thinking before another item's red blocks. +Only same identity (including both omitted) reorders red before pending thinking. +Release retained thinkingBuf after text frame enqueue, before signature frame enqueue; +queued frame budget stays authoritative, never weakened. Add near-limit valid control, +shared-budget collector control, overflow/cancel regressions. Deferred thinking is an +accepted visible-latency tradeoff; text/tool frames remain live with incremental-reader +coverage. Late done after a different emitted block cannot reorder earlier content. diff --git a/devlog/_plan/260907_lane_d/020_receipt.md b/devlog/_plan/260907_lane_d/020_receipt.md new file mode 100644 index 0000000000..7b710df91e --- /dev/null +++ b/devlog/_plan/260907_lane_d/020_receipt.md @@ -0,0 +1,12 @@ +# 020 Display-name receipt recovery +MODIFY gui/src/components/ModelDisplayNameDialog.tsx. +Before: input/reset enabled whenever saving=false; input onEdit clears recovery. +After: new mutationOutcomeUnknown prop from Models.tsx recovery.confirmed===false +disables draft editing and reset, submit retains +read/retry action. Handler guards prevent synthetic events bypassing disabled controls. +Close/cancel stays available. This is bounded UI recovery, not server request ordering. +MODIFY gui/tests/models-display-name-editor.test.tsx: unknown receipt cannot replace intent; retry recovers; confirmed saved:true +and ordinary validation error remain +editable. Screenshot changed disabled input/reset with retry available. + +Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. diff --git a/devlog/_plan/260907_lane_d/030_account_prices.md b/devlog/_plan/260907_lane_d/030_account_prices.md new file mode 100644 index 0000000000..4806657cdb --- /dev/null +++ b/devlog/_plan/260907_lane_d/030_account_prices.md @@ -0,0 +1,13 @@ +# 030 Account price identity +MODIFY src/usage/user-cost-overlays.ts registry refresh and signature/version. +Before: configured provider set and overlay rows only. +After: exact account identifiers/log labels from config mapped to established provider +identity. Include mapping in signature for memo and aggregate cache invalidation. +MODIFY src/usage/cost.ts resolveMatchedPrice: exact configured namespace and exact +user overlay precede account identity; unresolved suffix is never guessed/stripped. +MODIFY tests/usage/usage-cost.test.ts or existing provider-overlay tests: custom account +id, qualified id, stable log label, configured collision, unrelated hyphenated provider, +account rename/removal invalidation. Account aliases never become identity authority. +Audit determines precise supported historical labels from actual producer evidence. + +Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. diff --git a/devlog/_plan/260907_lane_d/040_price_editor.md b/devlog/_plan/260907_lane_d/040_price_editor.md new file mode 100644 index 0000000000..4628710d0d --- /dev/null +++ b/devlog/_plan/260907_lane_d/040_price_editor.md @@ -0,0 +1,23 @@ +# 040 Manual price editor +MODIFY src/usage/cost.ts userOverlayMatch: valid operator all-zero row returns user +price, while generated catalog zeros keep unknown/fallback semantics. +MODIFY src/server/management/model-routes.ts: exact-provider model-costs GET/PUT, +validate four finite nonnegative bounded rates or null reset, preserve siblings, +rollback on persist failure, no routing/catalog mutation required for price-only edits. +MODIFY src/cli/models-runtime.ts, models-runtime-subcommands.ts and capabilities.ts: +models set-price provider/model --input N --output N [--cache-read N --cache-write N] +or --auto. GET for show and PUT for set/reset through existing management client. +ADD gui/src/components/ModelPriceDialog.tsx; MODIFY Models.tsx and models-shared.ts +only as needed: edit action, load exact saved override, inputs 4 rates USD/1M, +save/reset and manual indicator. Reuse dialog/fetch/i18n patterns. All locale keys +append-only pricing.override.*. Add endpoint, CLI, estimator and GUI regressions; +register new test files in both append-only layout manifests. Public docs and generated +CLI surface map mirror actual capability entries; source-generation commands NOT RUN +locally so map is updated by its source contract without claiming verification. + +Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. + +A fold-back: add GET/PUT entries in src/server/management/route-registry.ts. +Reuse providerModelCostsConfigError. GET returns sanitized per-provider modelCosts map; +Models owns a typed map loaded with catalog or dedicated GET, so manual badges survive +reload. CLI omitted cache-read/cache-write rates default to zero, explicitly documented. diff --git a/devlog/_plan/260907_lane_d/050_usage_ranges.md b/devlog/_plan/260907_lane_d/050_usage_ranges.md new file mode 100644 index 0000000000..35b6758a76 --- /dev/null +++ b/devlog/_plan/260907_lane_d/050_usage_ranges.md @@ -0,0 +1,30 @@ +# 050 Custom usage windows +REIMPLEMENT range slice from PR #2956 with Manson2438 credit; do not carry offline reports. +ADD src/usage/time-range.ts strict timestamp parser and inclusive since/until bounds; +MODIFY summary.ts accumulator interface to support bounded windows without poisoning +preset daily aggregates. Use stream ledger filtering for partial days if compact daily +partitions cannot answer exact boundaries. Reject malformed/reversed bounds at API/CLI. +MODIFY src/server/management/logs-usage-routes.ts custom-window path before preset cache, +stream/filter into isolated accumulator preserving surface/provider/model and truncation +metadata. Do not persist normalized ledger rows. Include bounds in response. +MODIFY CLI observe/capabilities usage flags and GUI Usage.tsx custom datetime inputs, +independent draft/applied bounds, cache key includes bounds, grid anchored to effective +window, clear returns to preset. All locale keys append-only usage.range.*. +Tests: inclusive boundaries, partial same-day, reversed/invalid, empty ledger, existing +provider/model/surface filters, preset cache after custom query; GUI apply/clear/errors. +Public API/CLI docs describe epoch/ISO contract and local datetime conversion. + +Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. + +A fold-back: immutable window option on createUsageSummaryAccumulator; add() checks +inclusive bounds AFTER recording whole-scan snapshot timestamps but BEFORE partitioning. +clone preserves window. summarize uses window endpoint for grid, actual now for generatedAt; +retain 366-day grid cap. Custom queries use isolated row-unique accumulator via existing +getFilteredUsageAggregate with window in key. Reuse overlay/timezone revision restart +and scanner identity controls. Preserve apiKeyId and current filter echo alongside all +other filters. USAGE_RANGES remains preset-only; response range stays selected preset +with customWindow:true, since/until explicit bounds (bounds override preset). API accepts +integer epoch milliseconds or full ISO-8601 with timezone only; require both bounds; +reject negative/unsafe/date-invalid/reversed, never normalize overflow dates. +MODIFY src/cli/usage-report.ts heading prints since/until for customWindow responses. +GUI datetime values become epoch ms locally; end selected minute includes 59.999s. From b462cc54f223a34a10003873870dcc0aa92353b9 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:23:28 +0900 Subject: [PATCH 154/221] docs: record lane D roadmap audit decisions [skip ci] --- devlog/_plan/260907_lane_d/001_roadmap_audit.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 devlog/_plan/260907_lane_d/001_roadmap_audit.md diff --git a/devlog/_plan/260907_lane_d/001_roadmap_audit.md b/devlog/_plan/260907_lane_d/001_roadmap_audit.md new file mode 100644 index 0000000000..c14a08d2da --- /dev/null +++ b/devlog/_plan/260907_lane_d/001_roadmap_audit.md @@ -0,0 +1,16 @@ +# Roadmap audit resolution + +Astra Herschel (01a07b2b-5148-73c0-a067-a13485ab32c9) returned +GO-WITH-FIXES with four bounded roadmap corrections. All are incorporated in +040_price_editor.md and 050_usage_ranges.md: register management routes; persist +manual-price display state; filter individual ledger entries before daily aggregation; +preserve apiKeyId and scan consistency; define milliseconds and explicit window bounds. + +Astra Dirac identified two thinking design blockers, recorded in 010 for re-audit: +item ownership and simultaneous reasoning/frame retention. Astra Ohm limits the account +mapping to evidenced Codex identities and requires consistent tier-namespace resolution. +The first implementation phase must finish those fold-backs before code changes. + +Only documentation has changed. Source references were inspected; product tests, +typecheck, builds and installs are NOT RUN by delegation instruction. Product acceptance +remains open until top-head Cross-platform CI executes lane=all. From bf1536607a3036285939f7d2915fb5533f32a53b Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:35:28 +0900 Subject: [PATCH 155/221] fix(usage): resolve account prices through provider identity [skip ci] Apply base provider overlays to exact configured Codex account identities without widening arbitrary suffix matching. Preserve pricing namespaces, cache invalidation and tier parity. Refs #3817. Co-authored-by: rrmlima <137737127+rrmlima@users.noreply.github.com> --- .../_plan/260907_lane_d/030_account_prices.md | 14 ++ src/usage/cost.ts | 48 +++-- src/usage/user-cost-overlays.ts | 38 +++- tests/usage/usage-cost.test.ts | 178 ++++++++++++++++++ 4 files changed, 249 insertions(+), 29 deletions(-) diff --git a/devlog/_plan/260907_lane_d/030_account_prices.md b/devlog/_plan/260907_lane_d/030_account_prices.md index 4806657cdb..2ac6e9ccf4 100644 --- a/devlog/_plan/260907_lane_d/030_account_prices.md +++ b/devlog/_plan/260907_lane_d/030_account_prices.md @@ -11,3 +11,17 @@ account rename/removal invalidation. Account aliases never become identity autho Audit determines precise supported historical labels from actual producer evidence. Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. + +Astra Ohm audit corrections: config-only identity mapping supports selectable Codex +accounts, effective codexAccountLogLabel, exact ID compatibility aliases, and built-in +main/__main__. Generic OAuth stores are separate and excluded; no free-form inference. +Use exact configured provider before canonical account identity, exact override first. +Apply same namespace for context/priority/lower-bound modifiers, preserving attribution. +Include sorted mapping in version signature, but aliases/plan/reordering stay no-ops. + +Implementation: exact selectable account IDs, effective labels and main forms are resolved +from config at overlay refresh. Only identity changes bump cache versions. Exact configured +providers and explicit user rows remain isolated; context/Fast/lower-bound use the selected +price namespace while request attribution is unchanged. Existing memo fast path is retained. +Regression fixtures cover mappings, collisions, ignored aliases/invalid rows, add/remove/ +label invalidation, presentation no-ops, estimate/attempt/combo and tier parity. diff --git a/src/usage/cost.ts b/src/usage/cost.ts index f7004634c9..2a3b2ae6d3 100644 --- a/src/usage/cost.ts +++ b/src/usage/cost.ts @@ -16,10 +16,10 @@ import { } from "../generated/model-metadata"; import type { AttemptTierOutcome, OcxUsage } from "../types"; import { canonicalFastTierMarker } from "../providers/fastwire"; -import { baseProviderLabel, canonicalUsageProviderLabel } from "../providers/label"; +import { baseProviderLabel } from "../providers/label"; import type { PersistedUsageAttempt, UsageStatus } from "./log"; import { canonicalAntigravityUsageModel } from "../providers/antigravity-models"; -import { activeConfiguredProviders, activeUserCostOverlays, userCostOverlayVersion } from "./user-cost-overlays"; +import { activeAccountPricingProviders, activeConfiguredProviders, activeUserCostOverlays, userCostOverlayVersion } from "./user-cost-overlays"; import { EXPECTED_PRICE_OVERLAYS, findExpectedPriceOverlay, @@ -187,21 +187,18 @@ export function resolveMatchedPrice( userOverlays: readonly ExpectedPriceOverlay[] = activeUserCostOverlays(), options: PriceResolutionOptions = {}, ): MatchedPrice | null { - // User-configured overlays are keyed by the EXACT configured provider name. - // A provider that literally exists in config.providers keeps its own pricing - // namespace: a real custom provider can legitimately end with a label-shaped - // suffix (e.g. acme-pabcdef) and must not inherit the base provider's user - // overlay. Only NON-configured names (generated account log labels) collapse - // to their label base. chatgpt/openai-multi are the same OpenAI usage surface - // and always canonicalize to openai. - const collapsed = baseProviderLabel(provider); - if (collapsed !== provider && (canonicalUsageProviderLabel(provider) !== provider || !activeConfiguredProviders().has(provider))) { + // Literal configured providers win over account identities. Only then use + // config-owned Codex identities, followed by the existing historical suffix + // grammar. Never infer an account by stripping an arbitrary suffix. + const namespace = activeConfiguredProviders().has(provider) + ? provider + : activeAccountPricingProviders().get(provider) ?? baseProviderLabel(provider); + if (namespace !== provider) { + // An exact override (including caller-supplied rows) owns its namespace. + // Unchanged names use the memoized inner lookup's existing user-first order. const exactUserOverlay = userOverlayMatch(provider, modelId, userOverlays); if (exactUserOverlay) return exactUserOverlay; - // Pool/account log suffixes (e.g. google-antigravity-p442fff) must collapse - // before the compiled/overlay lookup; configured providers keep their own - // namespace above. - provider = collapsed; + provider = namespace; } // Memoize by (provider, model): usage summaries iterate hundreds of thousands of // rows that share a handful of provider/model keys, so resolving each time would @@ -466,7 +463,7 @@ function applyContextTier( tier?: ServiceTierInput, ): [Cost4, ContextTierName | undefined, boolean] { if (rawInputTokens === undefined) return [cost4, undefined, false]; - const rule = findContextTier(baseProviderLabel(provider), modelId); + const rule = findContextTier(provider, modelId); if (!rule || !isLongContext(rule, rawInputTokens)) return [cost4, undefined, false]; const confirmedFast = isConfirmedFast(tier); if (confirmedFast && rule.confirmedPriorityRelation === "exclusive") { @@ -494,9 +491,8 @@ function applyPriorityMultiplier( contextTier?: ContextTierName, ): [Cost4, number] { if (canonicalFastTierMarker(tierScalar(serviceTier)) !== "priority") return [cost4, 1]; - const base = baseProviderLabel(provider); - if (contextTier && findContextTier(base, modelId)?.confirmedPriorityRelation !== "stack") return [cost4, 1]; - const rule = findPriorityPricingRule(base, modelId); + if (contextTier && findContextTier(provider, modelId)?.confirmedPriorityRelation !== "stack") return [cost4, 1]; + const rule = findPriorityPricingRule(provider, modelId); if (rule?.requiresResponseConfirmation && !isConfirmedFast(serviceTier)) return [cost4, 1]; const multiplier = rule?.multiplier ?? 1; if (multiplier === 1) return [cost4, 1]; @@ -524,7 +520,7 @@ function isOpenRouterPriorityLowerBound( provider: string, outcome: AttemptTierOutcome | undefined, ): boolean { - return baseProviderLabel(provider) === "openrouter" + return provider === "openrouter" && outcome?.canonical === "priority" && outcome.fastOutcome === "applied" && (outcome.confirmation === "confirmed" || outcome.confirmation === "assumed"); @@ -550,13 +546,13 @@ export function estimateAttemptCost( ? serviceTierContextFromOutcome(attempt.tierOutcome) : serviceTier; const [tieredCost4, contextTier, contextPriorityLowerBound] = applyContextTier( - price.cost4, attempt.provider, attempt.model, attempt.usage.inputTokens, attemptServiceTier, + price.cost4, price.provider, attempt.model, attempt.usage.inputTokens, attemptServiceTier, ); const [effectiveCost4, multiplier] = applyPriorityMultiplier( - tieredCost4, attempt.provider, attempt.model, attemptServiceTier, contextTier, + tieredCost4, price.provider, attempt.model, attemptServiceTier, contextTier, ); const priorityLowerBound = contextPriorityLowerBound - || isOpenRouterPriorityLowerBound(attempt.provider, attempt.tierOutcome); + || isOpenRouterPriorityLowerBound(price.provider, attempt.tierOutcome); return { ordinal: attempt.ordinal, provider: attempt.provider, @@ -635,13 +631,13 @@ export function estimateRequestCost( const price = resolveMatchedPrice(input.provider, input.model, overlays, userOverlays, input); if (!price) return null; const [tieredCost4, contextTier, contextPriorityLowerBound] = applyContextTier( - price.cost4, input.provider, input.model, input.usage.inputTokens, input.serviceTier, + price.cost4, price.provider, input.model, input.usage.inputTokens, input.serviceTier, ); const [effectiveCost4, multiplier] = applyPriorityMultiplier( - tieredCost4, input.provider, input.model, input.serviceTier, contextTier, + tieredCost4, price.provider, input.model, input.serviceTier, contextTier, ); const priorityLowerBound = contextPriorityLowerBound || isOpenRouterPriorityLowerBound( - input.provider, + price.provider, typeof input.serviceTier === "object" ? input.serviceTier.tierOutcome : undefined, ); return { diff --git a/src/usage/user-cost-overlays.ts b/src/usage/user-cost-overlays.ts index 22af57e87a..6024e17596 100644 --- a/src/usage/user-cost-overlays.ts +++ b/src/usage/user-cost-overlays.ts @@ -13,19 +13,23 @@ * must not churn the version (see refreshUserCostOverlays). The configured * provider-name set is part of the change identity: adding or removing a * provider changes which names may collapse to a label base in the resolver, - * so it bumps the version even when no overlay row changed. + * so it bumps the version even when no overlay row changed. Exact selectable + * Codex IDs and effective log labels also participate in that identity. * * Display-time estimation only — these rows never affect billing. */ import type { OcxConfig, OcxProviderConfig, ProviderCostOverlay } from "../types"; import { MAX_COST4_RATE, type ExpectedPriceOverlay } from "./expected-prices"; import { redactSecretString } from "../lib/redact"; +import { isSelectableCodexPoolAccount, MAIN_CODEX_ACCOUNT_ID } from "../codex/account-id"; +import { codexAccountLogLabel } from "../codex/account-label"; const EMPTY: readonly ExpectedPriceOverlay[] = []; let active: readonly ExpectedPriceOverlay[] = EMPTY; let activeSignature = ""; let activeConfigured = new Set(); +let activeAccountProviders = codexAccountProviders([]); let version = 0; let preservedDiskOnlyProviders: Record | null = null; @@ -54,6 +58,24 @@ function providerNames(config: OcxConfig): Set { return new Set(Object.keys(config.providers ?? {})); } +/** Exact config-owned identities only; aliases and generic OAuth stores are not authority. */ +function codexAccountProviders(accounts: OcxConfig["codexAccounts"]): Map { + const identities = new Set(["main", MAIN_CODEX_ACCOUNT_ID]); + for (const account of accounts ?? []) { + if (!isSelectableCodexPoolAccount(account)) continue; + identities.add(account.id); + identities.add(codexAccountLogLabel(account)); + } + const mapping = new Map(); + for (const identity of identities) { + mapping.set(identity, "openai"); + for (const provider of ["openai", "chatgpt", "openai-multi"]) { + mapping.set(`${provider}-${identity}`, "openai"); + } + } + return mapping; +} + /** Register one active live-config owner. Multiple server leases may share one config object. */ export function registerPreservedProviderOwner(config: OcxConfig): void { const tagged = config as PreservationTaggedConfig; @@ -289,12 +311,17 @@ export function refreshUserCostOverlays(config: OcxConfig): void { // removing a provider (even one without an overlay) changes which names are // allowed to collapse to a label base, so the resolver memo and the // /api/usage summary cache must be invalidated on that change as well. + // Sort effective account identities so account order, aliases and plan + // metadata do not churn caches; add/remove/label changes still invalidate. const configuredNames = Object.keys(providers ?? {}).sort(); - const signature = `${JSON.stringify(configuredNames)}\u0000${JSON.stringify(rows)}`; + const accountProviders = codexAccountProviders(config.codexAccounts); + const accountEntries = [...accountProviders].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0); + const signature = `${JSON.stringify(configuredNames)}\u0000${JSON.stringify(rows)}\u0000${JSON.stringify(accountEntries)}`; if (signature === activeSignature) return; activeSignature = signature; active = rows; activeConfigured = new Set(configuredNames); + activeAccountProviders = accountProviders; version++; } @@ -303,7 +330,7 @@ export function activeUserCostOverlays(): readonly ExpectedPriceOverlay[] { return active; } -/** Monotonic version bumped on every refresh; used by the estimator memo key. */ +/** Monotonic version bumped on pricing-identity changes; used by the estimator memo key. */ export function userCostOverlayVersion(): number { return version; } @@ -312,3 +339,8 @@ export function userCostOverlayVersion(): number { export function activeConfiguredProviders(): ReadonlySet { return activeConfigured; } + +/** Account pricing identities built at refresh, without reading credential stores. */ +export function activeAccountPricingProviders(): ReadonlyMap { + return activeAccountProviders; +} diff --git a/tests/usage/usage-cost.test.ts b/tests/usage/usage-cost.test.ts index 387ed3c01d..e21c4276e9 100644 --- a/tests/usage/usage-cost.test.ts +++ b/tests/usage/usage-cost.test.ts @@ -1327,6 +1327,184 @@ describe("provider cost overlay (user-configured)", () => { }); }); +describe("Codex account pricing identity", () => { + const modelId = "wp3-synthetic-account-model"; + const account = { id: "cost-account", logLabel: "p123abc", alias: "display-name", email: "fixture@example.invalid", isMain: false }; + const row: ExpectedPriceOverlay = { + provider: "openai", modelId, cost4: RATE, + source: "fixture", verifiedAt: "2026-09-07", status: "verified", + }; + const config = (accounts = [account], providers = {}) => ({ + providers, codexAccounts: accounts, + }) as unknown as OcxConfig; + const forms = (id: string) => [id, ...["openai", "chatgpt", "openai-multi"].map(provider => `${provider}-${id}`)]; + + afterEach(() => refreshUserCostOverlays(config([]))); + + test("exact selectable IDs, effective labels and built-in main forms resolve without model fallback", () => { + refreshUserCostOverlays(config([ + account, + // SHA-256('abc') begins ba7816: an invalid stored label must use the producer's fallback. + { ...account, id: "abc", logLabel: "invalid-label" }, + ])); + for (const id of [account.id, account.logLabel, "abc", "pba7816", "main", "__main__"]) { + for (const provider of forms(id)) { + expect(resolveMatchedPrice(provider, modelId, [row], [], { allowModelLevelFallback: false })) + .toMatchObject({ provider: "openai", cost4: RATE, source: "expected" }); + } + } + }); + + test("aliases, email, invalid rows, unknown IDs, case variants and non-Codex identities stay unmapped", () => { + refreshUserCostOverlays(config([ + account, + { ...account, id: "invalid/id", logLabel: "p111aaa" }, + { ...account, id: "constructor", logLabel: "p222aaa" }, + { ...account, id: "desktop-row", logLabel: "p333aaa", isMain: true }, + { ...account, id: "abc", logLabel: "invalid-label" }, + ])); + for (const provider of [ + ...forms("unknown-account"), ...forms(account.alias), ...forms(account.email), + ...forms("Cost-account"), ...forms("invalid-label"), ...forms("invalid/id"), + "constructor", "desktop-row", "p111aaa", "p222aaa", "p333aaa", "p123abC", + "Openai-cost-account", "openai-cost-account-extra", "anthropic-cost-account", + "xai-cost-account", "oauth-account", "o123abc", "xai-o123abc", "unrelated-hyphen-provider", + ]) { + expect(resolveMatchedPrice(provider, modelId, [row], [], { allowModelLevelFallback: false })).toBeNull(); + } + }); + + test("configured literal namespaces beat account mapping and historical collapse", () => { + const names = [...forms(account.id), ...forms(account.logLabel), ...forms("main"), ...forms("__main__"), "chatgpt", "openai-multi"]; + refreshUserCostOverlays(config([account], Object.fromEntries(names.map(name => [name, {}])))); + for (const provider of names) { + expect(resolveMatchedPrice(provider, modelId, [row], [])).toBeNull(); + const literal = { ...row, provider, cost4: { ...RATE, input: 7 } }; + expect(resolveMatchedPrice(provider, modelId, [row, literal], [])) + .toMatchObject({ provider, cost4: literal.cost4 }); + } + }); + + test("caller-supplied exact user rows beat both canonical user and compiled rows", () => { + refreshUserCostOverlays(config()); + for (const provider of [...forms(account.id), ...forms(account.logLabel)]) { + const canonicalUser = { ...row, cost4: { ...RATE, input: 11 } }; + const exactUser = { ...row, provider, cost4: { ...RATE, input: 17 } }; + expect(resolveMatchedPrice(provider, modelId, [row], [canonicalUser, exactUser])) + .toMatchObject({ provider, source: "user", cost4: exactUser.cost4 }); + } + }); + + test("only recognized historical phex and main suffixes retain the existing fallback", () => { + refreshUserCostOverlays(config([])); + const custom = { ...row, provider: "legacy" }; + for (const provider of ["legacy-pabcdef", "legacy-main"]) { + expect(resolveMatchedPrice(provider, modelId, [custom], [])?.cost4).toEqual(RATE); + } + for (const provider of ["legacy-unknown", "legacy-pABCDEF", "legacy-pabcde", "legacy-oabcdef", "legacy-__main__"]) { + expect(resolveMatchedPrice(provider, modelId, [custom], [])).toBeNull(); + } + }); + + test("account add, effective-label change and removal invalidate memo; presentation and order do not", () => { + const providers = { openai: { modelCosts: { [modelId]: RATE } } }; + refreshUserCostOverlays(config([], providers)); + expect(resolveMatchedPrice(account.id, modelId)).toBeNull(); + expect(resolveMatchedPrice(account.logLabel, modelId)).toBeNull(); + const before = userCostOverlayVersion(); + const second = { ...account, id: "other-account", logLabel: "p456def" }; + refreshUserCostOverlays(config([account, second], providers)); + expect(userCostOverlayVersion()).toBe(before + 1); + for (const provider of [...forms(account.id), account.logLabel]) { + expect(resolveMatchedPrice(provider, modelId)?.cost4).toEqual(RATE); + } + const rows = activeUserCostOverlays(); + const memo = resolveMatchedPrice(account.id, modelId); + const renamed = { ...account, alias: "new-display", email: "new@example.invalid", plan: "pro" }; + refreshUserCostOverlays(config([second, renamed], providers)); + expect(userCostOverlayVersion()).toBe(before + 1); + expect(activeUserCostOverlays()).toBe(rows); + expect(resolveMatchedPrice(account.id, modelId)).toBe(memo); + refreshUserCostOverlays(config([{ ...renamed, logLabel: "p789abc" }, second], providers)); + expect(userCostOverlayVersion()).toBe(before + 2); + expect(resolveMatchedPrice(account.logLabel, modelId)).toBeNull(); + expect(resolveMatchedPrice("p789abc", modelId)?.cost4).toEqual(RATE); + refreshUserCostOverlays(config([second], providers)); + expect(userCostOverlayVersion()).toBe(before + 3); + for (const provider of [...forms(account.id), "p789abc"]) { + expect(resolveMatchedPrice(provider, modelId)).toBeNull(); + } + }); + + test("mapped accounts share request, attempt and combo long-context/Fast pricing with original attribution", () => { + refreshUserCostOverlays(config()); + const usage = { inputTokens: 300_000, outputTokens: 10_000 }; + for (const provider of [...forms(account.id), ...forms(account.logLabel), ...forms("__main__")]) { + for (const serviceTier of [undefined, { responseServiceTier: "priority" }, { responseServiceTier: "default", requestedServiceTier: "priority" }]) { + const input = { provider, model: "gpt-6-astra", usageStatus: "reported" as const, usage, serviceTier }; + const request = estimateRequestCost(input)!; + const attempt = estimateAttemptCost({ ...input, ordinal: 1 }, undefined, serviceTier)!; + const combo = estimateComboCost([{ ...input, ordinal: 1 }, { ...input, ordinal: 2 }], undefined, serviceTier)!; + // 300k * $20/M input + 10k * $75/M output; Fast doubles both. + const expected = serviceTier?.responseServiceTier === "priority" ? 13.5 : 6.75; + expect(request.cost.total).toBeCloseTo(expected, 9); + expect(request.contextTier).toBe("long"); + expect(request.priorityMultiplier).toBe(expected === 13.5 ? 2 : undefined); + expect(attempt.cost).toEqual(request.cost); + expect(attempt.contextTier).toBe(request.contextTier); + expect(attempt.priorityMultiplier).toBe(request.priorityMultiplier); + expect(attempt.provider).toBe(provider); + expect(combo.cost.total).toBeCloseTo(expected * 2, 9); + expect(combo.attempts?.map(entry => entry.provider)).toEqual([provider, provider]); + } + } + }); + + test("literal and direct override namespaces do not inherit OpenAI context or Fast modifiers", () => { + const provider = "openai-p123abc"; + const input = { provider, model: "gpt-6-astra", usageStatus: "reported" as const, + usage: { inputTokens: 300_000, outputTokens: 10_000 }, serviceTier: "priority" }; + const literal = { ...row, provider, modelId: input.model }; + refreshUserCostOverlays(config([account], { [provider]: {} })); + for (const estimate of [estimateRequestCost(input, [literal], []), estimateAttemptCost({ ...input, ordinal: 1 }, [literal], "priority", [])]) { + expect(estimate?.cost.total).toBeCloseTo(1.05, 9); + expect(estimate?.contextTier).toBeUndefined(); + expect(estimate?.priorityMultiplier).toBeUndefined(); + } + refreshUserCostOverlays(config()); + const direct = estimateRequestCost(input, [], [literal]); + expect(direct?.cost.total).toBeCloseTo(1.05, 9); + expect(direct?.contextTier).toBeUndefined(); + expect(direct?.priorityMultiplier).toBeUndefined(); + const combo = estimateComboCost([{ ...input, ordinal: 1 }], [], "priority", [literal]); + expect(combo?.cost.total).toBeCloseTo(1.05, 9); + expect(combo?.contextTier).toBeUndefined(); + expect(combo?.priorityMultiplier).toBeUndefined(); + }); + + test("OpenRouter lower-bound uses the selected namespace, including Codex-name collisions", () => { + const provider = "openrouter-p123abc"; + const tracker = createAdapterTierMetadata({ capability: true, eligibility: "eligible", + fastWire: { kind: "service-tier", canonicalToWire: { priority: "priority" }, foreignCallerTiers: "verbatim" }, + demandDecision: "force-fast" }, { kind: "set", value: "priority" }, "service-tier", "priority")!; + tracker.observeResponseServiceTier("priority"); + const input = { provider, model: modelId, usageStatus: "reported" as const, + usage: { inputTokens: 100, outputTokens: 10 }, ordinal: 1, tierOutcome: tracker.outcome }; + const router = { ...row, provider: "openrouter" }; + refreshUserCostOverlays(config([])); + expect(estimateAttemptCost(input, [router], undefined, [])?.priorityLowerBound).toBe(true); + refreshUserCostOverlays(config([{ ...account, id: provider }])); + expect(estimateAttemptCost(input, [row, router], undefined, [])?.priorityLowerBound).toBeUndefined(); + refreshUserCostOverlays(config([], { [provider]: {} })); + const literal = { ...row, provider }; + const request = estimateRequestCost({ ...input, serviceTier: { tierOutcome: tracker.outcome } }, [literal], []); + expect(request).not.toBeNull(); + expect(request?.priorityLowerBound).toBeUndefined(); + expect(estimateAttemptCost(input, [literal], undefined, [])?.priorityLowerBound).toBeUndefined(); + expect(estimateComboCost([input], [literal], undefined, [])?.priorityLowerBound).toBeUndefined(); + }); +}); + describe("aggregator vendor-prefixed model ids (#3136)", () => { test("restricted resolution partitions memoization and only removes vendor fallback", () => { const model = "anthropic/claude-3-haiku-20240307"; From c35b5a6e504a4513ad59957f5c81b7db45f8bec6 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:29:46 +0900 Subject: [PATCH 156/221] fix(claude): preserve legacy thinking block order [skip ci] Defer item-bound thinking emission until its envelope can place redacted blocks first. Preserve budget enforcement and live text/tool output. Refs #3719; replay/cache acceptance remains open. Co-authored-by: lidge-jun <243035832+lidge-jun@users.noreply.github.com> --- devlog/_plan/260907_lane_d/010_thinking.md | 4 +- src/claude/outbound.ts | 59 ++-- .../claude-outbound.test.ts | 306 +++++++++++++++++- 3 files changed, 343 insertions(+), 26 deletions(-) diff --git a/devlog/_plan/260907_lane_d/010_thinking.md b/devlog/_plan/260907_lane_d/010_thinking.md index e321ac03ce..f2bb7e18bf 100644 --- a/devlog/_plan/260907_lane_d/010_thinking.md +++ b/devlog/_plan/260907_lane_d/010_thinking.md @@ -17,8 +17,10 @@ Astra Dirac found two blockers: unmatched-item reordering and closure memory ove Track bounded reasoningItemKey separately from part identity; flush on changed explicit item identity, and close unrelated pending thinking before another item's red blocks. Only same identity (including both omitted) reorders red before pending thinking. -Release retained thinkingBuf after text frame enqueue, before signature frame enqueue; +Retain thinkingBuf through signature emission as before; queued frame budget stays authoritative, never weakened. Add near-limit valid control, shared-budget collector control, overflow/cancel regressions. Deferred thinking is an accepted visible-latency tradeoff; text/tool frames remain live with incremental-reader coverage. Late done after a different emitted block cannot reorder earlier content. + +Re-audit Dirac: VERDICT PASS, blockers=0. Accept tight artificial budget capacity reduction; retain original overflow assertions and production limits. diff --git a/src/claude/outbound.ts b/src/claude/outbound.ts index 1975d5b390..d4e7758ee0 100644 --- a/src/claude/outbound.ts +++ b/src/claude/outbound.ts @@ -215,6 +215,8 @@ interface OpenBlock { callId?: string; /** Last fixed-size reasoning identity (item + summary/content index) seen by this block. */ reasoningPartKey?: string; + /** Fixed-size item identity; missing IDs only match other missing IDs. */ + reasoningItemKey?: string; thinkingBuf?: string; thinkingBufBytes?: number; reasoningSig?: string; @@ -308,6 +310,20 @@ export function responsesSseToAnthropicSse( open.webSearchArgsEmitted = true; } if (open.kind === "thinking") { + // Delay the index and all thinking frames until closure so a matching + // done envelope can put its redacted blocks first. The existing buffer + // remains charged through signature emission, including queued frames. + open.index = blockIndex++; + emit("content_block_start", { + type: "content_block_start", index: open.index, + content_block: { type: "thinking", thinking: "", signature: "" }, + }); + if (open.thinkingBuf) { + emit("content_block_delta", { + type: "content_block_delta", index: open.index, + delta: { type: "thinking_delta", thinking: open.thinkingBuf }, + }); + } const signature = open.reasoningSig ?? encodeReasoningEnvelope({ txt: open.thinkingBuf ?? "" }, translatorBudget); emit("content_block_delta", { type: "content_block_delta", index: open.index, @@ -323,12 +339,13 @@ export function responsesSseToAnthropicSse( ensureStarted(); if (open && open.kind === kind) return; closeOpenBlock(); + if (kind === "thinking") { + open = { kind, index: -1, thinkingBuf: "", thinkingBufBytes: 0 }; + return; + } const index = blockIndex++; - const contentBlock: Rec = kind === "text" - ? { type: "text", text: "" } - : { type: "thinking", thinking: "", signature: "" }; - emit("content_block_start", { type: "content_block_start", index, content_block: contentBlock }); - open = { kind, index, thinkingBuf: "", thinkingBufBytes: 0 }; + emit("content_block_start", { type: "content_block_start", index, content_block: { type: "text", text: "" } }); + open = { kind, index }; }; const finish = (stopReason: string, usage: unknown) => { if (terminated) return; @@ -405,11 +422,13 @@ export function responsesSseToAnthropicSse( case "response.reasoning_summary_text.delta": case "response.reasoning_text.delta": { if (typeof data.delta !== "string" || data.delta.length === 0) break; + const itemKey = boundedReasoningIdentity(data.item_id); + if (open?.kind === "thinking" && open.reasoningItemKey !== itemKey) closeOpenBlock(); ensureBlock("thinking"); const active = open; if (!active || active.kind !== "thinking") break; // The JSON path joins reasoning summary/content parts with "\n\n" - // (responsesJsonToAnthropicMessage); mirror that at part and item boundaries + // (responsesJsonToAnthropicMessage); mirror that at part boundaries // so multi-part summaries do not glue into one run-on paragraph. Frames // without part indices produce a constant key and never get a separator. const slot = eventName === "response.reasoning_summary_text.delta" @@ -418,7 +437,7 @@ export function responsesSseToAnthropicSse( // Upstream string metadata can be arbitrarily large. Hash strings into fixed-size // components while retaining item and part equality, rather than dropping item_id and // accidentally joining distinct malformed reasoning items. - const partKey = `${boundedReasoningIdentity(data.item_id)}:${slot}`; + const partKey = `${itemKey}:${slot}`; const needsPartSeparator = active.reasoningPartKey !== undefined && active.reasoningPartKey !== partKey; const appended = `${needsPartSeparator ? "\n\n" : ""}${data.delta}`; @@ -436,17 +455,8 @@ export function responsesSseToAnthropicSse( reservation.release(); throw error; } - if (needsPartSeparator) { - emit("content_block_delta", { - type: "content_block_delta", index: active.index, - delta: { type: "thinking_delta", thinking: "\n\n" }, - }); - } + active.reasoningItemKey = itemKey; active.reasoningPartKey = partKey; - emit("content_block_delta", { - type: "content_block_delta", index: active.index, - delta: { type: "thinking_delta", thinking: data.delta }, - }); break; } case "response.output_item.added": { @@ -563,20 +573,27 @@ export function responsesSseToAnthropicSse( const encrypted = typeof item.encrypted_content === "string" ? item.encrypted_content : ""; const env = encrypted ? decodeReasoningEnvelope(encrypted, translatorBudget) : null; const red = env?.red ?? []; - if (env?.sig && open?.kind !== "thinking") ensureBlock("thinking"); - if (open?.kind === "thinking") { - if (env?.sig) open.reasoningSig = env.sig; + const itemKey = boundedReasoningIdentity(item.id); + // A late/unrelated done cannot reorder or sign another item's text. + if (open?.kind === "thinking" && open.reasoningItemKey !== itemKey) { closeOpenBlock(); } if (red.length > 0) { ensureStarted(); - closeOpenBlock(); + if (open?.kind !== "thinking") closeOpenBlock(); } for (const data of red) { const idx = blockIndex++; emit("content_block_start", { type: "content_block_start", index: idx, content_block: { type: "redacted_thinking", data } }); emit("content_block_stop", { type: "content_block_stop", index: idx }); } + if (env?.sig && open?.kind !== "thinking") { + ensureBlock("thinking"); + } + if (open?.kind === "thinking") { + if (env?.sig) open.reasoningSig = env.sig; + closeOpenBlock(); + } } break; } diff --git a/tests/claude-integration/claude-outbound.test.ts b/tests/claude-integration/claude-outbound.test.ts index 67380bb44a..72f7a22bdf 100644 --- a/tests/claude-integration/claude-outbound.test.ts +++ b/tests/claude-integration/claude-outbound.test.ts @@ -483,8 +483,8 @@ describe("claude outbound SSE", () => { responsesSseToAnthropicSse(streamFromChunks([upstream]), "m"), "m", ) as Record; - expect(msg.content.find((b: Record) => b.type === "thinking").thinking) - .toBe("AB\n\nC\n\nD"); + expect(msg.content.filter((b: Record) => b.type === "thinking") + .map((b: Record) => b.thinking)).toEqual(["AB", "C\n\nD"]); }); test("malformed array reasoning identities retain distinct boundaries", async () => { @@ -505,8 +505,8 @@ describe("claude outbound SSE", () => { responsesSseToAnthropicSse(streamFromChunks([upstream]), "m"), "m", ) as Record; - expect(msg.content.find((b: Record) => b.type === "thinking").thinking) - .toBe("A\n\nB"); + expect(msg.content.filter((b: Record) => b.type === "thinking") + .map((b: Record) => b.thinking)).toEqual(["A", "B"]); }); test("data-only Responses frames infer event names from payload types", async () => { @@ -1304,3 +1304,301 @@ describe("sanitizeWebSearchInput (#381)", () => { expect(events[3].data.delta).toEqual({ type: "signature_delta", signature: "sig-only" }); }); }); + +describe("deferred Claude thinking order", () => { + const fixtures = [ + { + name: "combined envelope with preceding multipart deltas", + envelope: { sig: "signed-visible", red: ["opaque-1", "opaque-2"], txt: "hidden-only" }, + deltas: [ + sse("response.reasoning_summary_text.delta", { item_id: "rs", summary_index: 0, delta: "Fir" }), + sse("response.reasoning_summary_text.delta", { item_id: "rs", summary_index: 0, delta: "st" }), + sse("response.reasoning_summary_text.delta", { item_id: "rs", summary_index: 1, delta: "Second" }), + sse("response.reasoning_text.delta", { item_id: "rs", content_index: 0, delta: "Third" }), + ], + summary: [{ text: "First" }, { text: "Second" }], + content: [{ text: "Third" }], + expected: [ + { type: "text", text: "prefix" }, + { type: "redacted_thinking", data: "opaque-1" }, + { type: "redacted_thinking", data: "opaque-2" }, + { type: "thinking", thinking: "First\n\nSecond\n\nThird", signature: "signed-visible" }, + ], + }, + { + name: "combined envelope without deltas keeps signed thinking empty", + envelope: { sig: "signed-empty", red: ["opaque-1", "opaque-2"], txt: "hidden-only" }, + deltas: [], summary: [], content: [], + expected: [ + { type: "text", text: "prefix" }, + { type: "redacted_thinking", data: "opaque-1" }, + { type: "redacted_thinking", data: "opaque-2" }, + { type: "thinking", thinking: "", signature: "signed-empty" }, + ], + }, + { + name: "signed-only envelope", + envelope: { sig: "signed-only", txt: "hidden-only" }, + deltas: [], summary: [], content: [], + expected: [ + { type: "text", text: "prefix" }, + { type: "thinking", thinking: "", signature: "signed-only" }, + ], + }, + { + name: "red-only envelope", + envelope: { red: ["opaque-1", "opaque-2"], txt: "hidden-only" }, + deltas: [], summary: [], content: [], + expected: [ + { type: "text", text: "prefix" }, + { type: "redacted_thinking", data: "opaque-1" }, + { type: "redacted_thinking", data: "opaque-2" }, + ], + }, + ]; + + for (const fixture of fixtures) { + test(`${fixture.name}: JSON and collected SSE match literal content`, async () => { + const item = { + type: "reasoning", id: "rs", summary: fixture.summary, content: fixture.content, + encrypted_content: encodeReasoningEnvelope(fixture.envelope), + }; + const frames = [ + sse("response.output_text.delta", { delta: "prefix" }), + ...fixture.deltas, + sse("response.output_item.done", { item }), + sse("response.completed", { response: { status: "completed" } }), + ]; + const json = responsesJsonToAnthropicMessage({ status: "completed", output: [ + { type: "message", content: [{ type: "output_text", text: "prefix" }] }, item, + ] }, "m"); + const message = await collectAnthropicMessage( + responsesSseToAnthropicSse(streamFromChunks(frames), "m", { pingIntervalMs: 0 }), "m", + ); + expect(json.content).toEqual(fixture.expected); + expect(message.content).toEqual(fixture.expected); + expect(JSON.stringify(message)).not.toContain("hidden-only"); + expect(message.stop_reason).toBe("end_turn"); + + const events = await collectEvents(responsesSseToAnthropicSse(streamFromChunks(frames), "m", { pingIntervalMs: 0 })); + let active: number | null = null; + let next = 0; + for (const event of events) { + if (event.name === "content_block_start") { + expect(active).toBeNull(); + expect(event.data.index).toBe(next); + active = next++; + } else if (event.name === "content_block_delta" || event.name === "content_block_stop") { + expect(active).not.toBeNull(); + expect(event.data.index).toBe(active); + if (event.name === "content_block_stop") active = null; + } + } + expect(active).toBeNull(); + expect(next).toBe(fixture.expected.length); + expect(events.at(-1)?.name).toBe("message_stop"); + }); + } + + for (const [deltaId, doneId, matching] of [ + ["a", "a", true], ["a", "b", false], + [undefined, undefined, true], ["a", undefined, false], [undefined, "b", false], + ] as const) { + test(`done item boundary ${String(deltaId)} -> ${String(doneId)}`, async () => { + const message = await collectAnthropicMessage(responsesSseToAnthropicSse(streamFromChunks([ + sse("response.reasoning_text.delta", { item_id: deltaId, delta: "A" }), + sse("response.output_item.done", { item: { + type: "reasoning", id: doneId, + encrypted_content: encodeReasoningEnvelope({ sig: "done-signature", red: ["done-red"] }), + } }), + sse("response.completed", { response: { status: "completed" } }), + ]), "m", { pingIntervalMs: 0 }), "m"); + expect(message.content).toEqual(matching ? [ + { type: "redacted_thinking", data: "done-red" }, + { type: "thinking", thinking: "A", signature: "done-signature" }, + ] : [ + { type: "thinking", thinking: "A", signature: "ocxr1:eyJ0eHQiOiJBIn0=" }, + { type: "redacted_thinking", data: "done-red" }, + { type: "thinking", thinking: "", signature: "done-signature" }, + ]); + }); + } + + for (const [firstId, secondId] of [["a", "b"], ["a", undefined], [undefined, "b"]] as const) { + test(`delta item boundary ${String(firstId)} -> ${String(secondId)} flushes first`, async () => { + const message = await collectAnthropicMessage(responsesSseToAnthropicSse(streamFromChunks([ + sse("response.reasoning_text.delta", { item_id: firstId, delta: "A" }), + sse("response.reasoning_text.delta", { item_id: secondId, delta: "B" }), + sse("response.output_item.done", { item: { + type: "reasoning", id: secondId, + encrypted_content: encodeReasoningEnvelope({ sig: "second-signature", red: ["second-red"] }), + } }), + sse("response.completed", { response: { status: "completed" } }), + ]), "m", { pingIntervalMs: 0 }), "m"); + expect(message.content).toEqual([ + { type: "thinking", thinking: "A", signature: "ocxr1:eyJ0eHQiOiJBIn0=" }, + { type: "redacted_thinking", data: "second-red" }, + { type: "thinking", thinking: "B", signature: "second-signature" }, + ]); + }); + } + + test("separate red and signed items preserve their stream order", async () => { + const items = [ + { type: "reasoning", id: "red", encrypted_content: encodeReasoningEnvelope({ red: ["first-red"] }) }, + { type: "reasoning", id: "signed", summary: [{ text: "A" }], encrypted_content: encodeReasoningEnvelope({ sig: "sig-A" }) }, + { type: "reasoning", id: "red-last", encrypted_content: encodeReasoningEnvelope({ red: ["last-red"] }) }, + ]; + const message = await collectAnthropicMessage(responsesSseToAnthropicSse(streamFromChunks([ + sse("response.output_item.done", { item: items[0] }), + sse("response.reasoning_text.delta", { item_id: "signed", delta: "A" }), + sse("response.output_item.done", { item: items[1] }), + sse("response.output_item.done", { item: items[2] }), + sse("response.completed", { response: { status: "completed" } }), + ]), "m", { pingIntervalMs: 0 }), "m"); + const expected = [ + { type: "redacted_thinking", data: "first-red" }, + { type: "thinking", thinking: "A", signature: "sig-A" }, + { type: "redacted_thinking", data: "last-red" }, + ]; + expect(message.content).toEqual(expected); + expect(responsesJsonToAnthropicMessage({ output: items }, "m").content).toEqual(expected); + }); + + for (const genuineSignature of [false, true]) { + for (const buffered of [false, true]) { + test(`near-limit valid thinking: ${genuineSignature ? "genuine" : "fallback"}, ${buffered ? "shared collector" : "stream"}`, async () => { + // The live collector also retains the emitted content/signature, unlike + // the stream-only near-limit control. Both use one budget throughout. + // Shared encoding admission needs ~254 KiB for the 20 KiB fallback + // including source and queued text; genuine signatures bypass encoding. + const maxTurnBytes = (genuineSignature ? (buffered ? 128 : 70) : (buffered ? 320 : 280)) * 1024; + const budget = createTestTranslatorBudget({ maxTurnBytes }); + const text = "x".repeat((genuineSignature ? 32 : 20) * 1024); + const frames = Array.from({ length: text.length / 256 }, () => sse("response.reasoning_text.delta", { + item_id: "rs_control", content_index: 0, delta: text.slice(0, 256), + })); + frames.push(sse("response.output_item.done", { item: { + type: "reasoning", id: "rs_control", + ...(genuineSignature ? { encrypted_content: encodeReasoningEnvelope({ sig: "control-signature", red: ["control-red"] }) } : {}), + } })); + frames.push(sse("response.completed", { response: { status: "completed" } })); + const stream = responsesSseToAnthropicSse(streamFromChunks(frames), "m", { + translatorBudget: budget, pingIntervalMs: 0, + }); + if (buffered) { + // Collect live with the exact translator budget; no capture/reset/new budget. + const message = await collectAnthropicMessage(stream, "m", budget); + expect(message.type).toBe("message"); + const content = message.content as Record[]; + expect(content.map(block => block.type)).toEqual(genuineSignature + ? ["redacted_thinking", "thinking"] : ["thinking"]); + const thinking = content.at(-1)!; + expect(thinking.thinking).toBe(text); + if (genuineSignature) expect(thinking.signature).toBe("control-signature"); + else expect(decodeReasoningEnvelope(thinking.signature as string)?.txt).toBe(text); + expect(message.stop_reason).toBe("end_turn"); + } else { + const events = await collectEvents(stream); + expect(events.filter(event => event.data.delta?.type === "thinking_delta") + .map(event => event.data.delta.thinking).join("")).toBe(text); + const signature = events.find(event => event.data.delta?.type === "signature_delta")?.data.delta.signature; + if (genuineSignature) expect(signature).toBe("control-signature"); + else expect(decodeReasoningEnvelope(signature)?.txt).toBe(text); + expect(events.at(-1)?.name).toBe("message_stop"); + expect(events.some(event => event.name === "error")).toBe(false); + } + expect(budget.snapshot().overflows).toBe(0); + expect(budget.snapshot().highWaterBytes).toBeGreaterThan(60 * 1024); + expect(budget.snapshot().highWaterBytes).toBeLessThanOrEqual(maxTurnBytes); + }); + } + } + + test("cancelling deferred thinking releases its buffer and cancels upstream", async () => { + const budget = createTestTranslatorBudget(); + const text = "pending".repeat(1024); + let signalConsumed!: () => void; + const consumed = new Promise(resolve => { signalConsumed = resolve; }); + let sent = false; + let cancelReason: unknown; + const upstream = new ReadableStream({ + pull(controller) { + if (sent) { + // A second read proves the first delta has passed through handleFrame. + signalConsumed(); + return; + } + sent = true; + controller.enqueue(new TextEncoder().encode(sse("response.reasoning_text.delta", { + item_id: "pending", delta: text, + }))); + }, + cancel(reason) { cancelReason = reason; }, + }, { highWaterMark: 0 }); + const stream = responsesSseToAnthropicSse(upstream, "m", { translatorBudget: budget, pingIntervalMs: 0 }); + await consumed; + expect(budget.snapshot().currentBytes).toBeGreaterThanOrEqual(text.length); + await stream.cancel("client cancelled"); + expect(cancelReason).toBe("client cancelled"); + expect(budget.snapshot().currentBytes).toBe(0); + expect(budget.snapshot().overflows).toBe(0); + }); + + test("thinking waits for closure while text and tool arguments remain incremental; late done stays late", async () => { + let controller!: ReadableStreamDefaultController; + const upstream = new ReadableStream({ start(value) { controller = value; } }); + const reader = responsesSseToAnthropicSse(upstream, "m", { pingIntervalMs: 0 }).getReader(); + const send = (name: string, data: Record) => controller.enqueue(new TextEncoder().encode(sse(name, data))); + const next = async () => { + const { done, value } = await reader.read(); + expect(done).toBe(false); + return JSON.parse(new TextDecoder().decode(value).split("\ndata: ")[1]!.trim()) as Record; + }; + try { + send("response.reasoning_text.delta", { item_id: "early", delta: "A" }); + expect(await next()).toMatchObject({ type: "message_start" }); + expect(await next()).toEqual({ type: "ping" }); + // An explicit transport checkpoint proves no thinking start/index/text escaped. + send("response.heartbeat", {}); + expect(await next()).toEqual({ type: "ping" }); + + send("response.output_text.delta", { delta: "live-1" }); + expect(await next()).toMatchObject({ type: "content_block_start", index: 0, content_block: { type: "thinking" } }); + expect(await next()).toEqual({ type: "content_block_delta", index: 0, delta: { type: "thinking_delta", thinking: "A" } }); + expect(await next()).toEqual({ type: "content_block_delta", index: 0, delta: { type: "signature_delta", signature: "ocxr1:eyJ0eHQiOiJBIn0=" } }); + expect(await next()).toEqual({ type: "content_block_stop", index: 0 }); + expect(await next()).toMatchObject({ type: "content_block_start", index: 1, content_block: { type: "text" } }); + expect(await next()).toEqual({ type: "content_block_delta", index: 1, delta: { type: "text_delta", text: "live-1" } }); + send("response.output_text.delta", { delta: "live-2" }); + expect(await next()).toEqual({ type: "content_block_delta", index: 1, delta: { type: "text_delta", text: "live-2" } }); + + send("response.output_item.added", { item: { type: "function_call", id: "fc", call_id: "call", name: "Read" } }); + expect(await next()).toEqual({ type: "content_block_stop", index: 1 }); + expect(await next()).toMatchObject({ type: "content_block_start", index: 2, content_block: { type: "tool_use", name: "Read" } }); + for (const fragment of ['{"path":', '"/x"}']) { + send("response.function_call_arguments.delta", { item_id: "fc", delta: fragment }); + expect(await next()).toEqual({ type: "content_block_delta", index: 2, delta: { type: "input_json_delta", partial_json: fragment } }); + } + send("response.output_item.done", { item: { type: "function_call", id: "fc" } }); + expect(await next()).toEqual({ type: "content_block_stop", index: 2 }); + + send("response.output_item.done", { item: { + type: "reasoning", id: "early", encrypted_content: encodeReasoningEnvelope({ sig: "late-sig", red: ["late-red"] }), + } }); + expect(await next()).toEqual({ type: "content_block_start", index: 3, content_block: { type: "redacted_thinking", data: "late-red" } }); + expect(await next()).toEqual({ type: "content_block_stop", index: 3 }); + expect(await next()).toEqual({ type: "content_block_start", index: 4, content_block: { type: "thinking", thinking: "", signature: "" } }); + expect(await next()).toEqual({ type: "content_block_delta", index: 4, delta: { type: "signature_delta", signature: "late-sig" } }); + expect(await next()).toEqual({ type: "content_block_stop", index: 4 }); + send("response.completed", { response: { status: "completed" } }); + controller.close(); + expect(await next()).toMatchObject({ type: "message_delta", delta: { stop_reason: "tool_use" } }); + expect(await next()).toEqual({ type: "message_stop" }); + expect((await reader.read()).done).toBe(true); + } finally { + await reader.cancel(); + reader.releaseLock(); + } + }); +}); From c5fb7e3332432c6546bffa9990bce5b971653139 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:30:46 +0900 Subject: [PATCH 157/221] fix(models): guard edits during unknown receipt recovery [skip ci] Co-authored-by: lidge-jun <243035832+lidge-jun@users.noreply.github.com> --- devlog/_plan/260907_lane_d/020_receipt.md | 5 +++++ gui/src/components/ModelDisplayNameDialog.tsx | 20 +++++++++++++------ gui/src/pages/Models.tsx | 1 + gui/tests/models-display-name-editor.test.tsx | 12 +++++++++-- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/devlog/_plan/260907_lane_d/020_receipt.md b/devlog/_plan/260907_lane_d/020_receipt.md index 7b710df91e..97568c39a8 100644 --- a/devlog/_plan/260907_lane_d/020_receipt.md +++ b/devlog/_plan/260907_lane_d/020_receipt.md @@ -10,3 +10,8 @@ and ordinary validation error remain editable. Screenshot changed disabled input/reset with retry available. Verification: NOT RUN locally by user instruction; focused tests execute in final top-head Cross-platform CI. + +Implementation: unknown outcome guards input/reset handlers and submit, and focuses Retry +when saving fails without a receipt. Saved:true remains editable. Transport/body failure +matrix attempts a replacement intent and asserts no second PUT before read-only retry. +Astra Herschel plan verdict PASS. Screenshots and product execution await top CI artifact. diff --git a/gui/src/components/ModelDisplayNameDialog.tsx b/gui/src/components/ModelDisplayNameDialog.tsx index 2a57ff8279..09854e104d 100644 --- a/gui/src/components/ModelDisplayNameDialog.tsx +++ b/gui/src/components/ModelDisplayNameDialog.tsx @@ -10,6 +10,7 @@ interface ModelDisplayNameDialogProps { saving: boolean; requestError: string | null; currentNamePending?: boolean; + mutationOutcomeUnknown?: boolean; onRetry?: () => void; onEdit?: () => void; onSave: (displayName: string) => void; @@ -28,6 +29,7 @@ export default function ModelDisplayNameDialog({ saving, requestError, currentNamePending = false, + mutationOutcomeUnknown = false, onRetry, onEdit, onSave, @@ -37,6 +39,7 @@ export default function ModelDisplayNameDialog({ const t = useT(); const dialogRef = useRef(null); const inputRef = useRef(null); + const submitRef = useRef(null); const wasSavingRef = useRef(saving); const titleId = useId(); const helpId = useId(); @@ -55,8 +58,11 @@ export default function ModelDisplayNameDialog({ useEffect(() => { const saveFailed = wasSavingRef.current && !saving && Boolean(requestError); wasSavingRef.current = saving; - if (saveFailed) inputRef.current?.focus(); - }, [requestError, saving]); + if (saveFailed) { + if (mutationOutcomeUnknown) submitRef.current?.focus(); + else inputRef.current?.focus(); + } + }, [requestError, saving, mutationOutcomeUnknown]); // Parent replaces this snapshot only after a confirmed mutation, not typing or polling. // Adjust before committing children, preserving the mounted dialog and its focus refs. @@ -102,6 +108,7 @@ export default function ModelDisplayNameDialog({ event.preventDefault(); if (saving) return; if (onRetry) { onRetry(); return; } + if (mutationOutcomeUnknown) return; const nextValidationKey = modelDisplayNameValidationKey(draft); setValidationKey(nextValidationKey); if (!nextValidationKey) onSave(draft.trim()); @@ -137,8 +144,9 @@ export default function ModelDisplayNameDialog({ placeholder={t("models.displayNamePlaceholder")} aria-describedby={`${helpId}${visibleError ? ` ${errorId}` : ""}`} aria-invalid={validationError ? true : undefined} - disabled={saving} + disabled={saving || mutationOutcomeUnknown} onChange={event => { + if (saving || mutationOutcomeUnknown) return; onEdit?.(); setDraft(event.target.value); setValidationKey(null); @@ -157,15 +165,15 @@ export default function ModelDisplayNameDialog({ -
diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx index c342866d7e..fc8db5626e 100644 --- a/gui/src/pages/Models.tsx +++ b/gui/src/pages/Models.tsx @@ -2643,6 +2643,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; saving={displayNameSaving} requestError={displayNameRequestError} currentNamePending={displayNameCurrentPending} + mutationOutcomeUnknown={displayNameRecovery?.confirmed === false} onRetry={displayNameRecovery ? () => void saveDisplayName(displayNameRecovery.value) : undefined} onEdit={() => setDisplayNameRecovery(null)} onSave={value => void saveDisplayName(value)} diff --git a/gui/tests/models-display-name-editor.test.tsx b/gui/tests/models-display-name-editor.test.tsx index b0656391ed..9d67f986e0 100644 --- a/gui/tests/models-display-name-editor.test.tsx +++ b/gui/tests/models-display-name-editor.test.tsx @@ -448,8 +448,16 @@ describe("Models dashboard discovered display name integration", () => { expect(currentNameText()).toContain("Current name unavailable until refresh"); expect(currentNameText()).not.toContain("Your name"); expect(container.textContent).toContain("The change may have been saved"); + expect(dialogInput().disabled).toBe(true); + expect(dialogButton("Reset name").disabled).toBe(true); expect(dialogButton("Retry").disabled).toBe(false); expect(dialogButton("Cancel").disabled).toBe(false); + await act(async () => { + setInputValue(dialogInput(), "Replacement intent"); + dialogButton("Reset name").dispatchEvent(new testWindow.MouseEvent("click", { bubbles: true })); + }); + expect(dialogButton("Retry").disabled).toBe(false); + expect(mutationBodies).toHaveLength(1); await act(async () => container.querySelector("dialog form")!.dispatchEvent( new testWindow.Event("submit", { bubbles: true, cancelable: true }), )); @@ -522,12 +530,12 @@ describe("Models dashboard discovered display name integration", () => { if (stage === "reload") expect(seenSignals[1]).toBe(seenSignals[0]); await act(async () => deadline.abort(new DOMException("Timed out", "TimeoutError"))); await flush(); - expect(dialogInput().disabled).toBe(false); + expect(dialogInput().disabled).toBe(stage === "mutation"); expect(dialogButton("Cancel").disabled).toBe(false); expect(dialogInput().value).toBe("Possibly saved"); expect(container.textContent).toContain(stage === "mutation" ? "The change may have been saved" : "The change was saved"); - expect(testWindow.document.activeElement).toBe(dialogInput()); + expect(testWindow.document.activeElement).toBe(stage === "mutation" ? dialogButton("Retry") : dialogInput()); stall = false; if (descriptor) Object.defineProperty(AbortSignal, "timeout", descriptor); await act(async () => dialogButton("Retry").click()); From c44c6de87389a95ab798b648659fbc0838af170b Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:11:13 +0900 Subject: [PATCH 158/221] test(usage): use approved synthetic email domains [skip ci] Exact top CI logs on macOS and Windows identified the same privacy-scan fixture rejection. Keep scanner rules and assertions unchanged. Co-authored-by: rrmlima <137737127+rrmlima@users.noreply.github.com> --- tests/usage/usage-cost.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/usage/usage-cost.test.ts b/tests/usage/usage-cost.test.ts index e21c4276e9..f234622e07 100644 --- a/tests/usage/usage-cost.test.ts +++ b/tests/usage/usage-cost.test.ts @@ -1329,7 +1329,7 @@ describe("provider cost overlay (user-configured)", () => { describe("Codex account pricing identity", () => { const modelId = "wp3-synthetic-account-model"; - const account = { id: "cost-account", logLabel: "p123abc", alias: "display-name", email: "fixture@example.invalid", isMain: false }; + const account = { id: "cost-account", logLabel: "p123abc", alias: "display-name", email: "fixture@example.test", isMain: false }; const row: ExpectedPriceOverlay = { provider: "openai", modelId, cost4: RATE, source: "fixture", verifiedAt: "2026-09-07", status: "verified", @@ -1420,7 +1420,7 @@ describe("Codex account pricing identity", () => { } const rows = activeUserCostOverlays(); const memo = resolveMatchedPrice(account.id, modelId); - const renamed = { ...account, alias: "new-display", email: "new@example.invalid", plan: "pro" }; + const renamed = { ...account, alias: "new-display", email: "new@example.test", plan: "pro" }; refreshUserCostOverlays(config([second, renamed], providers)); expect(userCostOverlayVersion()).toBe(before + 1); expect(activeUserCostOverlays()).toBe(rows); From 341d71dd553fdf65dde3e52038a0327a96e56354 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:45:22 +0900 Subject: [PATCH 159/221] feat(models): edit manual token prices and preserve explicit zero [skip ci] Expose modelCosts via the Models editor and models price/set-price CLI. Preserve sibling prices, support automatic reset, and treat explicit zero user rates as known-zero display estimates. Refs #3667. Co-authored-by: nordz0r <6949669+nordz0r@users.noreply.github.com> --- .../_plan/260907_lane_d/040_price_editor.md | 21 + .../fr/reference/configuration/providers.md | 2 +- .../ja/reference/configuration/providers.md | 2 +- .../ko/reference/configuration/providers.md | 2 +- .../docs/reference/cli/providers-accounts.md | 2 + .../docs/reference/configuration/providers.md | 2 +- .../content/docs/reference/management-api.md | 23 + .../ru/reference/configuration/providers.md | 2 +- .../tr/reference/configuration/providers.md | 2 +- .../reference/configuration/providers.md | 2 +- gui/src/components/ModelPriceDialog.tsx | 235 ++++++++++ gui/src/i18n/de.ts | 24 + gui/src/i18n/en.ts | 24 + gui/src/i18n/fr.ts | 24 + gui/src/i18n/ja.ts | 24 + gui/src/i18n/ko.ts | 24 + gui/src/i18n/ru.ts | 24 + gui/src/i18n/tr.ts | 24 + gui/src/i18n/zh-TW.ts | 24 + gui/src/i18n/zh.ts | 24 + gui/src/pages/Models.tsx | 35 ++ gui/src/pages/models-shared.ts | 1 + gui/tests/models-price-editor.test.tsx | 427 ++++++++++++++++++ scripts/test-layout/layout.json | 4 +- .../ocx/references/01_management_surface.md | 41 +- src/cli/capabilities.ts | 25 + src/cli/models-runtime-subcommands.ts | 2 + src/cli/models-runtime.ts | 68 ++- src/server/management/model-routes.ts | 59 ++- src/server/management/model-rows.ts | 5 + src/server/management/route-registry.ts | 2 + src/usage/cost.ts | 10 +- tests/cli/cli-models-price.test.ts | 153 +++++++ tests/cli/cli-models-runtime-dispatch.test.ts | 17 +- tests/fixtures/test-layout-expected.json | 4 +- .../server/model-costs-management-api.test.ts | 270 +++++++++++ tests/usage/usage-cost.test.ts | 25 +- 37 files changed, 1627 insertions(+), 32 deletions(-) create mode 100644 gui/src/components/ModelPriceDialog.tsx create mode 100644 gui/tests/models-price-editor.test.tsx create mode 100644 tests/cli/cli-models-price.test.ts create mode 100644 tests/server/model-costs-management-api.test.ts diff --git a/devlog/_plan/260907_lane_d/040_price_editor.md b/devlog/_plan/260907_lane_d/040_price_editor.md index 4628710d0d..8d79b2160e 100644 --- a/devlog/_plan/260907_lane_d/040_price_editor.md +++ b/devlog/_plan/260907_lane_d/040_price_editor.md @@ -21,3 +21,24 @@ A fold-back: add GET/PUT entries in src/server/management/route-registry.ts. Reuse providerModelCostsConfigError. GET returns sanitized per-provider modelCosts map; Models owns a typed map loaded with catalog or dedicated GET, so manual badges survive reload. CLI omitted cache-read/cache-write rates default to zero, explicitly documented. + +P revalidation/API contract: GET /api/providers/{provider}/model-costs returns +{provider,modelCosts}; PUT accepts {modelId,cost:Cost4|null}, returns +{ok:true,provider,modelId,cost}. Null deletes only that model key. Models API adds +manualPricing boolean on applicable rows so badges survive reload, while the dialog +GET owns editable rates. CLI models price reads; models set-price writes/resets. +Same C2 phase splits disjoint workers: backend API/CLI/model-row/tests; frontend dialog/ +Models/types/i18n/tests; main owns explicit-zero cost semantics, docs and manifests. +No worker commits/pushes/runs local checks. Main integrates once both return. +Main granted D exactly the zero sentence in all seven translated providers config +reference pages; leave all other sections to E/M. New i18n keys are append-only. + +Implementation checkpoint: GET/PUT editor and two CLI verbs share the four-rate store; +manualPricing is emitted only for exact stored overrides. All-zero user prices are +known-zero estimates while catalog zero fallbacks remain unchanged. API/CLI and dialog +regressions cover persistence, reset, sibling isolation, invalid input and unknown receipts. +All 9 locale catalogs gained matching append-only keys. Seven existing configuration +rows (English plus six translations) had only the zero sentence updated; zh-tw has no +modelCosts row on this baseline and was left untouched. CLI surface regenerated by its +own generator, not a build or test. New backend test names appended to both manifests. +Local suites/typecheck/build/install NOT RUN; final top CI and screenshot remain open. diff --git a/docs-site/src/content/docs/fr/reference/configuration/providers.md b/docs-site/src/content/docs/fr/reference/configuration/providers.md index 96d00e5668..1d043fc7fd 100644 --- a/docs-site/src/content/docs/fr/reference/configuration/providers.md +++ b/docs-site/src/content/docs/fr/reference/configuration/providers.md @@ -104,7 +104,7 @@ sauvegarde dont le contenu diffère, puis réécrit en identifiants sans préfix | `modelAutoCompactTokenLimits?` | `Record` | Budgets souples de compactage automatique par modèle, sous forme d'entiers sûrs positifs. Ils peuvent uniquement abaisser l'enveloppe effective de 90 % du contexte ou de l'entrée maximale et sont omis lorsqu'aucune fenêtre de contexte faisant autorité n'est connue. Pour le fournisseur canonique `openai`, les clés doivent être les identifiants exacts de modèles natifs pris en charge, sans préfixe de fournisseur ni de sélecteur de compte. PATCH fusionne les entrées ; `null` supprime une clé, tandis que `null` pour le champ entier efface la table. Ces marqueurs `null` sont réservés à PATCH. | | `defaultMaxOutputTokens?` | `number` | Solution de secours `openai-chat` à l’échelle du fournisseur lorsque le client omet `max_output_tokens`. | | `modelMaxOutputTokens?` | `Record` | Budgets de repli `openai-chat` positifs par modèle ; les correspondances exactes ou par motif priment sur la valeur par défaut du fournisseur. | -| `modelCosts?` | `Record` | Prix affichés par modèle (USD par 1M de jetons), indexés par l'identifiant exact du modèle en amont de ce fournisseur — et non par un identifiant de fournisseur ni par une étiquette routée `provider/model`, par exemple `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`. Tout identifiant de modèle constitue une clé valide : les fournisseurs personnalisés peuvent cibler n'importe quel point de terminaison compatible avec OpenAI au moyen de l'adaptateur `openai-chat`, et les identifiants de fournisseur locaux ou internes fonctionnent même s'ils sont absents des catalogues intégrés. Les prix configurés par l'utilisateur priment sur les catalogues intégrés dans les estimations des pages Journaux (`~$`) et Utilisation. Les entrées historiques sont recalculées à partir de la surcharge actuelle ; modifier un prix peut donc changer les totaux antérieurs. L'ordre de repli est le suivant : `modelCosts` défini par l'utilisateur → catalogue jawcode → surcharge des prix attendus → repli propre au fournisseur au niveau du modèle. Une entrée entièrement nulle passe à la source suivante. Chaque tarif doit être un nombre fini positif ou nul, inférieur ou égal à 1 000 000 (USD par 1M de jetons) ; les lignes hors plage sont rejetées par l'interface de gestion et ignorées au chargement. Ces valeurs servent uniquement à l'estimation lors de l'affichage : les surcharges n'affectent jamais le routage, la sélection des comptes, les quotas ni la facturation. | +| `modelCosts?` | `Record` | Prix affichés par modèle (USD par 1M de jetons), indexés par l'identifiant exact du modèle en amont de ce fournisseur — et non par un identifiant de fournisseur ni par une étiquette routée `provider/model`, par exemple `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`. Tout identifiant de modèle constitue une clé valide : les fournisseurs personnalisés peuvent cibler n'importe quel point de terminaison compatible avec OpenAI au moyen de l'adaptateur `openai-chat`, et les identifiants de fournisseur locaux ou internes fonctionnent même s'ils sont absents des catalogues intégrés. Les prix configurés par l'utilisateur priment sur les catalogues intégrés dans les estimations des pages Journaux (`~$`) et Utilisation. Les entrées historiques sont recalculées à partir de la surcharge actuelle ; modifier un prix peut donc changer les totaux antérieurs. L'ordre de repli est le suivant : `modelCosts` défini par l'utilisateur → catalogue jawcode → surcharge des prix attendus → repli propre au fournisseur au niveau du modèle. Une surcharge utilisateur explicitement définie à zéro produit une estimation nulle connue ; supprimez cette entrée pour rétablir la tarification automatique. Les prix de catalogue entièrement nuls restent soumis au repli. Chaque tarif doit être un nombre fini positif ou nul, inférieur ou égal à 1 000 000 (USD par 1M de jetons) ; les lignes hors plage sont rejetées par l'interface de gestion et ignorées au chargement. Ces valeurs servent uniquement à l'estimation lors de l'affichage : les surcharges n'affectent jamais le routage, la sélection des comptes, les quotas ni la facturation. | | `headers?` | `Record` | En-têtes supplémentaires en amont. L'autorisation, les cookies, les en-têtes de clé API, les nouvelles lignes intégrées et les noms invalides sont rejetés. | | `openRouterRouting?` | `OpenRouterProviderRouting` | Préférences OpenRouter `order`, `only` et `allowFallbacks` par défaut ; valable uniquement pour les OpenRouter canoniques avec `openai-chat`. | | `modelOpenRouterRouting?` | `Record` | Remplacements exacts de l'ID de modèle qui remplacent la préférence OpenRouter à l'échelle du fournisseur. | diff --git a/docs-site/src/content/docs/ja/reference/configuration/providers.md b/docs-site/src/content/docs/ja/reference/configuration/providers.md index 8938073e6c..e298d36559 100644 --- a/docs-site/src/content/docs/ja/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ja/reference/configuration/providers.md @@ -93,7 +93,7 @@ account を削除しても mapping は保持され、同じ id を再追加す | `modelAutoCompactTokenLimits?` | `Record` | モデルごとの正の安全な整数によるソフト自動圧縮予算。実効値であるコンテキストまたは最大入力の 90% の上限を下げることだけができ、信頼できるコンテキストウィンドウが不明な場合は出力されません。canonical `openai` では、キーは provider や account-selector の接頭辞を含まない、サポート対象の正確なネイティブモデル ID でなければなりません。provider PATCH はエントリをマージし、キーを `null` にするとそのキーを削除し、フィールド全体を `null` にするとマップを消去します。これらの `null` tombstone は PATCH 専用です。 | | `defaultMaxOutputTokens?` | `number` |クライアントが `max_output_tokens` を省略した場合の、プロバイダー全体の `openai-chat` フォールバック。 | | `modelMaxOutputTokens?` | `Record` |モデルごとの `openai-chat` フォールバック バジェットがプラスになります。正確な/パターン一致はプロバイダーのデフォルトを上回ります。 | -| `modelCosts?` | `Record` | モデルごとの表示価格(100万トークンあたりの米ドル)。そのプロバイダーの正確なアップストリーム モデル ID をキーにします(プロバイダー識別子やルーティングされた `provider/model` ラベルではありません)。値は `input`, `output`, `cacheRead`, `cacheWrite` の 4 フィールドです(例: `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`)。組み込みカタログにないモデル ID も、任意の OpenAI 互換エンドポイントを対象とするカスタムプロバイダーや、ローカル・内部プロバイダーで有効です。ユーザー設定の価格は Logs の `~$` と Usage の見積もりで組み込みカタログより優先されます。過去のエントリも現在のオーバーレイで再計算されるため、価格を編集すると過去の合計が変わることがあります(フォールバック順: ユーザー設定 → jawcode カタログ → expected-price オーバーレイ → モデル別ベンダー価格)。全ゼロのエントリは次のソースにフォールバックします。各レートは 0 以上の有限数で、最大 1,000,000(100万トークンあたりの米ドル)です。範囲外の行は管理境界で拒否され、読み込み時に破棄されます。表示専用の見積もりであり、ルーティング・アカウント選択・クォータ・請求には影響しません。 | +| `modelCosts?` | `Record` | モデルごとの表示価格(100万トークンあたりの米ドル)。そのプロバイダーの正確なアップストリーム モデル ID をキーにします(プロバイダー識別子やルーティングされた `provider/model` ラベルではありません)。値は `input`, `output`, `cacheRead`, `cacheWrite` の 4 フィールドです(例: `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`)。組み込みカタログにないモデル ID も、任意の OpenAI 互換エンドポイントを対象とするカスタムプロバイダーや、ローカル・内部プロバイダーで有効です。ユーザー設定の価格は Logs の `~$` と Usage の見積もりで組み込みカタログより優先されます。過去のエントリも現在のオーバーレイで再計算されるため、価格を編集すると過去の合計が変わることがあります(フォールバック順: ユーザー設定 → jawcode カタログ → expected-price オーバーレイ → モデル別ベンダー価格)。ユーザーが明示的に全レートを 0 にした場合は、既知のゼロ料金として見積もります。自動料金に戻すにはそのモデルの設定を削除してください。カタログの全ゼロ料金は引き続きフォールバックします。各レートは 0 以上の有限数で、最大 1,000,000(100万トークンあたりの米ドル)です。範囲外の行は管理境界で拒否され、読み込み時に破棄されます。表示専用の見積もりであり、ルーティング・アカウント選択・クォータ・請求には影響しません。 | | `headers?` | `Record` |追加の上流ヘッダー。認証、Cookie、API キー ヘッダー、埋め込まれた改行、および無効な名前は拒否されます。 | | `openRouterRouting?` | `OpenRouterProviderRouting` |デフォルトの OpenRouter `order`、`only`、および `allowFallbacks` 設定。 `openai-chat` を持つ正規 OpenRouter に対してのみ有効です。 | | `modelOpenRouterRouting?` | `Record` |プロバイダー全体の OpenRouter 設定を置き換える正確なモデル ID のオーバーライド。 | diff --git a/docs-site/src/content/docs/ko/reference/configuration/providers.md b/docs-site/src/content/docs/ko/reference/configuration/providers.md index 2dda27e7bf..c37191745d 100644 --- a/docs-site/src/content/docs/ko/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ko/reference/configuration/providers.md @@ -93,7 +93,7 @@ managed map을 활성화하면 privacy-safe selector를 만들고, 이후 계정 | `modelAutoCompactTokenLimits?` | `Record` | 모델별 양의 안전 정수형 소프트 자동 압축 예산입니다. 유효한 컨텍스트 또는 최대 입력의 90% 한도를 낮출 수만 있으며, 신뢰할 수 있는 컨텍스트 창을 알 수 없으면 내보내지 않습니다. canonical `openai`에서는 키가 공급자나 계정 선택자 접두사가 없는 정확한 지원 네이티브 모델 ID여야 합니다. 공급자 PATCH는 항목을 병합하며, 키를 `null`로 지정하면 해당 키를 삭제하고 필드 전체를 `null`로 지정하면 맵을 지웁니다. 이 `null` tombstone은 PATCH에서만 사용할 수 있습니다. | | `defaultMaxOutputTokens?` | `number` | 클라이언트가 `max_output_tokens`를 생략했을 때 쓰는 공급자 전반의 `openai-chat` 폴백입니다. | | `modelMaxOutputTokens?` | `Record` | 양수 모델별 `openai-chat` 폴백 예산입니다. 정확한 일치와 패턴 일치가 공급자 기본값보다 우선합니다. | -| `modelCosts?` | `Record` | 모델별 표시 가격(100만 토큰당 USD). 해당 공급자의 정확한 업스트림 모델 ID를 키로 사용하며(공급자 식별자나 라우팅된 `provider/model` 레이블이 아님) 값은 `input`, `output`, `cacheRead`, `cacheWrite` 네 필드입니다(예: `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`). 커스텀 공급자는 `openai-chat` 어댑터로 임의의 OpenAI 호환 엔드포인트를 대상으로 할 수 있으며, 내장 카탈로그에 없는 로컬·내부 공급자 ID도 유효합니다. 사용자 구성 가격은 Logs `~$` 및 Usage 추정에서 내장 카탈로그보다 우선합니다. 기존 항목도 현재 오버레이로 다시 계산되므로 가격을 편집하면 과거 합계가 바뀔 수 있습니다(폴백 순서: 사용자 설정 → jawcode 카탈로그 → expected-price 오버레이 → 모델별 벤더 가격). 전부 0인 항목은 다음 소스로 폴백합니다. 각 요율은 0 이상의 유한한 숫자이며 최대 1,000,000(100만 토큰당 USD)입니다. 범위를 벗어난 행은 관리 경계에서 거부되고 로드 시 삭제됩니다. 표시 전용 추정이며 라우팅·계정 선택·할당량·청구에는 영향을 주지 않습니다. | +| `modelCosts?` | `Record` | 모델별 표시 가격(100만 토큰당 USD). 해당 공급자의 정확한 업스트림 모델 ID를 키로 사용하며(공급자 식별자나 라우팅된 `provider/model` 레이블이 아님) 값은 `input`, `output`, `cacheRead`, `cacheWrite` 네 필드입니다(예: `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`). 커스텀 공급자는 `openai-chat` 어댑터로 임의의 OpenAI 호환 엔드포인트를 대상으로 할 수 있으며, 내장 카탈로그에 없는 로컬·내부 공급자 ID도 유효합니다. 사용자 구성 가격은 Logs `~$` 및 Usage 추정에서 내장 카탈로그보다 우선합니다. 기존 항목도 현재 오버레이로 다시 계산되므로 가격을 편집하면 과거 합계가 바뀔 수 있습니다(폴백 순서: 사용자 설정 → jawcode 카탈로그 → expected-price 오버레이 → 모델별 벤더 가격). 사용자가 모든 요율을 명시적으로 0으로 설정하면 비용을 0으로 추정합니다. 자동 가격으로 되돌리려면 해당 모델 항목을 삭제하세요. 카탈로그의 전부 0인 요율은 계속 다음 소스로 폴백합니다. 각 요율은 0 이상의 유한한 숫자이며 최대 1,000,000(100만 토큰당 USD)입니다. 범위를 벗어난 행은 관리 경계에서 거부되고 로드 시 삭제됩니다. 표시 전용 추정이며 라우팅·계정 선택·할당량·청구에는 영향을 주지 않습니다. | | `headers?` | `Record` | 추가 상위 헤더입니다. Authorization, cookies, API-key 헤더, 내장 개행, 잘못된 이름은 허용하지 않습니다. | | `openRouterRouting?` | `OpenRouterProviderRouting` | 기본 OpenRouter `order`, `only`, `allowFallbacks` 선호도입니다. 정식 OpenRouter와 `openai-chat`에서만 유효합니다. | | `modelOpenRouterRouting?` | `Record` | 공급자 전반의 OpenRouter 선호도를 덮어쓰는 정확한 모델 id별 재정의입니다. | diff --git a/docs-site/src/content/docs/reference/cli/providers-accounts.md b/docs-site/src/content/docs/reference/cli/providers-accounts.md index 3d602799bb..e92bf67874 100644 --- a/docs-site/src/content/docs/reference/cli/providers-accounts.md +++ b/docs-site/src/content/docs/reference/cli/providers-accounts.md @@ -508,6 +508,8 @@ proxy to be running (`ocx start`, or an installed service). | --- | --- | --- | | `list` (default) | `--provider `, `--json` | List models seeded in configured providers. | | `live` | `--provider `, `--json` | Read the running catalog, including models discovered at runtime. Rows are flagged `native`/`routed`, `custom`, and `enabled`/`disabled`. | +| `price ` | `--json` | Read the model's saved manual price override; no override means automatic pricing. | +| `set-price ` | `--input `, `--output `, `--cache-read `, `--cache-write `, `--auto`, `--json` | Set display prices in USD per 1M tokens. Input/output are required when setting; omitted cache rates become zero. `--auto` removes only this model's override. | | `add ` | `--display-name `, `--context-window `, `--modalities ` | Register a model the provider catalog does not advertise. | | `edit ` | `--model-id `, `--display-name `, `--context-window `, `--modalities `, `--json` | Edit a custom model. `-` clears a field; `0` clears the context window. | | `remove ` | `--yes` | Delete a custom model. Requires `--yes` when stdin is not an interactive terminal. | diff --git a/docs-site/src/content/docs/reference/configuration/providers.md b/docs-site/src/content/docs/reference/configuration/providers.md index b0792b7367..0deb12616f 100644 --- a/docs-site/src/content/docs/reference/configuration/providers.md +++ b/docs-site/src/content/docs/reference/configuration/providers.md @@ -149,7 +149,7 @@ predictions. Explicit provider/model price overrides still take precedence. | `modelAutoCompactTokenLimits?` | `Record` | Positive safe-integer per-model soft auto-compaction budgets. Values can only lower the effective 90%-of-context/max-input envelope and are omitted when no authoritative context window is known. For canonical `openai`, keys must be exact supported native model IDs without provider or account-selector prefixes. Provider PATCH merges entries; set a key to `null` to delete it or the whole field to `null` to clear the map. These `null` tombstones are PATCH-only. | | `defaultMaxOutputTokens?` | `number` | Provider-wide `openai-chat` fallback when the client omits `max_output_tokens`. | | `modelMaxOutputTokens?` | `Record` | Positive per-model `openai-chat` fallback budgets; exact/pattern matches beat the provider default. | -| `modelCosts?` | `Record` | Per-model display prices (USD per 1M tokens), keyed by that provider's exact upstream model id — not a provider identifier or a routed `provider/model` label, e.g. `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`. Any model id is a valid key — custom providers may target any OpenAI-compatible endpoint through the `openai-chat` adapter, and local or internal provider ids work even when they are absent from the built-in catalogs. User-configured prices win over the built-in catalogs in the Logs `~$` and Usage estimates; historical entries are repriced from the current overlay, so editing a price can move past totals. The fallback order is user `modelCosts` → exact official correction → jawcode catalog → expected-price overlay → model-level vendor fallback, and an all-zero entry falls through to the next source in that sequence. Each rate must be a non-negative finite number at most 1,000,000 (USD per 1M tokens); out-of-range rows are rejected by the management boundary and dropped on load. Display-time estimation only: overlays never affect routing, account selection, quotas, or billing. | +| `modelCosts?` | `Record` | Per-model display prices (USD per 1M tokens), keyed by that provider's exact upstream model id — not a provider identifier or a routed `provider/model` label, e.g. `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`. Any model id is a valid key — custom providers may target any OpenAI-compatible endpoint through the `openai-chat` adapter, and local or internal provider ids work even when they are absent from the built-in catalogs. User-configured prices win over the built-in catalogs in the Logs `~$` and Usage estimates; historical entries are repriced from the current overlay, so editing a price can move past totals. The fallback order is user `modelCosts` → exact official correction → jawcode catalog → expected-price overlay → model-level vendor fallback, and an explicit all-zero user entry means a known-zero estimate; delete that model entry to restore automatic pricing. All-zero catalog metadata still falls through. Each rate must be a non-negative finite number at most 1,000,000 (USD per 1M tokens); out-of-range rows are rejected by the management boundary and dropped on load. Display-time estimation only: overlays never affect routing, account selection, quotas, or billing. | | `headers?` | `Record` | Extra upstream headers. Authorization, cookies, API-key headers, embedded newlines, and invalid names are rejected. | | `openRouterRouting?` | `OpenRouterProviderRouting` | Default OpenRouter `order`, `only`, and `allowFallbacks` preferences; valid only for canonical OpenRouter with `openai-chat`. | | `modelOpenRouterRouting?` | `Record` | Exact model-id overrides that replace the provider-wide OpenRouter preference. | diff --git a/docs-site/src/content/docs/reference/management-api.md b/docs-site/src/content/docs/reference/management-api.md index a4ea3ad3d9..0b3598eac8 100644 --- a/docs-site/src/content/docs/reference/management-api.md +++ b/docs-site/src/content/docs/reference/management-api.md @@ -228,6 +228,29 @@ re-estimated from the pricing active when the summary is read. This is an API-eq not a subscription charge. New main-pool requests use the reserved `main` label; legacy bare `openai` rows remain in an ambiguous bucket instead of being reassigned from current configuration. +Manual model prices can also be edited from **Models → Price**. A manual-pricing badge survives +catalog reloads. Prices are stored in `providers..modelCosts` and survive catalog sync. +Explicit all-zero user rates mean a known-zero estimate; **Reset to automatic** removes the +override and restores the usual catalog fallback. These remain display estimates, not bills. + +`GET /api/providers/{provider}/model-costs` returns `{ provider, modelCosts }`, with sanitized +four-rate entries keyed by exact upstream model ID. `PUT` on the same route accepts +`{ modelId, cost }`, where `cost` is `{ input, output, cacheRead, cacheWrite }` or `null` to reset. +All four rates must be finite numbers from 0 through 1,000,000, in USD per 1M tokens. +Unknown fields and malformed rates are rejected. A write preserves other models' overrides +and returns `{ ok: true, provider, modelId, cost }`; reset returns `cost: null`. + +```bash +ocx models price ollama/custom-model --json +ocx models set-price ollama/custom-model --input 0.50 --output 1.50 +ocx models set-price ollama/custom-model --input 0 --output 0 +ocx models set-price ollama/custom-model --auto +``` + +Omitted CLI cache-read/cache-write rates default to zero. Use `--cache-read` and `--cache-write` +to set them explicitly. A provider name remains an exact configuration identity; account display +labels are not editable provider names. + Rows in `models`, `providers`, and `days[].models` also carry `cacheHitRate`: the share of input tokens served from the provider's prompt cache, clamped to `[0, 1]`. It is `null` — never `0` — when the provider reported no cache telemetry or the row has no input tokens, because "no cache diff --git a/docs-site/src/content/docs/ru/reference/configuration/providers.md b/docs-site/src/content/docs/ru/reference/configuration/providers.md index 14a8b0a3ce..7704a9cbda 100644 --- a/docs-site/src/content/docs/ru/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ru/reference/configuration/providers.md @@ -106,7 +106,7 @@ cross-route credential fallback не существует. Строки API GPT- | `modelAutoCompactTokenLimits?` | `Record` | Мягкие бюджеты автосжатия по моделям в виде положительных безопасных целых чисел. Они могут только уменьшать эффективную границу в 90 % контекста или максимального ввода и не выдаются, если авторитетное окно контекста неизвестно. Для канонического `openai` ключами могут быть только точные поддерживаемые ID нативных моделей без префиксов провайдера или селектора аккаунта. PATCH провайдера объединяет записи: `null` для ключа удаляет его, а `null` для всего поля очищает карту. Такие маркеры `null` допустимы только в PATCH. | | `defaultMaxOutputTokens?` | `number` | Provider-wide fallback для `openai-chat`, когда клиент не передал `max_output_tokens`. | | `modelMaxOutputTokens?` | `Record` | Положительные fallback-budget'ы `openai-chat` по моделям; exact/pattern-match имеет приоритет над provider-default. | -| `modelCosts?` | `Record` | Отображаемые цены по моделям (USD за 1M токенов), ключ — точный upstream id модели этого провайдера (не идентификатор провайдера и не маршрутизируемая метка `provider/model`), значение — четыре поля: `input`, `output`, `cacheRead`, `cacheWrite` (пример: `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`). Любой id допустим — кастомный провайдер может указывать на любой OpenAI-совместимый endpoint через адаптер `openai-chat`, а локальные и внутренние провайдеры работают даже без строки во встроенных каталогах. Пользовательские цены имеют приоритет над встроенными каталогами в оценках `~$` в Logs и Usage; исторические записи пересчитываются по текущему оверлею, поэтому изменение цены может сдвинуть прошлые суммы (порядок: пользователь → каталог jawcode → expected-price overlay → вендорская цена модели); полностью нулевая запись переходит к следующему источнику. Каждая ставка должна быть неотрицательным конечным числом не более 1 000 000 (USD за 1M токенов); строки вне диапазона отклоняются на управляющей границе и отбрасываются при загрузке. Только оценка для отображения: оверлеи не влияют на маршрутизацию, выбор аккаунта, квоты или биллинг. | +| `modelCosts?` | `Record` | Отображаемые цены по моделям (USD за 1M токенов), ключ — точный upstream id модели этого провайдера (не идентификатор провайдера и не маршрутизируемая метка `provider/model`), значение — четыре поля: `input`, `output`, `cacheRead`, `cacheWrite` (пример: `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`). Любой id допустим — кастомный провайдер может указывать на любой OpenAI-совместимый endpoint через адаптер `openai-chat`, а локальные и внутренние провайдеры работают даже без строки во встроенных каталогах. Пользовательские цены имеют приоритет над встроенными каталогами в оценках `~$` в Logs и Usage; исторические записи пересчитываются по текущему оверлею, поэтому изменение цены может сдвинуть прошлые суммы (порядок: пользователь → каталог jawcode → expected-price overlay → вендорская цена модели); явно заданный пользователем набор нулевых ставок означает известную нулевую оценку; удалите запись модели, чтобы восстановить автоматическую цену. Нулевые цены каталога по-прежнему переходят к следующему источнику. Каждая ставка должна быть неотрицательным конечным числом не более 1 000 000 (USD за 1M токенов); строки вне диапазона отклоняются на управляющей границе и отбрасываются при загрузке. Только оценка для отображения: оверлеи не влияют на маршрутизацию, выбор аккаунта, квоты или биллинг. | | `headers?` | `Record` | Дополнительные upstream-header'ы. Заголовки авторизации, cookie, API-key-header'ы, встроенные переводы строк и невалидные имена отклоняются. | | `openRouterRouting?` | `OpenRouterProviderRouting` | Предпочтения по умолчанию для OpenRouter (`order`, `only`, `allowFallbacks`); валидно только для канонического OpenRouter с `openai-chat`. | | `modelOpenRouterRouting?` | `Record` | Exact override по model id, которые полностью заменяют provider-wide preference для OpenRouter. | diff --git a/docs-site/src/content/docs/tr/reference/configuration/providers.md b/docs-site/src/content/docs/tr/reference/configuration/providers.md index 3e01051010..65d0d7eca7 100644 --- a/docs-site/src/content/docs/tr/reference/configuration/providers.md +++ b/docs-site/src/content/docs/tr/reference/configuration/providers.md @@ -111,7 +111,7 @@ alanlı seçilmiş kimlikleri yalın kimliklere yeniden yazar. | `modelAutoCompactTokenLimits?` | `Record` | Model başına pozitif güvenli tamsayı biçiminde yumuşak otomatik sıkıştırma bütçeleri. Değerler yalnızca bağlamın veya maksimum girdinin etkin %90 zarfını düşürebilir ve yetkili bir bağlam penceresi bilinmiyorsa yayımlanmaz. Canonical `openai` için anahtarlar, sağlayıcı veya hesap seçici öneki olmadan desteklenen tam yerel model kimlikleri olmalıdır. Sağlayıcı PATCH girdileri birleştirir; bir anahtarı `null` yapmak o anahtarı siler, alanın tamamını `null` yapmak haritayı temizler. Bu `null` silme işaretleri yalnızca PATCH içindir. | | `defaultMaxOutputTokens?` | `number` | İstemci `max_output_tokens` değerini atladığında sağlayıcı genelinde `openai-chat` geri dönüşü. | | `modelMaxOutputTokens?` | `Record` | Pozitif model başına `openai-chat` geri dönüş bütçeleri; tam/kalıp eşleşmeleri sağlayıcı varsayılanını yener. | -| `modelCosts?` | `Record` | Sağlayıcının tam yukarı akış model kimliğine göre anahtarlanan model başına görüntüleme fiyatları (1M token başına USD) — bir sağlayıcı tanımlayıcısı veya yönlendirilen `provider/model` etiketi değil, örn. `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`. Herhangi bir model kimliği geçerli bir anahtardır — özel sağlayıcılar `openai-chat` adaptörü aracılığıyla herhangi bir OpenAI uyumlu uç noktayı hedefleyebilir ve yerel veya dahili sağlayıcı kimlikleri yerleşik kataloglarda bulunmasalar bile çalışır. Kullanıcı tarafından yapılandırılan fiyatlar Günlükler `~$` ve Kullanım tahminlerinde yerleşik katalogları yener; geçmiş girdiler geçerli katmandan yeniden fiyatlandırılır, bu nedenle bir fiyatı düzenlemek geçmiş toplamları değiştirebilir. Geri dönüş sırası: kullanıcı `modelCosts` → jawcode kataloğu → beklenen fiyat katmanı → model düzeyinde satıcı geri dönüşü ve tamamen sıfır bir girdi bu dizideki bir sonraki kaynağa düşer. Her oran en fazla 1.000.000 (1M token başına USD) olan negatif olmayan sonlu bir sayı olmalıdır; aralık dışı satırlar yönetim sınırı tarafından reddedilir ve yükleme sırasında bırakılır. Yalnızca görüntüleme zamanı tahmini: katmanlar yönlendirmeyi, hesap seçimini, kotaları veya faturalandırmayı asla etkilemez. | +| `modelCosts?` | `Record` | Sağlayıcının tam yukarı akış model kimliğine göre anahtarlanan model başına görüntüleme fiyatları (1M token başına USD) — bir sağlayıcı tanımlayıcısı veya yönlendirilen `provider/model` etiketi değil, örn. `{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`. Herhangi bir model kimliği geçerli bir anahtardır — özel sağlayıcılar `openai-chat` adaptörü aracılığıyla herhangi bir OpenAI uyumlu uç noktayı hedefleyebilir ve yerel veya dahili sağlayıcı kimlikleri yerleşik kataloglarda bulunmasalar bile çalışır. Kullanıcı tarafından yapılandırılan fiyatlar Günlükler `~$` ve Kullanım tahminlerinde yerleşik katalogları yener; geçmiş girdiler geçerli katmandan yeniden fiyatlandırılır, bu nedenle bir fiyatı düzenlemek geçmiş toplamları değiştirebilir. Geri dönüş sırası: kullanıcı `modelCosts` → jawcode kataloğu → beklenen fiyat katmanı → model düzeyinde satıcı geri dönüşü ve kullanıcının açıkça sıfır olarak belirlediği oranlar bilinen sıfır maliyetli bir tahmin üretir; otomatik fiyatlandırmaya dönmek için model girdisini silin. Tamamen sıfır katalog fiyatları bir sonraki kaynağa geçmeye devam eder. Her oran en fazla 1.000.000 (1M token başına USD) olan negatif olmayan sonlu bir sayı olmalıdır; aralık dışı satırlar yönetim sınırı tarafından reddedilir ve yükleme sırasında bırakılır. Yalnızca görüntüleme zamanı tahmini: katmanlar yönlendirmeyi, hesap seçimini, kotaları veya faturalandırmayı asla etkilemez. | | `headers?` | `Record` | Ek yukarı akış başlıkları. Yetkilendirme, çerezler, API anahtarı başlıkları, gömülü yeni satırlar ve geçersiz adlar reddedilir. | | `openRouterRouting?` | `OpenRouterProviderRouting` | Varsayılan OpenRouter `order`, `only` ve `allowFallbacks` tercihleri; yalnızca `openai-chat` ile kurallı OpenRouter için geçerlidir. | | `modelOpenRouterRouting?` | `Record` | Sağlayıcı genelindeki OpenRouter tercihinin yerini alan tam model kimliği geçersiz kılmaları. | diff --git a/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md b/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md index 32f2b52a69..e01ab6f51a 100644 --- a/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md +++ b/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md @@ -93,7 +93,7 @@ selector,而不是分配一个新名称。 | `modelAutoCompactTokenLimits?` | `Record` | 按模型设置的正安全整数软自动压缩预算。该值只能降低“上下文或最大输入的 90%”这一有效上限;没有已知的权威上下文窗口时不会输出。对于规范 `openai`,键必须是受支持的精确原生模型 ID,且不得包含提供者或账户选择器前缀。提供者 PATCH 会合并条目;将某个键设为 `null` 会删除该键,将整个字段设为 `null` 会清空映射。这些 `null` 删除标记仅适用于 PATCH。 | | `defaultMaxOutputTokens?` | `number` | 当客户端省略 `max_output_tokens` 时,`openai-chat` 的提供者级回退值。 | | `modelMaxOutputTokens?` | `Record` | 正数型、按模型设置的 `openai-chat` 回退预算;精确/模式匹配优先于提供者默认值。 | -| `modelCosts?` | `Record` | 按模型设置的显示价格(每 100 万 token 的美元数),以该提供者的精确上游模型 ID 为键(不是提供者标识符或路由后的 `provider/model` 标签),值为四个字段:`input`、`output`、`cacheRead`、`cacheWrite`(示例:`{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`)。任何模型 ID 都是有效键——自定义提供者可以通过 `openai-chat` 适配器指向任意 OpenAI 兼容端点,即使不存在于内置目录中,本地 OpenAI 兼容和内部提供者的 ID 同样有效。用户配置的价格在 Logs 的 `~$` 和 Usage 估算中优先于内置目录;历史条目也会按当前覆盖项重新计价,因此修改价格可能改变过去的总额(回退顺序:用户配置 → jawcode 目录 → expected-price 覆盖 → 模型级厂商价格);全零条目会回退到该顺序中的下一个来源。每个费率必须是大于等于 0 的有限数字,且不超过 1,000,000(每 100 万 token 的美元数);超出范围的条目会在管理边界被拒绝,并在加载时被丢弃。仅用于显示的估算:覆盖项不影响路由、账户选择、配额或计费。 | +| `modelCosts?` | `Record` | 按模型设置的显示价格(每 100 万 token 的美元数),以该提供者的精确上游模型 ID 为键(不是提供者标识符或路由后的 `provider/model` 标签),值为四个字段:`input`、`output`、`cacheRead`、`cacheWrite`(示例:`{ "deepseek-v4-flash": { "input": 0.14, "output": 0.28, "cacheRead": 0.0028, "cacheWrite": 0 } }`)。任何模型 ID 都是有效键——自定义提供者可以通过 `openai-chat` 适配器指向任意 OpenAI 兼容端点,即使不存在于内置目录中,本地 OpenAI 兼容和内部提供者的 ID 同样有效。用户配置的价格在 Logs 的 `~$` 和 Usage 估算中优先于内置目录;历史条目也会按当前覆盖项重新计价,因此修改价格可能改变过去的总额(回退顺序:用户配置 → jawcode 目录 → expected-price 覆盖 → 模型级厂商价格);用户明确将所有费率设为零时,会得到已知的零费用估算;删除该模型的覆盖项即可恢复自动定价。目录中的全零价格仍会回退到下一个来源。每个费率必须是大于等于 0 的有限数字,且不超过 1,000,000(每 100 万 token 的美元数);超出范围的条目会在管理边界被拒绝,并在加载时被丢弃。仅用于显示的估算:覆盖项不影响路由、账户选择、配额或计费。 | | `headers?` | `Record` | 额外的上游请求头。会拒绝 Authorization、cookie、API key 头、嵌入换行符以及无效名称。 | | `openRouterRouting?` | `OpenRouterProviderRouting` | 默认的 OpenRouter `order`、`only` 和 `allowFallbacks` 偏好;仅对使用 `openai-chat` 的规范 OpenRouter 有效。 | | `modelOpenRouterRouting?` | `Record` | 精确模型 id 级别的覆盖项,会替换提供者级 OpenRouter 偏好。 | diff --git a/gui/src/components/ModelPriceDialog.tsx b/gui/src/components/ModelPriceDialog.tsx new file mode 100644 index 0000000000..c4e08d98b6 --- /dev/null +++ b/gui/src/components/ModelPriceDialog.tsx @@ -0,0 +1,235 @@ +import { Fragment, useCallback, useEffect, useId, useRef, useState } from "react"; +import { createBoundedFetch, type BoundedFetch } from "../bounded-fetch"; +import { readJsonOrThrow } from "../fetch-json"; +import { useT, type TKey } from "../i18n/shared"; +import type { ModelRow } from "../pages/models-shared"; + +interface Cost4 { + input: number; + output: number; + cacheRead: number; + cacheWrite: number; +} + +const RATE_FIELDS = ["input", "output", "cacheRead", "cacheWrite"] as const; +const RATE_LABELS: Record = { + input: "pricing.override.input", + output: "pricing.override.output", + cacheRead: "pricing.override.cacheRead", + cacheWrite: "pricing.override.cacheWrite", +}; +const MAX_RATE = 1_000_000; +const REQUEST_TIMEOUT_MS = 60_000; +const EMPTY_DRAFT = { input: "", output: "", cacheRead: "", cacheWrite: "" }; +type Phase = "loading" | "loadFailed" | "ready" | "saving" | "unknown" | "refreshing" | "refreshFailed"; + +function isRecord(value: unknown): value is Record { + return value !== null && typeof value === "object" && !Array.isArray(value); +} + +function isCost(value: unknown): value is Cost4 { + return isRecord(value) && RATE_FIELDS.every(field => ( + typeof value[field] === "number" && Number.isFinite(value[field]) + && value[field] >= 0 && value[field] <= MAX_RATE + )); +} + +interface ModelPriceDialogProps { + model: ModelRow; + apiBase: string; + onRefresh: (signal: AbortSignal) => Promise; + onClose: () => void; +} + +export default function ModelPriceDialog({ model, apiBase, onRefresh, onClose }: ModelPriceDialogProps) { + const t = useT(); + const id = useId(); + const dialogRef = useRef(null); + const inputRef = useRef(null); + const submitRef = useRef(null); + const requestRef = useRef(null); + const mutationPendingRef = useRef(false); + const [phase, setPhase] = useState("loading"); + const [draft, setDraft] = useState(EMPTY_DRAFT); + const [hasOverride, setHasOverride] = useState(false); + const [errorKey, setErrorKey] = useState(null); + const [recovered, setRecovered] = useState(false); + const endpoint = `${apiBase}/api/providers/${encodeURIComponent(model.provider)}/model-costs`; + const mutating = phase === "saving" || phase === "refreshing"; + const locked = phase !== "ready"; + + const readOverride = useCallback(async (recover = false) => { + if (requestRef.current) return; + const bounded = createBoundedFetch(REQUEST_TIMEOUT_MS); + requestRef.current = bounded; + setPhase("loading"); + setErrorKey(null); + try { + const response = await fetch(endpoint, { signal: bounded.signal, cache: "no-store" }); + const result = await readJsonOrThrow(response); + bounded.signal.throwIfAborted(); + if (!isRecord(result) || result.provider !== model.provider || !isRecord(result.modelCosts)) { + throw new Error("invalid model-costs response"); + } + const cost = Object.hasOwn(result.modelCosts, model.id) ? result.modelCosts[model.id] : undefined; + if (cost !== undefined && !isCost(cost)) throw new Error("invalid model cost"); + if (requestRef.current !== bounded) return; + setDraft(cost === undefined ? EMPTY_DRAFT : { + input: String(cost.input), output: String(cost.output), + cacheRead: String(cost.cacheRead), cacheWrite: String(cost.cacheWrite), + }); + setHasOverride(cost !== undefined); + // This read recovers an editable snapshot, not ordering against an earlier + // request still running on the server or writes from another client. + setRecovered(recover); + setPhase("ready"); + } catch { + if (requestRef.current !== bounded) return; + setPhase(recover ? "unknown" : "loadFailed"); + setErrorKey(recover ? "pricing.override.recoveryFailed" : "pricing.override.loadFailed"); + } finally { + bounded.clear(); + if (requestRef.current === bounded) requestRef.current = null; + } + }, [endpoint, model.id, model.provider]); + + useEffect(() => { + const dialog = dialogRef.current; + if (dialog && !dialog.open) dialog.showModal(); + void readOverride(); + return () => { + requestRef.current?.controller.abort(); + requestRef.current?.clear(); + requestRef.current = null; + if (dialog?.open) dialog.close(); + }; + }, [readOverride]); + + useEffect(() => { + if (phase === "ready") inputRef.current?.focus(); + else if (phase === "unknown" || phase === "loadFailed" || phase === "refreshFailed") submitRef.current?.focus(); + }, [phase]); + + // undefined retries only catalog refresh after a validated persistence receipt. + const save = async (cost: Cost4 | null | undefined) => { + if (requestRef.current || (cost === undefined ? phase !== "refreshFailed" : phase !== "ready")) return; + const bounded = createBoundedFetch(REQUEST_TIMEOUT_MS); + requestRef.current = bounded; + setPhase(cost === undefined ? "refreshing" : "saving"); + mutationPendingRef.current = true; + setErrorKey(null); + let confirmed = cost === undefined; + try { + if (cost !== undefined) { + const response = await fetch(endpoint, { + method: "PUT", headers: { "content-type": "application/json" }, + body: JSON.stringify({ modelId: model.id, cost }), signal: bounded.signal, + }); + const result = await readJsonOrThrow(response); + bounded.signal.throwIfAborted(); + const receiptCost = isRecord(result) ? result.cost : undefined; + if (!isRecord(result) || result.ok !== true || result.provider !== model.provider + || result.modelId !== model.id || (cost === null ? receiptCost !== null + : !isCost(receiptCost) || !RATE_FIELDS.every(field => receiptCost[field] === cost[field]))) { + throw new Error("invalid model-costs receipt"); + } + if (requestRef.current !== bounded) return; + confirmed = true; + setPhase("refreshing"); + } + if (!await onRefresh(bounded.signal)) throw new Error("catalog refresh failed"); + bounded.signal.throwIfAborted(); + if (requestRef.current === bounded) onClose(); + } catch { + if (requestRef.current !== bounded) return; + setPhase(confirmed ? "refreshFailed" : "unknown"); + setErrorKey(confirmed ? "pricing.override.refreshFailed" : "pricing.override.outcomeUnknown"); + } finally { + bounded.clear(); + if (requestRef.current === bounded) { + requestRef.current = null; + mutationPendingRef.current = false; + } + } + }; + + const requestClose = () => { + if (!mutationPendingRef.current) onClose(); + }; + + return ( + { event.preventDefault(); requestClose(); }}> + +
+
+ {t("pricing.override.modelId")} + {model.namespaced} +
+

{t("pricing.override.help")}

+ {phase === "loading" &&

{t("pricing.override.loading")}

} + {RATE_FIELDS.map(field => ( + + + { + if (locked || requestRef.current) return; + const value = event.target.value; + setDraft(current => ({ + ...current, + cacheRead: current.cacheRead || "0", cacheWrite: current.cacheWrite || "0", + [field]: value, + })); + setErrorKey(null); + }} /> + + ))} + {recovered &&

{t("pricing.override.recovered")}

} + {errorKey && } +
+ + + +
+ + + ); +} diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 4145cb8032..a361962237 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -2591,4 +2591,28 @@ export const de: Record = { "models.displayNameTooLong": "Der Anzeigename darf höchstens 128 Zeichen lang sein.", "models.displayNameNoSlash": "Der Anzeigename darf kein / enthalten.", "models.displayNameNoControl": "Der Anzeigename darf keine Steuerzeichen enthalten.", + "pricing.override.action": "Preis", + "pricing.override.actionLabel": "Preis für {model} bearbeiten", + "pricing.override.badge": "Manueller Preis", + "pricing.override.title": "Modellpreis", + "pricing.override.modelId": "Modell-ID", + "pricing.override.help": "USD pro 1 Mio. Token. Ein- und Ausgaberaten eingeben; leere Cache-Raten gelten als 0. Vier Raten von 0 bedeuten kostenlos.", + "pricing.override.input": "Eingabe", + "pricing.override.output": "Ausgabe", + "pricing.override.cacheRead": "Cache lesen", + "pricing.override.cacheWrite": "Cache schreiben", + "pricing.override.loading": "Gespeicherten Preis laden…", + "pricing.override.loadFailed": "Der gespeicherte Preis konnte nicht geladen werden. Erneut laden.", + "pricing.override.outcomeUnknown": "Das Ergebnis der Anfrage ist unklar. Der Preis könnte geändert worden sein. Vor weiteren Änderungen den gespeicherten Preis neu laden.", + "pricing.override.recoveryFailed": "Der gespeicherte Preis konnte nicht ermittelt werden. Die Bearbeitung bleibt gesperrt; erneut laden.", + "pricing.override.recovered": "Aktueller gespeicherter Preis geladen. Die frühere Anfrage oder ein anderer Client kann ihn noch ändern.", + "pricing.override.refreshFailed": "Der Preis wurde gespeichert, aber die Modellliste konnte nicht aktualisiert werden. Die Liste erneut aktualisieren.", + "pricing.override.invalid": "Ein- und Ausgaberaten eingeben. Jede Rate muss eine endliche Zahl zwischen 0 und 1.000.000 sein.", + "pricing.override.reset": "Automatischen Preis verwenden", + "pricing.override.save": "Speichern", + "pricing.override.saving": "Speichern…", + "pricing.override.reload": "Preis neu laden", + "pricing.override.refresh": "Liste aktualisieren", + "pricing.override.cancel": "Abbrechen", + "pricing.override.close": "Schließen", }; diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index 2a31ec7947..ff45937f47 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -2625,6 +2625,30 @@ export const en = { "models.displayNameTooLong": "Friendly name must be 128 characters or fewer.", "models.displayNameNoSlash": "Friendly name cannot contain /.", "models.displayNameNoControl": "Friendly name cannot contain control characters.", + "pricing.override.action": "Price", + "pricing.override.actionLabel": "Edit price for {model}", + "pricing.override.badge": "Manual price", + "pricing.override.title": "Model price", + "pricing.override.modelId": "Model ID", + "pricing.override.help": "USD per 1M tokens. Enter input and output rates; blank cache rates use 0. All four rates set to 0 mean free.", + "pricing.override.input": "Input", + "pricing.override.output": "Output", + "pricing.override.cacheRead": "Cache read", + "pricing.override.cacheWrite": "Cache write", + "pricing.override.loading": "Loading saved price…", + "pricing.override.loadFailed": "Could not load the saved price. Reload to try again.", + "pricing.override.outcomeUnknown": "The request did not finish reliably. The price may have changed. Reload the saved price before editing again.", + "pricing.override.recoveryFailed": "Could not recover the saved price. Editing stays locked; reload to try again.", + "pricing.override.recovered": "Latest saved price loaded. The earlier request or another client may still change it.", + "pricing.override.refreshFailed": "The price was saved, but the model list could not be refreshed. Retry the list refresh.", + "pricing.override.invalid": "Enter input and output rates. Every rate must be a finite number from 0 to 1,000,000.", + "pricing.override.reset": "Reset to automatic", + "pricing.override.save": "Save", + "pricing.override.saving": "Saving…", + "pricing.override.reload": "Reload price", + "pricing.override.refresh": "Refresh list", + "pricing.override.cancel": "Cancel", + "pricing.override.close": "Close", } as const; export type TKey = keyof typeof en; diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index 753982c1bf..eafe430758 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -2578,4 +2578,28 @@ export const fr: Record = { "models.displayNameTooLong": "Le nom d’affichage doit contenir au maximum 128 caractères.", "models.displayNameNoSlash": "Le nom d’affichage ne peut pas contenir /.", "models.displayNameNoControl": "Le nom d’affichage ne peut pas contenir de caractères de contrôle.", + "pricing.override.action": "Prix", + "pricing.override.actionLabel": "Modifier le prix de {model}", + "pricing.override.badge": "Prix manuel", + "pricing.override.title": "Prix du modèle", + "pricing.override.modelId": "ID du modèle", + "pricing.override.help": "USD par million de tokens. Saisissez les tarifs d’entrée et de sortie ; un tarif de cache vide vaut 0. Quatre tarifs à 0 signifient gratuit.", + "pricing.override.input": "Entrée", + "pricing.override.output": "Sortie", + "pricing.override.cacheRead": "Lecture du cache", + "pricing.override.cacheWrite": "Écriture du cache", + "pricing.override.loading": "Chargement du prix enregistré…", + "pricing.override.loadFailed": "Impossible de charger le prix enregistré. Rechargez pour réessayer.", + "pricing.override.outcomeUnknown": "Le résultat de la requête est incertain. Le prix a peut-être changé. Rechargez le prix enregistré avant toute autre modification.", + "pricing.override.recoveryFailed": "Impossible de récupérer le prix enregistré. La modification reste verrouillée ; rechargez pour réessayer.", + "pricing.override.recovered": "Le prix actuellement enregistré est chargé. La requête précédente ou un autre client peut encore le modifier.", + "pricing.override.refreshFailed": "Le prix est enregistré, mais la liste des modèles n’a pas pu être actualisée. Réessayez l’actualisation.", + "pricing.override.invalid": "Saisissez les tarifs d’entrée et de sortie. Chaque tarif doit être un nombre fini entre 0 et 1 000 000.", + "pricing.override.reset": "Revenir au prix automatique", + "pricing.override.save": "Enregistrer", + "pricing.override.saving": "Enregistrement…", + "pricing.override.reload": "Recharger le prix", + "pricing.override.refresh": "Actualiser la liste", + "pricing.override.cancel": "Annuler", + "pricing.override.close": "Fermer", }; diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 300d1f8c51..6fe289e48c 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -2612,4 +2612,28 @@ export const ja: Record = { "models.displayNameTooLong": "表示名は 128 文字以内にしてください。", "models.displayNameNoSlash": "表示名に / は使用できません。", "models.displayNameNoControl": "表示名に制御文字は使用できません。", + "pricing.override.action": "価格", + "pricing.override.actionLabel": "{model} の価格を編集", + "pricing.override.badge": "手動価格", + "pricing.override.title": "モデル価格", + "pricing.override.modelId": "モデル ID", + "pricing.override.help": "100万トークンあたりの USD です。入力・出力単価を入力してください。空のキャッシュ単価は 0 とし、4項目すべてが 0 なら無料です。", + "pricing.override.input": "入力", + "pricing.override.output": "出力", + "pricing.override.cacheRead": "キャッシュ読み取り", + "pricing.override.cacheWrite": "キャッシュ書き込み", + "pricing.override.loading": "保存済み価格を読み込み中…", + "pricing.override.loadFailed": "保存済み価格を読み込めませんでした。再読み込みしてください。", + "pricing.override.outcomeUnknown": "リクエストの結果を確認できませんでした。価格が変更された可能性があります。編集する前に保存済み価格を再読み込みしてください。", + "pricing.override.recoveryFailed": "保存済み価格を確認できないため、編集はロックされています。再読み込みしてください。", + "pricing.override.recovered": "現在の保存済み価格を読み込みました。先ほどのリクエストや別のクライアントが後から変更する可能性があります。", + "pricing.override.refreshFailed": "価格は保存されましたが、モデル一覧を更新できませんでした。一覧の更新を再試行してください。", + "pricing.override.invalid": "入力・出力単価を入力してください。各単価は 0 以上 1,000,000 以下の有限の数値にしてください。", + "pricing.override.reset": "自動価格に戻す", + "pricing.override.save": "保存", + "pricing.override.saving": "保存中…", + "pricing.override.reload": "価格を再読み込み", + "pricing.override.refresh": "一覧を更新", + "pricing.override.cancel": "キャンセル", + "pricing.override.close": "閉じる", }; diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 42c000c6bb..20160b7ffe 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -2613,4 +2613,28 @@ export const ko: Record = { "models.displayNameTooLong": "표시 이름은 128자 이하여야 합니다.", "models.displayNameNoSlash": "표시 이름에 /를 사용할 수 없습니다.", "models.displayNameNoControl": "표시 이름에 제어 문자를 사용할 수 없습니다.", + "pricing.override.action": "가격", + "pricing.override.actionLabel": "{model} 가격 편집", + "pricing.override.badge": "수동 가격", + "pricing.override.title": "모델 가격", + "pricing.override.modelId": "모델 ID", + "pricing.override.help": "토큰 100만 개당 USD입니다. 입력·출력 요율을 입력하세요. 빈 캐시 요율은 0으로 처리하며, 네 요율이 모두 0이면 무료입니다.", + "pricing.override.input": "입력", + "pricing.override.output": "출력", + "pricing.override.cacheRead": "캐시 읽기", + "pricing.override.cacheWrite": "캐시 쓰기", + "pricing.override.loading": "저장된 가격을 불러오는 중…", + "pricing.override.loadFailed": "저장된 가격을 불러오지 못했습니다. 다시 불러와 주세요.", + "pricing.override.outcomeUnknown": "요청 결과를 확인하지 못했습니다. 가격이 변경되었을 수 있으니 저장된 가격을 다시 불러온 뒤 편집하세요.", + "pricing.override.recoveryFailed": "저장된 가격을 확인하지 못해 편집이 잠겨 있습니다. 다시 불러와 주세요.", + "pricing.override.recovered": "현재 저장된 가격을 불러왔습니다. 이전 요청이나 다른 클라이언트가 이후에 가격을 변경할 수 있습니다.", + "pricing.override.refreshFailed": "가격은 저장했지만 모델 목록을 갱신하지 못했습니다. 목록 갱신을 다시 시도하세요.", + "pricing.override.invalid": "입력·출력 요율을 입력하세요. 모든 요율은 0 이상 1,000,000 이하의 유한한 숫자여야 합니다.", + "pricing.override.reset": "자동 가격으로 복원", + "pricing.override.save": "저장", + "pricing.override.saving": "저장 중…", + "pricing.override.reload": "가격 다시 불러오기", + "pricing.override.refresh": "목록 갱신", + "pricing.override.cancel": "취소", + "pricing.override.close": "닫기", }; diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 51fcaef210..b433aa4381 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -2614,4 +2614,28 @@ export const ru: Record = { "models.displayNameTooLong": "Понятное имя должно содержать не более 128 символов.", "models.displayNameNoSlash": "Понятное имя не может содержать /.", "models.displayNameNoControl": "Понятное имя не может содержать управляющие символы.", + "pricing.override.action": "Цена", + "pricing.override.actionLabel": "Изменить цену для {model}", + "pricing.override.badge": "Своя цена", + "pricing.override.title": "Цена модели", + "pricing.override.modelId": "ID модели", + "pricing.override.help": "USD за 1 млн токенов. Укажите входной и выходной тарифы; пустые тарифы кеша равны 0. Четыре нулевых тарифа означают бесплатное использование.", + "pricing.override.input": "Вход", + "pricing.override.output": "Выход", + "pricing.override.cacheRead": "Чтение кеша", + "pricing.override.cacheWrite": "Запись кеша", + "pricing.override.loading": "Загрузка сохранённой цены…", + "pricing.override.loadFailed": "Не удалось загрузить сохранённую цену. Повторите загрузку.", + "pricing.override.outcomeUnknown": "Результат запроса неизвестен. Цена могла измениться. Загрузите сохранённую цену перед следующим изменением.", + "pricing.override.recoveryFailed": "Не удалось получить сохранённую цену. Редактирование заблокировано; повторите загрузку.", + "pricing.override.recovered": "Текущая сохранённая цена загружена. Предыдущий запрос или другой клиент ещё может изменить её.", + "pricing.override.refreshFailed": "Цена сохранена, но список моделей не обновлён. Повторите обновление списка.", + "pricing.override.invalid": "Укажите входной и выходной тарифы. Каждый тариф должен быть конечным числом от 0 до 1 000 000.", + "pricing.override.reset": "Вернуть автоматическую цену", + "pricing.override.save": "Сохранить", + "pricing.override.saving": "Сохранение…", + "pricing.override.reload": "Загрузить цену", + "pricing.override.refresh": "Обновить список", + "pricing.override.cancel": "Отмена", + "pricing.override.close": "Закрыть", }; diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index c764bf11ca..b86b867b22 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -2614,4 +2614,28 @@ export const tr: Record = { "models.displayNameTooLong": "Görünen ad en fazla 128 karakter olabilir.", "models.displayNameNoSlash": "Görünen ad / içeremez.", "models.displayNameNoControl": "Görünen ad denetim karakterleri içeremez.", + "pricing.override.action": "Fiyat", + "pricing.override.actionLabel": "{model} fiyatını düzenle", + "pricing.override.badge": "Elle belirlenen fiyat", + "pricing.override.title": "Model fiyatı", + "pricing.override.modelId": "Model kimliği", + "pricing.override.help": "1 milyon token başına USD. Giriş ve çıkış ücretlerini girin; boş önbellek ücretleri 0 sayılır. Dört ücret de 0 ise ücretsizdir.", + "pricing.override.input": "Giriş", + "pricing.override.output": "Çıkış", + "pricing.override.cacheRead": "Önbellek okuma", + "pricing.override.cacheWrite": "Önbellek yazma", + "pricing.override.loading": "Kayıtlı fiyat yükleniyor…", + "pricing.override.loadFailed": "Kayıtlı fiyat yüklenemedi. Yeniden yükleyin.", + "pricing.override.outcomeUnknown": "İsteğin sonucu doğrulanamadı. Fiyat değişmiş olabilir. Yeniden düzenlemeden önce kayıtlı fiyatı yükleyin.", + "pricing.override.recoveryFailed": "Kayıtlı fiyat alınamadı. Düzenleme kilitli kalır; yeniden yükleyin.", + "pricing.override.recovered": "Güncel kayıtlı fiyat yüklendi. Önceki istek veya başka bir istemci fiyatı hâlâ değiştirebilir.", + "pricing.override.refreshFailed": "Fiyat kaydedildi ancak model listesi yenilenemedi. Listeyi yeniden yenileyin.", + "pricing.override.invalid": "Giriş ve çıkış ücretlerini girin. Her ücret 0 ile 1.000.000 arasında sonlu bir sayı olmalıdır.", + "pricing.override.reset": "Otomatik fiyata dön", + "pricing.override.save": "Kaydet", + "pricing.override.saving": "Kaydediliyor…", + "pricing.override.reload": "Fiyatı yeniden yükle", + "pricing.override.refresh": "Listeyi yenile", + "pricing.override.cancel": "İptal", + "pricing.override.close": "Kapat", }; diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index ab6aedd67a..856c4c869c 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2576,4 +2576,28 @@ export const zhTW: Record = { "models.displayNameTooLong": "友善名稱不能超過 128 個字元。", "models.displayNameNoSlash": "友善名稱不能包含 /。", "models.displayNameNoControl": "友善名稱不能包含控制字元。", + "pricing.override.action": "價格", + "pricing.override.actionLabel": "編輯 {model} 的價格", + "pricing.override.badge": "手動價格", + "pricing.override.title": "模型價格", + "pricing.override.modelId": "模型 ID", + "pricing.override.help": "單位為每百萬 token 的美元價格。請輸入輸入與輸出費率;空白快取費率以 0 計算。四項皆為 0 表示免費。", + "pricing.override.input": "輸入", + "pricing.override.output": "輸出", + "pricing.override.cacheRead": "快取讀取", + "pricing.override.cacheWrite": "快取寫入", + "pricing.override.loading": "正在載入已儲存的價格…", + "pricing.override.loadFailed": "無法載入已儲存的價格,請重新載入。", + "pricing.override.outcomeUnknown": "無法確認請求結果,價格可能已變更。再次編輯前請重新載入已儲存的價格。", + "pricing.override.recoveryFailed": "無法取得已儲存的價格,編輯仍被鎖定。請重新載入。", + "pricing.override.recovered": "已載入目前儲存的價格。先前的請求或其他用戶端仍可能變更該價格。", + "pricing.override.refreshFailed": "價格已儲存,但無法重新整理模型清單。請重試重新整理清單。", + "pricing.override.invalid": "請輸入輸入與輸出費率。每項費率必須是 0 到 1,000,000 之間的有限數字。", + "pricing.override.reset": "恢復自動價格", + "pricing.override.save": "儲存", + "pricing.override.saving": "正在儲存…", + "pricing.override.reload": "重新載入價格", + "pricing.override.refresh": "重新整理清單", + "pricing.override.cancel": "取消", + "pricing.override.close": "關閉", }; diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 052f449855..4e1fda0c2a 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -2612,4 +2612,28 @@ export const zh: Record = { "models.displayNameTooLong": "友好名称不能超过 128 个字符。", "models.displayNameNoSlash": "友好名称不能包含 /。", "models.displayNameNoControl": "友好名称不能包含控制字符。", + "pricing.override.action": "价格", + "pricing.override.actionLabel": "编辑 {model} 的价格", + "pricing.override.badge": "手动价格", + "pricing.override.title": "模型价格", + "pricing.override.modelId": "模型 ID", + "pricing.override.help": "单位为每百万 token 的美元价格。请输入输入和输出费率;空白缓存费率按 0 计算。四项均为 0 表示免费。", + "pricing.override.input": "输入", + "pricing.override.output": "输出", + "pricing.override.cacheRead": "缓存读取", + "pricing.override.cacheWrite": "缓存写入", + "pricing.override.loading": "正在加载已保存的价格…", + "pricing.override.loadFailed": "无法加载已保存的价格,请重新加载。", + "pricing.override.outcomeUnknown": "无法确认请求结果,价格可能已更改。再次编辑前请重新加载已保存的价格。", + "pricing.override.recoveryFailed": "无法获取已保存的价格,编辑仍被锁定。请重新加载。", + "pricing.override.recovered": "已加载当前保存的价格。之前的请求或其他客户端仍可能更改该价格。", + "pricing.override.refreshFailed": "价格已保存,但无法刷新模型列表。请重试刷新列表。", + "pricing.override.invalid": "请输入输入和输出费率。每项费率必须是 0 到 1,000,000 之间的有限数字。", + "pricing.override.reset": "恢复自动价格", + "pricing.override.save": "保存", + "pricing.override.saving": "正在保存…", + "pricing.override.reload": "重新加载价格", + "pricing.override.refresh": "刷新列表", + "pricing.override.cancel": "取消", + "pricing.override.close": "关闭", }; diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx index fc8db5626e..bc010c4abc 100644 --- a/gui/src/pages/Models.tsx +++ b/gui/src/pages/Models.tsx @@ -1,5 +1,6 @@ import { CodexStaleBanner } from "../components/codex-stale-banner"; import ModelDisplayNameDialog from "../components/ModelDisplayNameDialog"; +import ModelPriceDialog from "../components/ModelPriceDialog"; import { fetchCodexAppServerState } from "../codex-app-server-state"; import type { AppServerStateOutcome } from "../codex-app-server-state"; import { useCodexRestart } from "../use-codex-restart"; @@ -330,6 +331,8 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; const [v2HelpOpen, setV2HelpOpen] = useState(false); const [customModalOpen, setCustomModalOpen] = useState(false); const [displayNameModel, setDisplayNameModel] = useState(null); + const [priceModel, setPriceModel] = useState(null); + const priceTriggerRef = useRef(null); const [displayNameSaving, setDisplayNameSaving] = useState(false); const [displayNameRequestError, setDisplayNameRequestError] = useState(null); const [displayNameRecovery, setDisplayNameRecovery] = useState<{ @@ -1696,6 +1699,23 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; {t("models.customBadge")} )} + {!m.native && m.provider !== "combo" && ( + <> + {m.manualPricing === true && {t("pricing.override.badge")}} + + + )} {!m.custom && recentIds.has(m.id) && {t("models.newBadge")}} {m.contextCapped && {t("models.contextCappedValue", { value: fmtK(m.contextCap ?? contextCapValue) })}}
@@ -2651,6 +2671,21 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; onClose={closeDisplayNameEdit} /> )} + {priceModel && ( + load(true, signal)} + onClose={() => { + const trigger = priceTriggerRef.current; + setPriceModel(null); + window.setTimeout(() => { + if (trigger?.isConnected) trigger.focus(); + }, 0); + }} + /> + )} ); diff --git a/gui/src/pages/models-shared.ts b/gui/src/pages/models-shared.ts index 1f5ef7786b..19d9bb67f7 100644 --- a/gui/src/pages/models-shared.ts +++ b/gui/src/pages/models-shared.ts @@ -37,6 +37,7 @@ export interface ModelRow { displayName?: string; displayNameOverride?: string; displayNameSource?: "operator" | "provider" | "fallback"; + manualPricing?: boolean; inputModalities?: string[]; contextWindow?: number; contextCap?: number; diff --git a/gui/tests/models-price-editor.test.tsx b/gui/tests/models-price-editor.test.tsx new file mode 100644 index 0000000000..b759a8398e --- /dev/null +++ b/gui/tests/models-price-editor.test.tsx @@ -0,0 +1,427 @@ +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { Window } from "happy-dom"; +import { act } from "react"; +import type { Root } from "react-dom/client"; +import { clearClientResourceStoresForTests } from "../src/client-resource"; +import { LanguageProvider } from "../src/i18n/provider"; +import Models from "../src/pages/Models"; +import type { ModelRow } from "../src/pages/models-shared"; + +type Rates = { input: number; output: number; cacheRead: number; cacheWrite: number }; +type Mutation = { modelId: string; cost: Rates | null }; +const FREE = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }; +const SAVED = { input: 1.25, output: 9.5, cacheRead: 0.125, cacheWrite: 2.75 }; + +function deferred() { + let resolve!: () => void; + const promise = new Promise(done => { resolve = done; }); + return { promise, resolve }; +} + +describe("Models manual price editor", () => { + const globals = [ + "document", "window", "navigator", "localStorage", "sessionStorage", + "IS_REACT_ACT_ENVIRONMENT", "fetch", "setInterval", "clearInterval", + ] as const; + let previousGlobals: Record<(typeof globals)[number], PropertyDescriptor | undefined>; + let testWindow: Window; + let container: HTMLElement; + let root: Root | null; + let rows: ModelRow[]; + let modelCosts: Record; + let mutations: Mutation[]; + let reads: Array<{ url: string; init?: RequestInit }>; + let catalogReads: number; + let getFailure: boolean; + let catalogFailure: boolean; + let getGate: ReturnType | null; + let putGate: ReturnType | null; + let catalogGate: ReturnType | null; + let getResponse: (() => Response) | null; + let putResponse: ((body: Mutation) => Response) | null; + + beforeEach(() => { + clearClientResourceStoresForTests(); + previousGlobals = Object.fromEntries(globals.map(key => [key, Object.getOwnPropertyDescriptor(globalThis, key)])) as typeof previousGlobals; + testWindow = new Window({ url: "http://localhost/#models" }); + Object.defineProperties(globalThis, { + document: { configurable: true, value: testWindow.document }, + window: { configurable: true, value: testWindow }, + navigator: { configurable: true, value: testWindow.navigator }, + localStorage: { configurable: true, value: testWindow.localStorage }, + sessionStorage: { configurable: true, value: testWindow.sessionStorage }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true }, + setInterval: { configurable: true, value: () => 1 }, + clearInterval: { configurable: true, value: () => {} }, + }); + rows = [ + { provider: "xai-demo", id: "grok-4.6", namespaced: "xai-demo/grok-4.6", disabled: false, manualPricing: true }, + { provider: "xai-demo", id: "vendor/custom", namespaced: "xai-demo/vendor/custom", disabled: false, custom: true, customId: "custom-1" }, + { provider: "openai", id: "gpt-5.5", namespaced: "openai/gpt-5.5", disabled: false, native: true, manualPricing: true }, + { provider: "combo", id: "balanced", namespaced: "combo/balanced", disabled: false, manualPricing: true }, + ]; + const providers = [ + { name: "xai-demo", liveModels: false, models: ["grok-4.6", "vendor/custom"] }, + { name: "openai", liveModels: false, models: ["gpt-5.5"] }, + ]; + modelCosts = { "grok-4.6": { ...SAVED }, sibling: { ...FREE } }; + mutations = []; + reads = []; + catalogReads = 0; + getFailure = false; + catalogFailure = false; + getGate = null; + putGate = null; + catalogGate = null; + getResponse = null; + putResponse = null; + testWindow.localStorage.setItem("ocx-lang", "en"); + testWindow.localStorage.setItem("ocx-models-collapsed:v2", JSON.stringify([])); + testWindow.sessionStorage.setItem("ocx.models.catalog.v1:http://localhost", JSON.stringify({ + models: rows, providers, selectedModels: {}, disabled: [], contextCaps: {}, contextCapValue: 350_000, + })); + globalThis.fetch = (async (input, init) => { + const url = String(input); + if (url.endsWith("/api/providers/xai-demo/model-costs")) { + if (init?.method === "PUT") { + const body = JSON.parse(String(init.body)) as Mutation; + mutations.push(body); + if (putGate) await putGate.promise; + if (body.cost === null) delete modelCosts[body.modelId]; + else modelCosts[body.modelId] = body.cost; + rows = rows.map(row => row.provider === "xai-demo" && row.id === body.modelId + ? { ...row, manualPricing: body.cost !== null } : row); + return putResponse ? putResponse(body) : Response.json({ ok: true, provider: "xai-demo", ...body }); + } + reads.push({ url, init }); + if (getGate) await getGate.promise; + if (getFailure) return Response.json({ error: "unavailable" }, { status: 503 }); + return getResponse ? getResponse() : Response.json({ provider: "xai-demo", modelCosts }); + } + if (url.endsWith("/api/models")) { + catalogReads++; + if (catalogGate) await catalogGate.promise; + if (catalogFailure) return Response.json({ error: "unavailable" }, { status: 503 }); + return Response.json(rows); + } + if (url.endsWith("/api/providers")) return Response.json(providers); + if (url.endsWith("/api/selected-models")) return Response.json({ selected: {} }); + if (url.endsWith("/api/provider-context-caps")) return Response.json({ caps: {} }); + if (url.endsWith("/api/aliases")) return Response.json({ providers: {}, models: {}, defaults: { global: false, providers: {} } }); + if (url.endsWith("/api/combos")) return Response.json({ combos: [] }); + if (url.endsWith("/api/shadow-call-settings")) return Response.json({ enabled: false, model: "" }); + if (url.endsWith("/api/v2")) return Response.json({ enabled: false, agentsMaxThreadsConflict: false, multiAgentMode: "default" }); + return new Response(null, { status: 404 }); + }) as typeof fetch; + container = testWindow.document.createElement("div"); + testWindow.document.body.appendChild(container as never); + root = null; + }); + + afterEach(async () => { + clearClientResourceStoresForTests(); + if (root) await act(async () => root!.unmount()); + getGate?.resolve(); + putGate?.resolve(); + catalogGate?.resolve(); + testWindow.close(); + for (const key of globals) { + const descriptor = previousGlobals[key]; + if (descriptor) Object.defineProperty(globalThis, key, descriptor); + else Reflect.deleteProperty(globalThis, key); + } + }); + + async function flush() { + await act(async () => { await new Promise(resolve => testWindow.setTimeout(resolve, 0)); }); + } + + async function mount() { + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root = createRoot(container); + root.render(); + }); + await flush(); + } + + function trigger(model = "xai-demo/grok-4.6"): HTMLButtonElement { + return container.querySelector(`[aria-label="Edit price for ${model}"]`)!; + } + + function inputs(): HTMLInputElement[] { + return [...container.querySelectorAll("dialog input")]; + } + + function button(label: string): HTMLButtonElement { + return [...container.querySelectorAll("dialog button")].find(node => node.textContent === label)!; + } + + async function click(label: string) { + await act(async () => button(label).click()); + await flush(); + } + + async function open(model?: string) { + await act(async () => trigger(model).click()); + await flush(); + } + + async function fill(values: string[]) { + for (const [index, value] of values.entries()) { + await act(async () => { + const input = inputs()[index]!; + Object.getOwnPropertyDescriptor(testWindow.HTMLInputElement.prototype, "value")!.set!.call(input, value); + input.dispatchEvent(new testWindow.Event("input", { bubbles: true })); + }); + } + } + + test("real routed and custom rows expose Price; badges use manualPricing and exclude native/combo aliases", async () => { + await mount(); + expect(container.querySelectorAll('[aria-label^="Edit price for "]')).toHaveLength(2); + expect(trigger("openai/gpt-5.5")).toBeNull(); + expect(trigger("combo/balanced")).toBeNull(); + expect(trigger().closest(".models-model-row")!.textContent).toContain("Manual price"); + expect(trigger("xai-demo/vendor/custom").closest(".models-model-row")!.textContent).not.toContain("Manual price"); + expect(reads).toHaveLength(0); + }); + + test("opening loads exact fresh rates, focuses input, and closing aborts a pending read", async () => { + await mount(); + await open(); + expect(inputs().map(input => input.value)).toEqual(["1.25", "9.5", "0.125", "2.75"]); + expect(testWindow.document.activeElement).toBe(inputs()[0]); + expect(reads[0]!.init?.cache).toBe("no-store"); + await click("Cancel"); + expect(testWindow.document.activeElement).toBe(trigger()); + + modelCosts["grok-4.6"] = { input: 3, output: 7, cacheRead: 2, cacheWrite: 4 }; + await open(); + expect(inputs().map(input => input.value)).toEqual(["3", "7", "2", "4"]); + await click("Cancel"); + getGate = deferred(); + await open(); + expect(inputs().every(input => input.disabled)).toBe(true); + expect(button("Save").disabled).toBe(true); + const signal = reads.at(-1)!.init!.signal!; + await act(async () => container.querySelector("dialog")!.dispatchEvent(new testWindow.Event("cancel", { cancelable: true }))); + expect(signal.aborted).toBe(true); + expect(container.querySelector("dialog")).toBeNull(); + await act(async () => getGate!.resolve()); + expect(container.querySelector("dialog")).toBeNull(); + }); + + test("missing override starts empty; explicit free saves exact slash-containing ID, refreshes, then closes", async () => { + await mount(); + await open("xai-demo/vendor/custom"); + expect(inputs().map(input => input.value)).toEqual(["", "", "", ""]); + expect(button("Reset to automatic").disabled).toBe(true); + await click("Save"); + expect(mutations).toHaveLength(0); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("Enter input and output rates"); + await fill(["0", "0"]); + expect(inputs().map(input => input.value)).toEqual(["0", "0", "0", "0"]); + const before = catalogReads; + catalogGate = deferred(); + await click("Save"); + expect(mutations).toEqual([{ modelId: "vendor/custom", cost: FREE }]); + expect(catalogReads).toBeGreaterThan(before); + expect(container.querySelector("dialog")).not.toBeNull(); + expect(button("Cancel").disabled).toBe(true); + await act(async () => catalogGate!.resolve()); + await flush(); + expect(container.querySelector("dialog")).toBeNull(); + expect(trigger("xai-demo/vendor/custom").closest(".models-model-row")!.textContent).toContain("Manual price"); + await open("xai-demo/vendor/custom"); + expect(inputs().map(input => input.value)).toEqual(["0", "0", "0", "0"]); + expect(button("Reset to automatic").disabled).toBe(false); + }); + + test("reset sends null and refresh removes the badge without changing sibling rates", async () => { + await mount(); + await open(); + await click("Reset to automatic"); + expect(mutations).toEqual([{ modelId: "grok-4.6", cost: null }]); + expect(modelCosts.sibling).toEqual(FREE); + expect(trigger().closest(".models-model-row")!.textContent).not.toContain("Manual price"); + await open(); + expect(inputs().map(input => input.value)).toEqual(["", "", "", ""]); + }); + + test("finite bounds are enforced and the maximum with fractional cache rates is accepted", async () => { + await mount(); + await open(); + for (const invalid of ["-1", "1000001", ""]) { + await fill([invalid]); + await click("Save"); + expect(mutations).toHaveLength(0); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("finite number"); + } + await fill(["1000000", "0", "0.000001", "0.5"]); + await click("Save"); + expect(mutations).toEqual([{ modelId: "grok-4.6", cost: { input: 1000000, output: 0, cacheRead: 0.000001, cacheWrite: 0.5 } }]); + }); + + test("failed initial reads keep editing locked until a successful reload", async () => { + getFailure = true; + await mount(); + await open(); + expect(inputs().every(input => input.disabled)).toBe(true); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("Could not load"); + expect(testWindow.document.activeElement).toBe(button("Reload price")); + await click("Reload price"); + expect(mutations).toHaveLength(0); + expect(inputs()[0]!.disabled).toBe(true); + getFailure = false; + await click("Reload price"); + expect(inputs()[0]!.value).toBe("1.25"); + expect(inputs()[0]!.disabled).toBe(false); + }); + + for (const failure of ["transport", "malformed", "wrong identity", "wrong cost", "http"] as const) { + test(`${failure} mutation outcome requires read recovery before new edits`, async () => { + await mount(); + await open(); + putResponse = body => { + if (failure === "transport") throw new TypeError("connection dropped"); + if (failure === "malformed") return new Response("{", { status: 200 }); + if (failure === "http") return Response.json({ error: "failed" }, { status: 503 }); + return Response.json({ ok: true, provider: "xai-demo", ...body, + ...(failure === "wrong identity" ? { modelId: "other" } : { cost: SAVED }), + }); + }; + await fill(["0", "0", "0", "0"]); + await click("Save"); + expect(mutations).toHaveLength(1); + expect(inputs().every(input => input.disabled)).toBe(true); + expect(button("Reset to automatic").disabled).toBe(true); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("may have changed"); + await act(async () => button("Reset to automatic").dispatchEvent(new testWindow.MouseEvent("click", { bubbles: true }))); + expect(mutations).toHaveLength(1); + getFailure = true; + await click("Reload price"); + expect(mutations).toHaveLength(1); + expect(inputs()[0]!.disabled).toBe(true); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("Editing stays locked"); + getFailure = false; + await click("Reload price"); + expect(inputs().map(input => input.value)).toEqual(["0", "0", "0", "0"]); + expect(inputs()[0]!.disabled).toBe(false); + expect(container.textContent).toContain("may still change it"); + expect(mutations).toHaveLength(1); + putResponse = null; + await fill(["2", "3"]); + await click("Save"); + expect(mutations[1]).toEqual({ modelId: "grok-4.6", cost: { input: 2, output: 3, cacheRead: 0, cacheWrite: 0 } }); + expect(container.querySelector("dialog")).toBeNull(); + }); + } + + test("malformed GET cost or provider is never treated as an empty override", async () => { + await mount(); + for (const payload of [ + { provider: "other", modelCosts }, + { provider: "xai-demo", modelCosts: { "grok-4.6": { ...SAVED, input: -1 } } }, + { provider: "xai-demo", modelCosts: { "grok-4.6": { input: 1, output: 2 } } }, + { provider: "xai-demo", modelCosts: [] }, + ]) { + getResponse = () => Response.json(payload); + await open(); + expect(inputs().every(input => input.disabled)).toBe(true); + expect(button("Reset to automatic").disabled).toBe(true); + await click("Cancel"); + } + expect(mutations).toHaveLength(0); + }); + + test("a reset with a lost receipt recovers empty rates without replaying the reset", async () => { + await mount(); + await open(); + putResponse = () => { throw new TypeError("receipt lost"); }; + await click("Reset to automatic"); + expect(inputs()[0]!.disabled).toBe(true); + await click("Reload price"); + expect(inputs().map(input => input.value)).toEqual(["", "", "", ""]); + expect(inputs()[0]!.disabled).toBe(false); + expect(button("Reset to automatic").disabled).toBe(true); + expect(mutations).toEqual([{ modelId: "grok-4.6", cost: null }]); + }); + + test("the mutation deadline unlocks cancellation but requires a fresh read before editing", async () => { + await mount(); + await open(); + const descriptor = Object.getOwnPropertyDescriptor(AbortSignal, "timeout"); + const deadline = new AbortController(); + const timeoutBudgets: number[] = []; + const transport = globalThis.fetch; + let pendingSignal: AbortSignal | null | undefined; + try { + Object.defineProperty(AbortSignal, "timeout", { configurable: true, value: (ms: number) => { + timeoutBudgets.push(ms); + return deadline.signal; + } }); + globalThis.fetch = (async (input: RequestInfo | URL, init?: RequestInit) => { + if (init?.method === "PUT" && String(input).endsWith("/model-costs")) { + pendingSignal = init.signal; + return new Promise((_resolve, reject) => { + init.signal!.addEventListener("abort", () => reject(new Error("request deadline")), { once: true }); + }); + } + return transport(input, init); + }) as typeof fetch; + await click("Save"); + expect(button("Cancel").disabled).toBe(true); + expect(timeoutBudgets).toEqual([60_000]); + await act(async () => deadline.abort()); + await flush(); + expect(pendingSignal?.aborted).toBe(true); + expect(button("Cancel").disabled).toBe(false); + expect(inputs().every(input => input.disabled)).toBe(true); + expect(button("Reload price").disabled).toBe(false); + } finally { + globalThis.fetch = transport; + if (descriptor) Object.defineProperty(AbortSignal, "timeout", descriptor); + else Reflect.deleteProperty(AbortSignal, "timeout"); + } + await click("Reload price"); + expect(inputs()[0]!.disabled).toBe(false); + expect(reads).toHaveLength(2); + }); + + test("confirmed receipt survives repeated failed catalog refreshes and retries never PUT again", async () => { + await mount(); + await open(); + catalogFailure = true; + await click("Reset to automatic"); + expect(mutations).toHaveLength(1); + expect(inputs().every(input => input.disabled)).toBe(true); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("price was saved"); + await click("Refresh list"); + expect(mutations).toHaveLength(1); + expect(container.querySelector('[role="alert"]')!.textContent).toContain("price was saved"); + expect(reads).toHaveLength(1); + catalogFailure = false; + await click("Refresh list"); + expect(mutations).toEqual([{ modelId: "grok-4.6", cost: null }]); + expect(container.querySelector("dialog")).toBeNull(); + }); + + test("pending mutations reject duplicate submit and dismissal", async () => { + await mount(); + await open(); + putGate = deferred(); + await click("Save"); + await act(async () => { + container.querySelector("dialog form")!.dispatchEvent(new testWindow.Event("submit", { bubbles: true, cancelable: true })); + container.querySelector("dialog")!.dispatchEvent(new testWindow.Event("cancel", { cancelable: true })); + button("Cancel").dispatchEvent(new testWindow.MouseEvent("click", { bubbles: true })); + }); + expect(mutations).toHaveLength(1); + expect(container.querySelector("dialog")).not.toBeNull(); + expect(inputs().every(input => input.disabled)).toBe(true); + await act(async () => putGate!.resolve()); + await flush(); + expect(container.querySelector("dialog")).toBeNull(); + }); +}); diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json index 60e0f22a0d..ffb001a82d 100644 --- a/scripts/test-layout/layout.json +++ b/scripts/test-layout/layout.json @@ -1298,7 +1298,9 @@ "zhipu-bigmodel-provider.test.ts": "providers", "zz-ci-api-usage-isolation.test.ts": "ci-workflows", "zz-ci-storage-policy-isolation.test.ts": "ci-workflows", - "zz-pr-coderabbit-readiness-revalidation.test.ts": "ci-workflows" + "zz-pr-coderabbit-readiness-revalidation.test.ts": "ci-workflows", + "cli-models-price.test.ts": "cli", + "model-costs-management-api.test.ts": "server" }, "migrated": [ "adapters", diff --git a/skills/ocx/references/01_management_surface.md b/skills/ocx/references/01_management_surface.md index 10b0cd9e89..485ed745ba 100644 --- a/skills/ocx/references/01_management_surface.md +++ b/skills/ocx/references/01_management_surface.md @@ -28,6 +28,22 @@ These answer in the CLI head and never reach the proxy, so they work with nothin Safe to run at any time; none of these change state. +### `ocx models price` + +Read the saved manual price for an exact provider/model selector. + +| Method | Route | +|---|---| +| GET | `/api/providers/{provider}/model-costs` | + +| Flag | Value | Meaning | +|---|---|---| +| `--json` | boolean | Emit provider, modelId, and cost (null for automatic pricing). | + +JSON mode: `envelope`. + +- The provider must be configured; everything after the first slash is the exact upstream model ID. + ### `ocx status` Proxy status, injection state, and version skew between this CLI and the running proxy. @@ -353,6 +369,27 @@ JSON mode: `payload`. Each of these writes. Check the flags column before running one unattended. +### `ocx models set-price` + +Save four manual USD-per-1M-token rates, or restore automatic pricing for one model. + +| Method | Route | +|---|---| +| PUT | `/api/providers/{provider}/model-costs` | + +| Flag | Value | Meaning | +|---|---|---| +| `--input` | number | Input rate; required unless --auto is used. | +| `--output` | number | Output rate; required unless --auto is used. | +| `--cache-read` | number | Cache read rate; defaults to 0. | +| `--cache-write` | number | Cache write rate; defaults to 0. | +| `--auto` | boolean | Remove this model's override; cannot be combined with rates. | +| `--json` | boolean | Emit the saved price or reset result as JSON. | + +JSON mode: `payload`. + +- Uses the exact upstream model ID after the first slash. Omitted cache rates default to zero; sibling model prices are preserved. + ### `ocx connect rotate` Rotate the connected client's data key against the hub, with commit and abort. @@ -648,6 +685,6 @@ JSON mode: `payload`. ## Counts -- declared capabilities: 35 -- of those, state-changing: 15 +- declared capabilities: 37 +- of those, state-changing: 16 - head-resolved invocations: 2 diff --git a/src/cli/capabilities.ts b/src/cli/capabilities.ts index ff1f5fb9a2..e34b8ec79b 100644 --- a/src/cli/capabilities.ts +++ b/src/cli/capabilities.ts @@ -95,6 +95,31 @@ export const HEAD_CAPABILITIES: readonly HeadCapability[] = [ * A capability must not name a route the command does not actually fetch. */ export const CAPABILITIES: readonly Capability[] = [ + { + command: ["models", "price"], + summary: "Read the saved manual price for an exact provider/model selector.", + routes: [{ method: "GET", path: "/api/providers/{provider}/model-costs" }], + flags: [{ name: "--json", value: "boolean", summary: "Emit provider, modelId, and cost (null for automatic pricing)." }], + mutates: false, + json: "envelope", + details: ["The provider must be configured; everything after the first slash is the exact upstream model ID."], + }, + { + command: ["models", "set-price"], + summary: "Save four manual USD-per-1M-token rates, or restore automatic pricing for one model.", + routes: [{ method: "PUT", path: "/api/providers/{provider}/model-costs" }], + flags: [ + { name: "--input", value: "number", summary: "Input rate; required unless --auto is used." }, + { name: "--output", value: "number", summary: "Output rate; required unless --auto is used." }, + { name: "--cache-read", value: "number", summary: "Cache read rate; defaults to 0." }, + { name: "--cache-write", value: "number", summary: "Cache write rate; defaults to 0." }, + { name: "--auto", value: "boolean", summary: "Remove this model's override; cannot be combined with rates." }, + { name: "--json", value: "boolean", summary: "Emit the saved price or reset result as JSON." }, + ], + mutates: true, + json: "payload", + details: ["Uses the exact upstream model ID after the first slash. Omitted cache rates default to zero; sibling model prices are preserved."], + }, { command: ["status"], summary: "Proxy status, injection state, and version skew between this CLI and the running proxy.", diff --git a/src/cli/models-runtime-subcommands.ts b/src/cli/models-runtime-subcommands.ts index a49828d203..4aa6d7b77a 100644 --- a/src/cli/models-runtime-subcommands.ts +++ b/src/cli/models-runtime-subcommands.ts @@ -15,6 +15,8 @@ */ export const MODELS_RUNTIME_SUBCOMMANDS = [ "live", + "price", + "set-price", "edit", "enable", "disable", diff --git a/src/cli/models-runtime.ts b/src/cli/models-runtime.ts index e21fa25d9e..d71ce84e47 100644 --- a/src/cli/models-runtime.ts +++ b/src/cli/models-runtime.ts @@ -13,9 +13,18 @@ import { type RuntimeApiDeps, } from "./runtime-api"; import { isModelsRuntimeSubcommand } from "./models-runtime-subcommands"; +import { isValidProviderName } from "../config/provider-name"; +import { isValidModelDiscoveryModelId } from "../providers/model-discovery-limits"; +import { redactSecretString } from "../lib/redact"; +import type { ProviderCostOverlay } from "../types"; +import { MAX_COST4_RATE } from "../usage/expected-prices"; +import { isValidCost4Rate } from "../usage/user-cost-overlays"; const USAGE = `Usage: ocx models live [--provider ] [--json] + ocx models price [--json] + ocx models set-price --input N --output N [--cache-read N] [--cache-write N] [--json] + ocx models set-price --auto [--json] ocx models edit [--model-id ] [--display-name ] [--context-window ] [--modalities ] [--reasoning-efforts ] @@ -28,7 +37,10 @@ const USAGE = `Usage: ocx models new-policy [on|off] [--provider ] [--json] ocx models new-arrivals [--json] ocx models context [--set-all]|provider on [--value ]|provider off|all > [--json] - ocx models shadow [model|-] [--enabled ] [--json]`; + ocx models shadow [model|-] [--enabled ] [--json] + +Prices are USD per 1M tokens. Omitted cache rates default to 0. +Price selectors use the exact upstream model ID after the first slash.`; type ModelRow = { provider?: string; @@ -55,6 +67,58 @@ async function live(argv: string[], deps: RuntimeApiDeps): Promise { })); } +async function price(write: boolean, argv: string[], deps: RuntimeApiDeps): Promise { + const args = [...argv]; + const selector = args.shift() ?? ""; + const slash = selector.indexOf("/"); + const provider = selector.slice(0, slash); + const modelId = selector.slice(slash + 1); + if (slash < 1 || !isValidProviderName(provider) || !isValidModelDiscoveryModelId(modelId)) { + throw new CliUsageError("model selector must be provider/model with an exact upstream model id", USAGE); + } + if (redactSecretString(modelId) !== modelId) { + throw new CliUsageError("modelId cannot be displayed safely", USAGE); + } + const wantsJson = takeFlag(args, "--json"); + const path = `/api/providers/${encodeURIComponent(provider)}/model-costs`; + if (!write) { + rejectArgs(args, USAGE); + const result = await runtimeRequest<{ provider: string; modelCosts: Record }>(path, {}, deps); + const cost = Object.hasOwn(result.modelCosts, modelId) ? result.modelCosts[modelId]! : null; + printData({ provider: result.provider, modelId, cost }, wantsJson, [ + cost === null ? `${selector}: automatic pricing` : `${selector}: ${JSON.stringify(cost)} USD per 1M tokens`, + ]); + return; + } + const auto = takeFlag(args, "--auto"); + const input = takeOption(args, "--input"); + const output = takeOption(args, "--output"); + const cacheRead = takeOption(args, "--cache-read"); + const cacheWrite = takeOption(args, "--cache-write"); + rejectArgs(args, USAGE); + if (auto && [input, output, cacheRead, cacheWrite].some(value => value !== undefined)) { + throw new CliUsageError("--auto cannot be combined with price rates", USAGE); + } + if (!auto && (input === undefined || output === undefined)) { + throw new CliUsageError("--input and --output are required unless --auto is used", USAGE); + } + const rate = (raw: string, flag: string): number => { + const value = Number(raw); + if (!raw.trim() || !isValidCost4Rate(value)) { + throw new CliUsageError(`${flag} must be a finite number between 0 and ${MAX_COST4_RATE}`, USAGE); + } + return value; + }; + const cost: ProviderCostOverlay | null = auto ? null : { + input: rate(input!, "--input"), + output: rate(output!, "--output"), + cacheRead: rate(cacheRead ?? "0", "--cache-read"), + cacheWrite: rate(cacheWrite ?? "0", "--cache-write"), + }; + const result = await runtimeRequest(path, { method: "PUT", body: JSON.stringify({ modelId, cost }) }, deps); + printData(result, wantsJson, [auto ? `${selector}: automatic pricing restored.` : `${selector}: manual pricing saved.`]); +} + async function edit(argv: string[], deps: RuntimeApiDeps): Promise { const args = [...argv]; const id = args.shift()?.trim(); @@ -328,6 +392,8 @@ export async function handleModelsRuntimeCommand(sub: string, argv: string[], de if (!isModelsRuntimeSubcommand(sub)) return null; let action: (() => Promise) | undefined; if (sub === "live") action = () => live(argv, deps); + else if (sub === "price") action = () => price(false, argv, deps); + else if (sub === "set-price") action = () => price(true, argv, deps); else if (sub === "edit") action = () => edit(argv, deps); else if (sub === "enable") action = () => visibility(true, argv, deps); else if (sub === "disable") action = () => visibility(false, argv, deps); diff --git a/src/server/management/model-routes.ts b/src/server/management/model-routes.ts index dd84d8af8c..cc7a732a88 100644 --- a/src/server/management/model-routes.ts +++ b/src/server/management/model-routes.ts @@ -85,6 +85,8 @@ import { multiAgentGuidanceEnabled, providerBaseUrlConfigError, providerHeadersConfigError, + providerModelCostsConfigError, + sanitizeModelCostsForDisplay, saveConfigPreservingClaudeCode, } from "../../config"; import { @@ -98,6 +100,7 @@ import { } from "../../oauth"; import { removeCredential } from "../../oauth/store"; import { providerDestinationResolvedError } from "../../lib/destination-policy"; +import { redactSecretString } from "../../lib/redact"; import { enrichProviderFromCatalog, listKeyLoginProviders } from "../../oauth/key-providers"; import { deriveProviderPresets } from "../../providers/derive"; import { providerCodexAccountMode } from "../../providers/registry"; @@ -128,7 +131,7 @@ import { setDebugSettings, type DebugFlag, } from "../../lib/debug-settings"; -import type { OcxClaudeCodeConfig, OcxConfig, OcxCustomModel, OcxProviderConfig } from "../../types"; +import type { OcxClaudeCodeConfig, OcxConfig, OcxCustomModel, OcxProviderConfig, ProviderCostOverlay } from "../../types"; import { drainAndShutdown } from "../lifecycle"; import { filterRequestLogs, getRequestLogEntries, type RequestLogEntry } from "../request-log"; import { estimateComboCost, estimateRequestCost, normalizeCostTokens, tokensPerSecond } from "../../usage/cost"; @@ -369,6 +372,60 @@ export async function handleModelRoutes(ctx: ManagementContext): Promise key !== "modelId" && key !== "cost")) { + return jsonResponse({ error: "only a valid modelId and cost object or null are allowed" }, 400, req, config); + } + const modelId = body.modelId; + if (redactSecretString(modelId) !== modelId) { + return jsonResponse({ error: "modelId cannot be displayed safely" }, 400, req, config); + } + const submitted = { [modelId]: body.cost }; + const validationError = body.cost === null ? null : providerModelCostsConfigError(submitted); + if (validationError) return jsonResponse({ error: validationError }, 400, req, config); + // Copy only validated rate fields; never echo a secret-shaped model key that the + // shared display boundary suppresses. Model IDs remain exact, including slashes. + const cost = body.cost === null ? null : sanitizeModelCostsForDisplay(submitted)?.[modelId]; + if (cost === undefined) return jsonResponse({ error: "modelId cannot be displayed safely" }, 400, req, config); + + const hadModelCosts = Object.hasOwn(provider, "modelCosts"); + const previousModelCosts = provider.modelCosts; + const nextModelCosts = Object.assign( + Object.create(null) as Record, + previousModelCosts ?? {}, + ); + if (cost === null) delete nextModelCosts[modelId]; + else nextModelCosts[modelId] = cost; + const mergedError = providerModelCostsConfigError(nextModelCosts); + if (mergedError) return jsonResponse({ error: mergedError }, 400, req, config); + if (Object.keys(nextModelCosts).length > 0) provider.modelCosts = nextModelCosts; + else delete provider.modelCosts; + try { + // The persistence owner refreshes usage overlays after its atomic write. + // Price-only edits do not change routing or require catalog convergence. + persistConfig(config); + } catch (error) { + if (hadModelCosts) provider.modelCosts = previousModelCosts; + else delete provider.modelCosts; + throw error; + } + return jsonResponse({ ok: true, provider: name, modelId, cost }, 200, req, config); + } + const displayNameMatch = url.pathname.match(/^\/api\/providers\/([^/]+)\/model-display-names$/); if (displayNameMatch && req.method === "PUT") { let name: string; diff --git a/src/server/management/model-rows.ts b/src/server/management/model-rows.ts index 6d9ec08853..07405c4362 100644 --- a/src/server/management/model-rows.ts +++ b/src/server/management/model-rows.ts @@ -46,6 +46,7 @@ export type ManagementModelRow = Partial & { native?: boolean; custom?: boolean; customId?: string; + manualPricing?: boolean; fastRowAvailable?: boolean; displayNameOverride?: string; displayNameSource?: "operator" | "provider" | "fallback"; @@ -181,8 +182,12 @@ export async function listManagementModelRows( for (const row of rows) knownIds.add(row.namespaced); return rows.map(row => { const pending = initialModelSelectionPending(config.providers[row.provider]); + const modelCosts = Object.hasOwn(config.providers, row.provider) + ? config.providers[row.provider]?.modelCosts : undefined; return { ...row, + ...(!row.native && modelCosts !== undefined && Object.hasOwn(modelCosts, row.id) + ? { manualPricing: true } : {}), ...(pending ? { disabled: true, initialSelectionPending: true } : {}), fastRowAvailable: !row.disabled && !pending && !knownIds.has(fastRowId(row.namespaced)) && catalogFastRowEligible(config, row), diff --git a/src/server/management/route-registry.ts b/src/server/management/route-registry.ts index 421ead31e0..6c7d57547b 100644 --- a/src/server/management/route-registry.ts +++ b/src/server/management/route-registry.ts @@ -334,6 +334,8 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [ { method: "GET", path: "/api/request-history/{id}/route-decision", module: "server/management/request-history-routes", mutates: false, mechanism: "ends-with" }, { method: "PUT", path: "/api/providers/{provider}/alias", module: "server/management/model-routes", mutates: true, mechanism: "regex" }, { method: "PUT", path: "/api/providers/{provider}/model-aliases", module: "server/management/model-routes", mutates: true, mechanism: "regex" }, + { method: "GET", path: "/api/providers/{provider}/model-costs", module: "server/management/model-routes", mutates: false, mechanism: "regex" }, + { method: "PUT", path: "/api/providers/{provider}/model-costs", module: "server/management/model-routes", mutates: true, mechanism: "regex" }, { method: "PUT", path: "/api/custom-models/{id}", module: "server/management/model-routes", mutates: true, mechanism: "regex" }, { method: "DELETE", path: "/api/custom-models/{id}", module: "server/management/model-routes", mutates: true, mechanism: "regex" }, { method: "GET", path: "/api/lab/subjects/{id}", module: "server/management/lab-routes", mutates: false, mechanism: "regex", exempt: { reason: "local-transport", why: "ocx lab reads the same rows from the local SQLite projection; src/cli/lab.ts imports ../lab/query directly and never fetches /api/lab." } }, diff --git a/src/usage/cost.ts b/src/usage/cost.ts index 2a3b2ae6d3..deb7f6f20b 100644 --- a/src/usage/cost.ts +++ b/src/usage/cost.ts @@ -177,8 +177,8 @@ export function calculateCost(tokens: CostTokens, cost4: Cost4): CostBreakdown { * bundle) nonzero -> overlay verified -> overlay verified-derived -> jawcode * model-level vendor price (cross-provider fallback: a model follows its official * vendor price — WP5 policy, e.g. kiro/claude-opus-4-6 uses the anthropic price) - * -> null. All-zero rows are overlay candidates (zero is "not billable here", - * not "free"). + * -> null. An explicit all-zero user override means free; all-zero catalog + * rows remain overlay candidates rather than evidence of free pricing. */ export function resolveMatchedPrice( provider: string, @@ -244,7 +244,7 @@ function resolveMatchedPriceInner( /** * Exact provider/model price lookup: user-configured `modelCosts` first, then * an exact official correction, the jawcode provider bundle, the expected-price overlay, then the - * model-level vendor fallback. All-zero rows fall through ("not billable"). + * model-level vendor fallback. All-zero catalog rows fall through; user zeros win. */ function resolveMatchedPriceExact( provider: string, @@ -302,14 +302,14 @@ function resolveMatchedPriceExact( }; } -/** User-configured overlay match (all-zero rows fall through like any other source). */ +/** User-configured overlay match; explicit zero rates are authoritative too. */ function userOverlayMatch( provider: string, modelId: string, userOverlays: readonly ExpectedPriceOverlay[], ): MatchedPrice | null { const overlay = findExpectedPriceOverlay(provider, modelId, userOverlays); - if (!overlay || !validCost4(overlay.cost4) || !hasNonZeroCost(overlay.cost4)) return null; + if (!overlay || !validCost4(overlay.cost4)) return null; return { provider, modelId, diff --git a/tests/cli/cli-models-price.test.ts b/tests/cli/cli-models-price.test.ts new file mode 100644 index 0000000000..c36b049ce5 --- /dev/null +++ b/tests/cli/cli-models-price.test.ts @@ -0,0 +1,153 @@ +import { describe, expect, test } from "bun:test"; +import { handleModelsRuntimeCommand } from "../../src/cli/models-runtime"; +import { CAPABILITIES } from "../../src/cli/capabilities"; +import { MANAGEMENT_ROUTES } from "../../src/server/management/route-registry"; + +const COST = { input: 1.25, output: 5, cacheRead: 0.125, cacheWrite: 2 }; + +async function invoke(sub: string, args: string[], response: unknown = { ok: true }, status = 200) { + const calls: Array<{ path: string; method: string; body: unknown }> = []; + const stdout: string[] = []; + const stderr: string[] = []; + const log = console.log; + const error = console.error; + console.log = (...values: unknown[]) => { stdout.push(values.map(String).join(" ")); }; + console.error = (...values: unknown[]) => { stderr.push(values.map(String).join(" ")); }; + try { + const code = await handleModelsRuntimeCommand(sub, args, { + baseUrl: "http://127.0.0.1:1", + fetchImpl: async (url, init) => { + calls.push({ + path: new URL(String(url)).pathname, + method: init?.method ?? "GET", + body: init?.body ? JSON.parse(String(init.body)) : undefined, + }); + return Response.json(response, { status }); + }, + }); + return { code, calls, stdout: stdout.join("\n"), stderr: stderr.join("\n") }; + } finally { + console.log = log; + console.error = error; + } +} + +describe("models manual price commands", () => { + test("price reads the map and selects the exact ID after the first slash", async () => { + const result = await invoke("price", ["custom-price/org/model--fast", "--json"], { + provider: "custom-price", + modelCosts: { "org/model--fast": COST, "org--model--fast": { input: 9, output: 9, cacheRead: 9, cacheWrite: 9 } }, + }); + expect(result.code).toBe(0); + expect(result.calls).toEqual([{ path: "/api/providers/custom-price/model-costs", method: "GET", body: undefined }]); + expect(JSON.parse(result.stdout)).toEqual({ provider: "custom-price", modelId: "org/model--fast", cost: COST }); + }); + + test("missing own keys read as automatic, including prototype-shaped selectors", async () => { + for (const modelId of ["missing", "__proto__", "constructor", "toString"]) { + const result = await invoke("price", [`custom-price/${modelId}`, "--json"], { provider: "custom-price", modelCosts: {} }); + expect(result.code).toBe(0); + expect(JSON.parse(result.stdout)).toEqual({ provider: "custom-price", modelId, cost: null }); + } + const automatic = await invoke("price", ["custom-price/missing"], { provider: "custom-price", modelCosts: {} }); + expect(automatic.stdout).toContain("automatic pricing"); + }); + + test("set-price sends four numeric rates with omitted cache rates defaulted to zero", async () => { + const result = await invoke("set-price", ["custom-price/org/model", "--input", "1.25", "--output", "5", "--json"]); + expect(result.code).toBe(0); + expect(result.calls).toEqual([{ + path: "/api/providers/custom-price/model-costs", method: "PUT", + body: { modelId: "org/model", cost: { input: 1.25, output: 5, cacheRead: 0, cacheWrite: 0 } }, + }]); + }); + + test("explicit cache rates, all-zero pricing, and the maximum rate are transmitted unchanged", async () => { + const explicit = await invoke("set-price", ["custom-price/org/model", "--input", "1.25", "--output", "5", "--cache-read", "0.125", "--cache-write", "2"]); + expect(explicit.code).toBe(0); + expect(explicit.calls[0]!.body).toEqual({ modelId: "org/model", cost: COST }); + const zero = await invoke("set-price", ["custom-price/model", "--input", "0", "--output", "0"]); + expect(zero.code).toBe(0); + expect(zero.calls[0]!.body).toEqual({ modelId: "model", cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 } }); + const max = await invoke("set-price", ["custom-price/model", "--input", "1000000", "--output", "1e6"]); + expect(max.code).toBe(0); + expect(max.calls[0]!.body).toEqual({ modelId: "model", cost: { input: 1_000_000, output: 1_000_000, cacheRead: 0, cacheWrite: 0 } }); + }); + + test("--auto sends null and preserves the exact upstream ID", async () => { + const payload = { ok: true, provider: "custom-price", modelId: "org/model", cost: null }; + const result = await invoke("set-price", ["custom-price/org/model", "--auto", "--json"], payload); + expect(result.code).toBe(0); + expect(result.calls).toEqual([{ + path: "/api/providers/custom-price/model-costs", method: "PUT", body: { modelId: "org/model", cost: null }, + }]); + expect(JSON.parse(result.stdout)).toEqual(payload); + }); + + test("invalid selectors and read options fail before any request", async () => { + for (const selector of ["", "native-model", "/model", "provider/", " provider/model", "provider/ model", "provider/model ", "provider/bad\nmodel", "provider/" + "x".repeat(1025), "__proto__/model"]) { + for (const sub of ["price", "set-price"]) { + const result = await invoke(sub, [selector, ...(sub === "set-price" ? ["--auto"] : [])]); + expect(result.code).toBe(2); + expect(result.calls).toHaveLength(0); + } + } + for (const args of [["--auto"], ["--input", "1"], ["extra"], ["--json", "--json"]]) { + const result = await invoke("price", ["custom-price/model", ...args]); + expect(result.code).toBe(2); + expect(result.calls).toHaveLength(0); + } + }); + + test("missing, conflicting, repeated, unknown and invalid rate arguments make no requests", async () => { + const cases = [ + [], ["--input", "1"], ["--output", "2"], ["--input"], ["--input", "--output", "2"], + ["--auto", "--input", "0"], ["--auto", "--cache-read", "0"], ["--auto", "--cache-write", "0"], + ["--auto", "--auto"], ["--auto", "--unknown"], ["--auto", "extra"], + ["--input", "1", "--input", "2", "--output", "3"], + ...["", " ", "NaN", "Infinity", "1e309", "-1", "1000001", "1x", "1,2"].map(rate => ["--input", rate, "--output", "1"]), + ...["--output", "--cache-read", "--cache-write"].map(flag => flag === "--output" + ? ["--input", "1", flag, "-1"] : ["--input", "1", "--output", "2", flag, "-1"]), + ]; + for (const args of cases) { + const result = await invoke("set-price", ["custom-price/model", ...args]); + expect(result.code).toBe(2); + expect(result.calls).toHaveLength(0); + expect(result.stderr.length).toBeGreaterThan(0); + } + }); + + test("API rejection is reported with a nonzero exit and no success message", async () => { + const result = await invoke("set-price", ["custom-price/model", "--auto"], { error: "provider not found" }, 404); + expect(result.code).toBe(1); + expect(result.stderr).toContain("provider not found"); + expect(result.stdout).toBe(""); + }); + + test("secret-shaped model selectors fail before request or output for read, set and reset", async () => { + const modelId = "sk-" + "a".repeat(40); + for (const [sub, flags] of [ + ["price", []], + ["set-price", ["--input", "1", "--output", "2"]], + ["set-price", ["--auto"]], + ] as const) { + const result = await invoke(sub, [`custom-price/${modelId}`, ...flags, "--json"]); + expect(result.code).toBe(2); + expect(result.calls).toHaveLength(0); + expect(result.stdout).toBe(""); + expect(result.stderr).not.toContain(modelId); + expect(result.stderr).toContain("modelId cannot be displayed safely"); + } + }); + + test("capabilities map both CLI verbs onto the registered route methods", () => { + for (const [sub, method, mutates] of [["price", "GET", false], ["set-price", "PUT", true]] as const) { + const capability = CAPABILITIES.find(entry => entry.command.join(" ") === `models ${sub}`); + expect(capability?.routes).toEqual([{ method, path: "/api/providers/{provider}/model-costs" }]); + expect(capability?.mutates).toBe(mutates); + expect(MANAGEMENT_ROUTES.find(route => route.method === method && route.path === "/api/providers/{provider}/model-costs")).toMatchObject({ + module: "server/management/model-routes", mutates, mechanism: "regex", + }); + } + }); +}); diff --git a/tests/cli/cli-models-runtime-dispatch.test.ts b/tests/cli/cli-models-runtime-dispatch.test.ts index 3608fe9457..8145ec701e 100644 --- a/tests/cli/cli-models-runtime-dispatch.test.ts +++ b/tests/cli/cli-models-runtime-dispatch.test.ts @@ -37,6 +37,22 @@ describe("models runtime subcommand dispatch (#3094)", () => { expect(isModelsRuntimeSubcommand("new-arrivals")).toBe(true); }); + test("price and set-price are routed through the runtime dispatcher", async () => { + expect(isModelsRuntimeSubcommand("price")).toBe(true); + expect(isModelsRuntimeSubcommand("set-price")).toBe(true); + const methods: string[] = []; + const deps = { + baseUrl: "http://127.0.0.1:1", + fetchImpl: async (_url: string | URL | Request, init?: RequestInit) => { + methods.push(init?.method ?? "GET"); + return Response.json({ provider: "dispatch-test", modelCosts: {}, ok: true }); + }, + }; + expect(await handleModelsRuntimeCommand("price", ["dispatch-test/model"], deps)).toBe(0); + expect(await handleModelsRuntimeCommand("set-price", ["dispatch-test/model", "--auto"], deps)).toBe(0); + expect(methods).toEqual(["GET", "PUT"]); + }); + test("handleModels routes exactly the shared set to the runtime module", () => { // Reading the source keeps this honest without booting the CLI: the dispatch must // consult the shared predicate rather than re-listing names inline. @@ -54,4 +70,3 @@ describe("models runtime subcommand dispatch (#3094)", () => { expect(new Set(MODELS_RUNTIME_SUBCOMMANDS).size).toBe(MODELS_RUNTIME_SUBCOMMANDS.length); }); }); - diff --git a/tests/fixtures/test-layout-expected.json b/tests/fixtures/test-layout-expected.json index fe613ac71f..496d51ea31 100644 --- a/tests/fixtures/test-layout-expected.json +++ b/tests/fixtures/test-layout-expected.json @@ -1133,5 +1133,7 @@ "zhipu-bigmodel-provider.test.ts": "providers", "zz-ci-api-usage-isolation.test.ts": "ci-workflows", "zz-ci-storage-policy-isolation.test.ts": "ci-workflows", - "zz-pr-coderabbit-readiness-revalidation.test.ts": "ci-workflows" + "zz-pr-coderabbit-readiness-revalidation.test.ts": "ci-workflows", + "cli-models-price.test.ts": "cli", + "model-costs-management-api.test.ts": "server" } diff --git a/tests/server/model-costs-management-api.test.ts b/tests/server/model-costs-management-api.test.ts new file mode 100644 index 0000000000..856bf9ee79 --- /dev/null +++ b/tests/server/model-costs-management-api.test.ts @@ -0,0 +1,270 @@ +import { afterEach, beforeEach, describe, expect, test } from "bun:test"; +import { mkdtempSync, readFileSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { clearModelCache } from "../../src/codex/model-cache"; +import { resetCodexModelEntitlementCacheForTests } from "../../src/codex/model-entitlements"; +import { saveConfigPreservingClaudeCode } from "../../src/config"; +import { handleManagementAPI } from "../../src/server/management-api"; +import { handleModelRoutes } from "../../src/server/management/model-routes"; +import { listManagementModelRows } from "../../src/server/management/model-rows"; +import type { OcxConfig, ProviderCostOverlay } from "../../src/types"; +import { activeUserCostOverlays, refreshUserCostOverlays } from "../../src/usage/user-cost-overlays"; +import { removeTreeWithRetry } from "../helpers/remove-tree"; + +const PROVIDER = "manual-price-test"; +const COST: ProviderCostOverlay = { input: 1.25, output: 5, cacheRead: 0.125, cacheWrite: 2 }; +const SIBLING: ProviderCostOverlay = { input: 3, output: 7, cacheRead: 0.5, cacheWrite: 4 }; +const ZERO: ProviderCostOverlay = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }; +let home: string; +let previousHome: string | undefined; +let previousCodexHome: string | undefined; + +function fixture(costs?: Record): OcxConfig { + return { + port: 10100, + defaultProvider: PROVIDER, + modelCacheTtlMs: 60_000, + providers: { + [PROVIDER]: { + adapter: "openai-chat", + baseUrl: "https://price.example.invalid/v1", + alias: "price-alias", + liveModels: false, + models: ["org/model", "org/other", "sibling", "custom"], + ...(costs ? { modelCosts: costs } : {}), + }, + }, + }; +} + +beforeEach(() => { + previousHome = process.env.OPENCODEX_HOME; + previousCodexHome = process.env.CODEX_HOME; + home = mkdtempSync(join(tmpdir(), "ocx-model-prices-")); + process.env.OPENCODEX_HOME = home; + process.env.CODEX_HOME = join(home, "codex"); +}); + +afterEach(() => { + clearModelCache(); + resetCodexModelEntitlementCacheForTests(); + refreshUserCostOverlays(fixture()); + if (previousHome === undefined) delete process.env.OPENCODEX_HOME; + else process.env.OPENCODEX_HOME = previousHome; + if (previousCodexHome === undefined) delete process.env.CODEX_HOME; + else process.env.CODEX_HOME = previousCodexHome; + removeTreeWithRetry(home); +}); + +function harness(config = fixture(), persist?: (saved: OcxConfig) => void) { + const persisted: OcxConfig[] = []; + let convergeCalls = 0; + async function call(method: "GET" | "PUT", body?: unknown, provider = PROVIDER, rawBody?: string, rawProvider?: string) { + const url = new URL(`http://127.0.0.1:10100/api/providers/${rawProvider ?? encodeURIComponent(provider)}/model-costs`); + const response = await handleModelRoutes({ + version: "test", + req: new Request(url, { + method, + headers: { "Content-Type": "application/json" }, + ...(method === "PUT" ? { body: rawBody ?? JSON.stringify(body) } : {}), + }), + url, + config, + deps: { + saveConfigPreservingClaudeCode: saved => { + persist?.(saved); + persisted.push(structuredClone(saved)); + }, + }, + convergeCodexCatalog: async () => { + convergeCalls += 1; + throw new Error("price writes must not converge catalogs"); + }, + syncClaudeAgentDefsBestEffort: async () => {}, + }); + if (!response) throw new Error("model-costs route was not dispatched"); + return response; + } + return { call, config, persisted, get convergeCalls() { return convergeCalls; } }; +} + +describe("provider model costs API", () => { + test("GET returns the exact configured provider's sanitized map or an empty map", async () => { + const h = harness(); + expect(await (await h.call("GET")).json()).toEqual({ provider: PROVIDER, modelCosts: {} }); + const costs = JSON.parse(JSON.stringify({ + "org/model": { ...COST, apiKey: "not-for-display" }, + bad: { ...COST, input: -1 }, + ["sk-" + "a".repeat(40)]: COST, + })); + h.config.providers[PROVIDER]!.modelCosts = costs; + expect(await (await h.call("GET")).json()).toEqual({ provider: PROVIDER, modelCosts: { "org/model": COST } }); + expect(h.persisted).toHaveLength(0); + }); + + test("set, replace with explicit zero, and reset persist only the exact model key", async () => { + const h = harness(fixture({ sibling: SIBLING, "org--model": SIBLING })); + for (const cost of [COST, ZERO, null]) { + const response = await h.call("PUT", { modelId: "org/model", cost }); + expect(response.status).toBe(200); + expect(await response.json()).toEqual({ ok: true, provider: PROVIDER, modelId: "org/model", cost }); + const expected = { sibling: SIBLING, "org--model": SIBLING, ...(cost ? { "org/model": cost } : {}) }; + expect(h.config.providers[PROVIDER]!.modelCosts).toEqual(expected); + expect(h.persisted.at(-1)!.providers[PROVIDER]!.modelCosts).toEqual(expected); + } + expect(h.persisted).toHaveLength(3); + expect(h.convergeCalls).toBe(0); + }); + + test("reset of the last entry removes the map and repeated reset remains successful", async () => { + const h = harness(fixture({ "org/model": COST })); + for (let attempt = 0; attempt < 2; attempt++) { + expect((await h.call("PUT", { modelId: "org/model", cost: null })).status).toBe(200); + expect(Object.hasOwn(h.config.providers[PROVIDER]!, "modelCosts")).toBe(false); + expect(await (await h.call("GET")).json()).toEqual({ provider: PROVIDER, modelCosts: {} }); + } + }); + + test("the normal persistence owner writes disk and refreshes the overlay registry", async () => { + const config = fixture({ sibling: SIBLING }); + writeFileSync(join(home, "config.json"), JSON.stringify(config)); + const h = harness(config, saveConfigPreservingClaudeCode); + await h.call("PUT", { modelId: "org/model", cost: COST }); + const disk = JSON.parse(readFileSync(join(home, "config.json"), "utf8")) as OcxConfig; + expect(disk.providers[PROVIDER]!.modelCosts).toEqual({ sibling: SIBLING, "org/model": COST }); + expect(activeUserCostOverlays().find(row => row.provider === PROVIDER && row.modelId === "org/model")?.cost4).toEqual(COST); + expect(await (await harness(disk).call("GET")).json()).toEqual({ provider: PROVIDER, modelCosts: { sibling: SIBLING, "org/model": COST } }); + await h.call("PUT", { modelId: "org/model", cost: null }); + expect(JSON.parse(readFileSync(join(home, "config.json"), "utf8")).providers[PROVIDER].modelCosts).toEqual({ sibling: SIBLING }); + expect(activeUserCostOverlays().some(row => row.provider === PROVIDER && row.modelId === "org/model")).toBe(false); + }); + + test("persist failure restores map identity and own-property absence for set and reset", async () => { + for (const costs of [undefined, {}, { "org/model": COST, sibling: SIBLING }]) { + for (const cost of [SIBLING, null]) { + const config = fixture(costs); + const provider = config.providers[PROVIDER]!; + const previous = provider.modelCosts; + const snapshot = structuredClone(previous); + const hadMap = Object.hasOwn(provider, "modelCosts"); + const h = harness(config, () => { throw new Error("disk full"); }); + await expect(h.call("PUT", { modelId: "org/model", cost })).rejects.toThrow("disk full"); + expect(provider.modelCosts).toBe(previous); + expect(provider.modelCosts).toEqual(snapshot); + expect(Object.hasOwn(provider, "modelCosts")).toBe(hadMap); + expect(h.persisted).toHaveLength(0); + expect(h.convergeCalls).toBe(0); + } + } + }); + + test("missing, alias, case-folded and inherited provider names are not resolved", async () => { + const h = harness(); + for (const method of ["GET", "PUT"] as const) { + for (const provider of ["missing", "price-alias", PROVIDER.toUpperCase(), "__proto__", "constructor", "toString"]) { + expect((await h.call(method, { modelId: "org/model", cost: COST }, provider)).status).toBe(404); + } + expect((await h.call(method, { modelId: "org/model", cost: COST }, PROVIDER, undefined, "%E0%A4%A")).status).toBe(400); + } + expect(h.persisted).toHaveLength(0); + }); + + test("malformed bodies, model IDs, rates and extra fields fail before mutation", async () => { + const h = harness(fixture({ sibling: SIBLING })); + const original = h.config.providers[PROVIDER]!.modelCosts; + const invalid: unknown[] = [null, [], 4, {}, { modelId: "org/model" }, { cost: COST }, + ...["", " ", " model", "model ", "bad\nmodel", "x".repeat(1025), 42].map(modelId => ({ modelId, cost: null })), + ...[null, [], "1", true, -1, 1_000_001].map(input => ({ modelId: "org/model", cost: { ...COST, input } })), + ...[[], "auto", 0, { input: 1, output: 2 }, { ...COST, apiKey: "extra" }].map(cost => ({ modelId: "org/model", cost })), + { modelId: "org/model", cost: COST, extra: true }, + JSON.parse('{"modelId":"org/model","cost":null,"__proto__":{"polluted":true}}'), + JSON.parse('{"modelId":"org/model","cost":{"input":1,"output":2,"cacheRead":0,"cacheWrite":0,"constructor":{}}}'), + JSON.parse('{"modelId":"org/model","cost":{"input":1,"output":2,"cacheRead":0,"cacheWrite":0,"__proto__":{}}}'), + ]; + for (const body of invalid) expect((await h.call("PUT", body)).status).toBe(400); + for (const raw of ["{", "", '{"modelId":"org/model","cost":{"input":1e309,"output":1,"cacheRead":0,"cacheWrite":0}}']) { + expect((await h.call("PUT", undefined, PROVIDER, raw)).status).toBe(400); + } + expect(h.config.providers[PROVIDER]!.modelCosts).toBe(original); + expect(h.persisted).toHaveLength(0); + }); + + test("prototype-shaped model keys are stored and reset as own data without touching prototypes", async () => { + const h = harness(fixture({ sibling: SIBLING })); + for (const modelId of ["__proto__", "constructor", "toString"]) { + expect((await h.call("PUT", { modelId, cost: COST })).status).toBe(200); + const map = h.config.providers[PROVIDER]!.modelCosts!; + expect(Object.getPrototypeOf(map)).toBeNull(); + expect(Object.hasOwn(map, modelId)).toBe(true); + expect(map[modelId]).toEqual(COST); + const body = await (await h.call("GET")).json() as { modelCosts: Record }; + expect(Object.hasOwn(body.modelCosts, modelId)).toBe(true); + expect(body.modelCosts[modelId]).toEqual(COST); + await h.call("PUT", { modelId, cost: null }); + expect(Object.hasOwn(h.config.providers[PROVIDER]!.modelCosts!, modelId)).toBe(false); + } + expect(h.config.providers[PROVIDER]!.modelCosts).toEqual({ sibling: SIBLING }); + expect(Object.hasOwn(Object.prototype, "input")).toBe(false); + }); + + test("secret-shaped model IDs are rejected without echo on both set and reset", async () => { + const modelId = "sk-" + "a".repeat(40); + const h = harness(fixture({ [modelId]: COST, sibling: SIBLING })); + const original = h.config.providers[PROVIDER]!.modelCosts; + for (const cost of [COST, null]) { + const response = await h.call("PUT", { modelId, cost }); + expect(response.status).toBe(400); + expect(await response.text()).not.toContain(modelId); + } + expect(h.config.providers[PROVIDER]!.modelCosts).toBe(original); + expect(h.persisted).toHaveLength(0); + }); + + test("management dispatch reaches GET/PUT and still rejects cross-origin writes", async () => { + const config = fixture(); + const url = new URL(`http://127.0.0.1:10100/api/providers/${PROVIDER}/model-costs`); + let writes = 0; + for (const method of ["PUT", "GET"] as const) { + const response = await handleManagementAPI(new Request(url, { + method, headers: { Host: url.host, "Content-Type": "application/json" }, + ...(method === "PUT" ? { body: JSON.stringify({ modelId: "org/model", cost: COST }) } : {}), + }), url, config, { saveConfigPreservingClaudeCode: () => { writes++; } }); + expect(response?.status).toBe(200); + } + const blocked = await handleManagementAPI(new Request(url, { + method: "PUT", headers: { Host: url.host, Origin: "https://other.example.invalid" }, + body: JSON.stringify({ modelId: "org/model", cost: null }), + }), url, config, { saveConfigPreservingClaudeCode: () => { writes++; } }); + expect(blocked?.status).toBe(403); + expect(writes).toBe(1); + expect(config.providers[PROVIDER]!.modelCosts).toEqual({ "org/model": COST }); + }); + + test("set survives reload as manualPricing true and reset omits the badge field", async () => { + const config = fixture({ "org--other": SIBLING }); + config.customModels = [{ id: "custom-row", provider: PROVIDER, modelId: "custom" }]; + const h = harness(config); + expect((await h.call("PUT", { modelId: "org/model", cost: ZERO })).status).toBe(200); + expect((await h.call("PUT", { modelId: "custom", cost: COST })).status).toBe(200); + const reloaded = JSON.parse(JSON.stringify(config)) as OcxConfig; + const rows = await listManagementModelRows(reloaded, { entitlementWaitMs: 0 }); + expect(rows.find(row => row.provider === PROVIDER && row.id === "org/model")?.manualPricing).toBe(true); + for (const modelId of ["org/other", "sibling"]) { + const row = rows.find(row => row.provider === PROVIDER && row.id === modelId); + expect(row).toBeDefined(); + expect(Object.hasOwn(row!, "manualPricing")).toBe(false); + } + expect(rows.find(row => row.customId === "custom-row")?.manualPricing).toBe(true); + expect(rows.filter(row => row.native).every(row => !Object.hasOwn(row, "manualPricing"))).toBe(true); + for (const modelId of ["org/model", "custom"]) { + expect((await harness(reloaded).call("PUT", { modelId, cost: null })).status).toBe(200); + } + const resetRows = await listManagementModelRows(reloaded, { entitlementWaitMs: 0 }); + for (const modelId of ["org/model", "custom"]) { + const row = resetRows.find(row => row.provider === PROVIDER && row.id === modelId); + expect(row).toBeDefined(); + expect(Object.hasOwn(row!, "manualPricing")).toBe(false); + } + }); +}); diff --git a/tests/usage/usage-cost.test.ts b/tests/usage/usage-cost.test.ts index f234622e07..aa5711534e 100644 --- a/tests/usage/usage-cost.test.ts +++ b/tests/usage/usage-cost.test.ts @@ -1140,7 +1140,7 @@ describe("provider cost overlay (user-configured)", () => { }); }); - test("an all-zero overlay on a suffix-shaped configured provider falls through to compiled pricing, not the base provider's overlay", () => { + test("an explicit zero overlay on a suffix-shaped configured provider wins over every fallback", () => { refreshUserCostOverlays({ providers: { acme: { modelCosts: { "claude-opus-4-6": USER_PRICE } }, @@ -1150,16 +1150,12 @@ describe("provider cost overlay (user-configured)", () => { }, } as unknown as OcxConfig); const price = resolveMatchedPrice("acme-pabcdef", "claude-opus-4-6"); - // The all-zero row falls through to compiled/catalog pricing — the - // documented fallback order — and never to acme's user-configured price. + // Operator zero is an explicit free estimate, not missing catalog metadata. expect(price).not.toBeNull(); expect(price?.provider).toBe("acme-pabcdef"); - expect(price?.source).toBe("jawcode"); + expect(price?.source).toBe("user"); expect(price?.cost4).not.toEqual(USER_PRICE); - // A real positive catalog price, without pinning the vendor's current - // rate (the catalog lives outside this PR and may change independently). - expect(price?.cost4?.input).toBeGreaterThan(0); - expect(price?.cost4?.output).toBeGreaterThan(0); + expect(price?.cost4).toEqual({ input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }); }); test("a generated account label (not a configured provider) still collapses to the base provider's overlay", () => { @@ -1200,7 +1196,7 @@ describe("provider cost overlay (user-configured)", () => { expect(resolveMatchedPrice("acme-pabcdef", "acme-custom-model")).toBeNull(); }); - test("all-zero user overlay falls through to the expected overlay price", () => { + test("all-zero user overlay gives known-zero request and combo estimates until reset", () => { const zero: ExpectedPriceOverlay[] = [{ provider: "deepseek", modelId: "deepseek-chat", @@ -1210,10 +1206,13 @@ describe("provider cost overlay (user-configured)", () => { status: "verified", }]; const price = resolveMatchedPrice("deepseek", "deepseek-chat", undefined, zero); - expect(price?.source).toBe("expected"); - // A real positive expected-overlay price, without pinning the current - // rate (the overlay table may change independently of this feature). - expect(price?.cost4.input).toBeGreaterThan(0); + expect(price?.source).toBe("user"); + expect(price?.cost4).toEqual(zero[0]!.cost4); + const input = { provider: "deepseek", model: "deepseek-chat", usageStatus: "reported" as const, + usage: { inputTokens: 1_000_000, outputTokens: 100_000 } }; + expect(estimateRequestCost(input, undefined, zero)?.cost.total).toBe(0); + expect(estimateComboCost([{ ...input, ordinal: 1 }], undefined, undefined, zero)?.cost.total).toBe(0); + expect(resolveMatchedPrice("deepseek", "deepseek-chat", undefined, [])?.cost4.input).toBeGreaterThan(0); }); test("combo fails closed when a user-priced attempt shares a combo with an unpriced one", () => { From 062e9cbd39338945a3377f4ffbf2fa1dff41c65a Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:56:38 +0900 Subject: [PATCH 160/221] fix(models): validate price receipts and redact CLI failures [skip ci] Address independent review findings on the manual price CLI; preserve HTTP-specific exit codes and project only acknowledged fields. Co-authored-by: nordz0r <6949669+nordz0r@users.noreply.github.com> --- src/cli/models-runtime.ts | 49 ++++++++++++-- tests/cli/cli-models-price.test.ts | 67 +++++++++++++++++-- tests/cli/cli-models-runtime-dispatch.test.ts | 4 +- 3 files changed, 110 insertions(+), 10 deletions(-) diff --git a/src/cli/models-runtime.ts b/src/cli/models-runtime.ts index d71ce84e47..129f2fb53b 100644 --- a/src/cli/models-runtime.ts +++ b/src/cli/models-runtime.ts @@ -67,7 +67,31 @@ async function live(argv: string[], deps: RuntimeApiDeps): Promise { })); } +function priceRecord(value: unknown): value is Record { + return value !== null && typeof value === "object" && !Array.isArray(value); +} + +const PRICE_RATE_KEYS = ["input", "output", "cacheRead", "cacheWrite"] as const; + +function validPriceCost(value: unknown): value is ProviderCostOverlay { + return priceRecord(value) && Object.keys(value).length === PRICE_RATE_KEYS.length + && PRICE_RATE_KEYS.every(key => Object.hasOwn(value, key) && isValidCost4Rate(value[key])); +} + async function price(write: boolean, argv: string[], deps: RuntimeApiDeps): Promise { + try { + await priceRequest(write, argv, deps); + } catch (error) { + // Duplicated, inline and stray options also reach parser diagnostics. + // Keep HTTP-specific RuntimeApiError exits while masking usage errors. + if (error instanceof CliUsageError) { + throw new CliUsageError(redactSecretString(error.message), error.usage); + } + throw error; + } +} + +async function priceRequest(write: boolean, argv: string[], deps: RuntimeApiDeps): Promise { const args = [...argv]; const selector = args.shift() ?? ""; const slash = selector.indexOf("/"); @@ -83,9 +107,18 @@ async function price(write: boolean, argv: string[], deps: RuntimeApiDeps): Prom const path = `/api/providers/${encodeURIComponent(provider)}/model-costs`; if (!write) { rejectArgs(args, USAGE); - const result = await runtimeRequest<{ provider: string; modelCosts: Record }>(path, {}, deps); - const cost = Object.hasOwn(result.modelCosts, modelId) ? result.modelCosts[modelId]! : null; - printData({ provider: result.provider, modelId, cost }, wantsJson, [ + const result = await runtimeRequest(path, {}, deps); + if (!priceRecord(result) || result.provider !== provider || !priceRecord(result.modelCosts) + || !Object.values(result.modelCosts).every(validPriceCost)) { + throw new Error("Invalid model price response"); + } + let cost: ProviderCostOverlay | null = null; + if (Object.hasOwn(result.modelCosts, modelId)) { + const stored = result.modelCosts[modelId]; + if (!validPriceCost(stored)) throw new Error("Invalid model price response"); + cost = { ...stored }; + } + printData({ provider, modelId, cost }, wantsJson, [ cost === null ? `${selector}: automatic pricing` : `${selector}: ${JSON.stringify(cost)} USD per 1M tokens`, ]); return; @@ -116,7 +149,15 @@ async function price(write: boolean, argv: string[], deps: RuntimeApiDeps): Prom cacheWrite: rate(cacheWrite ?? "0", "--cache-write"), }; const result = await runtimeRequest(path, { method: "PUT", body: JSON.stringify({ modelId, cost }) }, deps); - printData(result, wantsJson, [auto ? `${selector}: automatic pricing restored.` : `${selector}: manual pricing saved.`]); + const receivedCost = priceRecord(result) ? result.cost : undefined; + if (!priceRecord(result) || result.ok !== true || result.provider !== provider || result.modelId !== modelId + || (cost === null ? receivedCost !== null : !validPriceCost(receivedCost) + || !PRICE_RATE_KEYS.every(key => receivedCost[key] === cost[key]))) { + throw new Error("Invalid model price persistence receipt"); + } + // Project the acknowledged fields only; unrelated response fields are not CLI output. + printData({ ok: true, provider, modelId, cost }, wantsJson, + [auto ? `${selector}: automatic pricing restored.` : `${selector}: manual pricing saved.`]); } async function edit(argv: string[], deps: RuntimeApiDeps): Promise { diff --git a/tests/cli/cli-models-price.test.ts b/tests/cli/cli-models-price.test.ts index c36b049ce5..9adda79977 100644 --- a/tests/cli/cli-models-price.test.ts +++ b/tests/cli/cli-models-price.test.ts @@ -5,7 +5,7 @@ import { MANAGEMENT_ROUTES } from "../../src/server/management/route-registry"; const COST = { input: 1.25, output: 5, cacheRead: 0.125, cacheWrite: 2 }; -async function invoke(sub: string, args: string[], response: unknown = { ok: true }, status = 200) { +async function invoke(sub: string, args: string[], response?: unknown, status = 200) { const calls: Array<{ path: string; method: string; body: unknown }> = []; const stdout: string[] = []; const stderr: string[] = []; @@ -17,12 +17,17 @@ async function invoke(sub: string, args: string[], response: unknown = { ok: tru const code = await handleModelsRuntimeCommand(sub, args, { baseUrl: "http://127.0.0.1:1", fetchImpl: async (url, init) => { + const path = new URL(String(url)).pathname; + const body = init?.body ? JSON.parse(String(init.body)) : undefined; calls.push({ - path: new URL(String(url)).pathname, + path, method: init?.method ?? "GET", - body: init?.body ? JSON.parse(String(init.body)) : undefined, + body, }); - return Response.json(response, { status }); + if (response instanceof Response) return response; + return Response.json(response === undefined + ? { ok: true, provider: path.split("/")[3], modelId: body?.modelId, cost: body?.cost } + : response, { status }); }, }); return { code, calls, stdout: stdout.join("\n"), stderr: stderr.join("\n") }; @@ -119,11 +124,63 @@ describe("models manual price commands", () => { test("API rejection is reported with a nonzero exit and no success message", async () => { const result = await invoke("set-price", ["custom-price/model", "--auto"], { error: "provider not found" }, 404); - expect(result.code).toBe(1); + expect(result.code).toBe(4); expect(result.stderr).toContain("provider not found"); expect(result.stdout).toBe(""); }); + test("duplicate, inline and stray price arguments never echo credential-shaped values", async () => { + const secret = "sk-" + "a".repeat(40); + for (const extra of [["--input", secret], [`--input=${secret}`], [secret]]) { + const result = await invoke("set-price", ["custom-price/model", "--input", "1", "--output", "2", ...extra]); + expect(result.code).toBe(2); + expect(result.calls).toHaveLength(0); + expect(result.stderr).not.toContain(secret); + expect(result.stderr).toContain("Unexpected argument(s)"); + expect(result.stdout).toBe(""); + } + }); + + test("malformed or mismatched success receipts fail without printing response contents", async () => { + const secret = "sk-" + "a".repeat(40); + const cost = { input: 1, output: 2, cacheRead: 0, cacheWrite: 0 }; + const receipt = { ok: true, provider: "custom-price", modelId: "model", cost }; + for (const response of [ + null, {}, "malformed", new Response("{"), new Response(null, { status: 204 }), + { ...receipt, ok: false }, { ...receipt, provider: "other" }, { ...receipt, modelId: "other" }, + { ...receipt, cost: null }, { ...receipt, cost: { input: 1, output: 2 } }, + { ...receipt, cost: { ...cost, output: 3 } }, { ...receipt, cost: { ...cost, apiKey: secret } }, + ]) { + const result = await invoke("set-price", ["custom-price/model", "--input", "1", "--output", "2"], response); + expect(result.code).toBe(1); + expect(result.stdout).toBe(""); + expect(result.stderr).toContain("Invalid model price persistence receipt"); + expect(result.stderr).not.toContain(secret); + } + const badReset = await invoke("set-price", ["custom-price/model", "--auto"], receipt); + expect(badReset.code).toBe(1); + expect(badReset.stdout).toBe(""); + const projected = await invoke("set-price", ["custom-price/model", "--input", "1", "--output", "2", "--json"], { ...receipt, apiKey: secret }); + expect(projected.code).toBe(0); + expect(JSON.parse(projected.stdout)).toEqual(receipt); + expect(projected.stdout).not.toContain(secret); + }); + + test("invalid GET maps fail rather than appearing automatic or leaking extra rate fields", async () => { + for (const response of [ + null, {}, new Response("{"), { provider: "other", modelCosts: {} }, + { provider: "custom-price", modelCosts: [] }, + { provider: "custom-price", modelCosts: { model: null } }, + { provider: "custom-price", modelCosts: { model: { ...COST, input: -1 } } }, + { provider: "custom-price", modelCosts: { model: { ...COST, extra: "unexpected" } } }, + ]) { + const result = await invoke("price", ["custom-price/model", "--json"], response); + expect(result.code).toBe(1); + expect(result.stdout).toBe(""); + expect(result.stderr).toContain("Invalid model price response"); + } + }); + test("secret-shaped model selectors fail before request or output for read, set and reset", async () => { const modelId = "sk-" + "a".repeat(40); for (const [sub, flags] of [ diff --git a/tests/cli/cli-models-runtime-dispatch.test.ts b/tests/cli/cli-models-runtime-dispatch.test.ts index 8145ec701e..06bc8f43b1 100644 --- a/tests/cli/cli-models-runtime-dispatch.test.ts +++ b/tests/cli/cli-models-runtime-dispatch.test.ts @@ -45,7 +45,9 @@ describe("models runtime subcommand dispatch (#3094)", () => { baseUrl: "http://127.0.0.1:1", fetchImpl: async (_url: string | URL | Request, init?: RequestInit) => { methods.push(init?.method ?? "GET"); - return Response.json({ provider: "dispatch-test", modelCosts: {}, ok: true }); + return Response.json(init?.method === "PUT" + ? { provider: "dispatch-test", modelId: "model", cost: null, ok: true } + : { provider: "dispatch-test", modelCosts: {} }); }, }; expect(await handleModelsRuntimeCommand("price", ["dispatch-test/model"], deps)).toBe(0); From a6e1227c8c6909eba8efc85d4a1ee3a992288bd7 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:14:02 +0900 Subject: [PATCH 161/221] fix(models): start price reload state from user actions [skip ci] Address exact-head GUI lint diagnosis without disabling the rule; initial loading uses initialized state and effects update only after the fetch. Co-authored-by: nordz0r <6949669+nordz0r@users.noreply.github.com> --- gui/src/components/ModelPriceDialog.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gui/src/components/ModelPriceDialog.tsx b/gui/src/components/ModelPriceDialog.tsx index c4e08d98b6..f6e1a58200 100644 --- a/gui/src/components/ModelPriceDialog.tsx +++ b/gui/src/components/ModelPriceDialog.tsx @@ -62,8 +62,6 @@ export default function ModelPriceDialog({ model, apiBase, onRefresh, onClose }: if (requestRef.current) return; const bounded = createBoundedFetch(REQUEST_TIMEOUT_MS); requestRef.current = bounded; - setPhase("loading"); - setErrorKey(null); try { const response = await fetch(endpoint, { signal: bounded.signal, cache: "no-store" }); const result = await readJsonOrThrow(response); @@ -168,7 +166,12 @@ export default function ModelPriceDialog({ model, apiBase, onRefresh, onClose }: onSubmit={event => { event.preventDefault(); if (requestRef.current) return; - if (phase === "unknown" || phase === "loadFailed") { void readOverride(phase === "unknown"); return; } + if (phase === "unknown" || phase === "loadFailed") { + setPhase("loading"); + setErrorKey(null); + void readOverride(phase === "unknown"); + return; + } if (phase === "refreshFailed") { void save(undefined); return; } if (locked) return; const cost = { From 568a3e89cb4bc67987d86acbf5e9d63fb3015c9b Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:36:04 +0900 Subject: [PATCH 162/221] docs: record code-mode delivery and qualify Desktop model switching [skip ci] --- .../040_delivery_record.md | 100 ++++++++++++++++++ .../src/content/docs/guides/claude-code.md | 12 ++- 2 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 devlog/_plan/260907_code_mode_host_contract/040_delivery_record.md diff --git a/devlog/_plan/260907_code_mode_host_contract/040_delivery_record.md b/devlog/_plan/260907_code_mode_host_contract/040_delivery_record.md new file mode 100644 index 0000000000..3c2b28e23d --- /dev/null +++ b/devlog/_plan/260907_code_mode_host_contract/040_delivery_record.md @@ -0,0 +1,100 @@ +# 040 — Delivery record: code-mode host contract + +Recorded 2026-09-07 from GitHub PR and Actions API responses. This records the delivery requested +by [030_docs_and_delivery.md](030_docs_and_delivery.md#d-record). + +## Delivered revision and CI identity + +- [PR #3854](https://github.com/lidge-jun/opencodex/pull/3854) is merged into `dev`; + GitHub records `merged_at: 2026-09-07T06:41:03Z`. +- Final PR head: `6bdcba5bff4196debf3cd159c7af3d34e35a24e0`. +- Merge commit: `ece556a6ed32dc811bd660ddd8ef9e829512457a`. +- [Pre-merge CI run 34090946313](https://github.com/lidge-jun/opencodex/actions/runs/34090946313), + attempt 1: `event: pull_request`, `head_sha: 6bdcba5bff4196debf3cd159c7af3d34e35a24e0`, + `status: completed`, `conclusion: success`; updated `2026-09-07T06:39:04Z`. +- [Merge-head CI run 34091933836](https://github.com/lidge-jun/opencodex/actions/runs/34091933836), attempt 1: + `event: push`, `head_sha: ece556a6ed32dc811bd660ddd8ef9e829512457a`, + `status: completed`, `conclusion: success`; updated `2026-09-07T06:50:18Z`. + +The pre-merge run matches the final PR head; the later push run matches the merge commit. +These are distinct CI records. This API check does not attest that the separate local receipt +required by 030 was recorded. + +## Per-job results + +Each run has 21 completed jobs: 19 success, 2 skipped. Every job has the same conclusion in both +runs. Names below are the literal Actions job names; each evidence link identifies its own run. + +| Job | Conclusion in both runs | Pre-merge evidence | Merge-head evidence | +|---|---|---|---| +| `select windows runner` | success | [job 101644191502](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644191502) | [job 101647069433](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647069433) | +| `changes` | success | [job 101644191303](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644191303) | [job 101647069779](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647069779) | +| `windows ${{ matrix.shard }}/6` | skipped | [job 101644212182](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644212182) | [job 101647096144](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647096144) | +| `macos 1/2` | success | [job 101644233998](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644233998) | [job 101647111898](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111898) | +| `api usage` | success | [job 101644234038](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234038) | [job 101647111914](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111914) | +| `storage policy` | success | [job 101644234034](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234034) | [job 101647111922](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111922) | +| `docker smoke` | success | [job 101644234277](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234277) | [job 101647111928](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111928) | +| `keyring ubuntu` | success | [job 101644234063](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234063) | [job 101647111929](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111929) | +| `test 3/4` | success | [job 101644234103](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234103) | [job 101647111932](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111932) | +| `test 4/4` | success | [job 101644234047](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234047) | [job 101647111936](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111936) | +| `keyring macos` | success | [job 101644233982](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644233982) | [job 101647111942](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111942) | +| `test 1/4` | success | [job 101644234139](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234139) | [job 101647111951](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111951) | +| `gates` | success | [job 101644233985](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644233985) | [job 101647111970](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111970) | +| `keyring windows` | success | [job 101644234037](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234037) | [job 101647111972](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111972) | +| `macos 2/2` | success | [job 101644234066](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234066) | [job 101647111974](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111974) | +| `npm-global ubuntu-latest` | success | [job 101644234059](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234059) | [job 101647111980](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111980) | +| `npm-global windows-latest` | success | [job 101644234098](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234098) | [job 101647111990](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647111990) | +| `test 2/4` | success | [job 101644234167](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234167) | [job 101647112003](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647112003) | +| `npm-global macos-latest` | success | [job 101644234033](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644234033) | [job 101647112012](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647112012) | +| `macos control` | skipped | [job 101644235362](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101644235362) | [job 101647112696](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101647112696) | +| `ci` | success | [job 101646588871](https://github.com/lidge-jun/opencodex/actions/runs/34090946313/job/101646588871) | [job 101649082610](https://github.com/lidge-jun/opencodex/actions/runs/34091933836/job/101649082610) | + +The Windows full-suite matrix was **SKIPPED in both runs**. Windows keyring create/read/delete smoke and +npm-global packaging/install/help smoke passed; those focused passes do not establish Windows +full-suite coverage. The `ci` aggregate accepts successful or skipped prerequisites, so its green +result does not turn skipped jobs into passes. On the merge-head run, `gates` includes successful Typecheck, GUI tests, +Privacy scan, skill-surface check, release-helper syntax check, and CLI help smoke; its GUI lint, +GUI build, and dashboard-preview steps were skipped. + +Evidence retrieval (read-only): + +```sh +gh api repos/lidge-jun/opencodex/pulls/3854 +gh api repos/lidge-jun/opencodex/actions/runs/34090946313 +gh api 'repos/lidge-jun/opencodex/actions/runs/34090946313/jobs?per_page=100' +gh api repos/lidge-jun/opencodex/actions/runs/34091933836 +gh api 'repos/lidge-jun/opencodex/actions/runs/34091933836/jobs?per_page=100' +``` + +## Limits and residuals + +The delivered scope is the pre-call guidance and post-hoc recovery annotations described in +[030](030_docs_and_delivery.md). Guidance cannot force model compliance, repair the model's +JavaScript or patch payload, or replace the host's validation. The effect on the live Grok defect +rate remains **unmeasured** until a live re-probe; CI success is not a defect-rate measurement. + +Anthropic, Google, OpenAI-chat, and command-code tool-result paths still lack exec-result +annotation seams and do not annotate these host failures. Existing coverage is limited to native +routed Responses, Kiro, and Cursor. + +Two public review threads were **OPEN / UNRESOLVED in the recorded 2026-09-07 audit snapshot**: GitHub's review-thread API returned +`isResolved: false` for both on 2026-09-07. The merge and green CI do not resolve these findings. +Source inspected for that snapshot was read at worktree HEAD `0fd3408b99994f74bd509975df7ee89823ddfecd`: + +- [discussion_r3947178410](https://github.com/lidge-jun/opencodex/pull/3854#discussion_r3947178410): + `src/adapters/exec-tool-result-normalize.ts:196` searches arbitrary output for a marker substring. + Successful output from a command such as `rg` or `cat` can therefore receive a misleading + recovery hint when it quotes that phrase, even though the command did not fail. The requested + host-error status/envelope or exact diagnostic check remains unimplemented at this anchor. +- [discussion_r3947178418](https://github.com/lidge-jun/opencodex/pull/3854#discussion_r3947178418): + `src/adapters/cursor/tool-result-normalize.ts:114` gates annotation on tool name/namespace + without request-catalog or freeform provenance. A structured tool named `exec` can receive + unrelated host guidance. The requested code-mode provenance check remains unimplemented at + this anchor. + +These limitations were also recorded in [000](000_plan.md). Recording them here is not a fix, +review resolution, or claim that successful output is left byte-identical. + +Local runtime, tests, typecheck, build, and install: **NOT RUN** by instruction. No live model +re-probe was performed for this record. The remote results above belong to the recorded PR head +and merge commit and do not validate later candidate documentation or test patches. diff --git a/docs-site/src/content/docs/guides/claude-code.md b/docs-site/src/content/docs/guides/claude-code.md index 0b1c0e9db4..0c3cb32697 100644 --- a/docs-site/src/content/docs/guides/claude-code.md +++ b/docs-site/src/content/docs/guides/claude-code.md @@ -309,8 +309,16 @@ canonical ids. The synthetic 2026 date is an internal slot, not a release date. and `claude-ocx---` ids from older configs still resolve. If Claude Desktop's footer picker does not change the model for an already-running 3P -conversation, use `/model ` in that conversation. OpenCodex cannot observe picker state; it -routes the model id carried by each request. Confirm the result under **Logs → requestedModel**. +conversation, you can try `/model `, but this workaround may also fail on affected Desktop +builds. [Issue #3782](https://github.com/lidge-jun/opencodex/issues/3782) reports that on Windows +with Claude Desktop 1.46388.4, the conversation continues using its initial model after both +footer-picker and `/model` changes. The report does not establish which client or routing +component causes the behavior. + +You can also try selecting the intended default model in the OpenCodex Claude Desktop profile, +reapplying the profile, and starting a new conversation. This is a troubleshooting step, not a +guaranteed fix. OpenCodex cannot observe picker state; it routes the model id carried by each +request. Confirm what the client sends under **Logs → requestedModel**. Models with an authoritative 1M context window get an extra `…[1m]` picker row: selecting it makes Claude Code account a full 1M context for that model (auto-compaction stays on) — the proxy strips From e0a1a8836e447ece3010ba98813e6feb3161eefd Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:33:29 +0900 Subject: [PATCH 163/221] docs: complete Raycast status and model-name recovery guidance [skip ci] --- .../content/docs/fr/guides/integrations.md | 2 +- .../fr/reference/configuration/providers.md | 18 +++++++++ .../src/content/docs/guides/integrations.md | 24 ++++++++---- .../ja/reference/configuration/providers.md | 16 ++++++++ .../ko/reference/configuration/providers.md | 14 +++++++ .../ru/reference/configuration/providers.md | 18 +++++++++ .../tr/reference/configuration/providers.md | 17 ++++++++ .../reference/configuration/providers.md | 12 ++++++ .../reference/configuration/providers.md | 12 ++++++ src/cli/integrations.ts | 2 +- tests/cli/cli-headless-parity.test.ts | 39 +++++++++++++++++++ 11 files changed, 164 insertions(+), 10 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/integrations.md b/docs-site/src/content/docs/fr/guides/integrations.md index c718801ddc..97babedd18 100644 --- a/docs-site/src/content/docs/fr/guides/integrations.md +++ b/docs-site/src/content/docs/fr/guides/integrations.md @@ -128,7 +128,7 @@ niveaux. Dans ces cas, le commutateur est verrouillé afin que rien ne soit modi **OMP** n'est pas affecté non plus par les modifications voisines, mais pour une autre raison : son outil d'écriture ne modifie, octet par octet, que sa propre plage `providers.opencodex` ; le reste du fichier n'est jamais réécrit. Pour les autres formats susceptibles de contenir des commentaires (Hermes, OpenClaw, -Kimi Code, Gajae Code, MiniMax Code, ZCode, Prime Agent, Aside et Raycast — documents YAML, JSON5 et TOML réécrits en entier), ou lorsque les propres entrées +Kimi Code, Gajae Code, MiniMax Code et Raycast — documents YAML, JSON5 et TOML réécrits en entier), ou lorsque les propres entrées d'opencodex ont été modifiées, le commutateur se verrouille et la désactivation est refusée plutôt que de deviner quelles modifications vous appartiennent. diff --git a/docs-site/src/content/docs/fr/reference/configuration/providers.md b/docs-site/src/content/docs/fr/reference/configuration/providers.md index 96d00e5668..9686bb2470 100644 --- a/docs-site/src/content/docs/fr/reference/configuration/providers.md +++ b/docs-site/src/content/docs/fr/reference/configuration/providers.md @@ -473,6 +473,24 @@ avec un contexte de `922000` et une entrée maximale de `922000` ; OpenRouter i } ``` +## Éditeur de noms d'affichage des modèles + +Dans le tableau de bord, **Models** permet d'enregistrer durablement des noms lisibles pour les modèles découverts. Développez le fournisseur, +repérez un modèle découvert et choisissez **Name**. La boîte de dialogue garde le sélecteur exact +`provider/model` visible pendant que vous enregistrez un libellé lisible. Choisissez **Reset name** +pour revenir aux métadonnées du fournisseur ou au sélecteur utilisé par défaut. **Name** ne change +que l'affichage ; le crayon distinct consacré à l'alias modifie l'alias court de routage et n'est +pas un éditeur de nom d'affichage. Les lignes OpenAI natives et celles des modèles personnalisés +conservent leurs commandes existantes. + +Si la modification est enregistrée mais que l'actualisation échoue, la boîte de dialogue reflète +la valeur enregistrée et garde **Retry** disponible. Retry relance la convergence du catalogue +si le serveur a signalé son échec, ou recharge la liste si seule la requête de liste a échoué. +La reprise d'une réinitialisation conserve cette opération ; elle ne rétablit pas l'ancien nom. +Les requêtes ont un délai maximal de 60 secondes couvrant l'écriture et l'actualisation de la liste +qui suit. Un dépassement de délai n'annule pas une écriture : utilisez **Retry** pour vérifier +le nom actuel avant d'effectuer une autre modification. + ## Exemple complet ```json diff --git a/docs-site/src/content/docs/guides/integrations.md b/docs-site/src/content/docs/guides/integrations.md index ea3c93f2dd..b475b71e20 100644 --- a/docs-site/src/content/docs/guides/integrations.md +++ b/docs-site/src/content/docs/guides/integrations.md @@ -62,14 +62,22 @@ One caveat specific to Aside: the running app rewrites `models.json` itself, so fully quit and reopen Aside after applying, the same way Claude Desktop needs a restart. Aside's block is loopback-only and never carries a real credential. -Raycast has two prerequisites. Custom Providers is a **Raycast Pro** feature: on a -free plan the file is still written, but `ocx integration client status --client -raycast` and the Integrations page report a warning, because Raycast will not -read it. And Raycast only creates its `ai` folder when you open Raycast → -Settings → AI → **Reveal Providers Config** once; opencodex uses that folder as -the install signal and reports the client as not installed until then. Raycast -reads `~/.config/raycast/ai/providers.yaml` on macOS and Windows alike and does -not honor `XDG_CONFIG_HOME`, so that path is not relocatable. +The managed Raycast integration supports **macOS and Windows**. Custom Providers +is a **Raycast Pro** feature: on a free plan the file is still written, but +`ocx integration client status --client raycast` and the Integrations page report +a warning, because Raycast will not read it. On macOS or Windows, open Raycast → +Settings → AI → **Reveal Providers Config** once so the `ai` folder exists. +On these supported platforms, opencodex uses that folder as its install signal +and reports the client as not installed until it exists. Linux is unsupported, +even if the folder exists. + +The status field `aiDirPresent` reports only whether `~/.config/raycast/ai` exists, +independently of whether the Raycast app is installed or the platform is supported. +It does not prove that Raycast is installed or usable. The CLI prints `plan` on a +separate line and adds the macOS/Windows setup instruction when `aiDirPresent` is +false; `--json` preserves the raw status, including the nested `raycast` block. +Raycast reads `~/.config/raycast/ai/providers.yaml` on macOS and Windows alike and +does not honor `XDG_CONFIG_HOME`, so that path is not relocatable. The managed block is one element, `id: opencodex`, in the file's `providers` sequence: `name: OpenCodex`, `base_url: http://:/v1`, and every diff --git a/docs-site/src/content/docs/ja/reference/configuration/providers.md b/docs-site/src/content/docs/ja/reference/configuration/providers.md index 8938073e6c..dc7929d26e 100644 --- a/docs-site/src/content/docs/ja/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ja/reference/configuration/providers.md @@ -394,6 +394,22 @@ Vercel AI Gateway は、1 つのモデルを複数の基盤となる推論プロ } ``` +## モデルの表示名エディター + +ダッシュボードの **Models** では、検出されたモデルに読みやすい名前を付けて永続的に保存できます。プロバイダーを展開し、検出された +モデルを見つけて **Name** を選択します。読みやすい名前を保存する間も、ダイアログには正確な +`provider/model` セレクターが表示されます。**Reset name** を選ぶと、プロバイダーのメタデータ、 +または通常のセレクター表示に戻ります。**Name** が変更するのは表示だけです。別のエイリアス用 +鉛筆アイコンは短いルーティングエイリアスを変更するもので、表示名エディターではありません。 +ネイティブ OpenAI とカスタムモデルの行では、既存の操作方法が維持されます。 + +変更は保存されたものの更新に失敗した場合、ダイアログは保存済みの上書き設定を反映し、**Retry** を +引き続き利用できます。サーバーがカタログの収束処理の失敗を報告した場合、Retry はその処理を再実行し、 +一覧取得のリクエストだけが失敗した場合は一覧を再読み込みします。リセット後の復旧でもリセット操作を +維持し、以前の名前には戻しません。リクエストには、書き込みとその後の一覧更新を合わせて 60 秒の +期限があります。タイムアウトしても書き込みは取り消されません。次の変更を行う前に **Retry** で +現在の名前を確認してください。 + ## 完全な例 ```json diff --git a/docs-site/src/content/docs/ko/reference/configuration/providers.md b/docs-site/src/content/docs/ko/reference/configuration/providers.md index 2dda27e7bf..75ae5055b6 100644 --- a/docs-site/src/content/docs/ko/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ko/reference/configuration/providers.md @@ -401,6 +401,20 @@ Vercel AI Gateway는 하나의 모델을 여러 기반 추론 공급자에 걸 } ``` +## 모델 표시 이름 편집기 + +대시보드의 **Models**에서 발견된 모델의 읽기 쉬운 이름을 저장해 유지할 수 있습니다. 공급자를 펼치고 발견된 모델을 +찾아 **Name**을 선택하세요. 읽기 쉬운 이름을 저장하는 동안에도 대화 상자는 정확한 `provider/model` +선택자를 표시합니다. **Reset name**을 선택하면 공급자 메타데이터 또는 기본 선택자 표시로 돌아갑니다. +**Name**은 표시만 바꿉니다. 별도의 별칭 연필 아이콘은 짧은 라우팅 별칭을 바꾸며, 표시 이름 편집기가 +아닙니다. 네이티브 OpenAI와 사용자 지정 모델 행은 기존 조작 방식을 유지합니다. + +변경은 저장됐지만 새로고침에 실패하면 대화 상자는 저장된 재정의를 반영하고 **Retry**를 계속 제공합니다. +서버가 카탈로그 수렴 실패를 보고했다면 Retry는 수렴을 다시 실행하고, 목록 요청만 실패했다면 목록을 +다시 불러옵니다. 초기화 후 복구는 초기화 작업을 유지하며 이전 이름을 복원하지 않습니다. 요청에는 +쓰기와 후속 목록 새로고침을 모두 포함하는 60초 제한이 있습니다. 시간 초과가 쓰기를 취소하지는 않습니다. +다른 변경을 하기 전에 **Retry**로 현재 이름을 확인하세요. + ## 전체 예시 ```json diff --git a/docs-site/src/content/docs/ru/reference/configuration/providers.md b/docs-site/src/content/docs/ru/reference/configuration/providers.md index 14a8b0a3ce..3ddb29c806 100644 --- a/docs-site/src/content/docs/ru/reference/configuration/providers.md +++ b/docs-site/src/content/docs/ru/reference/configuration/providers.md @@ -488,6 +488,24 @@ Pool/Direct рекламирует `922000`; синхронизированны } ``` +## Редактор отображаемых имён моделей + +На странице **Models** в дашборде можно задать понятные имена для обнаруженных моделей и сохранить их для дальнейшего использования. Разверните провайдера, +найдите обнаруженную модель и выберите **Name**. При сохранении понятной подписи диалог оставляет +видимым точный селектор `provider/model`. Выберите **Reset name**, чтобы вернуться к metadata +провайдера или обычному селектору, используемому по умолчанию. **Name** меняет только отображение; +отдельный значок карандаша для alias меняет короткий routing alias и не является редактором +отображаемого имени. Нативные строки OpenAI и строки пользовательских моделей сохраняют +существующие элементы управления. + +Если изменение сохранено, но обновление не удалось, диалог отражает сохранённое переопределение +и оставляет **Retry** доступным. Retry повторяет приведение каталога к согласованному состоянию, +если сервер сообщил о сбое этого процесса, или перезагружает список, если не удался только запрос +списка. Восстановление после сброса сохраняет операцию сброса и не возвращает старое имя. +Для запросов действует общий срок в 60 секунд, включающий запись и последующее обновление списка. +Тайм-аут не отменяет запись: используйте **Retry**, чтобы проверить текущее имя перед следующим +изменением. + ## Полный пример ```json diff --git a/docs-site/src/content/docs/tr/reference/configuration/providers.md b/docs-site/src/content/docs/tr/reference/configuration/providers.md index 3e01051010..daffcd2120 100644 --- a/docs-site/src/content/docs/tr/reference/configuration/providers.md +++ b/docs-site/src/content/docs/tr/reference/configuration/providers.md @@ -518,6 +518,23 @@ bildirir; senkronize edilen katalog `xhigh`'ı ayrı tutarken `max` bildirir. } ``` +## Model görünen adı düzenleyicisi + +Kontrol panelindeki **Models**, keşfedilen modeller için okunabilir adları kalıcı olarak kaydetmenizi sağlar. Sağlayıcıyı genişletin, keşfedilen +bir modeli bulun ve **Name** seçeneğini seçin. Okunabilir bir etiket kaydederken iletişim kutusu +tam `provider/model` seçicisini görünür tutar. Sağlayıcı meta verilerine veya varsayılan seçici +gösterimine dönmek için **Reset name** seçeneğini seçin. **Name** yalnızca görünümü değiştirir; +ayrı takma ad kalemi kısa yönlendirme takma adını değiştirir ve bir görünen ad düzenleyicisi +değildir. Yerel OpenAI ve özel model satırları mevcut kontrollerini korur. + +Değişiklik kaydedildiği halde yenileme başarısız olursa iletişim kutusu kaydedilen geçersiz kılma +değerini yansıtır ve **Retry** kullanılabilir kalır. Sunucu katalog yakınsamasının başarısız +olduğunu bildirdiyse Retry bu işlemi tekrarlar; yalnızca liste isteği başarısız olduysa listeyi +yeniden yükler. Sıfırlama sonrası kurtarma, sıfırlama işlemini korur ve eski adı geri getirmez. +İsteklerin, yazma işlemini ve ardından gelen liste yenilemesini kapsayan 60 saniyelik bir süresi +vardır. Zaman aşımı yazma işlemini geri almaz: başka bir değişiklik yapmadan önce **Retry** ile +geçerli adı kontrol edin. + ## Tam örnek ```json diff --git a/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md b/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md index 32f2b52a69..313663f346 100644 --- a/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md +++ b/docs-site/src/content/docs/zh-cn/reference/configuration/providers.md @@ -395,6 +395,18 @@ Vercel AI Gateway 可以在多个底层推理提供者之间路由一个模型 } ``` +## 模型显示名称编辑器 + +仪表板的 **Models** 可让你为已发现的模型持久保存易读名称。展开提供者,找到一个已发现的模型,然后选择 **Name**。 +保存易读名称时,对话框会一直显示精确的 `provider/model` 选择器。选择 **Reset name** 可恢复为 +提供者元数据中的名称,或默认的选择器显示。**Name** 只改变显示;单独的别名铅笔图标用于修改 +短路由别名,并不是显示名称编辑器。原生 OpenAI 和自定义模型条目保留现有控件。 + +如果更改已保存但刷新失败,对话框会反映已保存的覆盖值,并继续提供 **Retry**。如果服务器报告 +目录收敛失败,Retry 会重新执行目录收敛;如果只是列表请求失败,则重新加载列表。重置后的恢复 +会保留重置操作,不会恢复旧名称。请求的总时限为 60 秒,涵盖写入及后续的列表刷新。超时不会撤销 +写入:进行其他更改前,请使用 **Retry** 检查当前名称。 + ## 完整示例 ```json diff --git a/docs-site/src/content/docs/zh-tw/reference/configuration/providers.md b/docs-site/src/content/docs/zh-tw/reference/configuration/providers.md index 2a53c4d33a..74ee860ff1 100644 --- a/docs-site/src/content/docs/zh-tw/reference/configuration/providers.md +++ b/docs-site/src/content/docs/zh-tw/reference/configuration/providers.md @@ -352,6 +352,18 @@ Vercel AI Gateway 可在多個底層推論供應商之間路由一個模型。`v } ``` +## 模型顯示名稱編輯器 + +儀表板的 **Models** 可讓你為已探索到的模型持久儲存易讀名稱。展開供應商,找到已探索到的模型,然後選擇 **Name**。 +儲存易讀名稱時,對話方塊會持續顯示精確的 `provider/model` 選擇器。選擇 **Reset name** 可回到 +供應商中繼資料中的名稱,或預設的選擇器顯示。**Name** 只改變顯示;獨立的別名鉛筆圖示用來修改 +短路由別名,並不是顯示名稱編輯器。原生 OpenAI 與自訂模型列保留既有控制項。 + +若變更已儲存但重新整理失敗,對話方塊會反映已儲存的覆寫值,並繼續提供 **Retry**。若伺服器回報 +目錄收斂失敗,Retry 會重新執行目錄收斂;若只有清單請求失敗,則重新載入清單。重設後的復原 +會保留重設操作,不會還原舊名稱。請求的總期限為 60 秒,涵蓋寫入及後續的清單重新整理。逾時不會 +撤銷寫入:進行其他變更前,請使用 **Retry** 檢查目前名稱。 + ## 完整範例 ```json diff --git a/src/cli/integrations.ts b/src/cli/integrations.ts index 89ab3ee046..5b690a6c8b 100644 --- a/src/cli/integrations.ts +++ b/src/cli/integrations.ts @@ -189,7 +189,7 @@ function singleClientStatusLines(result: unknown): string[] { const rest = Object.fromEntries(Object.entries(result as Record).filter(([key]) => key !== "raycast")); const lines = [...summaryLines(rest), `plan: ${raycast.plan}`]; if (!raycast.aiDirPresent) { - lines.push('Open Raycast → Settings → AI → "Reveal Providers Config" once so the ai folder exists.'); + lines.push('On macOS or Windows, open Raycast → Settings → AI → "Reveal Providers Config" once so the ai folder exists.'); } return lines; } diff --git a/tests/cli/cli-headless-parity.test.ts b/tests/cli/cli-headless-parity.test.ts index dab85a132c..78f0cc04a1 100644 --- a/tests/cli/cli-headless-parity.test.ts +++ b/tests/cli/cli-headless-parity.test.ts @@ -609,6 +609,45 @@ describe("headless GUI parity CLI", () => { expect(runtime.requests[1]).toEqual({ path: "/api/grok/selection", method: "PUT", body: { excluded: ["b"] } }); }); + for (const plan of ["pro", "free", "unknown"] as const) { + for (const aiDirPresent of [true, false]) { + test(`Raycast status keeps plan ${plan} separate with aiDirPresent=${aiDirPresent}`, async () => { + const payload = { + clientId: "raycast", + installed: aiDirPresent, + raycast: { plan, aiDirPresent }, + }; + const runtime = fakeRuntime(() => payload); + const logSpy = spyOn(console, "log").mockImplementation(() => {}); + try { + expect(await handleClientIntegrationCommand(["status", "--client", "raycast"], runtime.deps)).toBe(0); + const out = logSpy.mock.calls.map(call => String(call[0])).join("\n"); + const lines = out.split("\n"); + expect(lines.filter(line => line.startsWith("plan:"))).toEqual([`plan: ${plan}`]); + expect(out).not.toContain("raycast."); + if (aiDirPresent) { + expect(out).not.toContain("Reveal Providers Config"); + } else { + expect(lines).toContain('On macOS or Windows, open Raycast → Settings → AI → "Reveal Providers Config" once so the ai folder exists.'); + } + + logSpy.mockClear(); + expect(await handleClientIntegrationCommand(["status", "--client", "raycast", "--json"], runtime.deps)).toBe(0); + expect(logSpy.mock.calls).toHaveLength(1); + const jsonOut = String(logSpy.mock.calls[0]![0]); + expect(JSON.parse(jsonOut)).toEqual(payload); + expect(jsonOut).not.toContain("Reveal Providers Config"); + expect(runtime.requests).toEqual([ + { path: "/api/client-integrations/raycast", method: "GET", body: null }, + { path: "/api/client-integrations/raycast", method: "GET", body: null }, + ]); + } finally { + logSpy.mockRestore(); + } + }); + } + } + test("client integration toggles hit the exact management routes", async () => { const runtime = fakeRuntime(); expect(await handleClientIntegrationCommand(["enable", "--client", "hermes", "--json"], runtime.deps)).toBe(0); From f8c8f6dd15b1518f25a3b1cd7b15c9b6c8b24f62 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 20:29:56 +0900 Subject: [PATCH 164/221] docs: qualify Desktop model switching in translated guides [skip ci] --- .../src/content/docs/fr/guides/claude-code.md | 12 ++++++++++-- .../src/content/docs/ja/guides/claude-code.md | 15 ++++++++++++--- .../src/content/docs/ko/guides/claude-code.md | 14 +++++++++++--- .../src/content/docs/ru/guides/claude-code.md | 12 ++++++++++-- .../src/content/docs/tr/guides/claude-code.md | 16 +++++++++++++--- .../src/content/docs/zh-cn/guides/claude-code.md | 12 +++++++++--- 6 files changed, 65 insertions(+), 16 deletions(-) diff --git a/docs-site/src/content/docs/fr/guides/claude-code.md b/docs-site/src/content/docs/fr/guides/claude-code.md index 2ae3940254..e11e6a06d8 100644 --- a/docs-site/src/content/docs/fr/guides/claude-code.md +++ b/docs-site/src/content/docs/fr/guides/claude-code.md @@ -290,8 +290,16 @@ anciens alias hachés et les identifiants `claude-ocx---` des c toujours résolus. Si le sélecteur situé au bas de Claude Desktop ne modifie pas le modèle d'une conversation 3P déjà en cours, -utilisez `/model ` dans cette conversation. OpenCodex ne peut pas observer l'état du sélecteur ; il -achemine l’identifiant du modèle porté par chaque requête. Confirmez le résultat sous **Journaux → requestModel**. +vous pouvez essayer `/model `, mais ce contournement peut également échouer sur les versions de Desktop +concernées. Le [ticket #3782](https://github.com/lidge-jun/opencodex/issues/3782) rapporte que sous Windows, +avec Claude Desktop 1.46388.4, la conversation continue d'utiliser son modèle initial après des changements +via le sélecteur du bas comme via `/model`. Ce signalement ne permet pas d'établir quel composant du client +ou du routage est à l'origine de ce comportement. + +Vous pouvez aussi essayer de sélectionner le modèle par défaut souhaité dans le profil Claude Desktop +d'OpenCodex, de réappliquer ce profil et de démarrer une nouvelle conversation. Il s'agit d'une étape de +dépannage, sans garantie de résolution. OpenCodex ne peut pas observer l'état du sélecteur ; il achemine +l'identifiant du modèle porté par chaque requête. Vérifiez ce que le client envoie sous **Logs → requestedModel**. Les modèles dont la fenêtre de contexte de référence atteint 1M obtiennent une ligne supplémentaire `…[1m]` dans le sélecteur. Sa sélection indique à Claude Code la fenêtre complète de 1M pour ce modèle, tout en maintenant le compactage automatique ; le proxy retire diff --git a/docs-site/src/content/docs/ja/guides/claude-code.md b/docs-site/src/content/docs/ja/guides/claude-code.md index 384c3f50df..adc8703340 100644 --- a/docs-site/src/content/docs/ja/guides/claude-code.md +++ b/docs-site/src/content/docs/ja/guides/claude-code.md @@ -163,9 +163,18 @@ Claude Code 2.1.129 以降は `GET /v1/models?limit=1000` でゲートウェイ 提供します。両系列は継続してデコードできるため、どちらの形式でも `settings.json` に保存したモデルは 引き続き動作します。 -Claude Desktop のフッターピッカーで実行中の 3P 会話のモデルが切り替わらない場合は、その会話で -`/model ` を使用してください。OpenCodex はピッカーの状態を直接参照できず、各リクエストに -含まれるモデル ID をルーティングします。結果は **Logs → requestedModel** で確認できます。 +Claude Desktop のフッターピッカーで実行中の 3P 会話のモデルが切り替わらない場合は、 +`/model ` を試せますが、影響を受ける Desktop ビルドではこの回避策も失敗することがあります。 +[Issue #3782](https://github.com/lidge-jun/opencodex/issues/3782) では、Windows 上の +Claude Desktop 1.46388.4 で、フッターピッカーと `/model` のどちらで変更しても、会話が最初の +モデルを使い続けると報告されています。この報告だけでは、クライアントやルーティングのどの +コンポーネントがこの動作の原因なのかは確定できません。 + +OpenCodex の Claude Desktop プロファイルで希望するデフォルトモデルを選択し、プロファイルを +再適用して、新しい会話を開始することも試せます。これはトラブルシューティングの手順であり、 +解決を保証するものではありません。OpenCodex はピッカーの状態を参照できず、各リクエストに +含まれるモデル ID をルーティングします。クライアントが何を送信しているかは +**Logs → requestedModel** で確認してください。 **エイリアス構文ルール:** provider には `/` や `--` を含められず `native` と同じでもいけません。 `/` も `~` も含まない plain な model ID は v1 接頭辞 `claude-ocx-…` のままです。`/` または `~` を含む diff --git a/docs-site/src/content/docs/ko/guides/claude-code.md b/docs-site/src/content/docs/ko/guides/claude-code.md index 676800d1e6..90857854f0 100644 --- a/docs-site/src/content/docs/ko/guides/claude-code.md +++ b/docs-site/src/content/docs/ko/guides/claude-code.md @@ -199,9 +199,17 @@ Claude Code 2.1.129 이상은 `GET /v1/models?limit=1000`에서 게이트웨이 제공해요. 두 계열은 계속 디코딩할 수 있으므로 어느 형식이든 `settings.json`에 저장한 모델이 계속 작동해요. -Claude Desktop의 하단 선택기로 이미 실행 중인 3P 대화의 모델이 바뀌지 않는다면, 그 대화에서 -`/model `를 사용하세요. OpenCodex는 선택기 상태를 따로 볼 수 없고 각 요청에 실린 모델 ID를 -라우팅해요. 적용 결과는 **Logs → requestedModel**에서 확인할 수 있어요. +Claude Desktop의 하단 선택기로 이미 실행 중인 3P 대화의 모델이 바뀌지 않는다면, +`/model `를 시도할 수 있지만, 문제가 있는 Desktop 빌드에서는 이 우회 방법도 실패할 수 있어요. +[이슈 #3782](https://github.com/lidge-jun/opencodex/issues/3782)에는 Windows의 +Claude Desktop 1.46388.4에서 하단 선택기와 `/model`로 각각 변경해도 대화가 처음 모델을 계속 +사용한다는 보고가 있어요. 이 보고만으로는 클라이언트나 라우팅의 어느 구성 요소가 이 동작을 +일으키는지 확정할 수 없어요. + +OpenCodex의 Claude Desktop 프로필에서 원하는 기본 모델을 선택하고, 프로필을 다시 적용한 뒤 +새 대화를 시작하는 방법도 시도할 수 있어요. 이는 문제 해결을 위한 시도이며 해결을 보장하지는 +않아요. OpenCodex는 선택기 상태를 볼 수 없고 각 요청에 실린 모델 ID를 라우팅해요. +클라이언트가 실제로 무엇을 보내는지는 **Logs → requestedModel**에서 확인하세요. **별칭 문법 규칙:** provider에는 `/`나 `--`를 넣을 수 없고 `native`와 같아도 안 돼요. `/`와 `~`가 없는 plain model ID는 v1 접두사 `claude-ocx-…`를 유지해요. `/` 또는 `~`가 있는 model ID는 v2 diff --git a/docs-site/src/content/docs/ru/guides/claude-code.md b/docs-site/src/content/docs/ru/guides/claude-code.md index 60464bfb90..f5504c9dc2 100644 --- a/docs-site/src/content/docs/ru/guides/claude-code.md +++ b/docs-site/src/content/docs/ru/guides/claude-code.md @@ -176,8 +176,16 @@ user-agent `claude-code/*` получает читаемую CLI-форму, а продолжает работать. Если нижний селектор Claude Desktop не переключает модель в уже запущенном 3P-диалоге, -используйте `/model ` внутри этого диалога. OpenCodex не видит состояние селектора и -маршрутизирует id модели из каждого запроса. Результат можно проверить в **Logs → requestedModel**. +можно попробовать `/model `, но в затронутых сборках Desktop этот обходной способ тоже может +не сработать. В [issue #3782](https://github.com/lidge-jun/opencodex/issues/3782) сообщается, что +в Windows с Claude Desktop 1.46388.4 диалог продолжает использовать исходную модель после изменений +как через нижний селектор, так и через `/model`. Это сообщение не устанавливает, какой компонент +клиента или маршрутизации вызывает такое поведение. + +Можно также попробовать выбрать нужную модель по умолчанию в профиле Claude Desktop в OpenCodex, +повторно применить профиль и начать новый диалог. Это шаг по устранению неполадки, а не гарантированное +решение. OpenCodex не видит состояние селектора; он маршрутизирует id модели, переданный в каждом +запросе. Проверьте, что отправляет клиент, в **Logs → requestedModel**. **Правила грамматики алиасов:** provider не может содержать `/` или `--` и не может быть равен `native`. Обычные id моделей (без `/` и `~`) остаются с префиксом v1 `claude-ocx-…`. Id с `/` diff --git a/docs-site/src/content/docs/tr/guides/claude-code.md b/docs-site/src/content/docs/tr/guides/claude-code.md index 4be81a4de8..497f5e635b 100644 --- a/docs-site/src/content/docs/tr/guides/claude-code.md +++ b/docs-site/src/content/docs/tr/guides/claude-code.md @@ -332,9 +332,19 @@ takma adlar ve eski yapılandırmalardan gelen `claude-ocx---` kimlikleri hala çözümlenir. Claude Desktop'ın altbilgi seçicisi zaten çalışan bir 3P görüşmesi için modeli -değiştirmezse, o görüşmede `/model ` komutunu kullanın. OpenCodex seçici -durumunu gözlemleyemez; her isteğin taşıdığı model kimliğini yönlendirir. Sonucu -**Logs → requestedModel** altında onaylayın. +değiştirmezse, `/model ` komutunu deneyebilirsiniz; ancak bu geçici çözüm de +etkilenen Desktop derlemelerinde başarısız olabilir. +[Sorun #3782](https://github.com/lidge-jun/opencodex/issues/3782), Windows üzerinde +Claude Desktop 1.46388.4 ile hem altbilgi seçicisi hem de `/model` üzerinden yapılan +değişikliklerden sonra görüşmenin ilk modelini kullanmaya devam ettiğini bildiriyor. +Bu bildirim, davranışa hangi istemci veya yönlendirme bileşeninin neden olduğunu +ortaya koymuyor. + +OpenCodex Claude Desktop profilinde istediğiniz varsayılan modeli seçmeyi, profili +yeniden uygulamayı ve yeni bir görüşme başlatmayı da deneyebilirsiniz. Bu bir sorun +giderme adımıdır; kesin çözüm değildir. OpenCodex seçici durumunu gözlemleyemez; +her isteğin taşıdığı model kimliğini yönlendirir. İstemcinin ne gönderdiğini +**Logs → requestedModel** altında kontrol edin. Yetkili 1M bağlam penceresine sahip modeller fazladan bir `…[1m]` seçici satırı alır: bunu seçmek Claude Code'un bu model için tam 1M bağlam hesabı yapmasını diff --git a/docs-site/src/content/docs/zh-cn/guides/claude-code.md b/docs-site/src/content/docs/zh-cn/guides/claude-code.md index dd8bc740b8..216766f70c 100644 --- a/docs-site/src/content/docs/zh-cn/guides/claude-code.md +++ b/docs-site/src/content/docs/zh-cn/guides/claude-code.md @@ -157,9 +157,15 @@ opencodex 会将已路由模型公开为稳定且可逆的别名: user-agent 会获得易读的 CLI 形式,其他客户端会获得 Desktop 哈希形式。两种别名族都会永久 保持可解码——以任一形式保存在 `settings.json` 中的模型都能继续工作。 -如果 Claude Desktop 底部的选择器没有切换已运行 3P 对话的模型,请在该对话中使用 -`/model `。OpenCodex 无法读取选择器状态,只会路由每个请求实际携带的模型 ID;可在 -**Logs → requestedModel** 中确认结果。 +如果 Claude Desktop 底部的选择器没有切换正在进行的 3P 对话的模型,可以尝试 +`/model `,但在受影响的 Desktop 版本中,这种变通方法也可能失败。 +[Issue #3782](https://github.com/lidge-jun/opencodex/issues/3782) 报告称,在 Windows 上使用 +Claude Desktop 1.46388.4 时,无论通过底部选择器还是 `/model` 更改模型,对话都会继续使用 +最初的模型。该报告并未确定是哪个客户端组件或路由组件导致了这一行为。 + +也可以尝试在 OpenCodex 的 Claude Desktop 配置档案中选择所需的默认模型,重新应用配置档案, +然后开始新对话。这是一项排查步骤,不保证能解决问题。OpenCodex 无法读取选择器状态, +而是根据每个请求携带的模型 ID 进行路由。请在 **Logs → requestedModel** 中确认客户端实际发送的内容。 **别名语法规则:**provider 不得包含 `/` 或 `--`,也不得等于 `native`。 不含 `/` 或 `~` 的普通 model ID 继续使用 v1 前缀 `claude-ocx-…`。包含 `/` 或 `~` 的 model ID From 209c88b16fb13d495029d005855006eceb3d20b7 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 21:10:26 +0900 Subject: [PATCH 165/221] fix(models): isolate async price-read state callbacks [skip ci] Exact CI gates diagnosis: keep effect request setup synchronous and update state only from registered fetch settlement callbacks; retain cancellation and identity guards. Co-authored-by: nordz0r <6949669+nordz0r@users.noreply.github.com> --- gui/src/components/ModelPriceDialog.tsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gui/src/components/ModelPriceDialog.tsx b/gui/src/components/ModelPriceDialog.tsx index f6e1a58200..59f385a841 100644 --- a/gui/src/components/ModelPriceDialog.tsx +++ b/gui/src/components/ModelPriceDialog.tsx @@ -58,12 +58,11 @@ export default function ModelPriceDialog({ model, apiBase, onRefresh, onClose }: const mutating = phase === "saving" || phase === "refreshing"; const locked = phase !== "ready"; - const readOverride = useCallback(async (recover = false) => { + const readOverride = useCallback((recover = false) => { if (requestRef.current) return; const bounded = createBoundedFetch(REQUEST_TIMEOUT_MS); requestRef.current = bounded; - try { - const response = await fetch(endpoint, { signal: bounded.signal, cache: "no-store" }); + void fetch(endpoint, { signal: bounded.signal, cache: "no-store" }).then(async response => { const result = await readJsonOrThrow(response); bounded.signal.throwIfAborted(); if (!isRecord(result) || result.provider !== model.provider || !isRecord(result.modelCosts)) { @@ -81,14 +80,14 @@ export default function ModelPriceDialog({ model, apiBase, onRefresh, onClose }: // request still running on the server or writes from another client. setRecovered(recover); setPhase("ready"); - } catch { + }).catch(() => { if (requestRef.current !== bounded) return; setPhase(recover ? "unknown" : "loadFailed"); setErrorKey(recover ? "pricing.override.recoveryFailed" : "pricing.override.loadFailed"); - } finally { + }).finally(() => { bounded.clear(); if (requestRef.current === bounded) requestRef.current = null; - } + }); }, [endpoint, model.id, model.provider]); useEffect(() => { From c4924740bd21add8357747da7f7c7f91baa119e1 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:54:08 +0900 Subject: [PATCH 166/221] feat(usage): add inclusive custom time windows [skip ci] Reimplement the range slice of #2956 with exact ledger filtering, bounded cache identity and localized datetime controls. Keep #3379 open for its other dashboard controls and hourly reporting scope; offline reports are not included. Co-authored-by: Manson2438 <183030642+Manson2438@users.noreply.github.com> --- .../_plan/260907_lane_d/050_usage_ranges.md | 19 ++ .../src/content/docs/reference/cli/agents.md | 9 +- .../content/docs/reference/management-api.md | 19 +- gui/src/i18n/de.ts | 10 + gui/src/i18n/en.ts | 10 + gui/src/i18n/fr.ts | 10 + gui/src/i18n/ja.ts | 10 + gui/src/i18n/ko.ts | 10 + gui/src/i18n/ru.ts | 10 + gui/src/i18n/tr.ts | 10 + gui/src/i18n/zh-TW.ts | 10 + gui/src/i18n/zh.ts | 10 + gui/src/pages/Usage.tsx | 114 +++++-- gui/src/usage-time-range.ts | 31 ++ gui/tests/usage-custom-range.test.tsx | 279 ++++++++++++++++++ gui/tests/usage-time-range.test.ts | 34 +++ scripts/test-layout/layout.json | 3 +- .../ocx/references/01_management_surface.md | 2 + src/cli/capabilities.ts | 2 + src/cli/observe.ts | 15 +- src/cli/usage-report.ts | 7 +- src/server/management/logs-usage-routes.ts | 14 +- .../management/usage-aggregate-cache.ts | 21 +- src/usage/summary.ts | 53 +++- src/usage/time-range.ts | 48 +++ structure/05_gui-and-management-api.md | 8 + tests/cli/cli-usage-report.test.ts | 58 ++++ tests/fixtures/test-layout-expected.json | 3 +- tests/server/api-usage.test.ts | 105 +++++++ tests/usage/usage-aggregate-cache.test.ts | 49 +++ tests/usage/usage-summary.test.ts | 96 ++++++ tests/usage/usage-time-range.test.ts | 36 +++ 32 files changed, 1072 insertions(+), 43 deletions(-) create mode 100644 gui/src/usage-time-range.ts create mode 100644 gui/tests/usage-custom-range.test.tsx create mode 100644 gui/tests/usage-time-range.test.ts create mode 100644 src/usage/time-range.ts create mode 100644 tests/usage/usage-time-range.test.ts diff --git a/devlog/_plan/260907_lane_d/050_usage_ranges.md b/devlog/_plan/260907_lane_d/050_usage_ranges.md index 35b6758a76..e08d758e5b 100644 --- a/devlog/_plan/260907_lane_d/050_usage_ranges.md +++ b/devlog/_plan/260907_lane_d/050_usage_ranges.md @@ -28,3 +28,22 @@ integer epoch milliseconds or full ISO-8601 with timezone only; require both bou reject negative/unsafe/date-invalid/reversed, never normalize overflow dates. MODIFY src/cli/usage-report.ts heading prints since/until for customWindow responses. GUI datetime values become epoch ms locally; end selected minute includes 59.999s. + +P revalidation: custom windows always filter rows before aggregation. Introduce exported +UsageTimeWindow {since:number,until:number} and immutable optional accumulator window; +snapshot timestamps update first, clone retains the window, summary returns customWindow:true +and exact since/until while actual generatedAt stays now. Partition/day filtering must not +drop the partial first day. Grid uses local calendar day boundaries and caps at 366 days. +getFilteredUsageAggregate accepts window, keys both bounds, passes window to factory and +reuses existing revision/timezone/overlay guards. Only-window queries preserve account rows. +GUI skips held/session report caching for custom windows (arbitrary keys must not grow the +preset cache); useDataSurface key still includes bounds and unsubscribed stores already evict. +Workers split backend/API/CLI/tests and GUI/i18n/tests; main owns docs/manifests/generated map. + +Implementation checkpoint: shared strict ISO/epoch-ms parser, immutable per-entry window, +window-keyed filtered cache, API and CLI inclusive bounds, exact interval heading, and +localized Usage date/time controls are implemented. Custom GUI reports bypass held caches; +calendar grid stays within the server's bounded days. Tests cover partial/inclusive bounds, +filters/accounts, cache invalidation, clone/snapshot behavior, empty/error responses and UI +apply/clear/stale-response paths. New parser test registered in both manifests. ISO fractions +beyond millisecond precision reject instead of truncating. Product execution NOT RUN locally. diff --git a/docs-site/src/content/docs/reference/cli/agents.md b/docs-site/src/content/docs/reference/cli/agents.md index 300bb7d5e2..4b95d1bcd2 100644 --- a/docs-site/src/content/docs/reference/cli/agents.md +++ b/docs-site/src/content/docs/reference/cli/agents.md @@ -111,14 +111,21 @@ Inspect proxy requests, usage, storage, memory, and debug data. The direct alias | Alias | Equivalent resource | | --- | --- | | `ocx logs [filters] [--follow] [--json|--jsonl]` | `ocx observe logs` | -| `ocx usage [--range ] [--surface ] [--provider ] [--model ] [--json]` | `ocx observe usage` | +| `ocx usage [--range ] [--since --until ] [--surface ] [--provider ] [--model ] [--json]` | `ocx observe usage` | | `ocx storage [--json]` | `ocx observe storage` | | `ocx memory [--json]` | `ocx observe memory` | ```bash ocx observe usage --range 30d --json +ocx usage --since 2026-09-01T09:00:00Z --until 2026-09-01T10:59:59.999Z --json ``` +`--since` and `--until` must be supplied together. They accept integer epoch milliseconds or +full ISO datetimes with an explicit timezone, include both endpoints, and override `--range`. +Invalid or reversed bounds fail before the request. Human output prints the requested interval; +`--json` includes `customWindow`, `since`, and `until`. Existing surface/provider/model filters +still apply. These commands query the running proxy; they do not provide offline reports. + `--range today` (alias `1d`) reports the current local day. `--provider` and `--model` narrow the report to one upstream target — distinct from `--surface`, which selects the calling client (Codex, Claude Code, Grok) diff --git a/docs-site/src/content/docs/reference/management-api.md b/docs-site/src/content/docs/reference/management-api.md index 0b3598eac8..238d23b336 100644 --- a/docs-site/src/content/docs/reference/management-api.md +++ b/docs-site/src/content/docs/reference/management-api.md @@ -182,7 +182,7 @@ by the current window size. | `GET /api/debug/usage-logs` | Read bounded usage-debug entries | — | | `GET /api/debug/injection-logs` | Read bounded guidance-injection debug entries | — | | `GET /api/claude/inbound-debug` | Read Claude inbound debug state and entries | — | -| `GET /api/usage` | Stream the complete usage ledger into compact aggregates, then incrementally fold verified appends; summarize by range and client surface, with a Codex `accounts` breakdown keyed by stable non-PII log labels | Returns an `error: "read_failed"` summary if storage cannot be read | +| `GET /api/usage` | Stream the complete usage ledger into compact aggregates, then incrementally fold verified appends; summarize by preset or inclusive custom window and client surface, with a Codex `accounts` breakdown keyed by stable non-PII log labels | 400 invalid custom bounds; returns an `error: "read_failed"` summary if storage cannot be read | | `GET /api/storage` | Scan Codex storage usage by bucket | Returns an `error: "scan_failed"` payload on scan failure | | `POST /api/storage/cleanup/preview` | Preview archived-session cleanup and return a binding digest | 400 `invalid_json` or `invalid_percent` | | `POST /api/storage/cleanup` | Quarantine or permanently remove the previewed archived set | 400 invalid input; 409 stale/busy/referenced state; 500 filesystem/database failure | @@ -210,6 +210,23 @@ an earlier file prefix from 7-day, 30-day, or all-history totals. `managementUsa accepted for compatibility with bounded legacy readers, but changing it no longer expands or reduces the history summarized by this endpoint. +Pass both `since` and `until` to select an inclusive custom interval. Each accepts integer Unix +epoch **milliseconds**, or a full ISO datetime with an explicit timezone. Invalid dates, negative +or out-of-range values, reversed bounds, and a single bound are rejected. Custom bounds override +`range`; the response keeps the preset `range` field for compatibility and adds `customWindow: true`, +the exact `since`, and `until`. `generatedAt` remains the time the report was produced. + +Custom windows filter individual ledger entries before daily aggregation, including partial first +and last days. They preserve `surface`, `provider`, `model`, and `apiKeyId` filtering and never reuse +or overwrite unfiltered preset summaries. The daily chart remains capped at 366 local calendar days; +totals cover the full requested interval. Snapshot-window fields describe the scanned ledger before +the time filter, so they can extend beyond the requested bounds. + +The Usage page accepts local date/time inputs. Its selected ending minute includes the entire +minute through `:59.999`. Choosing a preset or clearing the custom window restores preset behavior. +This adds exact range selection and existing cost estimates; it does not add hourly chart buckets +or offline reporting. + The runtime ledger is append-only. Replacing or truncating it, or changing local pricing/time-zone inputs, triggers a complete rebuild. If you manually edit an older row in place while the proxy is running, restart the proxy (or replace the file) before relying on the new total; incremental refreshes diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index a361962237..79d1591728 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -2615,4 +2615,14 @@ export const de: Record = { "pricing.override.refresh": "Liste aktualisieren", "pricing.override.cancel": "Abbrechen", "pricing.override.close": "Schließen", + "usage.range.custom": "Eigener Zeitraum", + "usage.range.start": "Beginn (Ortszeit)", + "usage.range.end": "Ende (Ortszeit)", + "usage.range.apply": "Anwenden", + "usage.range.clear": "Zurücksetzen", + "usage.range.help": "Ortszeit. Die gesamte Endminute ist enthalten.", + "usage.range.required": "Geben Sie Datum und Uhrzeit für Beginn und Ende ein.", + "usage.range.invalid": "Geben Sie gültige lokale Daten und Uhrzeiten ab 1970-01-01 UTC ein.", + "usage.range.reversed": "Das Ende muss auf oder nach dem Beginn liegen.", + "usage.range.applied": "Ausgewählter Zeitraum: {start} – {end} (beide Grenzen eingeschlossen).", }; diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index ff45937f47..cceef53d12 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -2649,6 +2649,16 @@ export const en = { "pricing.override.refresh": "Refresh list", "pricing.override.cancel": "Cancel", "pricing.override.close": "Close", + "usage.range.custom": "Custom date range", + "usage.range.start": "Start (local time)", + "usage.range.end": "End (local time)", + "usage.range.apply": "Apply", + "usage.range.clear": "Clear", + "usage.range.help": "Local time. Includes the entire end minute.", + "usage.range.required": "Enter both a start and an end date and time.", + "usage.range.invalid": "Enter valid local dates and times, on or after 1970-01-01 UTC.", + "usage.range.reversed": "The end must be at or after the start.", + "usage.range.applied": "Selected interval: {start} – {end} (both inclusive).", } as const; export type TKey = keyof typeof en; diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index eafe430758..67b2586fe4 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -2602,4 +2602,14 @@ export const fr: Record = { "pricing.override.refresh": "Actualiser la liste", "pricing.override.cancel": "Annuler", "pricing.override.close": "Fermer", + "usage.range.custom": "Période personnalisée", + "usage.range.start": "Début (heure locale)", + "usage.range.end": "Fin (heure locale)", + "usage.range.apply": "Appliquer", + "usage.range.clear": "Effacer", + "usage.range.help": "Heure locale. La dernière minute est entièrement incluse.", + "usage.range.required": "Saisissez la date et l’heure de début et de fin.", + "usage.range.invalid": "Saisissez des dates et heures locales valides à partir du 1970-01-01 UTC.", + "usage.range.reversed": "La fin doit être égale ou postérieure au début.", + "usage.range.applied": "Période sélectionnée : {start} – {end} (bornes incluses).", }; diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 6fe289e48c..92bb516827 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -2636,4 +2636,14 @@ export const ja: Record = { "pricing.override.refresh": "一覧を更新", "pricing.override.cancel": "キャンセル", "pricing.override.close": "閉じる", + "usage.range.custom": "期間を指定", + "usage.range.start": "開始(現地時間)", + "usage.range.end": "終了(現地時間)", + "usage.range.apply": "適用", + "usage.range.clear": "解除", + "usage.range.help": "現地時間です。終了時刻の分全体を含みます。", + "usage.range.required": "開始と終了の日時を両方入力してください。", + "usage.range.invalid": "1970-01-01 UTC以降の有効な現地日時を入力してください。", + "usage.range.reversed": "終了日時は開始日時と同じか、それ以降にしてください。", + "usage.range.applied": "選択した期間:{start} – {end}(両端を含む)。", }; diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 20160b7ffe..7f02d3792f 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -2637,4 +2637,14 @@ export const ko: Record = { "pricing.override.refresh": "목록 갱신", "pricing.override.cancel": "취소", "pricing.override.close": "닫기", + "usage.range.custom": "기간 직접 지정", + "usage.range.start": "시작 (현지 시간)", + "usage.range.end": "종료 (현지 시간)", + "usage.range.apply": "적용", + "usage.range.clear": "해제", + "usage.range.help": "현지 시간 기준이며, 종료 시각의 마지막 분 전체를 포함합니다.", + "usage.range.required": "시작과 종료 날짜 및 시간을 모두 입력하세요.", + "usage.range.invalid": "1970-01-01 UTC 이후의 유효한 현지 날짜와 시간을 입력하세요.", + "usage.range.reversed": "종료 시각은 시작 시각과 같거나 이후여야 합니다.", + "usage.range.applied": "선택한 기간: {start} – {end} (양 끝 시각 포함).", }; diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index b433aa4381..9548be7d64 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -2638,4 +2638,14 @@ export const ru: Record = { "pricing.override.refresh": "Обновить список", "pricing.override.cancel": "Отмена", "pricing.override.close": "Закрыть", + "usage.range.custom": "Произвольный период", + "usage.range.start": "Начало (местное время)", + "usage.range.end": "Конец (местное время)", + "usage.range.apply": "Применить", + "usage.range.clear": "Сбросить", + "usage.range.help": "Местное время. Последняя минута включена целиком.", + "usage.range.required": "Введите дату и время начала и конца.", + "usage.range.invalid": "Введите допустимые местные дату и время не ранее 1970-01-01 UTC.", + "usage.range.reversed": "Конец не может быть раньше начала.", + "usage.range.applied": "Выбранный период: {start} – {end} (обе границы включены).", }; diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index b86b867b22..7b835eb03e 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -2638,4 +2638,14 @@ export const tr: Record = { "pricing.override.refresh": "Listeyi yenile", "pricing.override.cancel": "İptal", "pricing.override.close": "Kapat", + "usage.range.custom": "Özel tarih aralığı", + "usage.range.start": "Başlangıç (yerel saat)", + "usage.range.end": "Bitiş (yerel saat)", + "usage.range.apply": "Uygula", + "usage.range.clear": "Temizle", + "usage.range.help": "Yerel saat. Bitiş dakikasının tamamı dahildir.", + "usage.range.required": "Başlangıç ve bitiş için tarih ve saat girin.", + "usage.range.invalid": "1970-01-01 UTC veya sonrasına ait geçerli yerel tarih ve saat girin.", + "usage.range.reversed": "Bitiş, başlangıçla aynı veya daha sonra olmalıdır.", + "usage.range.applied": "Seçilen aralık: {start} – {end} (iki sınır da dahil).", }; diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index 856c4c869c..cd0b7e17d3 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2600,4 +2600,14 @@ export const zhTW: Record = { "pricing.override.refresh": "重新整理清單", "pricing.override.cancel": "取消", "pricing.override.close": "關閉", + "usage.range.custom": "自訂時間範圍", + "usage.range.start": "開始(本地時間)", + "usage.range.end": "結束(本地時間)", + "usage.range.apply": "套用", + "usage.range.clear": "清除", + "usage.range.help": "使用本地時間,包含結束時刻的整分鐘。", + "usage.range.required": "請輸入開始和結束的日期及時間。", + "usage.range.invalid": "請輸入不早於 1970-01-01 UTC 的有效本地日期和時間。", + "usage.range.reversed": "結束時間必須等於或晚於開始時間。", + "usage.range.applied": "所選範圍:{start} – {end}(包含兩端)。", }; diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index 4e1fda0c2a..d9f93f20c7 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -2636,4 +2636,14 @@ export const zh: Record = { "pricing.override.refresh": "刷新列表", "pricing.override.cancel": "取消", "pricing.override.close": "关闭", + "usage.range.custom": "自定义时间范围", + "usage.range.start": "开始(本地时间)", + "usage.range.end": "结束(本地时间)", + "usage.range.apply": "应用", + "usage.range.clear": "清除", + "usage.range.help": "使用本地时间,包含结束时刻的整分钟。", + "usage.range.required": "请输入开始和结束的日期及时间。", + "usage.range.invalid": "请输入不早于 1970-01-01 UTC 的有效本地日期和时间。", + "usage.range.reversed": "结束时间必须等于或晚于开始时间。", + "usage.range.applied": "所选范围:{start} – {end}(包含两端)。", }; diff --git a/gui/src/pages/Usage.tsx b/gui/src/pages/Usage.tsx index bd7537073b..44ecce0c98 100644 --- a/gui/src/pages/Usage.tsx +++ b/gui/src/pages/Usage.tsx @@ -10,6 +10,7 @@ import { useDataSurface } from "../data-surface"; import { DataSurfaceSkeleton } from "../components/data-surface"; import { SectionTabs } from "../components/section-tabs"; import { sectionAnchorId } from "../section-anchors"; +import { parseUsageTimeRange, type UsageRangeError, type UsageTimeWindow } from "../usage-time-range"; type Range = "all" | "30d" | "7d"; type UsageSurface = "all" | "codex" | "claude" | "grok"; @@ -79,6 +80,8 @@ interface UsageResponse { range: Range; surface: UsageSurface; since: number | null; + until?: number; + customWindow?: boolean; generatedAt: number; summary: UsageSummaryTotals; days: UsageDay[]; @@ -156,16 +159,18 @@ interface HeatmapCell { dayOfWeek: number; } -function buildHeatmap(days: UsageDay[]): { weeks: HeatmapCell[][]; months: { label: string; col: number }[]; buckets: number[] } { +function buildHeatmap(days: UsageDay[], customWindow = false): { weeks: HeatmapCell[][]; months: { label: string; col: number }[]; buckets: number[] } { const buckets = quantileBuckets(days.map(d => d.totalTokens)); + if (customWindow && days.length === 0) return { weeks: [], months: [], buckets }; const dayMap = new Map(days.map(d => [d.date, d])); - const today = new Date(); + const today = customWindow ? new Date(`${days[days.length - 1].date}T00:00:00`) : new Date(); today.setHours(0, 0, 0, 0); - const start = new Date(today); - start.setDate(start.getDate() - 364); - // Align to Sunday - start.setDate(start.getDate() - start.getDay()); + const start = customWindow ? new Date(`${days[0].date}T00:00:00`) : new Date(today); + if (!customWindow) { + start.setDate(start.getDate() - 364); + start.setDate(start.getDate() - start.getDay()); + } const weeks: HeatmapCell[][] = []; const months: { label: string; col: number }[] = []; @@ -173,6 +178,12 @@ function buildHeatmap(days: UsageDay[]): { weeks: HeatmapCell[][]; months: { lab let lastMonthCol = -4; let prevMonthIdx = -1; let week: HeatmapCell[] = []; + // Align a custom grid without inventing report dates outside the server's bounded days. + if (customWindow) { + while (week.length < start.getDay()) { + week.push({ date: "", requests: 0, totalTokens: 0, level: 0, dayOfWeek: week.length }); + } + } const cursor = new Date(start); while (cursor <= today) { @@ -214,7 +225,7 @@ function UsageFilters({ t, }: { surface: UsageSurface; - range: Range; + range: Range | null; onSurface: (surface: UsageSurface) => void; onRange: (range: Range) => void; t: TFn; @@ -378,7 +389,7 @@ function UsageHeatmapPanel({ locale, t, }: { - range: Range; + range: Range | null; heatmap: ReturnType; weekBars: UsageDay[]; locale: Locale; @@ -671,7 +682,7 @@ function UsageWorkspaceBody({ modelQuery: string; onModelQuery: (query: string) => void; sortedProviders: UsageProvider[]; - range: Range; + range: Range | null; locale: Locale; t: TFn; }) { @@ -762,31 +773,52 @@ export default function Usage({ apiBase, connected = false, apiKeyId }: { apiBas const [surface, setSurface] = useState("all"); const [scope, setScope] = useState("machine"); const [modelQuery, setModelQuery] = useState(""); + const [draftWindow, setDraftWindow] = useState({ since: "", until: "" }); + const [customWindow, setCustomWindow] = useState(null); + const [rangeError, setRangeError] = useState(null); + const since = customWindow?.since; + const until = customWindow?.until; + + const clearCustomWindow = () => { + setCustomWindow(null); + setDraftWindow({ since: "", until: "" }); + setRangeError(null); + }; + const selectRange = (next: Range) => { + setRange(next); + clearCustomWindow(); + }; const loadUsage = useCallback(async (signal: AbortSignal): Promise => { const query = new URLSearchParams({ range, surface }); if (connected && scope === "machine" && apiKeyId) query.set("apiKeyId", apiKeyId); + if (since !== undefined && until !== undefined) { + query.set("since", String(since)); + query.set("until", String(until)); + } const response = await fetch(`${apiBase}/api/usage?${query}`, { signal }); if (!response.ok) throw new Error(`${response.status} ${response.statusText}`.trim()); const next = await response.json() as UsageResponse; - writeHeldUsage(apiBase, range, surface, connected, scope, apiKeyId, next); + if (since === undefined) writeHeldUsage(apiBase, range, surface, connected, scope, apiKeyId, next); return next; - }, [apiBase, apiKeyId, connected, range, scope, surface]); + }, [apiBase, apiKeyId, connected, range, scope, surface, since, until]); - const resourceKey = usageCacheKey(apiBase, range, surface, connected, scope, apiKeyId); - const cached = readHeldUsage(apiBase, range, surface, connected, scope, apiKeyId); + const presetKey = usageCacheKey(apiBase, range, surface, connected, scope, apiKeyId); + const resourceKey = customWindow ? `${presetKey}:custom:${since}:${until}` : presetKey; + // Arbitrary custom windows belong only to the subscription-scoped resource store. + const cached = customWindow ? null : readHeldUsage(apiBase, range, surface, connected, scope, apiKeyId); // Range and surface identify different reports, so the key changes with both. That prevents // a force-loading dependency revalidation from ever showing a previous report as this one. const resource = useDataSurface( resourceKey, - [apiBase, apiKeyId, connected, range, scope, surface], + [apiBase, apiKeyId, connected, range, scope, surface, since, until], loadUsage, { isEmpty: () => false, initialData: cached ?? undefined }, ); const { state } = resource; const data = state.data ?? cached ?? null; - const heatmap = useMemo(() => buildHeatmap(data?.days ?? []), [data?.days]); + const heatmap = useMemo(() => buildHeatmap(data?.days ?? [], !!customWindow), [data?.days, customWindow]); const weekBars = useMemo(() => lastSevenDays(data?.days ?? []), [data?.days]); const activeDays = useMemo(() => (data?.days ?? []).filter(d => d.requests > 0).length, [data?.days]); const filteredModels = useMemo(() => { @@ -810,9 +842,57 @@ export default function Usage({ apiBase, connected = false, apiKeyId }: { apiBas <>

{t("usage.title")}

- +

{t("usage.subtitle")}

+
{ + event.preventDefault(); + const result = parseUsageTimeRange(draftWindow.since, draftWindow.until); + if (result.ok === false) { + setRangeError(result.error); + return; + } + setRangeError(null); + setCustomWindow(result.window); + }}> +
+ + + + +
+

{t("usage.range.help")}

+ {rangeError && } + {customWindow &&

{(() => { + const formatter = new Intl.DateTimeFormat(locale, { + year: "numeric", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", + second: "2-digit", fractionalSecondDigits: 3, timeZoneName: "short", + }); + return t("usage.range.applied", { start: formatter.format(customWindow.since), end: formatter.format(customWindow.until) }); + })()}

} +
{/* Only shown when connected. Naming the source is a two-plane concept: it answers "which store served these numbers", and that question only exists once there are @@ -869,7 +949,7 @@ export default function Usage({ apiBase, connected = false, apiKeyId }: { apiBas modelQuery={modelQuery} onModelQuery={setModelQuery} sortedProviders={sortedProviders} - range={range} + range={customWindow ? null : range} locale={locale} t={t} /> diff --git a/gui/src/usage-time-range.ts b/gui/src/usage-time-range.ts new file mode 100644 index 0000000000..eebc445ad2 --- /dev/null +++ b/gui/src/usage-time-range.ts @@ -0,0 +1,31 @@ +export interface UsageTimeWindow { + since: number; + until: number; +} + +export type UsageRangeError = "required" | "invalid" | "reversed"; + +function localMinute(value: string): number | null { + const parts = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/.exec(value); + if (!parts) return null; + const [year, month, day, hour, minute] = parts.slice(1).map(Number); + const date = new Date(`${value}:00`); + const timestamp = date.getTime(); + // Reject calendar overflow and nonexistent local times (including DST gaps). + if (!Number.isSafeInteger(timestamp) || timestamp < 0 + || date.getFullYear() !== year || date.getMonth() !== month - 1 + || date.getDate() !== day || date.getHours() !== hour || date.getMinutes() !== minute) return null; + return timestamp; +} + +export function parseUsageTimeRange(start: string, end: string): + | { ok: true; window: UsageTimeWindow } + | { ok: false; error: UsageRangeError } { + if (!start || !end) return { ok: false, error: "required" }; + const since = localMinute(start); + const endMinute = localMinute(end); + if (since === null || endMinute === null) return { ok: false, error: "invalid" }; + if (since > endMinute) return { ok: false, error: "reversed" }; + // Both bounds are inclusive: the selected end minute includes its final millisecond. + return { ok: true, window: { since, until: endMinute + 59_999 } }; +} diff --git a/gui/tests/usage-custom-range.test.tsx b/gui/tests/usage-custom-range.test.tsx new file mode 100644 index 0000000000..c06b27eb33 --- /dev/null +++ b/gui/tests/usage-custom-range.test.tsx @@ -0,0 +1,279 @@ +import { afterEach, beforeEach, expect, test } from "bun:test"; +import { Window } from "happy-dom"; +import { act } from "react"; +import type { Root } from "react-dom/client"; +import { LanguageProvider } from "../src/i18n/provider"; +import { clearClientResourceStoresForTests } from "../src/client-resource"; +import Usage from "../src/pages/Usage"; + +const globals = ["document", "window", "navigator", "localStorage", "sessionStorage", "ResizeObserver", "IS_REACT_ACT_ENVIRONMENT"] as const; +const originalFetch = globalThis.fetch; +let previousGlobals: Record<(typeof globals)[number], unknown>; +let testWindow: Window; +let root: Root | undefined; +let container: HTMLElement; +let apiBase: string; +let sequence = 0; +type RequestGate = { url: string; resolve: (response: Response) => void }; +let requests: RequestGate[]; + +beforeEach(() => { + previousGlobals = Object.fromEntries(globals.map(key => [key, Reflect.get(globalThis, key)])) as typeof previousGlobals; + clearClientResourceStoresForTests(); + testWindow = new Window({ url: "http://localhost/" }); + testWindow.localStorage.setItem("ocx-lang", "en"); + Object.defineProperties(globalThis, { + document: { configurable: true, value: testWindow.document }, + window: { configurable: true, value: testWindow }, + navigator: { configurable: true, value: testWindow.navigator }, + localStorage: { configurable: true, value: testWindow.localStorage }, + sessionStorage: { configurable: true, value: testWindow.sessionStorage }, + ResizeObserver: { configurable: true, value: testWindow.ResizeObserver }, + IS_REACT_ACT_ENVIRONMENT: { configurable: true, value: true }, + }); + // The page also has a held memory cache: each test gets a distinct report identity. + apiBase = `http://usage-custom-${++sequence}`; + requests = []; + globalThis.fetch = ((input: RequestInfo | URL) => new Promise(resolve => { + requests.push({ url: String(input), resolve }); + })) as typeof fetch; +}); + +afterEach(async () => { + if (root) await act(async () => { root!.unmount(); }); + root = undefined; + globalThis.fetch = originalFetch; + clearClientResourceStoresForTests(); + testWindow.close(); + for (const key of globals) Object.defineProperty(globalThis, key, { configurable: true, value: previousGlobals[key] }); +}); + +async function mount(connected = false) { + const previousRequests = requests.length; + container = document.createElement("div"); + document.body.append(container); + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root = createRoot(container); + root.render(); + }); + expect(requests).toHaveLength(previousRequests + 1); +} + +function report(gate: RequestGate, marker: string, date = "2020-09-15") { + const query = new URL(gate.url).searchParams; + const custom = query.has("since"); + return { + range: query.get("range"), surface: query.get("surface"), + since: custom ? Number(query.get("since")) : null, + ...(custom ? { customWindow: true, until: Number(query.get("until")) } : {}), + generatedAt: Date.now(), + summary: { + requests: 1, measuredRequests: 1, reportedRequests: 1, unreportedRequests: 0, + unsupportedRequests: 0, estimatedRequests: 0, inputTokens: 10, outputTokens: 20, + cachedInputTokens: 0, reasoningOutputTokens: 0, totalTokens: 30, coverageRatio: 1, + }, + days: [{ date, requests: 1, measuredRequests: 1, reportedRequests: 1, totalTokens: 30, models: [] }], + models: [{ model: marker, provider: "openai", requests: 1, measuredRequests: 1, reportedRequests: 1, + estimatedRequests: 0, totalTokens: 30, inputTokens: 10, outputTokens: 20, shareRatio: 1 }], + providers: [], historyTruncated: false, truncatedPrefixBytes: 0, entriesTruncated: false, entriesDropped: 0, + }; +} + +async function respond(index: number, marker: string, date?: string) { + await act(async () => { requests[index].resolve(Response.json(report(requests[index], marker, date))); }); +} + +const form = () => container.querySelector('form[aria-label="Custom date range"]')!; +const startInput = () => form().querySelectorAll('input[type="datetime-local"]')[0]; +const endInput = () => form().querySelectorAll('input[type="datetime-local"]')[1]; +const interval = () => form().querySelector('[role="status"]')?.textContent; +const error = () => form().querySelector('[role="alert"]')?.textContent; +const preset = (name: string) => container.querySelector(`button.usage-segmented-btn[aria-label="${name}"]`)!; + +async function click(button: HTMLButtonElement) { + expect(button).toBeTruthy(); + await act(async () => { button.click(); }); +} + +async function enter(start: string, end: string) { + await act(async () => { + for (const [input, value] of [[startInput(), start], [endInput(), end]] as const) { + Object.getOwnPropertyDescriptor(testWindow.HTMLInputElement.prototype, "value")!.set!.call(input, value); + input.dispatchEvent(new testWindow.Event("input", { bubbles: true })); + input.dispatchEvent(new testWindow.Event("change", { bubbles: true })); + } + }); +} + +const apply = () => click(form().querySelector('button[type="submit"]')!); +const clear = () => click(form().querySelector('button[type="button"]')!); +const since = new Date(2020, 8, 15, 10, 20, 0, 0).getTime(); +const until = new Date(2020, 8, 15, 10, 21, 59, 999).getTime(); +const boundsQuery = `since=${since}&until=${until}`; + +function sessionEntries() { + return Array.from({ length: sessionStorage.length }, (_, index) => { + const key = sessionStorage.key(index)!; + return [key, sessionStorage.getItem(key)]; + }); +} + +test("Apply submits inclusive bounds once; Clear restores the held preset without custom cache entries", async () => { + await mount(); + expect(requests[0].url).toBe(`${apiBase}/api/usage?range=30d&surface=all`); + await respond(0, "preset-report-marker"); + const held = sessionEntries(); + expect(held).toHaveLength(1); + await enter("2020-09-15T10:20", "2020-09-15T10:21"); + expect(requests).toHaveLength(1); + expect(container.textContent).toContain("preset-report-marker"); + await apply(); + expect(requests).toHaveLength(2); + expect(requests[1].url).toBe(`${apiBase}/api/usage?range=30d&surface=all&${boundsQuery}`); + for (const name of ["Available history", "30d", "7d"]) expect(preset(name).getAttribute("aria-pressed")).toBe("false"); + expect(container.textContent).not.toContain("preset-report-marker"); + expect(container.textContent).toContain("Loading usage data"); + expect(interval()).toContain("both inclusive"); + expect(interval()).toContain(".999"); + const appliedInterval = interval(); + await respond(1, "custom-report-marker"); + expect(container.textContent).toContain("custom-report-marker"); + expect(sessionEntries()).toEqual(held); + // Resource eviction is scheduled on a zero-delay timer. Drain that turn before Clear + // so this explicitly covers restoring a held preset after its resource store was evicted. + await act(async () => { await new Promise(resolve => setTimeout(resolve, 0)); }); + // A one-day historical window must not produce a year grid anchored to today's date. + expect(container.querySelectorAll(".heatmap-grid .heatmap-cell")).toHaveLength(7); + const activeCell = container.querySelector(".heatmap-grid .heatmap-cell-1")!; + await act(async () => { activeCell.dispatchEvent(new testWindow.MouseEvent("mouseover", { bubbles: true })); }); + expect(container.querySelector('[role="tooltip"]')?.textContent).toContain("2020-09-15"); + await enter("2020-09-16T10:20", "2020-09-16T10:21"); + expect(interval()).toBe(appliedInterval); + expect(requests).toHaveLength(2); + await clear(); + expect(startInput().value).toBe(""); + expect(endInput().value).toBe(""); + expect(interval()).toBeUndefined(); + expect(preset("30d").getAttribute("aria-pressed")).toBe("true"); + expect(container.textContent).toContain("preset-report-marker"); + expect(container.textContent).not.toContain("custom-report-marker"); + expect(requests.at(-1)!.url).toBe(`${apiBase}/api/usage?range=30d&surface=all`); + await act(async () => { root!.unmount(); }); + root = undefined; + container.remove(); + clearClientResourceStoresForTests(); + await mount(); + expect(container.textContent).toContain("preset-report-marker"); + await enter("2020-09-15T10:20", "2020-09-15T10:21"); + await apply(); + // Reopening that exact custom window must not resurrect a module/session-held report. + expect(container.textContent).not.toContain("custom-report-marker"); + expect(container.textContent).not.toContain("preset-report-marker"); + expect(container.textContent).toContain("Loading usage data"); + expect(requests.at(-1)!.url).toBe(`${apiBase}/api/usage?range=30d&surface=all&${boundsQuery}`); +}); + +test("missing, partial, invalid and reversed drafts make no request or applied-state change", async () => { + await mount(); + await respond(0, "held-valid-report"); + for (const [start, end, expected] of [ + ["", "", "Enter both"], + ["2020-09-15T10:20", "", "Enter both"], + ["", "2020-09-15T10:20", "Enter both"], + ["1969-01-01T12:00", "2020-09-15T10:20", "Enter valid"], + ["2020-09-16T10:20", "2020-09-15T10:20", "The end must"], + ]) { + await enter(start, end); + await apply(); + expect(error()).toContain(expected); + expect(startInput().getAttribute("aria-invalid")).toBe("true"); + expect(requests).toHaveLength(1); + expect(container.textContent).toContain("held-valid-report"); + expect(interval()).toBeUndefined(); + } + await enter("2020-09-15T10:20", "2020-09-15T10:21"); + await apply(); + await respond(1, "applied-valid-report"); + const previousInterval = interval(); + await enter("2020-09-16T10:20", "2020-09-15T10:20"); + await apply(); + expect(requests).toHaveLength(2); + expect(interval()).toBe(previousInterval); + expect(container.textContent).toContain("applied-valid-report"); + await clear(); + expect(error()).toBeUndefined(); +}); + +test("new bounds never show a held report or a superseded request that settles late", async () => { + await mount(); + await respond(0, "preset-stale-marker"); + await enter("2020-09-15T10:20", "2020-09-15T10:21"); + await apply(); + await respond(1, "first-custom-marker"); + // Change only until, then only since: each bound independently owns a new request. + await enter("2020-09-15T10:20", "2020-09-15T10:22"); + await apply(); + expect(requests[2].url).toBe(`${apiBase}/api/usage?range=30d&surface=all&since=${since}&until=${until + 60_000}`); + expect(container.textContent).not.toContain("first-custom-marker"); + await enter("2020-09-15T10:21", "2020-09-15T10:22"); + await apply(); + expect(requests[3].url).toBe(`${apiBase}/api/usage?range=30d&surface=all&since=${since + 60_000}&until=${until + 60_000}`); + await respond(2, "late-superseded-marker"); + expect(container.textContent).not.toContain("late-superseded-marker"); + expect(container.textContent).not.toContain("preset-stale-marker"); + expect(container.textContent).toContain("Loading usage data"); + await respond(3, "latest-custom-marker"); + expect(container.textContent).toContain("latest-custom-marker"); + expect(sessionEntries()).toHaveLength(1); +}); + +test("Apply preserves machine key, surface and hub scope; choosing a preset clears custom", async () => { + await mount(true); + await respond(0, "machine-report"); + await click(preset("Grok")); + await respond(1, "machine-grok-report"); + await enter("2020-09-15T10:20", "2020-09-15T10:21"); + await apply(); + expect(requests[2].url).toBe(`${apiBase}/api/usage?range=30d&surface=grok&apiKeyId=machine%2Fkey+%2B+one&${boundsQuery}`); + await respond(2, "machine-custom-report"); + const hub = [...container.querySelectorAll(".usage-scope-control button")].find(button => button.textContent === "Hub-wide")!; + await click(hub); + expect(requests[3].url).toBe(`${apiBase}/api/usage?range=30d&surface=grok&${boundsQuery}`); + await respond(3, "hub-custom-report"); + await enter("2020-09-15T10:20", "2020-09-15T10:22"); + await apply(); + expect(requests[4].url).toBe(`${apiBase}/api/usage?range=30d&surface=grok&since=${since}&until=${until + 60_000}`); + await respond(4, "hub-new-custom-report"); + await click(preset("7d")); + expect(requests.at(-1)!.url).toBe(`${apiBase}/api/usage?range=7d&surface=grok`); + expect(interval()).toBeUndefined(); + expect(startInput().value).toBe(""); + expect(endInput().value).toBe(""); + expect(preset("7d").getAttribute("aria-pressed")).toBe("true"); + expect(hub.getAttribute("aria-pressed")).toBe("true"); +}); + +test("each preset clears custom, including the retained preset; 7d never replaces custom days with this week", async () => { + await mount(); + await respond(0, "preset-marker"); + for (const [index, name] of ["30d", "Available history", "7d"].entries()) { + await enter("2020-09-15T10:20", `2020-09-15T10:${21 + index}`); + const previousRequests = requests.length; + await apply(); + expect(requests).toHaveLength(previousRequests + 1); + await respond(requests.length - 1, "custom-marker"); + await click(preset(name)); + expect(preset(name).getAttribute("aria-pressed")).toBe("true"); + expect(interval()).toBeUndefined(); + expect(startInput().value).toBe(""); + expect(endInput().value).toBe(""); + } + await enter("2020-09-15T10:20", "2020-09-15T10:21"); + await apply(); + expect(requests.at(-1)!.url).toBe(`${apiBase}/api/usage?range=7d&surface=all&${boundsQuery}`); + await respond(requests.length - 1, "custom-from-7d-marker"); + expect(container.querySelector(".daybars")).toBeNull(); + expect(container.querySelectorAll(".heatmap-grid .heatmap-cell")).toHaveLength(7); + expect(preset("7d").getAttribute("aria-pressed")).toBe("false"); +}); diff --git a/gui/tests/usage-time-range.test.ts b/gui/tests/usage-time-range.test.ts new file mode 100644 index 0000000000..8ef289ef31 --- /dev/null +++ b/gui/tests/usage-time-range.test.ts @@ -0,0 +1,34 @@ +import { expect, test } from "bun:test"; +import { parseUsageTimeRange } from "../src/usage-time-range"; + +test("local minutes become inclusive epoch-ms bounds, including a single minute", () => { + expect(parseUsageTimeRange("2024-02-29T12:34", "2024-02-29T12:34")).toEqual({ + ok: true, + window: { + since: new Date(2024, 1, 29, 12, 34, 0, 0).getTime(), + until: new Date(2024, 1, 29, 12, 34, 59, 999).getTime(), + }, + }); +}); + +test("both local datetime bounds are required", () => { + for (const [start, end] of [["", ""], ["2024-02-29T12:34", ""], ["", "2024-02-29T12:34"]]) { + expect(parseUsageTimeRange(start, end)).toEqual({ ok: false, error: "required" }); + } +}); + +test("malformed, overflowing and negative dates are rejected rather than normalized", () => { + for (const invalid of [ + "not-a-date", "2023-02-29T12:34", "2024-02-30T12:34", "2024-13-01T12:34", + "2024-02-29T24:00", "2024-02-29T12:60", "1969-01-01T12:00", + "2024-02-29", "2024-02-29T12:34Z", "2024-02-29T12:34:30", "2024-02-29T12:34+09:00", + ]) { + expect(parseUsageTimeRange(invalid, "2024-03-01T12:34")).toEqual({ ok: false, error: "invalid" }); + expect(parseUsageTimeRange("2024-02-01T12:34", invalid)).toEqual({ ok: false, error: "invalid" }); + } +}); + +test("reversed dates are rejected before extending the end minute", () => { + expect(parseUsageTimeRange("2024-03-01T12:35", "2024-03-01T12:34")) + .toEqual({ ok: false, error: "reversed" }); +}); diff --git a/scripts/test-layout/layout.json b/scripts/test-layout/layout.json index ffb001a82d..d46f547867 100644 --- a/scripts/test-layout/layout.json +++ b/scripts/test-layout/layout.json @@ -1300,7 +1300,8 @@ "zz-ci-storage-policy-isolation.test.ts": "ci-workflows", "zz-pr-coderabbit-readiness-revalidation.test.ts": "ci-workflows", "cli-models-price.test.ts": "cli", - "model-costs-management-api.test.ts": "server" + "model-costs-management-api.test.ts": "server", + "usage-time-range.test.ts": "usage" }, "migrated": [ "adapters", diff --git a/skills/ocx/references/01_management_surface.md b/skills/ocx/references/01_management_surface.md index 485ed745ba..512aa3a7e2 100644 --- a/skills/ocx/references/01_management_surface.md +++ b/skills/ocx/references/01_management_surface.md @@ -132,6 +132,8 @@ Token and estimated-cost report over a time range. | Flag | Value | Meaning | |---|---|---| | `--range` | string | today | 1d | 7d | 30d | all | +| `--since` | string | Inclusive start: epoch milliseconds or full ISO datetime with timezone; requires --until and overrides --range. | +| `--until` | string | Inclusive end: epoch milliseconds or full ISO datetime with timezone; requires --since. | | `--provider` | string | Restrict to one provider. | | `--model` | string | Restrict to one model id. | | `--json` | boolean | Emit the usage report as JSON. | diff --git a/src/cli/capabilities.ts b/src/cli/capabilities.ts index e34b8ec79b..86aa5438df 100644 --- a/src/cli/capabilities.ts +++ b/src/cli/capabilities.ts @@ -225,6 +225,8 @@ export const CAPABILITIES: readonly Capability[] = [ routes: [{ method: "GET", path: "/api/usage" }], flags: [ { name: "--range", value: "string", summary: "today | 1d | 7d | 30d | all" }, + { name: "--since", value: "string", summary: "Inclusive start: epoch milliseconds or full ISO datetime with timezone; requires --until and overrides --range." }, + { name: "--until", value: "string", summary: "Inclusive end: epoch milliseconds or full ISO datetime with timezone; requires --since." }, { name: "--provider", value: "string", summary: "Restrict to one provider." }, { name: "--model", value: "string", summary: "Restrict to one model id." }, { name: "--json", value: "boolean", summary: "Emit the usage report as JSON." }, diff --git a/src/cli/observe.ts b/src/cli/observe.ts index 46e264d2a8..10a77254d0 100644 --- a/src/cli/observe.ts +++ b/src/cli/observe.ts @@ -12,6 +12,8 @@ import { } from "./runtime-api"; import { formatUsageReport } from "./usage-report"; import { USAGE_RANGES, USAGE_SURFACES } from "../usage/summary"; +import { parseUsageTimeWindow, type UsageTimeWindow } from "../usage/time-range"; +import { redactSecretString } from "../lib/redact"; const USAGE = `Usage: ocx observe logs [--provider ] [--model ] [--status ] @@ -20,6 +22,7 @@ const USAGE = `Usage: ocx logs rebuild-index ocx logs index-status ocx observe usage [--range ] [--surface ] + [--since ] [--until ] [--provider ] [--model ] [--json] ocx observe storage [codex-logs [status|protect|unprotect|repair|compact] [--mode ]] [--json] ocx observe memory [--json] @@ -146,6 +149,14 @@ async function usage(argv: string[], deps: RuntimeApiDeps): Promise { const surface = takeOption(args, "--surface") ?? "all"; const provider = takeOption(args, "--provider"); const model = takeOption(args, "--model"); + const since = takeOption(args, "--since"); + const until = takeOption(args, "--until"); + let window: UsageTimeWindow | undefined; + try { + window = parseUsageTimeWindow(since, until); + } catch (error) { + throw new CliUsageError(error instanceof Error ? error.message : "invalid usage time window", USAGE); + } // `1d` is accepted here as well as server-side so the CLI does not reject an // alias the API would have understood. const ranges = [...USAGE_RANGES, "1d"]; @@ -153,8 +164,8 @@ async function usage(argv: string[], deps: RuntimeApiDeps): Promise { if (!USAGE_SURFACES.includes(surface as (typeof USAGE_SURFACES)[number])) { throw new CliUsageError(`--surface must be one of ${USAGE_SURFACES.join(", ")}`, USAGE); } - rejectArgs(args, USAGE); - const result = await runtimeRequest(`/api/usage${query({ range, surface, provider, model })}`, {}, deps); + rejectArgs(args.map(redactSecretString), USAGE); + const result = await runtimeRequest(`/api/usage${query({ range, surface, provider, model, since: window?.since, until: window?.until })}`, {}, deps); // Built only when it will be printed: JavaScript evaluates arguments before // the call, so passing formatUsageReport(...) inline would run the human // renderer during --json and let its assumptions affect a path that is meant diff --git a/src/cli/usage-report.ts b/src/cli/usage-report.ts index e9f92f442d..6b684277c0 100644 --- a/src/cli/usage-report.ts +++ b/src/cli/usage-report.ts @@ -24,6 +24,8 @@ interface UsageReportInput { range?: string; surface?: string; since?: number | null; + until?: number; + customWindow?: boolean; summary?: { requests?: number; totalTokens?: number; @@ -90,7 +92,10 @@ function table(header: string[], rows: string[][]): string[] { } function describeScope(data: UsageReportInput): string { - const parts = [`Usage — ${data.range ?? "?"}`]; + const interval = data.customWindow && typeof data.since === "number" && typeof data.until === "number" + ? `custom ${new Date(data.since).toISOString()} to ${new Date(data.until).toISOString()} (inclusive)` + : data.range ?? "?"; + const parts = [`Usage — ${interval}`]; if (data.surface && data.surface !== "all") parts.push(`surface=${data.surface}`); if (data.filter?.provider) parts.push(`provider=${data.filter.provider}`); if (data.filter?.model) parts.push(`model=${data.filter.model}`); diff --git a/src/server/management/logs-usage-routes.ts b/src/server/management/logs-usage-routes.ts index ecbd6f655d..0177e56776 100644 --- a/src/server/management/logs-usage-routes.ts +++ b/src/server/management/logs-usage-routes.ts @@ -51,6 +51,7 @@ import { usageLogRevisionKey, } from "../../usage/log"; import { getUsageDebugLogEntries } from "../../usage/debug"; +import { parseUsageTimeWindow, type UsageTimeWindow } from "../../usage/time-range"; import { USAGE_RANGES, USAGE_SURFACES, parseRange, parseUsageSurface, rangeWindow, type UsageRange, type UsageSummary, type UsageSurface } from "../../usage/summary"; import { stripCodexRuntimeProviderFields } from "../../codex/auth-context"; import { getProviderRegistryEntry } from "../../providers/registry"; @@ -177,6 +178,12 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise typeof value === "string" && value.trim() !== ""); const now = Date.now(); try { @@ -211,7 +218,7 @@ export async function handleLogsUsageRoutes(ctx: ManagementContext): Promise { +}, window?: UsageTimeWindow): Promise { + const fixedWindow = window ? Object.freeze({ ...window }) : undefined; const normalizedFilter = { provider: normalizeFilterValue(filter.provider), model: normalizeFilterValue(filter.model), @@ -273,11 +275,13 @@ export async function getFilteredUsageAggregate(filter: { normalizedFilter.provider, normalizedFilter.model, normalizedFilter.apiKeyId, + fixedWindow?.since ?? null, + fixedWindow?.until ?? null, ]); const existing = filteredFlights.get(key); if (existing) return existing; - const flight = refreshFilteredAggregate(key, normalizedFilter); + const flight = refreshFilteredAggregate(key, normalizedFilter, fixedWindow); filteredFlights.set(key, flight); try { return await flight; @@ -316,12 +320,13 @@ function publishFilteredAggregate( async function rebuildFilteredAggregate( key: string, filter: NormalizedUsageFilter, + window?: UsageTimeWindow, ): Promise { let lastError: unknown; for (let attempt = 0; attempt < MAX_REBUILD_ATTEMPTS; attempt += 1) { const overlayVersion = userCostOverlayVersion(); const timeZone = currentTimeZone(); - const accumulator = createUsageSummaryAccumulator({ filter, mode: "row-unique" }); + const accumulator = createUsageSummaryAccumulator({ filter, mode: "row-unique", window }); try { const scan = await scanUsageLedgerCooperatively({ onEntry: entry => accumulator.add(entry) }); if (scan.oversizedRows > 0) throw new Error("usage ledger contains an oversized row"); @@ -345,6 +350,7 @@ async function appendFilteredAggregate( key: string, state: RetainedUsageAggregate, filter: NormalizedUsageFilter, + window?: UsageTimeWindow, ): Promise { pinnedAggregates.add(state); let rebuildAfterUnpin = false; @@ -384,28 +390,29 @@ async function appendFilteredAggregate( pinnedAggregates.delete(state); trimRetainedFilteredAggregates(); } - if (rebuildAfterUnpin) return rebuildFilteredAggregate(key, filter); + if (rebuildAfterUnpin) return rebuildFilteredAggregate(key, filter, window); throw new Error("filtered usage append did not settle"); } async function refreshFilteredAggregate( key: string, filter: NormalizedUsageFilter, + window?: UsageTimeWindow, ): Promise { const state = retainedFilteredAggregates.get(key); - if (!state) return rebuildFilteredAggregate(key, filter); + if (!state) return rebuildFilteredAggregate(key, filter, window); const observed = currentUsageLogRevision(); const overlayVersion = userCostOverlayVersion(); const timeZone = currentTimeZone(); if (requiresRebuild(state, observed, overlayVersion, timeZone)) { retainedFilteredAggregates.delete(key); - return rebuildFilteredAggregate(key, filter); + return rebuildFilteredAggregate(key, filter, window); } if (state.revisionKey === usageLogRevisionKey(observed)) { state.retainedAt = Date.now(); return resultFrom(state, "unchanged"); } - return appendFilteredAggregate(key, state, filter); + return appendFilteredAggregate(key, state, filter, window); } export function usageAggregateRetainedStats(): UsageAggregateRetainedStats { diff --git a/src/usage/summary.ts b/src/usage/summary.ts index 6390db38c1..d7e678ab4f 100644 --- a/src/usage/summary.ts +++ b/src/usage/summary.ts @@ -1,6 +1,7 @@ import { baseProviderLabel } from "../providers/label"; import { canonicalAntigravityUsageModel } from "../providers/antigravity-models"; import { usageDisplayTotalTokens } from "./totals"; +import type { UsageTimeWindow } from "./time-range"; import { isUnresolvedRequestedModel, usageModelPriceOptions } from "./model-identity"; import { isCodexUsageAccountLogLabel, type PersistedUsageEntry, type UsageStatus } from "./log"; import { type AttemptCostEstimate, type CostEstimate, estimateAttemptCost, estimateRequestCost, serviceTierContext, type ServiceTierContext } from "./cost"; @@ -145,6 +146,8 @@ export interface UsageSummary { range: UsageRange; surface: UsageSurface; since: number | null; + customWindow?: true; + until?: number; generatedAt: number; summary: UsageSummaryTotals; days: UsageDay[]; @@ -297,6 +300,17 @@ function dayCountForAllRange(oldest: number | null, now: number): number { return Math.min(MAX_USAGE_DAY_BUCKETS, Math.max(1, days)); } +function customWindowDates(window: UsageTimeWindow): string[] { + const start = startOfLocalDay(window.since); + const date = new Date(startOfLocalDay(window.until)); + const dates: string[] = []; + while (date.getTime() >= start && dates.length < MAX_USAGE_DAY_BUCKETS) { + dates.push(localDateKey(date.getTime())); + date.setDate(date.getDate() - 1); + } + return dates.reverse(); +} + function blankTotals(): UsageSummaryTotals { return { requests: 0, @@ -1015,6 +1029,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { private readonly requestIds: Map | null; private readonly filter: NormalizedUsageFilter | null; private readonly mode: UsageAccumulatorMode; + private readonly window: UsageTimeWindow | undefined; private nextRequestId = 0; private nextOrdinal = 0; private snapshotStart: number | null = null; @@ -1025,6 +1040,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { constructor(options?: { filter?: { provider?: string | null; model?: string | null; apiKeyId?: string | null }; mode?: UsageAccumulatorMode; + window?: UsageTimeWindow; }) { const provider = normalizeFilterValue(options?.filter?.provider); const model = normalizeFilterValue(options?.filter?.model); @@ -1033,6 +1049,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { ? null : { provider, model, apiKeyId }; this.mode = options?.mode ?? "exact"; + this.window = options?.window ? Object.freeze({ ...options.window }) : undefined; this.requestIds = this.mode === "exact" ? new Map() : null; } @@ -1048,6 +1065,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { const cloned = new StreamingUsageSummaryAccumulator({ ...(this.filter ? { filter: this.filter } : {}), mode: this.mode, + window: this.window, }); cloned.nextRequestId = this.nextRequestId; cloned.nextOrdinal = this.nextOrdinal; @@ -1276,6 +1294,8 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { ? sourceEntry.timestamp : Math.max(this.snapshotEnd, sourceEntry.timestamp); } + if (this.window && (!Number.isFinite(sourceEntry.timestamp) + || sourceEntry.timestamp < this.window.since || sourceEntry.timestamp > this.window.until)) return; const projected = this.filter ? projectedEntryForFilter(sourceEntry, this.filter) : { entry: sourceEntry, comboOverlap: false }; if (!projected) return; this.comboOverlap ||= projected.comboOverlap; @@ -1340,7 +1360,9 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { now: number, surface: UsageSurface = "all", ): UsageSummary & { filter?: UsageFilterEcho } { - const { since, days: fixedDays } = rangeWindow(range, now); + const preset = rangeWindow(range, now); + const since = this.window?.since ?? preset.since; + const fixedDays = preset.days; const totals = blankTotals(); const models = new Map(); const providers = new Map(); @@ -1351,7 +1373,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { for (const partition of this.partitions.values()) { if (!usageSurfaceMatches(partition.surface, surface)) continue; - if (since !== null && partition.dayStart < since) continue; + if (!this.window && since !== null && partition.dayStart < since) continue; mergeTotals(totals, partition.totals); mergeModelMaps(models, partition.models); if (partition.providers) mergeModelMaps(providers, partition.providers); @@ -1377,27 +1399,34 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { } finalizeCoverage(totals); - const dayCount = range === "all" ? dayCountForAllRange(oldestTimestamp, now) : fixedDays; - const startOfToday = startOfLocalDay(now); + const customDates = this.window ? new Set(customWindowDates(this.window)) : null; + const dayCount = customDates?.size ?? (range === "all" ? dayCountForAllRange(oldestTimestamp, now) : fixedDays); + const startOfToday = startOfLocalDay(this.window?.until ?? now); const firstVisibleDay = new Date(startOfToday); firstVisibleDay.setDate(firstVisibleDay.getDate() - dayCount + 1); const firstVisibleDate = localDateKey(firstVisibleDay.getTime()); const lastVisibleDate = localDateKey(startOfToday); - for (let offset = dayCount - 1; offset >= 0; offset--) { + const visibleDates = customDates ?? new Set(); + for (let offset = dayCount - 1; !customDates && offset >= 0; offset--) { const date = new Date(startOfToday); date.setDate(date.getDate() - offset); - const key = localDateKey(date.getTime()); + visibleDates.add(localDateKey(date.getTime())); + } + for (const key of visibleDates) { if (!dayAccumulators.has(key)) { dayAccumulators.set(key, { totals: blankTotals(), models: new Map(), modelOverlaps: [] }); } } - const days = [...dayAccumulators] + const visibleDays = customDates + ? [...customDates].map(date => [date, dayAccumulators.get(date)!] as const) + : [...dayAccumulators] // All-history totals, models, providers, and accounts still cover every // retained row. Only the chart buckets are bounded so one malformed or // ancient timestamp cannot synthesize an enormous JSON response. .filter(([date]) => range !== "all" || (date >= firstVisibleDate && date <= lastVisibleDate)) - .sort(([a], [b]) => a.localeCompare(b)) + .sort(([a], [b]) => a.localeCompare(b)); + const days = visibleDays .map(([date, day]): UsageDay => ({ date, requests: day.totals.requests, @@ -1412,6 +1441,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { range, surface, since, + ...(this.window ? { customWindow: true as const, until: this.window.until } : {}), generatedAt: now, summary: totals, days, @@ -1449,6 +1479,7 @@ class StreamingUsageSummaryAccumulator implements UsageSummaryAccumulator { export function createUsageSummaryAccumulator(options?: { filter?: { provider?: string | null; model?: string | null; apiKeyId?: string | null }; mode?: UsageAccumulatorMode; + window?: UsageTimeWindow; }): UsageSummaryAccumulator { return new StreamingUsageSummaryAccumulator(options); } @@ -1501,7 +1532,11 @@ export function projectUsageSummary( const model = normalizeFilterValue(filter.model); const apiKeyId = normalizeExactFilterValue(filter.apiKeyId); if (provider === null && model === null && apiKeyId === null) return summary; - const accumulator = createUsageSummaryAccumulator({ filter: { provider, model, apiKeyId } }); + const accumulator = createUsageSummaryAccumulator({ + filter: { provider, model, apiKeyId }, + ...(summary.customWindow && summary.since !== null && summary.until !== undefined + ? { window: { since: summary.since, until: summary.until } } : {}), + }); for (const entry of entries ?? []) accumulator.add(entry); const projected = accumulator.summarize(summary.range, summary.generatedAt, summary.surface); return { diff --git a/src/usage/time-range.ts b/src/usage/time-range.ts new file mode 100644 index 0000000000..01b1beec83 --- /dev/null +++ b/src/usage/time-range.ts @@ -0,0 +1,48 @@ +/** Inclusive epoch-millisecond bounds, independent of the selected preset. */ +export interface UsageTimeWindow { + readonly since: number; + readonly until: number; +} + +const MAX_DATE_MS = 8_640_000_000_000_000; +const ISO_DATETIME = /^(\d{4}|\+\d{6})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d{1,3})?(Z|([+-])(\d{2}):(\d{2}))$/; + +function parseTimestamp(input: string | number, name: "since" | "until"): number { + const invalid = (): never => { + throw new Error(`${name} must be nonnegative integer epoch milliseconds or a valid full ISO datetime with timezone`); + }; + let timestamp: number; + if (typeof input === "number") timestamp = input; + else if (/^\d+$/.test(input)) timestamp = Number(input); + else { + const parts = ISO_DATETIME.exec(input); + if (!parts) return invalid(); + const year = Number(parts[1]); + const month = Number(parts[2]); + const day = Number(parts[3]); + const leapYear = year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0); + const monthDays = [31, leapYear ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; + // Date.parse normalizes some impossible dates (e.g. February 30). + // Validate the written calendar fields before applying its timezone offset. + if (month < 1 || month > 12 || day < 1 || day > monthDays[month - 1]! + || Number(parts[4]) > 23 || Number(parts[5]) > 59 || Number(parts[6]) > 59 + || (parts[7] !== "Z" && (Number(parts[9]) > 23 || Number(parts[10]) > 59))) { + return invalid(); + } + timestamp = Date.parse(input); + } + if (!Number.isSafeInteger(timestamp) || timestamp < 0 || timestamp > MAX_DATE_MS) return invalid(); + return timestamp; +} + +/** No bounds selects the preset; supplying either bound requires both. */ +export function parseUsageTimeWindow( + since: string | number | null | undefined, + until: string | number | null | undefined, +): UsageTimeWindow | undefined { + if (since == null && until == null) return undefined; + if (since == null || until == null) throw new Error("since and until must be supplied together"); + const window = { since: parseTimestamp(since, "since"), until: parseTimestamp(until, "until") }; + if (window.since > window.until) throw new Error("since must be less than or equal to until"); + return Object.freeze(window); +} diff --git a/structure/05_gui-and-management-api.md b/structure/05_gui-and-management-api.md index a151a34d42..4a697671a4 100644 --- a/structure/05_gui-and-management-api.md +++ b/structure/05_gui-and-management-api.md @@ -357,6 +357,14 @@ keeps the saved state and renders fixed `ocx sync` guidance without server/accou ## Usage accounting +Custom usage windows are immutable bounds on the streaming accumulator, applied to each +ledger entry before attribution and daily aggregation. The filtered aggregate cache includes +both inclusive millisecond bounds in its identity and retains the existing ledger revision, +overlay-version and timezone checks. Preset warming never consumes custom summaries. +The response retains its preset range discriminator for compatibility and explicitly marks +`customWindow`, `since`, and `until`; the chart uses the window's local calendar days with +the existing 366-day cap. GUI custom reports bypass the held preset/session cache. + Account quota discovery is capability-based. Cheap OAuth and provider-key lists include `quotaMode` (`probe`, `passive`, or `unsupported`) without contacting upstream quota APIs. `GET /api/oauth/accounts?provider=..."a=1` and diff --git a/tests/cli/cli-usage-report.test.ts b/tests/cli/cli-usage-report.test.ts index b20112ee12..d1fdd7b4b5 100644 --- a/tests/cli/cli-usage-report.test.ts +++ b/tests/cli/cli-usage-report.test.ts @@ -136,6 +136,64 @@ describe("formatUsageReport", () => { }); describe("ocx usage command", () => { + test("duplicate, inline and stray custom-bound arguments do not echo credential-shaped values", async () => { + const secret = "sk-" + "a".repeat(40); + const errors: string[] = []; + const errorSpy = spyOn(console, "error").mockImplementation((...args: unknown[]) => { errors.push(args.map(String).join(" ")); }); + try { + for (const extra of [["--since", secret], [`--since=${secret}`], [secret]]) { + const result = await run(["usage", "--since", "0", "--until", "1", ...extra], payload()); + expect(result.code).toBe(2); + expect(result.urls).toEqual([]); + } + expect(errors.join("\n")).not.toContain(secret); + expect(errors.join("\n")).toContain("Unexpected argument(s)"); + } finally { errorSpy.mockRestore(); } + }); + + test("normalizes custom ISO bounds and preserves the selected preset and filters", async () => { + const body = payload({ customWindow: true, since: 1709164800123, until: 1709164800123 }); + const { code, urls, out } = await run([ + "usage", "--range", "7d", "--surface", "codex", "--provider", "openai", "--model", "gpt-5.5", + "--since", "2024-02-29T09:00:00.123+09:00", "--until", "1709164800123", + ], body); + expect(code).toBe(0); + expect(urls).toHaveLength(1); + const query = new URL(urls[0]!).searchParams; + expect(Object.fromEntries(query)).toEqual({ + range: "7d", surface: "codex", provider: "openai", model: "gpt-5.5", + since: "1709164800123", until: "1709164800123", + }); + expect(out.split("\n")[0]).toContain("custom 2024-02-29T00:00:00.123Z to 2024-02-29T00:00:00.123Z (inclusive)"); + expect((await run(["usage", "--since", "0", "--until", "0", "--json"], body)).out) + .toBe(JSON.stringify(body, null, 2)); + }); + + test("rejects malformed or unpaired windows as usage errors without an API request", async () => { + const errors: string[] = []; + const errorSpy = spyOn(console, "error").mockImplementation((...args: unknown[]) => { + errors.push(args.map(String).join(" ")); + }); + try { + for (const args of [ + ["--since", "0"], ["--until", "0"], ["--since", "2", "--until", "1"], + ["--since", "-1", "--until", "0"], ["--since", "1.5", "--until", "2"], + ["--since", "0", "--until", "8640000000000001"], + ["--since", "0", "--until", "2026-02-30T00:00:00Z"], + ["--since", "0", "--until", "2026-09-01T00:00:00"], + ["--since", "0", "--until", "2026-09-01T00:00:00.0001Z"], + ]) { + const result = await run(["usage", ...args], payload()); + expect(result.code).toBe(2); + expect(result.urls).toEqual([]); + } + expect(errors.join("\n")).toContain("since and until must be supplied together"); + expect(errors.join("\n")).toContain("timezone"); + } finally { + errorSpy.mockRestore(); + } + }); + test("forwards range and provider to the API", async () => { const { code, urls } = await run(["usage", "--range", "today", "--provider", "xai"], payload()); expect(code).toBe(0); diff --git a/tests/fixtures/test-layout-expected.json b/tests/fixtures/test-layout-expected.json index 496d51ea31..05ce7e87ff 100644 --- a/tests/fixtures/test-layout-expected.json +++ b/tests/fixtures/test-layout-expected.json @@ -1135,5 +1135,6 @@ "zz-ci-storage-policy-isolation.test.ts": "ci-workflows", "zz-pr-coderabbit-readiness-revalidation.test.ts": "ci-workflows", "cli-models-price.test.ts": "cli", - "model-costs-management-api.test.ts": "server" + "model-costs-management-api.test.ts": "server", + "usage-time-range.test.ts": "usage" } diff --git a/tests/server/api-usage.test.ts b/tests/server/api-usage.test.ts index a86836a0de..fa5c0ee2e2 100644 --- a/tests/server/api-usage.test.ts +++ b/tests/server/api-usage.test.ts @@ -109,6 +109,111 @@ afterEach(() => { }); describe("GET /api/usage", () => { + test("custom bounds override presets while preserving surface, filters and accounts", async () => { + const since = new Date(2026, 1, 10, 12).getTime(); + const until = since + 3_600_000; + const rows = [ + { timestamp: since - 1, apiKeyId: "Key-A" }, + { timestamp: since, apiKeyId: "Key-A" }, + { timestamp: until, apiKeyId: "key-a" }, + { timestamp: since + 1, apiKeyId: "Key-A", surface: "claude" }, + { timestamp: until + 1, apiKeyId: "Key-A" }, + ].map((row, index) => ({ + requestId: `custom-${index}`, provider: "openai", model: "gpt-5.5", accountLogLabel: "main", + status: 200, durationMs: 1, usageStatus: "reported", usage: { inputTokens: 10, outputTokens: 5 }, + totalTokens: 15, ...row, + })); + writeFileSync(join(testDir, "usage.jsonl"), rows.map(row => JSON.stringify(row)).join("\n") + "\n"); + const server = startServer(0); + try { + const preset = await (await fetch(new URL("/api/usage?range=all", server.url))).json(); + const params = new URLSearchParams({ range: "today", since: new Date(since).toISOString(), until: String(until), surface: "codex" }); + const before = Date.now(); + const response = await fetch(new URL(`/api/usage?${params}`, server.url)); + expect(response.status).toBe(200); + const custom = await response.json(); + expect(custom).toMatchObject({ range: "today", surface: "codex", customWindow: true, since, until }); + expect(custom.generatedAt).toBeGreaterThanOrEqual(before); + expect(custom.generatedAt).toBeLessThanOrEqual(Date.now()); + expect(custom.summary.requests).toBe(2); + expect(custom.days).toHaveLength(1); + expect(custom.days[0].requests).toBe(2); + expect(custom.accounts[0]).toMatchObject({ accountLogLabel: "main", requests: 2 }); + expect(custom.filter).toBeUndefined(); + expect(custom.snapshotWindowStart).toBe(since - 1); + expect(custom.snapshotWindowEnd).toBe(until + 1); + params.set("apiKeyId", "Key-A"); + const byKey = await (await fetch(new URL(`/api/usage?${params}`, server.url))).json(); + expect(byKey.summary.requests).toBe(1); + expect(byKey.accounts[0].requests).toBe(1); + expect(byKey.filter).toMatchObject({ apiKeyId: "Key-A", matched: true }); + params.set("provider", "OpenAI"); + params.set("model", "GPT-5.5"); + const combined = await (await fetch(new URL(`/api/usage?${params}`, server.url))).json(); + expect(combined.filter).toMatchObject({ provider: "openai", model: "gpt-5.5", apiKeyId: "Key-A", matched: true }); + expect(combined.summary.requests).toBe(1); + expect(combined.accounts).toEqual([]); + params.set("since", String(until)); + const noMatch = await (await fetch(new URL(`/api/usage?${params}`, server.url))).json(); + expect(noMatch.summary.requests).toBe(0); + expect(noMatch.filter.matched).toBe(false); + const after = await (await fetch(new URL("/api/usage?range=all", server.url))).json(); + expect(after.summary).toEqual(preset.summary); + expect(after.summary.requests).toBe(5); + expect(after.customWindow).toBeUndefined(); + expect(after.until).toBeUndefined(); + } finally { + await server.stop(true); + } + }); + + test("rejects invalid custom bounds with 400 before scanning", async () => { + const scanSpy = spyOn(usageLedgerScannerModule, "scanUsageLedgerCooperatively"); + const server = startServer(0); + try { + for (const query of [ + "since=0", "until=0", "since=&until=1", "since=2&until=1", "since=-1&until=1", + "since=0&until=8640000000000001", "since=0&until=9007199254740992", + "since=0&until=2026-02-30T12:00:00Z", "since=0&until=2026-09-01T12:00:00", + "since=0&until=2026-09-01T12:00:00.0001Z", + ]) { + const response = await fetch(new URL(`/api/usage?${query}`, server.url)); + expect(response.status).toBe(400); + expect((await response.json()).error).toBeTruthy(); + } + expect(scanSpy).not.toHaveBeenCalled(); + } finally { + scanSpy.mockRestore(); + await server.stop(true); + } + }); + + test("empty custom history and read failures retain the requested interval", async () => { + const server = startServer(0); + const url = new URL("/api/usage?range=today&since=0&until=0", server.url); + try { + const empty = await (await fetch(url)).json(); + expect(empty).toMatchObject({ customWindow: true, since: 0, until: 0, summary: { requests: 0 } }); + expect(empty.days).toHaveLength(1); + expect(empty.error).toBeUndefined(); + const scanSpy = spyOn(usageLedgerScannerModule, "scanUsageLedgerCooperatively") + .mockRejectedValue(new Error("fixture scan failure")); + try { + // A distinct key forces a fresh custom scan. + url.searchParams.set("until", "1"); + const response = await fetch(url); + expect(response.status).toBe(200); // existing Usage UI reads the error field + expect(await response.json()).toMatchObject({ + range: "today", customWindow: true, since: 0, until: 1, error: "read_failed", + }); + } finally { + scanSpy.mockRestore(); + } + } finally { + await server.stop(true); + } + }); + test("concurrent cold requests share one base-ledger scan", async () => { writeFixture(Date.now()); const originalScan = usageLedgerScannerModule.scanUsageLedgerCooperatively; diff --git a/tests/usage/usage-aggregate-cache.test.ts b/tests/usage/usage-aggregate-cache.test.ts index c739d0546d..3efb5615e4 100644 --- a/tests/usage/usage-aggregate-cache.test.ts +++ b/tests/usage/usage-aggregate-cache.test.ts @@ -72,6 +72,55 @@ afterEach(() => { }); describe("retained usage aggregate cache", () => { + test("custom cache keys isolate both endpoints and never poison preset aggregates", async () => { + const path = join(testDir, "usage.jsonl"); + const rows = [NOW - 2_000, NOW - 1_000, NOW].map((timestamp, index) => ({ ...entry(String(index)), timestamp })); + writeFileSync(path, rows.map(row => JSON.stringify(row)).join("\n") + "\n"); + const base = await getUsageAggregate(); + const firstWindow = { since: NOW - 2_000, until: NOW - 1_000 }; + const first = await getFilteredUsageAggregate({}, firstWindow); + const same = await getFilteredUsageAggregate({}, { ...firstWindow }); + const differentStart = await getFilteredUsageAggregate({}, { since: NOW - 1_000, until: NOW - 1_000 }); + const differentEnd = await getFilteredUsageAggregate({}, { since: NOW - 2_000, until: NOW }); + expect(same.accumulator).toBe(first.accumulator); + expect(same.update).toBe("unchanged"); + expect(requests(first)).toBe(2); + expect(requests(differentStart)).toBe(1); + expect(requests(differentEnd)).toBe(3); + expect((await getUsageAggregate()).accumulator).toBe(base.accumulator); + expect(requests(base)).toBe(3); + expect(base.accumulator.summarize("all", NOW).customWindow).toBeUndefined(); + for (let index = 1; index <= 7; index++) { + await getFilteredUsageAggregate({}, { since: NOW, until: NOW + index }); + } + expect(usageAggregateRetainedStats().count).toBe(5); // base plus four filtered windows + }); + + test("custom incremental clones filter appended rows and rebuild with changed prices", async () => { + const path = join(testDir, "usage.jsonl"); + const window = { since: NOW - 1_000, until: NOW }; + writeFileSync(path, line("one")); + const original = await getFilteredUsageAggregate({}, window); + appendFileSync(path, [ + { ...entry("inside"), timestamp: NOW }, + { ...entry("outside"), timestamp: NOW + 1 }, + ].map(row => JSON.stringify(row)).join("\n") + "\n"); + const appended = await getFilteredUsageAggregate({}, window); + expect(appended.update).toBe("append"); + expect(requests(original)).toBe(1); + expect(requests(appended)).toBe(2); + expect(appended.accumulator.snapshotWindow.end).toBe(NOW + 1); + refreshUserCostOverlays({ providers: { openai: { modelCosts: { + "gpt-5.5": { input: 1, output: 2, cacheRead: 0.1, cacheWrite: 0.2 }, + } } } } as unknown as OcxConfig); + const rebuilt = await getFilteredUsageAggregate({}, window); + expect(rebuilt.update).toBe("rebuild"); + expect(rebuilt.accumulator.summarize("today", NOW)).toMatchObject({ + customWindow: true, ...window, summary: { requests: 2 }, + }); + expect(rebuilt.accumulator.summarize("all", NOW).summary.estimatedCostUsd).toBeCloseTo(0.000006, 10); + }); + test("append and rebuild preserve unresolved attribution and restricted pricing without ledger changes", async () => { const path = join(testDir, "usage.jsonl"); writeFileSync(path, line("ordinary")); diff --git a/tests/usage/usage-summary.test.ts b/tests/usage/usage-summary.test.ts index 6e26fb2e66..36d83c779f 100644 --- a/tests/usage/usage-summary.test.ts +++ b/tests/usage/usage-summary.test.ts @@ -16,6 +16,102 @@ import { isUnresolvedRequestedModel } from "../../src/usage/model-identity"; const FIXED_NOW = Date.UTC(2026, 5, 28, 12, 0, 0); +describe("custom usage windows", () => { + const since = new Date(2026, 1, 10, 12, 0, 0, 123).getTime(); + const until = since + 3_600_000; + + test("includes both intraday endpoints before attribution and retains whole-log snapshot", () => { + for (const mode of ["exact", "row-unique"] as const) { + const accumulator = createUsageSummaryAccumulator({ mode, window: { since, until } }); + for (const ts of [since - 1, since, until, until + 1]) { + accumulator.add(entry({ ts, usageStatus: "reported", usage: { inputTokens: 10, outputTokens: 5 }, accountLogLabel: "main" })); + } + const result = accumulator.summarize("today", FIXED_NOW, "codex"); + expect(result).toMatchObject({ range: "today", customWindow: true, since, until, generatedAt: FIXED_NOW }); + expect(result.summary).toMatchObject({ requests: 2, inputTokens: 20, outputTokens: 10 }); + expect(result.days).toHaveLength(1); + expect(result.days[0]).toMatchObject({ date: "2026-02-10", requests: 2 }); + expect(result.accounts[0]).toMatchObject({ accountLogLabel: "main", requests: 2 }); + expect(result.filter).toBeUndefined(); + expect(accumulator.snapshotWindow).toEqual({ start: since - 1, end: until + 1 }); + } + }); + + test("same-instant windows survive caller mutation and independent incremental clones", () => { + const window = { since, until: since }; + const accumulator = createUsageSummaryAccumulator({ window, mode: "row-unique" }); + window.since = 0; + window.until = FIXED_NOW; + accumulator.add(entry({ ts: since })); + const clone = accumulator.clone(); + clone.add(entry({ ts: since, requestId: "second" })); + clone.add(entry({ ts: since + 1 })); + expect(accumulator.summarize("all", FIXED_NOW).summary.requests).toBe(1); + expect(clone.summarize("7d", FIXED_NOW)).toMatchObject({ + customWindow: true, since, until: since, summary: { requests: 2 }, + }); + expect(accumulator.snapshotWindow.end).toBe(since); + expect(clone.snapshotWindow.end).toBe(since + 1); + }); + + test("empty grids use exact local calendar days across DST and include endpoint midnight", () => { + for (const [year, month, day, expected] of [ + [2026, 2, 7, ["2026-03-07", "2026-03-08", "2026-03-09"]], + [2026, 9, 31, ["2026-10-31", "2026-11-01", "2026-11-02"]], + ] as const) { + const window = { + since: new Date(year, month, day, 23, 59).getTime(), + until: new Date(year, month, day + 2, 0, 0).getTime(), + }; + const accumulator = createUsageSummaryAccumulator({ window }); + const result = accumulator.summarize("30d", FIXED_NOW); + expect(result.days.map(row => row.date)).toEqual([...expected]); + expect(result.days.every(row => row.requests === 0)).toBe(true); + expect(result.summary.requests).toBe(0); + expect(result.since).toBe(window.since); + expect(result.until).toBe(window.until); + expect(accumulator.snapshotWindow).toEqual({ start: null, end: null }); + } + }); + + test("caps only the chart at 366 calendar days ending at until", () => { + const window = { since: new Date(2020, 0, 1, 12).getTime(), until: new Date(2026, 0, 1, 12).getTime() }; + const accumulator = createUsageSummaryAccumulator({ window }); + accumulator.add(entry({ ts: window.since })); + accumulator.add(entry({ ts: window.until })); + const result = accumulator.summarize("today", FIXED_NOW); + expect(result.summary.requests).toBe(2); + expect(result.days).toHaveLength(366); + expect(result.days[0]?.date).toBe("2025-01-01"); + expect(result.days.at(-1)?.date).toBe("2026-01-01"); + expect(result.days.reduce((sum, row) => sum + row.requests, 0)).toBe(1); + }); + + test("custom calendar order remains chronological across expanded ISO years", () => { + const accumulator = createUsageSummaryAccumulator({ window: { + since: new Date(9999, 11, 31, 12).getTime(), until: new Date(10000, 0, 1, 12).getTime(), + } }); + expect(accumulator.summarize("all", FIXED_NOW).days.map(day => day.date)) + .toEqual(["9999-12-31", "10000-01-01"]); + }); + + test("window filtering preserves preset cost attribution for the same retained rows", () => { + const rows = [since - 1, since, until, until + 1].map(ts => entry({ + ts, provider: "anthropic", model: "claude-3-haiku-20240307", usageStatus: "reported", + usage: { inputTokens: 100, outputTokens: 50 }, + })); + const accumulator = createUsageSummaryAccumulator({ window: { since, until }, mode: "row-unique" }); + rows.forEach(row => accumulator.add(row)); + const result = accumulator.summarize("today", FIXED_NOW); + const baseline = summarizeUsage(rows.slice(1, 3), "all", until); + expect(result.summary.estimatedCostUsd).toBeGreaterThan(0); + expect(result.summary).toEqual(baseline.summary); + expect(result.models).toEqual(baseline.models); + expect(result.providers).toEqual(baseline.providers); + expect(result.days[0]?.estimatedCostUsd).toBeCloseTo(result.summary.estimatedCostUsd, 10); + }); +}); + function entry(overrides: Partial & { ts: number }): PersistedUsageEntry { const { ts, ...rest } = overrides; return { diff --git a/tests/usage/usage-time-range.test.ts b/tests/usage/usage-time-range.test.ts new file mode 100644 index 0000000000..3a36def2bc --- /dev/null +++ b/tests/usage/usage-time-range.test.ts @@ -0,0 +1,36 @@ +import { describe, expect, test } from "bun:test"; +import { parseUsageTimeWindow } from "../../src/usage/time-range"; + +describe("usage time window parsing", () => { + test("accepts epoch milliseconds and normalizes explicit ISO offsets", () => { + expect(parseUsageTimeWindow(undefined, null)).toBeUndefined(); + expect(parseUsageTimeWindow("0", 0)).toEqual({ since: 0, until: 0 }); + expect(parseUsageTimeWindow("1970-01-01T00:00:00.1Z", "1970-01-01T00:00:00.12Z")) + .toEqual({ since: 100, until: 120 }); + expect(parseUsageTimeWindow("2024-02-29T09:00:00.123+09:00", "2024-02-28T19:00:00.123-05:00")) + .toEqual({ since: 1709164800123, until: 1709164800123 }); + expect(parseUsageTimeWindow("1970-01-01T00:00:00Z", "8640000000000000")) + .toEqual({ since: 0, until: 8_640_000_000_000_000 }); + expect(parseUsageTimeWindow("+275760-09-13T00:00:00Z", 8_640_000_000_000_000)?.since) + .toBe(8_640_000_000_000_000); + }); + + test("rejects absent peers, reversed bounds and non-integer or invalid dates", () => { + for (const [since, until] of [[0, undefined], [null, 0], [2, 1]] as const) { + expect(() => parseUsageTimeWindow(since, until)).toThrow(); + } + for (const value of [ + "", " ", " 0", "1.5", "1e3", "0x10", "-1", -1, 0.5, NaN, Infinity, + "9007199254740992", "8640000000000001", "2026-09-01", "2026-09-01T12:00:00", + "2026-09-01T12:00Z", "2026-02-29T00:00:00Z", "2024-02-30T00:00:00Z", + "2100-02-29T00:00:00Z", "2026-04-31T00:00:00+09:00", "2026-13-01T00:00:00Z", + "2026-01-00T00:00:00Z", "2026-01-01T24:00:00Z", "2026-01-01T00:60:00Z", + "2026-01-01T00:00:60Z", "2026-01-01T00:00:00+24:00", "2026-01-01T00:00:00+01:60", + "1970-01-01T00:00:00+00:01", "+275760-09-13T00:00:00.001Z", + "2026-09-01T00:00:00.0001Z", + ]) { + expect(() => parseUsageTimeWindow(value, 8_640_000_000_000_000)).toThrow(); + expect(() => parseUsageTimeWindow(0, value)).toThrow(); + } + }); +}); From 089320e88cd32056ab491706cb37faedb4cedd24 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 18:57:31 +0900 Subject: [PATCH 167/221] docs: define lane D verification and handoff [skip ci] --- devlog/_plan/260907_lane_d/060_delivery.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 devlog/_plan/260907_lane_d/060_delivery.md diff --git a/devlog/_plan/260907_lane_d/060_delivery.md b/devlog/_plan/260907_lane_d/060_delivery.md new file mode 100644 index 0000000000..2009ba9bb9 --- /dev/null +++ b/devlog/_plan/260907_lane_d/060_delivery.md @@ -0,0 +1,18 @@ +# 060 Remote verification and delivery + +Consume D5's implementation checkpoint. Resolve remaining independent review feedback on +its owning layer, cascade all dependent refs, and preserve contributor trailers. Detailed +unpublished security-review notes stay in scratch. Reconcile A's added reasoning-envelope +budget arguments with D1 ordering when A reaches dev; preserve both changes. + +Fetch fresh dev before final dispatch. Run only the top branch's ci.yml workflow with +lane=all; require successful actual platform jobs including Windows on the exact head. +Download its dashboard-preview artifact and verify build-commit/build-gui-tree markers. +Capture the changed dialogs and custom Usage range with synthetic data through the existing +browser capability; publish proof images separately so evidence does not change tested code. + +Create D2-D5 PRs with the required template, screenshot, manual chain table and native +stack:null proof. Attach independent implementation/security verdicts and top CI URL to +each PR. Leave all merges and original issue/PR closure actions to the main task. +Local product tests/typecheck/build/install remain NOT RUN. D closes only when exact-head +remote evidence and the requested handoff table are complete. From e346d7ae03433bf1d642e9ff0172dbd0edcffca0 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:01:33 +0900 Subject: [PATCH 168/221] fix(usage): preserve dates across timezone calendar gaps [skip ci] Use server civil dates for custom heatmaps and guarantee backward progress when a local day is skipped. Add Santiago and Apia timezone regressions. Co-authored-by: Manson2438 <183030642+Manson2438@users.noreply.github.com> --- devlog/_plan/260907_lane_d/060_delivery.md | 6 +++ gui/src/pages/Usage.tsx | 54 ++++++++++++++++------ gui/tests/usage-custom-range.test.tsx | 27 +++++++++++ src/usage/summary.ts | 8 ++++ tests/usage/usage-summary.test.ts | 20 ++++++++ 5 files changed, 101 insertions(+), 14 deletions(-) diff --git a/devlog/_plan/260907_lane_d/060_delivery.md b/devlog/_plan/260907_lane_d/060_delivery.md index 2009ba9bb9..38bcb1c80a 100644 --- a/devlog/_plan/260907_lane_d/060_delivery.md +++ b/devlog/_plan/260907_lane_d/060_delivery.md @@ -16,3 +16,9 @@ stack:null proof. Attach independent implementation/security verdicts and top CI each PR. Leave all merges and original issue/PR closure actions to the main task. Local product tests/typecheck/build/install remain NOT RUN. D closes only when exact-head remote evidence and the requested handoff table are complete. + +Calendar audit fold-back: custom heatmaps iterate the server's returned civil dates, +using UTC only for weekday/month layout; they do not step a local midnight cursor. +The server's backward calendar walk resets midnight after decrement and explicitly +advances to the prior existing local day if a whole-day timezone jump prevented progress. +Regressions pin America/Santiago (2026-09-05..07) and Pacific/Apia (2011-12-29..31). diff --git a/gui/src/pages/Usage.tsx b/gui/src/pages/Usage.tsx index 44ecce0c98..36b0d4ba82 100644 --- a/gui/src/pages/Usage.tsx +++ b/gui/src/pages/Usage.tsx @@ -161,29 +161,55 @@ interface HeatmapCell { function buildHeatmap(days: UsageDay[], customWindow = false): { weeks: HeatmapCell[][]; months: { label: string; col: number }[]; buckets: number[] } { const buckets = quantileBuckets(days.map(d => d.totalTokens)); - if (customWindow && days.length === 0) return { weeks: [], months: [], buckets }; + const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + if (customWindow) { + const weeks: HeatmapCell[][] = []; + const months: { label: string; col: number }[] = []; + let week: HeatmapCell[] = []; + let weekStart: number | undefined; + let previousMonth = -1; + let lastMonthCol = -4; + const pad = (length: number) => { + while (week.length < length) week.push({ date: "", requests: 0, totalTokens: 0, level: 0, dayOfWeek: week.length }); + }; + // The server already supplied the bounded civil dates. Local midnight stepping + // can retain a shifted hour across DST and omit the final day of the report. + for (const day of days) { + const [year, month, date] = day.date.split("-").map(Number); + const calendar = new Date(Date.UTC(year, month - 1, date)); + const weekday = calendar.getUTCDay(); + const nextWeekStart = calendar.getTime() - weekday * 86_400_000; + if (weekStart !== nextWeekStart) { + if (week.length > 0) { pad(7); weeks.push(week); } + week = []; + weekStart = nextWeekStart; + } + const monthIndex = calendar.getUTCMonth(); + if (monthIndex !== previousMonth && weeks.length - lastMonthCol >= 4) { + months.push({ label: monthNames[monthIndex], col: weeks.length }); + previousMonth = monthIndex; + lastMonthCol = weeks.length; + } + pad(weekday); + week.push({ date: day.date, requests: day.requests, totalTokens: day.totalTokens, + level: bucketLevel(day.totalTokens, buckets), dayOfWeek: weekday }); + } + if (week.length > 0) { pad(7); weeks.push(week); } + return { weeks, months, buckets }; + } const dayMap = new Map(days.map(d => [d.date, d])); - const today = customWindow ? new Date(`${days[days.length - 1].date}T00:00:00`) : new Date(); + const today = new Date(); today.setHours(0, 0, 0, 0); - const start = customWindow ? new Date(`${days[0].date}T00:00:00`) : new Date(today); - if (!customWindow) { - start.setDate(start.getDate() - 364); - start.setDate(start.getDate() - start.getDay()); - } + const start = new Date(today); + start.setDate(start.getDate() - 364); + start.setDate(start.getDate() - start.getDay()); const weeks: HeatmapCell[][] = []; const months: { label: string; col: number }[] = []; - const monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; let lastMonthCol = -4; let prevMonthIdx = -1; let week: HeatmapCell[] = []; - // Align a custom grid without inventing report dates outside the server's bounded days. - if (customWindow) { - while (week.length < start.getDay()) { - week.push({ date: "", requests: 0, totalTokens: 0, level: 0, dayOfWeek: week.length }); - } - } const cursor = new Date(start); while (cursor <= today) { diff --git a/gui/tests/usage-custom-range.test.tsx b/gui/tests/usage-custom-range.test.tsx index c06b27eb33..db441dbb83 100644 --- a/gui/tests/usage-custom-range.test.tsx +++ b/gui/tests/usage-custom-range.test.tsx @@ -119,6 +119,33 @@ function sessionEntries() { }); } +test("America/Santiago midnight DST retains final-day activity and tooltip", async () => { + const previous = process.env.TZ; + process.env.TZ = "America/Santiago"; + try { + expect(new Date(2026, 8, 6, 0).getHours()).toBe(1); + await mount(); + await respond(0, "preset-marker"); + await enter("2026-09-05T00:00", "2026-09-07T23:59"); + await apply(); + const gate = requests.at(-1)!; + const data = report(gate, "santiago-marker", "2026-09-07"); + data.days = ["2026-09-05", "2026-09-06", "2026-09-07"].map(date => ({ + date, requests: date === "2026-09-07" ? 7 : 0, measuredRequests: 0, reportedRequests: 0, + totalTokens: date === "2026-09-07" ? 700 : 0, models: [], + })); + await act(async () => gate.resolve(Response.json(data))); + const active = container.querySelector('.heatmap-grid .heatmap-cell:not(.heatmap-cell-0)'); + expect(active).not.toBeNull(); + await act(async () => active!.dispatchEvent(new testWindow.MouseEvent("mouseover", { bubbles: true }))); + expect(container.querySelector(".heatmap-tip-date")?.textContent).toBe("2026-09-07"); + expect(container.querySelector(".heatmap-tip")?.textContent).toContain("700"); + } finally { + if (previous === undefined) delete process.env.TZ; + else process.env.TZ = previous; + } +}); + test("Apply submits inclusive bounds once; Clear restores the held preset without custom cache entries", async () => { await mount(); expect(requests[0].url).toBe(`${apiBase}/api/usage?range=30d&surface=all`); diff --git a/src/usage/summary.ts b/src/usage/summary.ts index d7e678ab4f..2e731a2900 100644 --- a/src/usage/summary.ts +++ b/src/usage/summary.ts @@ -306,7 +306,15 @@ function customWindowDates(window: UsageTimeWindow): string[] { const dates: string[] = []; while (date.getTime() >= start && dates.length < MAX_USAGE_DAY_BUCKETS) { dates.push(localDateKey(date.getTime())); + const previous = date.getTime(); date.setDate(date.getDate() - 1); + date.setHours(0, 0, 0, 0); + // A skipped civil day can normalize back to this same midnight (Apia, 2011). + // Move through the preceding instant to find the prior existing local day. + if (date.getTime() >= previous) { + date.setTime(previous - 1); + date.setHours(0, 0, 0, 0); + } } return dates.reverse(); } diff --git a/tests/usage/usage-summary.test.ts b/tests/usage/usage-summary.test.ts index 36d83c779f..094e9e5a44 100644 --- a/tests/usage/usage-summary.test.ts +++ b/tests/usage/usage-summary.test.ts @@ -17,6 +17,26 @@ import { isUnresolvedRequestedModel } from "../../src/usage/model-identity"; const FIXED_NOW = Date.UTC(2026, 5, 28, 12, 0, 0); describe("custom usage windows", () => { + test("Pacific/Apia skipped day still reaches the preceding existing calendar date", () => { + const previous = process.env.TZ; + process.env.TZ = "Pacific/Apia"; + try { + const start = new Date(2011, 11, 29, 12).getTime(); + const end = new Date(2011, 11, 31, 12).getTime(); + expect(new Date(2011, 11, 30, 0).getDate()).toBe(31); + const accumulator = createUsageSummaryAccumulator({ window: { since: start, until: end } }); + accumulator.add(entry({ ts: start, requestId: "before-skip" })); + accumulator.add(entry({ ts: end, requestId: "after-skip" })); + const summary = accumulator.summarize("all", end); + expect(summary.days.map(day => day.date)).toEqual(["2011-12-29", "2011-12-31"]); + expect(summary.days.map(day => day.requests)).toEqual([1, 1]); + expect(summary.summary.requests).toBe(2); + } finally { + if (previous === undefined) delete process.env.TZ; + else process.env.TZ = previous; + } + }); + const since = new Date(2026, 1, 10, 12, 0, 0, 123).getTime(); const until = since + 3_600_000; From 5669413794ca54388782f6758171a81a2d1b361e Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 21:13:57 +0900 Subject: [PATCH 169/221] test(models): scope price errors to their dialog [skip ci] Exact gates log showed the fixture read an unrelated picker alert behind the modal. Keep all expected error text and mutation assertions. Co-authored-by: nordz0r <6949669+nordz0r@users.noreply.github.com> --- gui/tests/models-price-editor.test.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gui/tests/models-price-editor.test.tsx b/gui/tests/models-price-editor.test.tsx index b759a8398e..a80180b893 100644 --- a/gui/tests/models-price-editor.test.tsx +++ b/gui/tests/models-price-editor.test.tsx @@ -219,7 +219,7 @@ describe("Models manual price editor", () => { expect(button("Reset to automatic").disabled).toBe(true); await click("Save"); expect(mutations).toHaveLength(0); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("Enter input and output rates"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("Enter input and output rates"); await fill(["0", "0"]); expect(inputs().map(input => input.value)).toEqual(["0", "0", "0", "0"]); const before = catalogReads; @@ -256,7 +256,7 @@ describe("Models manual price editor", () => { await fill([invalid]); await click("Save"); expect(mutations).toHaveLength(0); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("finite number"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("finite number"); } await fill(["1000000", "0", "0.000001", "0.5"]); await click("Save"); @@ -268,7 +268,7 @@ describe("Models manual price editor", () => { await mount(); await open(); expect(inputs().every(input => input.disabled)).toBe(true); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("Could not load"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("Could not load"); expect(testWindow.document.activeElement).toBe(button("Reload price")); await click("Reload price"); expect(mutations).toHaveLength(0); @@ -296,14 +296,14 @@ describe("Models manual price editor", () => { expect(mutations).toHaveLength(1); expect(inputs().every(input => input.disabled)).toBe(true); expect(button("Reset to automatic").disabled).toBe(true); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("may have changed"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("may have changed"); await act(async () => button("Reset to automatic").dispatchEvent(new testWindow.MouseEvent("click", { bubbles: true }))); expect(mutations).toHaveLength(1); getFailure = true; await click("Reload price"); expect(mutations).toHaveLength(1); expect(inputs()[0]!.disabled).toBe(true); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("Editing stays locked"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("Editing stays locked"); getFailure = false; await click("Reload price"); expect(inputs().map(input => input.value)).toEqual(["0", "0", "0", "0"]); @@ -396,10 +396,10 @@ describe("Models manual price editor", () => { await click("Reset to automatic"); expect(mutations).toHaveLength(1); expect(inputs().every(input => input.disabled)).toBe(true); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("price was saved"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("price was saved"); await click("Refresh list"); expect(mutations).toHaveLength(1); - expect(container.querySelector('[role="alert"]')!.textContent).toContain("price was saved"); + expect(container.querySelector('dialog [role="alert"]')!.textContent).toContain("price was saved"); expect(reads).toHaveLength(1); catalogFailure = false; await click("Refresh list"); From fe9460372597061f572beee6c325009fef618c42 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:14:02 +0900 Subject: [PATCH 170/221] fix(usage): encode custom report identity as a tuple [skip ci] Keep cache identity as technical data rather than a UI-string-shaped template. No locale or lint-rule changes. Co-authored-by: Manson2438 <183030642+Manson2438@users.noreply.github.com> --- gui/src/pages/Usage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/src/pages/Usage.tsx b/gui/src/pages/Usage.tsx index 36b0d4ba82..7895ce9370 100644 --- a/gui/src/pages/Usage.tsx +++ b/gui/src/pages/Usage.tsx @@ -830,7 +830,7 @@ export default function Usage({ apiBase, connected = false, apiKeyId }: { apiBas }, [apiBase, apiKeyId, connected, range, scope, surface, since, until]); const presetKey = usageCacheKey(apiBase, range, surface, connected, scope, apiKeyId); - const resourceKey = customWindow ? `${presetKey}:custom:${since}:${until}` : presetKey; + const resourceKey = customWindow ? JSON.stringify([presetKey, since, until]) : presetKey; // Arbitrary custom windows belong only to the subscription-scoped resource store. const cached = customWindow ? null : readHeldUsage(apiBase, range, surface, connected, scope, apiKeyId); // Range and surface identify different reports, so the key changes with both. That prevents From 8ecf91fc88d8dc07f429f590b74880f25f9f4a3a Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 19:48:57 +0900 Subject: [PATCH 171/221] feat(gui): add guarded routed model picker drag ordering [skip ci] Add Custom routed ordering with fixed featured rows, keyboard controls, fresh settings snapshots and accepted-receipt recovery. Preserve native complete orders until an explicit preset/reset is accepted. Include source regressions and all nine locale strings; runtime checks await central CI. Implements the routed slice requested in #3774; native/featured full-picker placement remains open. Co-authored-by: leonclab <26379556+leonclab@users.noreply.github.com> --- .../src/content/docs/guides/model-ordering.md | 21 + gui/src/components/ModelPickerOrderEditor.tsx | 172 +++++++++ gui/src/i18n/de.ts | 15 + gui/src/i18n/en.ts | 15 + gui/src/i18n/fr.ts | 15 + gui/src/i18n/ja.ts | 15 + gui/src/i18n/ko.ts | 15 + gui/src/i18n/ru.ts | 15 + gui/src/i18n/tr.ts | 15 + gui/src/i18n/zh-TW.ts | 15 + gui/src/i18n/zh.ts | 15 + gui/src/model-picker-order.ts | 76 +++- gui/src/pages/Models.tsx | 61 ++- gui/src/styles-models-workspace.css | 7 + gui/tests/model-picker-order-editor.test.tsx | 358 ++++++++++++++++++ gui/tests/model-picker-order.test.ts | 109 +++++- 16 files changed, 917 insertions(+), 22 deletions(-) create mode 100644 gui/src/components/ModelPickerOrderEditor.tsx create mode 100644 gui/tests/model-picker-order-editor.test.tsx diff --git a/docs-site/src/content/docs/guides/model-ordering.md b/docs-site/src/content/docs/guides/model-ordering.md index 2d33b409d8..5333b839ce 100644 --- a/docs-site/src/content/docs/guides/model-ordering.md +++ b/docs-site/src/content/docs/guides/model-ordering.md @@ -178,3 +178,24 @@ On **Models**, choose **Default**, **A–Z by model**, **Group by provider**, or The controls use `GET/PUT /api/subagent-models`: `chosen` and `available` retain saved roster choices, including disabled or missing models; `pickerAvailable` contains only eligible routed catalog ids. The Models page sends `pickerOrder` and `pickerOrderMode`, never `models`. Roster-only saves preserve picker settings. Invalid combined updates and failed persistence leave the previous picker/roster state intact. Routed-only presets keep the existing featured/native priority bands. They affect the Codex catalog and Claude discovery's routed groups; Claude's native prefix and explicit Desktop profile/alias ownership remain unchanged. OpenCodex guidance ranks and configured fallback settings are preserved, but native Codex's advertised five and recommended default can change with display priority. Saving does not restart clients; a catalog refresh may remain pending, and clients holding an old catalog may need reopening. + + +### Custom routed order + +Choose **Custom order** on Models to load a fresh routed snapshot. Drag a movable row before +another row, or use its Up/Down buttons, then **Save draft**. Featured routed rows stay at the +front in their configured rank and cannot move. Native rows are not shown; this is not a preview +of the complete native picker. Surviving saved rows keep their relative order and new candidates +follow the current candidate list. Every save sends the complete routed list, without changing +the featured roster. + +An order containing bare native ids remains protected until you explicitly apply a routed preset +or Default. Selecting a different option alone does not replace it. Unknown featured state blocks +editing. Before saving, the editor checks a fresh snapshot; changes preserve your draft and block +saving until **Reload and discard draft** loads current settings. Request failures retain the +draft. Accepted saves can still have a pending catalog refresh; reload before editing again. + +The editor also requires an unambiguous model identity for every routed candidate. If the model +catalog is incomplete, refresh the Models page before editing; reloading picker settings alone +cannot restore missing catalog identities. Featured choices are matched exactly without trimming; +duplicate choices use their last configured position, and canonical ids take precedence over raw ids. diff --git a/gui/src/components/ModelPickerOrderEditor.tsx b/gui/src/components/ModelPickerOrderEditor.tsx new file mode 100644 index 0000000000..3c379f8cce --- /dev/null +++ b/gui/src/components/ModelPickerOrderEditor.tsx @@ -0,0 +1,172 @@ +import { useCallback, useEffect, useEffectEvent, useLayoutEffect, useRef, useState } from "react"; +import { createBoundedFetch, type BoundedFetch } from "../bounded-fetch"; +import { readJsonOrThrow } from "../fetch-json"; +import { IconArrowDown, IconArrowUp, IconGrip } from "../icons"; +import { useT, type TKey } from "../i18n/shared"; +import { + customPickerRows, isPickerOrderSaved, isPickerOrderSettings, movePickerBefore, + pickerSnapshotSignature, stepPickerOrder, type PickerModelIdentity, type PickerOrderSaved, +} from "../model-picker-order"; + +type Receipt = PickerOrderSaved & { catalogRefresh?: unknown }; +type Snapshot = { signature: string; identities: string; order: string[]; fixed: string[] }; +const DRAG_TYPE = "application/x-ocx-picker-order"; +let dragSequence = 0; +/** Local drag identity, not a security token. Like newClientId, supports LAN HTTP. */ +function newDragToken(): string { + const sequence = ++dragSequence; + if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") { + try { return `${sequence}:${crypto.randomUUID()}`; } + catch { /* Some browsers expose randomUUID but reject it outside secure contexts. */ } + } + return `picker-${Date.now().toString(36)}-${sequence}`; +} + +export default function ModelPickerOrderEditor({ apiBase, active, identities, onAccepted, onBusyChange }: { + apiBase: string; active: boolean; identities: readonly PickerModelIdentity[]; + onAccepted: (receipt: Receipt) => void; onBusyChange: (busy: boolean) => void; +}) { + const t = useT(); + const [snapshot, setSnapshot] = useState(null); + const [draft, setDraft] = useState([]); + const [busy, setBusy] = useState(false); + const [blocked, setBlocked] = useState(null); + const [error, setError] = useState(false); + const [announcement, setAnnouncement] = useState(""); + const [dragging, setDragging] = useState(null); + const [over, setOver] = useState(null); + const drag = useRef<{ id: string; token: string } | null>(null); + const generation = useRef(0); + const flight = useRef(null); + const identitySignature = JSON.stringify(identities.map(({ provider, id, namespaced }) => [provider, id, namespaced])); + const latestIdentitySignature = useRef(identitySignature); + useLayoutEffect(() => { latestIdentitySignature.current = identitySignature; }, [identitySignature]); + const identityChanged = snapshot !== null && snapshot.identities !== identitySignature; + const disabled = !active || busy || !snapshot || blocked !== null || identityChanged; + const dirty = snapshot !== null && JSON.stringify(draft) !== JSON.stringify(snapshot.order); + const clearDrag = useCallback(() => { drag.current = null; setDragging(null); setOver(null); }, []); + + // Layout cleanup fences even A → B → A and unmount before a pending promise resumes. + useLayoutEffect(() => { + generation.current++; + setSnapshot(null); setDraft([]); setBlocked(null); setError(false); + return () => { + generation.current++; + flight.current?.controller.abort(); flight.current?.clear(); flight.current = null; + drag.current = null; onBusyChange(false); + }; + }, [apiBase, active, onBusyChange]); + useEffect(() => { clearDrag(); }, [disabled, snapshot, identitySignature, clearDrag]); + + const run = async (save: boolean) => { + if (!active || flight.current || (save && (disabled || !dirty))) return; + const owner = generation.current, bounded = createBoundedFetch(15_000); + flight.current = bounded; setBusy(true); onBusyChange(true); setError(false); clearDrag(); + const owns = () => generation.current === owner && flight.current === bounded; + const current = () => owns() && !bounded.signal.aborted + && latestIdentitySignature.current === identitySignature; + try { + const response = await fetch(`${apiBase}/api/subagent-models`, { signal: bounded.signal }); + if (!current()) return; + const settings = await readJsonOrThrow(response); + if (!current()) return; + if (!isPickerOrderSettings(settings)) throw new Error("Invalid picker settings"); + const signature = pickerSnapshotSignature(apiBase, owner, settings); + if (save && (!snapshot || signature !== snapshot.signature || identitySignature !== snapshot.identities)) { + setBlocked("models.pickerOrder.changed"); return; + } + const rows = customPickerRows(settings, identities); + if (!rows) { + setBlocked(settings.pickerOrder.some(id => !id.includes("/")) + ? "models.pickerOrder.nativeLocked" : settings.chosen === undefined + ? "models.pickerOrder.unknownChosen" : "models.pickerOrder.catalogRequired"); + return; + } + if (!save) { + setSnapshot({ ...rows, signature, identities: identitySignature }); setDraft(rows.order); + setBlocked(null); setAnnouncement(""); return; + } + const result = await fetch(`${apiBase}/api/subagent-models`, { + method: "PUT", headers: { "Content-Type": "application/json" }, signal: bounded.signal, + body: JSON.stringify({ pickerOrder: draft, pickerOrderMode: null }), + }); + if (!current()) return; + const receipt = await readJsonOrThrow(result); + if (!current()) return; + if (!isPickerOrderSaved(receipt) || !("ok" in receipt) || receipt.ok !== true) throw new Error("Invalid picker receipt"); + setDraft(receipt.pickerOrder); setBlocked("models.pickerOrder.savedReload"); + onAccepted({ pickerOrder: receipt.pickerOrder, pickerOrderMode: receipt.pickerOrderMode, + catalogRefresh: "catalogRefresh" in receipt ? receipt.catalogRefresh : undefined }); + } catch { + if (owns() && latestIdentitySignature.current === identitySignature) setError(true); + // Current-identity timeouts surface an error; stale identities retain the draft silently. + } finally { + bounded.clear(); + if (owns()) { flight.current = null; setBusy(false); onBusyChange(false); } + } + }; + const enter = useEffectEvent(() => { void run(false); }); + useEffect(() => { if (active) enter(); }, [apiBase, active]); + + const move = (id: string, next: string[]) => { + if (disabled) return; + setDraft(next); + setAnnouncement(t("models.pickerOrder.position", { model: id, position: next.indexOf(id) + 1, total: next.length })); + clearDrag(); + }; + const movable = (id: string) => !disabled && draft.includes(id) && !snapshot?.fixed.includes(id); + return
+

{t("models.pickerOrder.editorHint")}

+ {(blocked || identityChanged) &&

{t(blocked ?? "models.pickerOrder.changed")}

} + {error &&

{t("models.pickerOrder.requestFailed")}

} + {snapshot && draft.length === 0 &&

{t("models.pickerOrder.empty")}

} +
    + {draft.map((id, index) => { + const fixed = snapshot?.fixed.includes(id) === true; + return
  1. { + if (!drag.current || drag.current.id === id || !movable(drag.current.id) || !movable(id) + || !event.dataTransfer.types.includes(DRAG_TYPE)) return; + event.preventDefault(); event.dataTransfer.dropEffect = "move"; setOver(id); + }} + onDragLeave={() => setOver(null)} + onDrop={event => { + const source = drag.current; + if (source && source.id !== id && source.token === event.dataTransfer.getData(DRAG_TYPE) && movable(source.id) && movable(id)) { + event.preventDefault(); move(source.id, movePickerBefore(draft, source.id, id, snapshot?.fixed ?? [])); + } + clearDrag(); + }} onDragEnd={clearDrag}> + + {id} + {fixed && {t("models.pickerOrder.featured")}} + + + + +
  2. ; + })} +
+

{announcement}

+
+ + +
+
; +} diff --git a/gui/src/i18n/de.ts b/gui/src/i18n/de.ts index 79d1591728..d413e1277c 100644 --- a/gui/src/i18n/de.ts +++ b/gui/src/i18n/de.ts @@ -2625,4 +2625,19 @@ export const de: Record = { "usage.range.invalid": "Geben Sie gültige lokale Daten und Uhrzeiten ab 1970-01-01 UTC ein.", "usage.range.reversed": "Das Ende muss auf oder nach dem Beginn liegen.", "usage.range.applied": "Ausgewählter Zeitraum: {start} – {end} (beide Grenzen eingeschlossen).", + "models.pickerOrder.editorHint": "Routingsmodelle neu ordnen und den Entwurf speichern. Hervorgehobene Zeilen sind fest; native Modelle werden nicht angezeigt.", + "models.pickerOrder.nativeLocked": "Diese Reihenfolge enthält native Modelle. Vor der Bearbeitung eine Routing-Vorgabe oder Standard anwenden.", + "models.pickerOrder.unknownChosen": "Hervorgehobene Modelle sind unbekannt. Vor der Bearbeitung neu laden.", + "models.pickerOrder.changed": "Die Einstellungen haben sich geändert. Der Entwurf bleibt erhalten; erneutes Laden verwirft ihn und lädt die aktuellen Einstellungen.", + "models.pickerOrder.savedReload": "Reihenfolge gespeichert. Vor weiterer Bearbeitung aktuelle Einstellungen laden.", + "models.pickerOrder.requestFailed": "Anfrage fehlgeschlagen. Der Entwurf bleibt erhalten; erneut versuchen oder neu laden.", + "models.pickerOrder.empty": "Keine Routingmodelle verfügbar.", + "models.pickerOrder.dragModel": "{model} ziehen", + "models.pickerOrder.featured": "Hervorgehoben", + "models.pickerOrder.upModel": "{model} nach oben verschieben", + "models.pickerOrder.downModel": "{model} nach unten verschieben", + "models.pickerOrder.position": "{model}: Position {position} von {total}", + "models.pickerOrder.saveDraft": "Entwurf speichern", + "models.pickerOrder.reloadDraft": "Neu laden und Entwurf verwerfen", + "models.pickerOrder.catalogRequired": "Modellidentitäten fehlen oder sind mehrdeutig. Laden Sie die Modellseite neu, um den Katalog vor der Bearbeitung zu aktualisieren.", }; diff --git a/gui/src/i18n/en.ts b/gui/src/i18n/en.ts index cceef53d12..b842f4618c 100644 --- a/gui/src/i18n/en.ts +++ b/gui/src/i18n/en.ts @@ -2659,6 +2659,21 @@ export const en = { "usage.range.invalid": "Enter valid local dates and times, on or after 1970-01-01 UTC.", "usage.range.reversed": "The end must be at or after the start.", "usage.range.applied": "Selected interval: {start} – {end} (both inclusive).", + "models.pickerOrder.editorHint": "Reorder routed models, then save your draft. Featured rows are fixed; native models are not shown.", + "models.pickerOrder.nativeLocked": "This saved order includes native models. Apply a routed preset or Default before editing Custom.", + "models.pickerOrder.unknownChosen": "Featured choices are unknown. Reload before editing.", + "models.pickerOrder.changed": "Picker settings changed. Your draft is kept; reload to discard it and use current settings.", + "models.pickerOrder.savedReload": "Order saved. Reload current settings before editing again.", + "models.pickerOrder.requestFailed": "Request failed. Your draft is kept; retry or reload.", + "models.pickerOrder.empty": "No routed models are available.", + "models.pickerOrder.dragModel": "Drag {model}", + "models.pickerOrder.featured": "Featured", + "models.pickerOrder.upModel": "Move {model} up", + "models.pickerOrder.downModel": "Move {model} down", + "models.pickerOrder.position": "{model}: position {position} of {total}", + "models.pickerOrder.saveDraft": "Save draft", + "models.pickerOrder.reloadDraft": "Reload and discard draft", + "models.pickerOrder.catalogRequired": "Model identities are missing or ambiguous. Reload the Models page to refresh its catalog before editing Custom.", } as const; export type TKey = keyof typeof en; diff --git a/gui/src/i18n/fr.ts b/gui/src/i18n/fr.ts index 67b2586fe4..d07b7f7a16 100644 --- a/gui/src/i18n/fr.ts +++ b/gui/src/i18n/fr.ts @@ -2612,4 +2612,19 @@ export const fr: Record = { "usage.range.invalid": "Saisissez des dates et heures locales valides à partir du 1970-01-01 UTC.", "usage.range.reversed": "La fin doit être égale ou postérieure au début.", "usage.range.applied": "Période sélectionnée : {start} – {end} (bornes incluses).", + "models.pickerOrder.editorHint": "Réordonnez les modèles routés, puis enregistrez le brouillon. Les lignes mises en avant sont fixes ; les modèles natifs ne sont pas affichés.", + "models.pickerOrder.nativeLocked": "Cet ordre contient des modèles natifs. Appliquez un préréglage de routage ou Par défaut avant de le personnaliser.", + "models.pickerOrder.unknownChosen": "Les modèles mis en avant sont inconnus. Rechargez avant de modifier.", + "models.pickerOrder.changed": "Les paramètres ont changé. Le brouillon est conservé ; rechargez pour le supprimer et utiliser les paramètres actuels.", + "models.pickerOrder.savedReload": "Ordre enregistré. Rechargez les paramètres actuels avant de modifier à nouveau.", + "models.pickerOrder.requestFailed": "Échec de la requête. Le brouillon est conservé ; réessayez ou rechargez.", + "models.pickerOrder.empty": "Aucun modèle routé disponible.", + "models.pickerOrder.dragModel": "Faire glisser {model}", + "models.pickerOrder.featured": "Mis en avant", + "models.pickerOrder.upModel": "Monter {model}", + "models.pickerOrder.downModel": "Descendre {model}", + "models.pickerOrder.position": "{model} : position {position} sur {total}", + "models.pickerOrder.saveDraft": "Enregistrer le brouillon", + "models.pickerOrder.reloadDraft": "Recharger et supprimer le brouillon", + "models.pickerOrder.catalogRequired": "Les identités des modèles sont manquantes ou ambiguës. Rechargez la page Modèles pour actualiser le catalogue avant de personnaliser l’ordre.", }; diff --git a/gui/src/i18n/ja.ts b/gui/src/i18n/ja.ts index 92bb516827..1db94902c5 100644 --- a/gui/src/i18n/ja.ts +++ b/gui/src/i18n/ja.ts @@ -2646,4 +2646,19 @@ export const ja: Record = { "usage.range.invalid": "1970-01-01 UTC以降の有効な現地日時を入力してください。", "usage.range.reversed": "終了日時は開始日時と同じか、それ以降にしてください。", "usage.range.applied": "選択した期間:{start} – {end}(両端を含む)。", + "models.pickerOrder.editorHint": "ルーティングモデルを並べ替えて下書きを保存します。おすすめ行は固定され、ネイティブモデルは表示されません。", + "models.pickerOrder.nativeLocked": "保存済みの順序にネイティブモデルが含まれています。ルーティングのプリセットかデフォルトを適用してからカスタム順序を編集してください。", + "models.pickerOrder.unknownChosen": "おすすめモデルが不明です。再読み込みしてから編集してください。", + "models.pickerOrder.changed": "設定が変更されました。下書きは保持されます。再読み込みすると下書きを破棄し、現在の設定を使用します。", + "models.pickerOrder.savedReload": "順序を保存しました。再編集する前に現在の設定を読み込んでください。", + "models.pickerOrder.requestFailed": "リクエストに失敗しました。下書きは保持されます。再試行するか再読み込みしてください。", + "models.pickerOrder.empty": "利用可能なルーティングモデルはありません。", + "models.pickerOrder.dragModel": "{model} をドラッグ", + "models.pickerOrder.featured": "おすすめ", + "models.pickerOrder.upModel": "{model} を上へ移動", + "models.pickerOrder.downModel": "{model} を下へ移動", + "models.pickerOrder.position": "{model}: {total} 件中 {position} 番目", + "models.pickerOrder.saveDraft": "下書きを保存", + "models.pickerOrder.reloadDraft": "下書きを破棄して再読み込み", + "models.pickerOrder.catalogRequired": "モデルの識別情報が不足しているか曖昧です。モデルページを再読み込みしてカタログを更新してからカスタム順序を編集してください。", }; diff --git a/gui/src/i18n/ko.ts b/gui/src/i18n/ko.ts index 7f02d3792f..b31d6e4e1a 100644 --- a/gui/src/i18n/ko.ts +++ b/gui/src/i18n/ko.ts @@ -2647,4 +2647,19 @@ export const ko: Record = { "usage.range.invalid": "1970-01-01 UTC 이후의 유효한 현지 날짜와 시간을 입력하세요.", "usage.range.reversed": "종료 시각은 시작 시각과 같거나 이후여야 합니다.", "usage.range.applied": "선택한 기간: {start} – {end} (양 끝 시각 포함).", + "models.pickerOrder.editorHint": "라우팅 모델의 순서를 바꾼 뒤 초안을 저장하세요. 추천 모델은 고정되며 네이티브 모델은 표시하지 않습니다.", + "models.pickerOrder.nativeLocked": "저장된 순서에 네이티브 모델이 포함되어 있습니다. 라우팅 프리셋이나 기본값을 적용한 뒤 사용자 지정 순서를 편집하세요.", + "models.pickerOrder.unknownChosen": "추천 모델 정보를 확인할 수 없습니다. 다시 불러온 뒤 편집하세요.", + "models.pickerOrder.changed": "모델 선택 설정이 바뀌었습니다. 초안은 유지됩니다. 다시 불러오면 초안을 버리고 현재 설정을 사용합니다.", + "models.pickerOrder.savedReload": "순서가 저장되었습니다. 다시 편집하려면 현재 설정을 불러오세요.", + "models.pickerOrder.requestFailed": "요청에 실패했습니다. 초안은 유지됩니다. 재시도하거나 다시 불러오세요.", + "models.pickerOrder.empty": "사용 가능한 라우팅 모델이 없습니다.", + "models.pickerOrder.dragModel": "{model} 끌어서 이동", + "models.pickerOrder.featured": "추천 모델", + "models.pickerOrder.upModel": "{model} 위로 이동", + "models.pickerOrder.downModel": "{model} 아래로 이동", + "models.pickerOrder.position": "{model}: {total}개 중 {position}번째", + "models.pickerOrder.saveDraft": "초안 저장", + "models.pickerOrder.reloadDraft": "초안 버리고 다시 불러오기", + "models.pickerOrder.catalogRequired": "모델 식별 정보가 없거나 모호합니다. 모델 페이지를 새로고침해 목록을 갱신한 뒤 사용자 지정 순서를 편집하세요.", }; diff --git a/gui/src/i18n/ru.ts b/gui/src/i18n/ru.ts index 9548be7d64..a8370e7f5f 100644 --- a/gui/src/i18n/ru.ts +++ b/gui/src/i18n/ru.ts @@ -2648,4 +2648,19 @@ export const ru: Record = { "usage.range.invalid": "Введите допустимые местные дату и время не ранее 1970-01-01 UTC.", "usage.range.reversed": "Конец не может быть раньше начала.", "usage.range.applied": "Выбранный период: {start} – {end} (обе границы включены).", + "models.pickerOrder.editorHint": "Измените порядок маршрутизируемых моделей и сохраните черновик. Избранные строки закреплены; нативные модели не показаны.", + "models.pickerOrder.nativeLocked": "Сохранённый порядок содержит нативные модели. Перед редактированием примените пресет маршрутизации или порядок по умолчанию.", + "models.pickerOrder.unknownChosen": "Избранные модели неизвестны. Перезагрузите данные перед редактированием.", + "models.pickerOrder.changed": "Настройки изменились. Черновик сохранён; перезагрузка сбросит его и загрузит текущие настройки.", + "models.pickerOrder.savedReload": "Порядок сохранён. Перед следующим редактированием загрузите текущие настройки.", + "models.pickerOrder.requestFailed": "Ошибка запроса. Черновик сохранён; повторите запрос или перезагрузите данные.", + "models.pickerOrder.empty": "Нет доступных маршрутизируемых моделей.", + "models.pickerOrder.dragModel": "Перетащить {model}", + "models.pickerOrder.featured": "Избранная", + "models.pickerOrder.upModel": "Переместить {model} вверх", + "models.pickerOrder.downModel": "Переместить {model} вниз", + "models.pickerOrder.position": "{model}: позиция {position} из {total}", + "models.pickerOrder.saveDraft": "Сохранить черновик", + "models.pickerOrder.reloadDraft": "Перезагрузить и сбросить черновик", + "models.pickerOrder.catalogRequired": "Идентификаторы моделей отсутствуют или неоднозначны. Перезагрузите страницу моделей, чтобы обновить каталог перед редактированием порядка.", }; diff --git a/gui/src/i18n/tr.ts b/gui/src/i18n/tr.ts index 7b835eb03e..6a7c02c936 100644 --- a/gui/src/i18n/tr.ts +++ b/gui/src/i18n/tr.ts @@ -2648,4 +2648,19 @@ export const tr: Record = { "usage.range.invalid": "1970-01-01 UTC veya sonrasına ait geçerli yerel tarih ve saat girin.", "usage.range.reversed": "Bitiş, başlangıçla aynı veya daha sonra olmalıdır.", "usage.range.applied": "Seçilen aralık: {start} – {end} (iki sınır da dahil).", + "models.pickerOrder.editorHint": "Yönlendirilen modelleri sıralayıp taslağı kaydedin. Öne çıkan satırlar sabittir; yerel modeller gösterilmez.", + "models.pickerOrder.nativeLocked": "Kayıtlı sıra yerel modeller içeriyor. Özel sırayı düzenlemeden önce yönlendirme ön ayarını veya Varsayılan seçeneğini uygulayın.", + "models.pickerOrder.unknownChosen": "Öne çıkan modeller bilinmiyor. Düzenlemeden önce yeniden yükleyin.", + "models.pickerOrder.changed": "Seçici ayarları değişti. Taslağınız korunuyor; yeniden yüklemek taslağı siler ve güncel ayarları kullanır.", + "models.pickerOrder.savedReload": "Sıra kaydedildi. Yeniden düzenlemeden önce güncel ayarları yükleyin.", + "models.pickerOrder.requestFailed": "İstek başarısız. Taslağınız korunuyor; tekrar deneyin veya yeniden yükleyin.", + "models.pickerOrder.empty": "Kullanılabilir yönlendirilen model yok.", + "models.pickerOrder.dragModel": "{model} modelini sürükle", + "models.pickerOrder.featured": "Öne çıkan", + "models.pickerOrder.upModel": "{model} modelini yukarı taşı", + "models.pickerOrder.downModel": "{model} modelini aşağı taşı", + "models.pickerOrder.position": "{model}: {total} içinde {position}. sıra", + "models.pickerOrder.saveDraft": "Taslağı kaydet", + "models.pickerOrder.reloadDraft": "Yeniden yükle ve taslağı sil", + "models.pickerOrder.catalogRequired": "Model kimlikleri eksik veya belirsiz. Özel sırayı düzenlemeden önce kataloğu yenilemek için Modeller sayfasını yeniden yükleyin.", }; diff --git a/gui/src/i18n/zh-TW.ts b/gui/src/i18n/zh-TW.ts index cd0b7e17d3..d59fa6d6bc 100644 --- a/gui/src/i18n/zh-TW.ts +++ b/gui/src/i18n/zh-TW.ts @@ -2610,4 +2610,19 @@ export const zhTW: Record = { "usage.range.invalid": "請輸入不早於 1970-01-01 UTC 的有效本地日期和時間。", "usage.range.reversed": "結束時間必須等於或晚於開始時間。", "usage.range.applied": "所選範圍:{start} – {end}(包含兩端)。", + "models.pickerOrder.editorHint": "調整路由模型順序後儲存草稿。精選列固定,原生模型不在此顯示。", + "models.pickerOrder.nativeLocked": "已儲存的順序包含原生模型。請先套用路由預設或預設順序,再編輯自訂順序。", + "models.pickerOrder.unknownChosen": "精選模型資訊未知。請重新載入後再編輯。", + "models.pickerOrder.changed": "模型選擇設定已變更。草稿已保留;重新載入將捨棄草稿並使用目前設定。", + "models.pickerOrder.savedReload": "順序已儲存。再次編輯前請重新載入目前設定。", + "models.pickerOrder.requestFailed": "請求失敗。草稿已保留;請重試或重新載入。", + "models.pickerOrder.empty": "沒有可用的路由模型。", + "models.pickerOrder.dragModel": "拖曳 {model}", + "models.pickerOrder.featured": "精選", + "models.pickerOrder.upModel": "上移 {model}", + "models.pickerOrder.downModel": "下移 {model}", + "models.pickerOrder.position": "{model}:第 {position} 位,共 {total} 個", + "models.pickerOrder.saveDraft": "儲存草稿", + "models.pickerOrder.reloadDraft": "捨棄草稿並重新載入", + "models.pickerOrder.catalogRequired": "模型識別資訊缺失或不明確。請重新載入模型頁面以更新目錄,再編輯自訂順序。", }; diff --git a/gui/src/i18n/zh.ts b/gui/src/i18n/zh.ts index d9f93f20c7..d20318ce42 100644 --- a/gui/src/i18n/zh.ts +++ b/gui/src/i18n/zh.ts @@ -2646,4 +2646,19 @@ export const zh: Record = { "usage.range.invalid": "请输入不早于 1970-01-01 UTC 的有效本地日期和时间。", "usage.range.reversed": "结束时间必须等于或晚于开始时间。", "usage.range.applied": "所选范围:{start} – {end}(包含两端)。", + "models.pickerOrder.editorHint": "调整路由模型顺序后保存草稿。精选行固定,原生模型不在此显示。", + "models.pickerOrder.nativeLocked": "已保存的顺序包含原生模型。请先应用路由预设或默认顺序,再编辑自定义顺序。", + "models.pickerOrder.unknownChosen": "精选模型信息未知。请重新加载后再编辑。", + "models.pickerOrder.changed": "模型选择设置已更改。草稿已保留;重新加载将丢弃草稿并使用当前设置。", + "models.pickerOrder.savedReload": "顺序已保存。再次编辑前请重新加载当前设置。", + "models.pickerOrder.requestFailed": "请求失败。草稿已保留;请重试或重新加载。", + "models.pickerOrder.empty": "没有可用的路由模型。", + "models.pickerOrder.dragModel": "拖动 {model}", + "models.pickerOrder.featured": "精选", + "models.pickerOrder.upModel": "上移 {model}", + "models.pickerOrder.downModel": "下移 {model}", + "models.pickerOrder.position": "{model}:第 {position} 位,共 {total} 个", + "models.pickerOrder.saveDraft": "保存草稿", + "models.pickerOrder.reloadDraft": "丢弃草稿并重新加载", + "models.pickerOrder.catalogRequired": "模型标识信息缺失或不明确。请重新加载模型页面以刷新目录,再编辑自定义顺序。", }; diff --git a/gui/src/model-picker-order.ts b/gui/src/model-picker-order.ts index dfa5073b08..0de6190f02 100644 --- a/gui/src/model-picker-order.ts +++ b/gui/src/model-picker-order.ts @@ -11,7 +11,7 @@ export interface PickerOrderSaved { pickerOrder: string[]; pickerOrderMode: SavedModelPickerOrderMode | null; } -export interface PickerOrderSettings extends PickerOrderSaved { pickerAvailable: string[] } +export interface PickerOrderSettings extends PickerOrderSaved { pickerAvailable: string[]; chosen?: string[] } function stringList(value: unknown): value is string[] { return Array.isArray(value) && value.every(id => typeof id === "string" && id.trim().length > 0); @@ -25,7 +25,11 @@ export function isPickerOrderSaved(value: unknown): value is PickerOrderSaved { return stringList(row.pickerOrder) && savedMode(row.pickerOrderMode); } export function isPickerOrderSettings(value: unknown): value is PickerOrderSettings { - return isPickerOrderSaved(value) && stringList((value as PickerOrderSettings).pickerAvailable); + if (!isPickerOrderSaved(value)) return false; + const row = value as PickerOrderSettings; + // Roster writes accept every string, including blanks; picker fields remain nonempty-string lists. + return stringList(row.pickerAvailable) && (!("chosen" in row) + || (Array.isArray(row.chosen) && row.chosen.every(id => typeof id === "string"))); } export function isModelPickerUsage(value: unknown): value is ModelPickerUsage[] { return Array.isArray(value) && value.every(row => row !== null && typeof row === "object" @@ -104,3 +108,71 @@ export function modelPickerOrderMode( } return "custom"; } + + +/** Resolve exact canonical ids before legacy provider/raw spellings; never guess a bare native id. */ +export function normalizePickerIds(ids: readonly string[], available: readonly string[], identities: readonly PickerModelIdentity[]): string[] { + const candidates = new Set(available.filter(id => id.includes("/"))); + const resolve = (id: string): string | undefined => { + if (candidates.has(id)) return id; + const matches = new Set(identities.filter(row => candidates.has(row.namespaced) + && id === `${row.provider}/${row.id}`).map(row => row.namespaced)); + return matches.size === 1 ? [...matches][0] : undefined; + }; + return [...new Set(ids.map(id => resolve(id.trim())).filter((id): id is string => id !== undefined))]; +} + +export function pickerSnapshotSignature(apiBase: string, generation: number, settings: PickerOrderSettings): string { + return JSON.stringify([apiBase, generation, settings.pickerAvailable, settings.chosen ?? null, + settings.pickerOrder, settings.pickerOrderMode]); +} + +/** Every candidate needs one observed provider/raw identity, with no encoded/raw collisions. */ +export function pickerIdentityCoverage(available: readonly string[], identities: readonly PickerModelIdentity[]): boolean { + const candidates = new Set(available.filter(id => id.includes("/"))); + const rawBySlug = new Map>(), slugsByRaw = new Map>(); + for (const row of identities) { + if (!candidates.has(row.namespaced)) continue; + const raw = `${row.provider}/${row.id}`; + const raws = rawBySlug.get(row.namespaced) ?? new Set(); + const slugs = slugsByRaw.get(raw) ?? new Set(); + raws.add(raw); slugs.add(row.namespaced); + rawBySlug.set(row.namespaced, raws); slugsByRaw.set(raw, slugs); + } + return [...candidates].every(slug => { + const raws = rawBySlug.get(slug); + return raws?.size === 1 && slugsByRaw.get([...raws][0]!)?.size === 1; + }); +} + +export function customPickerRows(settings: PickerOrderSettings, identities: readonly PickerModelIdentity[]): { order: string[]; fixed: string[] } | null { + // Unknown featured state and complete/native orders cannot safely become routed-only drafts. + if (settings.chosen === undefined || settings.pickerOrder.some(id => !id.includes("/"))) return null; + const available = [...new Set(settings.pickerAvailable.filter(id => id.includes("/")))]; + if (!pickerIdentityCoverage(available, identities)) return null; + // Roster strings stay verbatim. Map uses the LAST occurrence; each row prefers its exact canonical rank. + const chosenRank = new Map(settings.chosen.map((id, index) => [id, index])); + const rawBySlug = new Map(identities.map(row => [row.namespaced, `${row.provider}/${row.id}`])); + const rankOf = (slug: string) => chosenRank.get(slug) ?? chosenRank.get(rawBySlug.get(slug)!); + const fixed = available.filter(slug => rankOf(slug) !== undefined).sort((a, b) => rankOf(a)! - rankOf(b)!); + const saved = normalizePickerIds(settings.pickerOrder, available, identities); + return { fixed, order: [...new Set([...fixed, ...saved, ...available])] }; +} + +/** Drop semantics: remove first, re-find the target, then insert before it. */ +export function movePickerBefore(order: readonly string[], source: string, target: string, fixed: readonly string[]): string[] { + const next = [...order]; + if (source === target || fixed.includes(source) || fixed.includes(target) + || !next.includes(source) || !next.includes(target)) return next; + next.splice(next.indexOf(source), 1); + next.splice(next.indexOf(target), 0, source); + return next; +} + +/** Keyboard semantics deliberately differ from dropping before the next row. */ +export function stepPickerOrder(order: readonly string[], source: string, direction: -1 | 1, fixed: readonly string[]): string[] { + const next = [...order], index = next.indexOf(source), target = index + direction; + if (index < 0 || target < 0 || target >= next.length || fixed.includes(source) || fixed.includes(next[target]!)) return next; + [next[index], next[target]] = [next[target]!, next[index]!]; + return next; +} diff --git a/gui/src/pages/Models.tsx b/gui/src/pages/Models.tsx index bc010c4abc..55d9c16106 100644 --- a/gui/src/pages/Models.tsx +++ b/gui/src/pages/Models.tsx @@ -1,10 +1,11 @@ import { CodexStaleBanner } from "../components/codex-stale-banner"; +import ModelPickerOrderEditor from "../components/ModelPickerOrderEditor"; import ModelDisplayNameDialog from "../components/ModelDisplayNameDialog"; import ModelPriceDialog from "../components/ModelPriceDialog"; import { fetchCodexAppServerState } from "../codex-app-server-state"; import type { AppServerStateOutcome } from "../codex-app-server-state"; import { useCodexRestart } from "../use-codex-restart"; -import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"; import { Switch, Notice, EmptyState, Select, Tooltip } from "../ui"; import { IconChevron, IconBoxes, IconInfo, IconCheck, IconAlert, IconRefresh, IconPencil } from "../icons"; import { useT } from "../i18n/shared"; @@ -18,7 +19,7 @@ import { setClientResourceData } from "../client-resource"; import { createBoundedFetch, type BoundedFetch } from "../bounded-fetch"; import { isModelPickerUsage, isPickerOrderSaved, isPickerOrderSettings, modelPickerOrder, modelPickerOrderMode, - type ModelPickerOrderMode, type PickerOrderSettings, type ModelPickerUsage, + type ModelPickerOrderMode, type PickerOrderSettings, type PickerOrderSaved, type ModelPickerUsage, } from "../model-picker-order"; import { startVisibilityPoll } from "../visibility-poll"; import { useDataSurface } from "../data-surface"; @@ -253,6 +254,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; const [pickerDraft, setPickerDraft] = useState(null); const [pickerBusy, setPickerBusy] = useState(false); const pickerFlight = useRef(null); + const pickerGeneration = useRef(0); const pickerResource = useDataSurface( pickerCacheKey, [apiBase], useCallback(async (signal: AbortSignal) => { @@ -269,16 +271,22 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; const pickerMode = pickerDraft ?? modelPickerOrderMode( pickerSettings?.pickerAvailable ?? [], pickerSettings?.pickerOrder ?? [], pickerSettings?.pickerOrderMode, ); - useEffect(() => { + useLayoutEffect(() => { + pickerGeneration.current++; setPickerDraft(null); setPickerBusy(false); return () => { + pickerGeneration.current++; pickerFlight.current?.controller.abort(); pickerFlight.current?.clear(); pickerFlight.current = null; cancelAppServerRead(); }; }, [apiBase, catalogActive, cancelAppServerRead]); + useLayoutEffect(() => { + // Pin inferred Custom before any late GET can switch mode and unmount its draft. + if (catalogActive && pickerDraft === null && pickerMode === "custom") setPickerDraft("custom"); + }, [catalogActive, pickerDraft, pickerMode]); const [customCap, setCustomCap] = useState(""); const [showCustom, setShowCustom] = useState(false); const [providerCapCustomOpen, setProviderCapCustomOpen] = useState>({}); @@ -1825,49 +1833,61 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; ? groups.filter(group => group.provider === selectedProvider) : groups; + const acceptPickerOrder = (data: PickerOrderSaved & { catalogRefresh?: unknown }, custom = false) => { + // A receipt proves only the saved fields. No old chosen/available snapshot is promoted. + const next: PickerOrderSettings = { pickerOrder: data.pickerOrder, pickerOrderMode: data.pickerOrderMode, pickerAvailable: [] }; + setClientResourceData(pickerCacheKey, next); + writeSessionListCache(pickerCacheKey, next); + if (custom) setPickerDraft("custom"); + pickerResource.refresh(); + const refresh = data.catalogRefresh; + const converged = refresh !== null && typeof refresh === "object" + && "status" in refresh && refresh.status === "committed" + && "degraded" in refresh && refresh.degraded === false; + publishFeedback(converged, t(converged ? "models.pickerOrder.saved" : "models.pickerOrder.pending")); + void reloadAppServerState(); + }; + const savePickerOrder = async () => { if (pickerFlight.current || !pickerSettings || pickerResource.state.showError || pickerMode === "custom") return; + const owner = pickerGeneration.current; const mode = pickerMode; const available = pickerSettings.pickerAvailable; const bounded = createBoundedFetch(15_000); pickerFlight.current = bounded; setPickerBusy(true); + const owns = () => pickerGeneration.current === owner && pickerFlight.current === bounded; + const current = () => owns() && !bounded.signal.aborted; try { let usage: ModelPickerUsage[] = []; if (mode === "most-used") { const response = await fetch(`${apiBase}/api/usage?range=all&surface=all`, { signal: bounded.signal }); + if (!current()) return; const payload = await readJsonOrThrow<{ models?: unknown }>(response, t("models.pickerOrder.usageFailed")); + if (!current()) return; if (!isModelPickerUsage(payload?.models)) throw new Error(t("models.pickerOrder.usageFailed")); usage = payload.models; } + if (!current()) return; const order = modelPickerOrder(mode, available, usage, models); const response = await fetch(`${apiBase}/api/subagent-models`, { method: "PUT", headers: { "Content-Type": "application/json" }, signal: bounded.signal, body: JSON.stringify({ pickerOrder: order, pickerOrderMode: mode === "default" ? null : mode }), }); + if (!current()) return; const data = await readJsonOrThrow(response, t("models.saveFailed")); if (!isPickerOrderSaved(data) || !("ok" in data) || data.ok !== true) throw new Error(t("models.saveFailed")); - if (bounded.signal.aborted || pickerFlight.current !== bounded) return; - const next = { ...pickerSettings, pickerOrder: data.pickerOrder, pickerOrderMode: data.pickerOrderMode }; - // This aborts an older GET and advances the shared resource generation. - setClientResourceData(pickerCacheKey, next); - writeSessionListCache(pickerCacheKey, next); + if (!current()) return; + acceptPickerOrder({ pickerOrder: data.pickerOrder, pickerOrderMode: data.pickerOrderMode, + catalogRefresh: "catalogRefresh" in data ? data.catalogRefresh : undefined }); setPickerDraft(null); - - const refresh = "catalogRefresh" in data ? data.catalogRefresh : undefined; - const converged = refresh !== null && typeof refresh === "object" - && "status" in refresh && refresh.status === "committed" - && "degraded" in refresh && refresh.degraded === false; - publishFeedback(converged, t(converged ? "models.pickerOrder.saved" : "models.pickerOrder.pending")); - // Durable save is already accepted. Observational failure must not undo it. - void reloadAppServerState(); } catch (error) { - if (pickerFlight.current === bounded) { + if (owns()) { publishFeedback(false, error instanceof Error ? error.message : t("models.networkError")); } } finally { bounded.clear(); - if (pickerFlight.current === bounded) { pickerFlight.current = null; setPickerBusy(false); } + if (owns()) { pickerFlight.current = null; setPickerBusy(false); } } }; @@ -2039,7 +2059,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; { value: "alphabetical", label: t("models.pickerOrder.alphabetical") }, { value: "provider", label: t("models.pickerOrder.provider") }, { value: "most-used", label: t("models.pickerOrder.mostUsed") }, - ...(pickerMode === "custom" ? [{ value: "custom", label: t("models.pickerOrder.custom") }] : []), + { value: "custom", label: t("models.pickerOrder.custom") }, ]} onChange={value => setPickerDraft(value as ModelPickerOrderMode)} disabled={pickerBusy || !pickerSettings || pickerResource.state.showError} @@ -2058,6 +2078,9 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string; } {t("models.pickerOrder.hint")} + {pickerMode === "custom" && acceptPickerOrder(data, true)} />} + {(() => { const customCount = models.filter(m => m.custom).length; diff --git a/gui/src/styles-models-workspace.css b/gui/src/styles-models-workspace.css index 6195a7b24f..67872711e2 100644 --- a/gui/src/styles-models-workspace.css +++ b/gui/src/styles-models-workspace.css @@ -648,3 +648,10 @@ } } .models-integration-warning { overflow-wrap: anywhere; } + +.picker-order-editor { margin-block: 12px; } +.picker-order-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 8px; } +.picker-order-row { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; padding-block: 4px; } +.picker-order-name { flex: 1; min-width: 0; overflow-wrap: anywhere; } +.picker-order-actions { display: inline-flex; flex-shrink: 0; gap: 2px; } +.picker-order-row .cwi-target-grip:disabled { cursor: default; opacity: 0.5; } diff --git a/gui/tests/model-picker-order-editor.test.tsx b/gui/tests/model-picker-order-editor.test.tsx new file mode 100644 index 0000000000..7cfeb6b326 --- /dev/null +++ b/gui/tests/model-picker-order-editor.test.tsx @@ -0,0 +1,358 @@ +import { afterEach, beforeEach, expect, test } from "bun:test"; +import { Window } from "happy-dom"; +import { act } from "react"; +import type { Root } from "react-dom/client"; +import Models from "../src/pages/Models"; +import { clearClientResourceStoresForTests, setClientResourceData } from "../src/client-resource"; +import ModelPickerOrderEditor from "../src/components/ModelPickerOrderEditor"; +import { LanguageProvider } from "../src/i18n/provider"; +import type { PickerModelIdentity, PickerOrderSettings, PickerOrderSaved } from "../src/model-picker-order"; + +const globals = ["document", "window", "navigator", "localStorage", "sessionStorage", "fetch", "crypto", "IS_REACT_ACT_ENVIRONMENT"] as const; +const ids: PickerModelIdentity[] = ["f", "a", "b", "c"].map(id => ({ provider: "p", id, namespaced: `p/${id}` })); +const initial = (): PickerOrderSettings => ({ pickerAvailable: ["p/f", "p/a", "p/b", "p/c"], + chosen: ["native", "p/f"], pickerOrder: ["p/a", "p/b", "p/c", "p/f"], pickerOrderMode: null }); +const changedDraft = ["p/f", "p/b", "p/a", "p/c"]; +function deferred() { + let resolve!: (value: T) => void, reject!: (error: Error) => void; + const promise = new Promise((yes, no) => { resolve = yes; reject = no; }); + return { promise, resolve, reject }; +} +type Request = ReturnType> & { url: string; method: string; body: unknown; signal?: AbortSignal | null }; +let previous: Map; +let win: Window, host: HTMLElement, root: Root | null; +let requests: Request[], receipts: Array, busy: boolean[]; +const onAccepted = (value: PickerOrderSaved & { catalogRefresh?: unknown }) => { receipts.push(value); }; +const onBusyChange = (value: boolean) => { busy.push(value); }; + +beforeEach(() => { + clearClientResourceStoresForTests(); + previous = new Map(globals.map(key => [key, Object.getOwnPropertyDescriptor(globalThis, key)])); + win = new Window({ url: "http://localhost/#models" }); + win.localStorage.setItem("ocx-lang", "en"); + const values = { document: win.document, window: win, navigator: win.navigator, + localStorage: win.localStorage, sessionStorage: win.sessionStorage, IS_REACT_ACT_ENVIRONMENT: true }; + for (const [key, value] of Object.entries(values)) Object.defineProperty(globalThis, key, { configurable: true, value }); + requests = []; receipts = []; busy = []; root = null; + Object.defineProperty(globalThis, "fetch", { configurable: true, value: (input: RequestInfo | URL, init?: RequestInit) => { + // Intentionally ignores abort: late network/body completion must be fenced by the component. + const request = { ...deferred(), url: String(input), method: init?.method ?? "GET", + body: init?.body ? JSON.parse(String(init.body)) : undefined, signal: init?.signal }; + requests.push(request); return request.promise; + } }); + host = document.createElement("div"); document.body.append(host); +}); +afterEach(async () => { + if (root) await act(async () => { root!.unmount(); }); + clearClientResourceStoresForTests(); + win.close(); + for (const key of globals) { + const descriptor = previous.get(key); + if (descriptor) Object.defineProperty(globalThis, key, descriptor); + else Reflect.deleteProperty(globalThis, key); + } +}); +async function render(apiBase = "/a", identities = ids, active = true) { + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root ??= createRoot(host); + root.render(); + }); +} +async function reply(index: number, data: unknown, status = 200) { + await act(async () => { requests[index]!.resolve(Response.json(data, { status })); }); +} +const order = (within: ParentNode = host) => [...within.querySelectorAll(".picker-order-name")].map(row => row.textContent); +function button(name: string, within: ParentNode = host): HTMLButtonElement { + const found = [...within.querySelectorAll("button")] + .find(node => node.getAttribute("aria-label") === name || node.textContent === name); + if (!found) throw new Error(`Missing button: ${name}`); + return found; +} +async function click(name: string) { await act(async () => { button(name).click(); }); } +function row(id: string, within: ParentNode = host): HTMLElement { + const found = [...within.querySelectorAll("li")].find(node => node.querySelector("code")?.textContent === id); + if (!found) throw new Error(`Missing row: ${id}`); + return found; +} +function transfer() { + const data = new Map(); + return { effectAllowed: "uninitialized", dropEffect: "none", get types() { return [...data.keys()]; }, + setData: (type: string, value: string) => { data.set(type, value); }, getData: (type: string) => data.get(type) ?? "" }; +} +async function dragEvent(target: Element, type: string, dataTransfer: ReturnType) { + await act(async () => { + const event = new win.Event(type, { bubbles: true, cancelable: true }); + Object.defineProperty(event, "dataTransfer", { value: dataTransfer }); target.dispatchEvent(event); + }); +} +async function drop(source: string, target: string) { + const data = transfer(); + await dragEvent(button(`Drag ${source}`), "dragstart", data); + await dragEvent(row(target), "dragover", data); + await dragEvent(row(target), "drop", data); +} +async function edit() { await render(); await reply(0, initial()); await click("Move p/a down"); } + +// No sleeps, retries or real transport: each deferred settlement is explicitly released in act. +test("entering Custom reads a fresh GET each activation and only renders pickerAvailable", async () => { + await render("/a", ids, false); expect(requests).toHaveLength(0); + await render(); expect(requests.map(r => [r.url, r.method])).toEqual([["/a/api/subagent-models", "GET"]]); + expect(order()).toEqual([]); expect(busy.at(-1)).toBe(true); + await reply(0, { ...initial(), available: ["native", "other/roster-only"] }); + expect(order()).toEqual(["p/f", "p/a", "p/b", "p/c"]); expect(busy.at(-1)).toBe(false); + await render("/a", ids, false); await render(); expect(requests).toHaveLength(2); + await reply(1, { ...initial(), pickerOrder: ["p/c", "p/b", "p/a"] }); + expect(order()).toEqual(["p/f", "p/c", "p/b", "p/a"]); +}); + +for (const [name, override] of [ + ["missing", {}], ["null", { chosen: null }], ["non-array", { chosen: "p/f" }], ["invalid item", { chosen: [1] }], +] as const) test(`Custom cannot edit with ${name} chosen`, async () => { + await render(); + const { chosen: _chosen, ...settings } = initial(); + await reply(0, { ...settings, ...override }); + expect(order()).toEqual([]); expect(host.querySelector('[role="alert"]')).not.toBeNull(); + expect(button("Save draft").disabled).toBe(true); + await click("Save draft"); expect(requests).toHaveLength(1); +}); +test("saved bare native order remains locked without sending a replacement", async () => { + await render(); await reply(0, { ...initial(), pickerOrder: ["native", "p/a"] }); + expect(host.textContent).toContain("This saved order includes native models."); + expect(button("Save draft").disabled).toBe(true); expect(receipts).toEqual([]); + expect(requests.map(r => r.method)).toEqual(["GET"]); +}); + +test("forward/backward drop and Up/Down controls submit the complete routed list only", async () => { + await render(); await reply(0, initial()); + expect(button("Move p/f down").disabled).toBe(true); expect(button("Move p/a up").disabled).toBe(true); + await drop("p/a", "p/c"); expect(order()).toEqual(["p/f", "p/b", "p/a", "p/c"]); + await drop("p/c", "p/b"); expect(order()).toEqual(["p/f", "p/c", "p/b", "p/a"]); + button("Move p/c down").focus(); await click("Move p/c down"); + expect(order()).toEqual(["p/f", "p/b", "p/c", "p/a"]); + expect(document.activeElement).toBe(button("Move p/c down")); + await click("Move p/a up"); expect(order()).toEqual(changedDraft); + expect(host.querySelector('[role="status"]')?.textContent).toBe("p/a: position 3 of 4"); + await click("Save draft"); expect(requests.map(r => r.method)).toEqual(["GET", "GET"]); + await reply(1, initial()); + expect(requests[2]?.method).toBe("PUT"); + expect(requests[2]?.body).toEqual({ pickerOrder: changedDraft, pickerOrderMode: null }); +}); + +test("external, self, fixed and expired drag tokens cannot reorder", async () => { + await render(); await reply(0, initial()); + const original = ["p/f", "p/a", "p/b", "p/c"], external = transfer(); + external.setData("application/x-ocx-picker-order", "external"); + await dragEvent(row("p/b"), "drop", external); expect(order()).toEqual(original); + await drop("p/a", "p/a"); await drop("p/a", "p/f"); expect(order()).toEqual(original); + const local = transfer(); await dragEvent(button("Drag p/a"), "dragstart", local); + await dragEvent(row("p/b"), "drop", external); expect(order()).toEqual(original); + await dragEvent(row("p/b"), "drop", local); expect(order()).toEqual(original); + await dragEvent(button("Drag p/a"), "dragstart", local); + await dragEvent(row("p/a"), "dragend", local); + await dragEvent(row("p/c"), "drop", local); expect(order()).toEqual(original); +}); + +test("preflight roster drift blocks PUT, preserves draft, and requires explicit reload", async () => { + await edit(); await click("Save draft"); + const updated = { ...initial(), chosen: ["p/b"] }; + await reply(1, updated); + expect(order()).toEqual(changedDraft); expect(button("Save draft").disabled).toBe(true); + expect(host.textContent).toContain("Picker settings changed."); + await click("Save draft"); expect(requests.map(r => r.method)).toEqual(["GET", "GET"]); + await click("Reload and discard draft"); expect(order()).toEqual(changedDraft); + await reply(2, updated); expect(order()).toEqual(["p/b", "p/a", "p/c", "p/f"]); + expect(button("Move p/a down").disabled).toBe(false); expect(receipts).toEqual([]); +}); + +for (const failure of ["rejected", "malformed JSON", "malformed receipt", "network"] as const) + test(`failed PUT (${failure}) retains draft for a fresh preflight retry`, async () => { + await edit(); await click("Save draft"); await reply(1, initial()); + if (failure === "network") await act(async () => { requests[2]!.reject(new Error("offline")); }); + else if (failure === "malformed JSON") await act(async () => { requests[2]!.resolve(new Response("{")); }); + else await reply(2, failure === "rejected" ? { error: "refused" } : { ok: true, pickerOrder: [] }, failure === "rejected" ? 409 : 200); + expect(order()).toEqual(changedDraft); expect(receipts).toEqual([]); + expect(host.textContent).toContain("Request failed. Your draft is kept;"); + expect(button("Save draft").disabled).toBe(false); + await click("Save draft"); expect(requests[3]?.method).toBe("GET"); + await reply(3, initial()); expect(requests[4]?.body).toEqual({ pickerOrder: changedDraft, pickerOrderMode: null }); + }); + +test("pending accepted receipt publishes saved fields and requires reload before editing again", async () => { + await edit(); await click("Save draft"); await reply(1, initial()); + const accepted = { pickerOrder: changedDraft, pickerOrderMode: null, catalogRefresh: { status: "pending", degraded: true } }; + await reply(2, { ok: true, ...accepted, chosen: ["stale/receipt-choice"], pickerAvailable: ["stale/candidate"] }); + expect(receipts).toEqual([accepted]); expect(order()).toEqual(changedDraft); + expect(host.textContent).toContain("Order saved. Reload current settings before editing again."); + expect(button("Save draft").disabled).toBe(true); expect(button("Move p/a down").disabled).toBe(true); + expect(busy.at(-1)).toBe(false); expect(requests).toHaveLength(3); + await click("Reload and discard draft"); + await reply(3, { ...initial(), pickerOrder: changedDraft }); + expect(button("Move p/a down").disabled).toBe(false); +}); + +const stages = ["initial GET", "preflight GET", "preflight body", "PUT", "receipt body"] as const; +type Stage = typeof stages[number]; +async function pauseAt(stage: Stage): Promise<() => Promise> { + await render(); + if (stage === "initial GET") return () => reply(0, initial()); + await reply(0, initial()); await click("Move p/a down"); await click("Save draft"); + if (stage === "preflight GET") return () => reply(1, initial()); + if (stage !== "preflight body") await reply(1, initial()); + const accepted = { ok: true, pickerOrder: changedDraft, pickerOrderMode: null, catalogRefresh: { status: "pending" } }; + if (stage === "PUT") return () => reply(2, accepted); + const body = deferred(); let reads = 0; + const response = new Response(); + Object.defineProperty(response, "text", { value: () => { reads++; return body.promise; } }); + await act(async () => { requests[stage === "preflight body" ? 1 : 2]!.resolve(response); }); + expect(reads).toBe(1); // The deferred body is actually reached before changing owner/identity. + return async () => { await act(async () => { body.resolve(JSON.stringify(stage === "preflight body" ? initial() : accepted)); }); }; +} + +for (const stage of stages) { + test(`late ${stage} after unmount cannot write, publish a receipt or reset busy`, async () => { + const settle = await pauseAt(stage), count = requests.length; + await act(async () => { root!.unmount(); root = null; }); + const settledBusy = [...busy]; + expect(requests[count - 1]!.signal?.aborted).toBe(true); + await settle(); + expect(requests).toHaveLength(count); expect(receipts).toEqual([]); + expect(busy).toEqual(settledBusy); expect(host.textContent).toBe(""); + }); + test(`late ${stage} from API A→B→A cannot affect the new A flight`, async () => { + const settle = await pauseAt(stage); + await render("/b"); await render("/a"); + const count = requests.length, current = count - 1, settledBusy = [...busy]; + expect(requests[current]?.url).toBe("/a/api/subagent-models"); expect(busy.at(-1)).toBe(true); + expect(requests[current - 1]!.signal?.aborted).toBe(true); + await settle(); + expect(requests).toHaveLength(count); expect(receipts).toEqual([]); expect(order()).toEqual([]); + expect(busy).toEqual(settledBusy); // Old finally must not clear the successor's busy state. + await reply(current, { ...initial(), pickerOrder: ["p/c", "p/a", "p/b"] }); + expect(order()).toEqual(["p/f", "p/c", "p/a", "p/b"]); + }); + test(`identity drift during ${stage} suppresses stale snapshot, PUT and receipt publication`, async () => { + const settle = await pauseAt(stage), count = requests.length; + await render("/a", ids.map(row => row.id === "a" ? { ...row, id: "raw/a" } : row)); + await settle(); + expect(requests).toHaveLength(count); expect(receipts).toEqual([]); expect(busy.at(-1)).toBe(false); + expect(order()).toEqual(stage === "initial GET" ? [] : changedDraft); + expect(button("Save draft").disabled).toBe(true); + if (stage !== "initial GET") expect(host.textContent).toContain("Picker settings changed."); + // Reload, not the stale operation, is allowed to accept current identities. + await click("Reload and discard draft"); await reply(count, initial()); + expect(button("Move p/a down").disabled).toBe(false); + }); +} + + +for (const chosen of [[""], [" "]]) test(`blank chosen ${JSON.stringify(chosen)} keeps routed editing available`, async () => { + await render(); await reply(0, { ...initial(), chosen }); + expect(order()).toEqual(["p/a", "p/b", "p/c", "p/f"]); + expect(host.querySelector('[role="alert"]')).toBeNull(); + expect(button("Move p/f up").disabled).toBe(false); + await click("Move p/a down"); expect(button("Save draft").disabled).toBe(false); +}); + +for (const availability of ["absent", "throws"] as const) + test(`LAN drag with randomUUID ${availability}: same-editor works; cross-editor and stale tokens fail`, async () => { + Object.defineProperty(globalThis, "crypto", { configurable: true, value: availability === "absent" ? {} + : { randomUUID: () => { throw new Error("insecure context"); } } }); + const { createRoot } = await import("react-dom/client"); + await act(async () => { + root = createRoot(host); + root.render({["left", "right"].map(name =>
+ +
)}
); + }); + await reply(requests.findIndex(r => r.url === "/left/api/subagent-models"), initial()); + await reply(requests.findIndex(r => r.url === "/right/api/subagent-models"), initial()); + const left = host.querySelector('[data-editor="left"]')!; + const right = host.querySelector('[data-editor="right"]')!; + const original = ["p/f", "p/a", "p/b", "p/c"], type = "application/x-ocx-picker-order"; + const leftDrag = transfer(), rightDrag = transfer(); + await dragEvent(button("Drag p/a", left), "dragstart", leftDrag); + await dragEvent(button("Drag p/a", right), "dragstart", rightDrag); + expect(leftDrag.getData(type)).not.toBe(""); + expect(leftDrag.getData(type)).not.toBe(rightDrag.getData(type)); + // Both editors have active local drags: rejection must compare identities, not just presence. + await dragEvent(row("p/c", right), "drop", leftDrag); expect(order(right)).toEqual(original); + await dragEvent(row("p/c", left), "drop", leftDrag); expect(order(left)).toEqual(changedDraft); + const fresh = transfer(); await dragEvent(button("Drag p/b", left), "dragstart", fresh); + expect(fresh.getData(type)).not.toBe(leftDrag.getData(type)); + await dragEvent(row("p/c", left), "drop", leftDrag); expect(order(left)).toEqual(changedDraft); + await dragEvent(row("p/c", left), "drop", fresh); expect(order(left)).toEqual(changedDraft); + const ended = transfer(); await dragEvent(button("Drag p/b", left), "dragstart", ended); + await dragEvent(row("p/b", left), "dragend", ended); + await dragEvent(row("p/c", left), "drop", ended); expect(order(left)).toEqual(changedDraft); + const retry = transfer(); await dragEvent(button("Drag p/a", right), "dragstart", retry); + await dragEvent(row("p/c", right), "drop", retry); expect(order(right)).toEqual(changedDraft); + expect(requests.map(r => r.method)).toEqual(["GET", "GET"]); expect(receipts).toEqual([]); + }); + + +test("fresh legacy featured settings cannot unlock a row missing from the model identity catalog", async () => { + const settings = { pickerAvailable: ["p/team-model", "p/a"], chosen: ["p/team/model"], pickerOrder: [], pickerOrderMode: null }; + const a = { provider: "p", id: "a", namespaced: "p/a" }; + await render("/a", [a]); await reply(0, settings); + expect(order()).toEqual([]); expect(button("Save draft").disabled).toBe(true); + expect(host.textContent).toContain("Reload the Models page to refresh its catalog"); + await click("Reload and discard draft"); await reply(1, settings); + expect(order()).toEqual([]); // Settings-only reload cannot repair a missing model catalog. + await render("/a", [a, { provider: "p", id: "team/model", namespaced: "p/team-model" }]); + await click("Reload and discard draft"); await reply(2, settings); + expect(order()).toEqual(["p/team-model", "p/a"]); + expect(button("Drag p/team-model").disabled).toBe(true); + expect(requests.map(r => r.method)).toEqual(["GET", "GET", "GET"]); +}); + +test("duplicate featured choices use last occurrence and padded roster strings do not lock rows", async () => { + await render(); await reply(0, { ...initial(), chosen: ["p/a", "p/b", "p/a", " p/c "] }); + expect(order()).toEqual(["p/b", "p/a", "p/c", "p/f"]); + expect(button("Drag p/b").disabled).toBe(true); expect(button("Drag p/a").disabled).toBe(true); + expect(button("Drag p/c").disabled).toBe(false); +}); + +test("Models pins cache-inferred Custom across late parent GET publication, then resets on API change", async () => { + const modelRows = ids.map(row => ({ ...row, disabled: false })); + const catalog = { models: modelRows, providers: [{ name: "p" }], selectedModels: {}, disabled: [], + contextCaps: {}, contextCapValue: 350_000 }; + const custom = { ...initial(), pickerOrder: ["p/c", "p/a", "p/f", "p/b"] }; + for (const base of ["/a", "/b"]) { + win.sessionStorage.setItem(`ocx.models.catalog.v1:${base}`, JSON.stringify(catalog)); + win.sessionStorage.setItem(`ocx.models.catalog.v1:${base}:picker-order`, JSON.stringify(base === "/a" ? custom + : { ...initial(), pickerOrder: [] })); + } + const deferredFetch = globalThis.fetch; + Object.defineProperty(globalThis, "fetch", { configurable: true, value: (input: RequestInfo | URL, init?: RequestInit) => { + const path = String(input); + if (path.endsWith("/api/subagent-models")) return deferredFetch(input, init); + const payload = path.endsWith("/api/models") ? modelRows + : path.endsWith("/api/providers") ? catalog.providers + : path.endsWith("/api/provider-context-caps") ? { caps: {} } + : path.endsWith("/api/selected-models") ? { selected: {} } + : path.endsWith("/api/aliases") ? { providers: {}, models: {}, defaults: { global: false, providers: {} } } + : undefined; + return Promise.resolve(payload === undefined ? new Response(null, { status: 404 }) : Response.json(payload)); + } }); + const { createRoot } = await import("react-dom/client"); + await act(async () => { root = createRoot(host); root.render(); }); + // Parent resource and editor have separate initial reads; resolve both without relying on effect order. + const initialReads = requests.map((request, index) => ({ request, index })); + expect(initialReads).toHaveLength(2); + for (const { index } of initialReads) await reply(index, custom); + expect(order()).toEqual(["p/f", "p/c", "p/a", "p/b"]); + await click("Move p/a down"); const editor = host.querySelector(".picker-order-editor"); + expect(order()).toEqual(["p/f", "p/c", "p/b", "p/a"]); expect(button("Save draft").disabled).toBe(false); + // Integration seam: publish the same parent resource state a late GET would install. + const late = deferred(); + const publication = late.promise.then(value => setClientResourceData("ocx.models.catalog.v1:/a:picker-order", value)); + await act(async () => { late.resolve({ ...initial(), pickerOrderMode: "provider" }); await publication; }); + expect(host.querySelector(".picker-order-editor")).toBe(editor); + expect(order()).toEqual(["p/f", "p/c", "p/b", "p/a"]); expect(button("Save draft").disabled).toBe(false); + expect(requests.every(r => r.method === "GET")).toBe(true); + await act(async () => { root!.render(); }); + expect(host.querySelector(".picker-order-editor")).toBeNull(); +}); diff --git a/gui/tests/model-picker-order.test.ts b/gui/tests/model-picker-order.test.ts index 29c72c0b16..50f79d0b15 100644 --- a/gui/tests/model-picker-order.test.ts +++ b/gui/tests/model-picker-order.test.ts @@ -1,7 +1,7 @@ import { expect, test } from "bun:test"; import { summarizeUsage } from "../../src/usage/summary"; import type { PersistedUsageEntry } from "../../src/usage/log"; -import { isModelPickerUsage, isPickerOrderSaved, isPickerOrderSettings, modelPickerOrder, modelPickerOrderMode } from "../src/model-picker-order"; +import { pickerIdentityCoverage, customPickerRows, normalizePickerIds, pickerSnapshotSignature, movePickerBefore, stepPickerOrder, isModelPickerUsage, isPickerOrderSaved, isPickerOrderSettings, modelPickerOrder, modelPickerOrderMode } from "../src/model-picker-order"; const models = ["zeta/beta", "alpha/zeta", "alpha/alpha"]; @@ -77,3 +77,110 @@ test("real mixed-resolved usage summary never credits an entire legacy bucket to expect(modelPickerOrder("most-used", ["p/c", "p/b", "p/a"], summary.models)) .toEqual(["p/a", "p/b", "p/c"]); }); + + +test("Custom normalizes exact canonical names before provider/raw aliases, without native guesses", () => { + const identities = [ + { provider: "p", id: "team/model", namespaced: "p/team-model" }, + { provider: "p", id: "collision", namespaced: "p/a" }, + { provider: "p", id: "collision", namespaced: "p/b" }, + ]; + expect(normalizePickerIds(["p/team/model", "p/collision", "native", "p/team-model"], + ["p/team-model", "p/a", "p/b"], identities)).toEqual(["p/team-model"]); + expect(normalizePickerIds(["p/team/model"], ["p/team/model", "p/team-model"], identities)).toEqual(["p/team/model"]); +}); + +test("featured rank wins, survivors retain saved order, newcomers follow GET candidate order", () => { + expect(customPickerRows({ pickerAvailable: ["p/new", "p/b", "p/a", "p/top", "p/b"], + chosen: ["native", "p/top", "p/a", "missing/model"], pickerOrder: ["gone/model", "p/b", "p/a"], pickerOrderMode: null, + }, ["new", "b", "a", "top"].map(id => ({ provider: "p", id, namespaced: `p/${id}` })))).toEqual({ fixed: ["p/top", "p/a"], order: ["p/top", "p/a", "p/b", "p/new"] }); + expect(customPickerRows({ pickerAvailable: [], chosen: [], pickerOrder: [], pickerOrderMode: null }, [])) + .toEqual({ fixed: [], order: [] }); +}); + +test("unknown chosen cannot edit; malformed supplied chosen rejects; native saved ids remain untouched", () => { + const settings = { pickerAvailable: ["p/a"], pickerOrder: ["native", "p/a"], pickerOrderMode: null }; + expect(isPickerOrderSettings(settings)).toBe(true); + expect(customPickerRows(settings, [])).toBeNull(); + expect(customPickerRows({ ...settings, chosen: [] }, [])).toBeNull(); + expect(settings.pickerOrder).toEqual(["native", "p/a"]); + expect(customPickerRows({ ...settings, pickerOrder: [] }, [])).toBeNull(); + for (const chosen of [null, undefined, "p/a", [2]]) expect(isPickerOrderSettings({ ...settings, chosen })).toBe(false); + expect(isPickerOrderSettings({ ...settings, chosen: [] })).toBe(true); +}); + +test("snapshot binds base, activation, candidate sequence, chosen, saved order and provenance", () => { + const settings = { pickerAvailable: ["p/b", "p/a"], chosen: [], pickerOrder: ["p/a"], pickerOrderMode: null }; + const expected = '["/a",7,["p/b","p/a"],[],["p/a"],null]'; + expect(pickerSnapshotSignature("/a", 7, settings)).toBe(expected); + expect(pickerSnapshotSignature("/b", 7, settings)).not.toBe(expected); + expect(pickerSnapshotSignature("/a", 9, settings)).not.toBe(expected); // A → B → A + for (const changed of [ + { ...settings, pickerAvailable: ["p/a", "p/b"] }, { ...settings, chosen: ["p/a"] }, + { ...settings, pickerOrder: [] }, { ...settings, pickerOrderMode: "provider" as const }, + { pickerAvailable: settings.pickerAvailable, pickerOrder: settings.pickerOrder, pickerOrderMode: null }, + ]) expect(pickerSnapshotSignature("/a", 7, changed)).not.toBe(expected); +}); + +test("drop-before re-finds target after removal, while keyboard Down swaps adjacent movable rows", () => { + const order = ["p/featured", "p/a", "p/b", "p/c"], fixed = ["p/featured"]; + expect(movePickerBefore(order, "p/a", "p/c", fixed)).toEqual(["p/featured", "p/b", "p/a", "p/c"]); + expect(movePickerBefore(order, "p/c", "p/a", fixed)).toEqual(["p/featured", "p/c", "p/a", "p/b"]); + expect(movePickerBefore(order, "p/a", "p/b", fixed)).toEqual(order); + expect(stepPickerOrder(order, "p/a", 1, fixed)).toEqual(["p/featured", "p/b", "p/a", "p/c"]); + expect(stepPickerOrder(order, "p/c", -1, fixed)).toEqual(["p/featured", "p/a", "p/c", "p/b"]); + for (const [source, target] of [["outside", "p/a"], ["p/a", "outside"], ["p/a", "p/a"], ["p/featured", "p/b"], ["p/b", "p/featured"]]) + expect(movePickerBefore(order, source!, target!, fixed)).toEqual(order); + expect(stepPickerOrder(order, "p/a", -1, fixed)).toEqual(order); + expect(stepPickerOrder(order, "p/c", 1, fixed)).toEqual(order); + expect(order).toEqual(["p/featured", "p/a", "p/b", "p/c"]); +}); + + +test("blank roster strings retain GET compatibility and preset provenance without becoming featured rows", () => { + for (const blank of ["", " "]) { + const settings = { pickerAvailable: models, chosen: [blank], pickerOrder: ["alpha/alpha", "alpha/zeta", "zeta/beta"], + pickerOrderMode: "provider" as const }; + expect(isPickerOrderSettings(settings)).toBe(true); + expect(normalizePickerIds(settings.chosen, models, [])).toEqual([]); + const identities = [{ provider: "alpha", id: "alpha", namespaced: "alpha/alpha" }, + { provider: "alpha", id: "zeta", namespaced: "alpha/zeta" }, { provider: "zeta", id: "beta", namespaced: "zeta/beta" }]; + expect(customPickerRows(settings, identities)).toEqual({ fixed: [], order: ["alpha/alpha", "alpha/zeta", "zeta/beta"] }); + expect(modelPickerOrderMode(models, settings.pickerOrder, settings.pickerOrderMode)).toBe("provider"); + expect(modelPickerOrder("alphabetical", settings.pickerAvailable)).toEqual(["alpha/alpha", "zeta/beta", "alpha/zeta"]); + expect(settings.chosen).toEqual([blank]); // Normalization must not rewrite the saved roster. + expect(isPickerOrderSettings({ ...settings, pickerOrder: [""] })).toBe(false); + expect(isPickerOrderSettings({ ...settings, pickerAvailable: [" "] })).toBe(false); + } + expect(normalizePickerIds(["", " ", "alpha/zeta"], models, [])).toEqual(["alpha/zeta"]); +}); + + +test("incomplete or ambiguous catalog identities block projection, even with canonical candidates", () => { + const settings = { pickerAvailable: ["p/team-model", "p/a"], chosen: ["p/team/model"], pickerOrder: [], pickerOrderMode: null }; + const team = { provider: "p", id: "team/model", namespaced: "p/team-model" }; + const a = { provider: "p", id: "a", namespaced: "p/a" }; + for (const identities of [[], [a], [team], [team, a, { ...team, namespaced: "p/a" }], + [team, a, { ...team, id: "team-model" }]]) { + expect(pickerIdentityCoverage(settings.pickerAvailable, identities)).toBe(false); + expect(customPickerRows(settings, identities)).toBeNull(); + } + expect(pickerIdentityCoverage(settings.pickerAvailable, [team, a, { ...team }])).toBe(true); + expect(customPickerRows(settings, [team, a])).toEqual({ fixed: ["p/team-model"], order: ["p/team-model", "p/a"] }); +}); + +test("featured ranks use last duplicate, exact canonical precedence, and untrimmed roster strings", () => { + const identities = [{ provider: "p", id: "team/model", namespaced: "p/team-model" }, + { provider: "p", id: "a", namespaced: "p/a" }, { provider: "p", id: "b", namespaced: "p/b" }]; + const settings = { pickerAvailable: ["p/team-model", "p/a", "p/b"], pickerOrder: [], pickerOrderMode: null }; + expect(customPickerRows({ ...settings, chosen: ["p/a", "p/b", "p/a"] }, identities)) + .toEqual({ fixed: ["p/b", "p/a"], order: ["p/b", "p/a", "p/team-model"] }); + expect(customPickerRows({ ...settings, chosen: ["p/team/model", "p/b", "p/team-model"] }, identities)) + .toEqual({ fixed: ["p/b", "p/team-model"], order: ["p/b", "p/team-model", "p/a"] }); + expect(customPickerRows({ ...settings, chosen: ["p/team-model", "p/b", "p/team/model"] }, identities)) + .toEqual({ fixed: ["p/team-model", "p/b"], order: ["p/team-model", "p/b", "p/a"] }); + const chosen = [" p/a ", "", " "]; + expect(customPickerRows({ ...settings, chosen, pickerOrder: [" p/a "] }, identities)) + .toEqual({ fixed: [], order: ["p/a", "p/team-model", "p/b"] }); + expect(chosen).toEqual([" p/a ", "", " "]); +}); From dd8fb50b5e15ace4204ec7aa4ffb0d02df293c94 Mon Sep 17 00:00:00 2001 From: t Date: Mon, 7 Sep 2026 21:46:20 +0900 Subject: [PATCH 172/221] fix(gui): reconcile picker lifecycle outside synchronous effects [skip ci] Keep cancellation and stale-response fencing while separating render state reconciliation from automatic transport startup. Preserve immediate user actions and cover unmount before automatic request issuance. Co-authored-by: leonclab <26379556+leonclab@users.noreply.github.com> --- gui/src/components/ModelPickerOrderEditor.tsx | 61 ++++++++++++------- gui/tests/model-picker-order-editor.test.tsx | 18 ++++++ 2 files changed, 58 insertions(+), 21 deletions(-) diff --git a/gui/src/components/ModelPickerOrderEditor.tsx b/gui/src/components/ModelPickerOrderEditor.tsx index 3c379f8cce..1ca60c96b1 100644 --- a/gui/src/components/ModelPickerOrderEditor.tsx +++ b/gui/src/components/ModelPickerOrderEditor.tsx @@ -35,34 +35,48 @@ export default function ModelPickerOrderEditor({ apiBase, active, identities, on const [announcement, setAnnouncement] = useState(""); const [dragging, setDragging] = useState(null); const [over, setOver] = useState(null); - const drag = useRef<{ id: string; token: string } | null>(null); - const generation = useRef(0); - const flight = useRef(null); + const lifetime = useRef({ + generation: 0, + flight: null as BoundedFetch | null, + drag: null as { id: string; token: string } | null, + }); + const [activation, setActivation] = useState({ apiBase, active, onBusyChange }); const identitySignature = JSON.stringify(identities.map(({ provider, id, namespaced }) => [provider, id, namespaced])); const latestIdentitySignature = useRef(identitySignature); useLayoutEffect(() => { latestIdentitySignature.current = identitySignature; }, [identitySignature]); const identityChanged = snapshot !== null && snapshot.identities !== identitySignature; const disabled = !active || busy || !snapshot || blocked !== null || identityChanged; const dirty = snapshot !== null && JSON.stringify(draft) !== JSON.stringify(snapshot.order); - const clearDrag = useCallback(() => { drag.current = null; setDragging(null); setOver(null); }, []); + const clearDrag = useCallback(() => { lifetime.current.drag = null; setDragging(null); setOver(null); }, []); - // Layout cleanup fences even A → B → A and unmount before a pending promise resumes. + // Reconcile before committing children, like the existing display-name dialog. + if (activation.apiBase !== apiBase || activation.active !== active || activation.onBusyChange !== onBusyChange) { + setActivation({ apiBase, active, onBusyChange }); + setSnapshot(null); setDraft([]); setBlocked(null); setError(false); setBusy(false); + } + const [dragContext, setDragContext] = useState({ disabled, snapshot, identitySignature }); + if (dragContext.disabled !== disabled || dragContext.snapshot !== snapshot || dragContext.identitySignature !== identitySignature) { + setDragContext({ disabled, snapshot, identitySignature }); + setDragging(null); setOver(null); + } + + // Capture the stable holder, but always abort its CURRENT flight during cleanup. useLayoutEffect(() => { - generation.current++; - setSnapshot(null); setDraft([]); setBlocked(null); setError(false); + const holder = lifetime.current; + holder.generation++; return () => { - generation.current++; - flight.current?.controller.abort(); flight.current?.clear(); flight.current = null; - drag.current = null; onBusyChange(false); + holder.generation++; + holder.flight?.controller.abort(); holder.flight?.clear(); holder.flight = null; + holder.drag = null; onBusyChange(false); }; }, [apiBase, active, onBusyChange]); - useEffect(() => { clearDrag(); }, [disabled, snapshot, identitySignature, clearDrag]); + useLayoutEffect(() => { lifetime.current.drag = null; }, [disabled, snapshot, identitySignature]); const run = async (save: boolean) => { - if (!active || flight.current || (save && (disabled || !dirty))) return; - const owner = generation.current, bounded = createBoundedFetch(15_000); - flight.current = bounded; setBusy(true); onBusyChange(true); setError(false); clearDrag(); - const owns = () => generation.current === owner && flight.current === bounded; + if (!active || lifetime.current.flight || (save && (disabled || !dirty))) return; + const owner = lifetime.current.generation, bounded = createBoundedFetch(15_000); + lifetime.current.flight = bounded; setBusy(true); onBusyChange(true); setError(false); clearDrag(); + const owns = () => lifetime.current.generation === owner && lifetime.current.flight === bounded; const current = () => owns() && !bounded.signal.aborted && latestIdentitySignature.current === identitySignature; try { @@ -102,11 +116,16 @@ export default function ModelPickerOrderEditor({ apiBase, active, identities, on // Current-identity timeouts surface an error; stale identities retain the draft silently. } finally { bounded.clear(); - if (owns()) { flight.current = null; setBusy(false); onBusyChange(false); } + if (owns()) { lifetime.current.flight = null; setBusy(false); onBusyChange(false); } } }; - const enter = useEffectEvent(() => { void run(false); }); - useEffect(() => { if (active) enter(); }, [apiBase, active]); + const enter = useEffectEvent(async () => { + const holder = lifetime.current, owner = holder.generation; + // Automatic startup is cancellable before issuing transport; event actions stay immediate. + await Promise.resolve(); + if (active && holder.generation === owner) void run(false); + }); + useEffect(() => { if (active) void enter(); }, [apiBase, active, onBusyChange]); const move = (id: string, next: string[]) => { if (disabled) return; @@ -125,13 +144,13 @@ export default function ModelPickerOrderEditor({ apiBase, active, identities, on const fixed = snapshot?.fixed.includes(id) === true; return
  • { - if (!drag.current || drag.current.id === id || !movable(drag.current.id) || !movable(id) + if (!lifetime.current.drag || lifetime.current.drag.id === id || !movable(lifetime.current.drag.id) || !movable(id) || !event.dataTransfer.types.includes(DRAG_TYPE)) return; event.preventDefault(); event.dataTransfer.dropEffect = "move"; setOver(id); }} onDragLeave={() => setOver(null)} onDrop={event => { - const source = drag.current; + const source = lifetime.current.drag; if (source && source.id !== id && source.token === event.dataTransfer.getData(DRAG_TYPE) && movable(source.id) && movable(id)) { event.preventDefault(); move(source.id, movePickerBefore(draft, source.id, id, snapshot?.fixed ?? [])); } @@ -141,7 +160,7 @@ export default function ModelPickerOrderEditor({ apiBase, active, identities, on aria-label={t("models.pickerOrder.dragModel", { model: id })} onDragStart={event => { if (!movable(id)) { event.preventDefault(); return; } - const token = newDragToken(); drag.current = { id, token }; setDragging(id); + const token = newDragToken(); lifetime.current.drag = { id, token }; setDragging(id); event.dataTransfer.effectAllowed = "move"; event.dataTransfer.setData(DRAG_TYPE, token); }}>