@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
@@ -1,4 +1,15 @@
1
- import { codexAccountModelRefusal, codexAccountModelRefusalPayload, hasConflictingCodexModelRefusalEnvelopes, type CodexAccountModelRefusal } from "../../combos/failover";
1
+ import {
2
+ codexAccountModelRefusal,
3
+ codexAccountModelRefusalPayload,
4
+ envelopeErrorRecord,
5
+ envelopeRecordCode,
6
+ hasConflictingCodexModelRefusalEnvelopes,
7
+ isMalformedResponseFormatRecord,
8
+ isOpenRouterOpaque400EnvelopeRoot,
9
+ isProviderModerationRefusal,
10
+ isOpenRouterOpaque400Record,
11
+ type CodexAccountModelRefusal,
12
+ } from "../../combos/failover";
2
13
  import type { ResponsesTerminalStatus } from "../../bridge";
3
14
  import { comboFailureDecision } from "../../combos";
4
15
  import { httpStatusFromTerminalError } from "../../lib/errors";
@@ -7,13 +18,18 @@ import type { RequestFailureStage } from "../../lib/request-failure-model";
7
18
  import type { RequestLogContext } from "../request-log";
8
19
  import { carryResponseToolOwnership } from "./response-tool-ownership";
9
20
  import { createSseInspector } from "../relay";
21
+ import { sseDataPayload } from "../sse-payload-rewrite";
10
22
  import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
11
23
  import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
24
+ import { attachComboFailureEvidence, isPausedTurn } from "../../lib/client-error-body";
12
25
  import { requiredToolReasoningPrelude } from "./combo-required-tool-stream";
26
+ import { ProtocolPreOutputEof } from "../../lib/upstream-retry";
27
+ import { carryPacedStream, pacedQueuingStrategy } from "../../lib/paced-stream";
13
28
 
14
29
  const COMBO_STREAM_PREFLIGHT_MAX_BYTES = MAX_CLIENT_SSE_FRAME_BYTES;
15
30
  // Required-tool reasoning may delay delivery, but never for an unbounded/trickling prelude.
16
31
  const COMBO_REQUIRED_TOOL_REASONING_HOLD_MS = 1_000;
32
+ const RESET_PREFLIGHT_HEARTBEAT_MS = 15_000;
17
33
  // Keep retained object count proportional to the same byte budget used by the
18
34
  // shared SSE framer. Tiny or empty upstream reads must not bypass the byte cap.
