@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
@@ -1,5 +1,11 @@
1
+ import { clientFacingModelText } from "../../lib/error-destination";
2
+ import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
3
+ import { markProxyError, rememberProxyErrorMessage, carryProxyError } from "../../lib/client-error-body";
4
+ import { releaseRequestOwnedMainOnOutcome, isKeyedRequestOwnedMain } from "../../codex/request-owned-affinity";
1
5
  import { wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
2
6
  import { hasResponseMediaType } from "../../lib/http-response-semantics";
7
+ import { routeKnownModels } from "../../usage/log";
8
+ import type { OcxProviderConfig } from "../../types";
3
9
  import { isNativeControlResponse } from "./native-response-control";
4
10
  import { guardBufferedComboRequiredTool } from "./combo-required-tool-contract";
5
11
  import { createComboRequiredToolStreamGuard } from "./combo-required-tool-stream";
@@ -34,6 +40,7 @@ import {
34
40
  codexDenialOutcomeMeta,
35
41
  isFixedCodexAccount,
36
42
  shouldDeferCodexResetDerivedCooldown,
43
+ shouldRetryCodexPoolAccountQuota,
37
44
  } from "./core-codex-account";
38
45
  import { isMainQuotaDispatchLive, isMainQuotaDispatchWsClaimed } from "../../codex/main-account-cache";
39
46
  import { MAIN_CODEX_ACCOUNT_ID } from "../../codex/account-id";
@@ -482,9 +489,16 @@ export async function deliverPassthroughResponse(
482
489
  });
483
490
  }
484
491
 
485
- const headers = sanitizePassthroughHeaders(upstreamResponse.headers, codexSafetyBufferingOptions);
492
+ // Every relayed header set below goes through this filter with the route's known models, so a
493
+ // reported model (row and header) is only ever a model id this route or a catalog already names.
494
+ const passthroughHeaderOptions = {
495
+ ...codexSafetyBufferingOptions,
496
+ knownModels: [...routeKnownModels(logCtx), ...providerKnownModels(route.provider)],
497
+ provider: logCtx.provider,
498
+ };
499
+ const headers = sanitizePassthroughHeaders(upstreamResponse.headers, passthroughHeaderOptions);
486
500
  if (!upstreamResponse.ok) noteUpstreamRequestId(logCtx, headers);
487
- const resolvedModel = headers.get("openai-model")?.trim();
501
+ const resolvedModel = headers.get("openai-model") ?? undefined;
488
502
  if (resolvedModel) {
489
503
  logCtx.servedModel = resolvedModel;
490
504
  if (!logCtx.preserveResolvedModelFromRoute) logCtx.resolvedModel = resolvedModel;
@@ -571,6 +585,18 @@ export async function deliverPassthroughResponse(
571
585
  });
572
586
  }
