@bitkyc08/opencodex 2.93.0 → 2.94.0

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 (435) hide show
  1. package/README.md +27 -8
  2. package/bin/ocx.mjs +215 -63
  3. package/gui/dist/assets/App-DmvwlhQq.js +58 -0
  4. package/gui/dist/assets/Tray-CZatQdoF.js +1 -0
  5. package/gui/dist/assets/index-3EPO_KbX.js +94 -0
  6. package/gui/dist/assets/index-CHWwDo9L.css +1 -0
  7. package/gui/dist/assets/{quota-summary-BXu4zE8H.js → quota-summary-BHvWg9mi.js} +1 -1
  8. package/gui/dist/index.html +2 -2
  9. package/gui/dist/provider-icons/t3code.svg +4 -0
  10. package/package.json +7 -4
  11. package/src/adapters/anthropic/account-metadata.ts +34 -3
  12. package/src/adapters/anthropic/beta-allowlist.ts +5 -5
  13. package/src/adapters/anthropic/passthrough.ts +5 -2
  14. package/src/adapters/anthropic.ts +17 -4
  15. package/src/adapters/antigravity-refusal.ts +29 -0
  16. package/src/adapters/base.ts +11 -1
  17. package/src/adapters/client-fingerprint.ts +43 -9
  18. package/src/adapters/coding-agent/protocol.ts +19 -9
  19. package/src/adapters/command-code.ts +4 -5
  20. package/src/adapters/cursor/catalog.ts +5 -3
  21. package/src/adapters/cursor/claude-id.ts +30 -19
  22. package/src/adapters/cursor/cursor-errors.ts +5 -2
  23. package/src/adapters/cursor/h2-pool.ts +9 -7
  24. package/src/adapters/cursor/http1-bidi.ts +1 -0
  25. package/src/adapters/cursor/live-models.ts +4 -2
  26. package/src/adapters/cursor.ts +4 -1
  27. package/src/adapters/devin/cloud-direct/chat.ts +18 -2
  28. package/src/adapters/google-antigravity-replay.ts +13 -2
  29. package/src/adapters/google-antigravity-wire.ts +8 -3
  30. package/src/adapters/google-errors.ts +33 -0
  31. package/src/adapters/google-http.ts +41 -16
  32. package/src/adapters/google-wire-compiler.ts +4 -0
  33. package/src/adapters/google.ts +21 -10
  34. package/src/adapters/kiro/adapter.ts +3 -0
  35. package/src/adapters/kiro/stream.ts +18 -13
  36. package/src/adapters/openai-chat/completed-tool-blocks.ts +65 -0
  37. package/src/adapters/openai-chat/messages.ts +22 -10
  38. package/src/adapters/openai-chat/required-tool-result.ts +3 -3
  39. package/src/adapters/openai-chat/serialized-tool-call-content.ts +5 -0
  40. package/src/adapters/openai-chat/wire.ts +9 -0
  41. package/src/adapters/openai-chat.ts +18 -17
  42. package/src/adapters/openai-responses/image-gen.ts +15 -1
  43. package/src/adapters/openai-responses/passthrough.ts +11 -34
  44. package/src/adapters/openai-responses/transport.ts +20 -2
  45. package/src/adapters/openai-responses/usage.ts +34 -0
  46. package/src/adapters/qoder/adapter.ts +9 -15
  47. package/src/adapters/qoder/image-input.ts +52 -0
  48. package/src/adapters/unique-tool-call-ids.ts +2 -2
  49. package/src/adapters/zed-additional-tools.ts +51 -0
  50. package/src/adapters/zed-diagnostic-usage.ts +22 -0
  51. package/src/adapters/zed-json-tokens.ts +166 -0
  52. package/src/adapters/zed-openai-stream.ts +723 -0
  53. package/src/adapters/zed-tool-arguments.ts +79 -0
  54. package/src/adapters/zed.ts +53 -3
  55. package/src/advisor/consult.ts +22 -0
  56. package/src/advisor/runtime.ts +3 -0
  57. package/src/bridge/errors.ts +22 -1
  58. package/src/bridge/response-json.ts +4 -1
  59. package/src/bridge/sse.ts +21 -12
  60. package/src/chat/inbound.ts +13 -2
  61. package/src/chatgpt/app-server-shim/bundle-trust-async.ts +111 -0
  62. package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +83 -0
  63. package/src/chatgpt/app-server-shim/bundle-trust.ts +15 -72
  64. package/src/claude/desktop-first-party.ts +16 -5
  65. package/src/claude/desktop-gateway-state.ts +4 -0
  66. package/src/claude/inbound-tool-loading.ts +93 -0
  67. package/src/claude/intercept/picker-listener.ts +33 -1
  68. package/src/claude/model-info.ts +29 -4
  69. package/src/claude/outbound.ts +33 -13
  70. package/src/cli/account-main.ts +43 -5
  71. package/src/cli/capabilities-base.ts +22 -5
  72. package/src/cli/capabilities-integrations.ts +4 -4
  73. package/src/cli/claude-desktop.ts +139 -98
  74. package/src/cli/codex-cli-update.ts +102 -48
  75. package/src/cli/codex-launch-auth.ts +93 -0
  76. package/src/cli/codex-launch-command.ts +32 -0
  77. package/src/cli/codex-launch-diagnostics.ts +37 -0
  78. package/src/cli/codex-launch-ownership.ts +307 -0
  79. package/src/cli/codex-launch-policy.ts +84 -0
  80. package/src/cli/codex-launcher.ts +310 -0
  81. package/src/cli/codex-shim-autorestore.ts +2 -0
  82. package/src/cli/config-command.ts +9 -4
  83. package/src/cli/config-mutation.ts +13 -0
  84. package/src/cli/dispatch.ts +13 -7
  85. package/src/cli/effort.ts +19 -14
  86. package/src/cli/ensure-desired-integrations.ts +21 -14
  87. package/src/cli/ensure-desktop-cold-start.ts +41 -10
  88. package/src/cli/export-command.ts +8 -4
  89. package/src/cli/help.ts +3 -1
  90. package/src/cli/index.ts +58 -64
  91. package/src/cli/integration-input.ts +12 -0
  92. package/src/cli/integration-plan-dto.ts +2 -0
  93. package/src/cli/integration-preview.ts +6 -3
  94. package/src/cli/integrations.ts +2 -1
  95. package/src/cli/link-cleanup.ts +8 -23
  96. package/src/cli/link-enrollment.ts +1 -4
  97. package/src/cli/link.ts +1 -1
  98. package/src/cli/loopback-family.ts +2 -31
  99. package/src/cli/models.ts +62 -49
  100. package/src/cli/provider.ts +146 -139
  101. package/src/cli/registry.ts +34 -3
  102. package/src/cli/root.ts +2 -0
  103. package/src/cli/start-owner-fence.ts +22 -3
  104. package/src/cli/status-link.ts +28 -0
  105. package/src/cli/status.ts +15 -0
  106. package/src/cli/stop-restore-guard.ts +48 -0
  107. package/src/cli/stop-restore.ts +117 -36
  108. package/src/cli/system-command.ts +2 -0
  109. package/src/cli/v2.ts +17 -4
  110. package/src/client/lifecycle-lock.ts +1 -1
  111. package/src/client/link-connection.ts +19 -0
  112. package/src/client/link-relay-transport.ts +25 -3
  113. package/src/client/link-tunnel.ts +10 -0
  114. package/src/client/machine-listener.ts +7 -1
  115. package/src/client/restore-ownership.ts +45 -0
  116. package/src/client/runtime.ts +13 -1
  117. package/src/client/state.ts +1 -1
  118. package/src/clients/client-ids.ts +7 -0
  119. package/src/clients/client-path.ts +13 -5
  120. package/src/clients/config-export/agent-clients.ts +3 -6
  121. package/src/clients/config-export/alias-selectors.ts +85 -0
  122. package/src/clients/config-export/contracts.ts +6 -25
  123. package/src/clients/config-export/dsh.ts +8 -1
  124. package/src/clients/config-export/model-metadata.ts +19 -0
  125. package/src/clients/config-export/model-names.ts +31 -0
  126. package/src/clients/config-export/qoder.ts +3 -11
  127. package/src/clients/config-export/t3code.ts +141 -0
  128. package/src/clients/config-export.ts +51 -15
  129. package/src/clients/gentle-shell-path.ts +3 -3
  130. package/src/codex/account-lifecycle.ts +27 -13
  131. package/src/codex/account-store.ts +32 -6
  132. package/src/codex/app-server-processes.ts +84 -1
  133. package/src/codex/auth-api/main-account-probe.ts +50 -11
  134. package/src/codex/auth-api/pool-mode-gate.ts +16 -8
  135. package/src/codex/auth-context.ts +45 -4
  136. package/src/codex/catalog/antigravity-discovery.ts +59 -0
  137. package/src/codex/catalog/build-entries.ts +12 -13
  138. package/src/codex/catalog/bundled.ts +59 -9
  139. package/src/codex/catalog/derive-entry.ts +2 -0
  140. package/src/codex/catalog/gather-capture.ts +3 -0
  141. package/src/codex/catalog/metadata.ts +6 -5
  142. package/src/codex/catalog/model-hints.ts +36 -4
  143. package/src/codex/catalog/native-priority.ts +63 -0
  144. package/src/codex/catalog/provider-models.ts +20 -4
  145. package/src/codex/catalog/retained-sync.ts +1 -1
  146. package/src/codex/chatgpt-refresh-failure.ts +2 -2
  147. package/src/codex/cli-install-provenance.ts +57 -29
  148. package/src/codex/cli-installation-identity.ts +1 -1
  149. package/src/codex/cli-installation-limits.ts +7 -0
  150. package/src/codex/cli-update-apply.ts +391 -0
  151. package/src/codex/cli-update-artifacts.ts +257 -0
  152. package/src/codex/cli-update-files.ts +100 -0
  153. package/src/codex/cli-update-inspection-context.ts +49 -0
  154. package/src/codex/cli-update-job-execution.ts +77 -0
  155. package/src/codex/cli-update-job-store-windows.ts +1010 -0
  156. package/src/codex/cli-update-job-worker.ts +393 -0
  157. package/src/codex/cli-update-job.ts +369 -0
  158. package/src/codex/cli-update-lease.ts +71 -0
  159. package/src/codex/cli-update-paths.ts +76 -0
  160. package/src/codex/cli-update-plan.ts +180 -47
  161. package/src/codex/cli-update-recovery.ts +236 -0
  162. package/src/codex/cli-update-selection-gate.ts +235 -0
  163. package/src/codex/cli-update-windows-apply.ts +308 -0
  164. package/src/codex/cli-update-windows-layout.ts +110 -0
  165. package/src/codex/cli-update-windows-observation.ts +91 -0
  166. package/src/codex/cli-update-windows-paths.ts +26 -0
  167. package/src/codex/cli-update-worker-recovery.ts +32 -0
  168. package/src/codex/cli-update-worker.ts +185 -0
  169. package/src/codex/cli-windows-plan-provenance.ts +250 -0
  170. package/src/codex/desktop-app-restart.ts +22 -3
  171. package/src/codex/exec-boundary.ts +208 -0
  172. package/src/codex/forward-transport-headers.ts +80 -0
  173. package/src/codex/history-job.ts +7 -0
  174. package/src/codex/history-provider.ts +5 -2
  175. package/src/codex/history-worker.ts +20 -1
  176. package/src/codex/inject/restore.ts +57 -25
  177. package/src/codex/internal/history-writer.ts +2 -1
  178. package/src/codex/mac-app-bundle.ts +52 -0
  179. package/src/codex/main-account.ts +161 -23
  180. package/src/codex/native-main-auth-temp.ts +3 -2
  181. package/src/codex/native-main-refresh-mode.ts +18 -3
  182. package/src/codex/native-profile-manager.ts +8 -6
  183. package/src/codex/native-profile-store.ts +9 -0
  184. package/src/codex/ocx-compaction-history.ts +3 -2
  185. package/src/codex/prompt-text-probe.ts +211 -69
  186. package/src/codex/quota.ts +9 -0
  187. package/src/codex/role-model-history.ts +253 -0
  188. package/src/codex/runtime.ts +120 -71
  189. package/src/codex/shim-overlay.ts +22 -3
  190. package/src/codex/shim-templates.ts +5 -2
  191. package/src/codex/shim-wrapper-write.ts +136 -0
  192. package/src/codex/shim.ts +24 -125
  193. package/src/codex/windows-cli-child-native.ts +119 -0
  194. package/src/codex/windows-cli-child-pipe.ts +87 -0
  195. package/src/codex/windows-cli-child.ts +260 -0
  196. package/src/codex/windows-cli-recovery-guardian.ts +89 -0
  197. package/src/codex/windows-cli-recovery.ts +39 -0
  198. package/src/codex/windows-installation-files.ts +52 -6
  199. package/src/codex/windows-npm-execution.ts +25 -0
  200. package/src/combos/failover.ts +84 -5
  201. package/src/combos/index.ts +1 -0
  202. package/src/combos/resolve.ts +60 -22
  203. package/src/config/atomic-write.ts +75 -22
  204. package/src/config/diagnostics.ts +18 -10
  205. package/src/config/live-reconcile.ts +11 -3
  206. package/src/config/owner-registry.ts +5 -4
  207. package/src/config/persist-unlocked.ts +34 -8
  208. package/src/config/persisted-mutation.ts +7 -0
  209. package/src/config/process-state.ts +9 -5
  210. package/src/config/removed-opencode-free-backup.ts +99 -0
  211. package/src/config/removed-opencode-free.ts +4 -8
  212. package/src/config/salvage.ts +1 -0
  213. package/src/config/schema/config-schema.ts +16 -1
  214. package/src/config/schema/leaf-validators.ts +15 -0
  215. package/src/config.ts +4 -4
  216. package/src/generated/compatibility-version.json +743 -315
  217. package/src/grok/inject.ts +2 -1
  218. package/src/grok/sync.ts +5 -2
  219. package/src/images/loop.ts +14 -5
  220. package/src/integrations/catalog-refresh.ts +1 -1
  221. package/src/integrations/hermes-refresh.ts +28 -0
  222. package/src/integrations/model-name-guard.ts +31 -0
  223. package/src/integrations/mutation-plan.ts +17 -4
  224. package/src/integrations/ownership.ts +3 -0
  225. package/src/integrations/registry.ts +10 -1
  226. package/src/integrations/state.ts +6 -0
  227. package/src/integrations/writer.ts +64 -59
  228. package/src/lib/abort.ts +8 -4
  229. package/src/lib/bounded-body.ts +7 -1
  230. package/src/lib/config-ownership.ts +4 -0
  231. package/src/lib/errors.ts +2 -0
  232. package/src/lib/eventstream-decoder.ts +3 -2
  233. package/src/lib/http-response-semantics.ts +9 -6
  234. package/src/lib/inbound-body-policy.ts +11 -0
  235. package/src/lib/jsonc.ts +7 -2
  236. package/src/lib/local-management-capability.ts +3 -1
  237. package/src/lib/local-upstream.ts +22 -26
  238. package/src/lib/loopback-family.ts +31 -0
  239. package/src/lib/plain-data.ts +7 -5
  240. package/src/lib/process-control.ts +30 -5
  241. package/src/lib/shadow-call.ts +55 -1
  242. package/src/lib/tool-argument-integers.ts +99 -7
  243. package/src/lib/upstream-retry.ts +6 -1
  244. package/src/lib/windows-elevation.ts +34 -11
  245. package/src/lib/windows-owner-acl.ts +272 -32
  246. package/src/lib/windows-secret-acl.ts +310 -44
  247. package/src/lib/windows-service-wrappers.ts +10 -7
  248. package/src/lib/winsw.ts +8 -4
  249. package/src/link/relay-auth.ts +38 -1
  250. package/src/link/remote-platform.ts +11 -23
  251. package/src/link/remote-probe.ts +3 -1
  252. package/src/link/remote-windows.ts +150 -0
  253. package/src/link/ssh-argv.ts +13 -5
  254. package/src/link/store.ts +4 -1
  255. package/src/link/supervisor.ts +9 -0
  256. package/src/local-credentials/generation.ts +238 -0
  257. package/src/local-credentials/inventory.ts +281 -0
  258. package/src/local-credentials/observation-lease.ts +83 -0
  259. package/src/local-credentials/publication-fence.ts +81 -0
  260. package/src/local-credentials/references.ts +36 -0
  261. package/src/local-credentials/runtime-observation.ts +28 -0
  262. package/src/oauth/account-auto-pause-policy.ts +11 -0
  263. package/src/oauth/anthropic-account-refusal.ts +1 -0
  264. package/src/oauth/anthropic-rate-limit-policy.ts +26 -2
  265. package/src/oauth/anthropic-routing.ts +34 -44
  266. package/src/oauth/anthropic-session-affinity-store.ts +177 -0
  267. package/src/oauth/chatgpt.ts +11 -9
  268. package/src/oauth/cursor.ts +8 -2
  269. package/src/oauth/generic-account-failover.ts +33 -2
  270. package/src/oauth/generic-session-affinity.ts +7 -0
  271. package/src/oauth/google-antigravity.ts +29 -5
  272. package/src/oauth/index.ts +1 -0
  273. package/src/oauth/store.ts +32 -4
  274. package/src/protocols/encoders/adapter-events.ts +7 -4
  275. package/src/protocols/encoders/messages.ts +1 -1
  276. package/src/providers/antigravity-account-roster.ts +73 -7
  277. package/src/providers/antigravity-models.ts +8 -4
  278. package/src/providers/api-key-resolve.ts +16 -3
  279. package/src/providers/claude-cli-identity.ts +2 -0
  280. package/src/providers/codex-capacity.ts +3 -2
  281. package/src/providers/free-directory.ts +10 -2
  282. package/src/providers/key-store.ts +7 -2
  283. package/src/providers/provider-id-rewrite.ts +3 -0
  284. package/src/providers/quota/antigravity.ts +6 -4
  285. package/src/providers/quota/vendor-probes-oauth.ts +0 -1
  286. package/src/providers/stale-model-roster-migration.ts +3 -0
  287. package/src/quota-pool/assemble.ts +51 -21
  288. package/src/quota-pool/pooled.ts +162 -0
  289. package/src/remote-control/workspace-codex-runtime.ts +63 -20
  290. package/src/responses/apply-patch-envelope.ts +35 -0
  291. package/src/responses/compaction-history-framing.ts +15 -4
  292. package/src/responses/turn-membership.ts +111 -0
  293. package/src/server/advisor-admission-scope.ts +43 -0
  294. package/src/server/audio-upstream.ts +10 -2
  295. package/src/server/auth-cors.ts +23 -0
  296. package/src/server/bind-host.ts +5 -0
  297. package/src/server/chat-completions.ts +17 -2
  298. package/src/server/chat-native.ts +16 -11
  299. package/src/server/claude-messages.ts +9 -1
  300. package/src/server/codex-model-list.ts +46 -0
  301. package/src/server/gui-session.ts +5 -2
  302. package/src/server/inbound-body-admission.ts +21 -13
  303. package/src/server/inbound-body-budget.ts +128 -0
  304. package/src/server/index/link-listener.ts +3 -1
  305. package/src/server/index/link-relay-sessions.ts +9 -2
  306. package/src/server/index/optional-listeners.ts +1 -0
  307. package/src/server/index/serve-options.ts +9 -43
  308. package/src/server/index/websocket-handler.ts +7 -0
  309. package/src/server/index.ts +6 -5
  310. package/src/server/inference/client-encoder-delivery.ts +3 -1
  311. package/src/server/lifecycle.ts +8 -1
  312. package/src/server/management/advisor-routes.ts +26 -9
  313. package/src/server/management/agent-settings-routes.ts +424 -543
  314. package/src/server/management/anthropic-reset-grant-routes.ts +2 -1
  315. package/src/server/management/claude-code-settings-patch.ts +211 -0
  316. package/src/server/management/claude-desktop-config-writers.ts +78 -0
  317. package/src/server/management/codex-agent-role-routes.ts +79 -2
  318. package/src/server/management/codex-cli-update-routes.ts +55 -0
  319. package/src/server/management/codex-prompt-routes.ts +2 -1
  320. package/src/server/management/config-routes.ts +444 -380
  321. package/src/server/management/consent-session.ts +6 -0
  322. package/src/server/management/desktop-compatibility-authorization.ts +12 -0
  323. package/src/server/management/desktop-compatibility-routes.ts +3 -2
  324. package/src/server/management/desktop-compatibility-runtime-routes.ts +2 -1
  325. package/src/server/management/desktop-compatibility-settings-routes.ts +2 -1
  326. package/src/server/management/integration-routes.ts +45 -5
  327. package/src/server/management/link-enrollment.ts +21 -32
  328. package/src/server/management/link-route-state.ts +1 -0
  329. package/src/server/management/link-routes.ts +4 -1
  330. package/src/server/management/model-routes.ts +22 -6
  331. package/src/server/management/model-rows.ts +3 -1
  332. package/src/server/management/native-integration-routes.ts +90 -38
  333. package/src/server/management/oauth-account-routes.ts +8 -7
  334. package/src/server/management/route-registry.ts +8 -3
  335. package/src/server/management/session-routes.ts +20 -2
  336. package/src/server/management/shadow-call-validation.ts +43 -2
  337. package/src/server/management/sidebar-routes.ts +2 -1
  338. package/src/server/management/system-restart.ts +47 -7
  339. package/src/server/management-api.ts +61 -51
  340. package/src/server/management-auth.ts +11 -3
  341. package/src/server/messages-native.ts +21 -7
  342. package/src/server/messages-shared.ts +110 -18
  343. package/src/server/persistent-gui-session.ts +155 -0
  344. package/src/server/port-reclaim.ts +29 -5
  345. package/src/server/proxy-liveness.ts +110 -33
  346. package/src/server/request-decompress.ts +5 -1
  347. package/src/server/responses/account-change-state.ts +14 -2
  348. package/src/server/responses/adapter-continuation.ts +5 -4
  349. package/src/server/responses/adapter-delivery.ts +20 -5
  350. package/src/server/responses/adapter-dispatch.ts +39 -45
  351. package/src/server/responses/advisor-plan-slot.ts +3 -0
  352. package/src/server/responses/advisor-slot.ts +4 -2
  353. package/src/server/responses/antigravity-model-denial-recovery.ts +70 -0
  354. package/src/server/responses/antigravity-validation-refusal.ts +6 -0
  355. package/src/server/responses/combo-required-tool-contract.ts +2 -1
  356. package/src/server/responses/combo-required-tool-fulfillments.ts +58 -0
  357. package/src/server/responses/combo-required-tool-stream.ts +119 -0
  358. package/src/server/responses/combo-stream-preflight.ts +47 -7
  359. package/src/server/responses/compact.ts +14 -7
  360. package/src/server/responses/compaction-recovery.ts +2 -1
  361. package/src/server/responses/core-auth.ts +2 -1
  362. package/src/server/responses/core-codex-account.ts +1 -0
  363. package/src/server/responses/core-combo-failure.ts +11 -6
  364. package/src/server/responses/core-combo-native.ts +6 -5
  365. package/src/server/responses/core-combo.ts +93 -20
  366. package/src/server/responses/core-options.ts +7 -0
  367. package/src/server/responses/fetch-helpers.ts +5 -1
  368. package/src/server/responses/jev-model-invoke.ts +8 -3
  369. package/src/server/responses/memory-models.ts +3 -2
  370. package/src/server/responses/passthrough-delivery.ts +36 -8
  371. package/src/server/responses/passthrough-dispatch.ts +12 -12
  372. package/src/server/responses/request-prepare.ts +10 -1
  373. package/src/server/responses/request-transport.ts +41 -6
  374. package/src/server/responses/run-turn-execution.ts +11 -3
  375. package/src/server/responses/sidecar-execution.ts +5 -0
  376. package/src/server/responses/turn-membership.ts +30 -0
  377. package/src/server/responses-custom-tool-repair.ts +86 -11
  378. package/src/server/responses-image-gen-repair.ts +1 -1
  379. package/src/server/restart-parent-ownership.ts +49 -0
  380. package/src/server/stop-teardown.ts +46 -9
  381. package/src/server/windows-tcp-drop.ts +4 -2
  382. package/src/service/desktop-recovery-process.ts +341 -0
  383. package/src/service/desktop-recovery.ts +172 -0
  384. package/src/service/windows-ops.ts +6 -3
  385. package/src/service/windows-scheduler.ts +29 -6
  386. package/src/stall-timeout.ts +47 -0
  387. package/src/tray/windows.ts +6 -4
  388. package/src/types/config.ts +61 -10
  389. package/src/types/request.ts +1 -1
  390. package/src/types.ts +1 -0
  391. package/src/update/async-check.ts +4 -3
  392. package/src/update/bind-probe.ts +2 -2
  393. package/src/update/codex-cli-update-launch-policy.mjs +9 -0
  394. package/src/update/guarded-port-reclaim.ts +14 -0
  395. package/src/update/guarded-runtime-ops.ts +58 -0
  396. package/src/update/guarded-tray-ops.ts +9 -0
  397. package/src/update/index.ts +196 -58
  398. package/src/update/job-pinned-start.ts +53 -0
  399. package/src/update/job-supervised-restart.ts +23 -6
  400. package/src/update/job-update-home.ts +62 -0
  401. package/src/update/job-update-tray.ts +29 -0
  402. package/src/update/job-windows-restart.ts +39 -0
  403. package/src/update/job.ts +179 -193
  404. package/src/update/mutation-guard.d.mts +30 -0
  405. package/src/update/mutation-guard.mjs +103 -0
  406. package/src/update/notify.ts +2 -2
  407. package/src/update/npm-cache-preflight.mjs +4 -4
  408. package/src/update/npm-install.mjs +5 -3
  409. package/src/update/pnpm-read-policy.mjs +3 -2
  410. package/src/update/proxy-liveness-probe.mjs +2 -2
  411. package/src/update/service-home-authority.ts +35 -0
  412. package/src/update/service-home-package-only-protocol.json +1 -0
  413. package/src/update/service-home-policy.d.mts +25 -0
  414. package/src/update/service-home-policy.mjs +112 -0
  415. package/src/update/service-home-probe-entry.ts +9 -0
  416. package/src/update/service-home-probe.d.mts +15 -0
  417. package/src/update/service-home-probe.mjs +79 -0
  418. package/src/update/service-home-protocol.json +1 -0
  419. package/src/update/supervised-recovery.d.mts +2 -2
  420. package/src/update/supervised-recovery.mjs +14 -7
  421. package/src/update/transactional-install.d.mts +3 -1
  422. package/src/update/transactional-install.mjs +29 -19
  423. package/src/update/update-failure-guidance.mjs +1 -1
  424. package/src/update/worker-launch.ts +3 -3
  425. package/src/vision/anthropic-describe.ts +2 -1
  426. package/src/web-search/anthropic-executor.ts +2 -1
  427. package/src/web-search/anthropic-history.ts +1 -0
  428. package/src/web-search/format-result.ts +3 -2
  429. package/src/web-search/header-deadline.ts +3 -2
  430. package/src/web-search/loop.ts +10 -4
  431. package/src/web-search/parse.ts +191 -38
  432. package/gui/dist/assets/App-CizjBqyk.js +0 -58
  433. package/gui/dist/assets/Tray-DamiMqcX.js +0 -1
  434. package/gui/dist/assets/index-DQsht3vH.js +0 -94
  435. package/gui/dist/assets/index-DRe8Hhfz.css +0 -1
