@bitkyc08/opencodex 2.96.0 → 2.98.0-preview.20261107

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 (465) hide show
  1. package/bin/ocx.mjs +215 -20
  2. package/gui/dist/assets/App-6TFtZsUF.css +1 -0
  3. package/gui/dist/assets/App-B8_sOxoz.js +59 -0
  4. package/gui/dist/assets/Tray-DpWEp6ee.js +1 -0
  5. package/gui/dist/assets/WantedSansVariable.split.0-Dwvb1WRx.woff2 +0 -0
  6. package/gui/dist/assets/WantedSansVariable.split.1-1wKD2RxI.woff2 +0 -0
  7. package/gui/dist/assets/WantedSansVariable.split.10-CAKA6LIP.woff2 +0 -0
  8. package/gui/dist/assets/WantedSansVariable.split.11-k5H85R4b.woff2 +0 -0
  9. package/gui/dist/assets/WantedSansVariable.split.12-BHboLsUv.woff2 +0 -0
  10. package/gui/dist/assets/WantedSansVariable.split.13-9GV377ix.woff2 +0 -0
  11. package/gui/dist/assets/WantedSansVariable.split.14-DovDXnrj.woff2 +0 -0
  12. package/gui/dist/assets/WantedSansVariable.split.15-DTdykCig.woff2 +0 -0
  13. package/gui/dist/assets/WantedSansVariable.split.16-CKz2ccgK.woff2 +0 -0
  14. package/gui/dist/assets/WantedSansVariable.split.17-Z2RD_KRZ.woff2 +0 -0
  15. package/gui/dist/assets/WantedSansVariable.split.18-BcKtfonJ.woff2 +0 -0
  16. package/gui/dist/assets/WantedSansVariable.split.19-DEQPOSZn.woff2 +0 -0
  17. package/gui/dist/assets/WantedSansVariable.split.2-DryboyuA.woff2 +0 -0
  18. package/gui/dist/assets/WantedSansVariable.split.20-Bia5JMls.woff2 +0 -0
  19. package/gui/dist/assets/WantedSansVariable.split.21-Cr4jFw-E.woff2 +0 -0
  20. package/gui/dist/assets/WantedSansVariable.split.22-DjjB69TZ.woff2 +0 -0
  21. package/gui/dist/assets/WantedSansVariable.split.23-CvUzJskt.woff2 +0 -0
  22. package/gui/dist/assets/WantedSansVariable.split.24-i_eMg5ox.woff2 +0 -0
  23. package/gui/dist/assets/WantedSansVariable.split.25-2aKHwPX-.woff2 +0 -0
  24. package/gui/dist/assets/WantedSansVariable.split.26-B6wXoCEL.woff2 +0 -0
  25. package/gui/dist/assets/WantedSansVariable.split.27-D4h1WfGM.woff2 +0 -0
  26. package/gui/dist/assets/WantedSansVariable.split.28-kvRPCStd.woff2 +0 -0
  27. package/gui/dist/assets/WantedSansVariable.split.29-DHAiwleD.woff2 +0 -0
  28. package/gui/dist/assets/WantedSansVariable.split.3-7H--eyZi.woff2 +0 -0
  29. package/gui/dist/assets/WantedSansVariable.split.30-C66cfAY2.woff2 +0 -0
  30. package/gui/dist/assets/WantedSansVariable.split.31-FDmtiNim.woff2 +0 -0
  31. package/gui/dist/assets/WantedSansVariable.split.32-DouHt2Dd.woff2 +0 -0
  32. package/gui/dist/assets/WantedSansVariable.split.33-B8HVvkJX.woff2 +0 -0
  33. package/gui/dist/assets/WantedSansVariable.split.34-BtkRu1FN.woff2 +0 -0
  34. package/gui/dist/assets/WantedSansVariable.split.35-DBylQbtk.woff2 +0 -0
  35. package/gui/dist/assets/WantedSansVariable.split.36-Sg089Kgh.woff2 +0 -0
  36. package/gui/dist/assets/WantedSansVariable.split.37-CYtvbriS.woff2 +0 -0
  37. package/gui/dist/assets/WantedSansVariable.split.38-DKkSLf8Z.woff2 +0 -0
  38. package/gui/dist/assets/WantedSansVariable.split.39-CecotKZD.woff2 +0 -0
  39. package/gui/dist/assets/WantedSansVariable.split.4-Bv8O3ZMb.woff2 +0 -0
  40. package/gui/dist/assets/WantedSansVariable.split.40-DdCvkmOU.woff2 +0 -0
  41. package/gui/dist/assets/WantedSansVariable.split.41-ESn674Hc.woff2 +0 -0
  42. package/gui/dist/assets/WantedSansVariable.split.42-DL9V7NNV.woff2 +0 -0
  43. package/gui/dist/assets/WantedSansVariable.split.43-yipO0cyk.woff2 +0 -0
  44. package/gui/dist/assets/WantedSansVariable.split.44-6rTmLZhm.woff2 +0 -0
  45. package/gui/dist/assets/WantedSansVariable.split.45-BJAj8lrm.woff2 +0 -0
  46. package/gui/dist/assets/WantedSansVariable.split.46-BDTzMn2c.woff2 +0 -0
  47. package/gui/dist/assets/WantedSansVariable.split.47-Bxd4wGgi.woff2 +0 -0
  48. package/gui/dist/assets/WantedSansVariable.split.48-DxnFBLnH.woff2 +0 -0
  49. package/gui/dist/assets/WantedSansVariable.split.49-DnVD0aOD.woff2 +0 -0
  50. package/gui/dist/assets/WantedSansVariable.split.5-B1wI2pp5.woff2 +0 -0
  51. package/gui/dist/assets/WantedSansVariable.split.50-D9JlkZd6.woff2 +0 -0
  52. package/gui/dist/assets/WantedSansVariable.split.51-D9Vw6Bu3.woff2 +0 -0
  53. package/gui/dist/assets/WantedSansVariable.split.52-ClEJk4kn.woff2 +0 -0
  54. package/gui/dist/assets/WantedSansVariable.split.53-BSXU0vh-.woff2 +0 -0
  55. package/gui/dist/assets/WantedSansVariable.split.54-EcuxkR9v.woff2 +0 -0
  56. package/gui/dist/assets/WantedSansVariable.split.55-CYiFhQX8.woff2 +0 -0
  57. package/gui/dist/assets/WantedSansVariable.split.56--Gk9g8BK.woff2 +0 -0
  58. package/gui/dist/assets/WantedSansVariable.split.57-DnkOPZcy.woff2 +0 -0
  59. package/gui/dist/assets/WantedSansVariable.split.58-9MB8504z.woff2 +0 -0
  60. package/gui/dist/assets/WantedSansVariable.split.59-ByxIsN72.woff2 +0 -0
  61. package/gui/dist/assets/WantedSansVariable.split.6-Bmk0dRVw.woff2 +0 -0
  62. package/gui/dist/assets/WantedSansVariable.split.60-Bxwx_aWQ.woff2 +0 -0
  63. package/gui/dist/assets/WantedSansVariable.split.61-DA2z5sm7.woff2 +0 -0
  64. package/gui/dist/assets/WantedSansVariable.split.62-C5iJPJZn.woff2 +0 -0
  65. package/gui/dist/assets/WantedSansVariable.split.63-DAqrmaEc.woff2 +0 -0
  66. package/gui/dist/assets/WantedSansVariable.split.64-BgXFsljb.woff2 +0 -0
  67. package/gui/dist/assets/WantedSansVariable.split.65-DKiWujvu.woff2 +0 -0
  68. package/gui/dist/assets/WantedSansVariable.split.66-8po4vUZ4.woff2 +0 -0
  69. package/gui/dist/assets/WantedSansVariable.split.67-Cy5qyI9O.woff2 +0 -0
  70. package/gui/dist/assets/WantedSansVariable.split.68-BKny7Fy3.woff2 +0 -0
  71. package/gui/dist/assets/WantedSansVariable.split.69-B4VU4u_b.woff2 +0 -0
  72. package/gui/dist/assets/WantedSansVariable.split.7-BuqwNpgA.woff2 +0 -0
  73. package/gui/dist/assets/WantedSansVariable.split.70-BCd4n346.woff2 +0 -0
  74. package/gui/dist/assets/WantedSansVariable.split.71-CkQppaWn.woff2 +0 -0
  75. package/gui/dist/assets/WantedSansVariable.split.72-Db7vaoFs.woff2 +0 -0
  76. package/gui/dist/assets/WantedSansVariable.split.73-DI80TYWl.woff2 +0 -0
  77. package/gui/dist/assets/WantedSansVariable.split.74-tMCtDAHB.woff2 +0 -0
  78. package/gui/dist/assets/WantedSansVariable.split.75-Ciw0D5WG.woff2 +0 -0
  79. package/gui/dist/assets/WantedSansVariable.split.76-DoLjFgp-.woff2 +0 -0
  80. package/gui/dist/assets/WantedSansVariable.split.77-CpT2uvMy.woff2 +0 -0
  81. package/gui/dist/assets/WantedSansVariable.split.78-CkcJ4iZ1.woff2 +0 -0
  82. package/gui/dist/assets/WantedSansVariable.split.79-DsOUJjEM.woff2 +0 -0
  83. package/gui/dist/assets/WantedSansVariable.split.8-DsjypPd6.woff2 +0 -0
  84. package/gui/dist/assets/WantedSansVariable.split.80-C0VwHTte.woff2 +0 -0
  85. package/gui/dist/assets/WantedSansVariable.split.81-DTelu57i.woff2 +0 -0
  86. package/gui/dist/assets/WantedSansVariable.split.82-BiMndGN1.woff2 +0 -0
  87. package/gui/dist/assets/WantedSansVariable.split.83-CVcC6eDG.woff2 +0 -0
  88. package/gui/dist/assets/WantedSansVariable.split.84-DlhZVt_O.woff2 +0 -0
  89. package/gui/dist/assets/WantedSansVariable.split.85-S8I2D3pA.woff2 +0 -0
  90. package/gui/dist/assets/WantedSansVariable.split.86-DozXXpH5.woff2 +0 -0
  91. package/gui/dist/assets/WantedSansVariable.split.87-Dsn0Vuuo.woff2 +0 -0
  92. package/gui/dist/assets/WantedSansVariable.split.88-iNwxxDCr.woff2 +0 -0
  93. package/gui/dist/assets/WantedSansVariable.split.89-B63u_9CZ.woff2 +0 -0
  94. package/gui/dist/assets/WantedSansVariable.split.9-Bi3IzpMI.woff2 +0 -0
  95. package/gui/dist/assets/WantedSansVariable.split.90-ByeH1Pqf.woff2 +0 -0
  96. package/gui/dist/assets/WantedSansVariable.split.91-UQLlagpm.woff2 +0 -0
  97. package/gui/dist/assets/brand-mark-VPhzz-WE.js +1 -0
  98. package/gui/dist/assets/geist-cyrillic-ext-wght-normal-DjL33-gN.woff2 +0 -0
  99. package/gui/dist/assets/geist-cyrillic-wght-normal-BEAKL7Jp.woff2 +0 -0
  100. package/gui/dist/assets/geist-latin-ext-wght-normal-DC-KSUi6.woff2 +0 -0
  101. package/gui/dist/assets/geist-latin-wght-normal-BgDaEnEv.woff2 +0 -0
  102. package/gui/dist/assets/geist-mono-cyrillic-ext-wght-normal-X_5orZeX.woff2 +0 -0
  103. package/gui/dist/assets/geist-mono-cyrillic-wght-normal-DiZS0aHC.woff2 +0 -0
  104. package/gui/dist/assets/geist-mono-latin-ext-wght-normal-Bwz-egvJ.woff2 +0 -0
  105. package/gui/dist/assets/geist-mono-latin-wght-normal-XN7g48iV.woff2 +0 -0
  106. package/gui/dist/assets/geist-mono-symbols2-wght-normal-CO5SzqOn.woff2 +0 -0
  107. package/gui/dist/assets/geist-mono-vietnamese-wght-normal-DadHysG0.woff2 +0 -0
  108. package/gui/dist/assets/geist-vietnamese-wght-normal-6IgcOCM7.woff2 +0 -0
  109. package/gui/dist/assets/index-5REODpG3.css +2 -0
  110. package/gui/dist/assets/index-BWKBeK77.js +94 -0
  111. package/gui/dist/assets/segment-thumb-features-BQYzrze9.js +1 -0
  112. package/gui/dist/classic/assets/App-Bz65x1J6.js +58 -0
  113. package/gui/dist/{assets/Tray-BOPQyDbH.js → classic/assets/Tray-kk7mdO6I.js} +1 -1
  114. package/gui/dist/classic/assets/index-Dp2j8bSc.js +94 -0
  115. package/gui/dist/classic/assets/quota-summary-CvamtHjB.js +1 -0
  116. package/gui/dist/classic/index.html +47 -0
  117. package/gui/dist/favicon.png +0 -0
  118. package/gui/dist/favicon.svg +14 -0
  119. package/gui/dist/index.html +15 -2
  120. package/package.json +1 -1
  121. package/src/adapters/anthropic.ts +17 -8
  122. package/src/adapters/command-code.ts +15 -16
  123. package/src/adapters/cursor/transport-retry.ts +2 -2
  124. package/src/adapters/devin/cloud-direct/chat.ts +15 -6
  125. package/src/adapters/google.ts +7 -7
  126. package/src/adapters/kiro/adapter.ts +18 -3
  127. package/src/adapters/kiro/conversation.ts +8 -8
  128. package/src/adapters/kiro/payload.ts +45 -12
  129. package/src/adapters/kiro/stream.ts +230 -14
  130. package/src/adapters/kiro/structured-output-json.ts +191 -0
  131. package/src/adapters/kiro/structured-output-schema.ts +542 -0
  132. package/src/adapters/kiro/structured-output.ts +367 -0
  133. package/src/adapters/kiro-constants.ts +24 -1
  134. package/src/adapters/kiro-events.ts +31 -1
  135. package/src/adapters/kiro-retry.ts +3 -3
  136. package/src/adapters/kiro-tools.ts +14 -9
  137. package/src/adapters/kiro-wire.ts +9 -5
  138. package/src/adapters/ollama-native.ts +11 -1
  139. package/src/adapters/openai-chat/messages.ts +58 -5
  140. package/src/adapters/openai-chat/mistral-image-limit.ts +50 -0
  141. package/src/adapters/openai-chat/passthrough.ts +5 -3
  142. package/src/adapters/openai-chat/tool-schema.ts +83 -13
  143. package/src/adapters/openai-responses/empty-assistant.ts +15 -3
  144. package/src/adapters/openai-responses/opengateway-input.ts +18 -6
  145. package/src/adapters/openai-responses/passthrough.ts +5 -4
  146. package/src/adapters/openai-responses/reasoning.ts +9 -4
  147. package/src/adapters/openai-responses/request-strips.ts +1 -1
  148. package/src/adapters/openai-responses/tool-output-recovery.ts +79 -0
  149. package/src/adapters/physical-send.ts +3 -3
  150. package/src/adapters/qoder/live-models.ts +115 -1
  151. package/src/adapters/zed-openai-stream.ts +2 -1
  152. package/src/bridge/errors.ts +11 -2
  153. package/src/bridge/response-json.ts +2 -1
  154. package/src/bridge/sse.ts +14 -6
  155. package/src/chat/failure-verdict.ts +21 -0
  156. package/src/chat/outbound.ts +139 -21
  157. package/src/claude/failure-verdict.ts +21 -0
  158. package/src/claude/inbound-content-options.ts +15 -2
  159. package/src/claude/inbound-model-options.ts +2 -1
  160. package/src/claude/inbound-records.ts +2 -0
  161. package/src/claude/inbound.ts +17 -11
  162. package/src/claude/outbound.ts +98 -22
  163. package/src/cli/capabilities-access-remote.ts +13 -0
  164. package/src/cli/capabilities-base.ts +26 -3
  165. package/src/cli/capabilities-command.ts +12 -3
  166. package/src/cli/capabilities-provider-models.ts +3 -3
  167. package/src/cli/capability-contracts.ts +2 -0
  168. package/src/cli/codex-launch-auth.ts +30 -1
  169. package/src/cli/codex-launcher.ts +12 -5
  170. package/src/cli/codex-shim-autorestore.ts +12 -4
  171. package/src/cli/config-command.ts +11 -2
  172. package/src/cli/connect.ts +17 -2
  173. package/src/cli/dispatch.ts +14 -177
  174. package/src/cli/doctor.ts +95 -7
  175. package/src/cli/help.ts +2 -2
  176. package/src/cli/index.ts +17 -8
  177. package/src/cli/link-apply-restart.ts +9 -2
  178. package/src/cli/link.ts +1 -1
  179. package/src/cli/models.ts +124 -38
  180. package/src/cli/registry.ts +12 -4
  181. package/src/cli/restart-failure.ts +17 -0
  182. package/src/cli/root.ts +8 -0
  183. package/src/cli/stop-approval.ts +2 -2
  184. package/src/cli/sync-command.ts +243 -0
  185. package/src/cli/sync-fanout-process.ts +92 -0
  186. package/src/cli/sync-fanout.ts +161 -0
  187. package/src/cli/sync-flags.ts +10 -0
  188. package/src/cli/sync-link-status.ts +39 -0
  189. package/src/cli/sync-update-guard.ts +18 -0
  190. package/src/cli/system-restart-client.ts +5 -0
  191. package/src/cli/uninstall-client-state.ts +12 -1
  192. package/src/cli/update-restart-child.ts +13 -3
  193. package/src/cli/update-restart-home.ts +6 -3
  194. package/src/cli/update-restart.ts +36 -19
  195. package/src/client/connect.ts +35 -15
  196. package/src/client/hub-client.ts +5 -0
  197. package/src/client/link-home.ts +3 -2
  198. package/src/client/link-management-relay.ts +39 -2
  199. package/src/client/link-readiness.ts +3 -1
  200. package/src/client/machine-api.ts +2 -1
  201. package/src/client/machine-listener.ts +10 -0
  202. package/src/client/orphan-token-recovery.ts +322 -0
  203. package/src/client/restore-ownership.ts +19 -1
  204. package/src/client/runtime-restart.ts +12 -4
  205. package/src/client/runtime.ts +40 -11
  206. package/src/client/stop-routing.ts +62 -0
  207. package/src/client/sync-runtime.ts +65 -0
  208. package/src/clients/config-export.ts +32 -3
  209. package/src/codex/auth-context.ts +49 -103
  210. package/src/codex/catalog/antigravity-discovery.ts +16 -5
  211. package/src/codex/catalog/provider-models.ts +18 -12
  212. package/src/codex/forward-transport-headers.ts +35 -6
  213. package/src/codex/inject/config-toml.ts +88 -0
  214. package/src/codex/inject/multi-agent-v2.ts +30 -4
  215. package/src/codex/inject/plan.ts +34 -7
  216. package/src/codex/inject-coordination.ts +11 -0
  217. package/src/codex/inject.ts +18 -7
  218. package/src/codex/lineage.ts +13 -7
  219. package/src/codex/native-profile-api.ts +27 -1
  220. package/src/codex/quota.ts +22 -6
  221. package/src/codex/request-owned-affinity-key.ts +11 -0
  222. package/src/codex/request-owned-affinity.ts +118 -0
  223. package/src/codex/request-owned-main-pin.ts +86 -0
  224. package/src/codex/role-capability.ts +52 -41
  225. package/src/codex/routing/active-account.ts +13 -5
  226. package/src/codex/routing/selection.ts +40 -1
  227. package/src/codex/routing/thread-affinity-store.ts +916 -0
  228. package/src/codex/routing/thread-affinity.ts +90 -12
  229. package/src/codex/shim-diagnostics.ts +7 -0
  230. package/src/codex/shim-legacy-record.ts +290 -0
  231. package/src/codex/shim-windows-refresh.ts +9 -2
  232. package/src/codex/shim-wrapper-write.ts +7 -0
  233. package/src/codex/shim.ts +80 -21
  234. package/src/codex/toml-source-lines.ts +72 -13
  235. package/src/combos/failover.ts +6 -109
  236. package/src/combos/request.ts +2 -2
  237. package/src/combos/resolve.ts +29 -11
  238. package/src/config/diagnostics.ts +9 -9
  239. package/src/config/load-degrade.ts +27 -27
  240. package/src/config/process-state.ts +5 -0
  241. package/src/config/provider-validation.ts +9 -2
  242. package/src/config/removed-opencode-free-backup.ts +6 -3
  243. package/src/config/schema/leaf-validators.ts +1 -0
  244. package/src/config/tracked-runtime-inspection.ts +3 -3
  245. package/src/generated/compatibility-version.json +595 -255
  246. package/src/images/loop.ts +4 -3
  247. package/src/lib/client-error-body.ts +215 -0
  248. package/src/lib/client-retry-after.ts +66 -0
  249. package/src/lib/config-ownership-removal.ts +422 -0
  250. package/src/lib/config-ownership.ts +650 -81
  251. package/src/lib/context-overflow-verdict.ts +113 -0
  252. package/src/lib/crash-guard.ts +4 -2
  253. package/src/lib/desktop-cli-handoff.d.mts +4 -5
  254. package/src/lib/desktop-cli-handoff.mjs +18 -17
  255. package/src/lib/empty-tool-catalog.ts +25 -3
  256. package/src/lib/error-destination.ts +47 -0
  257. package/src/lib/errors.ts +1 -0
  258. package/src/lib/failure-detail.ts +66 -0
  259. package/src/lib/local-management-capability.ts +3 -1
  260. package/src/lib/messages-error-body.ts +162 -0
  261. package/src/lib/messages-sse-error-presentation.ts +93 -0
  262. package/src/lib/model-identity.ts +44 -0
  263. package/src/lib/passive-read.ts +9 -4
  264. package/src/lib/private-sqlite-path.ts +124 -0
  265. package/src/lib/response-service-tier.ts +17 -0
  266. package/src/lib/retry-after.ts +3 -0
  267. package/src/lib/socks5-fetch.ts +21 -9
  268. package/src/lib/spend-ledger-owner.ts +43 -4
  269. package/src/lib/upstream-condition.ts +142 -0
  270. package/src/lib/upstream-retry.ts +95 -12
  271. package/src/lib/windows-owner-acl.ts +22 -9
  272. package/src/lib/winsw.ts +5 -5
  273. package/src/lib/workflow-budget.ts +3 -1
  274. package/src/link/remote-platform.ts +14 -0
  275. package/src/link/remote-windows.ts +51 -9
  276. package/src/link/ssh-argv.ts +63 -10
  277. package/src/oauth/generic-account-failover.ts +13 -11
  278. package/src/oauth/index.ts +42 -73
  279. package/src/oauth/oauth-errors.ts +67 -0
  280. package/src/oauth/store.ts +21 -11
  281. package/src/protocols/codecs/messages-ir.ts +15 -9
  282. package/src/protocols/codecs/ollama.ts +197 -0
  283. package/src/protocols/encoders/adapter-events.ts +30 -7
  284. package/src/protocols/encoders/chat.ts +18 -10
  285. package/src/protocols/encoders/messages.ts +72 -28
  286. package/src/protocols/trace.ts +18 -0
  287. package/src/providers/antigravity-models.ts +45 -12
  288. package/src/providers/fastwire.ts +3 -2
  289. package/src/providers/free-directory.ts +2 -2
  290. package/src/providers/quota/anthropic-usage-windows.ts +13 -3
  291. package/src/providers/quota/vendor-probes-key.ts +60 -24
  292. package/src/providers/reasoning-metadata.ts +2 -1
  293. package/src/providers/registry/entries-extended.ts +9 -0
  294. package/src/providers/request-pacing.ts +3 -2
  295. package/src/reasoning-effort.ts +7 -2
  296. package/src/remote/hub-usage.ts +3 -0
  297. package/src/responses/apply-patch-envelope.ts +45 -19
  298. package/src/responses/compaction-history-framing.ts +5 -1
  299. package/src/responses/freeform-wrapper-scan.ts +5 -3
  300. package/src/responses/progressive-freeform-input.ts +354 -45
  301. package/src/routing/fallback-policy.ts +3 -1
  302. package/src/server/admission-model-scope.ts +17 -6
  303. package/src/server/admitted-http-turn.ts +57 -0
  304. package/src/server/anthropic-rate-limit-headers.ts +75 -3
  305. package/src/server/auth-cors.ts +5 -0
  306. package/src/server/chat-completions.ts +45 -20
  307. package/src/server/chat-native-sse.ts +52 -7
  308. package/src/server/chat-native.ts +60 -35
  309. package/src/server/claude-bridge-pool-session.ts +59 -0
  310. package/src/server/claude-messages.ts +174 -84
  311. package/src/server/context-history.ts +5 -1
  312. package/src/server/gui-static.ts +4 -1
  313. package/src/server/hub-usage.ts +7 -2
  314. package/src/server/inbound-body-admission.ts +11 -4
  315. package/src/server/index/link-management.ts +8 -0
  316. package/src/server/index/ollama-routes.ts +91 -0
  317. package/src/server/index/serve-options.ts +44 -24
  318. package/src/server/index/startup-warnings.ts +5 -12
  319. package/src/server/index/websocket-handler.ts +5 -2
  320. package/src/server/index.ts +6 -36
  321. package/src/server/inference/client-encoder-delivery.ts +9 -3
  322. package/src/server/json-serialized-bytes.ts +44 -0
  323. package/src/server/management/agent-settings-routes.ts +24 -21
  324. package/src/server/management/codex-cli-update-routes.ts +2 -1
  325. package/src/server/management/logs-usage-routes.ts +89 -4
  326. package/src/server/management/provider-routes.ts +2 -22
  327. package/src/server/management/qoder-provider-probe.ts +105 -0
  328. package/src/server/management/route-registry.ts +4 -1
  329. package/src/server/management/usage-aggregate-cache.ts +15 -5
  330. package/src/server/management/usage-source-facets.ts +38 -0
  331. package/src/server/messages-native-scope.ts +2 -1
  332. package/src/server/messages-native-tool-guard.ts +12 -4
  333. package/src/server/messages-native.ts +123 -47
  334. package/src/server/messages-response-headers.ts +25 -11
  335. package/src/server/messages-shared.ts +99 -65
  336. package/src/server/messages-sse-error-filter.ts +199 -0
  337. package/src/server/native-final-log.ts +93 -0
  338. package/src/server/ollama-inbound.ts +349 -0
  339. package/src/server/ollama-native-paths.ts +21 -0
  340. package/src/server/ollama-route-policy.ts +73 -0
  341. package/src/server/relay.ts +22 -3
  342. package/src/server/request-decompress.ts +4 -2
  343. package/src/server/request-log-failure-attribution.ts +22 -0
  344. package/src/server/request-log-failure-detail.ts +80 -0
  345. package/src/server/request-log-terminal-status.ts +4 -2
  346. package/src/server/request-log.ts +91 -42
  347. package/src/server/response-log-body.ts +6 -1
  348. package/src/server/responses/account-change-state.ts +17 -6
  349. package/src/server/responses/adapter-continuation.ts +17 -6
  350. package/src/server/responses/adapter-delivery.ts +17 -10
  351. package/src/server/responses/adapter-dispatch.ts +32 -31
  352. package/src/server/responses/anthropic-thinking-recovery.ts +3 -0
  353. package/src/server/responses/codex-auth-error.ts +24 -19
  354. package/src/server/responses/codex-ws-exchange.ts +11 -8
  355. package/src/server/responses/codex-ws-metadata.ts +94 -21
  356. package/src/server/responses/codex-ws-request.ts +3 -1
  357. package/src/server/responses/codex-ws-wire.ts +19 -3
  358. package/src/server/responses/compact.ts +57 -24
  359. package/src/server/responses/compaction-recovery.ts +4 -2
  360. package/src/server/responses/compaction-routing.ts +9 -4
  361. package/src/server/responses/core-auth.ts +32 -14
  362. package/src/server/responses/core-codex-account.ts +17 -6
  363. package/src/server/responses/core-combo-failure.ts +7 -1
  364. package/src/server/responses/core-combo-native.ts +2 -1
  365. package/src/server/responses/core-combo.ts +43 -27
  366. package/src/server/responses/core-errors.ts +24 -21
  367. package/src/server/responses/core-lifetime.ts +6 -3
  368. package/src/server/responses/core-normalize.ts +1 -0
  369. package/src/server/responses/core-options.ts +9 -0
  370. package/src/server/responses/core-pipeline.ts +4 -3
  371. package/src/server/responses/empty-completion-guard.ts +4 -1
  372. package/src/server/responses/fetch-helpers.ts +7 -1
  373. package/src/server/responses/input-admission.ts +28 -2
  374. package/src/server/responses/native-injection.ts +1 -1
  375. package/src/server/responses/native-response-json.ts +13 -4
  376. package/src/server/responses/native-response-output.ts +1 -2
  377. package/src/server/responses/non-replayable-error.ts +2 -1
  378. package/src/server/responses/pacing-overload.ts +3 -2
  379. package/src/server/responses/passthrough-delivery.ts +55 -14
  380. package/src/server/responses/passthrough-dispatch.ts +20 -18
  381. package/src/server/responses/passthrough-error.ts +9 -9
  382. package/src/server/responses/policy-fallback.ts +2 -1
  383. package/src/server/responses/request-prepare.ts +69 -48
  384. package/src/server/responses/request-transport.ts +36 -31
  385. package/src/server/responses/response-effects.ts +3 -2
  386. package/src/server/responses/run-turn-execution.ts +6 -6
  387. package/src/server/responses/sidecar-execution.ts +16 -12
  388. package/src/server/responses/spend-storage-error.ts +2 -1
  389. package/src/server/responses/terminal-guard.ts +30 -0
  390. package/src/server/responses/ws-upstream.ts +9 -0
  391. package/src/server/responses-custom-tool-repair.ts +14 -3
  392. package/src/server/responses-terminal-repair.ts +5 -2
  393. package/src/server/responses-undeclared-tool-guard.ts +39 -16
  394. package/src/server/restart-replacement.ts +3 -1
  395. package/src/server/safe-response-headers.ts +162 -13
  396. package/src/server/sse-payload-rewrite.ts +23 -11
  397. package/src/server/turn-state-handles.ts +164 -0
  398. package/src/server/workflow-refusal.ts +2 -1
  399. package/src/server/ws-bridge.ts +4 -0
  400. package/src/service/definition.ts +36 -4
  401. package/src/service/launchd.ts +89 -32
  402. package/src/service/logging.ts +34 -7
  403. package/src/service/ownership-mutation-lease.d.mts +11 -2
  404. package/src/service/ownership-mutation-lease.mjs +53 -11
  405. package/src/service/plist-xml.ts +59 -0
  406. package/src/service/state.ts +8 -0
  407. package/src/service/systemd-env.ts +2 -0
  408. package/src/service/systemd.ts +31 -7
  409. package/src/service/windows-taskxml.ts +16 -7
  410. package/src/service-manager-probe.ts +4 -10
  411. package/src/types/config.ts +2 -0
  412. package/src/types/provider.ts +2 -0
  413. package/src/types/request.ts +13 -1
  414. package/src/update/config-preflight.ts +48 -0
  415. package/src/update/index.ts +148 -26
  416. package/src/update/npm-install.d.mts +8 -0
  417. package/src/update/npm-install.mjs +20 -1
  418. package/src/update/orchestrated-admission.d.mts +4 -0
  419. package/src/update/orchestrated-admission.mjs +12 -0
  420. package/src/update/orchestrated-arguments.d.mts +12 -0
  421. package/src/update/orchestrated-arguments.mjs +64 -0
  422. package/src/update/orchestrated-child.d.mts +12 -0
  423. package/src/update/orchestrated-child.mjs +70 -0
  424. package/src/update/orchestrated-entry.ts +234 -0
  425. package/src/update/orchestrated-identity-probe-entry.ts +20 -0
  426. package/src/update/orchestrated-identity.ts +53 -0
  427. package/src/update/orchestrated-live-identity.ts +48 -0
  428. package/src/update/orchestrated-node-driver.mjs +99 -0
  429. package/src/update/orchestrated-outcome.d.mts +21 -0
  430. package/src/update/orchestrated-outcome.mjs +40 -0
  431. package/src/update/orchestrated-plan.ts +49 -0
  432. package/src/update/orchestrated-pnpm.d.mts +8 -0
  433. package/src/update/orchestrated-pnpm.mjs +33 -0
  434. package/src/update/orchestrated-session.d.mts +37 -0
  435. package/src/update/orchestrated-session.mjs +264 -0
  436. package/src/update/orchestrated-token.d.mts +10 -0
  437. package/src/update/orchestrated-token.mjs +21 -0
  438. package/src/update/orchestrated-token.ts +3 -0
  439. package/src/update/orchestrated-tree.d.mts +1 -0
  440. package/src/update/orchestrated-tree.mjs +14 -0
  441. package/src/update/pnpm-global-install.d.mts +6 -0
  442. package/src/update/pnpm-global-install.mjs +9 -2
  443. package/src/update/posix-install-supervisor-entry.mjs +6 -0
  444. package/src/update/posix-install-supervisor.d.mts +10 -0
  445. package/src/update/posix-install-supervisor.mjs +88 -0
  446. package/src/update/sync-update-mutex.d.mts +10 -0
  447. package/src/update/sync-update-mutex.mjs +164 -0
  448. package/src/update/sync-update-mutex.ts +1 -0
  449. package/src/update/test-home-guard.mjs +33 -0
  450. package/src/update/transactional-install.mjs +2 -2
  451. package/src/usage/client.ts +43 -0
  452. package/src/usage/error-detail.ts +225 -0
  453. package/src/usage/log.ts +64 -27
  454. package/src/usage/source-facets.ts +51 -0
  455. package/src/usage/source-filter.ts +65 -0
  456. package/src/usage/summary.ts +50 -8
  457. package/src/web-search/anthropic-executor.ts +105 -24
  458. package/src/web-search/executor.ts +5 -3
  459. package/src/web-search/loop.ts +33 -6
  460. package/src/web-search/progress-stream.ts +64 -5
  461. package/gui/dist/assets/App-bwugJRKn.js +0 -58
  462. package/gui/dist/assets/index-ebuVUtB7.js +0 -94
  463. package/gui/dist/assets/quota-summary-6HsrHQAy.js +0 -1
  464. /package/gui/dist/{assets → classic/assets}/App-B4j-Txmb.css +0 -0
  465. /package/gui/dist/{assets → classic/assets}/index-CHWwDo9L.css +0 -0
