Skip to content

Commit 16149ea

Browse files
committed
Merge remote-tracking branch 'origin/dev' into lane/pr-8064
2 parents 28d81ea + 665cc48 commit 16149ea

123 files changed

Lines changed: 4301 additions & 311 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs-site/src/content/docs/fr/guides/codex-integration.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,16 @@ configuration de référence et de repli. Sur l'interface de bouclage, ce fichie
134134
vous pouvez fusionner manuellement si l'injection automatique a été supprimée ; hors bouclage, il contient la
135135
forme avec fournisseur dédié. Le mode de fournisseur externe laisse ce profil intact.
136136

137+
Quand ce fichier est régénéré, les clés racine simples qu'OpenCodex ne gère pas sont conservées : un réglage
138+
que vous ajoutez, comme `stream_idle_timeout_ms` ou `stream_max_retries`, survit à l'injection suivante.
139+
Chaque affectation conservée est copiée telle quelle, y compris les valeurs sur plusieurs lignes et les entiers
140+
64 bits, et placée avant la première table. Les clés à l'intérieur des tables et les clés racine pointées comme
141+
`a.b = 1` ne sont pas conservées. En cas de conflit, OpenCodex l'emporte toujours : les clés racine qu'il gère
142+
(`model_provider`, `model_catalog_json`, `openai_base_url`) sont réécrites pour le mode de routage actif, et
143+
une clé racine portant le nom d'une table écrite par le profil, par exemple un `features = { ... }` en ligne
144+
quand le profil écrit `[features]`, est supprimée. Si le fichier change pendant qu'une injection attend le
145+
verrou d'écriture, l'injection s'arrête avec une erreur réessayable et laisse votre modification en place.
146+
137147
:::caution
138148
Les clés racine telles que `openai_base_url`, `model_provider` et `model_catalog_json` **doivent** précéder le
139149
premier en-tête `[table]`. L'injecteur garantit ce placement, supprime ses propres copies obsolètes ou en double

‎docs-site/src/content/docs/fr/reference/cli/lifecycle.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ ocx start --socks5-off
3232

3333
### `ocx stop`
3434

35+
Un Link Child non supervisé restaure Codex natif et Grok avant de libérer son listener lors d’un signal, en revérifiant la connexion à chaque écriture. Service/Desktop, sibling, transfert de redémarrage et reçu stop du parent préservent les intégrations. L’arrêt refuse le redémarrage avec `409 runtime_stopping`. Une terminaison forcée peut éviter le signal ; la restauration par `ocx stop` reste nécessaire.
36+
3537
Arrête le proxy actif à partir de son PID, supprime le fichier de PID et rétablit le fonctionnement natif de Codex. Si un service d’arrière-plan géré est installé, `ocx stop` l’arrête d’abord afin qu’il ne puisse pas relancer le proxy. Le bouton **Stop** du tableau de bord Web exécute la même opération (`POST /api/stop`) sur tous les backends, sauf le Planificateur de tâches Windows : le wrapper peut y relancer le proxy après la fin de la tâche, donc le tableau de bord refuse avec `respawnable_service`, ne modifie rien et vous demande d'exécuter `ocx stop`.
3638

3739
Sur un client hub connecté, `ocx stop`, y compris via l’API, conserve le routage Codex, le catalogue et la configuration Grok appartenant à la connexion ; `ocx start` les dessert de nouveau. L’arrêt explicite d’un Remote Link Child rétablit au contraire, si la restauration partagée réussit, le routage natif de Codex, le catalogue et les métadonnées de reprise sauvegardées, et supprime la configuration Grok gérée. La connexion Home enregistrée reste conservée ; `ocx disconnect` la supprime.

‎docs-site/src/content/docs/guides/codex-integration.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,16 @@ reference/fallback config. On loopback it contains the root keys you can merge m
412412
injection was removed; on non-loopback it contains the dedicated provider form. External-provider
413413
mode leaves this profile untouched.
414414

415+
Rebuilding that file keeps the plain root keys OpenCodex does not manage, so a setting you add such as
416+
`stream_idle_timeout_ms` or `stream_max_retries` survives the next injection. Each kept assignment is
417+
copied exactly as written, including values that span several lines and 64-bit integers, and is placed
418+
above the first table. Keys inside tables and dotted root keys such as `a.b = 1` are not kept.
419+
OpenCodex wins every collision: the root keys it owns (`model_provider`, `model_catalog_json`,
420+
`openai_base_url`) are rewritten for the routing mode in use, and a root key named like a table the
421+
profile writes, such as an inline `features = { ... }` when the profile writes `[features]`, is
422+
dropped. If the file changes while an injection waits for the write lock, the injection stops with a
423+
retryable error and leaves your edit in place.
424+
415425
:::caution
416426
Root keys such as `openai_base_url`, `model_provider`, and `model_catalog_json` **must** sit before the
417427
first `[table]` header. The injector guarantees that placement, removes its own stale/duplicate

