@bitkyc08/opencodex 2.100.2 → 2.100.4

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 (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  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/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -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.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -152,6 +152,7 @@ import { requiresPlaintextReasoningReplay } from "../../adapters/openai-response
152
152
  import { destinationDecodesNativeCompactionBlob, isOpenAiOperatedResponsesDestination } from "../../providers/openai-tiers-destination";
153
153
  import { bindRouteReasoningReplayScope } from "./core-replay";
154
154
  import { commitReasoningReplayServingIdentity } from "../../responses/reasoning-replay-cache";
155
+ import { rewriteRoutedCustomToolsForUpstream, RoutedCustomToolCompatError, validateFinalCustomToolCompatibility } from "../../responses/custom-tool-compat";
155
156
  import { findInvalidRetainedCompactionEnvelope, InvalidRetainedCompactionEnvelopeError } from "../../responses/retained-compaction";
156
157
  import { nativeCompactResponseSchema } from "../../responses/schema";
157
158
  import { NATIVE_RESERVE_MODEL } from "../../codex/catalog/native-models";
@@ -177,12 +178,13 @@ import {
177
178
  DecompressedBodyTooLargeError,
178
179
  UnsupportedContentEncodingError,
179
180
  } from "../request-decompress";
180
- import { resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
181
+ import { projectCapturedCustomToolPolicy, resolveAdapter, resolveWireProtocolOverride } from "../adapter-resolve";
181
182
  import { hasKeyPoolFailover, rotateProviderTransportOn429, selectProactiveApiKeyTransport, transientRetryPolicyFor } from "../../providers/key-failover";
182
183
  import { transientSendCapFor } from "./request-send-budget";
183
184
  import { distributedKeyPhysicalFetch, recordDistributedResponseFailure } from "../../providers/api-key-response-ownership";
185
+ import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
184
186
  import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../../providers/api-key-pause";
185
- import { providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../../providers/api-key-selection";
187
+ import { providerAffinityGenerationIsCurrent, providerApiKeySelectionIsCurrent, resolveCurrentProviderApiKeyTransport } from "../../providers/api-key-selection";
186
188
  import { stampApiKeyAccountLabel } from "../../providers/label";
187
189
  import { shouldAttemptImageTierRetry } from "../image-retry";
188
190
  import { resolveProviderTransport } from "../../providers/xai-transport";
@@ -236,9 +238,10 @@ import { fetchWithHeaderTimeout, providerFetch, safeHostLabel, safeOriginLabel,
236
238
  import { requestPacingOverloadResponse } from "./pacing-overload";
237
239
  import { shouldRetryCodexPoolAccountQuota, shouldRetryCodexPoolAccountTransient } from "./core-codex-account";
238
240
  import { mapCodexAuthContextErrorToResponse, nativeMainRefreshFailureResponse } from "./codex-auth-error";
239
- import { linkRequestSessionLane, sessionLaneIdFromRequest, reasoningReplayConversationIdFromResponsesRequest, sessionIdHeaderFromRequest } from "../request-log-conversation";
241
+ import { affinityLaneFromRequest, linkRequestSessionLane, reasoningReplayConversationIdFromResponsesRequest, sessionIdHeaderFromRequest, sessionLaneIdFromRequest } from "../request-log-conversation";
240
242
  import { recallComboForLane } from "./combo-session-recall";
241
243
  import { redactHostedImageDisplayPaths } from "../responses-hosted-image-display";
244
+ import { warnEagerCodexToolCatalog } from "./codex-tool-catalog";
242
245
 
243
246
  export const COMPACT_RESPONSE_MAX_BYTES = 32 * 1024 * 1024;
244
247
 
@@ -697,6 +700,8 @@ export async function handleResponsesCompact(
697
700
  }
698
701
  const clientModelLabel = options.clientModelLabel ?? clientFacingModelLabel(options.compactionRoutingOverride?.sourceModel ?? (body as { model?: unknown }).model);
699
702
  options = { ...options, clientModelLabel };
703
+ // Compaction body `input` is forwarded history, so only the top-level catalog is counted.
704
+ warnEagerCodexToolCatalog(body, req.headers, { surface: "compact", logicalRequest: logCtx });
700
705
  // Compaction forwards client history upstream too; keep local artifact paths out of it.
701
706
  redactHostedImageDisplayPaths(body);
702
707
  if (!options.compactionRoutingOverride) {
@@ -965,11 +970,14 @@ export async function handleResponsesCompact(
965
970
  // Transport variant, for the same reason as the Responses core: the persisted row has no
966
971
  // registry backfills, and compactProvider is read for its transport fields below.
967
972
  let warmKeyProvider;
968
- try { warmKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, compactProvider); }
973
+ const affinityLane = affinityLaneFromRequest(req, logCtx, config, admission);
974
+ if (affinityLane) logCtx.affinityLane = affinityLane;
975
+ try { warmKeyProvider = selectProactiveApiKeyTransport(config, route.providerName, compactProvider, undefined, Date.now(), { lane: affinityLane, model: route.modelId, log: logCtx }); }
969
976
  catch (error) {
970
977
  const refusal = requestPacingOverloadResponse(error);
971
- if (refusal) return refusal;
978
+ if (refusal) { logCtx.terminalSource = "synthetic"; return refusal; }
972
979
  if (error instanceof ProviderApiKeyPausedError) {
980
+ logCtx.terminalSource = "synthetic";
973
981
  return formatErrorResponse(403, "permission_error", error.message);
974
982
  }
975
983
  throw error;
@@ -1193,6 +1201,8 @@ export async function handleResponsesCompact(
1193
1201
  sendAuthCtx: CodexAuthContext,
1194
1202
  onPhysicalDispatch?: () => void,
1195
1203
  ): Promise<Response> => {
1204
+ // Only the captured custom-tool contract: native compact keeps the provider's own wire.
1205
+ sendProvider = projectCapturedCustomToolPolicy(sendProvider, route.staticPolicy);
1196
1206
  // A gateway send carries only its own transport headers, whatever recovery handed in.
1197
1207
  // An account-change scrub that removed the turn state from the send headers still applies.
1198
1208
  let wireHeaders = gatewayTransport ? new Headers(gatewayTransport.headers) : sendHeaders;
@@ -1229,8 +1239,17 @@ export async function handleResponsesCompact(
1229
1239
  replayBody = isolateCodexPoolClientMetadata(replayBody, sendAuthCtx.chatgptAccountId) as typeof replayBody;
1230
1240
  }
1231
1241
  // A queued key selection can refresh the destination; project only for this send.
1232
- return isOpenAiOperatedResponsesDestination(sendProvider)
1242
+ replayBody = isOpenAiOperatedResponsesDestination(sendProvider)
1233
1243
  ? repairUrlCitationAnnotations(replayBody) : stripCanonicalOnlyInputItems(stripCanonicalOnlyTopLevelFields(replayBody));
1244
+ // Only an explicit `false` lowers custom tools here; with no declaration, native compact
1245
+ // forwards every custom tool and its history exactly as before this capability existed.
1246
+ if (sendProvider.supportsResponsesCustomTools === false && !isCanonicalOpenAiForwardProvider(sendProvider)) {
1247
+ replayBody = rewriteRoutedCustomToolsForUpstream(
1248
+ replayBody, sendProvider.supportsResponsesCustomTools,
1249
+ ).body as typeof replayBody;
1250
+ validateFinalCustomToolCompatibility(replayBody, sendProvider.supportsResponsesCustomTools);
1251
+ }
1252
+ return replayBody;
1234
1253
  };
1235
1254
  const doFetch = (upstreamRecovery?: UpstreamSendRecovery) => fetchWithHeaderTimeout(
1236
1255
  compactUrl,
@@ -1253,6 +1272,7 @@ export async function handleResponsesCompact(
1253
1272
  dispatchOverride: sendProvider.authMode !== "forward" && sendProvider.apiKey
1254
1273
  ? async (_input, init, execute, reacquirePacing) => {
1255
1274
  for (let attempt = 0; !providerApiKeySelectionIsCurrent(config, route.providerName, sendProvider); attempt++) {
1275
+ if (!providerAffinityGenerationIsCurrent(config, route.providerName, sendProvider)) throw new Error("Provider affinity selection is no longer available");
1256
1276
  if (attempt >= 3) throw new Error("Provider key selection changed repeatedly before compact dispatch");
1257
1277
  let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, sendProvider);
1258
1278
  if (!current && sendProvider.requestPacing?.enabled
@@ -1264,6 +1284,7 @@ export async function handleResponsesCompact(
1264
1284
  if (!current?.apiKey && isProviderApiKeyPaused(config.providers[route.providerName])) throw new ProviderApiKeyPausedError();
1265
1285
  throw new Error("Provider key selection is no longer available for compact");
1266
1286
  }
1287
+ current = projectCapturedCustomToolPolicy(current, route.staticPolicy);
1267
1288
  const rebuilt = new Headers(sendHeaders);
1268
1289
  for (const name of Object.keys(sendProvider.headers ?? {})) rebuilt.delete(name);
1269
1290
  for (const [name, value] of Object.entries(current.headers ?? {})) rebuilt.set(name, value);
@@ -1288,7 +1309,7 @@ export async function handleResponsesCompact(
1288
1309
  identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
1289
1310
  noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
1290
1311
  const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
1291
- distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), String(input),
1312
+ passiveKeyPhysicalFetch(distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), config, route.providerName, sendProvider), String(input),
1292
1313
  physicalInit, { providerName: route.providerName, provider: sendProvider })) as typeof fetch;
1293
1314
  return fetchWithHeaderTimeout(compactUrl,
1294
1315
  { ...init, headers: sendHeaders, body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }) },
@@ -1325,7 +1346,9 @@ export async function handleResponsesCompact(
1325
1346
  let outcomeCtx = authCtx;
1326
1347
  const localDispatchRefusal = (error: unknown): Response | undefined => {
1327
1348
  const cause = unwrapUpstreamRetryEvidenceError(error);
1328
- const response = (cause instanceof InvalidRetainedCompactionEnvelopeError
1349
+ const response = (cause instanceof RoutedCustomToolCompatError
1350
+ ? formatErrorResponse(400, "invalid_request_error", redactSecretString(cause.message))
1351
+ : cause instanceof InvalidRetainedCompactionEnvelopeError
1329
1352
  ? formatErrorResponse(400, "invalid_request_error", cause.message)
1330
1353
  : cause instanceof ProviderApiKeyPausedError ? formatErrorResponse(403, "permission_error", cause.message) : undefined)
1331
1354
  ?? requestPacingOverloadResponse(cause) ?? spendLedgerStorageErrorResponse(error, logCtx) ?? (cause instanceof SendBudgetExhaustedError
@@ -1334,6 +1357,7 @@ export async function handleResponsesCompact(
1334
1357
  now: Date.now(), accountSelector: route.codexAccountNamespace,
1335
1358
  }));
1336
1359
  if (response) {
1360
+ logCtx.terminalSource = "synthetic";
1337
1361
  releaseUpstreamHostAdmission(compactHostAdmissionLease);
1338
1362
  compactHostAdmissionLease = null;
1339
1363
  releaseCodexAuthContextProbeLease(outcomeCtx);
@@ -22,6 +22,7 @@ import {
22
22
  resetUpstreamHostHealth,
23
23
  } from "../../codex/upstream-host-health";
24
24
  import { safeOriginLabel, fetchWithHeaderTimeout, providerFetch } from "./fetch-helpers";
25
+ import type { AdapterRequest } from "../../adapters/base";
25
26
  import { classifyPoolRecoveryDispatch } from "../../routing/probe-lease";
26
27
  import { formatErrorResponse } from "../../bridge";
27
28
  import { readBoundedResponseBody } from "../../lib/bounded-body";
@@ -221,14 +222,25 @@ export class PoolPreOutputRefusals {
221
222
  }
222
223
 
223
224
 
225
+ // A recovery that can publish either of two physical attempts binds the proof to the published head.
226
+ const publishedMainQuotaDispatches = new WeakMap<Response, MainQuotaDispatch | null>();
227
+
228
+ /** Bind the quota proof of the attempt whose head `published` carries; none means no proof. */
229
+ export function bindPublishedMainQuotaDispatch(published: Response, dispatch: MainQuotaDispatch | undefined): void {
230
+ publishedMainQuotaDispatches.set(published, dispatch ?? null);
231
+ }
232
+
224
233
  /** Live proof that this plain-main response used the observed main credential. */
225
234
  export function liveMainQuotaDispatch(
226
- authCtx: CodexAuthContext, provider: OcxProviderConfig,
235
+ authCtx: CodexAuthContext, provider: OcxProviderConfig, published?: Response,
227
236
  ): MainQuotaDispatch | undefined {
228
- if (authCtx.kind !== "main" || !authCtx.mainQuotaDispatch) return undefined;
237
+ if (authCtx.kind !== "main") return undefined;
238
+ const dispatch = published && publishedMainQuotaDispatches.has(published)
239
+ ? publishedMainQuotaDispatches.get(published) : authCtx.mainQuotaDispatch;
240
+ if (!dispatch) return undefined;
229
241
  if (!isCanonicalOpenAiForwardProvider(provider)
230
242
  || provider.authMode !== "forward" || provider.adapter !== "openai-responses") return undefined;
231
- return isMainQuotaDispatchLive(authCtx.mainQuotaDispatch) ? authCtx.mainQuotaDispatch : undefined;
243
+ return isMainQuotaDispatchLive(dispatch) ? dispatch : undefined;
232
244
  }
233
245
 
234
246
  export function codexWsQuotaObserver(authCtx: CodexAuthContext, provider: OcxProviderConfig, modelId?: string): CodexWsQuotaObserver | undefined {
@@ -529,6 +541,7 @@ export interface CodexPoolAccountRetryArgs {
529
541
  httpOnly?: boolean;
530
542
  /** Pre-output refusal hold for the alternate's WebSocket send (#6969); the caller restores. */
531
543
  preOutputRefusalHold?: CodexWsPreOutputRefusalHold;
544
+ onPhysicalSend?: (request: AdapterRequest, body: BodyInit | null | undefined) => void;
532
545
  onResponse?: (
533
546
  response: Response,
534
547
  authCtx: CodexAuthContext,
@@ -1072,6 +1085,7 @@ export async function retryCodexPoolOnAlternateAccount(
1072
1085
  httpOnly,
1073
1086
  providerName: route.providerName,
1074
1087
  modelId: route.modelId,
1088
+ onPhysicalDispatch: body => args.onPhysicalSend?.(request, body),
1075
1089
  preOutputRefusalHold: args.preOutputRefusalHold,
1076
1090
  accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: retryAuthCtx }, headers),
1077
1091
  onCodexWsQuota: codexWsQuotaObserver(retryAuthCtx, route.provider, route.modelId),
@@ -8,6 +8,7 @@ import {
8
8
  codexAccountModelRefusalHardStopCode,
9
9
  isMalformedResponseFormatRequest,
10
10
  isOpenRouterOpaque400Envelope,
11
+ isProviderModerationRefusal,
11
12
  upstreamEnvelopeRootCode,
12
13
  type CodexAccountModelRefusal,
13
14
  } from "../../combos/failover";
@@ -66,6 +67,7 @@ export async function consumeComboFailure(
66
67
  let codexModelRefusal: CodexAccountModelRefusal | undefined;
67
68
  let malformedResponseFormat: boolean | undefined;
68
69
  let openRouterOpaque400: boolean | undefined;
70
+ let providerModerationRefusal: boolean | undefined;
69
71
  let usage: OcxUsage | undefined;
70
72
  let upstreamCode: string | undefined;
71
73
  let upstreamRootCode: string | undefined;
@@ -107,6 +109,11 @@ export async function consumeComboFailure(
107
109
  malformedResponseFormat = isMalformedResponseFormatRequest(response.status, body.text);
108
110
  openRouterOpaque400 = isOpenRouterOpaque400Envelope(body.text);
109
111
  }
112
+ // Judged on the whole body: the classification text below is cut at 500 characters, and a
113
+ // hard refusal after the cut must still veto a moderation hop.
114
+ if (response.status === 400 || response.status === 422) {
115
+ providerModerationRefusal = isProviderModerationRefusal(response.status, body.text, undefined, true);
116
+ }
110
117
  // Status-independent: the nested record is what normalization selects, so a root verdict
111
118
  // beside it has to be captured here or the conflict rule never sees it.
112
119
  upstreamRootCode = upstreamEnvelopeRootCode(body.text);
@@ -189,6 +196,7 @@ export async function consumeComboFailure(
189
196
  ...(codexModelRefusal !== undefined ? { codexModelRefusal } : {}),
190
197
  ...(malformedResponseFormat !== undefined ? { malformedResponseFormat } : {}),
191
198
  ...(openRouterOpaque400 !== undefined ? { openRouterOpaque400 } : {}),
199
+ ...(providerModerationRefusal !== undefined ? { providerModerationRefusal } : {}),
192
200
  ...(normalizedUpstreamCode !== undefined ? { upstreamCode: normalizedUpstreamCode } : {}),
193
201
  // A rewritten identity (policy, replay refusal) is the whole verdict; the root's own code
194
202
  // would only re-open a decision that rewrite already settled.
@@ -1,3 +1,5 @@
1
+ import { responseReplayOwnerKey } from "../../responses/state/replay-owner";
2
+ import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
1
3
  import { comboLogLabel, comboTargetLogLabel } from "../../combos/resolve";
2
4
  import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
3
5
  import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
@@ -21,6 +23,7 @@ import {
21
23
  } from "../../reasoning-effort";
22
24
  import { admissionMayUseMeteredComboTargets, resolveAdmissionModelScope, routeAllowedByScope } from "../admission-model-scope";
23
25
  import { recordAttemptRequestedEffort } from "../request-log";
26
+ import { bindLinkTurnChild, failLinkTurnExpansion, markLinkTurnMissing, observeLinkTurnExpansion } from "../link-turn";
24
27
  import {
25
28
  CODEX_TEXT_GUARDED_BUDGET_POLICY,
26
29
  deriveRequestExecutionBudget,
@@ -44,7 +47,9 @@ import {
44
47
  comboDefaultEffort,
45
48
  isComboTargetInCooldown,
46
49
  snapshotComboQuotaCooldowns,
47
- comboExclusionReasons,
50
+ comboExclusion,
51
+ comboUnavailableDiagnostics,
52
+ comboTargetUnavailableCause,
48
53
  comboTargetSkipTrigger,
49
54
  noteComboSuccess,
50
55
  settleComboReprobeSuccess,
@@ -62,10 +67,12 @@ import { formatErrorResponse } from "../../bridge";
62
67
  import { SEND_BUDGET_EXHAUSTED_CODE } from "../../lib/errors";
63
68
  import {
64
69
  expandPreviousResponseInput,
70
+ previousResponseRestoredPrefixLength,
65
71
  previousResponseReplayFailure,
66
72
  previousResponseProviderState,
67
73
  } from "../../responses/state";
68
74
  import { hasUnreadableEncryptedAgentTask } from "./encrypted-payload";
75
+ import { eagerCodexToolCatalogSurface, warnEagerCodexToolCatalog } from "./codex-tool-catalog";
69
76
  import { captureRouteStaticPolicy, routeConcreteModel, comboRouteDecisionTrace } from "../../router";
70
77
  import { memoryModelRouteReason } from "./memory-models";
71
78
  import { baseProviderLabel, poolAccountProviderLabel } from "../../providers/label";
@@ -443,13 +450,17 @@ export async function executeComboResponses(
443
450
  // continuation that only references prior images still fails closed when
444
451
  // imageInput is disabled (and so targets see the full replayed input).
445
452
  const inboundClientThreadId = req.headers.get("x-codex-parent-thread-id")?.trim() || undefined;
446
- const body = expandPreviousResponseInput(rawBody, inboundClientThreadId);
453
+ const inboundOwnThreadId = req.headers.get("thread-id")?.trim() || undefined;
454
+ const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
455
+ const replayOwnerKey = strictReplay ? responseReplayOwnerKey(replayPrincipal.clientPrincipalId, inboundOwnThreadId) : undefined;
456
+ const body = expandPreviousResponseInput(rawBody, strictReplay ? inboundOwnThreadId : inboundClientThreadId, replayOwnerKey);
447
457
  const replayFailure = previousResponseReplayFailure(body);
448
458
  if (replayFailure?.reason === "scope_mismatch") {
449
459
  console.warn("[opencodex] refusing continuation because the client task scope does not match replay state");
450
460
  }
451
461
  // Local replay failures require full client replay.
452
462
  if (replayFailure) {
463
+ failLinkTurnExpansion(options.linkTurn, req, logCtx, body, replayFailure.reason);
453
464
  return formatErrorResponse(
454
465
  400,
455
466
  "previous_response_not_found",
@@ -462,10 +473,15 @@ export async function executeComboResponses(
462
473
  // object (still carrying previous_response_id) and must not be treated as
463
474
  // unresolved — text-only stored continuations remain allowed.
464
475
  const requestedPreviousId = typeof (rawBody as { previous_response_id?: unknown } | null)?.previous_response_id === "string"
465
- ? (rawBody as { previous_response_id: string }).previous_response_id.trim()
476
+ ? (rawBody as { previous_response_id: string }).previous_response_id
466
477
  : "";
467
- const unresolvedPrevious = requestedPreviousId.length > 0 && body === rawBody;
478
+ const unresolvedPrevious = requestedPreviousId.trim().length > 0 && body === rawBody;
479
+ // Remote Link (design T4 5 and 9.1): the combo's own expansion is the request's one capture point; its
480
+ // children replay a snapshot and skip theirs.
481
+ observeLinkTurnExpansion(options.linkTurn, req, logCtx, body,
482
+ requestedPreviousId.trim().length > 0 ? (unresolvedPrevious ? "unexpanded" : "chained") : "none");
468
483
  if (combo.imageInput === "disabled" && unresolvedPrevious) {
484
+ markLinkTurnMissing(logCtx);
469
485
  return formatErrorResponse(
470
486
  400,
471
487
  "previous_response_not_found",
@@ -475,6 +491,16 @@ export async function executeComboResponses(
475
491
  if (combo.imageInput === "disabled" && comboRequestHasImageInput(body)) {
476
492
  return formatErrorResponse(400, "invalid_request_error", "This combo does not accept image input");
477
493
  }
494
+ // The combo ladder owns the whole logical request, so the catalog diagnostic is counted here for
495
+ // combo-routed turns; children run as concrete selections and would otherwise never report it.
496
+ // Counting after the replay expansion keeps restored history out of the tally.
497
+ if ((options.inboundWire ?? "responses") === "responses") {
498
+ warnEagerCodexToolCatalog(body, req.headers, {
499
+ surface: eagerCodexToolCatalogSurface(body, options.compactionRecoveryKind),
500
+ replayPrefixLength: previousResponseRestoredPrefixLength(body),
501
+ logicalRequest: logCtx,
502
+ });
503
+ }
478
504
  const comboReplaySnapshot = {
479
505
  sourceBody: body,
480
506
  previousResponseInputExpanded: body !== rawBody
@@ -581,6 +607,10 @@ export async function executeComboResponses(
581
607
  const enabled = combo.targets.filter(target => config.providers[target.provider]?.disabled !== true);
582
608
  return enabled.length > 0 && enabled.every(target => !museToolEligible(target));
583
609
  };
610
+ // A mandatory tool_choice no target preserves is unsupported (#7965), but shared exclusion evidence
611
+ // (provider state, quota, live cooldowns) keeps precedence, exactly as in the readable reasons.
612
+ const unsupportedToolChoice = (attempted: number) => comboUnavailableDiagnostics(combo.targets.length, attempted,
613
+ combo.targets.map(target => comboTargetUnavailableCause(config, comboId, target, museToolEligible) ?? "unsupported"));
584
614
  // Recovery can replace unreadable encrypted input, but cannot relax other admission checks.
585
615
  const recoveryEligible = (target: (typeof combo.targets)[number]): boolean =>
586
616
  (meteredAllowed || !target.metered)
@@ -701,12 +731,13 @@ export async function executeComboResponses(
701
731
  { parentThreadId: inboundClientThreadId },
702
732
  );
703
733
  if (!options.abortSignal?.aborted && onlyMuseToolIncompatible()) {
704
- return comboUnavailableResponse("No available targets for combo; targets cannot preserve mandatory tool_choice");
734
+ return comboUnavailableResponse("No available targets for combo; targets cannot preserve mandatory tool_choice",
735
+ { diagnostics: unsupportedToolChoice(0) });
705
736
  }
706
737
  return options.abortSignal?.aborted
707
738
  ? clientCancelledResponse()
708
739
  : comboUnavailable(comboId, undefined,
709
- comboExclusionReasons(config, comboId, recoveryEligible));
740
+ comboExclusion(config, comboId, recoveryEligible));
710
741
  }
711
742
  if (!(await recoverUnreadableEncryptedTask())) {
712
743
  return options.abortSignal?.aborted
@@ -721,11 +752,12 @@ export async function executeComboResponses(
721
752
  if (protocolRefusal) return protocolRefusal;
722
753
  if (onlyReplayIncompatibleTargetsRemain()) return targetIncompatibleResponse();
723
754
  if (!options.abortSignal?.aborted && onlyMuseToolIncompatible()) {
724
- return comboUnavailableResponse("No available targets for combo; targets cannot preserve mandatory tool_choice");
755
+ return comboUnavailableResponse("No available targets for combo; targets cannot preserve mandatory tool_choice",
756
+ { diagnostics: unsupportedToolChoice(0) });
725
757
  }
726
758
  return options.abortSignal?.aborted
727
759
  ? clientCancelledResponse()
728
- : comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, targetEligible));
760
+ : comboUnavailable(comboId, undefined, comboExclusion(config, comboId, targetEligible));
729
761
  }
730
762
  // OCX-11: an ordered failover combo that starts on a later target than its first one, for any
731
763
  // reason (cooling down, provider disabled, cached quota spent, ineligible for this request),
@@ -756,7 +788,7 @@ export async function executeComboResponses(
756
788
  const choices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now(), pick.cooldownReprobeTargets);
757
789
  const first = choices[0];
758
790
  if (!first) {
759
- return comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, target =>
791
+ return comboUnavailable(comboId, undefined, comboExclusion(config, comboId, target =>
760
792
  targetEligible(target) && target.provider !== JEV_PROVIDER_ID && jevChoiceEfforts(config, target, false) !== undefined));
761
793
  }
762
794
  const fallbackFor = (choice: JevComboChoice): Pick<JevDecision, "targetKey" | "effort"> => {
@@ -870,7 +902,7 @@ export async function executeComboResponses(
870
902
  });
871
903
  // A completed decision belongs to the parent log even if no model can be dispatched.
872
904
  if (selectionUnavailable) {
873
- return comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, target =>
905
+ return comboUnavailable(comboId, undefined, comboExclusion(config, comboId, target =>
874
906
  targetEligible(target) && target.provider !== JEV_PROVIDER_ID && jevChoiceEfforts(config, target, false) !== undefined));
875
907
  }
876
908
  }
@@ -946,12 +978,13 @@ export async function executeComboResponses(
946
978
  const returnsQuota = lastFailure && [400, 401, 403].includes(lastFailure.status) && quotaFailure;
947
979
  const failedChildLog = returnsQuota ? quotaFailedChildLog : lastFailedChildLog;
948
980
  if (failedChildLog) adoptFailedChildLog(failedChildLog);
949
- if (targetsExhausted && toolChoiceRefusalsOnly === true) return comboUnavailableResponse("No available targets for combo; attempted targets cannot preserve mandatory tool_choice");
981
+ if (targetsExhausted && toolChoiceRefusalsOnly === true) return comboUnavailableResponse("No available targets for combo; attempted targets cannot preserve mandatory tool_choice", { diagnostics: unsupportedToolChoice(comboTargetsDispatched) });
950
982
  if (!lastFailure || ![400, 401, 403].includes(lastFailure.status)) return lastFailure!;
951
983
  if (quotaFailure) return quotaFailure;
952
984
  // The quota-refused target was cooled before this request picked, so the ladder never saw
953
985
  // its refusal. The cooldown, with its Retry-After, is still the honest answer.
954
986
  let quotaCooldownUntil: number | undefined;
987
+ let quotaCooledTargets = 0;
955
988
  const now = Date.now();
956
989
  for (const { target, cooldownUntil } of quotaCooldownSnapshot) {
957
990
  if (cooldownUntil <= now) continue;
@@ -962,11 +995,15 @@ export async function executeComboResponses(
962
995
  continue;
963
996
  }
964
997
  quotaCooldownUntil = Math.min(quotaCooldownUntil ?? cooldownUntil, cooldownUntil);
998
+ quotaCooledTargets += 1;
965
999
  }
966
1000
  const remainingQuotaCooldownMs = quotaCooldownUntil === undefined ? 0 : quotaCooldownUntil - Date.now();
967
1001
  return remainingQuotaCooldownMs > 0
968
1002
  ? comboUnavailableResponse("No available targets for combo", {
969
1003
  retryAfter: String(Math.max(1, Math.ceil(remainingQuotaCooldownMs / 1000))),
1004
+ // Only quota-cooled eligible targets can produce this answer, so its class is quota.
1005
+ diagnostics: comboUnavailableDiagnostics(combo.targets.length, comboTargetsDispatched,
1006
+ Array.from({ length: quotaCooledTargets }, () => "quota" as const)),
970
1007
  }) : lastFailure;
971
1008
  };
972
1009
  // The caller's output ceiling, captured once so a floor applied to one target never
@@ -1065,9 +1102,12 @@ export async function executeComboResponses(
1065
1102
  const childLog: RequestLogContext = {
1066
1103
  model: pick.target.model,
1067
1104
  provider: pick.target.provider,
1068
- ...(logCtx.conversationId ? { conversationId: logCtx.conversationId } : {}),
1105
+ ...(logCtx.conversationId ? { conversationId: logCtx.conversationId, conversationIdIsHermesFallback: logCtx.conversationIdIsHermesFallback } : {}),
1106
+ ...(logCtx.affinityLane ? { affinityLane: logCtx.affinityLane } : {}),
1069
1107
  ...(logCtx.surface ? { surface: logCtx.surface } : {}),
1070
1108
  };
1109
+ // A link turn's child reads its upstream only as the client drains, as the parent would (#8601).
1110
+ bindLinkTurnChild(logCtx, childLog);
1071
1111
  const targetReasoningEfforts = supportedLadderFor({
1072
1112
  provider: targetRoute.provider,
1073
1113
  modelId: targetRoute.modelId,
@@ -1227,6 +1267,7 @@ export async function executeComboResponses(
1227
1267
  },
1228
1268
  }) : await requestDispatchers.handleResponses(childRequest, config, childLog, {
1229
1269
  ...options,
1270
+ plaintextV2Decision: strictReplay,
1230
1271
  replayPrincipal,
1231
1272
  // A bridge child is a concrete route; the native source belongs to this loop only.
1232
1273
  ...(options.protocolSource ? { protocolSource: undefined } : {}),
@@ -1437,6 +1478,7 @@ export async function executeComboResponses(
1437
1478
  verifiedPlanRefusal: failure.verifiedPlanRefusal,
1438
1479
  malformedResponseFormat: failure.malformedResponseFormat,
1439
1480
  openRouterOpaque400: failure.openRouterOpaque400,
1481
+ providerModerationRefusal: failure.providerModerationRefusal,
1440
1482
  // The adapter the failed leg actually resolved: a configured `kiro` provider can route a
1441
1483
  // model through another wire via `modelAdapters`, and an unresolved leg grants no hop.
1442
1484
  failedAdapter: childLog.providerAdapter,
@@ -1515,6 +1557,7 @@ export async function executeComboResponses(
1515
1557
  code: failure.upstreamCode,
1516
1558
  malformedResponseFormat: failure.malformedResponseFormat,
1517
1559
  openRouterOpaque400: failure.openRouterOpaque400,
1560
+ providerModerationRefusal: failure.providerModerationRefusal,
1518
1561
  });
1519
1562
  const failedTargetKey = targetKey(pick.target);
1520
1563
  let failedTargetCooldownRecorded = false;
@@ -1,6 +1,6 @@
1
- import type { ComboExclusionReasons } from "../../combos/resolve";
1
+ import type { ComboExclusion, ComboUnavailableDiagnostics } from "../../combos/resolve";
2
2
  import { markProxyError } from "../../lib/client-error-body";
3
- import { formatClientRetryAfter } from "../../lib/client-retry-after";
3
+ import { appendClientRetryIn, formatClientRetryAfter } from "../../lib/client-retry-after";
4
4
  import { readBoundedResponseBody } from "../../lib/bounded-body";
5
5
  import { redactSecretString } from "../../lib/redact";
6
6
  import { isCyberPolicyMessage, isCyberPolicyCode } from "../../lib/errors";
@@ -104,25 +104,31 @@ export function decodeRequestErrorResponse(err: unknown, label: string): Respons
104
104
 
105
105
  export function comboUnavailableResponse(
106
106
  message: string,
107
- options?: { retryAfter?: string | null; presentation?: "combo" },
107
+ options?: { retryAfter?: string | null; presentation?: "combo"; diagnostics?: ComboUnavailableDiagnostics },
108
108
  ): Response {
109
109
  const headers = new Headers({ "Content-Type": "application/json" });
110
110
  // Advice leaves in this proxy's format, whatever form the earliest cooldown was recorded in.
111
111
  const advice = formatClientRetryAfter(options?.retryAfter);
112
112
  if (advice !== undefined) headers.set("Retry-After", advice);
113
+ // Name the earliest recovery in the body too: a client that drops the header still
114
+ // shows the user how long the combo stays cooled.
113
115
  return markProxyError(new Response(
114
116
  JSON.stringify({
115
- error: { message, type: "server_error", code: "combo_unavailable" },
117
+ // Built from the header value itself, so an HTTP-date cannot make the body and header disagree.
118
+ // `combo` carries the machine-readable cause class and target counts (#7965).
119
+ error: { message: appendClientRetryIn(message, advice), type: "server_error", code: "combo_unavailable",
120
+ ...(options?.diagnostics ? { combo: options.diagnostics } : {}) },
116
121
  }),
117
122
  { status: 503, headers },
118
123
  ), options?.presentation);
119
124
  }
120
125
 
121
126
 
122
- export function comboUnavailable(comboId: string, now = Date.now(), reasons?: ComboExclusionReasons): Response {
123
- return comboUnavailableResponse(new NoAvailableComboTargetsError(comboId, reasons).message, {
127
+ export function comboUnavailable(comboId: string, now = Date.now(), exclusion?: ComboExclusion): Response {
128
+ return comboUnavailableResponse(new NoAvailableComboTargetsError(comboId, exclusion).message, {
124
129
  retryAfter: comboCooldownRetryAfterSeconds(comboId, now),
125
- presentation: reasons === undefined ? undefined : "combo",
130
+ presentation: exclusion === undefined ? undefined : "combo",
131
+ ...(exclusion ? { diagnostics: exclusion.diagnostics } : {}),
126
132
  });
127
133
  }
128
134
 
@@ -3,6 +3,7 @@ import type { TranslatorBudget } from "../../lib/translator-budget";
3
3
  import { carryResponseToolOwnership } from "./response-tool-ownership";
4
4
  import { carryPolicyCandidateRefusal } from "./policy-request-scope";
5
5
  import { finalizeTranslatorBudgetResponse } from "../../lib/translator-budget";
6
+ import { carryPacedStream, pacedQueuingStrategy } from "../../lib/paced-stream";
6
7
  import { carryReplayRefusal, isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
7
8
  import { isVerifiedModelNotInPlanResponse, markVerifiedModelNotInPlanResponse } from "../../lib/errors";
8
9
  import { carryCodexAccountCooldownResponse } from "../../codex/account-cooldown-response";
@@ -68,7 +69,7 @@ export function finalizeAccountLease(response: Response, release: () => void, on
68
69
  const reader = response.body.getReader();
69
70
  let done = false;
70
71
  const finish = () => { if (!done) { done = true; release(); } };
71
- const body = new ReadableStream<Uint8Array>({
72
+ const body = carryPacedStream(response.body, new ReadableStream<Uint8Array>({
72
73
  async pull(controller) {
73
74
  try {
74
75
  const next = await reader.read();
@@ -77,7 +78,7 @@ export function finalizeAccountLease(response: Response, release: () => void, on
77
78
  } catch (error) { finish(); controller.error(error); }
78
79
  },
79
80
  async cancel(reason) { onCancel?.(); try { await reader.cancel(reason); } finally { finish(); } },
80
- });
81
+ }, pacedQueuingStrategy(response.body)));
81
82
  const wrapped = new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
82
83
  carryProxyError(response, wrapped);
83
84
  if (isNonReplayableResponse(response)) markResponseNonReplayable(wrapped);
@@ -19,6 +19,7 @@ import { prepareEffortNormalization, stripEmptyLadderEffort, supportedLadderFor
19
19
  import { resolveOpenCodeGoTransport } from "../../providers/opencode-go-transport";
20
20
  import { getOrAllocateRequestSessionLane } from "../request-log-conversation";
21
21
  import { shouldPreparePlaintextV2AgentMessages } from "../../responses/plaintext-v2-agent-messages";
22
+ import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
22
23
  import { hasValidatedActiveReasoningEffort } from "../../responses/parser";
23
24
  import { responseTierAuthorityForProvider } from "../../providers/openai-tiers-destination";
24
25
  import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
@@ -195,11 +196,12 @@ export async function applyFinalRouteRequestNormalization(args: {
195
196
  args.claudeGoAffinity ? args.claudeGoAffinity.sessionLane : getOrAllocateRequestSessionLane(req),
196
197
  routedProvider);
197
198
  parsed._plaintextV2AgentMessages = shouldPreparePlaintextV2AgentMessages({
198
- enabled: config.plaintextV2AgentMessages === true,
199
+ enabled: parsed._plaintextV2Decision === true && isPlaintextV2AgentMessagesEnabled(config),
199
200
  inboundWire,
200
201
  canonicalChatGpt: isCanonicalOpenAiForwardProvider(route.provider),
201
202
  requestBody: parsed._rawBody,
202
203
  });
204
+ if (parsed._plaintextV2AgentMessages) parsed._plaintextV2EverPrepared = true;
203
205
  // Recompute from the original wire preference on every route, including fallback.
204
206
  // A provider default never converts raw reasoning into a summary.
205
207
  if (inboundWire === "responses" && parsed._rawBody) {
@@ -37,6 +37,8 @@ export interface ConsumedComboFailure {
37
37
  malformedResponseFormat?: boolean;
38
38
  /** Complete bounded-envelope OpenRouter opaque-400 verdict captured before display truncation. */
39
39
  openRouterOpaque400?: boolean;
40
+ /** Complete bounded-envelope provider moderation verdict captured before display truncation. */
41
+ providerModerationRefusal?: boolean;
40
42
  /** Structured upstream `error.code` when present in the failure body. */
41
43
  upstreamCode?: string;
42
44
  /**
@@ -159,6 +161,8 @@ export interface HandleResponsesOptions {
159
161
  * holder with no principal preserves keyless replay; never populate it from client data.
160
162
  */
161
163
  replayPrincipal?: Readonly<{ clientPrincipalId: string | undefined }>;
164
+ /** Captured for the logical request and inherited by retries and combo children. */
165
+ readonly plaintextV2Decision?: boolean;
162
166
  /** Called at most once after the complete client body is read and accepted for dispatch. */
163
167
  onRequestBodyRead?: () => void;
164
168
  /** Internal handoff for retry wrappers that must reuse the already-accounted request body. */
@@ -166,6 +170,8 @@ export interface HandleResponsesOptions {
166
170
  forceEmptyResponseId?: boolean;
167
171
  /** Internal, connection-owned control channel; never reconstructed from headers. */
168
172
  nativeControl?: NativeResponseControl;
173
+ /** A Remote Link WebSocket turn: told the expanded input and the terminal (src/server/link-turn.ts). */
174
+ linkTurn?: import("../link-turn").LinkTurnObserver;
169
175
  abortSignal?: AbortSignal;
170
176
  /** One-shot TTFT callback: first non-empty model output observed (WP4). */
171
177
  onFirstOutput?: () => void;
@@ -220,6 +226,14 @@ export interface HandleResponsesOptions {
220
226
  protocolSource?: import("./core-combo-native").ComboProtocolSource;
221
227
  /** Internal transport identity for route-scoped upstream compatibility policy. */
222
228
  inboundTransport?: "websocket";
229
+ /**
230
+ * Set by the HTTP `/v1/responses` ingress only: a streaming combo turn whose target selection
231
+ * outlasts `COMBO_SELECTION_KEEPALIVE_THRESHOLD_MS` commits a 200 SSE head and sends keepalive
232
+ * comments (#8326). `clock` is a test seam; production uses the global timers.
233
+ */
234
+ comboSelectionKeepalive?: {
235
+ clock?: { setTimeout(callback: () => void, ms: number): unknown; clearTimeout(handle: unknown): void };
236
+ };
223
237
  /**
224
238
  * Claude replay may add native-main auth so OpenAI sidecars remain available.
225
239
  * Strip only that internal credential when the final route is a noncanonical
@@ -12,9 +12,15 @@ import { createInferenceSendBudget } from "../inference/context";
12
12
  import { finalizeOwnedTranslatorBudget, finalizeAccountLease } from "./core-lifetime";
13
13
  import type { TranslatorBudget } from "../../lib/translator-budget";
14
14
  import { executeComboResponses } from "./core-combo";
15
+ import {
16
+ comboSelectionKeepaliveApplies,
17
+ comboSelectionKeepaliveLadderOptions,
18
+ selectComboWithKeepalive,
19
+ } from "./combo-selection-keepalive";
15
20
  import { registerTurn, unregisterTurn } from "../lifecycle";
16
21
  import { runWithCompactionRecovery } from "./compaction-recovery";
17
22
  import { captureAdmissionPolicy } from "../capture-admission-policy";
23
+ import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
18
24
  /**
19
25
  * Route one `/v1/responses` request through the adapter pipeline: recovery loop, passthrough
20
26
  * wire, image/web-search bridges, and the terminal-guard continuation.
@@ -36,6 +42,7 @@ export async function handleResponses(
36
42
  try {
37
43
  const response = await runWithCompactionRecovery(req, config, logCtx, {
38
44
  ...options, abortSignal,
45
+ plaintextV2Decision: options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config),
39
46
  advisorAdmissionPolicy: options.advisorAdmissionPolicy ?? captureAdmissionPolicy(config, options.admission, options.admissionScope),
40
47
  openAiSidecarAuth: options.openAiSidecarAuth === undefined
41
48
  ? captureExplicitOpenAiCallerAuth(req.headers, config) : options.openAiSidecarAuth,
@@ -69,6 +76,22 @@ export async function handleComboResponses(
69
76
  config: OcxConfig,
70
77
  logCtx: RequestLogContext,
71
78
  options: HandleResponsesOptions & { translatorBudget: TranslatorBudget },
79
+ ): Promise<Response> {
80
+ if (!comboSelectionKeepaliveApplies(rawBody, options)) return runComboLadder(req, rawBody, comboId, config, logCtx, options);
81
+ // A slow selection may answer with a keepalive head while the ladder below keeps running (#8326).
82
+ const model = (rawBody as { model?: unknown }).model;
83
+ return selectComboWithKeepalive(
84
+ hooks => runComboLadder(req, rawBody, comboId, config, logCtx, comboSelectionKeepaliveLadderOptions(options, hooks)),
85
+ { model: typeof model === "string" ? model : comboId, logCtx, signal: options.abortSignal, clock: options.comboSelectionKeepalive?.clock },
86
+ );
87
+ }
88
+ async function runComboLadder(
89
+ req: Request,
90
+ rawBody: unknown,
91
+ comboId: string,
92
+ config: OcxConfig,
93
+ logCtx: RequestLogContext,
94
+ options: HandleResponsesOptions & { translatorBudget: TranslatorBudget },
72
95
  ): Promise<Response> {
73
96
  // Each child relay binds the turn's lease and unbinds it when its stream ends; the lease is
74
97
  // released once nothing is bound. Hold it for the whole ladder so a refused child's relay