573
587
  } else {
588
+ if (terminalBodyWillRecord) {
589
+ options.setTerminalOutcomeRecorder?.((status, httpStatusOverride) => {
590
+ terminalRecorder?.(status, httpStatusOverride);
591
+ options.onNativePassthroughTerminal?.(status);
592
+ });
593
+ }
594
+ if (isKeyedRequestOwnedMain(admissionState.authCtx) && !terminalBodyWillRecord && !upstreamResponse.ok && !isNonReplayableResponse(upstreamResponse)
595
+ && !isReplayRefusalResponse(upstreamResponse) && !wasPermanentAccountRefusal(upstreamResponse) && isCanonicalOpenAiForwardProvider(route.provider)) {
596
+ const outcome = upstreamResponse.status >= 500 && await shouldRetryCodexPoolAccountQuota(upstreamResponse, options.abortSignal)
597
+ ? 429 : upstreamResponse.status;
598
+ releaseRequestOwnedMainOnOutcome(admissionState.authCtx, outcome, route.modelId);
599
+ }
574
600
  // The WS observer is the only plain-main publisher for a WebSocket exchange;
575
601
  // a prelude projection carries the prelude snapshot, not fresh evidence.
576
602
  // The dispatch claim is authoritative because downstream wrappers can replace the Response.
@@ -602,7 +628,7 @@ export async function deliverPassthroughResponse(
602
628
  return new Response(upstreamResponse.body, {
603
629
  status: upstreamResponse.status,
604
630
  statusText: upstreamResponse.statusText,
605
- headers: sanitizePassthroughHeaders(upstreamResponse.headers, codexSafetyBufferingOptions),
631
+ headers: sanitizePassthroughHeaders(upstreamResponse.headers, passthroughHeaderOptions),
606
632
  });
607
633
  }
608
634
  if (!upstreamResponse.ok) {
@@ -621,27 +647,28 @@ export async function deliverPassthroughResponse(
621
647
  // Unsafe partial data falls back to #452's non-empty status-only JSON.
622
648
  const errorText = await readDisplaySafeErrorText(upstreamResponse, upstream.signal, "");
623
649
  if (upstreamResponse.status === 413) {
650
+ if (options.clientModelLabel) projectLocalModelRefusalLog(logCtx, options.clientModelLabel);
624
651
  return clientRequestedStream
625
- ? streamingContextOverflowResponse(parsed._responseModelId ?? parsed.modelId, translatorBudget)
652
+ ? streamingContextOverflowResponse(clientFacingModelText(options.clientModelLabel), translatorBudget)
626
653
  : jsonContextOverflowResponse();
627
654
  }
628
655
  const policyRefusal = rewriteUpstreamPolicyRefusal({
629
656
  status: upstreamResponse.status,
630
657
  errorText,
631
658
  stream: clientRequestedStream,
632
- modelId: parsed._responseModelId ?? parsed.modelId,
659
+ modelId: clientFacingModelText(options.clientModelLabel),
633
660
  destinationIsXai: isXaiResponsesDestination(route.provider),
634
661
  translatorBudget,
635
662
  turnAdmissionLease: options.turnAdmissionLease,
636
663
  });
637
664
  if (policyRefusal) return policyRefusal;
638
- return formatPassthroughUpstreamError(upstreamResponse.status, errorText, {
665
+ return carryProxyError(upstreamResponse, formatPassthroughUpstreamError(upstreamResponse.status, errorText, {
639
666
  statusText: upstreamResponse.statusText,
640
667
  headers,
641
668
  // Provenance, not inference: `errorText` is empty when the bounded read finds nothing
642
669
  // display-safe, and an empty body is exactly what the retryable-429 default fires on.
643
670
  replayRefusal: isReplayRefusalResponse(upstreamResponse),
644
- });
671
+ }));
645
672
  }
646
673
 
647
674
  if (options.nativeControl && isNativeControlResponse(upstreamResponse) && upstreamResponse.body) {
@@ -707,7 +734,7 @@ export async function deliverPassthroughResponse(
707
734
  upstream,
708
735
  terminalRepairPolicy,
709
736
  translatorBudget,
710
- options.responsesTerminalRepairScheduler,
737
+ options.responsesTerminalRepairScheduler, logCtx,
711
738
  )
712
739
  : upstreamResponse.body;
713
740
  passthroughSseBody = webSearchBridgePlan
@@ -749,7 +776,7 @@ export async function deliverPassthroughResponse(
749
776
  upstream,
750
777
  terminalRepairPolicy,
751
778
  translatorBudget,
752
- options.responsesTerminalRepairScheduler,
779
+ options.responsesTerminalRepairScheduler, logCtx,
753
780
  ),
754
781
  continuation,
755
782
  );
@@ -912,7 +939,8 @@ export async function deliverPassthroughResponse(
912
939
  providerExecutedCallTypes,
913
940
  declaredBareWireToolNames,
914
941
  recoverableBareCustomWireToolNames,
915
- { refuseUndeclared: nativeExchange.undeclaredToolGuardActive },
942
+ { refuseUndeclared: nativeExchange.undeclaredToolGuardActive,
943
+ onRefusal: message => rememberProxyErrorMessage(logCtx, message, { status: 502, type: "upstream_error", code: UNDECLARED_TOOL_CALL_ERROR_CODE }) },
916
944
  )
917
945
  : undefined,
918
946
  grokUpstreamEchoEnabled
@@ -1147,7 +1175,7 @@ export async function deliverPassthroughResponse(
1147
1175
  rememberPassthroughResponseChecked(client.terminal.response);
1148
1176
  }
1149
1177
 
1150
- const jsonHeaders = sanitizePassthroughHeaders(headers, codexSafetyBufferingOptions);
1178
+ const jsonHeaders = sanitizePassthroughHeaders(headers, passthroughHeaderOptions);
1151
1179
  jsonHeaders.set("content-type", "application/json");
1152
1180
  return markPreinspectedJsonResponse(new Response(clientJson, {
1153
1181
  status: upstreamResponse.status,
@@ -1415,9 +1443,9 @@ export async function deliverPassthroughResponse(
1415
1443
  }
1416
1444
  })();
1417
1445
  if (undeclared !== undefined) {
1418
- return formatErrorResponse(502, "upstream_error", undeclaredToolCallMessage(undeclared), {
1446
+ return markProxyError(formatErrorResponse(502, "upstream_error", undeclaredToolCallMessage(), {
1419
1447
  code: UNDECLARED_TOOL_CALL_ERROR_CODE,
1420
- });
1448
+ }));
1421
1449
  }
1422
1450
  }
1423
1451
  // Same split as the SSE rewrite: normalization applies whenever a declared name exists,
@@ -1489,7 +1517,7 @@ export async function deliverPassthroughResponse(
1489
1517
  }
1490
1518
  throw error;
1491
1519
  }
1492
- const sseHeaders = sanitizePassthroughHeaders(headers, codexSafetyBufferingOptions);
1520
+ const sseHeaders = sanitizePassthroughHeaders(headers, passthroughHeaderOptions);
1493
1521
  sseHeaders.set("content-type", "text/event-stream");
1494
1522
  sseHeaders.set("cache-control", "no-store");
1495
1523
  return new Response(stream, {
@@ -1537,3 +1565,16 @@ export async function deliverPassthroughResponse(
1537
1565
  headers,
1538
1566
  });
1539
1567
  }
1568
+
1569
+ /**
1570
+ * Model ids the user configured for the selected provider: its models and retention lists and
1571
+ * default. A provider-owned model hint that names one of them is relayed as the proxy's copy.
1572
+ * Live-discovered ids are not trusted here, because the upstream's own /models answer chose them;
1573
+ * neither is the selection list, which a model preset fills from that same discovered catalog.
1574
+ */
1575
+ function providerKnownModels(provider: OcxProviderConfig): string[] {
1576
+ return [
1577
+ ...(provider.models ?? []), ...(provider.retainModels ?? []),
1578
+ ...(provider.defaultModel ? [provider.defaultModel] : []),
1579
+ ];
1580
+ }
@@ -1,3 +1,5 @@
1
+ import { clientFacingModelText } from "../../lib/error-destination";
2
+ import { markProxyError } from "../../lib/client-error-body";
1
3
  import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
2
4
  import { passthroughBuildErrorResponse } from "./passthrough-build-error";
3
5
  import { recoverAutoPausedAccount, rotatePassthroughKeyOn429 } from "./passthrough-key-rotation";
@@ -118,7 +120,7 @@ import type { CodexAuthContext } from "../../codex/auth-context";
118
120
  import { checkOutboundBodySize, describeOutboundBodyRefusal } from "./outbound-body-guard";
119
121
  import { streamingContextOverflowResponse } from "./context-overflow";
120
122
  import {
121
- SendBudgetExhaustedError,
123
+ SendBudgetExhaustedError, errorDestinationLabel,
122
124
  fetchWithTransientRetry,
123
125
  applyUpstreamRecoveryInit,
124
126
  isNonReplayableResponse,
@@ -145,7 +147,7 @@ import { resolveWireProtocolOverride } from "../adapter-resolve";
145
147
  import { refreshPoolForwardAuth, refreshNativeMainForwardAuth, withClaudeNativeSession } from "./core-auth";
146
148
  import { bindRouteReasoningReplayScope } from "./core-replay";
147
149
  import type { OAuthAccessSnapshot } from "../../oauth";
148
- import { OAuthAccountPausedError, OAuthLoginRequiredError, OAuthTokenRefreshBusyError, publicOAuthAuthenticationErrorMessage } from "../../oauth";
150
+ import { publicOAuthErrorPresentation, OAuthAccountPausedError, OAuthLoginRequiredError, OAuthTokenRefreshBusyError, publicOAuthAuthenticationErrorMessage } from "../../oauth";
149
151
  import { AnthropicAccountCooldownError } from "../../oauth/anthropic-routing";
150
152
  import { resolveCopilotApiBaseUrl } from "../../oauth/github-copilot";
151
153
  import {
@@ -841,7 +843,7 @@ export async function preparePassthroughExchange(
841
843
  // Charged to the SAME request counter every other send goes through. The
842
844
  // replacement is bought here rather than by a nested retry helper, so there is
843
845
  // one charge for one send and no per-layer counter to reconcile.
844
- if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(safeHostLabel(request.url));
846
+ if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
845
847
  started = true;
846
848
  },
847
849
  }),
@@ -876,14 +878,14 @@ export async function preparePassthroughExchange(
876
878
  console.warn(
877
879
  `[responses] refused an oversized outbound body: bytes=${result.bytes} limit=${result.limit} `
878
880
  + `input_images=${result.imageCount} image_bytes=${result.imageBytes} `
879
- + `model=${JSON.stringify(parsed.modelId)}`,
881
+ + `model=${JSON.stringify(clientFacingModelText(options.clientModelLabel))}`,
880
882
  );
881
883
  // A streaming client treats HTTP 413 as a retryable transport error and resends the same
882
884
  // oversized body — the reconnect loop #3177 exists to stop. Terminal overflow is the
883
885
  // honest shape, and it is what the upstream-413 path already returns.
884
886
  if (clientRequestedStream) {
885
887
  return streamingContextOverflowResponse(
886
- parsed._responseModelId ?? parsed.modelId,
888
+ clientFacingModelText(options.clientModelLabel),
887
889
  translatorBudget,
888
890
  );
889
891
  }
@@ -911,7 +913,7 @@ export async function preparePassthroughExchange(
911
913
  nativeHostState.lease = null;
912
914
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
913
915
  return unboundPoolSpendRefusalResponse(logCtx)
914
- ?? formatErrorResponse(429, "request_send_budget_exhausted", err.message);
916
+ ?? markProxyError(formatErrorResponse(429, "request_send_budget_exhausted", err.message));
915
917
  }
916
918
  const refusal = unwrapUpstreamRetryEvidenceError(err);
917
919
  if (refusal instanceof CopilotAutoAdapterHandoff) {
@@ -932,12 +934,12 @@ export async function preparePassthroughExchange(
932
934
  nativeHostState.lease = null;
933
935
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
934
936
  if (refusal instanceof OAuthLoginRequiredError) {
935
- return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal));
937
+ return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(refusal)), publicOAuthErrorPresentation(refusal));
936
938
  }
