@bitkyc08/opencodex 2.100.2 → 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 (561) 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-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.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-DT146AhS.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-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  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 +3 -3
  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/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -6,6 +6,7 @@ import {
6
6
  hasConflictingCodexModelRefusalEnvelopes,
7
7
  isMalformedResponseFormatRecord,
8
8
  isOpenRouterOpaque400EnvelopeRoot,
9
+ isProviderModerationRefusal,
9
10
  isOpenRouterOpaque400Record,
10
11
  type CodexAccountModelRefusal,
11
12
  } from "../../combos/failover";
@@ -17,14 +18,18 @@ import type { RequestFailureStage } from "../../lib/request-failure-model";
17
18
  import type { RequestLogContext } from "../request-log";
18
19
  import { carryResponseToolOwnership } from "./response-tool-ownership";
19
20
  import { createSseInspector } from "../relay";
21
+ import { sseDataPayload } from "../sse-payload-rewrite";
20
22
  import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
21
23
  import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
22
- import { isPausedTurn } from "../../lib/client-error-body";
24
+ import { attachComboFailureEvidence, isPausedTurn } from "../../lib/client-error-body";
23
25
  import { requiredToolReasoningPrelude } from "./combo-required-tool-stream";
26
+ import { ProtocolPreOutputEof } from "../../lib/upstream-retry";
27
+ import { carryPacedStream, pacedQueuingStrategy } from "../../lib/paced-stream";
24
28
 
25
29
  const COMBO_STREAM_PREFLIGHT_MAX_BYTES = MAX_CLIENT_SSE_FRAME_BYTES;
26
30
  // Required-tool reasoning may delay delivery, but never for an unbounded/trickling prelude.
27
31
  const COMBO_REQUIRED_TOOL_REASONING_HOLD_MS = 1_000;
32
+ const RESET_PREFLIGHT_HEARTBEAT_MS = 15_000;
28
33
  // Keep retained object count proportional to the same byte budget used by the
29
34
  // shared SSE framer. Tiny or empty upstream reads must not bypass the byte cap.
