@bitkyc08/opencodex 2.100.2 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -3,6 +3,7 @@ import { gunzipSync, inflateRawSync, inflateSync, zstdDecompressSync } from "nod
3
3
  import type { TranslatorBudget } from "../lib/translator-budget";
4
4
  import { updateInboundBodyReservation } from "./inbound-body-budget";
5
5
  import { serializedJsonByteLength } from "./json-serialized-bytes";
6
+ import { recordRequestBodyFacts } from "./request-body-facts";
6
7
 
7
8
  /**
8
9
  * Request-body decompression for the /v1/responses data plane.
@@ -75,6 +76,24 @@ function megabytes(bytes: number): string | null {
75
76
 
76
77
  const INBOUND_CEILING_MB = (MAX_CONFIGURABLE_INBOUND_BODY_BYTES / (1024 * 1024)).toFixed(1);
77
78
 
79
+ /**
80
+ * Compression-bomb bound (#3023). A zstd frame of about 8 KiB inflates to 256 MiB, and the
81
+ * concurrent inbound budget reserves only the bytes on the wire, so the absolute limit alone lets
82
+ * a few tiny requests allocate the whole budget many times over. Now that Remote Link Children send
83
+ * zstd bodies by default, every encoded body may decode to at most
84
+ * max(COMPRESSED_BODY_RATIO_FLOOR_BYTES, COMPRESSED_BODY_RATIO_LIMIT x its wire bytes), and never
85
+ * past the absolute limit. zlib stops inflating at that size, so memory and time are bounded by it.
86
+ * 200 follows Apache mod_deflate's DeflateInflateRatioLimit; agent request bodies measured about
87
+ * 2.5x, and a body that decodes to 8 MiB or less is never refused for its ratio.
88
+ */
89
+ export const COMPRESSED_BODY_RATIO_LIMIT = 200;
90
+ export const COMPRESSED_BODY_RATIO_FLOOR_BYTES = 8 * 1024 * 1024;
91
+
92
+ /** The most an encoded body of `wireBytes` may decode to under `maxBytes`. */
93
+ export function compressedBodyDecodeLimit(wireBytes: number, maxBytes: number): number {
94
+ return Math.min(maxBytes, Math.max(COMPRESSED_BODY_RATIO_FLOOR_BYTES, wireBytes * COMPRESSED_BODY_RATIO_LIMIT));
95
+ }
96
+
78
97
 