‎docs-site/src/content/docs/guides/providers.md‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,11 @@ The built-in Claude model seeds advertise text and image input for both `anthrop
9292
Explicit per-model input-modality overrides remain authoritative; unknown models are not assumed
9393
image-capable. This applies across integrations wherever the client's configuration supports image
9494
capability metadata: OpenClaw exports a declared `input` array, and Kimi Code exports
95-
`capabilities: ["image_in"]` only for image-capable models. OpenClaw omits `input` when no supported
96-
modalities are declared; Kimi omits `capabilities` for unknown or text-only models. Clients without
95+
`capabilities: ["image_in"]` only for image-capable models, adding `"thinking"` when the model
96+
declares an effort ladder. Kimi Code also receives that ladder as `support_efforts` (limited to
97+
`low`, `medium`, `high`, `xhigh` and `max`, in that order) and the declared default as
98+
`default_effort` when it is in the ladder. OpenClaw omits `input` when no supported modalities are
99+
declared; Kimi omits `capabilities` for models that declare neither image input nor an effort ladder. Clients without
97100
a supported capability field keep their existing configuration shape. After updating opencodex,
98101
regenerate or refresh the client configuration managed by opencodex to receive the updated metadata.
99102

@@ -651,6 +654,8 @@ If Kiro ends with plain text instead of its private final-answer tool, one bound
651654
still runs, and only the resulting final answer is displayed. Progress accompanying a real
652655
tool call remains visible. A normal private final answer needs no completion retry.
653656

657+
When Kiro's safety filter stops a turn (`CONTENT_FILTERED`, for example the Claude `BIO` classifier), the request ends as a refusal that clients do not retry: Claude clients see `stop_reason: "refusal"` and Codex sees a failed response carrying Kiro's category and explanation. If the filter stops the bounded retry, no final answer is displayed; the progress held from the first attempt and any partial text from the retry are shown as commentary before the refusal.
658+
654659
When Kiro emits credit metering, request logs preserve the reported spend as
655660
`usage.providerCredits`, including in the persisted usage ledger. These are Kiro credits;
656661
token counts may still be estimated, and the credit value does not replace USD cost estimates.
@@ -1834,6 +1839,16 @@ Google Antigravity, OpenCode Go, OpenRouter, DeepSeek, ClinePass, Z.AI, MiniMax,
18341839
Moonshot, Venice, Synthetic, DeepInfra, Neuralwatt, Command Code, and any a6api-backed
18351840
or Abliteration custom provider.
18361841

1842+
**Kimi Coding Plan quota.** Account login and API-key providers on the canonical
1843+
`https://api.kimi.com/coding/v1` endpoint read `/usages`. Plans that report
1844+
`usages.limit_month_total` (or `monthTotal`) show a monthly utilization bar, with
1845+
`limit_month_code` (or `monthCode`) as the fallback when total usage is unavailable.
1846+
The `used_ratio` / `usedRatio` fraction must be in `[0, 1]` before conversion to a consumed
1847+
percentage; invalid ratios are ignored. Empty or unusable `usages` containers do not hide
1848+
usable monthly data in another supported envelope. Any reported reset time is retained.
1849+
Existing 5-hour, weekly, and total subscription-credit
1850+
windows remain separate, and an absent monthly window is not shown as 0%.
1851+
18371852
**Abliteration credits.** A provider of any name whose `baseUrl` is
18381853
`https://api.abliteration.ai` or `https://api.abliteration.ai/v1` reads
18391854
`GET https://api.abliteration.ai/v1/credits` with its active key as a Bearer token and does not

‎docs-site/src/content/docs/guides/web-dashboard.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,14 @@ they have been synchronized. See
301301

302302
In **Connect → API Keys**, every row of the key table has its own delete button, which asks for confirmation in place. Clicking a key can show its full value with a **Copy** button only from an independently authorized session.
303303