30
35
  const COMBO_STREAM_PREFLIGHT_MAX_CHUNKS = Math.max(
@@ -39,6 +44,131 @@ const PRE_OUTPUT_CONTROL_EVENTS = new Set([
39
44
  "response.heartbeat",
40
45
  ]);
41
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
+
42
172
  // The Codex WebSocket metadata channel (`codex-ws-metadata.ts`) writes these into the same SSE
43
173
  // body, typically ahead of `response.created`. They are rebuilt field by field from quota and
44
174
  // header metadata, so they are neither output nor a terminal. Committing on them made a native
@@ -65,15 +195,14 @@ const RETRYABLE_ZERO_OUTPUT_INCOMPLETE_REASONS = new Set([
65
195
  "upstream_stall_timeout",
66
196
  ]);
67
197
 
68
- function bareErrorStatus(payload: unknown): number | undefined {
198
+ export function explicitErrorEventStatus(payload: unknown): number | undefined {
69
199
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return undefined;
70
200
  const event = payload as Record<string, unknown>;
71
- if (event.type !== "error") return undefined;
72
201
  const nested = event.error;
73
202
  const error = nested && typeof nested === "object" && !Array.isArray(nested)
74
203
  ? nested as Record<string, unknown>
75
204
  : event;
76
- const explicitStatus = [
205
+ return [
77
206
  event.status,
78
207
  event.status_code,
79
208
  event.http_status,
@@ -87,6 +216,42 @@ function bareErrorStatus(payload: unknown): number | undefined {
87
216
  ? Number(value)
88
217
  : undefined)
89
218
  .find(value => value !== undefined && value >= 400 && value <= 599);
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);
90
255
  const rawCode = error.code ?? event.code;
91
256
  const code = typeof rawCode === "string"
92
257
  ? rawCode
@@ -94,6 +259,11 @@ function bareErrorStatus(payload: unknown): number | undefined {
94
259
  ? String(rawCode)
95
260
  : null;
96
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
+ }
97
267
  // Status is the record's own evidence; whether that record speaks for the envelope is the
98
268
  // decision's question, so a root hard stop still reports 400 instead of inventing a 5xx.
99
269
  if (explicitStatus === undefined && isOpenRouterOpaque400Record(envelopeErrorRecord(event))) {
@@ -157,12 +327,15 @@ function bareErrorIsRetryable(payload: unknown): boolean {
157
327
  };
158
328
  const malformedResponseFormat = status === 400 ? isMalformedResponseFormatRecord(rawRecord, message) : undefined;
159
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;
160
333
  // A conflicting root and record code hop only when each would hop on its own, so a root hard
161
334
  // stop is never hidden behind a retryable record code (and a retryable pair keeps dev's hop).
162
335
  return comboFailureDecision(status, message, {
163
336
  code: recordCode ?? rootCode, rootCode,
164
337
  codexModelRefusal: terminalModelRefusal(status, event),
165
- malformedResponseFormat, openRouterOpaque400,
338
+ malformedResponseFormat, openRouterOpaque400, providerModerationRefusal,
166
339
  }) === "hop";
167
340
  }
168
341
 
@@ -247,14 +420,32 @@ export function comboStreamPayloadCommitsOutput(payload: unknown): boolean {
247
420
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return true;
248
421
  const type = (payload as { type?: unknown }).type;
249
422
  if (typeof type !== "string") return true;
250
- if (type === "response.created") {
251
- // A created event is a control frame only while its snapshot is empty. An origin that
252
- // resumes a turn can put completed items in it, and treating that as a prelude would let
253
- // a replacement re-emit output the caller already received.
254
- 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;
255
438
  if (response && typeof response === "object" && !Array.isArray(response)) {
256
- const output = (response as { output?: unknown }).output;
257
- 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;
258
449
  }
259
450
  }
260
451
  if (type === "response.output_text.delta") {
@@ -294,17 +485,24 @@ function observedResponsesStage(state: {
294
485
  return "headers-only";
295
486
  }
296
487
 
297
- 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(
298
493
  response: Response,
299
494
  reader: ReadableStreamDefaultReader<Uint8Array>,
300
495
  buffered: Uint8Array[],
301
496
  pendingRead?: ReturnType<typeof reader.read>,
302
497
  ): Response {
303
498
  let index = 0;
304
- const body = new ReadableStream<Uint8Array>({
499
+ const body = carryPacedStream(response.body, new ReadableStream<Uint8Array>({
305
500
  async pull(controller) {
306
501
  if (index < buffered.length) {
307
- 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);
308
506
  return;
309
507
  }
310
508
  try {
@@ -317,9 +515,10 @@ function replayBufferedResponse(
317
515
  }
318
516
  },
319
517
  cancel(reason) {
518
+ buffered.fill(EMPTY_CHUNK);
320
519
  reader.cancel(reason).catch(() => undefined);
321
520
  },
322
- });
521
+ }, pacedQueuingStrategy(response.body)));
323
522
  return carryResponseToolOwnership(response, new Response(body, {
324
523
  status: response.status,
325
524
  statusText: response.statusText,
@@ -386,7 +585,14 @@ function failedTerminalResponse(
386
585
  ...(usage && typeof usage === "object" && !Array.isArray(usage) ? { usage } : {}),
387
586
  },
388
587
  }), {
389
- 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,
390
596
  headers,
391
597
  });
392
598
  }
@@ -401,7 +607,9 @@ export type ComboStreamPreflightResult =
401
607
  * a projected terminal can treat this exactly as `accepted`, which is what it was before
402
608
  * the stage became observable.
403
609
  */
404
- | { 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 };
405
613
 
406
614
  /**
407
615
  * Buffer a Responses SSE only until the request becomes unsafe to replay or reaches a
@@ -417,8 +625,10 @@ export async function preflightComboStreamResponse(
417
625
  options?: {
418
626
  allowMissingContentType?: boolean;
419
627
  replayReadErrors?: boolean;
628
+ replayCleanEof?: boolean;
420
629
  requiredToolPrelude?: boolean;
421
630
  signal?: AbortSignal;
631
+ onUpstreamActivity?: () => void;
422
632
  },
423
633
  ): Promise<ComboStreamPreflightResult> {
424
634
  const retryableTerminalFor = retryableTerminal ?? ((payload: unknown) => retryableZeroOutputTerminal(payload, logCtx));
@@ -446,6 +656,10 @@ export async function preflightComboStreamResponse(
446
656
  let holdDeadline: Promise<"hold-expired"> | undefined;
447
657
  const inspector = createSseInspector({
448
658
  logCtx,
659
+ onFrame: frame => {
660
+ if (terminalStatus === undefined && !outputCommitted && !retryableTerminalPayload
661
+ && ambiguousSseFrame(frame)) outputCommitted = true;
662
+ },
449
663
  // A payload the inspector could not parse still reached this proxy, and it may be output.
450
664
  // Committing on it is what keeps an unreadable frame from reading as an empty prelude.
451
665
  onOpaquePayload: () => { outputCommitted = true; },
@@ -496,16 +710,31 @@ export async function preflightComboStreamResponse(
496
710
  next = observed;
497
711
  } catch (error) {
498
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();
499
716
  // The native relay still owns post-header transport failures. Preserve
500
717
  // the bounded prefix and the errored reader; cancelling it here would
501
718
  // erase the failure before either client relay or inspection sees it.
502
719
  const replay = replayBufferedResponse(response, reader, buffered);
720
+ if (outputCommitted || terminalStatus !== undefined || retryableTerminalPayload) {
721
+ return { kind: "accepted", response: replay };
722
+ }
503
723
  const stage = observedResponsesStage({ outputCommitted, terminalStatus, responseCreated });
504
724
  return { kind: "read-error", response: replay, error, stage };
505
725
  }
506
726
  if (next.done) {
507
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
+ }
508
736
  } else {
737
+ if (next.value.byteLength > 0) options?.onUpstreamActivity?.();
509
738
  if (bufferedBytes + next.value.byteLength > COMBO_STREAM_PREFLIGHT_MAX_BYTES) {
510
739
  // Keep the cap about memory the preflight allocates. The upstream chunk already exists;
511
740
  // copying it before committing would transiently exceed the boundary for no
@@ -528,6 +757,17 @@ export async function preflightComboStreamResponse(
528
757
  && !outputCommitted && retryableTerminalPayload) {
529
758
  await reader.cancel("retrying zero-output combo stream terminal").catch(() => undefined);
530
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
+ }
531
771
  return { kind: "failed", response: failed,
532
772
  ...(failed.status === 400
533
773
  ? { codexModelRefusal: terminalModelRefusal(failed.status, retryableTerminalPayload) } : {}) };
@@ -549,27 +789,144 @@ export async function preflightComboStreamResponse(
549
789
  export type ProtocolSafeResetRecovery = (
550
790
  error: unknown,
551
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,
552
795
  ) => Promise<Response | null>;
553
796
 
554
797
  /**
555
- * Defer protocol inspection until the downstream actually pulls the body.
798
+ * The headers a committed head promises about the body that follows it.
556
799
  *
557
- * Direct passthrough must return response headers before the first SSE event arrives, so the
558
- * inspection cannot be awaited at the dispatch site the way combo routing awaits it. Wrapping
559
- * the body moves it to the first pull, which is the earliest moment the client is willing to
560
- * wait anyway.
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.
806
+ *
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.
561
822
  */
562
- 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(
563
884
  response: Response,
564
885
  logCtx: RequestLogContext,
565
886
  recover: ProtocolSafeResetRecovery,
566
- options?: { allowMissingContentType?: boolean },
567
- ): Response {
568
- if (!response.body) return response;
569
-
887
+ options: ResetSelectionOptions | undefined,
888
+ early: boolean,
889
+ ): { held: Response; selected?: Promise<Response> } {
570
890
  let reader: ReadableStreamDefaultReader<Uint8Array> | undefined;
891
+ let selection: { response: Response; owner: ResetSelectionOwner } | undefined;
571
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;
572
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;
573
930
 
574
931
  const cancelBody = (body: ReadableStream<Uint8Array> | null, reason?: unknown): void => {
575
932
  try { void body?.cancel(reason).catch(() => {}); } catch { /* already locked or closed */ }
@@ -579,31 +936,104 @@ export function deferProtocolSafeResetRecovery(
579
936
  response,
580
937
  logCtx,
581
938
  () => false,
582
- { 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 },
583
945
  );
584
- let selected = preflight.response;
585
- if (preflight.kind === "read-error") {
586
- 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);
587
952
  if (replacement) {
588
- cancelBody(selected.body, "using protocol-safe replacement stream");
589
- 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
+ }
590
962
  }
591
963
  }
592
964
  if (closed) {
593
- cancelBody(selected.body, "downstream cancelled before protocol preflight completed");
965
+ cancelBody(chosen.response.body, "downstream cancelled before protocol preflight completed");
594
966
  return;
595
967
  }
596
- reader = selected.body?.getReader();
968
+ selection = chosen;
597
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
+ }
598
1002
 
599
1003
  const body = new ReadableStream<Uint8Array>({
1004
+ start(controller) { output = controller; },
600
1005
  async pull(controller) {
601
1006
  try {
602
- initialization ??= initialize();
603
- 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
+ }
604
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();
605
1034
  if (!reader) {
606
1035
  closed = true;
1036
+ detach();
607
1037
  controller.close();
608
1038
  return;
609
1039
  }
@@ -611,6 +1041,7 @@ export function deferProtocolSafeResetRecovery(
611
1041
  if (closed) return;
612
1042
  if (next.done) {
613
1043
  closed = true;
1044
+ detach();
614
1045
  try { reader.releaseLock(); } catch { /* already released */ }
615
1046
  reader = undefined;
616
1047
  controller.close();
@@ -620,32 +1051,104 @@ export function deferProtocolSafeResetRecovery(
620
1051
  } catch (error) {
621
1052
  if (closed) return;
622
1053
  closed = true;
1054
+ detach();
623
1055
  try { reader?.releaseLock(); } catch { /* errored reader */ }
624
1056
  reader = undefined;
625
1057
  controller.error(error);
626
1058
  }
627
1059
  },
628
1060
  cancel(reason) {
629
- if (closed) return;
630
- closed = true;
631
- if (reader) {
632
- try { void reader.cancel(reason).catch(() => {}); } catch { /* already closed */ }
633
- try { reader.releaseLock(); } catch { /* already released */ }
634
- reader = undefined;
635
- } else if (initialization === undefined) {
636
- // Nothing has read the upstream yet, so this body is still ours to cancel.
637
- cancelBody(response.body, reason);
638
- }
639
- // A cancel while the preflight is mid-flight falls through deliberately. That body is
640
- // locked by the preflight's own reader, so cancelling it here would reject and be
641
- // swallowed; `initialize` sees `closed` when it settles and releases whichever body it
642
- // ended up selecting, which is the one that actually has to be let go.
1061
+ release(reason);
643
1062
  },
644
1063
  }, { highWaterMark: 0 });
645
-
646
- return new Response(body, {
1064
+ const held = carryResponseToolOwnership(response, new Response(body, {
647
1065
  status: response.status,
648
1066
  statusText: response.statusText,
649
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
+ });
650
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!;
651
1154
  }