79
98
  export class UnsupportedContentEncodingError extends Error {
80
99
  constructor(readonly encoding: string) {
@@ -120,6 +139,7 @@ export class DecompressedBodyTooLargeError extends Error {
120
139
  * as evidence of an upstream context verdict.
121
140
  */
122
141
  export function describeInboundBodyRefusal(error: DecompressedBodyTooLargeError): string {
142
+ if (error instanceof CompressionRatioExceededError) return error.message;
123
143
  // A lower-bound measurement stopped counting at the cap; reporting it as exact would be a lie.
124
144
  const approximate = error.measurement === "declared_wire" || error.measurement === "decoded_exact"
125
145
  ? "" : "at least ";
@@ -136,6 +156,18 @@ export function describeInboundBodyRefusal(error: DecompressedBodyTooLargeError)
136
156
  + "conversation earlier.";
137
157
  }
138
158
 
159
+ /** An encoded body that would decode past its ratio bound; inflation stopped there. */
160
+ export class CompressionRatioExceededError extends DecompressedBodyTooLargeError {
161
+ constructor(readonly wireBytes: number, readonly ratioLimitBytes: number, limit: number) {
162
+ super(ratioLimitBytes + 1, limit, "decoded_lower_bound");
163
+ this.name = "CompressionRatioExceededError";
164
+ const decoded = megabytes(ratioLimitBytes) ?? "the";
165
+ this.message = `OpenCodex refused this request before reading it: its compressed body (${Number.isSafeInteger(wireBytes) ? wireBytes : "?"} bytes) `
166
+ + `expands past ${decoded} MB, more than ${COMPRESSED_BODY_RATIO_LIMIT} times its size. This is a local guard against `
167
+ + "compression bombs, not a provider refusal; send the body uncompressed or with less repeated content.";
168
+ }
169
+ }
170
+
139
171
  function assertBodySizeWithinLimit(
140
172
  body: Uint8Array,
141
173
  maxBytes: number,
@@ -269,8 +301,9 @@ export function decodeRequestBody(
269
301
  const compressed = raw as Uint8Array<ArrayBuffer>;
270
302
  // `maxOutputLength` makes zlib abort DURING inflation (ERR_BUFFER_TOO_LARGE), so a
271
303
  // decompression bomb never allocates beyond the cap — checking after the fact would
272
- // already have paid the full allocation (review finding, PR #96).
273
- const opts = { maxOutputLength: maxBytes };
304
+ // already have paid the full allocation (review finding, PR #96). The cap is the ratio bound.
305
+ const decodeLimit = compressedBodyDecodeLimit(raw.byteLength, maxBytes);
306
+ const opts = { maxOutputLength: decodeLimit };
274
307
  let decoded: Uint8Array;
275
308
  try {
276
309
  if (encoding === "zstd") decoded = zstdDecompressSync(compressed, opts);
@@ -280,6 +313,7 @@ export function decodeRequestBody(
280
313
  else throw new UnsupportedContentEncodingError(encoding);
281
314
  } catch (err) {
282
315
  if ((err as NodeJS.ErrnoException | null)?.code === "ERR_BUFFER_TOO_LARGE") {
316
+ if (decodeLimit < maxBytes) throw new CompressionRatioExceededError(raw.byteLength, decodeLimit, maxBytes);
283
317
  // Inflation stopped at the cap; the full decoded size was never measured.
284
318
  throw new DecompressedBodyTooLargeError(maxBytes + 1, maxBytes, "decoded_lower_bound");
285
319
  }
@@ -325,6 +359,7 @@ export async function readBoundedJsonRequestBody(
325
359
  let releaseText: (() => void) | undefined;
326
360
  try {
327
361
  const decoded = decodeRequestBody(raw, encoding, maxBytes);
362
+ recordRequestBodyFacts(req, raw.byteLength, encoding, decoded.byteLength);
328
363
  releaseDecoded = decoded === raw ? undefined : budget?.observeAcceptedRequestCopy(decoded.byteLength);
329
364
  const text = new TextDecoder().decode(decoded);
330
365
  // Count UTF-8 without allocating another request-sized byte array for diagnostics.
@@ -360,3 +395,31 @@ export function readJsonRequestBody(
360
395
  ): Promise<unknown> {
361
396
  return readBoundedJsonRequestBody(req, maxBytes, budget);
362
397
  }
398
+
399
+ /**
400
+ * Admit a body the caller already parsed (a Remote Link WebSocket create, #8600) as if it had been read: its serialized
401
+ * size is held to the same limit and observed by the same budget as the parse at the end of the bounded reader.
402
+ */
403
+ export function admitParsedJsonRequestBody(body: unknown, maxBytes: number, budget?: TranslatorBudget): unknown {
404
+ const parsedBytes = serializedJsonByteLength(body);
405
+ if (parsedBytes > maxBytes) throw new DecompressedBodyTooLargeError(parsedBytes, maxBytes, "decoded_exact");
406
+ budget?.observeAcceptedRequestCopy(parsedBytes);
407
+ return body;
408
+ }
409
+
410
+ /**
411
+ * A parsed body bound to the one Request it stands for (#8600). It goes with that request alone: a request the pipeline
412
+ * builds for a combo child, a recovery or a retry is another Request and reads its own body. Taken once, like a body.
413
+ */
414
+ const parsedBodies = new WeakMap<Request, unknown>();
415
+
416
+ export function attachParsedRequestBody(req: Request, body: unknown): void {
417
+ parsedBodies.set(req, body);
418
+ }
419
+
420
+ export function takeParsedRequestBody(req: Request): { body: unknown } | undefined {
421
+ if (!parsedBodies.has(req)) return undefined;
422
+ const body = parsedBodies.get(req);
423
+ parsedBodies.delete(req);
424
+ return { body };
425
+ }
@@ -1,4 +1,5 @@
1
1
  import { ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
2
+ import { anthropicAccountTag } from "../providers/label";
2
3
  import { isCodexUsageAccountLogLabel, type PersistedUsageAttempt } from "../usage/log";
3
4
 
4
5
  /**
@@ -42,6 +43,11 @@ export function sealRequestAttemptIdentity(
42
43
  attempt.adapter = adapter;
43
44
  if (attempt.sendCount === 0) {
44
45
  attempt.provider = provider;
46
+ // The Anthropic pool tag is a pure function of this frozen provider, so a failover split
47
+ // (a fresh attempt sealed with the next account's provider) carries the next account's tag.
48
+ const accountTag = anthropicAccountTag(provider);
49
+ if (accountTag) attempt.accountTag = accountTag;
50
+ else delete attempt.accountTag;
45
51
  if (isCodexUsageAccountLogLabel(accountLogLabel)) attempt.accountLogLabel = accountLogLabel;
46
52
  else delete attempt.accountLogLabel;
47
53
  return;
@@ -0,0 +1,69 @@
1
+ import { usageTotalTokens, type PersistedUsageAttempt, type UsageStatus } from "../usage/log";
2
+ import type { OcxUsage } from "../types";
3
+
4
+ interface FinalizedUsageResult {
5
+ usage?: OcxUsage;
6
+ status: UsageStatus;
7
+ totalTokens?: number;
8
+ }
9
+
10
+ export function aggregateAttemptUsage(
11
+ attempts: readonly PersistedUsageAttempt[],
12
+ ): FinalizedUsageResult {
13
+ // A usage-less attempt that never reached upstream spent nothing (summary.ts `spentNothing`),
14
+ // so it cannot leave the row's usage unknown.
15
+ const measured = attempts.filter(attempt => attempt.usage
16
+ || (attempt.sendCount !== 0 && attempt.locallyAnswered !== true));
17
+ const status: UsageStatus = measured.length > 0
18
+ && measured.every(attempt => attempt.usageStatus === "unsupported")
19
+ ? "unsupported"
20
+ : measured.some(attempt => (
21
+ attempt.usageStatus === "unreported" || attempt.usageStatus === "unsupported"
22
+ ))
23
+ ? "unreported"
24
+ : measured.some(attempt => attempt.usageStatus === "estimated")
25
+ ? "estimated"
26
+ : measured.length > 0
27
+ ? "reported"
28
+ : "unreported";
29
+
30
+ const usages = attempts.flatMap(attempt => attempt.usage ? [attempt.usage] : []);
31
+ if (usages.length === 0) return { status };
32
+
33
+ const sumOptional = (
34
+ key: "cachedInputTokens" | "cacheReadInputTokens" | "cacheCreationInputTokens" | "cacheCreation1hInputTokens"
35
+ | "reasoningOutputTokens" | "providerCredits",
36
+ ): number | undefined => {
37
+ const present = usages.flatMap(usage => (
38
+ typeof usage[key] === "number" ? [usage[key] as number] : []
39
+ ));
40
+ return present.length > 0 ? present.reduce((sum, value) => sum + value, 0) : undefined;
41
+ };
42
+ const cachedInputTokens = sumOptional("cachedInputTokens");
43
+ // Readers take `cacheReadInputTokens ?? cachedInputTokens` (usage/cost.ts), so once any attempt
44
+ // reports the read field, an attempt that only reports `cachedInputTokens` must count in it too.
45
+ const cacheReadInputTokens = sumOptional("cacheReadInputTokens") === undefined ? undefined
46
+ : usages.reduce((sum, usage) => sum + (usage.cacheReadInputTokens ?? usage.cachedInputTokens ?? 0), 0);
47
+ const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
48
+ const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
49
+ const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
50
+ const providerCredits = sumOptional("providerCredits");
51
+ const totalTokens = usages.reduce(
52
+ (sum, usage) => sum + (usageTotalTokens(usage) ?? 0),
53
+ 0,
54
+ );
55
+ const aggregate: OcxUsage = {
56
+ inputTokens: usages.reduce((sum, usage) => sum + usage.inputTokens, 0),
57
+ outputTokens: usages.reduce((sum, usage) => sum + usage.outputTokens, 0),
58
+ totalTokens,
59
+ ...(cachedInputTokens !== undefined ? { cachedInputTokens } : {}),
60
+ ...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
61
+ ...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
62
+ ...(cacheCreation1hInputTokens !== undefined ? { cacheCreation1hInputTokens } : {}),
63
+ ...(reasoningOutputTokens !== undefined ? { reasoningOutputTokens } : {}),
64
+ ...(providerCredits !== undefined ? { providerCredits } : {}),
65
+ ...(status === "estimated" ? { estimated: true } : {}),
66
+ ...(usages.every(usage => usage.upstreamReported) ? { upstreamReported: true as const } : {}),
67
+ };
68
+ return { usage: aggregate, status, totalTokens };
69
+ }
@@ -0,0 +1,60 @@
1
+ import {
2
+ boundEntryIdForLane,
3
+ recordProviderCacheAffinity,
4
+ releaseProviderCacheAffinity,
5
+ } from "../providers/cache-affinity";
6
+ import { isAnthropicBillingFailure } from "../providers/anthropic-billing-refusal";
7
+ import type { OcxUsage } from "../types";
8
+ import type { RequestLogContext } from "./request-log";
9
+ import { loadConfig } from "../config";
10
+ import { capturedCacheAffinityIdentity, currentCacheAffinityIdentity } from "../providers/cache-affinity-identity";
11
+
12
+ /** Finalize against the serving credential, never a logical combo's display label. */
13
+ export function finalizeProviderCacheAffinity(
14
+ logCtx: RequestLogContext,
15
+ status: number,
16
+ usage: OcxUsage | undefined,
17
+ ): void {
18
+ const {
19
+ affinityLane: lane,
20
+ affinityKeyEntryId: entryId,
21
+ affinityProviderName: providerName,
22
+ } = logCtx;
23
+ if (!lane || !entryId || !providerName || logCtx.cacheAffinityApplicable !== true) return;
24
+ const identity = capturedCacheAffinityIdentity(logCtx);
25
+ if (!identity || identity !== currentCacheAffinityIdentity(providerName, loadConfig().providers[providerName], entryId)) return;
26
+ if (status >= 200 && status < 300 && logCtx.observedTerminalStatus !== "failed") {
27
+ const previouslyBound = boundEntryIdForLane(lane);
28
+ recordProviderCacheAffinity({
29
+ lane,
30
+ providerName,
31
+ entryId,
32
+ identity,
33
+ model: logCtx.affinityModel ?? logCtx.model,
34
+ cacheRead: usage?.cacheReadInputTokens ?? usage?.cachedInputTokens,
35
+ cacheWrite: usage?.cacheCreationInputTokens,
36
+ cacheWriteLong: usage?.cacheCreation1hInputTokens,
37
+ inputTokens: usage?.inputTokens,
38
+ });
39
+ if (logCtx.cacheAffinity === "kept" && logCtx.affinityKeptEntryId !== entryId) {
40
+ logCtx.cacheAffinity = "bound";
41
+ logCtx.cacheAffinityReason = "new";
42
+ } else if (!logCtx.cacheAffinity) {
43
+ logCtx.cacheAffinity = previouslyBound === entryId ? "kept" : "bound";
44
+ logCtx.cacheAffinityReason = previouslyBound === entryId ? "cache" : "new";
45
+ }
46
+ } else if (
47
+ logCtx.terminalSource !== "synthetic" &&
48
+ (status === 401 ||
49
+ status === 402 ||
50
+ status === 429 ||
51
+ (logCtx.providerAdapter === "anthropic" &&
52
+ isAnthropicBillingFailure(status, logCtx.upstreamError ?? "", logCtx.upstreamErrorType)))
53
+ ) {
54
+ // Only this request's refusal is evidence. A shared cooldown may have been
55
+ // written by another conversation while this request was in flight.
56
+ if (!releaseProviderCacheAffinity(lane, providerName, entryId, identity)) return;
57
+ logCtx.cacheAffinity = "released";
58
+ logCtx.cacheAffinityReason = status === 401 ? "auth" : "quota";
59
+ }
60
+ }
@@ -2,7 +2,9 @@
2
2
  * Best-effort chat/session correlation for Logs / usage.jsonl (#330).
3
3
  * Opaque ids only — never persist raw emails or Claude Desktop system-hash fallbacks.
4
4
  */
5
- import { createHash, randomUUID } from "node:crypto";
5
+ import { createHash, createHmac, randomBytes, randomUUID } from "node:crypto";
6
+ import type { OcxConfig } from "../types";
7
+ import { resolveContextPrincipal, type DataPlaneAdmission } from "./auth-cors";
6
8
 
7
9
  /** Reject absurdly long client strings before hashing (DoS / JSONL bloat). */
8
10
  export const LOG_CONVERSATION_ID_INPUT_MAX = 4096;
@@ -75,7 +77,9 @@ export function unwrapLogConversationQuery(query: string): string {
75
77
  export function logConversationQueryCandidates(query: string): string[] {
76
78
  const trimmed = query.trim();
77
79
  const unwrapped = unwrapLogConversationQuery(trimmed);
78
- return unwrapped === trimmed ? [unwrapped] : [unwrapped, trimmed];
80
+ // A pasted Claude Code metadata.user_id is stored without its per-turn `tk`.
81
+ const session = trimmed.length > LOG_CONVERSATION_ID_INPUT_MAX ? trimmed : claudeSessionUserId(trimmed);
82
+ return [...new Set([unwrapped, trimmed, session])];
79
83
  }
80
84
 
81
85
  /**
@@ -128,6 +132,42 @@ export function sessionLaneIdFromRequest(headers: Headers): string | undefined {
128
132
  return specific ?? parent;
129
133
  }
130
134
 
135
+ /**
136
+ * The affinity lane a request binds under, derived once so every entry path agrees.
137
+ *
138
+ * `sessionLaneIdFromRequest` first (explicit thread/session/parent identity), then the
139
+ * explicit `x-opencode-session` header the Claude-Go handoff and
140
+ * `getOrAllocateRequestSessionLane` already treat as lane identity, then the log
141
+ * conversation id — except the Hermes digest, which is log correlation only and must
142
+ * never affect lanes or routing (#330). This expression used to be inlined at four
143
+ * entry paths and drifted: three of the four missed the `x-opencode-session` fallback
144
+ * until PR #7738 aligned them.
145
+ *
146
+ * Scope authenticated lanes to the admitted principal with a process-local HMAC. A translated
147
+ * request carries the principal captured before its caller credential was stripped. Loopback
148
+ * without a recognized credential retains the existing local lane; an authenticated admission
149
+ * without a principal cannot bind. The distinct prefix prevents local lanes from colliding.
150
+ */
151
+ const AFFINITY_SCOPE_KEY = randomBytes(32);
152
+
153
+ export function affinityLaneFromRequest(
154
+ req: Request,
155
+ slot: LogConversationSlot,
156
+ config: OcxConfig,
157
+ admission?: DataPlaneAdmission,
158
+ capturedPrincipal?: Readonly<{ clientPrincipalId: string | undefined }>,
159
+ ): string | undefined {
160
+ const lane = sessionLaneIdFromRequest(req.headers)
161
+ ?? normalizeLogConversationId(req.headers.get("x-opencode-session"))
162
+ ?? (slot.conversationIdIsHermesFallback ? undefined : normalizeLogConversationId(slot.conversationId));
163
+ if (!lane) return undefined;
164
+ const principal = capturedPrincipal ? capturedPrincipal.clientPrincipalId : resolveContextPrincipal(req, config, admission);
165
+ if (principal) return `principal:${createHmac("sha256", AFFINITY_SCOPE_KEY).update(JSON.stringify([principal, lane])).digest("hex")}`;
166
+ // An authenticated admission with no identity must not join any other caller's lane.
167
+ if (admission && admission.kind !== "loopback") return undefined;
168
+ return lane;
169
+ }
170
+
131
171
  function firstSanitizedConversationId(
132
172
  ...values: Array<string | null | undefined>
133
173
  ): string | undefined {
@@ -227,6 +267,7 @@ export function fillHermesLogConversationFallback(slot: LogConversationSlot, hea
227
267
  * Any other user_id, including one that is nothing but `tk`, is returned unchanged.
228
268
  */
229
269
  export function claudeSessionUserId(userId: string): string {
270
+ if (!userId.trimStart().startsWith("{")) return userId;
230
271
  try {
231
272
  const parsed: unknown = JSON.parse(userId);
232
273
  if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) && "tk" in parsed) {
@@ -245,6 +286,8 @@ export function conversationIdFromClaudeMetadata(
245
286
  metadata: { user_id?: unknown } | null | undefined,
246
287
  ): string | undefined {
247
288
  if (!metadata || typeof metadata.user_id !== "string") return undefined;
289
+ // Too long to persist: skip parsing a blob normalizeLogConversationId rejects anyway.
290
+ if (metadata.user_id.trim().length > LOG_CONVERSATION_ID_INPUT_MAX) return undefined;
248
291
  return normalizeLogConversationId(claudeSessionUserId(metadata.user_id));
249
292
  }
250
293
 
@@ -1,3 +1,6 @@
1
+ // Re-exported so request-log.ts reaches the Remote Link turn seam through an import it already has.
2
+ export { notifyLinkTurnFinal } from "./link-turn";
3
+ export { linkLogField, type LinkRequestLogCarrier } from "../usage/link-log-fields";
1
4
  import {
2
5
  CYBER_POLICY_ERROR_CODE,
3
6
  httpStatusFromTerminalError,
@@ -5,11 +8,12 @@ import {
5
8
  isCyberPolicyMessage,
6
9
  isRateLimitOrQuotaFailureMessage,
7
10
  recognizedUpstreamError,
11
+ upstreamErrorMessageFromPayload,
8
12
  } from "../lib/errors";
9
13
  import { redactSecretString } from "../lib/redact";
10
- import { outboundCredentials, type OutboundCredentialRegistry } from "../lib/outbound-credential-registry";
11
- import { configuredCredentials, type ConfiguredCredentials } from "./configured-credentials";
12
- import { codexWsWrapperStatus } from "./responses/codex-ws-wire";
14
+ import { SENT_VALUE_GUARD_SCAN_CHARS, outboundCredentials, type OutboundCredentialRegistry } from "../lib/outbound-credential-registry";
15
+ import { configuredCredentials, containsConfiguredCredentialExcerpt, type ConfiguredCredentials } from "./configured-credentials";
16
+ import { isUntypedBareUpstreamError, reduceBareUpstreamEvidence, wrappedServerErrorStatus, type BareUpstreamError, type BareUpstreamEvidence } from "./bare-upstream-error";
13
17
 
14
18
  /** First bounded upstream diagnostics shared by request contexts and final rows. */
15
19
  export interface UpstreamErrorDiagnostics {
@@ -21,6 +25,7 @@ export interface UpstreamErrorDiagnostics {
21
25
  interface TerminalStatusContext extends UpstreamErrorDiagnostics {
22
26
  terminalHttpStatus?: number;
23
27
  terminalErrorCode?: typeof CYBER_POLICY_ERROR_CODE;
28
+ upstreamError?: string;
24
29
  }
25
30
 
26
31
  export interface UpstreamErrorPayload {
@@ -41,6 +46,9 @@ export interface UpstreamErrorPayload {
41
46
  // Bare error evidence is provisional: only a genuine terminal owns account-health status.
42
47
  const provisionalStatuses = new WeakMap<TerminalStatusContext, number>();
43
48
  const genuineTerminals = new WeakSet<TerminalStatusContext>();
49
+ // The winning bare verdict owns the row's status, refusal identity and diagnostic copy together,
50
+ // so a later losing frame cannot leave the status from one frame beside the copy of another.
51
+ const bareEvidence = new WeakMap<TerminalStatusContext, BareUpstreamEvidence>();
44
52
 
45
53
  const UPSTREAM_DIAGNOSTIC_TOKEN = /^[A-Za-z0-9_.:-]{1,128}$/;
46
54
 
@@ -81,6 +89,8 @@ function noteBoundedDiagnostic(
81
89
  if (!isSafeDiagnosticToken(value)) return;
82
90
  if (field === "upstreamErrorType" && !KNOWN_UPSTREAM_ERROR_TYPES.has(value)) return;
83
91
  if (!diagnosticValueAllowed(value)) return;
92
+ // Closed vocabulary is public; anything else is refused when it repeats a value this request sent.
93
+ if (!isClosedDiagnosticVocabulary(field, value) && repeatsRequestSentValue(logCtx, value)) return;
84
94
  logCtx[field] = value;
85
95
  const status = logCtx.terminalHttpStatus;
86
96
  if (status === undefined || status >= 500) {
@@ -104,21 +114,207 @@ export function diagnosticValueAllowed(
104
114
  configured: ConfiguredCredentials = configuredCredentials(),
105
115
  ): boolean {
106
116
  if (!registry.complete() || !configured.complete) return false;
107
- return !registry.matches(value) && !configured.matches(value);
117
+ return !registry.matches(value) && !configured.matches(value) && !containsConfiguredCredentialExcerpt(value);
118
+ }
119
+
120
+ /**
121
+ * Row copy taken from upstream text: pattern-redacted and bounded, or wholly redacted when it
122
+ * repeats a configured credential or one this process sent. Every row-copy write uses it, so no
123
+ * ordering of frames can store an echoed credential through a pattern-only path.
124
+ */
125
+ export function guardedRowCopy(logCtx: TerminalStatusContext, text: string): string {
126
+ const head = text.length > SENT_VALUE_GUARD_SCAN_CHARS ? text.slice(0, SENT_VALUE_GUARD_SCAN_CHARS) : text;
127
+ return diagnosticValueAllowed(head) && !repeatsRequestSentValue(logCtx, head) ? redactSecretString(head).slice(0, 500) : "[REDACTED]";
128
+ }
129
+
130
+ /**
131
+ * The sent-value guard of the request a row belongs to, registered by its delivery path. The global
132
+ * registry can evict a value or miss an excerpt; this request's own headers do not.
133
+ */
134
+ const requestSentValueGuards = new WeakMap<object, (text: string) => boolean>();
135
+
136
+ export function noteRequestSentValueGuard(logCtx: TerminalStatusContext, guard: (text: string) => boolean): void {
137
+ requestSentValueGuards.set(logCtx, guard);
138
+ }
139
+
140
+ function repeatsRequestSentValue(logCtx: object, text: string): boolean {
141
+ return requestSentValueGuards.get(logCtx)?.(text) === true;
142
+ }
143
+
144
+ function isClosedDiagnosticVocabulary(field: string, value: string): boolean {
145
+ return (field === "upstreamErrorType" && KNOWN_UPSTREAM_ERROR_TYPES.has(value))
146
+ || (field === "upstreamErrorCode" && KNOWN_BARE_ERROR_CODES.has(value));
108
147
  }
109
148
 
110
149
  export function noteUpstreamRequestId(logCtx: TerminalStatusContext, headers: Headers): void {
111
150
  noteBoundedDiagnostic(logCtx, "upstreamRequestId", headers.get("openai-request-id") ?? headers.get("x-request-id"));
112
151
  }
113
152
 
114
- export function captureUpstreamTerminalDiagnostics(logCtx: TerminalStatusContext, json: UpstreamErrorPayload): void {
115
- captureTerminalHttpStatus(logCtx, json);
116
- noteBoundedDiagnostic(logCtx, "upstreamErrorCode",
117
- json.error?.code ?? json.last_error?.code ?? json.response?.error?.code
118
- // A bare top-level code (new in 2.83.0) has no envelope contract, so only a known class is kept.
119
- ?? (typeof json.code === "string" && KNOWN_BARE_ERROR_CODES.has(json.code) ? json.code : undefined));
120
- noteBoundedDiagnostic(logCtx, "upstreamErrorType",
121
- json.error?.type ?? json.last_error?.type ?? json.response?.error?.type);
153
+ /**
154
+ * Exact payload texts the relay synthesized as bare-verdict tails for this request, registered by
155
+ * the relay as it frames them (passthrough-delivery's onSyntheticTail). A client-stream reader
156
+ * (the WebSocket log) sees those tails beside upstream frames; only a registered text is the
157
+ * relay's own, however closely a genuine upstream terminal resembles it. Each entry matches once.
158
+ */
159
+ const relaySyntheticTails = new WeakMap<TerminalStatusContext, Array<{ payload: string; verdict?: BareUpstreamError }>>();
160
+
161
+ /**
162
+ * The verdict travels with its tail: the relay withholds an untyped envelope from the client, so a
163
+ * client-stream reader sees only the tail and records the verdict it renders.
164
+ */
165
+ export function noteRelaySyntheticTail(logCtx: TerminalStatusContext, payload: string, verdict?: BareUpstreamError): void {
166
+ const tails = relaySyntheticTails.get(logCtx) ?? [];
167
+ tails.push({ payload, verdict });
168
+ if (tails.length > 4) tails.shift();
169
+ relaySyntheticTails.set(logCtx, tails);
170
+ }
171
+
172
+ function consumeRelaySyntheticTail(logCtx: TerminalStatusContext, json: UpstreamErrorPayload): { verdict?: BareUpstreamError } | undefined {
173
+ const tails = relaySyntheticTails.get(logCtx);
174
+ if (!tails?.length) return undefined;
175
+ // The relay serializes with JSON.stringify, so the parsed frame re-serializes to the same text.
176
+ const text = JSON.stringify(json);
177
+ const index = tails.findIndex(tail => tail.payload === text);
178
+ if (index < 0) return undefined;
179
+ const [tail] = tails.splice(index, 1);
180
+ return tail;
181
+ }
182
+
183
+ /**
184
+ * Returns false when the frame is a bare frame after a genuine terminal: it owns nothing on the
185
+ * row, so the caller must not fall back to recording its copy either.
186
+ */
187
+ export function captureUpstreamTerminalDiagnostics(logCtx: TerminalStatusContext, json: UpstreamErrorPayload, untypedSse = false): boolean {
188
+ const type = json.type;
189
+ const terminal = type === "response.completed" || type === "response.failed" || type === "response.incomplete";
190
+ if (terminal) {
191
+ // A genuine terminal supersedes every provisional bare verdict: it retires the evidence and
192
+ // owns the row through the terminal classifier. Without this split the reducer's "no new
193
+ // evidence" result would be read as "keep the previous bare verdict" and the terminal would
194
+ // never claim the row.
195
+ const prior = bareEvidence.get(logCtx);
196
+ // A policy verdict is itself the turn's terminal: the client stream ended on it. A reader that
197
+ // keeps inspecting (the metadata consumer, the WS observer) may see a later genuine terminal,
198
+ // which owns nothing on the row, exactly like a bare frame after a genuine terminal.
199
+ if (prior?.terminal === true) return false;
200
+ genuineTerminals.add(logCtx);
201
+ // A reader of the client stream (the WebSocket log) also sees the relay's own synthesized
202
+ // response.failed. It renders the winning bare verdict, so the row keeps that verdict, and the
203
+ // evidence stays for the final row's code, instead of inferring a different class from the
204
+ // provider copy it carries. The relay withholds untyped envelopes from the client, so such a
205
+ // reader may meet the tail first; it records the verdict the tail carries.
206
+ const tail = type === "response.failed" ? consumeRelaySyntheticTail(logCtx, json) : undefined;
207
+ // The tail's verdict is the relay's own, reduced from the provider's original frames. A reader of
208
+ // the client stream may have seen only redacted copies of them, so the tail's verdict owns the row.
209
+ if (tail !== undefined && tail.verdict !== undefined) {
210
+ recordBareEvidence(logCtx, { typed: prior?.typed ?? false, verdict: tail.verdict });
211
+ return true;
212
+ }
213
+ if (tail !== undefined && prior !== undefined) return true;
214
+ bareEvidence.delete(logCtx);
215
+ // The evidence wrote the diagnostics and the copy; the terminal that retires it owns them now,
216
+ // so the row cannot keep a losing verdict's code or copy beside the terminal's status.
217
+ if (prior !== undefined) {
218
+ delete logCtx.upstreamErrorCode;
219
+ delete logCtx.upstreamErrorType;
220
+ delete logCtx.upstreamError;
221
+ }
222
+ // The classifier retires the provisional status it owns; clearing the map first would
223
+ // hide that ownership from it and leave the stale status on the row.
224
+ captureTerminalHttpStatus(logCtx, json);
225
+ noteBoundedDiagnostic(logCtx, "upstreamErrorCode",
226
+ json.error?.code ?? json.last_error?.code ?? json.response?.error?.code
227
+ // A bare top-level code (new in 2.83.0) has no envelope contract, so only a known class is kept.
228
+ ?? (typeof json.code === "string" && KNOWN_BARE_ERROR_CODES.has(json.code) ? json.code : undefined));
229
+ noteBoundedDiagnostic(logCtx, "upstreamErrorType",
230
+ json.error?.type ?? json.last_error?.type ?? json.response?.error?.type);
231
+ return true;
232
+ }
233
+ // A buffered JSON body is not a stream in which a later frame could supersede an earlier one,
234
+ // so it keeps the single-frame classifier. Only an SSE frame enters the reducer.
235
+ if (!untypedSse) {
236
+ captureTerminalHttpStatus(logCtx, json);
237
+ noteBoundedDiagnostic(logCtx, "upstreamErrorCode",
238
+ json.error?.code ?? json.last_error?.code ?? json.response?.error?.code
239
+ // A bare top-level code (new in 2.83.0) has no envelope contract, so only a known class is kept.
240
+ ?? (typeof json.code === "string" && KNOWN_BARE_ERROR_CODES.has(json.code) ? json.code : undefined));
241
+ noteBoundedDiagnostic(logCtx, "upstreamErrorType",
242
+ json.error?.type ?? json.last_error?.type ?? json.response?.error?.type);
243
+ return true;
244
+ }
245
+ // The client already ended on the genuine terminal, so a bare frame after it is not the
246
+ // turn's verdict: it may not restart evidence or touch status, code or type. Readers that
247
+ // keep inspecting past the terminal (the WS EOF observer, the metadata consumer) reach here.
248
+ // Its copy stays guarded as before: untyped text that fails the credential check is redacted.
249
+ if (genuineTerminals.has(logCtx)) {
250
+ if (logCtx.upstreamError === undefined && isUntypedBareUpstreamError(json)) {
251
+ const message = upstreamErrorMessageFromPayload(json);
252
+ if (typeof message === "string" && message.trim() && !diagnosticValueAllowed(message)) logCtx.upstreamError = "[REDACTED]";
253
+ }
254
+ return false;
255
+ }
256
+ const previousEvidence = bareEvidence.get(logCtx);
257
+ const evidence = reduceBareUpstreamEvidence(previousEvidence, json);
258
+ if (evidence === undefined || evidence === previousEvidence) return true;
259
+ recordBareEvidence(logCtx, evidence);
260
+ return true;
261
+ }
262
+
263
+ /** The row writes for a winning bare verdict: status, code, type and guarded copy together. */
264
+ function recordBareEvidence(logCtx: TerminalStatusContext, evidence: BareUpstreamEvidence): void {
265
+ bareEvidence.set(logCtx, evidence);
266
+ const previous = provisionalStatuses.get(logCtx);
267
+ // A status set by the caller or another path is not this reducer's to overwrite; only a
268
+ // provisional status this reducer owns is replaceable.
269
+ const replaceable = logCtx.terminalHttpStatus === undefined
270
+ || (provisionalStatuses.has(logCtx) && previous !== undefined && logCtx.terminalHttpStatus === previous);
271
+ if (replaceable) {
272
+ if (logCtx.terminalHttpStatus !== undefined) {
273
+ delete logCtx.terminalHttpStatus;
274
+ delete logCtx.terminalErrorCode;
275
+ }
276
+ // The verdict carries the status every reader uses: a recognized class its own status, an
277
+ // explicit refusal 400, and an unrecognized class the wrapper status the upstream stated. A
278
+ // typed frame with none of those leaves the row open, as before, so combo preflight still
279
+ // reads its wider set of explicit event fields (`bareErrorStatus`) and the row falls back to
280
+ // the synthetic 502 on its own; an untyped envelope keeps its provisional synthetic 502.
281
+ const status = evidence.typed ? evidence.verdict.httpStatus : evidence.verdict.terminalStatus;
282
+ if (status === undefined) {
283
+ provisionalStatuses.delete(logCtx);
284
+ } else {
285
+ logCtx.terminalHttpStatus = status;
286
+ provisionalStatuses.set(logCtx, status);
287
+ }
288
+ if (evidence.verdict.refusalCode === CYBER_POLICY_ERROR_CODE) logCtx.terminalErrorCode = CYBER_POLICY_ERROR_CODE;
289
+ else delete logCtx.terminalErrorCode;
290
+ }
291
+ // The winning verdict owns the bounded diagnostics and the copy together. A losing frame may
292
+ // not leave a code/type from one verdict beside the status and copy of another.
293
+ delete logCtx.upstreamErrorCode;
294
+ delete logCtx.upstreamErrorType;
295
+ // The winning verdict's identity is the one the client tail carries, so a refusal recognized
296
+ // from copy is recorded as that refusal rather than as the wrapper's unrelated code.
297
+ noteBoundedDiagnostic(logCtx, "upstreamErrorCode", evidence.verdict.refusalCode ?? evidence.verdict.errorCode);
298
+ noteBoundedDiagnostic(logCtx, "upstreamErrorType", evidence.verdict.errorType);
299
+ // Typed and untyped copy hold the same guard: the full-text configured check and the retained text.
300
+ if (!evidence.verdict.rowCopyAllowed || !diagnosticValueAllowed(evidence.verdict.message)
301
+ || repeatsRequestSentValue(logCtx, evidence.verdict.message)) {
302
+ logCtx.upstreamError = "[REDACTED]";
303
+ } else {
304
+ logCtx.upstreamError = evidence.verdict.message;
305
+ }
306
+ }
307
+
308
+ /**
309
+ * The final row's error code while a winning bare verdict owns the row and names a provider class
310
+ * whose copy also reads like a policy refusal. The verdict already ruled that the structured class
311
+ * outranks that copy, so the row must not reclassify the same copy as cyber_policy. Undefined
312
+ * otherwise: every other row keeps the ordinary status-and-copy classification.
313
+ */
314
+ export function bareVerdictRowErrorCode(logCtx: TerminalStatusContext): string | undefined {
315
+ const verdict = bareEvidence.get(logCtx)?.verdict;
316
+ if (verdict === undefined || verdict.refusalCode !== undefined || verdict.httpStatus === undefined) return undefined;
317
+ return isCyberPolicyMessage(verdict.message) ? verdict.terminalCode : undefined;
122
318
  }
123
319
 
124
320
  export function upstreamDiagnosticLogFields(logCtx: UpstreamErrorDiagnostics): UpstreamErrorDiagnostics {
@@ -130,7 +326,8 @@ export function upstreamDiagnosticLogFields(logCtx: UpstreamErrorDiagnostics): U
130
326
  const value = logCtx[field];
131
327
  if (!value) return undefined;
132
328
  sources ??= { registry: outboundCredentials(), configured: configuredCredentials() };
133
- return diagnosticValueAllowed(value, sources.registry, sources.configured) ? value : undefined;
329
+ if (!diagnosticValueAllowed(value, sources.registry, sources.configured)) return undefined;
330
+ return isClosedDiagnosticVocabulary(field, value) || !repeatsRequestSentValue(logCtx, value) ? value : undefined;
134
331
  };
135
332
  const code = allowed("upstreamErrorCode");
136
333
  const type = allowed("upstreamErrorType");
@@ -142,17 +339,6 @@ export function upstreamDiagnosticLogFields(logCtx: UpstreamErrorDiagnostics): U
142
339
  };
143
340
  }
144
341
 
145
- /**
146
- * The server status a Codex WebSocket `error` frame states on its wrapper ({@link codexWsWrapperStatus}),
147
- * or undefined. Only 5xx is returned. Every 5xx is the same transient class for account health, so
148
- * this changes what a row says, not where the next turn goes; a wrapper 4xx would move quota and
149
- * credential routing and is left to its own review (#6740).
150
- */
151
- export function wrappedServerErrorStatus(json: UpstreamErrorPayload): number | undefined {
152
- const status = codexWsWrapperStatus(json as Record<string, unknown>);
153
- return status !== undefined && status >= 500 ? status : undefined;
154
- }
155
-
156
342
  function captureTerminalHttpStatus(
157
343
  logCtx: TerminalStatusContext,
158
344
  json: UpstreamErrorPayload,