937
939
  if (refusal instanceof AnthropicAccountCooldownError) {
938
940
  return anthropicPoolCooldownResponse(refusal, { comboAttempt: options.comboAttempt, logCtx });
939
941
  }
940
- return formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal));
942
+ return markProxyError(formatErrorResponse(403, "permission_error", publicOAuthAuthenticationErrorMessage(refusal)), publicOAuthErrorPresentation(refusal));
941
943
  }
942
944
  const localRefusal = spendLedgerStorageErrorResponse(err, logCtx) ?? mapCodexAuthContextErrorToResponse(refusal, {
943
945
  now: Date.now(), accountSelector: route.codexAccountNamespace,
@@ -1032,7 +1034,7 @@ export async function preparePassthroughExchange(
1032
1034
  // retry wrapper replaces — proves the host was reached (#914 review).
1033
1035
  .then(adoptObservedResponse).then(preOutputRefusals.observe);
1034
1036
  },
1035
- { abortSignal: upstream.signal, label: safeHostLabel(request.url),
1037
+ { abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
1036
1038
  attempts: sendBudgetState.initialSendAllowance(transientSendAttempts()),
1037
1039
  // Reporter path: direct requests and enforced spend. Receipt-mode sends are settled
1038
1040
  // by `onPhysicalDispatch`; a reporter as well would count them twice.
@@ -1145,7 +1147,7 @@ export async function preparePassthroughExchange(
1145
1147
  // Gated on the return, not fire-and-forget: a consumed permit means this leg
1146
1148
  // already sent once, and letting the second call through would be a free send.
1147
1149
  if (allowance.permit && !allowance.permit.use()) {
1148
- throw new SendBudgetExhaustedError(safeHostLabel(request.url));
1150
+ throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
1149
1151
  }
1150
1152
  transportState.noteRoutedAttemptSend(passthroughEstimate, innerRecovery ?? recovery);
1151
1153
  return fetchWithHeaderTimeout(request.url, applyUpstreamRecoveryInit({
@@ -1169,7 +1171,7 @@ export async function preparePassthroughExchange(
1169
1171
  route.provider.authMode === "forward")
1170
1172
  .then(adoptObservedResponse);
1171
1173
  },
1172
- { abortSignal: upstream.signal, label: safeHostLabel(request.url), attempts: allowance.attempts,
1174
+ { abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url), attempts: allowance.attempts,
1173
1175
  onSendsConsumed: transientSendReporter(allowance.permit),
1174
1176
  claimAmbiguousResend: recovery === "empty-completion" ? undefined : claimPreHeaderResend },
1175
1177
  );
@@ -1311,7 +1313,7 @@ export async function preparePassthroughExchange(
1311
1313
  route.provider.authMode === "forward",
1312
1314
  ).then(adoptObservedResponse);
1313
1315
  },
1314
- { abortSignal: upstream.signal, label: safeHostLabel(request.url),
1316
+ { abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
1315
1317
  attempts: remainingTransientSendBudget(transientSendAttempts()),
1316
1318
  onSendsConsumed: transientSendReporter(), claimAmbiguousResend: claimPreHeaderResend },
1317
1319
  );
@@ -1348,13 +1350,13 @@ export async function preparePassthroughExchange(
1348
1350
  upstream.abort();
1349
1351
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
1350
1352
  if (options.abortSignal?.aborted || req.signal.aborted) return clientCancelledResponse();
1351
- if (err instanceof OAuthTokenRefreshBusyError) return formatErrorResponse(503, "server_error", publicOAuthAuthenticationErrorMessage(err), { retryAfter: "1" });
1352
- return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err));
1353
+ if (err instanceof OAuthTokenRefreshBusyError) return markProxyError(formatErrorResponse(503, "server_error", publicOAuthAuthenticationErrorMessage(err), { retryAfter: "1" }), publicOAuthErrorPresentation(err));
1354
+ return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(err)), publicOAuthErrorPresentation(err));
1353
1355
  }
1354
1356
  if (route.provider.googleMode === "cloud-code-assist" && !refreshed.projectId) {
1355
1357
  upstream.abort();
1356
1358
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
1357
- return formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required")));
1359
+ return markProxyError(formatErrorResponse(401, "authentication_error", publicOAuthAuthenticationErrorMessage(new Error("Cloud Code Assist project is required"))));
1358
1360
  }
1359
1361
  transportState.sentOAuthSnapshot = refreshed;
1360
1362
  transportState.replayOAuthCredentialSnapshot = {
@@ -1436,7 +1438,7 @@ export async function preparePassthroughExchange(
1436
1438
  route.provider.authMode === "forward")
1437
1439
  .then(adoptObservedResponse);
1438
1440
  },
1439
- { abortSignal: upstream.signal, label: safeHostLabel(request.url), attempts: remainingTransientSendBudget(transientSendAttempts()),
1441
+ { abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url), attempts: remainingTransientSendBudget(transientSendAttempts()),
1440
1442
  onSendsConsumed: transientSendReporter(), claimAmbiguousResend: claimPreHeaderResend },
1441
1443
  );