304+
### Applying a Codex CLI update over HTTP
305+
306+
The CLI-update HTTP API has no dashboard job UI. Its apply route requires a current explicitly paired browser session on trusted loopback ingress, matching Origin and CSRF headers, and `confirmed: true`. Automatic local sign-in, a remembered admin session, an admin token or Tailscale sign-in alone cannot authorize this action.
307+
308+
For standalone local pairing, open the dashboard at its configured literal `http://127.0.0.1:<port>` or `http://[::1]:<port>` origin. Use the existing local pairing form in **Connect → API Keys** or Remote Link setup: run the displayed `ocx gui pair --origin "<browser-origin>"` command locally, then redeem its one-time code in that form. Pairing does not apply an update; a subsequent confirmed API request is still required. A server configured with hostname `localhost`, a wildcard bind, or a connected-client role cannot issue this local pairing authority. Remote pairing does not remove the apply route's trusted-loopback requirement.
309+
310+
Without an eligible HTTP pairing path, use `ocx system codex-cli-update plan` followed by `ocx system codex-cli-update apply --plan-id <32-hex> --yes` locally. This uses the same durable job owner without a GUI session. Pairing proves authority to write the protected configuration home, not human identity or protection from unrestricted same-user processes.
311+
304312
### Reading an existing API key
305313

306314
Showing a stored key's full value requires a dashboard session established by explicit pairing or

‎docs-site/src/content/docs/ja/guides/codex-integration.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ env_key = "OPENCODEX_API_AUTH_TOKEN"
9494

9595
OpenCodex がルーティングを所有している場合、どちらのモードも参照/フォールバック設定として `$CODEX_HOME/opencodex.config.toml` を書き込みます。ループバックでは、自動挿入が削除された場合に手動でマージできるルート キーが含まれています。非ループバックでは、専用のプロバイダー フォームが含まれます。外部プロバイダー モードでは、このプロファイルは変更されません。
9696

97+
このファイルを再生成しても、OpenCodex が管理しない単純なルート キーは保持されます。そのため、`stream_idle_timeout_ms` や `stream_max_retries` のように追加した設定は次の挿入後も残ります。保持される代入は、複数行にわたる値や 64 ビット整数も含めて書かれたとおりにコピーされ、最初のテーブルより前に置かれます。テーブル内のキーと、`a.b = 1` のようなドット付きルート キーは保持されません。衝突した場合は常に OpenCodex が優先されます。OpenCodex が所有するルート キー(`model_provider`、`model_catalog_json`、`openai_base_url`)は使用中のルーティング モードに合わせて書き直され、プロファイルが書き込むテーブルと同じ名前のルート キー(プロファイルが `[features]` を書き込むときのインライン `features = { ... }` など)は削除されます。挿入が書き込みロックを待っている間にファイルが変更された場合、挿入は再試行可能なエラーで停止し、編集内容はそのまま残ります。
98+
9799
:::caution
98100
`openai_base_url`、`model_provider`、`model_catalog_json` などのルート キーは、最初の `[table]` ヘッダーの前に**なければなりません**。インジェクターはその配置を保証し、それ自身の古い/重複したコピーを削除し、ユーザー所有のルート `openai_base_url` を決して上書きしません。存在する場合、sync はカタログを更新しますが、ルーティングが挿入されなかったことを報告します。
99101
:::

‎docs-site/src/content/docs/ja/reference/cli/lifecycle.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ ocx start --socks5-off
2828

2929
### `ocx stop`
3030

31+
監督プロセスのない Link Child は終了シグナル時、各書き込みで接続を再確認し、リスナーを閉じる前に Codex と管理対象 Grok を復元します。サービス・Desktop、sibling、再起動の引き継ぎ、親 stop 記録がある場合は設定を保持します。終了中の再起動は `409 runtime_stopping` です。強制終了はシグナル処理を省略する場合があり、親 `ocx stop` の復元も必要です。
32+
3133
実行中のプロキシを (PID によって) 停止し、PID ファイルを削除します。スタンドアロンの所有者ではネイティブ Codex を復元します。マネージド バックグラウンド サービスがインストールされている場合、`ocx stop` はそれを最初に停止するため、プロキシを再起動できません。Web ダッシュボードの **停止** ボタンは同じ処理 (`POST /api/stop`) を実行しますが、Windows タスク スケジューラだけは例外です。タスク終了後もラッパーがプロキシを再起動しうるため、ダッシュボードは `respawnable_service` で拒否し、何も変更せずに `ocx stop` の実行を促します。
3234

3335
接続済みの hub クライアントでは、`ocx stop`(成功した API 停止を含む)は接続が所有する Codex のルーティング、モデルカタログ、Grok 設定を保持します。`ocx start` はルーティングを再注入せず、その設定で再び処理します。Codex を自身のアカウントへ戻すには `ocx disconnect`、既にネイティブルーティングへ戻した後の再適用には `ocx sync --restart-codex` を使います。