@@ -18,6 +18,8 @@ export interface PreparedCodexWsRequest {
18
18
  /** Original HTTP body/framing/options with only the canonical routing hint re-derived. */
19
19
  httpInit: RequestInit;
20
20
  canonical: boolean;
21
+ /** The request's model id, when the body names one: a model the relayed metadata may report. */
22
+ model?: string;
21
23
  }
22
24
 
23
25
  function isRecord(value: unknown): value is Record<string, unknown> {
@@ -83,7 +85,7 @@ export function prepareCodexWsRequest(url: string, init: RequestInit): PreparedC
83
85
  ? headers["openai-beta"]
84
86
  : `${headers["openai-beta"]}, ${WS_BETA}`
85
87
  : WS_BETA;
86
- return { frameText, headers, httpInit, canonical };
88
+ return { frameText, headers, httpInit, canonical, ...(typeof body.model === "string" ? { model: body.model } : {}) };
87
89
  } catch {
88
90
  return null;
89
91
  }
@@ -203,13 +203,29 @@ export function codexWsPreOutputRefusalHold(connectMs: number, now = Date.now())
203
203
 
204
204
  /**
205
205
  * A lifecycle frame that commits nothing the client could see or act on (#6969): created,
206
- * in-progress or queued, carrying a response object whose output is absent or empty. A snapshot
207
- * with any output item, an unknown event, or a frame addressed to another stream is not one.
206
+ * in-progress or queued, carrying a response object whose output is absent or empty, or the
207
+ * heartbeat that only keeps the connection alive. A snapshot with any output item,
208
+ * an unknown event, or a frame addressed to another stream is not one.
209
+ *
210
+ * A heartbeat qualifies only while it carries no output, no field this contract does not know, and
211
+ * at most its numeric sequence marker. A replay-unsafe mark already ran a side effect and is never
212
+ * held; only an absent mark or the boolean false proves there was none, so any other value fails
213
+ * closed rather than trusting a malformed type.
208
214
  */