19
35
  const COMBO_STREAM_PREFLIGHT_MAX_CHUNKS = Math.max(
@@ -28,6 +44,131 @@ const PRE_OUTPUT_CONTROL_EVENTS = new Set([
28
44
  "response.heartbeat",
29
45
  ]);
30
46
 
47
+ const PRE_OUTPUT_EVENT_FIELDS = new Set([
48
+ "type", "response", "sequence_number", "replayUnsafe", "error", "last_error",
49
+ "incomplete_details", "status", "output", "item", "delta", "content", "message", "code",
50
+ ]);
51
+
52
+ // These are response identity and request-configuration fields, not output carriers.
53
+ // Unknown snapshot extensions commit the original instead of guessing whether they hide output.
54
+ const PRE_OUTPUT_SNAPSHOT_FIELDS = new Set([
55
+ "id", "object", "created_at", "completed_at", "status", "model", "output", "error", "last_error",
56
+ "incomplete_details", "usage", "background", "instructions", "max_output_tokens", "max_tool_calls",
57
+ "metadata", "parallel_tool_calls", "previous_response_id", "prompt", "prompt_cache_key",
58
+ "prompt_cache_retention", "reasoning", "safety_identifier", "service_tier", "store", "temperature",
59
+ "text", "tool_choice", "tools", "top_p", "top_logprobs", "truncation", "user", "end_turn", "replayUnsafe",
60
+ ]);
61
+
62
+ const PRE_OUTPUT_STRING_FIELDS = [
63
+ "id", "object", "model", "prompt_cache_key", "prompt_cache_retention", "safety_identifier",
64
+ "service_tier", "truncation", "user",
65
+ ] as const;
66
+ const PRE_OUTPUT_NUMBER_FIELDS = ["created_at", "max_output_tokens", "max_tool_calls", "temperature", "top_p", "top_logprobs"] as const;
67
+
68
+ function isRecord(value: unknown): value is Record<string, unknown> {
69
+ return value !== null && typeof value === "object" && !Array.isArray(value);
70
+ }
71
+
72
+ function recordWithOnly(value: unknown, fields: readonly string[]): value is Record<string, unknown> {
73
+ return isRecord(value) && Object.keys(value).every(key => fields.includes(key));
74
+ }
75
+
76
+ function safeSnapshotTools(value: unknown, budget: { remaining: number }, depth = 0): boolean {
77
+ if (!Array.isArray(value) || depth > 4) return false;
78
+ return value.every(tool => {
79
+ if (--budget.remaining < 0 || !isRecord(tool)) return false;
80
+ if (tool.type === "function") {
81
+ return recordWithOnly(tool, ["type", "name", "description", "parameters", "strict"])
82
+ && typeof tool.name === "string"
83
+ && (tool.description == null || typeof tool.description === "string")
84
+ && (tool.parameters == null || isRecord(tool.parameters))
85
+ && (tool.strict == null || typeof tool.strict === "boolean");
86
+ }
87
+ if (tool.type === "custom") {
88
+ if (!recordWithOnly(tool, ["type", "name", "description", "format"])
89
+ || typeof tool.name !== "string"
90
+ || (tool.description != null && typeof tool.description !== "string")) return false;
91
+ if (tool.format == null) return true;
92
+ return recordWithOnly(tool.format, ["type", "syntax", "definition"])
93
+ && (tool.format.type === "text" || tool.format.type === "grammar")
94
+ && (tool.format.syntax == null || typeof tool.format.syntax === "string")
95
+ && (tool.format.definition == null || typeof tool.format.definition === "string");
96
+ }
97
+ if (tool.type === "tool_search") {
98
+ return recordWithOnly(tool, ["type", "execution", "description"])
99
+ && tool.execution === "client" && (tool.description == null || typeof tool.description === "string");
100
+ }
101
+ return tool.type === "namespace" && recordWithOnly(tool, ["type", "name", "description", "tools"])
102
+ && typeof tool.name === "string" && (tool.description == null || typeof tool.description === "string")
103
+ && safeSnapshotTools(tool.tools, budget, depth + 1);
104
+ });
105
+ }
106
+
107
+ function safeSnapshotUsage(value: unknown): boolean {
108
+ if (!recordWithOnly(value, ["input_tokens", "output_tokens", "total_tokens", "input_tokens_details", "output_tokens_details"])) return false;
109
+ for (const key of ["input_tokens", "output_tokens", "total_tokens"]) {
110
+ if (value[key] != null && !(typeof value[key] === "number" && Number.isFinite(value[key]) && value[key] >= 0)) return false;
111
+ }
112
+ for (const [key, fields] of [
113
+ ["input_tokens_details", ["cached_tokens"]],
114
+ ["output_tokens_details", ["reasoning_tokens"]],
115
+ ] as const) {
116
+ const detail = value[key];
117
+ if (detail != null && (!recordWithOnly(detail, fields)
118
+ || Object.values(detail).some(count => !(typeof count === "number" && Number.isFinite(count) && count >= 0)))) return false;
119
+ }
120
+ return true;
121
+ }
122
+
123
+ function snapshotMetadataIsSafe(snapshot: Record<string, unknown>): boolean {
124
+ if (PRE_OUTPUT_STRING_FIELDS.some(key => snapshot[key] != null && typeof snapshot[key] !== "string")) return false;
125
+ if (snapshot.object != null && snapshot.object !== "response") return false;
126
+ if (PRE_OUTPUT_NUMBER_FIELDS.some(key => snapshot[key] != null
127
+ && !(typeof snapshot[key] === "number" && Number.isFinite(snapshot[key])))) return false;
128
+ if (snapshot.parallel_tool_calls != null && typeof snapshot.parallel_tool_calls !== "boolean") return false;
129
+ if (snapshot.tools != null && !safeSnapshotTools(snapshot.tools, { remaining: 4096 })) return false;
130
+ if (snapshot.instructions != null && typeof snapshot.instructions !== "string") return false;
131
+ if (snapshot.prompt != null) {
132
+ if (!recordWithOnly(snapshot.prompt, ["id", "version", "variables"])
133
+ || typeof snapshot.prompt.id !== "string"
134
+ || (snapshot.prompt.version != null && typeof snapshot.prompt.version !== "string")
135
+ || (snapshot.prompt.variables != null && (!isRecord(snapshot.prompt.variables)
136
+ || Object.values(snapshot.prompt.variables).some(value => typeof value !== "string")))) return false;
137
+ }
138
+ if (typeof snapshot.tool_choice === "string" && !["none", "auto", "required"].includes(snapshot.tool_choice)) return false;
139
+ if (snapshot.tool_choice != null && typeof snapshot.tool_choice !== "string") {
140
+ if (!recordWithOnly(snapshot.tool_choice, ["type", "name", "namespace", "function"])
141
+ || !["function", "custom", "tool_search"].includes(String(snapshot.tool_choice.type))
142
+ || (snapshot.tool_choice.name != null && typeof snapshot.tool_choice.name !== "string")
143
+ || (snapshot.tool_choice.namespace != null && typeof snapshot.tool_choice.namespace !== "string")) return false;
144
+ const selected = snapshot.tool_choice.function;
145
+ if (selected != null && (!recordWithOnly(selected, ["name"]) || typeof selected.name !== "string")) return false;
146
+ }
147
+ if (snapshot.usage != null && !safeSnapshotUsage(snapshot.usage)) return false;
148
+ if (snapshot.metadata != null && (!isRecord(snapshot.metadata)
149
+ || Object.values(snapshot.metadata).some(value => typeof value !== "string"))) return false;
150
+ if (snapshot.reasoning != null) {
151
+ if (!recordWithOnly(snapshot.reasoning, ["effort", "summary", "generate_summary"])
152
+ || Object.values(snapshot.reasoning).some(value => value != null && typeof value !== "string")) return false;
153
+ if (snapshot.reasoning.effort != null
154
+ && !["none", "minimal", "low", "medium", "high", "xhigh", "max"].includes(String(snapshot.reasoning.effort))) return false;
155
+ if ([snapshot.reasoning.summary, snapshot.reasoning.generate_summary].some(value => value != null
156
+ && !["auto", "concise", "detailed"].includes(String(value)))) return false;
157
+ }
158
+ if (snapshot.text != null) {
159
+ if (!recordWithOnly(snapshot.text, ["format", "verbosity"])
160
+ || (snapshot.text.verbosity != null && typeof snapshot.text.verbosity !== "string")) return false;
161
+ const format = snapshot.text.format;
162
+ if (format != null && (!recordWithOnly(format, ["type", "name", "description", "schema", "strict"])
163
+ || !["text", "json_object", "json_schema"].includes(String(format.type))
164
+ || (format.name != null && typeof format.name !== "string")
165
+ || (format.description != null && typeof format.description !== "string")
166
+ || (format.schema != null && !isRecord(format.schema))
167
+ || (format.strict != null && typeof format.strict !== "boolean"))) return false;
168
+ }
169
+ return true;
170
+ }
171
+
31
172
  // The Codex WebSocket metadata channel (`codex-ws-metadata.ts`) writes these into the same SSE
32
173
  // body, typically ahead of `response.created`. They are rebuilt field by field from quota and
33
174
  // header metadata, so they are neither output nor a terminal. Committing on them made a native
@@ -54,15 +195,14 @@ const RETRYABLE_ZERO_OUTPUT_INCOMPLETE_REASONS = new Set([
54
195
  "upstream_stall_timeout",
55
196
  ]);
56
197
 
57
- function bareErrorStatus(payload: unknown): number | undefined {
198
+ export function explicitErrorEventStatus(payload: unknown): number | undefined {
58
199
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return undefined;
59
200
  const event = payload as Record<string, unknown>;
60
- if (event.type !== "error") return undefined;
61
201
  const nested = event.error;
62
202
  const error = nested && typeof nested === "object" && !Array.isArray(nested)
63
203
  ? nested as Record<string, unknown>
64
204
  : event;
65
- const explicitStatus = [
205
+ return [
66
206
  event.status,
67
207
  event.status_code,
68
208
  event.http_status,
@@ -76,10 +216,67 @@ function bareErrorStatus(payload: unknown): number | undefined {
76
216
  ? Number(value)
77
217
  : undefined)
78
218
  .find(value => value !== undefined && value >= 400 && value <= 599);
79
- const code = typeof error.code === "string"
80
- ? error.code
81
- : typeof event.code === "string" ? event.code : null;
219
+ }
220
+
221
+ function ambiguousSseFrame(frame: string): boolean {
222
+ let event: string | undefined;
223
+ let hasNonComment = false;
224
+ for (const line of frame.split(/\r\n|\r|\n/)) {
225
+ if (!line || line.startsWith(":")) continue;
226
+ hasNonComment = true;
227
+ const colon = line.indexOf(":");
228
+ const field = colon < 0 ? line : line.slice(0, colon);
229
+ if (field === "event") {
230
+ const value = colon < 0 ? "" : line.slice(colon + 1);
231
+ event = value.startsWith(" ") ? value.slice(1) : value;
232
+ }
233
+ }
234
+ const data = sseDataPayload(frame);
235
+ if (data === null || data === "") return hasNonComment;
236
+ if (!event) return false;
237
+ try {
238
+ const payload: unknown = JSON.parse(data);
239
+ return !payload || typeof payload !== "object" || Array.isArray(payload)
240
+ || (payload as { type?: unknown }).type !== event;
241
+ } catch {
242
+ return true;
243
+ }
244
+ }
245
+
246
+ function bareErrorStatus(payload: unknown): number | undefined {
247
+ if (!payload || typeof payload !== "object" || Array.isArray(payload)) return undefined;
248
+ const event = payload as Record<string, unknown>;
249
+ if (event.type !== "error") return undefined;
250
+ const nested = event.error;
251
+ const error = nested && typeof nested === "object" && !Array.isArray(nested)
252
+ ? nested as Record<string, unknown>
253
+ : event;
254
+ const explicitStatus = explicitErrorEventStatus(payload);
255
+ const rawCode = error.code ?? event.code;
256
+ const code = typeof rawCode === "string"
257
+ ? rawCode
258
+ : typeof rawCode === "number" && Number.isFinite(rawCode)
259
+ ? String(rawCode)
260
+ : null;
82
261
  if (explicitStatus === undefined && code === "invalid_request_error") return 400;
262
+ // A structured moderation verdict with no stated status is the request-level 400 the HTTP and
263
+ // native readers judge it as, not an unknown code's 5xx.
264
+ if (explicitStatus === undefined && isProviderModerationRefusal(400, JSON.stringify(event), undefined, true)) {
265
+ return 400;
266
+ }
267
+ // Status is the record's own evidence; whether that record speaks for the envelope is the
268
+ // decision's question, so a root hard stop still reports 400 instead of inventing a 5xx.
269
+ if (explicitStatus === undefined && isOpenRouterOpaque400Record(envelopeErrorRecord(event))) {
270
+ return 400;
271
+ }
272
+ // OpenRouter-style envelopes carry the HTTP status as a bare numeric `code` (e.g. `code: 400`)
273
+ // with no separate status field. `httpStatusFromTerminalError` only understands symbolic codes,
274
+ // so without this the opaque 400 stringifies to "400", reads as unknown, and falls back to 502 —
275
+ // which cools the target on the generic 5xx path instead of taking the intended no-cool hop.
276
+ if (explicitStatus === undefined
277
+ && typeof rawCode === "number" && Number.isInteger(rawCode) && rawCode >= 400 && rawCode <= 599) {
278
+ return rawCode;
279
+ }
83
280
  return explicitStatus ?? httpStatusFromTerminalError({
84
281
  type: typeof error.type === "string" && error.type !== "error" ? error.type : undefined,
85
282
  code,
@@ -115,38 +312,101 @@ function bareErrorIsRetryable(payload: unknown): boolean {
115
312
  return false;
116
313
  }
117
314
  const event = payload as Record<string, unknown>;
118
- const nested = event.error;
119
- const error = nested && typeof nested === "object" && !Array.isArray(nested)
120
- ? nested as Record<string, unknown>
121
- : event;
122
- const code = typeof error.code === "string"
123
- ? error.code
124
- : typeof event.code === "string" ? event.code : null;
315
+ // The record selection, the opaque verdict and the code conflict rule are shared with the HTTP
316
+ // consumer; only the carrier (one parsed frame here, one body there) differs.
317
+ const record = envelopeErrorRecord(event);
318
+ const error = record ?? event;
319
+ const rootCode = envelopeRecordCode(event);
320
+ const recordCode = envelopeRecordCode(record);
125
321
  const message = typeof error.message === "string"
126
322
  ? error.message
127
323
  : typeof event.message === "string" ? event.message : "";
324
+ const rawRecord = {
325
+ ...(error as Record<string, unknown>),
326
+ ...(typeof event.detail === "string" ? { detail: event.detail } : {}),
327
+ };
328
+ const malformedResponseFormat = status === 400 ? isMalformedResponseFormatRecord(rawRecord, message) : undefined;
329
+ const openRouterOpaque400 = status === 400 ? isOpenRouterOpaque400EnvelopeRoot(event) : undefined;
330
+ // The parsed event is the whole terminal record, so its moderation verdict is not cut short.
331
+ const providerModerationRefusal = status === 400 || status === 422
332
+ ? isProviderModerationRefusal(status, JSON.stringify(event), undefined, true) : undefined;
333
+ // A conflicting root and record code hop only when each would hop on its own, so a root hard
334
+ // stop is never hidden behind a retryable record code (and a retryable pair keeps dev's hop).
128
335
  return comboFailureDecision(status, message, {
129
- code, codexModelRefusal: terminalModelRefusal(status, event),
336
+ code: recordCode ?? rootCode, rootCode,
337
+ codexModelRefusal: terminalModelRefusal(status, event),
338
+ malformedResponseFormat, openRouterOpaque400, providerModerationRefusal,
130
339
  }) === "hop";
131
340
  }
132
341
 
133
- function retryableZeroOutputTerminal(payload: unknown): boolean {
342
+ /**
343
+ * Only text and reasoning items, which the required-tool guard holds back until it decides. Both the
344
+ * snapshot's and the event's own `output` are read; an absent or empty one contributes nothing.
345
+ */
346
+ function heldOnlyOutput(...outputs: unknown[]): boolean {
347
+ const items = outputs.flatMap(output => Array.isArray(output) ? output : []);
348
+ if (outputs.some(output => output !== undefined && !Array.isArray(output))) return false;
349
+ return items.length > 0 && items.every(item => item !== null && typeof item === "object"
350
+ && !Array.isArray(item) && ["message", "reasoning"].includes((item as { type?: unknown }).type as string));
351
+ }
352
+
353
+ function retryableZeroOutputTerminal(payload: unknown, context?: object): boolean {
134
354
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return false;
135
355
  const event = payload as {
136
356
  type?: unknown;
137
- response?: { incomplete_details?: { reason?: unknown }; output?: unknown };
357
+ status?: unknown;
358
+ end_turn?: unknown;
359
+ incomplete_details?: { reason?: unknown; retryable?: unknown };
360
+ output?: unknown;
361
+ error?: { code?: unknown; retryable?: unknown };
362
+ response?: {
363
+ status?: unknown;
364
+ end_turn?: unknown;
365
+ incomplete_details?: { reason?: unknown; retryable?: unknown };
366
+ output?: unknown;
367
+ error?: { code?: unknown; retryable?: unknown };
368
+ };
138
369
  };
139
370
  if (bareErrorIsRetryable(event)) return true;
140
- if (event.type === "response.failed") {
141
- const error = (event.response as { error?: { code?: unknown; retryable?: unknown } } | undefined)?.error;
371
+ const target = (event.response && typeof event.response === "object" && !Array.isArray(event.response))
372
+ ? event.response as Record<string, unknown>
373
+ : event as Record<string, unknown>;
374
+ const emptyOutput = (!Array.isArray(event.output) || event.output.length === 0)
375
+ && (!Array.isArray(target.output) || target.output.length === 0);
376
+
377
+ if (event.type === "response.failed" || event.status === "failed") {
378
+ const error = (event.response as { error?: { code?: unknown; retryable?: unknown } } | undefined)?.error
379
+ ?? event.error;
142
380
  const code = error?.code;
143
- if (code === REQUIRED_TOOL_CONTRACT_CODE && error?.retryable === false) return false;
381
+ // The required-tool guard synthesizes this terminal over output it held back from the client,
382
+ // so held text and reasoning are not evidence of anything sent; it keeps the retryability it
383
+ // carries. Any other output item (a tool call, an action) still commits it.
384
+ if (code === REQUIRED_TOOL_CONTRACT_CODE) {
385
+ return error?.retryable !== false && (emptyOutput || heldOnlyOutput(target.output, event.output));
386
+ }
387
+ if (!emptyOutput) return false;
144
388
  return !(typeof code === "string" && NON_REPLAYABLE_FAILED_CODES.has(code));
145
389
  }
146
- if (event.type !== "response.incomplete") return false;
147
- const reason = event.response?.incomplete_details?.reason;
148
- // A terminal-only upstream can carry output without preceding delta/item events.
149
- if (reason === undefined) return !Array.isArray(event.response?.output) || event.response.output.length === 0;
390
+ const isIncomplete = event.type === "response.incomplete" || event.status === "incomplete";
391
+ if (!isIncomplete) return false;
392
+ if (!emptyOutput) return false;
393
+ const details = (target.incomplete_details && typeof target.incomplete_details === "object" && !Array.isArray(target.incomplete_details))
394
+ ? target.incomplete_details as { reason?: unknown; retryable?: unknown }
395
+ : undefined;
396
+ const reason = details?.reason;
397
+ if (reason === undefined) return true;
398
+ if (reason === "max_output_tokens") {
399
+ // Same evidence the run-turn classifier requires before it treats an output limit as a
400
+ // replayable zero-output terminal: an explicitly unfinished turn or an explicitly
401
+ // non-retryable limit is an answer, not a target failure. A normalized Anthropic
402
+ // `pause_turn` also reads as max_output_tokens on the wire, so the request-scoped marker
403
+ // keeps a paused turn the client must continue from hopping to another provider.
404
+ if (isPausedTurn(context)) return false;
405
+ const endTurn = target.end_turn ?? event.end_turn;
406
+ if (endTurn === false) return false;
407
+ if (details?.retryable === false) return false;
408
+ return true;
409
+ }
150
410
  return typeof reason === "string" && RETRYABLE_ZERO_OUTPUT_INCOMPLETE_REASONS.has(reason);
151
411
  }
152
412
 
@@ -160,16 +420,38 @@ export function comboStreamPayloadCommitsOutput(payload: unknown): boolean {
160
420
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return true;
161
421
  const type = (payload as { type?: unknown }).type;
162
422
  if (typeof type !== "string") return true;
163
- if (type === "response.created") {
164
- // A created event is a control frame only while its snapshot is empty. An origin that
165
- // resumes a turn can put completed items in it, and treating that as a prelude would let
166
- // a replacement re-emit output the caller already received.
167
- const response = (payload as { response?: unknown }).response;
423
+ if (PRE_OUTPUT_CONTROL_EVENTS.has(type)) {
424
+ // Lifecycle snapshots may already carry output or an error. Neither can be discarded
425
+ // for a replacement, even if the event name otherwise describes only a prelude.
426
+ const event = payload as Record<string, unknown>;
427
+ const conflictingStatus = (status: unknown) => status != null && status !== "queued" && status !== "in_progress";
428
+ if (Object.keys(event).some(key => !PRE_OUTPUT_EVENT_FIELDS.has(key))) return true;
429
+ if (Object.hasOwn(event, "replayUnsafe") && event.replayUnsafe !== false) return true;
430
+ if (event.sequence_number !== undefined && !(typeof event.sequence_number === "number"
431
+ && Number.isSafeInteger(event.sequence_number) && event.sequence_number >= 0)) return true;
432
+ if (event.error != null || event.last_error != null || event.incomplete_details != null
433
+ || event.item != null || event.delta != null || event.content != null
434
+ || event.message != null || event.code != null || conflictingStatus(event.status)) return true;
435
+ if (event.output !== undefined && (!Array.isArray(event.output) || event.output.length > 0)) return true;
436
+ const response = event.response;
437
+ if (response != null && (typeof response !== "object" || Array.isArray(response))) return true;
168
438
  if (response && typeof response === "object" && !Array.isArray(response)) {
169
- const output = (response as { output?: unknown }).output;
170
- if (Array.isArray(output) && output.length > 0) return true;
439
+ const snapshot = response as Record<string, unknown>;
440
+ if (Object.keys(snapshot).some(key => !PRE_OUTPUT_SNAPSHOT_FIELDS.has(key))) return true;
441
+ if (!snapshotMetadataIsSafe(snapshot)) return true;
442
+ if (snapshot.output !== undefined && (!Array.isArray(snapshot.output) || snapshot.output.length > 0)) return true;
443
+ if (Object.hasOwn(snapshot, "replayUnsafe") && snapshot.replayUnsafe !== false) return true;
444
+ if (snapshot.error != null || snapshot.last_error != null || snapshot.incomplete_details != null
445
+ || conflictingStatus(snapshot.status)) return true;
446
+ if (snapshot.completed_at != null || (snapshot.end_turn != null && snapshot.end_turn !== false)
447
+ || (snapshot.background != null && snapshot.background !== false)
448
+ || (snapshot.store != null && snapshot.store !== false) || snapshot.previous_response_id != null) return true;
171
449
  }
172
450
  }
451
+ if (type === "response.output_text.delta") {
452
+ const delta = (payload as { delta?: unknown }).delta;
453
+ if (delta === undefined || (typeof delta === "string" && delta.length === 0)) return false;
454
+ }
173
455
  return !PRE_OUTPUT_CONTROL_EVENTS.has(type) && !CODEX_METADATA_CONTROL_EVENTS.has(type)
174
456
  && !TERMINAL_EVENTS.has(type);
175
457
  }
@@ -203,17 +485,24 @@ function observedResponsesStage(state: {
203
485
  return "headers-only";
204
486
  }
205
487
 
206
- function replayBufferedResponse(
488
+ /** A released replay slot. */
489
+ const EMPTY_CHUNK = new Uint8Array(0);
490
+
491
+ /** Exported for its regression tests (#8601). */
492
+ export function replayBufferedResponse(
207
493
  response: Response,
208
494
  reader: ReadableStreamDefaultReader<Uint8Array>,
209
495
  buffered: Uint8Array[],
210
496
  pendingRead?: ReturnType<typeof reader.read>,
211
497
  ): Response {
212
498
  let index = 0;
213
- const body = new ReadableStream<Uint8Array>({
499
+ const body = carryPacedStream(response.body, new ReadableStream<Uint8Array>({
214
500
  async pull(controller) {
215
501
  if (index < buffered.length) {
216
- controller.enqueue(buffered[index++]!);
502
+ // Hand each replayed chunk over once: the replay keeps no reference to a prefix the client already took (#8601).
503
+ const chunk = buffered[index]!;
504
+ buffered[index++] = EMPTY_CHUNK;
505
+ controller.enqueue(chunk);
217
506
  return;
218
507
  }
219
508
  try {
@@ -226,9 +515,10 @@ function replayBufferedResponse(
226
515
  }
227
516
  },
228
517
  cancel(reason) {
518
+ buffered.fill(EMPTY_CHUNK);
229
519
  reader.cancel(reason).catch(() => undefined);
230
520
  },
231
- });
521
+ }, pacedQueuingStrategy(response.body)));
232
522
  return carryResponseToolOwnership(response, new Response(body, {
233
523
  status: response.status,
234
524
  statusText: response.statusText,
@@ -244,13 +534,19 @@ function failedTerminalResponse(
244
534
  const nested = terminalPayload.response;
245
535
  const terminalResponse = nested && typeof nested === "object" && !Array.isArray(nested)
246
536
  ? nested as Record<string, unknown>
247
- : {};
248
- const nestedError = terminalResponse.error;
537
+ : terminalPayload;
538
+ const nestedError = (nested as Record<string, unknown> | undefined)?.error;
249
539
  const topLevelError = terminalPayload.error;
250
540
  const error = nestedError && typeof nestedError === "object" && !Array.isArray(nestedError)
251
541
  ? nestedError as Record<string, unknown>
252
542
  : topLevelError && typeof topLevelError === "object" && !Array.isArray(topLevelError)
253
543
  ? topLevelError as Record<string, unknown>
544
+ : isOpenRouterOpaque400Record(terminalPayload)
545
+ ? {
546
+ message: terminalPayload.message,
547
+ code: terminalPayload.code,
548
+ metadata: terminalPayload.metadata,
549
+ }
254
550
  : {
255
551
  // A caller-validated flat error can carry its identity beside type:error.
256
552
  // Retain it when that caller established a 400, rather than discarding the
@@ -258,10 +554,20 @@ function failedTerminalResponse(
258
554
  type: terminalPayload.type === "error" && logCtx.terminalHttpStatus === 400
259
555
  ? "invalid_request_error" : "upstream_error",
260
556
  code: terminalPayload.type === "error" && logCtx.terminalHttpStatus === 400
261
- ? (typeof terminalPayload.code === "string" ? terminalPayload.code : null) : "upstream_server_error",
557
+ ? (typeof terminalPayload.code === "string"
558
+ ? terminalPayload.code
559
+ : typeof terminalPayload.code === "number" && Number.isFinite(terminalPayload.code)
560
+ ? String(terminalPayload.code)
561
+ : null)
562
+ : ((terminalPayload.type === "response.incomplete" || terminalPayload.status === "incomplete")
563
+ && (terminalResponse.incomplete_details as { reason?: unknown } | undefined)?.reason === "max_output_tokens"
564
+ ? "zero_output_token_limit" : "upstream_server_error"),
262
565
  message: typeof terminalPayload.message === "string"
263
566
  ? terminalPayload.message
264
- : logCtx.upstreamError ?? "Provider stream failed before producing output",
567
+ : ((terminalPayload.type === "response.incomplete" || terminalPayload.status === "incomplete")
568
+ && (terminalResponse.incomplete_details as { reason?: unknown } | undefined)?.reason === "max_output_tokens"
569
+ ? "Provider reached its output token limit before producing output"
570
+ : logCtx.upstreamError ?? "Provider stream failed before producing output"),
265
571
  };
266
572
  const headers = new Headers(response.headers);
267
573
  headers.set("content-type", "application/json");
@@ -270,6 +576,7 @@ function failedTerminalResponse(
270
576
  const usage = terminalResponse.usage;
271
577
  return new Response(JSON.stringify({
272
578
  error,
579
+ ...(typeof terminalPayload.detail === "string" ? { detail: terminalPayload.detail } : {}),
273
580
  // The combo classifier needs only the error and optional usage. Do not carry
274
581
  // response ids, provider metadata, or future terminal fields into the client
275
582
  // error envelope merely because they shared the terminal snapshot.
@@ -278,7 +585,14 @@ function failedTerminalResponse(
278
585
  ...(usage && typeof usage === "object" && !Array.isArray(usage) ? { usage } : {}),
279
586
  },
280
587
  }), {
281
- status: logCtx.terminalHttpStatus ?? bareErrorStatus(terminalPayload) ?? 502,
588
+ // A structured moderation verdict on any carrier (`error` or `response.failed`) is the
589
+ // request-level 400 the HTTP and native readers judge it as. The verdict already vetoes any
590
+ // stated status other than 400/422, so this only replaces a status the log tap inferred (the
591
+ // synthetic 502 for an unrecognized code).
592
+ status: (logCtx.terminalHttpStatus !== 400 && logCtx.terminalHttpStatus !== 422
593
+ && isProviderModerationRefusal(400, JSON.stringify(terminalPayload), undefined, true))
594
+ ? 400
595
+ : logCtx.terminalHttpStatus ?? bareErrorStatus(terminalPayload) ?? 502,
282
596
  headers,
283
597
  });
284
598
  }
@@ -293,7 +607,9 @@ export type ComboStreamPreflightResult =
293
607
  * a projected terminal can treat this exactly as `accepted`, which is what it was before
294
608
  * the stage became observable.
295
609
  */
296
- | { kind: "read-error"; response: Response; error: unknown; stage: RequestFailureStage };
610
+ | { kind: "read-error"; response: Response; error: unknown; stage: RequestFailureStage }
611
+ /** A clean EOF after control frames, retained for an explicitly opted-in recovery owner. */
612
+ | { kind: "pre-output-eof"; response: Response; error: ProtocolPreOutputEof; stage: RequestFailureStage };
297
613
 
298
614
  /**
299
615
  * Buffer a Responses SSE only until the request becomes unsafe to replay or reaches a
@@ -305,13 +621,24 @@ export type ComboStreamPreflightResult =
305
621
  export async function preflightComboStreamResponse(
306
622
  response: Response,
307
623
  logCtx: RequestLogContext,
308
- retryableTerminal: (payload: unknown) => boolean = retryableZeroOutputTerminal,
309
- options?: { allowMissingContentType?: boolean; replayReadErrors?: boolean; requiredToolPrelude?: boolean; signal?: AbortSignal },
624
+ retryableTerminal?: (payload: unknown) => boolean,
625
+ options?: {
626
+ allowMissingContentType?: boolean;
627
+ replayReadErrors?: boolean;
628
+ replayCleanEof?: boolean;
629
+ requiredToolPrelude?: boolean;
630
+ signal?: AbortSignal;
631
+ onUpstreamActivity?: () => void;
632
+ },
310
633
  ): Promise<ComboStreamPreflightResult> {
634
+ const retryableTerminalFor = retryableTerminal ?? ((payload: unknown) => retryableZeroOutputTerminal(payload, logCtx));
311
635
  const contentType = response.headers.get("content-type");
312
636
  const isEventStream = hasResponseMediaType(response.headers, "text/event-stream")
313
637
  || (!contentType && options?.allowMissingContentType === true);
314
- if (!response.ok || !response.body || !isEventStream) {
638
+ if (!response.ok || !response.body) {
639
+ return { kind: "accepted", response };
640
+ }
641
+ if (!isEventStream) {
315
642
  return { kind: "accepted", response };
316
643
  }
317
644
 
@@ -329,6 +656,10 @@ export async function preflightComboStreamResponse(
329
656
  let holdDeadline: Promise<"hold-expired"> | undefined;
330
657
  const inspector = createSseInspector({
331
658
  logCtx,
659
+ onFrame: frame => {
660
+ if (terminalStatus === undefined && !outputCommitted && !retryableTerminalPayload
661
+ && ambiguousSseFrame(frame)) outputCommitted = true;
662
+ },
332
663
  // A payload the inspector could not parse still reached this proxy, and it may be output.
333
664
  // Committing on it is what keeps an unreadable frame from reading as an empty prelude.
334
665
  onOpaquePayload: () => { outputCommitted = true; },
@@ -336,7 +667,7 @@ export async function preflightComboStreamResponse(
336
667
  if (terminalStatus !== undefined || outputCommitted || retryableTerminalPayload) return;
337
668
  if (payload !== null && typeof payload === "object" && !Array.isArray(payload)
338
669
  && (payload as { type?: unknown }).type === "response.created") responseCreated = true;
339
- const retryable = retryableTerminal(payload);
670
+ const retryable = retryableTerminalFor(payload);
340
671
  const matchedBareError = retryable && payload !== null && typeof payload === "object"
341
672
  && !Array.isArray(payload) && (payload as { type?: unknown }).type === "error";
342
673
  // A zero-output bare error is terminal evidence. Explicit client errors stay
@@ -379,16 +710,31 @@ export async function preflightComboStreamResponse(
379
710
  next = observed;
380
711
  } catch (error) {
381
712
  if (!options?.replayReadErrors) throw error;
713
+ // A rejected read can leave an output, terminal or opaque frame buffered
714
+ // in the inspector. Flush it before deciding whether recovery is safe.
715
+ inspector.finish();
382
716
  // The native relay still owns post-header transport failures. Preserve
383
717
  // the bounded prefix and the errored reader; cancelling it here would
384
718
  // erase the failure before either client relay or inspection sees it.
385
719
  const replay = replayBufferedResponse(response, reader, buffered);
720
+ if (outputCommitted || terminalStatus !== undefined || retryableTerminalPayload) {
721
+ return { kind: "accepted", response: replay };
722
+ }
386
723
  const stage = observedResponsesStage({ outputCommitted, terminalStatus, responseCreated });
387
724
  return { kind: "read-error", response: replay, error, stage };
388
725
  }
389
726
  if (next.done) {
390
727
  inspector.finish();
728
+ if (options?.replayCleanEof && !outputCommitted && terminalStatus === undefined) {
729
+ return {
730
+ kind: "pre-output-eof",
731
+ response: replayBufferedResponse(response, reader, buffered),
732
+ error: new ProtocolPreOutputEof(),
733
+ stage: observedResponsesStage({ outputCommitted, terminalStatus, responseCreated }),
734
+ };
735
+ }
391
736
  } else {
737
+ if (next.value.byteLength > 0) options?.onUpstreamActivity?.();
392
738
  if (bufferedBytes + next.value.byteLength > COMBO_STREAM_PREFLIGHT_MAX_BYTES) {
393
739
  // Keep the cap about memory the preflight allocates. The upstream chunk already exists;
394
740
  // copying it before committing would transiently exceed the boundary for no
@@ -411,6 +757,17 @@ export async function preflightComboStreamResponse(
411
757
  && !outputCommitted && retryableTerminalPayload) {
412
758
  await reader.cancel("retrying zero-output combo stream terminal").catch(() => undefined);
413
759
  const failed = failedTerminalResponse(response, retryableTerminalPayload, logCtx);
760
+ // The rebuilt envelope keeps only the record. When either the whole frame or that slim
761
+ // envelope reads as a moderation verdict, the combo loop must judge the whole frame: a
762
+ // verdict needs the evidence the envelope dropped (a root code, an innererror), and a veto
763
+ // the envelope dropped (a root verdict, a nested hard code) must not turn into a hop.
764
+ if (failed.status === 400 || failed.status === 422) {
765
+ const whole = JSON.stringify(retryableTerminalPayload);
766
+ if (isProviderModerationRefusal(failed.status, whole, undefined, true)
767
+ || isProviderModerationRefusal(failed.status, await failed.clone().text(), undefined, true)) {
768
+ attachComboFailureEvidence(failed, whole);
769
+ }
770
+ }
414
771
  return { kind: "failed", response: failed,
415
772
  ...(failed.status === 400
416
773
  ? { codexModelRefusal: terminalModelRefusal(failed.status, retryableTerminalPayload) } : {}) };
@@ -432,27 +789,144 @@ export async function preflightComboStreamResponse(
432
789
  export type ProtocolSafeResetRecovery = (
433
790
  error: unknown,
434
791
  stage: RequestFailureStage,
792
+ signal: AbortSignal,
793
+ /** Whether the selection can still publish this candidate; it narrows once a head is committed. */
794
+ accepts: (candidate: Response) => boolean,
435
795
  ) => Promise<Response | null>;
436
796
 
437
797
  /**
438
- * Defer protocol inspection until the downstream actually pulls the body.
798
+ * The headers a committed head promises about the body that follows it.
799
+ *
800
+ * A replacement never sends its own head: the client already has the original one, so only what
801
+ * the client reads to interpret the swapped body can matter here. Comparing the whole header set
802
+ * refused every real recovery, because origins vary `date`, `x-request-id`, `cf-ray`,
803
+ * `server-timing`, the quota headers and `content-length` per attempt; those describe the
804
+ * attempt that answered, not the response identity, and the client already holds the original's
805
+ * values. Hop-by-hop headers are listed for the same reason: the connection is the proxy's.
439
806
  *
440
- * Direct passthrough must return response headers before the first SSE event arrives, so the
441
- * inspection cannot be awaited at the dispatch site the way combo routing awaits it. Wrapping
442
- * the body moves it to the first pull, which is the earliest moment the client is willing to
443
- * wait anyway.
807
+ * What is left is the identity a mismatched body would corrupt:
808
+ * - `openai-model` is the model the origin actually served. A body produced by a different
809
+ * served model behind a head that advertised the first one mislabels the turn for the client's
810
+ * follow-ups and for usage attribution.
811
+ * - `x-codex-turn-state` is this proxy's own handle, bound at issuance to the caller, provider
812
+ * and outbound account and redeemed back to the upstream turn token only at the physical send
813
+ * of a matching request (`src/server/turn-state-handles.ts`). Publishing a replacement body
814
+ * under the original handle would redeem the client's next turn against a different turn state
815
+ * than the one that produced the body, which is exactly the conversation corruption the handle
816
+ * exists to prevent.
817
+ *
818
+ * Everything else is ignored on purpose: `date`, `x-request-id`, `request-id`, `cf-ray`,
819
+ * `server-timing`, `x-ratelimit-*`, `openai-processing-ms`, `content-length`,
820
+ * `transfer-encoding`, `connection` and `keep-alive`, plus any provider header the client
821
+ * never interprets.
444
822
  */
445
- export function deferProtocolSafeResetRecovery(
823
+ const DEFERRED_IDENTITY_HEADERS: readonly string[] = ["openai-model", "x-codex-turn-state"];
824
+
825
+ const headerMediaType = (headers: Headers): string =>
826
+ headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() ?? "";
827
+
828
+ /**
829
+ * Whether a replacement body may be published behind an already committed head on the clean
830
+ * pre-output EOF path. A deferred body cannot change the head, so it must at least agree on the
831
+ * identity subset above.
832
+ */
833
+ export function sameDeferredResponseIdentity(original: Response, replacement: Response): boolean {
834
+ if (original.status !== replacement.status || original.statusText !== replacement.statusText) return false;
835
+ if (headerMediaType(original.headers) !== headerMediaType(replacement.headers)) return false;
836
+ return DEFERRED_IDENTITY_HEADERS.every(name => (original.headers.get(name) ?? "") === (replacement.headers.get(name) ?? ""));
837
+ }
838
+
839
+ export interface DeferredResetRecoveryOptions {
840
+ allowMissingContentType?: boolean;
841
+ heartbeatIntervalMs?: number;
842
+ /**
843
+ * `periodic` comments a waiting client once per heartbeat. `upstream-activity` comments only when
844
+ * the upstream reads non-empty bytes or a replacement head lands behind a committed head, for a
845
+ * consumer whose silence clock sees only delivered bytes; its owner still bounds real silence.
846
+ */
847
+ keepalive?: "periodic" | "upstream-activity" | "none";
848
+ }
849
+
850
+ /** Which physical attempt produced the head a reset selection published. */
851
+ export type ResetSelectionOwner = "original" | "replacement";
852
+
853
+ export interface ResetSelectionOptions extends DeferredResetRecoveryOptions {
854
+ /** Upper bound on the pre-head wait. The wait never exceeds one heartbeat interval either. */
855
+ maxSelectionMs?: number;
856
+ /**
857
+ * Upper bound on how long the original's own inspection may hold the head. When it expires
858
+ * before the original settles, the original head is committed and inspection continues behind
859
+ * it. A replacement requested after the original failed inside this window is still bounded by
860
+ * `maxSelectionMs`, because no healthy source is waiting behind that head.
861
+ */
862
+ inspectionWindowMs?: number;
863
+ /** Ends the selection, the committed hold and an in-flight replacement without awaiting cleanup. */
864
+ signal?: AbortSignal;
865
+ /** Called once, synchronously, before the caller receives the published response. */
866
+ onCommit?: (published: Response, owner: ResetSelectionOwner) => void;
867
+ }
868
+
869
+ const positiveMs = (value: number | undefined): number | undefined =>
870
+ value !== undefined && Number.isFinite(value) && value > 0 ? value : undefined;
871
+
872
+ // A fresh chunk per enqueue: a consumer may transfer the buffer it receives.
873
+ const resetPreflightKeepalive = (): Uint8Array => new TextEncoder().encode(": keepalive\n\n");
874
+
875
+ /**
876
+ * One protocol preflight and at most one replacement for a native SSE body, behind a head that is
877
+ * either still open (`early`) or already committed. While the head is open, any replacement the
878
+ * caller's recovery accepts can be published with its own status and headers. Once a head is
879
+ * committed, acceptance depends on how the stream ended: a read error keeps the permissive
880
+ * replacement behaviour the reset lane has always had, while a clean pre-output EOF must agree on
881
+ * the deferred identity subset. The original keeps its bytes and error when nothing is accepted.
882
+ */
883
+ function createResetSelection(
446
884
  response: Response,
447
885
  logCtx: RequestLogContext,
448
886
  recover: ProtocolSafeResetRecovery,
449
- options?: { allowMissingContentType?: boolean },
450
- ): Response {
451
- if (!response.body) return response;
452
-
887
+ options: ResetSelectionOptions | undefined,
888
+ early: boolean,
889
+ ): { held: Response; selected?: Promise<Response> } {
453
890
  let reader: ReadableStreamDefaultReader<Uint8Array> | undefined;
891
+ let selection: { response: Response; owner: ResetSelectionOwner } | undefined;
454
892
  let initialization: Promise<void> | undefined;
893
+ let initializationResult: { kind: "ready" } | { kind: "failed"; error: unknown } | undefined;
894
+ let notifyInitialization: (() => void) | undefined;
895
+ let commitEarly: ((published: Response, owner: ResetSelectionOwner) => void) | undefined;
896
+ let inspectionTimer: ReturnType<typeof setTimeout> | undefined;
897
+ const endInspectionWindow = (): void => {
898
+ if (inspectionTimer !== undefined) clearTimeout(inspectionTimer);
899
+ inspectionTimer = undefined;
900
+ };
901
+ let activityPending = false;
902
+ // A replacement head behind a committed head is upstream activity the held stream must report.
903
+ let replacementHeadPending = false;
904
+ let heartbeatDue = false;
455
905
  let closed = false;
906
+ let headCommitted = !early;
907
+ let output!: ReadableStreamDefaultController<Uint8Array>;
908
+ const preflightAbort = new AbortController();
909
+ const heartbeatMs = positiveMs(options?.heartbeatIntervalMs) ?? RESET_PREFLIGHT_HEARTBEAT_MS;
910
+ const keepalive = options?.keepalive ?? "periodic";
911
+ const signal = options?.signal;
912
+ /**
913
+ * Acceptance narrows with the failure, not with the selection alone.
914
+ *
915
+ * A read error is the reset the recovery lane has always served: the transport died, the
916
+ * upstream attempt is over, and whatever a fresh attempt produced stands in for it. Nothing
917
+ * about the replacement's metadata can be inferred from the original's, because a real origin
918
+ * varies `date`, request ids and quota headers on every attempt, so requiring equality made
919
+ * the recovery unreachable.
920
+ *
921
+ * A clean pre-output EOF is different: the origin closed a healthy stream after its lifecycle
922
+ * events, so the bytes that follow are a different attempt's answer to the same turn. Behind a
923
+ * committed head it still has to agree on the identity subset that describes what the client
924
+ * will read.
925
+ */
926
+ const acceptsFor = (kind: "read-error" | "pre-output-eof"): ((candidate: Response) => boolean) =>
927
+ kind === "pre-output-eof"
928
+ ? (candidate: Response) => !headCommitted || sameDeferredResponseIdentity(response, candidate)
929
+ : () => true;
456
930
 
457
931
  const cancelBody = (body: ReadableStream<Uint8Array> | null, reason?: unknown): void => {
458
932
  try { void body?.cancel(reason).catch(() => {}); } catch { /* already locked or closed */ }
@@ -462,31 +936,104 @@ export function deferProtocolSafeResetRecovery(
462
936
  response,
463
937
  logCtx,
464
938
  () => false,
465
- { allowMissingContentType: options?.allowMissingContentType === true, replayReadErrors: true },
939
+ { allowMissingContentType: options?.allowMissingContentType === true, replayReadErrors: true,
940
+ replayCleanEof: true, signal: preflightAbort.signal,
941
+ onUpstreamActivity: keepalive === "upstream-activity" ? () => {
942
+ activityPending = true;
943
+ notifyInitialization?.();
944
+ } : undefined },
466
945
  );
467
- let selected = preflight.response;
468
- if (preflight.kind === "read-error") {
469
- const replacement = await recover(preflight.error, preflight.stage);
946
+ // The original settled, so it no longer holds the head; only a replacement can from here.
947
+ endInspectionWindow();
948
+ let chosen: { response: Response; owner: ResetSelectionOwner } = { response: preflight.response, owner: "original" };
949
+ if (!closed && (preflight.kind === "read-error" || preflight.kind === "pre-output-eof")) {
950
+ const accepts = acceptsFor(preflight.kind);
951
+ const replacement = await recover(preflight.error, preflight.stage, preflightAbort.signal, accepts);
470
952
  if (replacement) {
471
- cancelBody(selected.body, "using protocol-safe replacement stream");
472
- selected = replacement;
953
+ // Checked again here: the head may have been committed while the replacement was in flight.
954
+ if (!closed && accepts(replacement)) {
955
+ cancelBody(chosen.response.body, "using protocol-safe replacement stream");
956
+ chosen = { response: replacement, owner: "replacement" };
957
+ replacementHeadPending = headCommitted && keepalive === "upstream-activity";
958
+ } else {
959
+ cancelBody(replacement.body, "declining protocol-safe replacement stream");
960
+ if (!closed) console.warn("[upstream-retry] replacement response metadata differs from the committed head; preserving original stream");
961
+ }
473
962
  }
474
963
  }
475
964
  if (closed) {
476
- cancelBody(selected.body, "downstream cancelled before protocol preflight completed");
965
+ cancelBody(chosen.response.body, "downstream cancelled before protocol preflight completed");
477
966
  return;
478
967
  }
479
- reader = selected.body?.getReader();
968
+ selection = chosen;
480
969
  };
970
+ const start = (): Promise<void> => initialization ??= initialize().then(
971
+ () => { initializationResult = { kind: "ready" }; notifyInitialization?.(); },
972
+ error => { initializationResult = { kind: "failed", error }; notifyInitialization?.(); },
973
+ );
974
+ const detach = (): void => signal?.removeEventListener("abort", onAbort);
975
+ const release = (reason: unknown): boolean => {
976
+ if (closed) return false;
977
+ closed = true;
978
+ detach();
979
+ preflightAbort.abort(reason);
980
+ notifyInitialization?.();
981
+ if (reader) {
982
+ try { void reader.cancel(reason).catch(() => {}); } catch { /* already closed */ }
983
+ try { reader.releaseLock(); } catch { /* already released */ }
984
+ reader = undefined;
985
+ } else if (selection) {
986
+ cancelBody(selection.response.body, reason);
987
+ } else if (initialization === undefined) {
988
+ // Nothing has read the upstream yet, so this body is still ours to cancel.
989
+ cancelBody(response.body, reason);
990
+ }
991
+ // Otherwise aborting cancels the preflight's locked reader or the in-flight replacement, and
992
+ // initialization releases whichever body it ends up choosing. Nothing here awaits cleanup.
993
+ return true;
994
+ };
995
+ function onAbort(): void {
996
+ const reason = signal?.reason;
997
+ if (release(reason)) {
998
+ try { output.error(reason); } catch { /* already closed */ }
999
+ }
1000
+ commitEarly?.(held, "original");
1001
+ }
481
1002
 
482
1003
  const body = new ReadableStream<Uint8Array>({
1004
+ start(controller) { output = controller; },
483
1005
  async pull(controller) {
484
1006
  try {
485
- initialization ??= initialize();
486
- await initialization;
1007
+ void start();
1008
+ // Keep only one waiter on the initialization; racing it afresh for every heartbeat
1009
+ // would retain one promise callback per interval until a quiet upstream settles.
1010
+ if (initializationResult === undefined && !heartbeatDue && !(keepalive === "upstream-activity" && activityPending)) {
1011
+ await new Promise<void>(resolve => {
1012
+ const timer = keepalive === "periodic"
1013
+ ? setTimeout(() => { notifyInitialization = undefined; resolve(); }, heartbeatMs)
1014
+ : undefined;
1015
+ notifyInitialization = () => { if (timer !== undefined) clearTimeout(timer); notifyInitialization = undefined; resolve(); };
1016
+ });
1017
+ }
487
1018
  if (closed) return;
1019
+ if (initializationResult === undefined) {
1020
+ activityPending = false;
1021
+ heartbeatDue = false;
1022
+ controller.enqueue(resetPreflightKeepalive());
1023
+ return;
1024
+ }
1025
+ if (initializationResult.kind === "failed") throw initializationResult.error;
1026
+ if (replacementHeadPending) {
1027
+ // A buffered consumer's silence clock sees only delivered bytes. Without this, a quiet
1028
+ // replacement would inherit the original's last activity and be cut short.
1029
+ replacementHeadPending = false;
1030
+ controller.enqueue(resetPreflightKeepalive());
1031
+ return;
1032
+ }
1033
+ reader ??= selection?.response.body?.getReader();
488
1034
  if (!reader) {
489
1035
  closed = true;
1036
+ detach();
490
1037
  controller.close();
491
1038
  return;
492
1039
  }
@@ -494,6 +1041,7 @@ export function deferProtocolSafeResetRecovery(
494
1041
  if (closed) return;
495
1042
  if (next.done) {
496
1043
  closed = true;
1044
+ detach();
497
1045
  try { reader.releaseLock(); } catch { /* already released */ }
498
1046
  reader = undefined;
499
1047
  controller.close();
@@ -503,32 +1051,104 @@ export function deferProtocolSafeResetRecovery(
503
1051
  } catch (error) {
504
1052
  if (closed) return;
505
1053
  closed = true;
1054
+ detach();
506
1055
  try { reader?.releaseLock(); } catch { /* errored reader */ }
507
1056
  reader = undefined;
508
1057
  controller.error(error);
509
1058
  }
510
1059
  },
511
1060
  cancel(reason) {
512
- if (closed) return;
513
- closed = true;
514
- if (reader) {
515
- try { void reader.cancel(reason).catch(() => {}); } catch { /* already closed */ }
516
- try { reader.releaseLock(); } catch { /* already released */ }
517
- reader = undefined;
518
- } else if (initialization === undefined) {
519
- // Nothing has read the upstream yet, so this body is still ours to cancel.
520
- cancelBody(response.body, reason);
521
- }
522
- // A cancel while the preflight is mid-flight falls through deliberately. That body is
523
- // locked by the preflight's own reader, so cancelling it here would reject and be
524
- // swallowed; `initialize` sees `closed` when it settles and releases whichever body it
525
- // ended up selecting, which is the one that actually has to be let go.
1061
+ release(reason);
526
1062
  },
527
1063
  }, { highWaterMark: 0 });
528
-
529
- return new Response(body, {
1064
+ const held = carryResponseToolOwnership(response, new Response(body, {
530
1065
  status: response.status,
531
1066
  statusText: response.statusText,
532
1067
  headers: response.headers,
1068
+ }));
1069
+
1070
+ if (!early) {
1071
+ if (signal?.aborted) onAbort();
1072
+ else signal?.addEventListener("abort", onAbort, { once: true });
1073
+ return { held };
1074
+ }
1075
+ const selected = new Promise<Response>(resolve => {
1076
+ let deadline: ReturnType<typeof setTimeout> | undefined;
1077
+ commitEarly = (published, owner) => {
1078
+ commitEarly = undefined;
1079
+ headCommitted = true;
1080
+ if (deadline !== undefined) clearTimeout(deadline);
1081
+ endInspectionWindow();
1082
+ // A published selection owns its own body; the hold and its abort hook are finished.
1083
+ if (published !== held) detach();
1084
+ try { options?.onCommit?.(published, owner); } finally { resolve(published); }
1085
+ };
1086
+ if (signal?.aborted) {
1087
+ onAbort();
1088
+ return;
1089
+ }
1090
+ signal?.addEventListener("abort", onAbort, { once: true });
1091
+ const deadlineMs = Math.min(heartbeatMs, positiveMs(options?.maxSelectionMs) ?? Infinity);
1092
+ deadline = setTimeout(() => {
1093
+ // The client has waited one heartbeat interval for a head; its first read gets a keepalive.
1094
+ if (keepalive === "periodic") heartbeatDue = true;
1095
+ commitEarly?.(held, "original");
1096
+ }, deadlineMs);
1097
+ const inspectionMs = positiveMs(options?.inspectionWindowMs);
1098
+ // A quiet original is a healthy slow response as often as a dying one; its head goes out now.
1099
+ // Bun's server writes a head only with the first body bytes, so the held body owes a comment.
1100
+ if (inspectionMs !== undefined && inspectionMs < deadlineMs) {
1101
+ inspectionTimer = setTimeout(() => {
1102
+ inspectionTimer = undefined;
1103
+ if (keepalive === "periodic") heartbeatDue = true;
1104
+ commitEarly?.(held, "original");
1105
+ }, inspectionMs);
1106
+ }
1107
+ void start().then(() => {
1108
+ if (selection && !closed) commitEarly?.(selection.response, selection.owner);
1109
+ else commitEarly?.(held, "original");
1110
+ });
533
1111
  });
1112
+ return { held, selected };
1113
+ }
1114
+
1115
+ /**
1116
+ * Defer protocol inspection behind a head the caller has already committed.
1117
+ *
1118
+ * The inspection starts at the first pull. A replacement behind the committed head is published
1119
+ * for a read error (the reset lane's long-standing behaviour) and, for a clean pre-output EOF,
1120
+ * only when it agrees on the deferred identity subset (status, status text, media type,
1121
+ * `openai-model`, `x-codex-turn-state`).
1122
+ */
1123
+ export function deferProtocolSafeResetRecovery(
1124
+ response: Response,
1125
+ logCtx: RequestLogContext,
1126
+ recover: ProtocolSafeResetRecovery,
1127
+ options?: DeferredResetRecoveryOptions,
1128
+ ): Response {
1129
+ if (!response.body) return response;
1130
+ return createResetSelection(response, logCtx, recover, options, false).held;
1131
+ }
1132
+
1133
+ /**
1134
+ * Choose the native response before its head is committed, within one heartbeat interval or the
1135
+ * shorter `inspectionWindowMs` while the original itself is still being inspected.
1136
+ *
1137
+ * Inspection starts immediately. If selection finishes first, the caller receives the selected
1138
+ * response, a replacement included, with its own status and headers. If the deadline wins, the
1139
+ * caller receives the original head and the same preflight continues behind it, where a read
1140
+ * error's replacement is accepted and a clean EOF's must agree on the identity subset.
1141
+ * `onCommit` names which attempt owns the published head.
1142
+ */
1143
+ export function selectProtocolSafeResetResponse(
1144
+ response: Response,
1145
+ logCtx: RequestLogContext,
1146
+ recover: ProtocolSafeResetRecovery,
1147
+ options: ResetSelectionOptions = {},
1148
+ ): Promise<Response> {
1149
+ if (!response.body) {
1150
+ options.onCommit?.(response, "original");
1151
+ return Promise.resolve(response);
1152
+ }
1153
+ return createResetSelection(response, logCtx, recover, options, true).selected!;
534
1154
  }