‎docs-site/src/content/docs/ko/guides/codex-integration.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ env_key = "OPENCODEX_API_AUTH_TOKEN"
196196

197197
OpenCodex가 라우팅을 소유할 때는 두 모드 모두 `$CODEX_HOME/opencodex.config.toml`을 참고용/폴백 설정으로 작성합니다. loopback에서는 자동 주입이 사라졌을 때 수동으로 합칠 수 있는 root key가 들어가고, non-loopback에서는 전용 provider 형식이 들어갑니다. 외부 provider 모드는 이 프로필을 건드리지 않습니다.
198198

199+
이 파일을 다시 만들 때 OpenCodex가 관리하지 않는 일반 root key는 그대로 남습니다. 그래서 `stream_idle_timeout_ms`나 `stream_max_retries`처럼 직접 추가한 설정은 다음 주입 뒤에도 유지됩니다. 남는 대입문은 여러 줄에 걸친 값과 64비트 정수까지 작성한 그대로 복사되고, 첫 번째 테이블보다 앞에 놓입니다. 테이블 안의 키와 `a.b = 1` 같은 점 표기 root key는 남지 않습니다. 충돌하면 항상 OpenCodex 쪽이 이깁니다. OpenCodex가 소유한 root key(`model_provider`, `model_catalog_json`, `openai_base_url`)는 현재 라우팅 모드에 맞게 다시 쓰이고, 프로필이 쓰는 테이블과 이름이 같은 root key(프로필이 `[features]`를 쓸 때의 인라인 `features = { ... }` 등)는 버려집니다. 주입이 쓰기 잠금을 기다리는 동안 파일이 바뀌면 주입은 재시도 가능한 오류로 멈추고 수정한 내용은 그대로 둡니다.
200+
199201
:::caution
200202
`openai_base_url`, `model_provider`, `model_catalog_json` 같은 root key는 첫 번째 `[table]` 헤더보다 **반드시** 앞에 있어야 합니다. 인젝터는 그 위치를 보장하고, 자신이 남긴 오래되었거나 중복된 복사본은 지웁니다. 사용자가 소유한 root `openai_base_url`은 덮어쓰지 않습니다. 그런 값이 있으면 sync는 카탈로그만 갱신하고 라우팅은 주입하지 않았다고 알립니다.
201203
:::

‎docs-site/src/content/docs/ko/reference/cli/lifecycle.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ ocx start --socks5-off
4444

4545
### `ocx stop`
4646

47+
감독 프로세스 없이 실행되는 Link Child는 종료 신호 처리 시 각 쓰기 직전에 연결을 재확인하고 리스너를 닫기 전에 Codex 기본 설정과 관리 Grok 설정을 복원합니다. 서비스·Desktop 감독, sibling, 재시작·재활용 인계, 부모 stop 영수증이 있으면 설정을 보존합니다. 종료 중 재시작 요청은 `409 runtime_stopping`입니다. 강제 종료는 신호 처리를 건너뛸 수 있어 부모 `ocx stop`의 복원도 필요합니다.
48+
4749
실행 중인 프록시를 PID 기준으로 중지하고 PID 파일을 삭제합니다. 독립 실행 소유자라면 기본 Codex를 복원합니다. 관리형
4850
백그라운드 서비스가 설치되어 있으면 `ocx stop`이 먼저 그 서비스를 중지하므로 프록시가 다시
4951
올라올 수 없습니다. 웹 대시보드의 **Stop** 버튼도 같은 동작(`POST /api/stop`)을 하지만, Windows 작업 스케줄러는 예외입니다. 작업이 끝나도 래퍼가 프록시를 다시 띄울 수 있어서, 대시보드는 `respawnable_service`로 거절하고 아무것도 바꾸지 않은 채 `ocx stop` 실행을 안내합니다.

‎docs-site/src/content/docs/reference/adapters.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ For Meta Responses at the exact `api.meta.ai` host, OpenCodex omits the unsuppor
274274
`output.encrypted_content` include requested by Codex Desktop. Meta otherwise rejects the
275275
request before inference. `reasoning.encrypted_content` and other include entries remain
276276
intact, so stateless reasoning replay is preserved. The same exact-entry normalization
277-
applies to xAI; unrelated Responses destinations keep their original include list.
277+
applies to xAI and to Kimi Code at its exact HTTPS Responses endpoint
278+
(`https://api.kimi.com/coding/v1/responses`); unrelated Responses destinations keep their original include list.
278279

279280
These request-shape fixes do not change account entitlements. Meta limits Muse Code
280281
subscription credentials to the Muse Code client; other clients require a separately

0 commit comments

Comments
 (0)