@bitkyc08/opencodex 2.100.1 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (624) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
  6. package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/index-DQtCRNAw.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +6 -4
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/native-exec.ts +3 -2
  38. package/src/adapters/cursor/protobuf-request.ts +8 -8
  39. package/src/adapters/cursor/tool-guidance.ts +3 -3
  40. package/src/adapters/cursor/tool-wording.ts +10 -1
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
  43. package/src/adapters/google-antigravity-wire.ts +15 -6
  44. package/src/adapters/google-truncation.ts +4 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +17 -4
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/openai-chat/tool-schema.ts +9 -0
  54. package/src/adapters/openai-responses/tool-schema.ts +18 -4
  55. package/src/adapters/run-turn-queue.ts +139 -5
  56. package/src/adapters/upstream-http-error.ts +4 -2
  57. package/src/adapters/zed.ts +3 -0
  58. package/src/advisor/consult.ts +15 -4
  59. package/src/advisor/context.ts +12 -3
  60. package/src/advisor/runtime.ts +35 -5
  61. package/src/advisor/settings.ts +8 -0
  62. package/src/advisor/synthetic-tool.ts +21 -8
  63. package/src/bridge/response-json.ts +11 -2
  64. package/src/bridge/sse.ts +51 -9
  65. package/src/claude/auth-detect.ts +21 -33
  66. package/src/claude/chat-tool-dispatch.ts +233 -0
  67. package/src/claude/desktop-3p.ts +11 -5
  68. package/src/claude/desktop-gateway-state.ts +2 -0
  69. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  70. package/src/claude/desktop-remote-store.ts +24 -4
  71. package/src/claude/inbound-content-options.ts +31 -16
  72. package/src/claude/inbound-tool-loading.ts +42 -17
  73. package/src/claude/outbound.ts +13 -3
  74. package/src/cli/account-api.ts +23 -1
  75. package/src/cli/account-auth.ts +54 -21
  76. package/src/cli/account-extended.ts +60 -6
  77. package/src/cli/account-key-quota.ts +56 -7
  78. package/src/cli/account.ts +5 -3
  79. package/src/cli/advisor.ts +7 -4
  80. package/src/cli/alias.ts +38 -1
  81. package/src/cli/capabilities-access-remote.ts +137 -2
  82. package/src/cli/capabilities-accounts.ts +3 -3
  83. package/src/cli/capabilities-agents-routing.ts +17 -10
  84. package/src/cli/capabilities-base.ts +43 -18
  85. package/src/cli/capabilities-integrations.ts +2 -2
  86. package/src/cli/capabilities-provider-models.ts +18 -2
  87. package/src/cli/capabilities-route-to.ts +43 -0
  88. package/src/cli/capabilities.ts +2 -0
  89. package/src/cli/capability-contracts.ts +1 -1
  90. package/src/cli/claude-desktop.ts +30 -11
  91. package/src/cli/claude.ts +36 -17
  92. package/src/cli/codex-launcher.ts +3 -1
  93. package/src/cli/codex-shim-autorestore.ts +5 -42
  94. package/src/cli/config-command.ts +38 -2
  95. package/src/cli/config-root-startup.ts +34 -0
  96. package/src/cli/connect.ts +124 -19
  97. package/src/cli/desktop-runtime-guidance.ts +1 -1
  98. package/src/cli/disconnect-runtime.ts +168 -0
  99. package/src/cli/dispatch.ts +54 -12
  100. package/src/cli/export-command.ts +1 -1
  101. package/src/cli/gui-pair-client.ts +29 -5
  102. package/src/cli/gui.ts +10 -5
  103. package/src/cli/help-catalog.ts +11 -0
  104. package/src/cli/help.ts +5 -4
  105. package/src/cli/hub.ts +18 -1
  106. package/src/cli/index.ts +83 -92
  107. package/src/cli/inspect.ts +11 -2
  108. package/src/cli/integrations.ts +26 -1
  109. package/src/cli/link-capture.ts +64 -0
  110. package/src/cli/link-child-ops.ts +314 -0
  111. package/src/cli/link-cleanup.ts +8 -5
  112. package/src/cli/link-diagnostics.ts +67 -0
  113. package/src/cli/link-enrollment.ts +158 -12
  114. package/src/cli/link-operations.ts +52 -0
  115. package/src/cli/link-recover.ts +152 -0
  116. package/src/cli/link-routes.ts +87 -0
  117. package/src/cli/link-status-child.ts +137 -0
  118. package/src/cli/link-status-traffic.ts +34 -0
  119. package/src/cli/link.ts +327 -37
  120. package/src/cli/message-command.ts +1 -1
  121. package/src/cli/message-mcp-command.ts +23 -10
  122. package/src/cli/models-runtime.ts +3 -3
  123. package/src/cli/opencode.ts +3 -1
  124. package/src/cli/pi-sync.ts +35 -0
  125. package/src/cli/preflight-exemptions.ts +46 -0
  126. package/src/cli/registry.ts +29 -12
  127. package/src/cli/restart-failure.ts +5 -2
  128. package/src/cli/root.ts +5 -1
  129. package/src/cli/route-to.ts +172 -0
  130. package/src/cli/runtime-api.ts +5 -8
  131. package/src/cli/status.ts +3 -1
  132. package/src/cli/stop-approval.ts +66 -19
  133. package/src/cli/stop-report.ts +23 -0
  134. package/src/cli/stop-windows-checked.ts +304 -0
  135. package/src/cli/sync-command.ts +70 -13
  136. package/src/cli/sync-fanout.ts +81 -99
  137. package/src/cli/sync-flags.ts +40 -3
  138. package/src/cli/sync-link-status.ts +18 -2
  139. package/src/cli/sync-update-guard.ts +7 -2
  140. package/src/cli/system-restart-client.ts +3 -2
  141. package/src/cli/uninstall-plan.ts +77 -5
  142. package/src/cli/uninstall-stop.ts +152 -0
  143. package/src/cli/v2-input.ts +10 -6
  144. package/src/cli/v2-local-output.ts +3 -2
  145. package/src/cli/v2-runtime.ts +10 -3
  146. package/src/cli/v2.ts +22 -7
  147. package/src/client/connect.ts +321 -34
  148. package/src/client/link-home-features.ts +27 -0
  149. package/src/client/link-home.ts +92 -4
  150. package/src/client/link-ingress.ts +21 -3
  151. package/src/client/link-join.ts +12 -2
  152. package/src/client/link-parity-reporter.ts +60 -6
  153. package/src/client/link-readiness.ts +16 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel-status.ts +76 -0
  161. package/src/client/link-tunnel.ts +56 -5
  162. package/src/client/link-websocket-limits.ts +89 -0
  163. package/src/client/link-websocket.ts +586 -0
  164. package/src/client/link-ws-advertisement.ts +100 -0
  165. package/src/client/link-ws-framer.ts +241 -0
  166. package/src/client/link-ws-transport.ts +177 -0
  167. package/src/client/machine-api.ts +13 -2
  168. package/src/client/machine-listener.ts +48 -7
  169. package/src/client/route-intent-apply.ts +293 -0
  170. package/src/client/route-intent-file-originals.ts +97 -0
  171. package/src/client/route-intent-native-originals.ts +201 -0
  172. package/src/client/route-intent-watch.ts +141 -0
  173. package/src/client/runtime-restart.ts +127 -5
  174. package/src/client/runtime.ts +61 -15
  175. package/src/client/state.ts +30 -0
  176. package/src/client/sync-expectation.ts +36 -2
  177. package/src/client/sync-runtime.ts +7 -0
  178. package/src/clients/config-export/alias-selectors.ts +63 -40
  179. package/src/clients/config-export/contracts.ts +2 -0
  180. package/src/clients/config-export/nested-selectors.ts +42 -0
  181. package/src/clients/config-export.ts +36 -4
  182. package/src/codex/account-resume-health.ts +41 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/login-flow.ts +6 -0
  187. package/src/codex/auth-api/routes.ts +35 -2
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +21 -6
  190. package/src/codex/catalog/gather-capture.ts +10 -2
  191. package/src/codex/catalog/parsing.ts +7 -3
  192. package/src/codex/catalog/provider-models.ts +67 -23
  193. package/src/codex/catalog/retained-sync.ts +2 -1
  194. package/src/codex/catalog/routed-gather.ts +1 -1
  195. package/src/codex/catalog-auto-refresh.ts +11 -0
  196. package/src/codex/cli-update-job.ts +35 -13
  197. package/src/codex/convergence-types.ts +2 -0
  198. package/src/codex/convergence.ts +2 -2
  199. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  200. package/src/codex/features.ts +2 -2
  201. package/src/codex/history-provider.ts +31 -0
  202. package/src/codex/inject/multi-agent-v2.ts +9 -3
  203. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  204. package/src/codex/inject/plan.ts +20 -2
  205. package/src/codex/inject.ts +2 -0
  206. package/src/codex/journal-config-restore.ts +217 -0
  207. package/src/codex/journal.ts +75 -6
  208. package/src/codex/main-account.ts +23 -30
  209. package/src/codex/native-main-auth-file.ts +104 -0
  210. package/src/codex/native-profile-manager.ts +4 -3
  211. package/src/codex/native-profile-store.ts +3 -61
  212. package/src/codex/orca-import.ts +10 -1
  213. package/src/codex/quota-history.ts +13 -0
  214. package/src/codex/quota-window-conflict.ts +103 -0
  215. package/src/codex/quota.ts +134 -7
  216. package/src/codex/subagent-model-fallback.ts +3 -1
  217. package/src/codex/websocket-activity.ts +171 -16
  218. package/src/codex/websocket-registry.ts +11 -4
  219. package/src/combos/cooldown-store.ts +228 -0
  220. package/src/combos/failover.ts +760 -35
  221. package/src/config/dashboard-trusted-proxy.ts +83 -0
  222. package/src/config/diagnostics.ts +28 -0
  223. package/src/config/feature-flags.ts +9 -0
  224. package/src/config/live-reconcile.ts +10 -1
  225. package/src/config/load-degrade.ts +12 -1
  226. package/src/config/multi-agent-surface.ts +28 -5
  227. package/src/config/pending-teardown.ts +60 -3
  228. package/src/config/process-state.ts +175 -4
  229. package/src/config/provider-validation.ts +4 -4
  230. package/src/config/salvage.ts +1 -0
  231. package/src/config/schema/config-schema.ts +12 -3
  232. package/src/config/schema/leaf-validators.ts +43 -14
  233. package/src/config/windows-process-command-line.ts +107 -0
  234. package/src/generated/compatibility-version.json +1077 -429
  235. package/src/generated/model-metadata.ts +1 -1
  236. package/src/images/loop.ts +3 -0
  237. package/src/integrations/model-name-guard.ts +25 -0
  238. package/src/integrations/route-intent-catalog.ts +26 -0
  239. package/src/integrations/route-intent-connected.ts +262 -0
  240. package/src/integrations/route-intent-contract.ts +55 -0
  241. package/src/integrations/route-intent-disconnect.ts +109 -0
  242. package/src/integrations/route-intent-initial.ts +64 -0
  243. package/src/integrations/route-intent-state.ts +117 -0
  244. package/src/integrations/route-intent-tick.ts +65 -0
  245. package/src/integrations/route-intent.ts +212 -0
  246. package/src/integrations/writer.ts +44 -11
  247. package/src/lib/catalog-etag.ts +10 -0
  248. package/src/lib/client-error-body.ts +15 -0
  249. package/src/lib/client-retry-after.ts +29 -0
  250. package/src/lib/config-ownership.ts +13 -0
  251. package/src/lib/context-overflow-verdict.ts +266 -9
  252. package/src/lib/desktop-gui-origin.ts +28 -0
  253. package/src/lib/errors.ts +1 -1
  254. package/src/lib/failure-detail.ts +72 -3
  255. package/src/lib/gui-pair-capability.ts +2 -1
  256. package/src/lib/hard-refusal.ts +259 -0
  257. package/src/lib/messages-error-body.ts +4 -1
  258. package/src/lib/outbound-credential-registry.ts +362 -4
  259. package/src/lib/paced-stream.ts +34 -0
  260. package/src/lib/passive-key-fetch-proof.ts +30 -0
  261. package/src/lib/passive-read.ts +5 -0
  262. package/src/lib/process-control.ts +76 -12
  263. package/src/lib/redact.ts +84 -8
  264. package/src/lib/state-store-registrations.ts +11 -0
  265. package/src/lib/state-store-sweeper.ts +4 -0
  266. package/src/lib/supervisor-markers.ts +18 -0
  267. package/src/lib/terminal-safe-text.ts +58 -0
  268. package/src/lib/translator-budget.ts +3 -2
  269. package/src/lib/upstream-retry.ts +14 -4
  270. package/src/link/alias-lock.ts +119 -0
  271. package/src/link/child-activity.ts +83 -0
  272. package/src/link/child-binary-cache-fill.d.mts +50 -0
  273. package/src/link/child-binary-cache-fill.mjs +494 -0
  274. package/src/link/child-binary-cache-start.ts +73 -0
  275. package/src/link/child-binary-source.ts +12 -5
  276. package/src/link/child-catalog-freshness.ts +149 -0
  277. package/src/link/child-gated-ocx.ts +135 -0
  278. package/src/link/child-observations.ts +206 -0
  279. package/src/link/child-observe.ts +121 -0
  280. package/src/link/child-ops-engine.ts +230 -0
  281. package/src/link/child-ops-host.ts +138 -0
  282. package/src/link/child-ops-runners.ts +319 -0
  283. package/src/link/child-ops-scheduler.ts +207 -0
  284. package/src/link/child-ops-types.ts +89 -0
  285. package/src/link/child-parity.ts +23 -4
  286. package/src/link/child-policy.ts +93 -0
  287. package/src/link/child-update-contract.ts +174 -0
  288. package/src/link/codex-settings.ts +1 -1
  289. package/src/link/compatibility.ts +18 -1
  290. package/src/link/diagnostics-read.ts +163 -0
  291. package/src/link/diagnostics.ts +20 -7
  292. package/src/link/explicit-route.ts +209 -0
  293. package/src/link/link-recover.ts +113 -0
  294. package/src/link/management-routes.ts +3 -1
  295. package/src/link/operation-recovery-slot.ts +44 -0
  296. package/src/link/operations-journal.ts +408 -0
  297. package/src/link/paths.ts +5 -0
  298. package/src/link/peer-report.ts +1 -1
  299. package/src/link/relay-auth.ts +14 -0
  300. package/src/link/remote-plant.ts +152 -14
  301. package/src/link/remote-platform.ts +21 -10
  302. package/src/link/remote-probe.ts +11 -3
  303. package/src/link/remote-windows.ts +88 -12
  304. package/src/link/request-compression.ts +30 -0
  305. package/src/link/residual-recovery.ts +54 -0
  306. package/src/link/retirement.ts +128 -0
  307. package/src/link/route-intent-watch.ts +41 -0
  308. package/src/link/route-intent.ts +209 -0
  309. package/src/link/route-proof.ts +82 -0
  310. package/src/link/route-rounds.ts +579 -0
  311. package/src/link/route-select.ts +95 -0
  312. package/src/link/route-trust.ts +96 -0
  313. package/src/link/ssh-argv.ts +285 -43
  314. package/src/link/ssh-capture-redact.ts +253 -0
  315. package/src/link/ssh-capture.ts +497 -0
  316. package/src/link/ssh-runner.ts +141 -14
  317. package/src/link/status-projection.ts +160 -0
  318. package/src/link/store.ts +54 -1
  319. package/src/link/supervisor.ts +543 -55
  320. package/src/link/sync-fanout-classify.ts +114 -0
  321. package/src/link/sync-then-restart.ts +65 -0
  322. package/src/link/tombstones.ts +209 -0
  323. package/src/link/traffic.ts +178 -0
  324. package/src/link/tunnel-state.ts +10 -4
  325. package/src/link/ws-activity-holds.ts +474 -0
  326. package/src/local-credentials/publication-fence.ts +20 -1
  327. package/src/messaging/mcp-queue-rpc.ts +3 -2
  328. package/src/messaging/mcp-queue-server.ts +21 -1
  329. package/src/messaging/mcp-reply-tools.ts +24 -9
  330. package/src/messaging/mcp-reply-wait.ts +70 -0
  331. package/src/messaging/mcp-resume-tools.ts +25 -0
  332. package/src/messaging/remote-enrollment.ts +3 -3
  333. package/src/messaging/remote-tunnels.ts +2 -2
  334. package/src/messaging/resume-permissions.ts +27 -0
  335. package/src/messaging/rpc.ts +46 -2
  336. package/src/oauth/account-resume-health.ts +60 -0
  337. package/src/oauth/anthropic-continuity.ts +23 -7
  338. package/src/oauth/anthropic-routing.ts +5 -2
  339. package/src/oauth/anthropic.ts +22 -2
  340. package/src/oauth/claude-keychain-read.ts +78 -68
  341. package/src/oauth/index.ts +25 -6
  342. package/src/oauth/local-token-detect.ts +8 -29
  343. package/src/oauth/login-cli-errors.ts +5 -1
  344. package/src/oauth/login-cli.ts +33 -18
  345. package/src/oauth/login-flow-state.ts +26 -3
  346. package/src/oauth/meta-muse.ts +1 -1
  347. package/src/oauth/store.ts +51 -1
  348. package/src/oauth/xai.ts +248 -14
  349. package/src/protocols/contract.ts +4 -0
  350. package/src/protocols/encoders/messages.ts +1 -0
  351. package/src/providers/alias-template.ts +48 -0
  352. package/src/providers/anthropic-billing-ownership.ts +2 -0
  353. package/src/providers/anthropic-output-caps.ts +46 -0
  354. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  355. package/src/providers/antigravity-effort-families.ts +11 -3
  356. package/src/providers/antigravity-models.ts +32 -9
  357. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  358. package/src/providers/api-key-pause-state.ts +23 -0
  359. package/src/providers/api-key-pause.ts +71 -10
  360. package/src/providers/api-key-resolve.ts +49 -7
  361. package/src/providers/api-key-response-ownership.ts +2 -0
  362. package/src/providers/api-key-selection-capture.ts +3 -1
  363. package/src/providers/api-key-selection.ts +54 -11
  364. package/src/providers/api-keys.ts +24 -7
  365. package/src/providers/cache-affinity-identity.ts +73 -0
  366. package/src/providers/cache-affinity.ts +256 -0
  367. package/src/providers/claude-cli-usage-state.ts +11 -6
  368. package/src/providers/claude-cli-usage.ts +27 -9
  369. package/src/providers/codex-capacity.ts +11 -2
  370. package/src/providers/default-aliases.ts +98 -20
  371. package/src/providers/google-vertex-model-discovery.ts +510 -0
  372. package/src/providers/key-failover.ts +136 -14
  373. package/src/providers/key-store.ts +3 -3
  374. package/src/providers/kiro-models.ts +3 -5
  375. package/src/providers/label.ts +31 -5
  376. package/src/providers/mistral-transport.ts +17 -4
  377. package/src/providers/model-discovery-config.ts +31 -0
  378. package/src/providers/model-discovery-diagnostic.ts +34 -3
  379. package/src/providers/model-discovery.ts +43 -7
  380. package/src/providers/model-rename-fields.ts +5 -0
  381. package/src/providers/muse-key-quota.ts +14 -6
  382. package/src/providers/new-model-policy-runtime.ts +17 -4
  383. package/src/providers/new-model-policy.ts +30 -4
  384. package/src/providers/openai-sidecar.ts +15 -2
  385. package/src/providers/passive-key-observation.ts +252 -0
  386. package/src/providers/provider-id-rewrite.ts +3 -0
  387. package/src/providers/quota/account-cache.ts +53 -34
  388. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  389. package/src/providers/quota/anthropic-usage-windows.ts +19 -9
  390. package/src/providers/quota/passive-key-limits.ts +272 -0
  391. package/src/providers/quota/passive-wire-model.ts +126 -0
  392. package/src/providers/quota/report-cache.ts +112 -5
  393. package/src/providers/quota/vendor-probes-key.ts +73 -0
  394. package/src/providers/quota/vendor-probes-oauth.ts +57 -3
  395. package/src/providers/quota-key-accounts.ts +22 -10
  396. package/src/providers/quota-mistral-budget.ts +18 -0
  397. package/src/providers/quota-types.ts +43 -0
  398. package/src/providers/quota.ts +31 -32
  399. package/src/providers/reasoning-metadata.ts +1051 -12
  400. package/src/providers/registry/entries-core.ts +34 -16
  401. package/src/providers/registry/entries-extended.ts +32 -0
  402. package/src/providers/registry/model-seeds.ts +35 -0
  403. package/src/providers/resolved-model-policy.ts +7 -0
  404. package/src/providers/routed-config.ts +8 -3
  405. package/src/providers/xai-transport.ts +3 -0
  406. package/src/quota/reset-observer.ts +4 -2
  407. package/src/quota/reset-seen-store.ts +9 -0
  408. package/src/quota/window-mapping.ts +1 -0
  409. package/src/quota-pool/assemble.ts +4 -1
  410. package/src/remote/features.ts +17 -0
  411. package/src/responses/anthropic-progress.ts +10 -4
  412. package/src/responses/citation-markers.ts +231 -0
  413. package/src/responses/hosted-tool-policy.ts +56 -12
  414. package/src/responses/spill-store.ts +5 -1
  415. package/src/responses/state/replay-input.ts +50 -0
  416. package/src/responses/state/replay-owner.ts +24 -0
  417. package/src/responses/state/snapshot-codec.ts +9 -0
  418. package/src/responses/state/spill-queue.ts +1 -0
  419. package/src/responses/state.ts +42 -60
  420. package/src/router.ts +4 -2
  421. package/src/routing/home-route-capture.ts +123 -0
  422. package/src/routing/home-route-intent.ts +200 -0
  423. package/src/routing/route-intent-state.ts +178 -0
  424. package/src/routing/route-to-live-settings.ts +35 -0
  425. package/src/routing/route-to-local.ts +145 -0
  426. package/src/routing/route-to-status.ts +94 -0
  427. package/src/routing/route-to-sync-child.ts +32 -0
  428. package/src/server/adapter-resolve.ts +21 -1
  429. package/src/server/admitted-http-turn.ts +3 -0
  430. package/src/server/auth-cors.ts +109 -8
  431. package/src/server/bare-upstream-error.ts +220 -0
  432. package/src/server/catalog-download.ts +3 -5
  433. package/src/server/chat-native.ts +25 -7
  434. package/src/server/claude-messages.ts +8 -5
  435. package/src/server/codex-model-list.ts +2 -1
  436. package/src/server/configured-credentials.ts +37 -5
  437. package/src/server/gui-desktop-authorization.ts +36 -0
  438. package/src/server/gui-pair-delivery.ts +6 -3
  439. package/src/server/gui-session.ts +10 -1
  440. package/src/server/images.ts +41 -13
  441. package/src/server/inbound-body-admission.ts +17 -4
  442. package/src/server/index/link-listener.ts +203 -11
  443. package/src/server/index/link-management.ts +15 -1
  444. package/src/server/index/link-relay-sessions.ts +128 -8
  445. package/src/server/index/link-websocket-limits.ts +136 -0
  446. package/src/server/index/link-websocket.ts +692 -0
  447. package/src/server/index/optional-listeners.ts +115 -7
  448. package/src/server/index/route-intent-watch.ts +47 -0
  449. package/src/server/index/serve-contract.ts +86 -0
  450. package/src/server/index/serve-options.ts +35 -86
  451. package/src/server/index/startup-warnings.ts +8 -2
  452. package/src/server/index/websocket-handler.ts +26 -4
  453. package/src/server/index.ts +12 -2
  454. package/src/server/inference/client-encoder-delivery.ts +2 -0
  455. package/src/server/inspection-tee.ts +39 -2
  456. package/src/server/lifecycle.ts +2 -0
  457. package/src/server/link-turn.ts +137 -0
  458. package/src/server/management/advisor-routes.ts +10 -2
  459. package/src/server/management/agent-settings-routes.ts +50 -16
  460. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  461. package/src/server/management/config-routes.ts +7 -1
  462. package/src/server/management/context.ts +9 -2
  463. package/src/server/management/desktop-authorization.ts +41 -0
  464. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  465. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  466. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  467. package/src/server/management/home-integration-decision.ts +89 -0
  468. package/src/server/management/integration-routes.ts +208 -81
  469. package/src/server/management/link-child-ops-routes.ts +218 -0
  470. package/src/server/management/link-child-preflight.ts +31 -0
  471. package/src/server/management/link-diagnostics-route.ts +29 -0
  472. package/src/server/management/link-enrollment.ts +199 -47
  473. package/src/server/management/link-operation.ts +609 -0
  474. package/src/server/management/link-recover-route.ts +103 -0
  475. package/src/server/management/link-route-edit.ts +173 -0
  476. package/src/server/management/link-route-request.ts +62 -0
  477. package/src/server/management/link-route-state.ts +92 -6
  478. package/src/server/management/link-routes.ts +563 -51
  479. package/src/server/management/link-traffic-status.ts +13 -0
  480. package/src/server/management/model-routes.ts +122 -36
  481. package/src/server/management/model-rows.ts +2 -1
  482. package/src/server/management/native-integration-routes.ts +176 -70
  483. package/src/server/management/oauth-account-routes.ts +69 -17
  484. package/src/server/management/protocol-routes.ts +7 -0
  485. package/src/server/management/provider-completion-test.ts +4 -4
  486. package/src/server/management/provider-overwrite-carry.ts +39 -3
  487. package/src/server/management/provider-routes.ts +80 -72
  488. package/src/server/management/provider-routing-quota.ts +45 -0
  489. package/src/server/management/route-registry.ts +25 -3
  490. package/src/server/management/route-to-routes.ts +257 -0
  491. package/src/server/management/system-restart.ts +4 -2
  492. package/src/server/management/usage-aggregate-cache.ts +101 -66
  493. package/src/server/management-api.ts +17 -3
  494. package/src/server/management-auth.ts +13 -1
  495. package/src/server/messages-native-preflight.ts +27 -4
  496. package/src/server/messages-native.ts +22 -5
  497. package/src/server/persistent-gui-session.ts +6 -3
  498. package/src/server/proxy-liveness.ts +33 -6
  499. package/src/server/relay-eager.ts +36 -12
  500. package/src/server/relay.ts +183 -116
  501. package/src/server/request-body-facts.ts +48 -0
  502. package/src/server/request-decompress.ts +65 -2
  503. package/src/server/request-log-account-rotation.ts +6 -0
  504. package/src/server/request-log-attempt-usage.ts +69 -0
  505. package/src/server/request-log-cache-affinity.ts +60 -0
  506. package/src/server/request-log-conversation.ts +45 -2
  507. package/src/server/request-log-failure-detail.ts +59 -1
  508. package/src/server/request-log-terminal-status.ts +210 -24
  509. package/src/server/request-log.ts +71 -79
  510. package/src/server/responses/adapter-continuation.ts +2 -1
  511. package/src/server/responses/adapter-delivery.ts +2 -0
  512. package/src/server/responses/adapter-dispatch.ts +40 -51
  513. package/src/server/responses/advisor-plan-slot.ts +33 -1
  514. package/src/server/responses/advisor-question.ts +21 -0
  515. package/src/server/responses/advisor-slot.ts +10 -3
  516. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  517. package/src/server/responses/buffered-sse-json.ts +9 -3
  518. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  519. package/src/server/responses/codex-tool-catalog.ts +156 -0
  520. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  521. package/src/server/responses/combo-stream-preflight.ts +701 -81
  522. package/src/server/responses/compact.ts +47 -12
  523. package/src/server/responses/context-overflow.ts +58 -2
  524. package/src/server/responses/core-codex-account.ts +17 -3
  525. package/src/server/responses/core-combo-failure.ts +37 -4
  526. package/src/server/responses/core-combo-native.ts +3 -1
  527. package/src/server/responses/core-combo.ts +62 -7
  528. package/src/server/responses/core-errors.ts +8 -3
  529. package/src/server/responses/core-lifetime.ts +3 -2
  530. package/src/server/responses/core-normalize.ts +3 -1
  531. package/src/server/responses/core-opaque-recovery.ts +45 -2
  532. package/src/server/responses/core-options.ts +18 -0
  533. package/src/server/responses/core.ts +2 -0
  534. package/src/server/responses/fetch-helpers.ts +15 -10
  535. package/src/server/responses/native-replay-guard.ts +57 -0
  536. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  537. package/src/server/responses/outbound-request-body.ts +29 -0
  538. package/src/server/responses/passthrough-completion.ts +105 -8
  539. package/src/server/responses/passthrough-delivery.ts +31 -11
  540. package/src/server/responses/passthrough-dispatch.ts +99 -106
  541. package/src/server/responses/policy-fallback.ts +13 -1
  542. package/src/server/responses/request-prepare.ts +50 -6
  543. package/src/server/responses/request-transport.ts +53 -17
  544. package/src/server/responses/reset-replay.ts +104 -4
  545. package/src/server/responses/run-turn-execution.ts +58 -30
  546. package/src/server/responses/sidecar-execution.ts +14 -0
  547. package/src/server/responses/terminal-error-redaction.ts +222 -25
  548. package/src/server/responses/ws-upstream.ts +2 -2
  549. package/src/server/sse-payload-rewrite.ts +3 -2
  550. package/src/server/stop-service-route.ts +85 -0
  551. package/src/server/system-env-shell.ts +12 -1
  552. package/src/server/system-env.ts +5 -3
  553. package/src/server/windows-tcp-drop.ts +21 -4
  554. package/src/server/workflow-refusal.ts +8 -0
  555. package/src/server/ws-bridge.ts +191 -12
  556. package/src/service/cli-windows-stop.ts +189 -0
  557. package/src/service/cli.ts +41 -12
  558. package/src/service/disconnected-client-restart.ts +60 -0
  559. package/src/service/guarded-manager-target.ts +18 -1
  560. package/src/service/health.ts +99 -6
  561. package/src/service/launchd.ts +84 -31
  562. package/src/service/orchestration.ts +418 -91
  563. package/src/service/repair.ts +223 -6
  564. package/src/service/restart-proxy-stop.ts +79 -0
  565. package/src/service/service-child-ownership.ts +6 -2
  566. package/src/service/windows-checked-stop-live.ts +467 -0
  567. package/src/service/windows-checked-stop.ts +435 -0
  568. package/src/service/windows-command-line-token.ts +23 -0
  569. package/src/service/windows-guarded-manager.ts +77 -34
  570. package/src/service/windows-ops.ts +38 -56
  571. package/src/service/windows-process-evidence.ts +292 -0
  572. package/src/service/windows-process-native.ts +262 -0
  573. package/src/service/windows-service-stop.ts +321 -0
  574. package/src/service/windows-stop-binding.ts +187 -0
  575. package/src/service/windows-stop-budget.ts +123 -0
  576. package/src/service/windows-stop-confirm.ts +158 -0
  577. package/src/service/windows-stop-deadline.ts +56 -0
  578. package/src/service.ts +2 -2
  579. package/src/types/claude-tool-loading.ts +48 -0
  580. package/src/types/config.ts +47 -53
  581. package/src/types/link.ts +20 -0
  582. package/src/types/multi-agent.ts +13 -0
  583. package/src/types/provider.ts +68 -2
  584. package/src/types/request.ts +4 -0
  585. package/src/types.ts +4 -0
  586. package/src/update/guarded-runtime-ops.ts +5 -7
  587. package/src/update/index.ts +25 -10
  588. package/src/update/install-detection.mjs +3 -1
  589. package/src/update/job-pinned-start.ts +2 -0
  590. package/src/update/job-windows-restart.ts +19 -32
  591. package/src/update/job.ts +12 -5
  592. package/src/update/npm-install.d.mts +11 -0
  593. package/src/update/npm-install.mjs +44 -7
  594. package/src/update/orchestrated-entry.ts +1 -1
  595. package/src/update/orchestrated-node-driver.mjs +3 -2
  596. package/src/update/orchestrated-pnpm.d.mts +4 -0
  597. package/src/update/orchestrated-pnpm.mjs +50 -6
  598. package/src/update/orchestrated-session.d.mts +3 -1
  599. package/src/update/orchestrated-session.mjs +21 -6
  600. package/src/update/pnpm-global-install.d.mts +21 -3
  601. package/src/update/pnpm-global-install.mjs +322 -19
  602. package/src/update/pnpm-store-layout.mjs +46 -0
  603. package/src/update/sync-update-mutex.d.mts +3 -2
  604. package/src/update/sync-update-mutex.mjs +57 -8
  605. package/src/update/transactional-install.d.mts +3 -1
  606. package/src/update/transactional-install.mjs +545 -12
  607. package/src/update/windows-installer-marker.d.mts +1 -0
  608. package/src/update/windows-installer-marker.mjs +44 -0
  609. package/src/usage/expected-prices.ts +8 -0
  610. package/src/usage/filter-index.ts +326 -77
  611. package/src/usage/ledger-scanner.ts +15 -0
  612. package/src/usage/link-log-fields.ts +48 -0
  613. package/src/usage/log.ts +43 -2
  614. package/src/usage/request-body.ts +37 -0
  615. package/src/web-search/loop.ts +3 -0
  616. package/src/web-search/parse.ts +21 -2
  617. package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
  618. package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
  619. package/gui/dist/assets/index-Bziu8gTy.css +0 -2
  620. package/gui/dist/assets/index-OYzhQUNP.js +0 -94
  621. package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
  622. package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
  623. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
  624. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -43,6 +43,7 @@ import { effectiveGoogleMode, getProviderRegistryEntry, providerCodexAccountMode
43
43
  import { providerConfigSeed } from "../providers/derive";
44
44
  import { anthropicOAuthInstanceConfigError } from "../config/schema/anthropic-account-pool";
45
45
  import { accountAutoPausePolicySchema } from "../config/schema/account-auto-pause";
46
+ import { normalizeProxyAddress, parseDashboardTrustedProxy } from "../config/dashboard-trusted-proxy";
46
47
  import type { OcxConfig, OcxProviderConfig } from "../types";
47
48
  import { openRouterRoutingConfigError } from "../providers/openrouter-routing";
48
49
  import { modelAutoCompactTokenLimitsConfigError } from "../providers/auto-compact-budget";
@@ -51,6 +52,7 @@ import { googleVertexLocationConfigError } from "../providers/google-vertex-loca
51
52
  import { xaiResponsesOptInState } from "../providers/xai-responses-opt-in";
52
53
  import { authorizationCredential } from "../lib/authorization-scheme";
53
54
  import { noteTurnStateCaller } from "./turn-state-handles";
55
+ import { providerModelDiscoveryConfigError } from "../providers/model-discovery-config";
54
56
 
55
57
  let _corsOrigin = "http://localhost:10100";
56
58
  // Listener identity is process-local. Never infer this trust from forwarded headers: the
@@ -64,6 +66,59 @@ export function markTrustedHubManagementRequest(req: Request): void {
64
66
 
65
67
  export function inheritTrustedHubManagementRequest(source: Request, target: Request): void {
66
68
  if (trustedHubManagementRequests.has(source)) trustedHubManagementRequests.add(target);
69
+ const peer = dashboardProxyPeers.get(source);
70
+ if (peer !== undefined) dashboardProxyPeers.set(target, peer);
71
+ }
72
+
73
+ // #8338: the kernel-observed peer of a public-listener request, recorded by the serve layer the
74
+ // same way as the hub mark above. No header can create or change it.
75
+ const dashboardProxyPeers = new WeakMap<Request, string>();
76
+
77
+ export function markDashboardProxyPeer(req: Request, address: string | undefined): void {
78
+ const normalized = address ? normalizeProxyAddress(address) : null;
79
+ if (normalized) dashboardProxyPeers.set(req, normalized);
80
+ }
81
+
82
+ /** One forwarded value: undefined when absent, null when empty or a multi-hop list. */
83
+ function singleForwardedValue(req: Request, name: string): string | null | undefined {
84
+ const value = req.headers.get(name);
85
+ if (value === null) return undefined;
86
+ const trimmed = value.trim();
87
+ return trimmed && !trimmed.includes(",") ? trimmed : null;
88
+ }
89
+
90
+ function forwardedAuthorityHost(value: string): string | null {
91
+ try {
92
+ const url = new URL(`https://${value}`);
93
+ return url.username || url.password || url.pathname !== "/" || url.search || url.hash ? null : url.host;
94
+ } catch {
95
+ return null;
96
+ }
97
+ }
98
+
99
+ /**
100
+ * The configured dashboard origin when, and only when, the configured proxy delivered this request
101
+ * (#8338). The peer must be one of `proxyAddresses`; the browser host comes from Host, or from
102
+ * X-Forwarded-Host when that header is trusted; X-Forwarded-Proto must say https when trusted. A
103
+ * forwarded host or scheme that contradicts the configured origin refuses even when that header is
104
+ * not trusted, so a forged value can never pass silently. Standalone with remote auth only: a
105
+ * loopback bind must never hand local trust to whatever the proxy forwards.
106
+ */
107
+ export function dashboardProxyOrigin(req: Request, config: OcxConfig): string | null {
108
+ if (config.dashboardTrustedProxy === undefined) return null;
109
+ const peer = dashboardProxyPeers.get(req);
110
+ if (peer === undefined) return null;
111
+ if ((config.runtimeRole ?? "standalone") !== "standalone" || !isApiAuthRequired(config)) return null;
112
+ const settings = parseDashboardTrustedProxy(config.dashboardTrustedProxy);
113
+ if (typeof settings === "string" || !settings.addresses.has(peer)) return null;
114
+ const forwardedHost = singleForwardedValue(req, "X-Forwarded-Host");
115
+ const forwardedProto = singleForwardedValue(req, "X-Forwarded-Proto");
116
+ if (forwardedHost === null || forwardedProto === null) return null;
117
+ if (forwardedHost !== undefined && forwardedAuthorityHost(forwardedHost) !== settings.host) return null;
118
+ if (forwardedProto !== undefined && forwardedProto.toLowerCase() !== "https") return null;
119
+ if (settings.trust.has("x-forwarded-proto") && forwardedProto === undefined) return null;
120
+ const authority = settings.trust.has("x-forwarded-host") ? forwardedHost : req.headers.get("Host");
121
+ return authority && forwardedAuthorityHost(authority) === settings.host ? settings.origin : null;
67
122
  }
68
123
 
69
124
  export function setCorsOrigin(port: number): void { _corsOrigin = `http://localhost:${port}`; }
@@ -151,6 +206,9 @@ function comparableOrigin(value: string): string | null {
151
206
  }
152
207
 
153
208
  export function managementRequestOrigin(req: Request, config: OcxConfig): string | null {
209
+ // #8338: a request the configured dashboard proxy delivered speaks for the configured origin.
210
+ const proxied = dashboardProxyOrigin(req, config);
211
+ if (proxied) return proxied;
154
212
  const host = req.headers.get("Host");
155
213
  const parsedHost = parseHttpHost(host);
156
214
  if (!host || !parsedHost) return null;
@@ -492,6 +550,28 @@ export function contextPrincipalIdOf(admission: DataPlaneAdmission | undefined):
492
550
  return admission && "contextPrincipalId" in admission ? admission.contextPrincipalId : undefined;
493
551
  }
494
552
 
553
+ /**
554
+ * Recheck a content-free loopback identity after its local-only header was discarded.
555
+ * This only revokes retained replay identity; it never grants data-plane admission.
556
+ */
557
+ export function isContextPrincipalCurrent(principal: string | undefined, config: Pick<OcxConfig, "apiKeys">): boolean {
558
+ if (!principal) return false;
559
+ const environment = configuredApiAuthToken(config);
560
+ if (environment && mintContextPrincipal("environment", "", environment) === principal) return true;
561
+ const matches = (keyId: string, secret: string): boolean => {
562
+ if (!secret || mintContextPrincipal("configured", keyId, secret) !== principal) return false;
563
+ // Preserve the resolver's precedence if an environment token or another key
564
+ // now shadows this entry. The same key id with a replacement secret is not this owner.
565
+ return contextPrincipalIdOf(resolveDataPlaneAdmissionSecret(secret, config) ?? undefined) === principal;
566
+ };
567
+ for (const key of config.apiKeys ?? []) {
568
+ if (matches(key.id, key.key)) return true;
569
+ const pending = key.pendingRotation;
570
+ if (pending && Date.parse(pending.expiresAt) > Date.now() && matches(key.id, pending.key)) return true;
571
+ }
572
+ return false;
573
+ }
574
+
495
575
  /**
496
576
  * The caller principal for a context-relay request, which is a stricter question than admission.
497
577
  *
@@ -518,6 +598,22 @@ export function resolveContextPrincipal(req: Request, config: OcxConfig, admissi
518
598
  return undefined;
519
599
  }
520
600
 
601
+ /** Preserve only loopback replay identity removed by the forwarding-header filter. */
602
+ export function resolveFilteredReplayPrincipal(
603
+ req: Request,
604
+ config: OcxConfig,
605
+ admission: DataPlaneAdmission,
606
+ forwardHeaders: Headers,
607
+ ): Readonly<{ clientPrincipalId: string }> | undefined {
608
+ if (admission.kind !== "loopback"
609
+ || !(req.headers.has("x-opencodex-api-key") || req.headers.has("x-api-key"))) return undefined;
610
+ const principal = resolveContextPrincipal(req, config, admission);
611
+ const forwardedPrincipal = resolveContextPrincipal(new Request(req.url, { headers: forwardHeaders }), config, admission);
612
+ // A surviving bearer keeps its existing per-frame resolution and key-rotation semantics.
613
+ if (principal && principal !== forwardedPrincipal) return Object.freeze({ clientPrincipalId: principal });
614
+ return undefined;
615
+ }
616
+
521
617
  /** Stable structural replay identity. This does not replace process-local opaque-state ownership. */
522
618
  export function resolveDurableReplayPrincipal(
523
619
  req: Request,
@@ -993,24 +1089,24 @@ export function providerManagementConfigError(
993
1089
  if (jsonSchemaOptOutError) return `provider ${name} ${jsonSchemaOptOutError}`;
994
1090
  const retainModelsError = nonBlankStringArrayConfigError(raw.retainModels, "retainModels");
995
1091
  if (retainModelsError) return `provider ${name} ${retainModelsError}`;
1092
+ const modelDiscoveryError = providerModelDiscoveryConfigError(raw.modelDiscovery);
1093
+ if (modelDiscoveryError) return `provider ${JSON.stringify(redactSecretString(name))} ${modelDiscoveryError}`;
996
1094
  const toolReasoningOptOutError = nonBlankStringArrayConfigError(
997
1095
  raw.omitReasoningEffortWithToolsModels,
998
1096
  "omitReasoningEffortWithToolsModels",
999
1097
  );
1000
1098
  if (toolReasoningOptOutError) return `provider ${name} ${toolReasoningOptOutError}`;
1001
- const unsupportedHostedToolsError = nonBlankStringArrayConfigError(
1002
- raw.unsupportedHostedTools,
1003
- "unsupportedHostedTools",
1004
- );
1005
- if (unsupportedHostedToolsError) return `provider ${name} ${unsupportedHostedToolsError}`;
1006
- if (Array.isArray(raw.unsupportedHostedTools)) {
1099
+ for (const field of ["unsupportedHostedTools", "unsupportedHostedToolsWithClientTools"] as const) {
1100
+ const hostedToolsError = nonBlankStringArrayConfigError(raw[field], field);
1101
+ if (hostedToolsError) return `provider ${name} ${hostedToolsError}`;
1102
+ if (!Array.isArray(raw[field])) continue;
1007
1103
  // Closed vocabulary, same reason as the config schema: an unrecognized name would be
1008
1104
  // stored and then strip nothing, so the operator would keep getting the upstream 400
1009
1105
  // this field exists to prevent.
1010
- const unknownTool = (raw.unsupportedHostedTools as unknown[])
1106
+ const unknownTool = (raw[field] as unknown[])
1011
1107
  .find(tool => typeof tool === "string" && !DECLARABLE_HOSTED_TOOL_TYPES.has(tool.trim()));
1012
1108
  if (unknownTool !== undefined) {
1013
- return `provider ${name} unsupportedHostedTools must name only hosted tool types: `
1109
+ return `provider ${name} ${field} must name only hosted tool types: `
1014
1110
  + `${[...DECLARABLE_HOSTED_TOOL_TYPES].join(", ")}`;
1015
1111
  }
1016
1112
  }
@@ -1077,6 +1173,7 @@ type ProviderConfigFieldPolicy = "editor" | "redacted" | "runtime";
1077
1173
  const PROVIDER_CONFIG_FIELD_POLICY = {
1078
1174
  alias: "editor",
1079
1175
  modelAliases: "editor",
1176
+ aliasTemplate: "editor",
1080
1177
  modelDisplayNames: "editor",
1081
1178
  defaultAliases: "editor",
1082
1179
  adapter: "editor",
@@ -1136,6 +1233,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
1136
1233
  defaultModel: "editor",
1137
1234
  models: "editor",
1138
1235
  liveModels: "editor",
1236
+ modelDiscovery: "editor",
1139
1237
  selectedModels: "editor",
1140
1238
  initialModelSelection: "runtime",
1141
1239
  retainModels: "editor",
@@ -1190,6 +1288,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
1190
1288
  zaiResponsesDefaultVersion: "runtime",
1191
1289
  supportsResponsesCustomTools: "editor",
1192
1290
  unsupportedHostedTools: "editor",
1291
+ unsupportedHostedToolsWithClientTools: "editor",
1193
1292
  responsesSnapshotRepair: "editor",
1194
1293
  webSearchBridge: "editor",
1195
1294
  reasoningEffortMap: "editor",
@@ -1211,6 +1310,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
1211
1310
  foldDeveloperRoleToSystem: "editor",
1212
1311
  singleLeadingSystemMessage: "editor",
1213
1312
  promptCacheKey: "editor",
1313
+ cacheAffinity: "editor",
1214
1314
  chatServiceTier: "editor",
1215
1315
  responsesItemIdRepair: "editor",
1216
1316
  autoToolChoiceOnlyModels: "editor",
@@ -1228,6 +1328,7 @@ const PROVIDER_CONFIG_FIELD_POLICY = {
1228
1328
  thinkingBudgetModels: "editor",
1229
1329
  escapeBuiltinToolNames: "editor",
1230
1330
  anthropicEofTolerance: "editor",
1331
+ forwardAdvisorTool: "editor",
1231
1332
  noVisionModels: "editor",
1232
1333
  googleMode: "editor",
1233
1334
  project: "editor",
@@ -0,0 +1,220 @@
1
+ import {
2
+ CYBER_POLICY_ERROR_CODE,
3
+ isCyberPolicyMessage,
4
+ isTerminalRefusalCode,
5
+ recognizedUpstreamError,
6
+ safetyRefusalCodeFromMessage,
7
+ terminalRefusalFallbackMessage,
8
+ upstreamErrorMessageFromPayload,
9
+ } from "../lib/errors";
10
+ import { redactSecretString } from "../lib/redact";
11
+ import { outboundCredentials } from "../lib/outbound-credential-registry";
12
+ import { codexWsWrapperStatus } from "./responses/codex-ws-wire";
13
+ import { configuredCredentials, containsConfiguredCredentialExcerpt } from "./configured-credentials";
14
+
15
+ type JsonRecord = Record<string, unknown>;
16
+ export const MAX_BARE_ERROR_MESSAGE_CHARS = 512;
17
+ const record = (value: unknown): JsonRecord | undefined =>
18
+ value !== null && typeof value === "object" && !Array.isArray(value) ? value as JsonRecord : undefined;
19
+ const field = (value: JsonRecord | undefined, key: string): string | undefined => {
20
+ const item = value?.[key];
21
+ return typeof item === "string" && item.trim() ? item.trim() : undefined;
22
+ };
23
+ const MAX_BARE_CLASS_CHARS = 128;
24
+ /** A class identifier longer than the bound is not a class; truncating it could keep a credential prefix. */
25
+ const classField = (value: JsonRecord | undefined, key: string): string | undefined => {
26
+ const item = field(value, key);
27
+ return item !== undefined && item.length <= MAX_BARE_CLASS_CHARS ? item : undefined;
28
+ };
29
+
30
+ /**
31
+ * Masks upstream copy before anything bounds it. A bound applied first can keep a prefix of a long
32
+ * credential that a later full-value mask no longer recognizes. The relay passes its per-request
33
+ * outbound mask; every reader also refuses copy that contains a credential this process sent, and
34
+ * refuses all copy while the registry cannot vouch for every sent credential (one too large to keep).
35
+ */
36
+ export type BareCopyMask = (text: string) => string;
37
+ export function guardBareCopy(raw: string, mask?: BareCopyMask): string {
38
+ const masked = mask ? mask(raw) : raw;
39
+ const registry = outboundCredentials();
40
+ return !registry.complete() || registry.matches(masked) ? "[REDACTED]" : masked;
41
+ }
42
+
43
+ /** Codes this proxy's own transport layer assigns to a delivery failure, not a provider verdict. */
44
+ function isTransportFailureCode(code: string): boolean {
45
+ return /^(?:upstream_|transport_|network_|connection_|socket_|adapter_|stream_)/.test(code);
46
+ }
47
+
48
+ /** Only absent root type plus an error object qualifies as an untyped envelope. */
49
+ export function isUntypedBareUpstreamError(payload: unknown): boolean {
50
+ const root = record(payload);
51
+ return !!root && root.type === undefined && record(root.error) !== undefined;
52
+ }
53
+
54
+ export interface BareUpstreamError {
55
+ message: string;
56
+ refusalCode: string | undefined;
57
+ /** The wire identity and status the client tail carries, derived once for every reader. */
58
+ errorType: string | undefined;
59
+ terminalType: string;
60
+ terminalCode: string;
61
+ /** The one server status every reader records; never absent. */
62
+ terminalStatus: number;
63
+ errorCode: string | undefined;
64
+ /**
65
+ * The status the provider itself stated: an explicit refusal (400), a recognized class, or a
66
+ * Codex WebSocket wrapper 5xx. Undefined for an unrecognized class, so a reader that has a wider
67
+ * set of explicit fields (combo preflight) or a transport failure that followed (a read reset)
68
+ * still decides; {@link terminalStatus} is the synthetic wire status for the same verdict.
69
+ */
70
+ httpStatus: number | undefined;
71
+ /**
72
+ * Whether the copy may be kept on a request row. Decided on the full upstream text, before any
73
+ * bound, against every configured credential (not only the ones sent on this request), and false
74
+ * while that set cannot vouch for complete coverage. The client tail is unaffected.
75
+ */
76
+ rowCopyAllowed: boolean;
77
+ }
78
+
79
+ /** Preserve first-code precedence when deriving a bounded provisional stream verdict. */
80
+ export function bareUpstreamError(payload: unknown, mask?: BareCopyMask): BareUpstreamError | undefined {
81
+ const root = record(payload);
82
+ const untyped = isUntypedBareUpstreamError(payload);
83
+ // A bare error is a typed `error` event or an untyped envelope. `response.failed` is a genuine
84
+ // terminal and belongs to the terminal classifier, not to this provisional evidence.
85
+ if (!root || (root.type !== "error" && !untyped)) return undefined;
86
+ const response = record(root.response);
87
+ // A typed `error` frame carries its class on the envelope; an untyped one carries it inside
88
+ // the error object. Reading the envelope first for both would let a stray top-level `code`
89
+ // outrank the structured class the provider actually stated.
90
+ const candidates = untyped
91
+ ? [record(root.error), record(root.last_error), record(response?.error), record(response?.incomplete_details), root]
92
+ : [root, record(root.error), record(root.last_error), record(response?.error), record(response?.incomplete_details)];
93
+ const code = candidates.map(candidate => classField(candidate, "code")).find(value => value !== undefined);
94
+ // The envelope's own `type` is `error` or the terminal event name, never the error class.
95
+ const errorType = (untyped ? candidates.slice(0, -1) : candidates.slice(1))
96
+ .map(candidate => classField(candidate, "type")).find(value => value !== undefined);
97
+ // The message follows the same precedence as the class: a typed frame's own envelope copy is
98
+ // the provider's verdict, while an untyped envelope's copy lives inside its error object.
99
+ const rawMessage = untyped
100
+ ? upstreamErrorMessageFromPayload(payload)
101
+ : field(root, "message") ?? upstreamErrorMessageFromPayload(payload);
102
+ const message = rawMessage
103
+ ? redactSecretString(guardBareCopy(rawMessage, mask)).slice(0, MAX_BARE_ERROR_MESSAGE_CHARS) : undefined;
104
+ // The verdict is read from the provider's own words, not from the copy the guard may have
105
+ // replaced: a refusal that also echoes a credential is still a refusal. Never stored or shown.
106
+ const evidenceCopy = rawMessage ? redactSecretString(rawMessage).slice(0, MAX_BARE_ERROR_MESSAGE_CHARS) : undefined;
107
+ // An explicit refusal code is the provider's own verdict. Otherwise verified refusal copy is
108
+ // recognized beside an unrelated code: a gateway that wraps the refusal in its own class still
109
+ // ended the turn with a refusal, and retrying it would loop. A recognized quota/overload class
110
+ // is stronger evidence than copy and keeps its identity instead. A transport code names the
111
+ // delivery failure rather than the provider's verdict, so copy quoted inside its diagnostic
112
+ // text is not evidence of a refusal.
113
+ const refusalCode = isTerminalRefusalCode(code) ? code
114
+ : evidenceCopy === undefined || recognizedUpstreamError({ type: errorType, code }) !== undefined
115
+ || (code !== undefined && isTransportFailureCode(code)) ? undefined
116
+ : isCyberPolicyMessage(evidenceCopy) ? CYBER_POLICY_ERROR_CODE : safetyRefusalCodeFromMessage(evidenceCopy);
117
+ if (message === undefined && refusalCode === undefined && code === undefined && errorType === undefined && !untyped) return undefined;
118
+ const recognized = recognizedUpstreamError({ type: errorType, code });
119
+ const fallback = code ?? errorType;
120
+ // A recognized class outranks an unknown code in the same verdict: the row records the class's
121
+ // status, so the client must carry the class identity rather than a generic retryable code.
122
+ // A refusal keeps its own identity and is never retried. An unrecognized class is still a
123
+ // provider verdict, so it keeps the wrapper status the upstream stated (a WebSocket `error`
124
+ // carries one) and otherwise the synthetic 502 every reader already used.
125
+ const terminalType = refusalCode !== undefined
126
+ ? "invalid_request_error" : recognized?.type ?? "upstream_error";
127
+ const terminalCode = refusalCode ?? recognized?.code ?? "upstream_server_error";
128
+ const wrapped = wrappedServerErrorStatus(payload);
129
+ const httpStatus = refusalCode !== undefined ? 400 : recognized?.httpStatus ?? wrapped;
130
+ const terminalStatus = httpStatus ?? 502;
131
+ const configured = configuredCredentials();
132
+ const rowCopyAllowed = configured.complete
133
+ && ![rawMessage, code, errorType].some(text => text !== undefined && (configured.matches(text) || containsConfiguredCredentialExcerpt(text)));
134
+ return {
135
+ message: message ?? (refusalCode ? terminalRefusalFallbackMessage(refusalCode)
136
+ : fallback ? `Upstream error without a message (${redactSecretString(guardBareCopy(fallback, mask))})` : "The upstream reported an error."),
137
+ refusalCode,
138
+ errorType,
139
+ errorCode: code,
140
+ terminalType,
141
+ terminalCode,
142
+ terminalStatus,
143
+ httpStatus,
144
+ rowCopyAllowed,
145
+ };
146
+ }
147
+
148
+ /**
149
+ * The server status a Codex WebSocket `error` frame states on its wrapper ({@link codexWsWrapperStatus}),
150
+ * or undefined. Only 5xx is returned. Every 5xx is the same transient class for account health, so
151
+ * this changes what a row says, not where the next turn goes; a wrapper 4xx would move quota and
152
+ * credential routing and is left to its own review (#6740).
153
+ */
154
+ export function wrappedServerErrorStatus(payload: unknown): number | undefined {
155
+ const status = codexWsWrapperStatus(payload as Record<string, unknown>);
156
+ return status !== undefined && status >= 500 ? status : undefined;
157
+ }
158
+
159
+ export interface BareUpstreamEvidence {
160
+ typed: boolean;
161
+ verdict: BareUpstreamError;
162
+ /** The winning frame was itself a policy terminal; the client stream ended on it. */
163
+ terminal?: boolean;
164
+ }
165
+
166
+ /**
167
+ * A bare frame the relay treats as an immediate policy terminal, by the same rule as its
168
+ * client rewrite: a typed `error` with a `cyber_policy` code or policy copy in any error
169
+ * record, or an untyped envelope whose structured code is `cyber_policy`.
170
+ */
171
+ function isBarePolicyTerminal(payload: unknown, verdict: BareUpstreamError): boolean {
172
+ if (isUntypedBareUpstreamError(payload)) return verdict.errorCode === CYBER_POLICY_ERROR_CODE;
173
+ const root = record(payload);
174
+ const response = record(root?.response);
175
+ const candidates = [record(root?.error), record(root?.last_error), record(response?.error),
176
+ record(response?.incomplete_details), root, response];
177
+ return candidates.some(candidate => field(candidate, "code") === CYBER_POLICY_ERROR_CODE)
178
+ || candidates.some(candidate => { const message = field(candidate, "message"); return !!message && isCyberPolicyMessage(message); });
179
+ }
180
+
181
+ /**
182
+ * One precedence rule for every reader of bare upstream errors.
183
+ *
184
+ * A typed bare `error` is the provider's structured verdict, so the newest typed
185
+ * frame wins. An untyped envelope is weaker evidence: it may replace an earlier
186
+ * untyped frame, but it never replaces a typed verdict. A genuine terminal is not
187
+ * bare evidence and supersedes both, which is why the reducer only ever sees
188
+ * bare frames. A winning policy terminal ends the client stream on that frame, so
189
+ * nothing after it can replace it.
190
+ */
191
+ export function reduceBareUpstreamEvidence(
192
+ previous: BareUpstreamEvidence | undefined,
193
+ payload: unknown,
194
+ mask?: BareCopyMask,
195
+ ): BareUpstreamEvidence | undefined {
196
+ const verdict = bareUpstreamError(payload, mask);
197
+ if (verdict === undefined) return previous;
198
+ if (previous?.terminal === true) return previous;
199
+ const typed = !isUntypedBareUpstreamError(payload);
200
+ // The stored verdict decides: an untyped frame may replace untyped evidence, never typed.
201
+ if (!typed && previous?.typed === true) return previous;
202
+ if (!isBarePolicyTerminal(payload, verdict)) return { typed, verdict };
203
+ // The client receives this frame rewritten as the policy terminal, so every reader records
204
+ // that refusal, even when the frame also names an unrelated class beside the policy copy.
205
+ return { typed, terminal: true, verdict: { ...verdict, refusalCode: CYBER_POLICY_ERROR_CODE,
206
+ terminalType: "invalid_request_error", terminalCode: CYBER_POLICY_ERROR_CODE, terminalStatus: 400, httpStatus: 400 } };
207
+ }
208
+
209
+ /**
210
+ * Whether a payload is bare evidence at all, independent of whether it wins.
211
+ *
212
+ * The reducer returns the previous evidence for a frame that is not bare, so a caller
213
+ * that must distinguish "no new evidence" from "a weaker frame lost" asks this first.
214
+ * A genuine Responses terminal is not bare evidence and is handled by the terminal
215
+ * classifier, never by the provisional reducer.
216
+ */
217
+ export function isBareUpstreamErrorPayload(payload: unknown): boolean {
218
+ const root = record(payload);
219
+ return !!root && (root.type === "error" || isUntypedBareUpstreamError(payload));
220
+ }
@@ -10,7 +10,9 @@
10
10
  * If each route serialized independently they would drift, and the data-plane
11
11
  * copy is the one nobody looks at in the dashboard.
12
12
  */
13
- import { createHash } from "node:crypto";
13
+ import { catalogEtag } from "../lib/catalog-etag";
14
+
15
+ export { catalogEtag };
14
16
 
15
17
  /**
16
18
  * Upper bound for the REMOTE route only.
@@ -37,10 +39,6 @@ export interface SerializedCatalog {
37
39
  bytes?: number;
38
40
  }
39
41
 
40
- export function catalogEtag(body: string): string {
41
- return `"${createHash("sha256").update(body).digest("hex")}"`;
42
- }
43
-
44
42
  /**
45
43
  * Read and serialize the persisted catalog once.
46
44
  *
@@ -1,4 +1,4 @@
1
- import { recordUpstreamValidationDetail } from "./request-log-failure-detail";
1
+ import { recordUpstreamProviderErrorDetail } from "./request-log-failure-detail";
2
2
  import { normalizeNativeChatContent } from "../adapters/openai-chat/native-content";
3
3
  import { attachComboFailureEvidence, ownedChatErrorPayload, type ClientErrorContract } from "../lib/client-error-body";
4
4
  import type { FailureVerdictSink } from "../chat/failure-verdict";
@@ -8,6 +8,7 @@ import { createPhysicalSendReporter } from "../lib/request-execution-budget";
8
8
  import { createInferenceSendBudget } from "./inference/context";
9
9
  import { observeAdvisorNativeReasoning } from "./inference/advisor-diagnostics";
10
10
  import { buildOpenAIChatPassthroughRequest, createOpenAIChatAdapter } from "../adapters/openai-chat";
11
+ import { affinityLaneFromRequest } from "./request-log-conversation";
11
12
  import type { AdapterRequest, ProviderAdapter } from "../adapters/base";
12
13
  import { isNativeChatRouteEligible } from "./chat-native-eligibility";
13
14
  import {
@@ -68,7 +69,9 @@ import { fastPolicyForModel } from "../providers/service-tier";
68
69
  import { RequestPacingQueueOverloadError } from "../providers/request-pacing";
69
70
  import { stampApiKeyAccountLabel } from "../providers/label";
70
71
  import { distributedKeyPhysicalFetch, distributedKeyResponseOwner } from "../providers/api-key-response-ownership";
71
- import { providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
72
+ import { passiveKeyPhysicalFetch } from "../providers/passive-key-observation";
73
+ import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
74
+ import { providerAffinityGenerationIsCurrent, providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../providers/api-key-selection";
72
75
  import type { OcxProviderTransport } from "../providers/xai-transport";
73
76
  import type { RouteResult } from "../router";
74
77
  import type { OcxConfig, OcxProviderConfig } from "../types";
@@ -357,11 +360,19 @@ export async function runNativeChatAttempt(
357
360
  // Transport variant: the bare picker answers with the persisted row, which for a built-in
358
361
  // provider carries no adapter id or base URL until routedProviderConfig backfills it.
359
362
  try {
360
- const proactiveKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, route.provider);
363
+ const affinityLane = affinityLaneFromRequest(req, logCtx, config, execution.admission ?? logIds?.admission);
364
+ if (affinityLane) logCtx.affinityLane = affinityLane;
365
+ const chatMessages = Array.isArray(execution.chatBody.messages) ? execution.chatBody.messages : [];
366
+ const proactiveKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, route.provider, undefined, Date.now(), { lane: affinityLane, model: route.modelId, log: logCtx, continuation: (chatMessages.at(-1) as { role?: unknown } | undefined)?.role === "tool" });
361
367
  if (proactiveKeyProvider) route.provider = proactiveKeyProvider;
368
+ if (isProviderApiKeyPaused(route.provider)) throw new ProviderApiKeyPausedError();
362
369
  } catch (error) {
363
370
  cleanupAbort(); upstream.abort();
371
+ if (error instanceof ProviderApiKeyPausedError) {
372
+ return failLocal(403, error.message, "permission_error");
373
+ }
364
374
  if (!(error instanceof RequestPacingQueueOverloadError)) throw error;
375
+ logCtx.terminalSource = "synthetic";
365
376
  const refusal = failLocal(429, error.message, "rate_limit_error");
366
377
  const advice = formatClientRetryAfter(error.retryAfterSeconds);
367
378
  if (advice !== undefined) refusal.headers.set("Retry-After", advice);
@@ -518,6 +529,7 @@ export async function runNativeChatAttempt(
518
529
  dispatchOverride: async (_input, init, execute, reacquirePacing) => {
519
530
  for (let attempt = 0; !providerApiKeySelectionIsCurrent(config, route.providerName, activeProvider); attempt++) {
520
531
  if (outputDelivered) throw new Error("Provider key selection is unavailable during the native Chat turn");
532
+ if (!providerAffinityGenerationIsCurrent(config, route.providerName, activeProvider)) throw new Error("Provider affinity selection is no longer available");
521
533
  if (attempt >= 3) throw new Error("Provider key selection changed repeatedly before native Chat dispatch");
522
534
  let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, activeProvider);
523
535
  if (!current && activeProvider.requestPacing?.enabled
@@ -526,6 +538,7 @@ export async function runNativeChatAttempt(
526
538
  if (fresh) current = selectProactiveApiKeyTransport(config, route.providerName, fresh) ?? fresh;
527
539
  }
528
540
  if (!current || !isNativeChatRouteEligible({ ...route, provider: current }, execution.chatBody, config)) {
541
+ if (!current && isProviderApiKeyPaused(config.providers[route.providerName])) throw new ProviderApiKeyPausedError();
529
542
  throw new Error("Provider key selection is no longer available for native Chat");
530
543
  }
531
544
  activeProvider = current;
@@ -570,8 +583,8 @@ export async function runNativeChatAttempt(
570
583
  // A reselected provider transport is still a physical send: the connection policy
571
584
  // and manual-redirect ownership wrap the selected implementation (#4992).
572
585
  const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
573
- distributedKeyPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute,
574
- route.providerName, activeProvider, request.url),
586
+ passiveKeyPhysicalFetch(distributedKeyPhysicalFetch((activeProvider as OcxProviderTransport).fetch ?? execute,
587
+ route.providerName, activeProvider, request.url), config, route.providerName, activeProvider),
575
588
  String(input), physicalInit, { providerName: route.providerName, provider: activeProvider },
576
589
  )) as typeof fetch;
577
590
  localUpstream = isLocalUpstream(request.url);
@@ -649,7 +662,7 @@ export async function runNativeChatAttempt(
649
662
  // exists to stop. It kept the same shape under the old 502 only because 502 never
650
663
  // matched this branch.
651
664
  && !isNonReplayableResponse(response) && !isSameTargetRetryHold(response)
652
- && retryPolicy
665
+ && retryPolicy && providerAffinityGenerationIsCurrent(config, route.providerName, activeProvider)
653
666
  && retries < retryPolicy.attempts
654
667
  && transientSendAvailable()
655
668
  ) {
@@ -699,13 +712,18 @@ export async function runNativeChatAttempt(
699
712
  upstream.abort();
700
713
  if (req.signal.aborted) return failLocal(499, "Client cancelled request", "client_cancelled");
701
714
  const sendError = error instanceof UpstreamRetryEvidenceError ? error.cause : error;
715
+ if (sendError instanceof ProviderApiKeyPausedError) {
716
+ return failLocal(403, sendError.message, "permission_error");
717
+ }
702
718
  if (sendError instanceof RequestPacingQueueOverloadError) {
719
+ logCtx.terminalSource = "synthetic";
703
720
  const refusal = failLocal(429, sendError.message, "rate_limit_error");
704
721
  const advice = formatClientRetryAfter(sendError.retryAfterSeconds);
705
722
  if (advice !== undefined) refusal.headers.set("Retry-After", advice);
706
723
  return refusal;
707
724
  }
708
725
  if (sendError instanceof SendBudgetExhaustedError) {
726
+ logCtx.terminalSource = "synthetic";
709
727
  const refusal = workflowSendCeilingRefusalResponse(logCtx, req.headers.get("x-codex-parent-thread-id")?.trim() || undefined,
710
728
  execution.workflowRefusalContext);
711
729
  if (refusal) { finishLog(429); return refusal; }
@@ -745,7 +763,7 @@ export async function runNativeChatAttempt(
745
763
  let upstreamMessage: string | undefined;
746
764
  try {
747
765
  const parsedError = JSON.parse(bodyText) as Rec;
748
- recordUpstreamValidationDetail(logCtx, response.status, parsedError);
766
+ recordUpstreamProviderErrorDetail(logCtx, response.status, parsedError);
749
767
  const nested = isRec(parsedError.error) ? parsedError.error : undefined;
750
768
  const details = nested ?? parsedError;
751
769
  if (typeof details.type === "string") upstreamType = details.type;
@@ -46,6 +46,7 @@ import { captureAdmissionPolicy } from "./capture-admission-policy";
46
46
  import type { CapturedAdmissionPolicy } from "../types/admission-policy";
47
47
  import { captureClaudeInbound } from "../claude/inbound-debug";
48
48
  import { declaredAnthropicServerTools, replayedAnthropicServerBlocks, systemCachePrefix } from "../claude/inbound-content-options";
49
+ import { linkAdvisorPlanConfig } from "./responses/advisor-plan-slot";
49
50
  import { claudeCodeForIngress } from "../claude/intercept/model-bindings";
50
51
  import { classifyInterceptClient } from "../claude/intercept/client-class";
51
52
  import { analyzeClaudeCompatibility, isClaudeCompatibilityMode } from "../claude/compatibility";
@@ -1176,7 +1177,7 @@ async function handleClaudeMessagesWithBudget(
1176
1177
  }
1177
1178
  const { handleNativeMessages } = await import("./messages-native");
1178
1179
  return await handleNativeMessages({
1179
- req, config, logCtx, ...(logIds ? { logIds } : {}),
1180
+ req, config, logCtx, ...(logIds ? { logIds } : {}), admission: logIds?.admission,
1180
1181
  route: nativeMessagesRoute, body: nativeBody, requestedModel: clientFacingModelText(clientModelLabel), translatorBudget, selector: nativeSelector,
1181
1182
  modelScope: resolveAdmissionModelScope(config, logIds?.admission),
1182
1183
  // Compatibility identity is an opaque request-local handle, separate from credentials.
@@ -1265,15 +1266,16 @@ async function handleClaudeMessagesWithBudget(
1265
1266
  // BEFORE translation (the translated Anthropic stream has no response.completed
1266
1267
  // frame, so tapping it records a bogus 502 with no usage/cache detail).
1267
1268
  const finalizeNativeLog = createFinalRequestLog(logIds, logCtx).finish;
1268
- const upstream = await handleResponses(internalReq, {
1269
+ // The replay view is a new object; link it so the Advisor factory registered on `config` applies.
1270
+ const upstream = await handleResponses(internalReq, linkAdvisorPlanConfig(config, {
1269
1271
  ...buildClaudeReplayConfig(config),
1270
1272
  // Operator config wins; otherwise the caller's explicit TTLs (all 1h, or a pinned 5m) carry
1271
1273
  // over, and TTL-less breakpoints take the destination default.
1272
1274
  cacheRetention: config.cacheRetention ?? callerCacheRetention(anthropicBody),
1273
- }, logCtx, {
1275
+ }), logCtx, {
1274
1276
  ...(nativeComboSource && envelope && settledRoute?.combo ? {
1275
1277
  protocolSource: (await import("./messages-native")).createNativeMessagesComboSource({
1276
- req, config, logCtx, envelope, requestedModel, translatorBudget, selector: nativeSelector,
1278
+ req, config, logCtx, envelope, requestedModel, translatorBudget, selector: nativeSelector, admission: logIds?.admission,
1277
1279
  echoModel: clientFacingModelText(clientModelLabel),
1278
1280
  modelScope: resolveAdmissionModelScope(config, logIds?.admission),
1279
1281
  callerAnthropicBeta: req.headers.get("anthropic-beta"),
@@ -1314,7 +1316,8 @@ async function handleClaudeMessagesWithBudget(
1314
1316
  anthropicSystemCachePrefix: isRec(anthropicBody) ? systemCachePrefix(anthropicBody.system) : undefined,
1315
1317
  // Preserve the original catalog through late fallback; only the physical adapter projects it.
1316
1318
  anthropicToolLoadingSource: cacheKeySource === "metadata" && isRec(anthropicBody)
1317
- && Array.isArray(cc?.appendOnlyToolLoadingModels) && cc.appendOnlyToolLoadingModels.length > 0
1319
+ && ((Array.isArray(cc?.appendOnlyToolLoadingModels) && cc.appendOnlyToolLoadingModels.length > 0)
1320
+ || (Array.isArray(cc?.chatToolDispatchModels) && cc.chatToolDispatchModels.length > 0))
1318
1321
  ? { tools: anthropicBody.tools, messages: anthropicBody.messages, tool_choice: anthropicBody.tool_choice } : undefined,
1319
1322
  claudeGoAffinity: { sessionLane: claudeGoSessionLane },
1320
1323
  claudeNativeSessionId,
@@ -6,6 +6,7 @@ import { loadCatalogTemplate } from "../codex/catalog/bundled";
6
6
  import { applyNativeVisibility, nativeContextLimits } from "../codex/catalog/metadata";
7
7
  import { readCatalog, readCodexCatalogPath, type CatalogModel } from "../codex/catalog/parsing";
8
8
  import { readNativeBaseline, retainedNativeSourcePriorities } from "../codex/catalog/native-priority";
9
+ import { resolveMultiAgentMode } from "../config/multi-agent-surface";
9
10
 
10
11
  interface CodexModelListInput {
11
12
  config: OcxConfig;
@@ -31,7 +32,7 @@ export function buildCodexModelList({
31
32
  baseline: readNativeBaseline(catalogPath),
32
33
  retainedBySlug: retainedNativeSourcePriorities(readCatalog(catalogPath)?.models ?? []),
33
34
  };
34
- const maMode = config.multiAgentMode === "v1" || config.multiAgentMode === "v2" ? config.multiAgentMode : "default";
35
+ const maMode = resolveMultiAgentMode(config);
35
36
  // Account rows include hidden supported ids so newly re-enabled natives reappear before sync.
36
37
  const catalogNativeSlugs = accountSelectors.length > 0
37
38
  ? [...new Set([...availableAccountNativeSlugs, ...accountNativeSlugs])]