@@ -2,13 +2,18 @@ import { codexAccountModelRefusal, codexAccountModelRefusalPayload, hasConflicti
2
2
  import type { ResponsesTerminalStatus } from "../../bridge";
3
3
  import { comboFailureDecision } from "../../combos";
4
4
  import { httpStatusFromTerminalError } from "../../lib/errors";
5
+ import { hasResponseMediaType } from "../../lib/http-response-semantics";
5
6
  import type { RequestFailureStage } from "../../lib/request-failure-model";
6
7
  import type { RequestLogContext } from "../request-log";
7
8
  import { carryResponseToolOwnership } from "./response-tool-ownership";
8
9
  import { createSseInspector } from "../relay";
9
10
  import { MAX_CLIENT_SSE_FRAME_BYTES } from "../sse-frame-buffer";
11
+ import { REQUIRED_TOOL_CONTRACT_CODE } from "../../lib/errors";
12
+ import { requiredToolReasoningPrelude } from "./combo-required-tool-stream";
10
13
 
11
14
  const COMBO_STREAM_PREFLIGHT_MAX_BYTES = MAX_CLIENT_SSE_FRAME_BYTES;
15
+ // Required-tool reasoning may delay delivery, but never for an unbounded/trickling prelude.
16
+ const COMBO_REQUIRED_TOOL_REASONING_HOLD_MS = 1_000;
12
17
  // Keep retained object count proportional to the same byte budget used by the
13
18
  // shared SSE framer. Tiny or empty upstream reads must not bypass the byte cap.
14
19
  const COMBO_STREAM_PREFLIGHT_MAX_CHUNKS = Math.max(
@@ -123,7 +128,9 @@ function retryableZeroOutputTerminal(payload: unknown): boolean {
123
128
  };
124
129
  if (bareErrorIsRetryable(event)) return true;
125
130
  if (event.type === "response.failed") {
126
- const code = (event.response as { error?: { code?: unknown } } | undefined)?.error?.code;
131
+ const error = (event.response as { error?: { code?: unknown; retryable?: unknown } } | undefined)?.error;
132
+ const code = error?.code;
133
+ if (code === REQUIRED_TOOL_CONTRACT_CODE && error?.retryable === false) return false;
127
134
  return !(typeof code === "string" && NON_REPLAYABLE_FAILED_CODES.has(code));
128
135
  }
129
136
  if (event.type !== "response.incomplete") return false;
@@ -188,6 +195,7 @@ function replayBufferedResponse(
188
195
  response: Response,
189
196
  reader: ReadableStreamDefaultReader<Uint8Array>,
190
197
  buffered: Uint8Array[],
198
+ pendingRead?: ReturnType<typeof reader.read>,
191
199
  ): Response {
192
200
  let index = 0;
193
201
  const body = new ReadableStream<Uint8Array>({
@@ -197,7 +205,8 @@ function replayBufferedResponse(
197
205
  return;
198
206
  }
199
207
  try {
200
- const next = await reader.read();
208
+ const next = await (pendingRead ?? reader.read());
209
+ pendingRead = undefined;
201
210
  if (next.done) controller.close();
202
211
  else controller.enqueue(next.value);
203
212
  } catch (error) {
@@ -285,22 +294,27 @@ export async function preflightComboStreamResponse(
285
294
  response: Response,
286
295
  logCtx: RequestLogContext,
287
296
  retryableTerminal: (payload: unknown) => boolean = retryableZeroOutputTerminal,
288
- options?: { allowMissingContentType?: boolean; replayReadErrors?: boolean },
297
+ options?: { allowMissingContentType?: boolean; replayReadErrors?: boolean; requiredToolPrelude?: boolean; signal?: AbortSignal },
289
298
  ): Promise<ComboStreamPreflightResult> {
290
- const contentType = response.headers.get("content-type")?.toLowerCase() ?? "";
291
- const isEventStream = contentType.includes("text/event-stream")
299
+ const contentType = response.headers.get("content-type");
300
+ const isEventStream = hasResponseMediaType(response.headers, "text/event-stream")
292
301
  || (!contentType && options?.allowMissingContentType === true);
293
302
  if (!response.ok || !response.body || !isEventStream) {
294
303
  return { kind: "accepted", response };
295
304
  }
296
305
 
297
306
  const reader = response.body.getReader();
307
+ const cancelRead = () => { reader.cancel(options?.signal?.reason).catch(() => undefined); };
308
+ if (options?.signal?.aborted) cancelRead();
309
+ else options?.signal?.addEventListener("abort", cancelRead, { once: true });
298
310
  const buffered: Uint8Array[] = [];
299
311
  let bufferedBytes = 0;
300
312
  let outputCommitted = false;
301
313
  let responseCreated = false;
302
314
  let terminalStatus: ResponsesTerminalStatus | undefined;
303
315
  let retryableTerminalPayload: Record<string, unknown> | undefined;
316
+ let holdTimer: ReturnType<typeof setTimeout> | undefined;
317
+ let holdDeadline: Promise<"hold-expired"> | undefined;
304
318
  const inspector = createSseInspector({
305
319
  logCtx,
306
320
  // A payload the inspector could not parse still reached this proxy, and it may be output.
@@ -315,7 +329,22 @@ export async function preflightComboStreamResponse(
315
329
  && !Array.isArray(payload) && (payload as { type?: unknown }).type === "error";
316
330
  // A zero-output bare error is terminal evidence. Explicit client errors stay
317
331
  // committed; unknown and retryable upstream failures may advance the combo.
318
- if (comboStreamPayloadCommitsOutput(payload) && !matchedBareError) outputCommitted = true;
332
+ const heldReasoning = options?.requiredToolPrelude && requiredToolReasoningPrelude(payload);
333
+ if (heldReasoning) holdDeadline ??= new Promise(resolve => {
334
+ holdTimer = setTimeout(() => resolve("hold-expired"), COMBO_REQUIRED_TOOL_REASONING_HOLD_MS);
335
+ });
336
+ if (comboStreamPayloadCommitsOutput(payload) && !matchedBareError && !heldReasoning) outputCommitted = true;
337
+ if (options?.requiredToolPrelude && payload && typeof payload === "object") {
338
+ const event = payload as { type?: unknown; response?: { output?: unknown; error?: { code?: unknown; retryable?: unknown } } };
339
+ const output = event.response?.output;
340
+ const contractFailure = event.type === "response.failed" && event.response?.error?.code === REQUIRED_TOOL_CONTRACT_CODE
341
+ && event.response.error.retryable !== false && Array.isArray(output) && output.every(item =>
342
+ item !== null && typeof item === "object" && !Array.isArray(item)
343
+ && ["message", "reasoning"].includes((item as { type: string }).type));
344
+ // Other lifecycle/terminal snapshots can hide effects too. Only our checked contract
345
+ // failure may discard a terminal-only text snapshot that was held in its entirety.
346
+ if (output !== undefined && (!Array.isArray(output) || output.length > 0) && !contractFailure) outputCommitted = true;
347
+ }
319
348
  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return;
320
349
  if (retryable) retryableTerminalPayload = payload as Record<string, unknown>;
321
350
  },
@@ -324,9 +353,18 @@ export async function preflightComboStreamResponse(
324
353
 
325
354
  try {
326
355
  for (;;) {
356
+ options?.signal?.throwIfAborted();
327
357
  let next: Awaited<ReturnType<typeof reader.read>>;
328
358
  try {
329
- next = await reader.read();
359
+ const pendingRead = reader.read();
360
+ const observed = await (holdDeadline ? Promise.race([pendingRead, holdDeadline]) : pendingRead);
361
+ options?.signal?.throwIfAborted();
362
+ if (observed === "hold-expired") {
363
+ // Expiry commits this child. Hand the in-flight read to the relay so its
364
+ // eventual chunk/error is delivered exactly once, never lost to the race.
365
+ return { kind: "accepted", response: replayBufferedResponse(response, reader, buffered, pendingRead) };
366
+ }
367
+ next = observed;
330
368
  } catch (error) {
331
369
  if (!options?.replayReadErrors) throw error;
332
370
  // The native relay still owns post-header transport failures. Preserve
@@ -372,6 +410,8 @@ export async function preflightComboStreamResponse(
372
410
  }
373
411
  }
374
412
  } finally {
413
+ if (holdTimer !== undefined) clearTimeout(holdTimer);
414
+ options?.signal?.removeEventListener("abort", cancelRead);
375
415
  inspector.dispose();
376
416
  }
377
417
  }
@@ -1,6 +1,7 @@
1
1
  import { captureAccountAutoPauseAttempt, wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
2
2
  import { spendLedgerStorageErrorResponse } from "./spend-storage-error";
3
3
  import { createPhysicalSendReporter, rebindPhysicalSend } from "../../lib/request-execution-budget";
4
+ import { hasResponseMediaType } from "../../lib/http-response-semantics";
4
5
  import { createInferenceSendBudget } from "../inference/context";
5
6
  import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
6
7
  import { capturePoolQuotaWriter } from "../../codex/account-store";
@@ -80,6 +81,7 @@ import {
80
81
  } from "../../codex/auth-context";
81
82
  import {
82
83
  forceRefreshMainAccountToken,
84
+ mainAccountTokenQuotaWriter,
83
85
  type NativeMainRefreshDependencies,
84
86
  } from "../../codex/main-account";
85
87
  import {
@@ -179,7 +181,7 @@ import { codexAccountSelectionForTurn, registerTurn, trackStreamLifetime, unregi
179
181
  import type { AdmissionLease } from "../../lib/admission";
180
182
  import { redactSecretString } from "../../lib/redact";
181
183
  import { readBoundedResponseBytes } from "../../lib/bounded-body";
182
- import { resolveStallTimeoutMs } from "../../stall-timeout";
184
+ import { resolveConnectTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
183
185
  import { isLocalUpstream } from "../../lib/local-upstream";
184
186
  import { isRateLimitOrQuotaFailureMessage } from "../../lib/errors";
185
187
  import { supportedLadderFor } from "../effort-policy";
@@ -371,6 +373,7 @@ async function refreshNativeMainCompactContext(args: {
371
373
  ...authCtx,
372
374
  accessToken: refreshed.accessToken,
373
375
  chatgptAccountId: refreshed.chatgptAccountId,
376
+ mainQuotaWriter: mainAccountTokenQuotaWriter(refreshed) ?? authCtx.mainQuotaWriter,
374
377
  };
375
378
  const refreshedProvider = applyCodexAuthContextToProvider(
376
379
  stripCodexRuntimeProviderFields(provider),
@@ -1051,7 +1054,7 @@ export async function handleResponsesCompact(
1051
1054
  }
1052
1055
  compactHostAdmissionLease = null;
1053
1056
  };
1054
- const connectMs = config.connectTimeoutMs ?? 200_000;
1057
+ const connectMs = () => resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(compactUrl) });
1055
1058
  // Takes its context explicitly: the alternate-account flow below records a rejection
1056
1059
  // against A while promoting B, then records B's own outcome. A closure over a single
1057
1060
  // `authCtx` cannot express either.
@@ -1172,7 +1175,9 @@ export async function handleResponsesCompact(
1172
1175
  body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }),
1173
1176
  }, upstreamRecovery),
1174
1177
  req.signal,
1175
- connectMs,
1178
+ // Keyed sends can refresh their destination after pacing. Their physical send below
1179
+ // owns the header clock; the outer wrapper owns pacing and client cancellation only.
1180
+ sendProvider.authMode !== "forward" && sendProvider.apiKey ? 0 : connectMs(),
1176
1181
  false,
1177
1182
  providerFetch(sendProvider, undefined, {
1178
1183
  providerName: route.providerName,
@@ -1216,10 +1221,12 @@ export async function handleResponsesCompact(
1216
1221
  if (!rebindPhysicalSend(sendBudget, { poolId: logCtx.spendPoolId ?? route.providerName,
1217
1222
  identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(safeHostLabel(compactUrl));
1218
1223
  noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
1219
- return sendWithConnectionPolicy(
1220
- distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), compactUrl,
1224
+ const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
1225
+ distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), String(input),
1226
+ physicalInit, { providerName: route.providerName, provider: sendProvider })) as typeof fetch;
1227
+ return fetchWithHeaderTimeout(compactUrl,
1221
1228
  { ...init, headers: sendHeaders, body: JSON.stringify({ ...buildCompactSendBody() as typeof compactBody, model: route.modelId }) },
1222
- { providerName: route.providerName, provider: sendProvider });
1229
+ init.signal ?? req.signal, connectMs(), false, physicalFetch);
1223
1230
  } : undefined,
1224
1231
  ...(onPhysicalDispatch ? { onPhysicalDispatch } : {}),
1225
1232
  }),
@@ -1739,7 +1746,7 @@ export async function handleResponsesCompact(
1739
1746
  }
1740
1747
  if (!response.ok) return response;
1741
1748
  let json: { output?: unknown[]; status?: unknown; error?: unknown };
1742
- if (response.headers.get("content-type")?.includes("text/event-stream")) {
1749
+ if (hasResponseMediaType(response.headers, "text/event-stream")) {
1743
1750
  if (!response.body) {
1744
1751
  return formatErrorResponse(502, "server_error", "compaction turn returned an empty event stream");
1745
1752
  }
@@ -5,6 +5,7 @@ import { copyPlainData } from "../../lib/plain-data";
5
5
  import { jsonUtf8Bytes } from "../../lib/json-byte-size";
6
6
  import type { TranslatorBudget } from "../../lib/translator-budget";
7
7
  import { readBoundedResponseBytes } from "../../lib/bounded-body";
8
+ import { hasResponseMediaType } from "../../lib/http-response-semantics";
8
9
  import { isRequestExecutionBudget, type RequestExecutionBudget, type SingleUseDispatchPermit } from "../../lib/request-execution-budget";
9
10
  import { isNonReplayableResponse, isNonReplayableUpstreamCode, markResponseNonReplayable, TRANSIENT_RETRY_MAX_ATTEMPTS } from "../../lib/upstream-retry";
10
11
  import { isCyberPolicyCode, isTerminalRefusalCode } from "../../lib/errors";
@@ -162,7 +163,7 @@ export async function runWithCompactionRecovery(
162
163
  const originalModel = firstOptions.compactionRoutingOverride?.sourceModel ?? String(snapshot.model);
163
164
  // Use the established protocol commit boundary. For runTurn streams the direct event
164
165
  // observer additionally preserves side-effect heartbeats that the bridge does not publish.
165
- if (response.ok && response.headers.get("content-type")?.includes("text/event-stream")) {
166
+ if (response.ok && hasResponseMediaType(response.headers, "text/event-stream")) {
166
167
  const native = isNativePassthroughSseResponse(response);
167
168
  const eager = isEagerRelaySseResponse(response);
168
169
  const preflight = await preflightComboStreamResponse(response, logCtx);
@@ -42,7 +42,7 @@ import type { RequestLogContext } from "../request-log";
42
42
  import { markLocalRequestLogRefusal } from "../request-log";
43
43
  import { CODEX_POOL_REFRESH_INCOMPLETE_LOG_REASON } from "../../codex/pool-refresh-backoff";
44
44
  import { codexAuthContextLogLabel } from "../../codex/account-label";
45
- import { forceRefreshMainAccountToken } from "../../codex/main-account";
45
+ import { forceRefreshMainAccountToken, mainAccountTokenQuotaWriter } from "../../codex/main-account";
46
46
  import { rebindPoolCreditPolicy } from "../../codex/pool-credit-policy";
47
47
  import { safeCallerSessionId } from "../caller-session-identity";
48
48
  import { copyResponsesClientMetadata } from "../../adapters/openai-responses/transport";
@@ -578,6 +578,7 @@ export async function refreshNativeMainForwardAuth(args: {
578
578
  ...authCtx,
579
579
  accessToken: refreshed.accessToken,
580
580
  chatgptAccountId: refreshed.chatgptAccountId,
581
+ mainQuotaWriter: mainAccountTokenQuotaWriter(refreshed) ?? authCtx.mainQuotaWriter,
581
582
  };
582
583
  const provider = applyCodexAuthContextToProvider(
583
584
  stripCodexRuntimeProviderFields(route.provider),
@@ -918,6 +918,7 @@ export async function retryCodexPoolOnAlternateAccount(
918
918
  if (binding) {
919
919
  applyAccountChangeConversationStateScrub({
920
920
  body: parsed._rawBody,
921
+ headers: retryHeaders,
921
922
  parsed,
922
923
  preserveReasoningEncryptedContent: isCanonicalOpenAiForwardProvider(retryProvider)
923
924
  && parsed._nativeReasoningRetention?.accountSwitch === true,
@@ -18,8 +18,9 @@ import {
18
18
  import { normalizeUpstreamErrorText } from "./core-errors";
19
19
  import { resolveClientRetryAfter } from "../../lib/retry-after";
20
20
  import { formatErrorResponse } from "../../bridge";
21
+ import { upstreamCodeForComboFailure } from "../../bridge/errors";
21
22
  import { OLLAMA_LATE_ATTRIBUTION_LIMIT_MESSAGE } from "../../adapters/ollama-native";
22
- import { isNonReplayableResponse, markResponseNonReplayable } from "../../lib/upstream-retry";
23
+ import { carryReplayRefusal, isNonReplayableResponse, isReplayRefusalResponse, markResponseNonReplayable, UPSTREAM_RESET_REPLAY_REFUSED_CODE } from "../../lib/upstream-retry";
23
24
  import { MODEL_NOT_ALLOWED_FOR_KEY } from "../admission-model-scope";
24
25
  import { usageFromResponsesPayload } from "../request-log";
25
26
  import type { ResponsesTerminalStatus } from "../../bridge";
@@ -41,6 +42,7 @@ export async function consumeComboFailure(
41
42
  // Read before the body: the marker lives on this Response object, and the failure below is
42
43
  // rebuilt as a new one that would otherwise lose it.
43
44
  const nonReplayable = isNonReplayableResponse(response);
45
+ const replayRefusal = isReplayRefusalResponse(response);
44
46
  const fallback = `Provider error ${response.status}`;
45
47
  let classificationText = fallback;
46
48
  let codexModelRefusal: CodexAccountModelRefusal | undefined;
@@ -76,7 +78,8 @@ export async function consumeComboFailure(
76
78
  const normalized = normalizeUpstreamErrorText(body.text, fallback);
77
79
  if (utf8Trusted || isCyberPolicyCode(normalized.code) || isCyberPolicyMessage(normalized.safeText)) {
78
80
  classificationText = normalized.safeText;
79
- upstreamCode = codexAccountModelRefusalHardStopCode(response.status, body.text) ?? normalized.code;
81
+ upstreamCode = codexAccountModelRefusalHardStopCode(response.status, body.text)
82
+ ?? upstreamCodeForComboFailure(response, normalized.code);
80
83
  // Only the adapter's own normalized refusal may claim the plan-refusal hop; another
81
84
  // upstream echoing the code in any spelling keeps the meaning it had before, which was none.
82
85
  if (namesModelNotInPlanCode(upstreamCode) && !isModelNotInPlanRefusal(response, upstreamCode)) upstreamCode = undefined;
@@ -93,7 +96,8 @@ export async function consumeComboFailure(
93
96
  classificationText = fallback;
94
97
  }
95
98
  const cyberFailure = isCyberPolicyCode(upstreamCode) || isCyberPolicyMessage(classificationText);
96
- const normalizedUpstreamCode = cyberFailure ? CYBER_POLICY_ERROR_CODE : upstreamCode;
99
+ const normalizedUpstreamCode = cyberFailure ? CYBER_POLICY_ERROR_CODE
100
+ : replayRefusal ? UPSTREAM_RESET_REPLAY_REFUSED_CODE : upstreamCode;
97
101
  const message = cyberFailure
98
102
  ? upstreamMessage
99
103
  ?? (isCyberPolicyCode(upstreamCode) ? CYBER_POLICY_FALLBACK_MESSAGE : classificationText)
@@ -109,13 +113,13 @@ export async function consumeComboFailure(
109
113
  : upstreamRetryAfter;
110
114
  // Client response may get the synthetic "2" fallback; cooldown metadata must not —
111
115
  // otherwise coolComboTarget treats it as a 2s cooldown instead of the 60s default.
112
- const clientRetryAfter = resolveClientRetryAfter({
116
+ const clientRetryAfter = replayRefusal ? undefined : resolveClientRetryAfter({
113
117
  status: response.status,
114
118
  message,
115
119
  upstreamRetryAfter: effectiveRetryAfter,
116
120
  now,
117
121
  });
118
- const cooldownRetryAfter = resolveClientRetryAfter({
122
+ const cooldownRetryAfter = replayRefusal ? undefined : resolveClientRetryAfter({
119
123
  status: response.status,
120
124
  message,
121
125
  upstreamRetryAfter: effectiveRetryAfter,
@@ -134,6 +138,7 @@ export async function consumeComboFailure(
134
138
  },
135
139
  );
136
140
  if (nonReplayable) markResponseNonReplayable(failureResponse);
141
+ carryReplayRefusal(response, failureResponse);
137
142
  if (verifiedPlanRefusal) markVerifiedModelNotInPlanResponse(failureResponse);
138
143
  carryAnthropicRefusalCredential(response, failureResponse);
139
144
  return {
@@ -150,7 +155,7 @@ export async function consumeComboFailure(
150
155
  // refusal in a 5xx still carries `x-codex-*-reset-at`, and gating on 402/429 alone threw
151
156
  // those away, so the combo target came back up immediately instead of waiting for the
152
157
  // window it was told about. `cyberFailure` stays excluded: a policy block is not a quota.
153
- ...(!cyberFailure
158
+ ...(!cyberFailure && !replayRefusal
154
159
  && (response.status === 429 || response.status === 402 || quotaConfirmedByBody)
155
160
  ? { resetAt: codexQuotaOutcomeMeta(response).resetAt }
156
161
  : {}),
@@ -16,7 +16,7 @@
16
16
  */
17
17
  import type { OcxConfig } from "../../types";
18
18
  import type { RouteResult } from "../../router";
19
- import type { DataPlaneAdmission } from "../auth-cors";
19
+ import type { AdmissionModelScope } from "../admission-model-scope";
20
20
  import type { AdmissionLease } from "../../lib/admission";
21
21
  import type { RequestExecutionBudget, SingleUseDispatchPermit } from "../../lib/request-execution-budget";
22
22
  import type { TransientSendBudget } from "../../lib/upstream-retry";
@@ -38,7 +38,7 @@ import { applyDroidReasoningDefault } from "../droid-reasoning-default";
38
38
  import { resolveWireProtocolOverride } from "../adapter-resolve";
39
39
  import { resolveOpenCodeGoTransport } from "../../providers/opencode-go-transport";
40
40
  import { getOrAllocateRequestSessionLane } from "../request-log-conversation";
41
- import { assertRouteAllowedByScope, resolveAdmissionModelScope } from "../admission-model-scope";
41
+ import { assertRouteAllowedByScope } from "../admission-model-scope";
42
42
  import { isNativeChatRouteEligible } from "../chat-native-eligibility";
43
43
  import { chatCompletionsErrorResponse } from "../../chat/outbound";
44
44
  import { isRequestExecutionBudget } from "../../lib/request-execution-budget";
@@ -108,12 +108,13 @@ export function createComboProtocolLanes(input: {
108
108
  req: Request;
109
109
  config: OcxConfig;
110
110
  logCtx: RequestLogContext;
111
- admission: DataPlaneAdmission | undefined;
111
+ /** The request's resolved model-scope snapshot; internal callers carry the caller's scope. */
112
+ admissionScope: AdmissionModelScope | undefined;
112
113
  droidDefaultEffort?: string;
113
114
  comboId: string;
114
115
  targets: readonly ComboTarget[];
115
116
  }): ComboProtocolLanes | undefined {
116
- const { source, req, config, logCtx, admission, droidDefaultEffort, comboId, targets } = input;
117
+ const { source, req, config, logCtx, admissionScope, droidDefaultEffort, comboId, targets } = input;
117
118
  if (!source) return undefined;
118
119
  const envelope = source.envelope;
119
120
  const reject = resolveProtocolSettings(config).unrepresentable === "reject";
@@ -125,7 +126,7 @@ export function createComboProtocolLanes(input: {
125
126
  const settle = (target: ComboTarget, targetRoute: RouteResult): RouteResult | undefined => {
126
127
  try {
127
128
  const route: RouteResult = { ...targetRoute };
128
- assertRouteAllowedByScope(resolveAdmissionModelScope(config, admission), selector(target), route);
129
+ assertRouteAllowedByScope(admissionScope, selector(target), route);
129
130
  const routedProvider = route.provider;
130
131
  route.staticPolicy = captureRouteStaticPolicy(
131
132
  route.providerName, route.modelId, routedProvider, route.staticPolicy.effectiveAlias, "chat",
@@ -35,6 +35,7 @@ import {
35
35
  comboExclusionReasons,
36
36
  comboTargetSkipTrigger,
37
37
  noteComboSuccess,
38
+ settleComboReprobeSuccess,
38
39
  comboFailureDecision,
39
40
  advanceComboAfterFailure,
40
41
  comboFailureCooldownScope,
@@ -113,9 +114,11 @@ import {
113
114
  markEagerRelaySseResponse,
114
115
  } from "../relay";
115
116
  import { preflightComboStreamResponse } from "./combo-stream-preflight";
117
+ import { requiredToolContractOf } from "./combo-required-tool-contract";
116
118
  import { streamingContextOverflowResponse, jsonContextOverflowResponse, lateAttributionLimitResponse } from "./context-overflow";
117
119
  import { mandatoryResponsesReasoningReplayUnavailable } from "./core-replay";
118
- import { settleOperatorReplacement } from "../../lib/upstream-retry";
120
+ import { isReplayRefusalResponse, settleOperatorReplacement, UPSTREAM_RESET_REPLAY_REFUSED_CODE } from "../../lib/upstream-retry";
121
+ import { attributeFinalRequest } from "../request-log-failure-attribution";
119
122
  import { createComboProtocolLanes, dispatchNativeComboChild } from "./core-combo-native";
120
123
  import { createJevModelInvoker } from "./jev-model-invoke";
121
124
  import { comboRequestedEffortLabel } from "./combo-requested-effort";
@@ -319,19 +322,23 @@ interface JevComboChoice {
319
322
  candidate: JevCandidate;
320
323
  }
321
324
 
322
- /** Enumerate the current ordinary Combo eligibility set without retaining attempted picks. */
325
+ /** Enumerate this request's eligible targets without reserving another recovery pass. */
323
326
  function eligibleJevComboChoices(
324
327
  config: OcxConfig,
325
328
  comboId: string,
326
329
  eligible: (target: NonNullable<ReturnType<typeof getCombo>>["targets"][number]) => boolean,
327
330
  now: number,
331
+ cooldownReprobeTargets?: ComboPick["cooldownReprobeTargets"],
328
332
  ): JevComboChoice[] {
329
333
  const combo = getCombo(config, comboId);
330
334
  if (!combo) return [];
331
335
  const excluded = new Set<string>();
332
336
  const choices: JevComboChoice[] = [];
337
+ const reserved = cooldownReprobeTargets ? Object.entries(cooldownReprobeTargets) : undefined;
333
338
  while (excluded.size < combo.targets.length) {
334
- const pick = pickComboTarget(config, comboId, { exclude: excluded, eligible, now });
339
+ const pick = pickComboTarget(config, comboId, {
340
+ exclude: excluded, eligible, now, allowCooldownReprobe: false, cooldownReprobeTargets: reserved,
341
+ });
335
342
  if (!pick) break;
336
343
  const key = targetKey(pick.target);
337
344
  excluded.add(key);
@@ -388,6 +395,10 @@ export async function executeComboResponses(
388
395
  // result after its provisional Authorization is removed, including an explicitly keyless result.
389
396
  const replayPrincipal = options.replayPrincipal
390
397
  ?? { clientPrincipalId: resolveContextPrincipal(req, config, options.admission) };
398
+ // The caller's model scope, resolved once from the request options. A capability-authenticated
399
+ // internal request carries the caller's captured scope on options.admissionScope even though
400
+ // its own admission is the host's broad key; recomputing from options.admission would lose it.
401
+ const admissionScope = options.admissionScope ?? resolveAdmissionModelScope(config, options.admission);
391
402
  // PF-07: present only for a Chat combo with `nativeChatCombos` on; otherwise every child
392
403
  // takes the bridge below exactly as before.
393
404
  const protocolLanes = createComboProtocolLanes({
@@ -395,7 +406,7 @@ export async function executeComboResponses(
395
406
  req,
396
407
  config,
397
408
  logCtx,
398
- admission: options.admission,
409
+ admissionScope,
399
410
  droidDefaultEffort: options.droidDefaultEffort,
400
411
  comboId,
401
412
  targets: combo.targets,
@@ -480,6 +491,18 @@ export async function executeComboResponses(
480
491
  const adoptFailedChildLog = (childLog: RequestLogContext): void => {
481
492
  // Attempts remain the complete physical history; the logical row mirrors the failed
482
493
  // target whose response is returned, including an earlier quota refusal on exhaustion.
494
+ // The ingress finalizer cannot stamp this child once activeAttempt is cleared below.
495
+ if (childLog.activeAttempt) {
496
+ attributeFinalRequest({
497
+ status: childLog.activeAttempt.status,
498
+ terminalSource: childLog.terminalSource,
499
+ transportPhase: childLog.transportPhase,
500
+ causeHint: childLog.causeHint,
501
+ outputObserved: childLog.firstOutputMs !== undefined,
502
+ locallyAnswered: childLog.localTerminalReason !== undefined,
503
+ attempt: childLog.activeAttempt,
504
+ });
505
+ }
483
506
  Object.assign(logCtx, childLog, {
484
507
  requestedModel,
485
508
  model: requestedModel,
@@ -582,6 +605,8 @@ export async function executeComboResponses(
582
605
  exclude?: Iterable<string>;
583
606
  eligible?: (target: NonNullable<typeof combo>["targets"][number]) => boolean;
584
607
  allowCooldownReprobe?: boolean;
608
+ /** This request's own cooldown-reprobe reservation, carried through its failover hops. */
609
+ cooldownReprobeTargets?: Iterable<readonly [string, number]>;
585
610
  now?: number;
586
611
  }) => pickComboTargetWithWait(config, comboId, {
587
612
  ...pickOptions,
@@ -672,22 +697,20 @@ export async function executeComboResponses(
672
697
  }
673
698
  let jevDecision: JevDecision | undefined;
674
699
  if (combo.strategy === "jev" && !toolLoopPin) {
675
- const choices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now());
700
+ const choices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now(), pick.cooldownReprobeTargets);
676
701
  const first = choices[0];
677
702
  if (!first) {
678
703
  return comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, target =>
679
704
  targetEligible(target) && target.provider !== JEV_PROVIDER_ID && jevChoiceEfforts(config, target, false) !== undefined));
680
705
  }
681
- const resolvedFailOpenEffort = resolveEffortAtOrBelow(
682
- "medium",
683
- first.candidate.reasoningEfforts,
684
- );
685
- const fallback: Pick<JevDecision, "targetKey" | "effort"> = {
686
- targetKey: first.candidate.key,
687
- effort: resolvedFailOpenEffort && isCodexReasoningEffort(resolvedFailOpenEffort)
688
- ? resolvedFailOpenEffort as OcxComboDefaultEffort
689
- : null,
706
+ const fallbackFor = (choice: JevComboChoice): Pick<JevDecision, "targetKey" | "effort"> => {
707
+ const effort = resolveEffortAtOrBelow("medium", choice.candidate.reasoningEfforts);
708
+ return {
709
+ targetKey: choice.candidate.key,
710
+ effort: effort && isCodexReasoningEffort(effort) ? effort as OcxComboDefaultEffort : null,
711
+ };
690
712
  };
713
+ const fallback = fallbackFor(first);
691
714
  const decisionStartedAt = Date.now();
692
715
  const pinReuse = jevPin?.reuse(
693
716
  choices.map(choice => choice.candidate),
@@ -702,7 +725,7 @@ export async function executeComboResponses(
702
725
  fallback,
703
726
  config,
704
727
  isDestinationAllowed: (providerName, modelId) => routeAllowedByScope(
705
- resolveAdmissionModelScope(config, options.admission), { providerName, modelId },
728
+ admissionScope, { providerName, modelId },
706
729
  ),
707
730
  ...(combo.decisionQuotaSignals === true ? { decisionQuotaSignals: true, decisionQuotaTiers: combo.decisionQuotaTiers } : {}),
708
731
  ...(combo.decisionProvider ? { decisionProvider: combo.decisionProvider } : {}),
@@ -712,7 +735,7 @@ export async function executeComboResponses(
712
735
  invokeModel: createJevModelInvoker({
713
736
  req,
714
737
  config,
715
- options,
738
+ options: { ...options, admissionScope },
716
739
  handleResponses: requestDispatchers.handleResponses,
717
740
  }),
718
741
  }
@@ -729,9 +752,32 @@ export async function executeComboResponses(
729
752
  latencyMs: Math.max(0, Date.now() - decisionStartedAt),
730
753
  };
731
754
  }
755
+ let selected = choices.find(choice => choice.candidate.key === decision.targetKey) ?? first;
756
+ let selectionUnavailable = false;
757
+ if (pick.cooldownReprobeTargets && !options.abortSignal?.aborted) {
758
+ // Another request can replace a cooldown while the decision is awaited. Recheck the
759
+ // original reservation, current availability and request eligibility without reserving again.
760
+ const currentChoices = eligibleJevComboChoices(config, comboId, targetEligible, Date.now(), pick.cooldownReprobeTargets);
761
+ const current = currentChoices.find(choice => choice.candidate.key === decision.targetKey
762
+ && (decision.effort === null ? choice.candidate.reasoningEfforts.length === 0
763
+ : choice.candidate.reasoningEfforts.includes(decision.effort)));
764
+ const available = current ?? currentChoices[0];
765
+ if (available) selected = available;
766
+ else selectionUnavailable = true;
767
+ if (!current) {
768
+ // Keep completed decision usage even when no target remains. Old scores and quota
769
+ // selection describe neither a fail-open replacement nor a rejected selection.
770
+ decision = {
771
+ backend: decision.backend,
772
+ ...(available ? fallbackFor(available) : { targetKey: decision.targetKey, effort: decision.effort }),
773
+ gate: decision.gate === "apply" ? "invalid" : decision.gate,
774
+ latencyMs: decision.latencyMs,
775
+ ...(decision.usage ? { usage: decision.usage } : {}),
776
+ };
777
+ }
778
+ }
732
779
  if (pinReuse?.released) decision = { ...decision, pinReason: pinReuse.released };
733
780
  jevDecision = decision;
734
- const selected = choices.find(choice => choice.candidate.key === decision.targetKey) ?? first;
735
781
  pick = { ...selected.pick, attempted: [targetKey(selected.pick.target)] };
736
782
  logCtx.jevDecision = normalizePersistedJevDecision({
737
783
  version: 1,
@@ -766,6 +812,11 @@ export async function executeComboResponses(
766
812
  : {}),
767
813
  ...(decision.usage ? { usage: decision.usage } : {}),
768
814
  });
815
+ // A completed decision belongs to the parent log even if no model can be dispatched.
816
+ if (selectionUnavailable) {
817
+ return comboUnavailable(comboId, undefined, comboExclusionReasons(config, comboId, target =>
818
+ targetEligible(target) && target.provider !== JEV_PROVIDER_ID && jevChoiceEfforts(config, target, false) !== undefined));
819
+ }
769
820
  }
770
821
  // One immutable combo selection trace, before any child dispatch; child
771
822
  // adoption below must never replace it with a concrete child route trace.
@@ -1138,7 +1189,10 @@ export async function executeComboResponses(
1138
1189
  const eagerRelay = isEagerRelaySseResponse(response);
1139
1190
  let preflight;
1140
1191
  try {
1141
- preflight = await preflightComboStreamResponse(response, childLog);
1192
+ preflight = await preflightComboStreamResponse(response, childLog, undefined, {
1193
+ signal: options.abortSignal,
1194
+ requiredToolPrelude: childLog.providerAdapter === "openai-responses" && requiredToolContractOf(rawBody) !== undefined,
1195
+ });
1142
1196
  } catch (error) {
1143
1197
  callbackGate.discard();
1144
1198
  if (options.abortSignal?.aborted) {
@@ -1161,6 +1215,13 @@ export async function executeComboResponses(
1161
1215
  }
1162
1216
  }
1163
1217
 
1218
+ if (options.abortSignal?.aborted) {
1219
+ callbackGate.discard();
1220
+ await response.body?.cancel().catch(() => undefined);
1221
+ retainCancelledAttempt();
1222
+ return clientCancelledResponse();
1223
+ }
1224
+
1164
1225
  if (response.ok) {
1165
1226
  sealRequestAttemptIdentity(
1166
1227
  attempt,
@@ -1170,6 +1231,7 @@ export async function executeComboResponses(
1170
1231
  );
1171
1232
  attemptRetained = true;
1172
1233
  noteComboSuccess(comboId, combo, pick.target, pick.writerGeneration);
1234
+ settleComboReprobeSuccess(pick);
1173
1235
  Object.assign(logCtx, childLog, {
1174
1236
  requestedModel,
1175
1237
  model: requestedModel,
@@ -1226,6 +1288,12 @@ export async function executeComboResponses(
1226
1288
  Date.now() - started,
1227
1289
  failure.usage,
1228
1290
  );
1291
+ if (isReplayRefusalResponse(failure.response)) {
1292
+ // Numeric 429 is a client replay policy here, not an upstream quota observation.
1293
+ childLog.causeHint = "transport-ambiguous";
1294
+ childLog.terminalSource = "synthetic";
1295
+ childLog.errorCode = attempt.errorCode = UPSTREAM_RESET_REPLAY_REFUSED_CODE;
1296
+ }
1229
1297
  if (failure.upstreamCode === "input_admission_refused" && attempt.sendCount === 0) {
1230
1298
  attempt.errorCode = failure.upstreamCode;
1231
1299
  localAdmissionRefusals?.push(failure.upstreamMessage ?? "");
@@ -1368,10 +1436,13 @@ export async function executeComboResponses(
1368
1436
  && failedTargetCooldownRecorded
1369
1437
  && isComboTargetInCooldown(comboId, pick.target, failureNow);
1370
1438
  // Drop exclusions for the single-target retry, but wait for normal cooldown
1371
- // expiry: an in-flight request cannot reserve a fresh recovery pass.
1372
- const retryAfterCooldown = () =>
1439
+ // expiry: an in-flight request cannot reserve a fresh recovery pass, though the
1440
+ // reservation it already owns still applies to entries unchanged since it was made.
1441
+ const carriedReprobe: ComboPick["cooldownReprobeTargets"] = pick.cooldownReprobeTargets;
1442
+ const retryAfterCooldown = (): Promise<ComboPick | null> =>
1373
1443
  pickWithWait({
1374
1444
  allowCooldownReprobe: false,
1445
+ cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
1375
1446
  eligible: targetEligible,
1376
1447
  now: failureNow,
1377
1448
  });
@@ -1381,6 +1452,7 @@ export async function executeComboResponses(
1381
1452
  pick = await pickWithWait({
1382
1453
  exclude: pick.attempted,
1383
1454
  eligible: targetEligible,
1455
+ cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
1384
1456
  now: failureNow,
1385
1457
  });
1386
1458
  // A single-target combo with waitForCooldownMs has no alternate target to fail over to,
@@ -1414,6 +1486,7 @@ export async function executeComboResponses(
1414
1486
  const recoveredTarget = await pickWithWait({
1415
1487
  exclude: attemptedTargets,
1416
1488
  eligible: recoveryEligible,
1489
+ cooldownReprobeTargets: carriedReprobe ? Object.entries(carriedReprobe) : undefined,
1417
1490
  now: failureNow,
1418
1491
  });
1419
1492
  if (recoveredTarget && await recoverUnreadableEncryptedTask()) {