209
215
  export function isEmptyCodexWsLifecycleEvent(payload: Record<string, unknown>): boolean {
216
+ if (payload.stream_id !== undefined) return false;
217
+ if (payload.type === "response.heartbeat") {
218
+ if ((Object.hasOwn(payload, "replayUnsafe") && payload.replayUnsafe !== false)
219
+ || Object.keys(payload).some(key =>
220
+ key !== "type" && key !== "response" && key !== "replayUnsafe" && key !== "sequence_number")) return false;
221
+ if (payload.sequence_number !== undefined
222
+ && !(typeof payload.sequence_number === "number" && Number.isSafeInteger(payload.sequence_number)
223
+ && payload.sequence_number >= 0)) return false;
224
+ return payload.response === undefined
225
+ || (plainRecord(payload.response) && emptyOutput(payload.response));
226
+ }
210
227
  if (payload.type !== "response.created" && payload.type !== "response.in_progress"
211
228
  && payload.type !== "response.queued") return false;
212
- if (payload.stream_id !== undefined) return false;
213
229
  return plainRecord(payload.response) && emptyOutput(payload.response);
214
230
  }
215
231
 
@@ -1,4 +1,8 @@
1
+ import { clientFacingModelLabel, type ClientFacingModelLabel } from "../../lib/error-destination";
2
+ import { formatClientRetryAfter } from "../../lib/client-retry-after";
3
+ import { conversationStateAccountId, releaseRequestOwnedMainOnOutcome, isKeyedRequestOwnedMain } from "../../codex/request-owned-affinity";
1
4
  import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