1442
1444
  } catch (err) {
@@ -1583,7 +1585,7 @@ export async function preparePassthroughExchange(
1583
1585
  route.provider.authMode === "forward")
1584
1586
  .then(adoptObservedResponse);
1585
1587
  },
1586
- { abortSignal: upstream.signal, label: safeHostLabel(request.url), attempts: remainingTransientSendBudget(transientSendAttempts()),
1588
+ { abortSignal: upstream.signal, label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url), attempts: remainingTransientSendBudget(transientSendAttempts()),
1587
1589
  onSendsConsumed: transientSendReporter(), claimAmbiguousResend: claimPreHeaderResend },
1588
1590
  );
1589
1591
  } catch (err) {
@@ -1908,7 +1910,7 @@ export async function preparePassthroughExchange(
1908
1910
  error,
1909
1911
  {
1910
1912
  abortSignal: upstream.signal,
1911
- label: safeHostLabel(request.url),
1913
+ label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
1912
1914
  attempts: remainingTransientSendBudget(transientSendAttempts()),
1913
1915
  // The whole decision, including the stage the preflight observed and the grant the
1914
1916
  // pre-header helper shares. A committed stage refuses here without touching the
@@ -7,8 +7,8 @@ import {
7
7
  UPSTREAM_RESET_REPLAY_REFUSED_CODE,
8
8
  } from "../../lib/upstream-retry";
9
9
  import {
10
+ formatClientRetryAfter,
10
11
  resolveClientRetryAfter,
11
- validateClientRetryAfterHeader,
12
12
  } from "../../lib/retry-after";
13
13
 
14
14
  function isCyberPolicyBody(body: string): boolean {
@@ -93,7 +93,6 @@ export function formatPassthroughUpstreamError(
93
93
  const trimmed = bodyText.trim();
94
94
  const now = options?.now ?? Date.now();
95
95
  const upstreamRetryAfter = options?.headers?.get("retry-after")?.trim() || undefined;
96
- const originalValid = validateClientRetryAfterHeader(upstreamRetryAfter, now);
97
96
  const cyberPolicyFailure = isCyberPolicyBody(trimmed);
98
97
  const replayRefusal = options?.replayRefusal === true || isReplayRefusalBody(trimmed);
99
98
  // Two different reasons to answer with no wait at all, handled the same way: a hard policy
@@ -108,12 +107,12 @@ export function formatPassthroughUpstreamError(
108
107
  now,
109
108
  });
110
109
 
110
+ // The header leaves in this proxy's own format: an integer of seconds, never the upstream bytes.
111
+ const formatted = resolved === undefined ? undefined : formatClientRetryAfter(resolved, now);
112
+
111
113
  if (trimmed) {
112
- const needsSet = resolved !== undefined && upstreamRetryAfter !== resolved;
113
- const needsDelete = (suppressRetryAfter && upstreamRetryAfter !== undefined)
114
- || (resolved === undefined
115
- && upstreamRetryAfter !== undefined
116
- && originalValid === undefined);
114
+ const needsSet = formatted !== undefined && upstreamRetryAfter !== formatted;
115
+ const needsDelete = formatted === undefined && upstreamRetryAfter !== undefined;
117
116
 
118
117
  // A refusal always takes the rewriting path: it has a header to add even when the
119
118
  // upstream named no wait for it to remove.
@@ -128,7 +127,7 @@ export function formatPassthroughUpstreamError(
128
127
  const headers = options?.headers
129
128
  ? new Headers(options.headers)
130
129
  : new Headers({ "Content-Type": "application/json" });
131
- if (needsSet) headers.set("Retry-After", resolved!);
130
+ if (needsSet) headers.set("Retry-After", formatted!);
132
131
  else headers.delete("Retry-After");
133
132
  if (replayRefusal) applyReplayRefusalClientHeaders(headers);
134
133
  const rewritten = new Response(bodyText, {
@@ -152,7 +151,8 @@ export function formatPassthroughUpstreamError(
152
151
  );
153
152
  const headers = new Headers(response.headers);
154
153
  headers.set("Content-Type", "application/json");
155
- if (resolved !== undefined) headers.set("Retry-After", resolved);
154
+ if (formatted !== undefined) headers.set("Retry-After", formatted);
155
+ else headers.delete("Retry-After");
156
156
  if (replayRefusal) applyReplayRefusalClientHeaders(headers);
157
157
  const wrapped = new Response(response.body, { status: response.status, headers });
158
158
  return replayRefusal ? retainReplayRefusal(wrapped) : wrapped;
@@ -16,6 +16,7 @@ import { routeConcreteModel } from "../../router";
16
16
  import { isPolicyCandidateRefusal, policyWireDestination, type PolicyRequestScope } from "./policy-request-scope";
17
17
  import { fallbackTriggerForStatus, guardFallbackHop } from "../../routing/fallback-policy";
18
18
  import { captureAdmissionPolicy } from "../capture-admission-policy";
19
+ import { upstreamCodeForComboFailure } from "../../bridge/errors";
19
20
 
20
21
  type CoreHandler = typeof handleResponsesCore;
21
22
  type CoreOptions = Parameters<CoreHandler>[3];
@@ -133,7 +134,7 @@ async function shouldHopPolicyCandidate(response: Response, signal?: AbortSignal
133
134
  const inspected = await readBoundedResponseBody(response.clone(), { signal });
134
135
  const text = inspected.displaySafe && !inspected.truncated ? inspected.text : "";
135
136
  return comboFailureDecision(response.status, text, {
136
- code: errorCodeFromText(text),
137
+ code: upstreamCodeForComboFailure(response, errorCodeFromText(text)),
137
138
  // A passthrough candidate returns its upstream body unchanged, so the code is not provenance.
138
139
  verifiedPlanRefusal: isVerifiedModelNotInPlanResponse(response),
139
140
  }) === "hop";