5
+ import { MAIN_CODEX_ACCOUNT_ID } from "../../codex/account-id";
2
6
  import { isolateCodexPoolClientMetadata } from "../../codex/forward-transport-headers";
3
7
  import { captureAccountAutoPauseAttempt, wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
4
8
  import { spendLedgerStorageErrorResponse } from "./spend-storage-error";
@@ -12,7 +16,7 @@ import { join } from "node:path";
12
16
  import { rmSync } from "node:fs";
13
17
  import { previewXaiOauthWireModel } from "./core-normalize";
14
18
  import {
15
- admissionModelDeniedResponse,
19
+ admissionModelDeniedResponse, projectAdmissionModelDeniedLog,
16
20
  AdmissionModelDeniedError,
17
21
  assertRouteAllowedByScope,
18
22
  resolveAdmissionModelScope,
@@ -97,6 +101,7 @@ import { codexFailureWindowOutcomeMeta } from "../../codex/routing/failure-windo
97
101
  import {
98
102
  applyAccountChangeConversationStateScrub,
99
103
  conversationStateBindingFromAuth,
104
+ compactAlternateAffinityKey,
100
105
  accountChangeFileReferenceRefusal,
101
106
  rememberServingConversationStateIssuer,
102
107
  conversationCarriesUploadedFiles,
@@ -111,7 +116,7 @@ import {
111
116
  fetchWithTransientRetry,
112
117
  applyUpstreamRecoveryInit,
113
118
  isNonReplayableResponse,
114
- SendBudgetExhaustedError,
119
+ SendBudgetExhaustedError, errorDestinationLabel,
115
120
  TRANSIENT_RETRY_MAX_ATTEMPTS,
116
121
  type UpstreamSendRecovery,
117
122
  } from "../../lib/upstream-retry";
@@ -322,6 +327,7 @@ function compactHandoffRoute(
322
327
  }
323
328
 
324
329
  export interface HandleResponsesCompactOptions {
330
+ clientModelLabel?: ClientFacingModelLabel;
325
331
  advisorAdmissionPolicy?: import("../../types/admission-policy").CapturedAdmissionPolicy;
326
332
  compactionRoutingOverride?: CompactionRoutingOverride | null;
327
333
  nativeMainRefreshDependencies?: NativeMainRefreshDependencies;
@@ -608,7 +614,12 @@ function compactResponseHeaders(upstream: Response): Headers {
608
614
  const headers = new Headers({ "Content-Type": upstream.headers.get("content-type") ?? "application/json" });
609
615
  for (const name of COMPACT_PASSTHROUGH_HEADERS) {
610
616
  const value = upstream.headers.get(name);
611
- if (value !== null) headers.set(name, value);
617
+ if (value === null) continue;
618
+ if (name === "retry-after") {
619
+ // Retry advice leaves as an integer this proxy formats, never the upstream bytes.
620
+ const advice = formatClientRetryAfter(value);
621
+ if (advice !== undefined) headers.set(name, advice);
622
+ } else headers.set(name, value);
612
623
  }
613
624
  return headers;
614
625
  }
@@ -677,6 +688,8 @@ export async function handleResponsesCompact(
677
688
  if (!body || typeof body !== "object" || Array.isArray(body)) {
678
689
  return formatErrorResponse(400, "invalid_request_error", "Invalid compaction request body");
679
690
  }
691
+ const clientModelLabel = options.clientModelLabel ?? clientFacingModelLabel(options.compactionRoutingOverride?.sourceModel ?? (body as { model?: unknown }).model);
692
+ options = { ...options, clientModelLabel };
680
693
  // Compaction forwards client history upstream too; keep local artifact paths out of it.
681
694
  redactHostedImageDisplayPaths(body);
682
695
  if (!options.compactionRoutingOverride) {
@@ -730,14 +743,14 @@ export async function handleResponsesCompact(
730
743
  // Routed xAI OAuth compaction must preview its Fast wire model here;
731
744
  // native compact keeps checking the destination it dispatches directly.
732
745
  const callerTier = (raw as Record<string, unknown>).service_tier;
733
- assertRouteAllowedByScope(resolveAdmissionModelScope(config, admission), compactRequestedModel, {
746
+ assertRouteAllowedByScope(resolveAdmissionModelScope(config, admission), clientModelLabel, {
734
747
  providerName: route.providerName,
735
748
  modelId: previewXaiOauthWireModel({ options: {
736
749
  serviceTier: compactFastRow ? "priority" : typeof callerTier === "string" ? callerTier : undefined,
737
750
  } }, route, config, "responses"),
738
751
  });
739
752
  } catch (err) {
740
- if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(err);
753
+ if (err instanceof AdmissionModelDeniedError) return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(err, logCtx));
741
754
  if (err instanceof NoEligiblePolicyCandidateError) {
742
755
  // Persist the evaluation trace (per-candidate exclusions + the
743
756
  // no-eligible reason) so a failed compact policy request stays
@@ -983,6 +996,7 @@ export async function handleResponsesCompact(
983
996
  if (refusal) return refusal;
984
997
  applyAccountChangeConversationStateScrub({
985
998
  body: raw,
999
+ headers,
986
1000
  bindingKey: binding.bindingKey,
987
1001
  servingAccountId: binding.accountId,
988
1002
  logCtx,
@@ -1001,7 +1015,11 @@ export async function handleResponsesCompact(
1001
1015
  && compactProvider.supportsNativeCompactEndpoint === true
1002
1016
  ? buildResponsesTransport({ ...compactProvider, apiKey: compactProvider.apiKey ? resolveProviderApiKey(compactProvider.apiKey) : undefined }, { headers: req.headers })
1003
1017
  : undefined;
1004
- if (gatewayTransport) headers = new Headers(gatewayTransport.headers);
1018
+ if (gatewayTransport) {
1019
+ headers = new Headers(gatewayTransport.headers);
1020
+ const binding = conversationStateBindingFromAuth(authCtx, codexPoolAffinityKey(req.headers));
1021
+ if (binding) applyAccountChangeConversationStateScrub({ body: compactBody, headers, bindingKey: binding.bindingKey, servingAccountId: binding.accountId, logCtx });
1022
+ }
1005
1023
  // Native v1 bypasses the adapter serializer. Bind the same replay provenance as ordinary
1006
1024
  // turns, but leave canonical compact's established account-state handling unchanged.
1007
1025
  const gatewayReplayParsed = gatewayTransport ? parseRequest(raw) : undefined;
@@ -1084,8 +1102,12 @@ export async function handleResponsesCompact(
1084
1102
  } = {},
1085
1103
  ) => {
1086
1104
  // A gateway response is not evidence about any Codex account.
1087
- if (gatewayTransport || !usesCodexForwardPoolAuth(ctx, route.provider)) return;
1105
+ if (gatewayTransport) return;
1088
1106
  if ((outcome === 401 || outcome === 403) && upstream && wasPermanentAccountRefusal(upstream)) return;
1107
+ if (!usesCodexForwardPoolAuth(ctx, route.provider)) {
1108
+ if (isKeyedRequestOwnedMain(ctx) && typeof outcome === "number" && (!upstream || !isNonReplayableResponse(upstream)) && isCanonicalOpenAiForwardProvider(route.provider)) releaseRequestOwnedMainOnOutcome(ctx, outcome, selectedModelId);
1109
+ return;
1110
+ }
1089
1111
  recordCodexUpstreamOutcome(config, ctx.accountId, outcome, {
1090
1112
  ...meta,
1091
1113
  ...codexFailureWindowOutcomeMeta(ctx),
@@ -1123,7 +1145,7 @@ export async function handleResponsesCompact(
1123
1145
  identityId: logCtx.accountLogLabel }));
1124
1146
  let started = false;
1125
1147
  try {
1126
- if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(safeHostLabel(compactUrl));
1148
+ if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
1127
1149
  started = true;
1128
1150
  return await (report.execute ? report.execute(doFetch) : doFetch());
1129
1151
  } finally {
@@ -1135,11 +1157,11 @@ export async function handleResponsesCompact(
1135
1157
  sendClass: "auth-recovery",
1136
1158
  targetKey: compactTargetKey,
1137
1159
  });
1138
- if (!decision.allowed) return Promise.reject(new SendBudgetExhaustedError(safeHostLabel(compactUrl)));
1160
+ if (!decision.allowed) return Promise.reject(new SendBudgetExhaustedError(errorDestinationLabel(compactUrl)));
1139
1161
  const dispatch = () => {
1140
1162
  if (!decision.permit.use()) {
1141
1163
  decision.permit.release();
1142
- throw new SendBudgetExhaustedError(safeHostLabel(compactUrl));
1164
+ throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
1143
1165
  }
1144
1166
  return doFetch();
1145
1167
  };
@@ -1153,7 +1175,9 @@ export async function handleResponsesCompact(
1153
1175
  onPhysicalDispatch?: () => void,
1154
1176
  ): Promise<Response> => {
1155
1177
  // A gateway send carries only its own transport headers, whatever recovery handed in.
1178
+ // An account-change scrub that removed the turn state from the send headers still applies.
1156
1179
  let wireHeaders = gatewayTransport ? new Headers(gatewayTransport.headers) : sendHeaders;
1180
+ if (gatewayTransport && !sendHeaders.has("x-codex-turn-state")) wireHeaders.delete("x-codex-turn-state");
1157
1181
  sendHeaders = wireHeaders;
1158
1182
  const buildCompactSendBody = () => {
1159
1183
  if (gatewayReplayParsed) bindRouteReasoningReplayScope({
@@ -1162,6 +1186,9 @@ export async function handleResponsesCompact(
1162
1186
  });
1163
1187
  const requireSendPlaintextReasoning = !isOpenAiOperatedResponsesDestination(sendProvider)
1164
1188
  && requiresPlaintextReasoningReplay(sendProvider);
1189
+ // #8042: `ocx1:`/`ocx2:` are OpenCodex's own transparent envelopes, which no upstream can
1190
+ // decode, so canonical and official sends must lower them like ordinary turns do. `false`
1191
+ // leaves native blobs to the account-change scrub that already owns them on this path.
1165
1192
  let replayBody = gatewayReplayParsed ? sanitizeReasoningInputContent(scrubOcxCompactionItems(
1166
1193
  compactBody, destinationDecodesNativeCompactionBlob(sendProvider),
1167
1194
  gatewayReplayParsed._stripReasoningEncryptedContent === true,
@@ -1172,7 +1199,7 @@ export async function handleResponsesCompact(
1172
1199
  stripEncryptedContent: gatewayReplayParsed._stripReasoningEncryptedContent === true || requireSendPlaintextReasoning,
1173
1200
  dropForeignItemId: gatewayReplayParsed._dropForeignReasoningItemIds === true,
1174
1201
  requirePlaintextReasoning: requireSendPlaintextReasoning,
1175
- }) : compactBody;
1202
+ }) : scrubOcxCompactionItems(compactBody, destinationDecodesNativeCompactionBlob(sendProvider), false) as typeof compactBody;
1176
1203
  if (!isOpenAiOperatedResponsesDestination(sendProvider) && sendProvider.dropResponsesReasoningItems === true) {
1177
1204
  replayBody = dropResponsesReasoningInputItems(replayBody) as typeof replayBody;
1178
1205
  }
@@ -1238,7 +1265,7 @@ export async function handleResponsesCompact(
1238
1265
  if (req.signal.aborted) throw req.signal.reason;
1239
1266
  stampApiKeyAccountLabel(logCtx, route.providerName, sendProvider);
1240
1267
  if (!rebindPhysicalSend(sendBudget, { poolId: logCtx.spendPoolId ?? route.providerName,
1241
- identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(safeHostLabel(compactUrl));
1268
+ identityId: logCtx.accountLogLabel })) throw new SendBudgetExhaustedError(errorDestinationLabel(compactUrl));
1242
1269
  noteProviderAttemptSend(logCtx, route.providerName, sendProvider, logCtx.usageLogInputTokens, upstreamRecovery);
1243
1270
  const physicalFetch = ((input, physicalInit) => sendWithConnectionPolicy(
1244
1271
  distributedKeyPhysicalFetch((sendProvider as { fetch?: typeof fetch }).fetch ?? execute, route.providerName, sendProvider, compactUrl), String(input),
@@ -1262,7 +1289,7 @@ export async function handleResponsesCompact(
1262
1289
  ? sendSingleCompactAttempt(doFetch)
1263
1290
  : fetchWithTransientRetry(doFetch, {
1264
1291
  abortSignal: req.signal,
1265
- label: safeHostLabel(compactUrl),
1292
+ label: safeHostLabel(compactUrl), destination: errorDestinationLabel(compactUrl),
1266
1293
  // Key-auth policy is a logical-request total; canonical forward keeps its default
1267
1294
  // ladder. Both intersect the same shared base remainder as ordinary Responses.
1268
1295
  attempts: sendBudget.remainingBaseSends(transientSendCapFor(
@@ -1382,6 +1409,8 @@ export async function handleResponsesCompact(
1382
1409
  outcomeCtx = replay.authCtx;
1383
1410
  compactProvider = replay.provider;
1384
1411
  headers = replay.headers;
1412
+ const replayBinding = conversationStateBindingFromAuth(replay.authCtx, codexPoolAffinityKey(req.headers));
1413
+ if (replayBinding) applyAccountChangeConversationStateScrub({ body: compactBody, headers, bindingKey: replayBinding.bindingKey, servingAccountId: replayBinding.accountId, logCtx });
1385
1414
  logCtx.accountLogLabel = codexAuthContextLogLabel(replay.authCtx, config);
1386
1415
  try {
1387
1416
  upstream = await sendCompactAttempt(compactProvider, headers, "single", authCtx);
@@ -1425,20 +1454,24 @@ export async function handleResponsesCompact(
1425
1454
  recordCompactPoolOutcome(outcomeCtx, outcome);
1426
1455
  return formatErrorResponse(502, "upstream_error", "Failed to connect to compact upstream");
1427
1456
  };
1428
- const scrubCompactStateForAlternate = (alternateAuthCtx: CodexAuthContext): void => {
1429
- const binding = conversationStateBindingFromAuth(
1430
- alternateAuthCtx,
1431
- (authCtx.kind === "pool" || authCtx.kind === "main-pool")
1432
- ? authCtx.affinityKey
1433
- : codexPoolAffinityKey(req.headers),
1434
- );
1457
+ const scrubCompactStateForAlternate = (alternateAuthCtx: CodexAuthContext, alternateHeaders: Headers): void => {
1458
+ const affinityKey = compactAlternateAffinityKey(authCtx, () => codexPoolAffinityKey(req.headers))
1459
+ ?? codexPoolAffinityKey(req.headers);
1460
+ const priorAccountId = conversationStateAccountId(authCtx);
1461
+ // An unkeyed caller-owned main alternate has no binding of its own, but moving off the issuing
1462
+ // account still makes the carried state foreign. Scrub for this request only; nothing persists.
1463
+ const binding = conversationStateBindingFromAuth(alternateAuthCtx, affinityKey)
1464
+ ?? (alternateAuthCtx.kind === "main" && priorAccountId && affinityKey
1465
+ ? { bindingKey: affinityKey, accountId: priorAccountId === MAIN_CODEX_ACCOUNT_ID ? "__caller_main__" : MAIN_CODEX_ACCOUNT_ID }
1466
+ : null);
1435
1467
  if (!binding) return;
1436
1468
  for (const body of [raw, compactBody]) {
1437
1469
  applyAccountChangeConversationStateScrub({
1438
1470
  body,
1471
+ headers: alternateHeaders,
1439
1472
  bindingKey: binding.bindingKey,
1440
1473
  servingAccountId: binding.accountId,
1441
- priorAccountId: authCtx.accountId,
1474
+ priorAccountId: conversationStateAccountId(authCtx),
1442
1475
  logCtx,
1443
1476
  });
1444
1477
  }
@@ -1541,7 +1574,7 @@ export async function handleResponsesCompact(
1541
1574
  await upstream.body?.cancel().catch(() => undefined);
1542
1575
  outcomeCtx = alternate.authCtx;
1543
1576
  logCtx.accountLogLabel = codexAuthContextLogLabel(alternate.authCtx, config);
1544
- scrubCompactStateForAlternate(alternate.authCtx);
1577
+ scrubCompactStateForAlternate(alternate.authCtx, alternate.headers);
1545
1578
  try {
1546
1579
  upstream = await sendCompactAttempt(alternate.provider, alternate.headers, "single", alternate.authCtx);
1547
1580
  } catch (err) {
@@ -1598,7 +1631,7 @@ export async function handleResponsesCompact(
1598
1631
  // B's identity before B's admission, so every budget and spend check runs against B. A's
1599
1632
  // response stays intact until B is actually sent.
1600
1633
  logCtx.accountLogLabel = codexAuthContextLogLabel(alternate.authCtx, config);
1601
- scrubCompactStateForAlternate(alternate.authCtx);
1634
+ scrubCompactStateForAlternate(alternate.authCtx, alternate.headers);
1602
1635
  const recordFirstMove = () => {
1603
1636
  recordCompactPoolOutcome(authCtx, firstStatus, { retryAfter: firstRetryAfter, resetAt: firstResetAt });
1604
1637
  void upstream.body?.cancel().catch(() => undefined);
@@ -1760,7 +1793,7 @@ export async function handleResponsesCompact(
1760
1793
  // fallback spend four more.
1761
1794
  // internalReq keeps only FORWARD_HEADERS, so the caller principal is resolved from req.
1762
1795
  const replayPrincipal = { clientPrincipalId: resolveContextPrincipal(req, config, admission) };
1763
- const response = await handleResponses(internalReq, config, logCtx, { abortSignal: req.signal, turnAdmissionLease, sendBudget, compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride, advisorAdmissionPolicy: options.advisorAdmissionPolicy, replayPrincipal, ...(admission ? { admission } : {}) });
1796
+ const response = await handleResponses(internalReq, config, logCtx, { clientModelLabel: options.clientModelLabel, abortSignal: req.signal, turnAdmissionLease, sendBudget, compactionRecoveryKind: "compaction-v1", compactionRoutingOverride: options.compactionRoutingOverride, advisorAdmissionPolicy: options.advisorAdmissionPolicy, replayPrincipal, ...(admission ? { admission } : {}) });
1764
1797
  if (req.signal.aborted) {
1765
1798
  void response.body?.cancel(req.signal.reason).catch(() => undefined);
1766
1799
  return formatErrorResponse(499, "client_cancelled", "Client cancelled compact request");
@@ -1,3 +1,4 @@
1
+ import { clientFacingModelText } from "../../lib/error-destination";
1
2
  import type { AdapterEvent, OcxConfig } from "../../types";
2
3
  import { carryResponseToolOwnership } from "./response-tool-ownership";
3
4
  import { routeConcreteModel, type RouteResult } from "../../router";
@@ -160,7 +161,8 @@ export async function runWithCompactionRecovery(
160
161
  let target: RouteResult;
161
162
  try { target = routeConcreteModel(config, recovery.model); } catch { return keep(response); }
162
163
  if (!routed(target, kind) || identity(sourceRoute) === identity(target)) return keep(response);
163
- const originalModel = firstOptions.compactionRoutingOverride?.sourceModel ?? String(snapshot.model);
164
+ const originalModel = firstOptions.clientModelLabel ? clientFacingModelText(firstOptions.clientModelLabel)
165
+ : firstOptions.compactionRoutingOverride?.sourceModel ?? String(snapshot.model);
164
166
  // Use the established protocol commit boundary. For runTurn streams the direct event
165
167
  // observer additionally preserves side-effect heartbeats that the bridge does not publish.
166
168
  if (response.ok && hasResponseMediaType(response.headers, "text/event-stream")) {
@@ -268,7 +270,7 @@ export async function runWithCompactionRecovery(
268
270
  options.accountLoad.lease = null;
269
271
  }
270
272
  fallback = await dispatch(child, config, logCtx, {
271
- ...options, compactionRecoveryAttempted: true, compactionRecoveryPermit: recoveryPermit,
273
+ ...options, clientModelLabel: firstOptions.clientModelLabel, compactionRecoveryAttempted: true, compactionRecoveryPermit: recoveryPermit,
272
274
  compactionRoutingOverride: { sourceModel: originalModel },
273
275
  onRequestBodyRead: undefined, onRequestBodyParsed: undefined,
274
276
  onCompactionRecoveryRoute: undefined, onCompactionRecoveryAdapterEvent: undefined,
@@ -7,6 +7,7 @@ import { resolvePolicyProfileId } from "../../routing/profile";
7
7
  import { parseSyntheticRowId } from "../fast-row";
8
8
  import { recallComboForLane } from "./combo-session-recall";
9
9
  import { sessionLaneIdFromRequest } from "../request-log-conversation";
10
+ import { isLocalCompactionCheckpoint } from "../../responses/compaction-history-framing";
10
11
 
11
12
  /** `sourceModel` is the conversation's own selector before the rewrite. */
12
13
  export interface CompactionRoutingOverride {
@@ -38,7 +39,7 @@ function configuredTriggers(value: unknown): readonly string[] | null {
38
39
  }
39
40
 
40
41
  export interface CompactionRoutingOverrideOptions {
41
- /** `responses` requires a `compaction_trigger` input item; the native compact endpoint carries none. */
42
+ /** Responses accepts remote triggers or opted-in local checkpoints; compact carries neither. */
42
43
  endpoint?: "responses" | "compact";
43
44
  transport?: "websocket";
44
45
  }
@@ -66,8 +67,10 @@ export function applyCompactionRoutingOverride(
66
67
  ? source.startsWith(selector.slice(0, -1)) && source.length > selector.length - 1
67
68
  : source === selector)) return null;
68
69
  }
69
- if (options.endpoint !== "compact"
70
- && !(Array.isArray(raw.input) && raw.input.some(item => record(item)?.type === "compaction_trigger"))) return null;
70
+ const remoteTrigger = Array.isArray(raw.input) && raw.input.some(item => record(item)?.type === "compaction_trigger");
71
+ const localCheckpoint = options.endpoint !== "compact" && !remoteTrigger
72
+ && config.codexClientCompaction === true && isLocalCompactionCheckpoint(raw.input);
73
+ if (options.endpoint !== "compact" && !remoteTrigger && !localCheckpoint) return null;
71
74
 
72
75
  const metadata: unknown[] = [];
73
76
  const header = headers.get("x-codex-turn-metadata");
@@ -81,7 +84,9 @@ export function applyCompactionRoutingOverride(
81
84
  try {
82
85
  const parsed = record(JSON.parse(value));
83
86
  if (parsed?.request_kind !== "compaction") return null;
84
- const carried = record(parsed.compaction)?.trigger;
87
+ const compaction = record(parsed.compaction);
88
+ if (localCheckpoint && compaction?.implementation !== "responses") return null;
89
+ const carried = compaction?.trigger;
85
90
  if (typeof carried !== "string" || !triggers.includes(carried)) return null;
86
91
  // Copies that name different triggers are not agreement, and picking either one would
87
92
  // let a caller widen an override by disagreeing with itself.
@@ -1,3 +1,5 @@
1
+ import { markProxyError } from "../../lib/client-error-body";
2
+ import { applyClaudeBridgePoolSession } from "../claude-bridge-pool-session";
1
3
  import type { OcxProviderConfig, OcxConfig } from "../../types";
2
4
  import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
3
5
  import type { CodexAuthContext } from "../../codex/auth-context";
@@ -111,7 +113,7 @@ function validatedCallerDirectHeaders(
111
113
  return captureCallerDirectAuth(headers, config) ? headers : undefined;
112
114
  }
113
115
 
114
- export function codexRouteCredentialDomainHeaders(
116
+ function codexRouteCredentialDomainHeadersFor(
115
117
  req: Request,
116
118
  route: RouteResult,
117
119
  options: HandleResponsesOptions,
@@ -156,6 +158,20 @@ export function codexRouteCredentialDomainHeaders(
156
158
  }
157
159
 
158
160
 
161
+ /**
162
+ * Credential-domain headers for Codex account SELECTION (previews, recovery, final resolution).
163
+ * A Claude bridge pool identity is completed here only; upstream headers are always materialized
164
+ * from the uncompleted form, so the synthesized pair never reaches the wire.
165
+ */
166
+ export function codexRouteCredentialDomainHeaders(
167
+ req: Request, route: RouteResult, options: HandleResponsesOptions,
168
+ credentialDomainWasRewritten: boolean, config: OcxConfig,
169
+ ): Headers {
170
+ return applyClaudeBridgePoolSession(
171
+ codexRouteCredentialDomainHeadersFor(req, route, options, credentialDomainWasRewritten, config), route, options,
172
+ );
173
+ }
174
+
159
175
  /**
160
176
  * Does this route substitute OUR stored main credential, and does the caller own the credential
161
177
  * this request will authenticate with?
@@ -208,9 +224,9 @@ export async function resolveResponsesCodexAuth(
208
224
  let authCtx: CodexAuthContext | undefined;
209
225
  // Ingress already refuses assertion_only; a later internal hop must not reach a pool or
210
226
  // routed credential with it either, because that would be a silent credential swap.
211
- if (hasAgentAssertionAuthorization(req.headers)) return { ok: false, response: agentAssertionUnsupportedResponse() };
227
+ if (hasAgentAssertionAuthorization(req.headers)) return { ok: false, response: markProxyError(agentAssertionUnsupportedResponse()) };
212
228
  try {
213
- let authInputHeaders = codexRouteCredentialDomainHeaders(
229
+ let authInputHeaders = codexRouteCredentialDomainHeadersFor(
214
230
  req,
215
231
  route,
216
232
  options,
@@ -270,7 +286,9 @@ export async function resolveResponsesCodexAuth(
270
286
  validateForwardAdmissionCredential(authInputHeaders, config);
271
287
  }
272
288
  if (route.codexAccountMode) {
273
- authCtx = await resolveCodexAuthContext(authInputHeaders, config, route.codexAccountMode, {
289
+ // Only selection sees the Claude bridge pool identity; materialization below keeps the
290
+ // uncompleted headers, so the wire matches the original request.
291
+ authCtx = await resolveCodexAuthContext(applyClaudeBridgePoolSession(authInputHeaders, route, options), config, route.codexAccountMode, {
274
292
  admission: options.admission,
275
293
  codexAuthPolicy: options.codexAuthPolicy,
276
294
  accountId: route.codexAccountId,
@@ -323,7 +341,7 @@ export async function resolveResponsesCodexAuth(
323
341
  releaseCodexAuthContextProbeLease(authCtx);
324
342
  return {
325
343
  ok: false,
326
- response: formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication"),
344
+ response: markProxyError(formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication")),
327
345
  };
328
346
  }
329
347
  if (stripAuthorization) {
@@ -371,9 +389,9 @@ export async function resolveResponsesCodexAuth(
371
389
  console.error(`[codex-auth] Pool account ${safeAccountLabel} token failed; reauthentication required`);
372
390
  }
373
391
  if (err instanceof ForwardAdmissionCredentialError) {
374
- return { ok: false, response: formatErrorResponse(401, "authentication_error", err.message) };
392
+ return { ok: false, response: markProxyError(formatErrorResponse(401, "authentication_error", err.message)) };
375
393
  }
376
- if (err instanceof AgentAssertionUnsupportedError) return { ok: false, response: agentAssertionUnsupportedResponse() };
394
+ if (err instanceof AgentAssertionUnsupportedError) return { ok: false, response: markProxyError(agentAssertionUnsupportedResponse()) };
377
395
  const response = mapCodexAuthContextErrorToResponse(err, {
378
396
  accountSelector: route.codexAccountNamespace,
379
397
  now: Date.now(),
@@ -438,15 +456,15 @@ export function poolCredentialRefreshIncompleteResponse(args: {
438
456
  if (args.logCtx) markLocalRequestLogRefusal(args.logCtx, CODEX_POOL_REFRESH_INCOMPLETE_LOG_REASON);
439
457
  const label = args.accountSelector ?? codexAuthContextLogLabel(args.authCtx, args.config);
440
458
  const account = label ? `Codex pool account ${label}` : "the selected Codex pool account";
441
- const response = formatErrorResponse(
459
+ const response = markProxyError(formatErrorResponse(
442
460
  503,
443
461
  "server_busy",
444
462
  `Codex credential refresh did not complete for ${account}; retry this request. `
445
463
  + "If it keeps failing, sign in to that account again.",
446
- );
464
+ ));
447
465
  const headers = new Headers(response.headers);
448
466
  headers.set("Retry-After", "1");
449
- return new Response(response.body, { status: response.status, headers });
467
+ return markProxyError(new Response(response.body, { status: response.status, headers }), "pool_refresh");
450
468
  }
451
469
 
452
470
 
@@ -484,7 +502,7 @@ export async function refreshPoolForwardAuth(args: {
484
502
  ok: false,
485
503
  quarantine: true,
486
504
  quarantineGeneration: refreshed.generation,
487
- response: formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication"),
505
+ response: markProxyError(formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication")),
488
506
  };
489
507
  }
490
508
  // Only a CAS this request performed itself proves the new credential descends from
@@ -522,7 +540,7 @@ export async function refreshPoolForwardAuth(args: {
522
540
  return {
523
541
  ok: false,
524
542
  quarantine: true,
525
- response: formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication"),
543
+ response: markProxyError(formatErrorResponse(401, "authentication_error", "Selected Codex account needs reauthentication")),
526
544
  };
527
545
  }
528
546
  if (options.abortSignal?.aborted || req.signal.aborted) {
@@ -564,7 +582,7 @@ export async function refreshNativeMainForwardAuth(args: {
564
582
  > {
565
583
  const { req, config, route, authCtx, substituteMainCredential, options } = args;
566
584
  if (authCtx.kind !== "main-pool") {
567
- return { ok: false, response: formatErrorResponse(401, "authentication_error", "No native main credential to refresh") };
585
+ return { ok: false, response: markProxyError(formatErrorResponse(401, "authentication_error", "No native main credential to refresh")) };
568
586
  }
569
587
  try {
570
588
  const refreshed = await forceRefreshMainAccountToken(authCtx.accessToken, {
@@ -572,7 +590,7 @@ export async function refreshNativeMainForwardAuth(args: {
572
590
  ...(options.nativeMainRefreshDependencies ?? {}),
573
591
  });
574
592
  if (!refreshed) {
575
- return { ok: false, response: formatErrorResponse(401, "authentication_error", "Codex main account needs reauthentication") };
593
+ return { ok: false, response: markProxyError(formatErrorResponse(401, "authentication_error", "Codex main account needs reauthentication")) };
576
594
  }
577
595
  const refreshedAuthCtx: CodexAuthContext = {
578
596
  ...authCtx,
@@ -1,3 +1,4 @@
1
+ import { conversationStateAccountId, releaseRequestOwnedMainOnOutcome, isKeyedRequestOwnedMain } from "../../codex/request-owned-affinity";
1
2
  import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
2
3
  import { captureAccountAutoPauseAttempt, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
3
4
  import type { OcxConfig, OcxProviderConfig, OcxParsedRequest } from "../../types";
@@ -26,6 +27,7 @@ import { formatErrorResponse } from "../../bridge";
26
27
  import { readBoundedResponseBody } from "../../lib/bounded-body";
27
28
  import { upstreamErrorMessageFromPayload, isRateLimitOrQuotaFailureMessage } from "../../lib/errors";
28
29
  import { isNonReplayableResponse, isTransientUpstreamStatus, SendBudgetExhaustedError } from "../../lib/upstream-retry";
30
+ import { applyClaudeBridgePoolSession } from "../claude-bridge-pool-session";
29
31
  import {
30
32
  codexWsPreOutputRefusalHold,
31
33
  codexWsPreOutputRefusalOutcomeRecorded,
@@ -489,6 +491,8 @@ export interface CodexPoolAccountRetryArgs {
489
491
  abortSignal?: AbortSignal;
490
492
  onCodexAuthContextResolved?: (ctx: CodexAuthContext) => void;
491
493
  deferCodexResetDerivedCooldown?: boolean;
494
+ /** Private Claude bridge pool identity; alternate selection completes it like the first pick. */
495
+ claudeBridgePoolSession?: string;
492
496
  // Narrowed subset of HandleResponsesOptions: the retry rebuilds the adapter, so it
493
497
  // needs the inbound scope or the retry could land on a different wire than the
494
498
  // first attempt.
@@ -766,7 +770,9 @@ export async function retryCodexPoolOnAlternateAccount(
766
770
  }
767
771
  try {
768
772
  retryAuthCtx ??= await resolveCodexAuthContext(
769
- callerAuthHeaders,
773
+ // Alternate selection keeps the initial Claude bridge pool identity; the retry's upstream
774
+ // headers are still built from uncompleted callerAuthHeaders below.
775
+ applyClaudeBridgePoolSession(callerAuthHeaders, { codexAccountMode: "pool" }, options),
770
776
  config,
771
777
  "pool",
772
778
  {
@@ -912,9 +918,7 @@ export async function retryCodexPoolOnAlternateAccount(
912
918
  {
913
919
  const binding = conversationStateBindingFromAuth(
914
920
  retryAuthCtx,
915
- firstAuthCtx.kind === "pool" || firstAuthCtx.kind === "main-pool"
916
- ? firstAuthCtx.affinityKey
917
- : undefined,
921
+ firstAuthCtx.affinityKey ?? firstAuthCtx.conversationStateKey,
918
922
  );
919
923
  if (binding) {
920
924
  applyAccountChangeConversationStateScrub({
@@ -925,7 +929,7 @@ export async function retryCodexPoolOnAlternateAccount(
925
929
  && parsed._nativeReasoningRetention?.accountSwitch === true,
926
930
  bindingKey: binding.bindingKey,
927
931
  servingAccountId: binding.accountId,
928
- priorAccountId: firstAuthCtx.accountId,
932
+ priorAccountId: conversationStateAccountId(firstAuthCtx),
929
933
  logCtx,
930
934
  });
931
935
  }
@@ -1164,7 +1168,14 @@ export function codexForwardTerminalOutcomeRecorder(
1164
1168
  modelId?: string,
1165
1169
  logCtx?: RequestLogContext,
1166
1170
  ): ((status: ResponsesTerminalStatus, httpStatusOverride?: number) => void) | undefined {
1167
- if (!usesCodexForwardPoolAuth(authCtx, provider)) return undefined;
1171
+ if (!usesCodexForwardPoolAuth(authCtx, provider)) {
1172
+ if (!isKeyedRequestOwnedMain(authCtx) || !isCanonicalOpenAiForwardProvider(provider)) return undefined;
1173
+ return (status, httpStatusOverride) => {
1174
+ const quota = [httpStatusOverride, logCtx?.terminalHttpStatus].find(value => value === 429 || value === 402);
1175
+ const outcome = status === "completed" || (status === "incomplete" && quota === undefined) ? 200 : (quota ?? httpStatusOverride ?? logCtx?.terminalHttpStatus ?? 502);
1176
+ releaseRequestOwnedMainOnOutcome(authCtx, outcome, modelId);
1177
+ };
1178
+ }
1168
1179
  const windowMeta = codexFailureWindowOutcomeMeta(authCtx);
1169
1180
  return (status, httpStatusOverride) => {
1170
1181
  const quotaStatus = [httpStatusOverride, logCtx?.terminalHttpStatus]
@@ -1,3 +1,5 @@
1
+ import { carryProxyErrorPresentation } from "../../lib/client-error-body";
2
+ import { comboFailureEvidence, carryProxyError } from "../../lib/client-error-body";
1
3
  import { codexAccountModelRefusal, codexAccountModelRefusalHardStopCode, type CodexAccountModelRefusal } from "../../combos/failover";
2
4
  import { parseRetryAfterMs } from "../../combos";
3
5
  import type { ConsumedComboFailure, HandleResponsesOptions } from "./core-options";
@@ -62,7 +64,9 @@ export async function consumeComboFailure(
62
64
  let scopeRefusalBody: string | undefined;
63
65
  let verifiedPlanRefusal = false;
64
66
  try {
65
- const body = await readBoundedResponseBody(response, { signal, reportUtf8Validity: serverError });
67
+ const legacy = comboFailureEvidence(response);
68
+ if (legacy !== undefined) void response.body?.cancel().catch(() => undefined);
69
+ const body = await readBoundedResponseBody(legacy === undefined ? response : new Response(legacy), { signal, reportUtf8Validity: serverError });
66
70
  // A 5xx body counts as quota or classification evidence only when it decoded as valid
67
71
  // UTF-8, matching shouldRetryCodexPoolAccountQuota. A malformed byte keeps the status-only
68
72
  // fallback, with one exception: a cyber-policy refusal must still stop the combo, so the
@@ -139,7 +143,9 @@ export async function consumeComboFailure(
139
143
  },
140
144
  );
141
145
  if (nonReplayable) markResponseNonReplayable(failureResponse);
146
+ carryProxyError(response, failureResponse);
142
147
  carryReplayRefusal(response, failureResponse);
148
+ carryProxyErrorPresentation(response, failureResponse);
143
149
  if (verifiedPlanRefusal) markVerifiedModelNotInPlanResponse(failureResponse);
144
150
  carryAnthropicRefusalCredential(response, failureResponse);
145
151
  carryCodexAccountCooldownResponse(response, failureResponse);
@@ -1,3 +1,4 @@
1
+ import { clientFacingModelLabel } from "../../lib/error-destination";
1
2
  /**
2
3
  * Native Chat candidates inside the combo loop (PF-07).
3
4
  *
@@ -126,7 +127,7 @@ export function createComboProtocolLanes(input: {
126
127
  const settle = (target: ComboTarget, targetRoute: RouteResult): RouteResult | undefined => {
127
128
  try {
128
129
  const route: RouteResult = { ...targetRoute };
129
- assertRouteAllowedByScope(admissionScope, selector(target), route);
130
+ assertRouteAllowedByScope(admissionScope, clientFacingModelLabel(undefined), route);
130
131
  const routedProvider = route.provider;
131
132
  route.staticPolicy = captureRouteStaticPolicy(
132
133
  route.providerName, route.modelId, routedProvider, route.staticPolicy.effectiveAlias, "chat",