@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
@@ -1,4 +1,5 @@
1
1
  import { clientFacingModelText } from "../../lib/error-destination";
2
+ import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
2
3
  import { markProxyError } from "../../lib/client-error-body";
3
4
  import { CodexInstallationIdUnavailableError } from "../../codex/installation-id";
4
5
  import { passthroughBuildErrorResponse } from "./passthrough-build-error";
@@ -26,7 +27,7 @@ import { renewMainQuotaDispatchForAttempt } from "../../codex/main-account-cache
26
27
  import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
27
28
  import { isLocalUpstream } from "../../lib/local-upstream";
28
29
  import { resolveConnectTimeoutMs } from "../../stall-timeout";
29
- import { codexSafetyBufferingFilterOptions, terminalStatusFromParsed } from "../relay";
30
+ import { codexSafetyBufferingFilterOptions, createTerminalStatusTracker } from "../relay";
30
31
  import { imageGenToolCallAliases } from "../responses-image-gen-repair";
31
32
  import { rememberResponseState, isBodyNonPersistable } from "../../responses/state";
32
33
  import {
@@ -62,7 +63,8 @@ import {
62
63
  collectFunctionCallRepairSchemas,
63
64
  repairFunctionCallsInJson,
64
65
  } from "../../responses/function-call-compat";
65
- import type { RoutedNamespaceToolAliases } from "../../responses/namespace-tool-compat";
66
+ import { authorizedBareNamespaceToolAliases as authorizedBareNamespaceAliases } from "./bare-namespace-aliases";
67
+ import { outboundToolScope } from "./outbound-request-body";
66
68
  import { hasResponsesSnapshotRepair, repairResponsesSnapshotJson } from "../responses-snapshot-repair";
67
69
  import { backfillResponsesFieldsJson } from "./responses-field-backfill";
68
70
  import type { AdapterRequest } from "../../adapters/base";
@@ -168,13 +170,17 @@ import {
168
170
  refusedReasoningEffortDowngrade, withRawBodyReasoningEffort,
169
171
  } from "./core-opaque-recovery";
170
172
  import type { RequestLogContext } from "../request-log";
171
- import { deferProtocolSafeResetRecovery, preflightComboStreamResponse } from "./combo-stream-preflight";
172
- import { ambiguousResendAllowanceFor, ambiguousResendAuthorizer, nativePassthroughReplayJudgmentBody, selfContainedResponsesBody } from "./reset-replay";
173
+ import { preflightComboStreamResponse } from "./combo-stream-preflight";
174
+ import type { RequestFailureStage } from "../../lib/request-failure-model";
175
+ import {
176
+ ambiguousResendAllowanceFor, ambiguousResendAuthorizer, UnsafePhysicalReplacement,
177
+ } from "./reset-replay";
178
+ import { createNativeReplayGuard } from "./native-replay-guard";
173
179
  import { upstreamErrorMessageFromPayload, ENCRYPTED_FUNCTION_OUTPUT_REJECTION } from "../../lib/errors";
174
180
  import { isTransientConsoleGoUploadRejection } from "../../providers/opencode-zen-rate-limit";
175
181
  import { unboundPoolSpendRefusalResponse } from "../workflow-refusal";
176
182
  import { createNativeContinuationDispatch } from "./native-continuation-send";
177
- import { guardPassthroughCompletion, parseOutboundRequestBody } from "./passthrough-completion";
183
+ import { guardPassthroughCompletion, isResetReplacementStream, parseOutboundRequestBody, selectPassthroughResetResponse } from "./passthrough-completion";
178
184
 
179
185
  /** Transfer an uncommitted Copilot exchange to the existing translated pipeline without new admission. */
180
186
  export interface PassthroughAdapterHandoff { kind: "adapter-handoff" }
@@ -426,7 +432,8 @@ export async function preparePassthroughExchange(
426
432
  // `{model, input, stream}` with no tools and Copilot answers with a `custom_tool_call` for
427
433
  // `apply_patch`. Policing an absent catalog truncates that turn. An unreadable body lands there
428
434
  // too because the proxy cannot establish the caller's declared authorization boundary.
429
- let outboundRequestBody: Record<string, unknown> | undefined;
435
+ // #8601: only the outbound body's tool scope (outbound-request-body.ts) stays with the turn, never a parsed copy of it.
436
+ let outboundRequestScope: Record<string, unknown> | undefined;
430
437
  const declaredWireToolNames = new Set<string>();
431
438
  const declaredBareWireToolNames = new Set<string>();
432
439
  const declaredNamelessClientCallTypes = new Set<string>();
@@ -437,22 +444,12 @@ export async function preparePassthroughExchange(
437
444
  // checks. `exec` uses separate handling: its bridge alias is copied into the declared set only
438
445
  // when the client itself declared bare `exec`, because otherwise code-mode normalization could
439
446
  // authorize the unrelated code-mode helper names.
440
- const authorizedBareNamespaceToolAliases: RoutedNamespaceToolAliases = new Map(
441
- [...toolBridgeMaps.toolNsMap].flatMap(([alias, identity]) =>
442
- alias === identity.name
443
- ? [[alias, {
444
- namespace: identity.namespace,
445
- name: identity.name,
446
- kind: identity.freeform ? "custom" as const : "function" as const,
447
- }] as const]
448
- : []
449
- ),
450
- );
447
+ const authorizedBareNamespaceToolAliases = authorizedBareNamespaceAliases(toolBridgeMaps.toolNsMap);
451
448
  const restoreAuthorizedBareNamespaceToolCalls = (value: unknown): unknown =>
452
449
  restoreRoutedNamespaceCalls(value, authorizedBareNamespaceToolAliases).value;
453
450
  const normalizeFunctionCompletionJson = (text: string): string => {
454
451
  const snapshot = hasResponsesSnapshotRepair(route.provider.responsesSnapshotRepair)
455
- ? repairResponsesSnapshotJson(text, outboundRequestBody)
452
+ ? repairResponsesSnapshotJson(text, outboundRequestScope)
456
453
  : text;
457
454
  // Sparse gateways need completion status inferred before schema repair can
458
455
  // distinguish completed arguments from in-progress placeholders.
@@ -460,7 +457,8 @@ export async function preparePassthroughExchange(
460
457
  };
461
458
  let undeclaredToolGuardActive = false;
462
459
  const refreshUndeclaredToolGuard = (builtRequest: AdapterRequest): void => {
463
- outboundRequestBody = parseOutboundRequestBody(builtRequest.body);
460
+ const outboundRequestBody = parseOutboundRequestBody(builtRequest.body);
461
+ outboundRequestScope = outboundToolScope(outboundRequestBody);
464
462
  providerExecutedCallTypes.clear();
465
463
  if (isXaiResponsesDestination(route.provider)) {
466
464
  // Preserve the caller-declared authorization recognized by the original classifier, then
@@ -545,7 +543,6 @@ export async function preparePassthroughExchange(
545
543
  // untouched upstream stream, so it can still observe a `response.completed` the client never
546
544
  // received; checking the payload itself rather than a flag shared with the client relay keeps
547
545
  // this free of tee ordering races.
548
- //
549
546
  // Checking only the terminal snapshot is not enough. An upstream can announce the undeclared
550
547
  // call in `response.output_item.added`, which trips the client guard, and then close with a
551
548
  // `response.completed` whose `output` is empty. The client gets `response.failed`, the terminal
@@ -555,12 +552,13 @@ export async function preparePassthroughExchange(
555
552
  let inspectedTerminal: ResponsesTerminalStatus | null = null;
556
553
  let inspectedCompletionSeen = false;
557
554
  let firstTerminalAllowsRecall = false;
555
+ const inspectedTerminalStatus = createTerminalStatusTracker();
558
556
  const passiveQuotaObserved = hasPassiveAccountQuota(route.providerName)
559
557
  && route.provider.authMode === "oauth";
560
558
  const noteInspectedPayload = (payload: unknown) => {
561
559
  // First terminal stays authoritative even in metadata-only inspection, which
562
560
  // intentionally continues parsing after a failed/incomplete terminal.
563
- const terminal = terminalStatusFromParsed(payload);
561
+ const terminal = inspectedTerminalStatus(payload);
564
562
  if (inspectedTerminal === null && terminal !== null) {
565
563
  inspectedTerminal = terminal;
566
564
  // The client boundary accepts a terminal by event type, even without a
@@ -763,16 +761,15 @@ export async function preparePassthroughExchange(
763
761
  );
764
762
  const configuredTransientSendBudgetExhausted = (): boolean =>
765
763
  transientSendPolicy() !== null && transientSendAttempts() === 0;
766
- /**
767
- * Judged once. The inbound body does not change between legs, and every rebuild this lane
768
- * performs only ever REMOVES a hazard -- `previous_response_id` is expanded, hosted tools
769
- * are lowered into client execution -- so a body that was replaceable stays replaceable.
770
- * Memoized rather than recomputed because it walks the input array, and a provider that
771
- * never opted in must not pay for it at all.
772
- */
773
- let selfContainedJudgment: boolean | undefined;
774
- const requestIsSelfContained = (): boolean =>
775
- selfContainedJudgment ??= selfContainedResponsesBody(nativePassthroughReplayJudgmentBody(parsed));
764
+ // Judged once on the inbound body and once per send on the body that physically leaves; the
765
+ // split and its reasons live in the sibling module.
766
+ const replayGuard = createNativeReplayGuard({
767
+ providerExecuted: () => isXaiResponsesDestination(route.provider)
768
+ && collectProviderExecutedCallTypes(clientToolAuthorizationBody).size > 0,
769
+ parsed,
770
+ currentRequest: () => request,
771
+ });
772
+ const recordPhysicalSend = replayGuard.sendHandler;
776
773
  /**
777
774
  * The operator's replacement grant for THIS logical request.
778
775
  *
@@ -782,7 +779,7 @@ export async function preparePassthroughExchange(
782
779
  * child shares, so every ambiguous stage of this request draws on the same grant.
783
780
  */
784
781
  const ambiguousResend = () =>
785
- ambiguousResendAllowanceFor(route.provider, requestIsSelfContained, claimAmbiguousResend);
782
+ ambiguousResendAllowanceFor(route.provider, replayGuard.isSelfContained, claimAmbiguousResend);
786
783
  const authorizeAmbiguousResend = ambiguousResendAuthorizer(ambiguousResend, () => safeHostLabel(request.url));
787
784
  /**
788
785
  * The pre-header row of the stage table, asked through the one gate.
@@ -791,7 +788,12 @@ export async function preparePassthroughExchange(
791
788
  * the server tree; routing the answer through `authorizeResendForRecovery` here is what
792
789
  * keeps the decision derived from the table rather than restated as a boolean.
793
790
  */
794
- const claimPreHeaderResend = (): boolean => authorizeAmbiguousResend("pre-header");
791
+ const claimRecoveryResend = (stage: RequestFailureStage): boolean => {
792
+ const allowed = authorizeAmbiguousResend(stage);
793
+ if (allowed) replayGuard.authorize();
794
+ return allowed;
795
+ };
796
+ const claimPreHeaderResend = (): boolean => claimRecoveryResend("pre-header");
795
797
  /**
796
798
  * The one replacement send the ambiguous rows at the end of the recovery loop may buy: an SSE
797
799
  * body that died before any output, and a Codex WebSocket that died under its create frame
@@ -827,7 +829,12 @@ export async function preparePassthroughExchange(
827
829
  providerName: route.providerName,
828
830
  modelId: route.modelId,
829
831
  dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
830
- onPhysicalDispatch: accounting.onPhysicalDispatch ? () => { accounting.onPhysicalDispatch!(); started = true; } : undefined,
832
+ onPhysicalDispatch: recordPhysicalSend(() => {
833
+ transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
834
+ if (accounting.onPhysicalDispatch) accounting.onPhysicalDispatch();
835
+ else if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
836
+ started = true;
837
+ }),
831
838
  beforeDispatch: headers => {
832
839
  if (signal.aborted) throw signal.reason;
833
840
  if (!transportState.selectionIsCurrent(transportState.requestBindings.get(request))) {
@@ -842,16 +849,6 @@ export async function preparePassthroughExchange(
842
849
  options.visionDescribeTerminal === true,
843
850
  )?.(headers);
844
851
  }
845
- // Recorded with the kind the gate derived its cause from, at the moment the
846
- // send actually leaves. One authorisation, one recorded reason, one send.
847
- transportState.noteRoutedAttemptSend(passthroughEstimate, "connection-reset");
848
- // Charged to the SAME request counter every other send goes through. The
849
- // replacement is bought here rather than by a nested retry helper, so there is
850
- // one charge for one send and no per-layer counter to reconcile.
851
- if (!accounting.onPhysicalDispatch) {
852
- if (report.beforeSend?.() === false) throw new SendBudgetExhaustedError(errorDestinationLabel(request.url));
853
- started = true;
854
- }
855
852
  },
856
853
  }),
857
854
  route.provider.authMode === "forward",
@@ -912,10 +909,9 @@ export async function preparePassthroughExchange(
912
909
  return clientCancelledResponse();
913
910
  }
914
911
  if (lastDistributedResponse) recordDistributedResponseFailure(lastDistributedResponse, config, route.providerName, options.abortSignal);
915
- // A budget refusal is a proxy decision, not an upstream fault. Reporting it as
916
- // 502 upstream_error would blame the provider for a limit this process applied, and
917
- // would record a fake reachability failure against the account's health.
912
+ // A budget refusal is local; a 502 would falsely record an account reachability failure.
918
913
  if (err instanceof SendBudgetExhaustedError) {
914
+ logCtx.terminalSource = "synthetic";
919
915
  releaseUpstreamHostAdmission(nativeHostState.lease);
920
916
  nativeHostState.lease = null;
921
917
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
@@ -927,12 +923,13 @@ export async function preparePassthroughExchange(
927
923
  bindRefreshedAdapter(refusal.adapter);
928
924
  return handoffToChat(refusal.adapter);
929
925
  }
930
- const dispatchRefusal = requestPacingOverloadResponse(refusal) ?? copilotRefusalResponse(refusal);
931
- if (dispatchRefusal) {
932
- releaseUpstreamHostAdmission(nativeHostState.lease);
933
- nativeHostState.lease = null;
926
+ const pacingRefusal = requestPacingOverloadResponse(refusal);
927
+ if (pacingRefusal) logCtx.terminalSource = "synthetic";
928
+ const localDispatchRefusal = pacingRefusal ?? copilotRefusalResponse(refusal);
929
+ if (localDispatchRefusal) {
930
+ releaseUpstreamHostAdmission(nativeHostState.lease); nativeHostState.lease = null;
934
931
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
935
- return dispatchRefusal;
932
+ return localDispatchRefusal;
936
933
  }
937
934
  // Pacing may outlive the selected account's admission. No fetch occurred, so do
938
935
  // not turn an operator pause into a 502 or charge it to host/account health.
@@ -1031,7 +1028,7 @@ export async function preparePassthroughExchange(
1031
1028
  dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
1032
1029
  providerName: route.providerName,
1033
1030
  modelId: route.modelId,
1034
- onPhysicalDispatch: receiptMode ? sendBudgetState.noteInitialDispatch : initialAccounting.onPhysicalDispatch,
1031
+ onPhysicalDispatch: recordPhysicalSend(receiptMode ? sendBudgetState.noteInitialDispatch : initialAccounting.onPhysicalDispatch),
1035
1032
  onContinuationDispatch,
1036
1033
  accountAutoPause: (name, provider, headers) => captureAccountAutoPauseAttempt(name, provider, { config, codex: admissionState.authCtx }, headers),
1037
1034
  onCodexWsQuota: codexWsQuotaObserver(admissionState.authCtx, route.provider, route.modelId),
@@ -1170,7 +1167,7 @@ export async function preparePassthroughExchange(
1170
1167
  && responseEffects.plaintextV2AgentMessageToolNames.size === 0
1171
1168
  ? options.nativeControl : undefined,
1172
1169
  dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
1173
- onPhysicalDispatch: recoveryAccounting.onPhysicalDispatch,
1170
+ onPhysicalDispatch: recordPhysicalSend(recoveryAccounting.onPhysicalDispatch),
1174
1171
  providerName: route.providerName,
1175
1172
  modelId: route.modelId,
1176
1173
  onContinuationDispatch,
@@ -1208,7 +1205,6 @@ export async function preparePassthroughExchange(
1208
1205
  upstreamResponse = recovered; continue passthroughRecovery;
1209
1206
  }
1210
1207
 
1211
-
1212
1208
  if (
1213
1209
  upstreamResponse.status === 401 && !wasPermanentAccountRefusal(upstreamResponse)
1214
1210
  && (admissionState.authCtx.kind === "main-pool" || admissionState.authCtx.kind === "pool")
@@ -1291,6 +1287,7 @@ export async function preparePassthroughExchange(
1291
1287
  && responseEffects.plaintextV2AgentMessageToolNames.size === 0
1292
1288
  ? options.nativeControl : undefined,
1293
1289
  dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
1290
+ onPhysicalDispatch: recordPhysicalSend(),
1294
1291
  providerName: route.providerName,
1295
1292
  modelId: route.modelId,
1296
1293
  onContinuationDispatch,
@@ -1440,7 +1437,7 @@ export async function preparePassthroughExchange(
1440
1437
  && responseEffects.plaintextV2AgentMessageToolNames.size === 0
1441
1438
  ? options.nativeControl : undefined,
1442
1439
  dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
1443
- onPhysicalDispatch: oauthReplayAccounting.onPhysicalDispatch,
1440
+ onPhysicalDispatch: recordPhysicalSend(oauthReplayAccounting.onPhysicalDispatch),
1444
1441
  providerName: route.providerName,
1445
1442
  modelId: route.modelId,
1446
1443
  onContinuationDispatch,
@@ -1544,7 +1541,7 @@ export async function preparePassthroughExchange(
1544
1541
  while (
1545
1542
  upstreamResponse.status === 429
1546
1543
  && !isNonReplayableResponse(upstreamResponse)
1547
- && rateLimitPolicy !== null
1544
+ && rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
1548
1545
  && rateLimitRetries < rateLimitPolicy.attempts
1549
1546
  // Checked here rather than inside the helper: prepareSameTarget429Wait releases the 429
1550
1547
  // body, so a refusal discovered after the wait can no longer return the real rate-limit
@@ -1590,7 +1587,7 @@ export async function preparePassthroughExchange(
1590
1587
  && responseEffects.plaintextV2AgentMessageToolNames.size === 0
1591
1588
  ? options.nativeControl : undefined,
1592
1589
  dispatchOverride: oauthDispatch(request, parsed, "passthrough"),
1593
- onPhysicalDispatch: failoverAccounting.onPhysicalDispatch,
1590
+ onPhysicalDispatch: recordPhysicalSend(failoverAccounting.onPhysicalDispatch),
1594
1591
  providerName: route.providerName,
1595
1592
  modelId: route.modelId,
1596
1593
  onContinuationDispatch,
@@ -1698,6 +1695,7 @@ export async function preparePassthroughExchange(
1698
1695
  stream: upstreamRequestsStream,
1699
1696
  httpOnly: canonicalBufferedJson,
1700
1697
  preOutputRefusalHold: preOutputRefusalHold(),
1698
+ onPhysicalSend: replayGuard.record,
1701
1699
  onResponse: (response, retryAuthCtx, retryRequest) => {
1702
1700
  adoptCodexWsStage(response, logCtx);
1703
1701
  captureAffinityResponse(
@@ -1862,17 +1860,18 @@ export async function preparePassthroughExchange(
1862
1860
  // Asked before the gate, which claims last: a replacement the budget cannot fund must not
1863
1861
  // spend the request's one grant.
1864
1862
  && remainingTransientSendBudget(transientSendAttempts()) > 0
1865
- && authorizeAmbiguousResend(socketDeathStage)
1863
+ && claimRecoveryResend(socketDeathStage)
1866
1864
  ) {
1867
- try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
1868
1865
  console.warn(`[upstream-retry] codex websocket died before any Responses event (${safeHostLabel(request.url)}); `
1869
1866
  + "using one replacement over HTTP");
1870
1867
  let replacement: Response | undefined;
1868
+ let unsafeReplacement = false;
1871
1869
  while (!replacement) {
1872
1870
  try {
1873
1871
  replacement = await sendAmbiguousReplacement().then(adoptObservedResponse);
1874
1872
  } catch (err) {
1875
1873
  if (upstream.signal.aborted) return transportFailureResponse(err);
1874
+ if (err instanceof UnsafePhysicalReplacement) { unsafeReplacement = true; break; }
1876
1875
  // A replacement that reset before its head is the pre-header row again: a configured
1877
1876
  // second grant (and a send the budget can still fund) may buy one more send. The gate
1878
1877
  // claims from the request's finite allowance, so this loop is bounded by it.
@@ -1886,6 +1885,8 @@ export async function preparePassthroughExchange(
1886
1885
  }
1887
1886
  // The first send may already have run the turn, so a replacement that failed settles as
1888
1887
  // the refusal rather than as a transport error the client would retry.
1888
+ if (unsafeReplacement) break passthroughRecovery;
1889
+ try { void upstreamResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
1889
1890
  upstreamResponse = replacement ? settleOperatorReplacement(replacement) : replayRefusalResponse();
1890
1891
  continue passthroughRecovery;
1891
1892
  }
@@ -1905,32 +1906,32 @@ export async function preparePassthroughExchange(
1905
1906
  // This preflight retains that event until output commits, so the two contracts cannot
1906
1907
  // share one body owner.
1907
1908
  && !(options.nativeControl && options.inboundTransport === "websocket")
1908
- && ambiguousResend() !== undefined
1909
+ // Only a self-contained request can be replaced; any other preflight only delays its head.
1910
+ && ambiguousResend()?.selfContained === true
1909
1911
  && remainingTransientSendBudget(transientSendAttempts()) > 0
1910
1912
  && (streamRecoveryContentType.includes("text/event-stream") || (!streamRecoveryContentType && upstreamRequestsStream));
1911
1913
  if (protocolRecoveryCandidate) {
1912
- upstreamResponse = deferProtocolSafeResetRecovery(
1913
- upstreamResponse,
1914
+ // Selection may publish the replacement's own head until one is committed; see the helper.
1915
+ upstreamResponse = await selectPassthroughResetResponse(
1916
+ upstreamResponse, admissionState,
1914
1917
  { model: logCtx.model, provider: logCtx.provider },
1915
- (error, stage) => refetchAfterProtocolSafeReset(
1918
+ (error, stage, signal, accepts) => refetchAfterProtocolSafeReset(
1916
1919
  (signal = upstream.signal) => sendAmbiguousReplacement(signal).then(adoptObservedResponse),
1917
1920
  error,
1918
1921
  {
1919
- abortSignal: upstream.signal,
1922
+ abortSignal: AbortSignal.any([upstream.signal, signal]),
1920
1923
  label: safeHostLabel(request.url), destination: errorDestinationLabel(request.url),
1921
1924
  attempts: remainingTransientSendBudget(transientSendAttempts()),
1922
1925
  // The whole decision, including the stage the preflight observed and the grant the
1923
1926
  // pre-header helper shares. A committed stage refuses here without touching the
1924
1927
  // allowance, which is what keeps a turn that already emitted output from draining
1925
1928
  // the replacement a later ambiguous reset would have been entitled to.
1926
- authorize: () => authorizeAmbiguousResend(stage),
1927
- acceptResponse: candidate => {
1928
- const type = candidate.headers.get("content-type")?.toLowerCase() ?? "";
1929
- return type.includes("text/event-stream") || (!type && upstreamRequestsStream);
1930
- },
1929
+ authorize: () => claimRecoveryResend(stage),
1930
+ acceptResponse: candidate => accepts(candidate) && isResetReplacementStream(candidate, upstreamRequestsStream),
1931
1931
  },
1932
1932
  ),
1933
- { allowMissingContentType: !streamRecoveryContentType && upstreamRequestsStream },
1933
+ { request, config, signal: upstream.signal, allowMissingContentType: !streamRecoveryContentType && upstreamRequestsStream,
1934
+ delivery: canonicalBufferedJson ? "buffered-json" : options.comboAttempt ? "combo-child" : "direct-stream" },
1934
1935
  );
1935
1936
  }
1936
1937
  break;
@@ -1961,10 +1962,10 @@ export async function preparePassthroughExchange(
1961
1962
  },
1962
1963
  functionRepairSchemas,
1963
1964
  get outboundRequestBody(): Record<string, unknown> | undefined {
1964
- return outboundRequestBody;
1965
+ return outboundRequestScope;
1965
1966
  },
1966
1967
  set outboundRequestBody(value: Record<string, unknown> | undefined) {
1967
- outboundRequestBody = value;
1968
+ outboundRequestScope = outboundToolScope(value);
1968
1969
  },
1969
1970
  declaredWireToolNames,
1970
1971
  declaredBareWireToolNames,
@@ -1,4 +1,4 @@
1
- import { comboFailureDecision } from "../../combos/failover";
1
+ import { comboFailureDecision, isProviderModerationRefusal } from "../../combos/failover";
2
2
  import { readBoundedResponseBody } from "../../lib/bounded-body";
3
3
  import { isVerifiedModelNotInPlanResponse } from "../../lib/errors";
4
4
  import { isShadowSourceModel } from "../../lib/shadow-call";
@@ -138,6 +138,9 @@ async function shouldHopPolicyCandidate(response: Response, signal?: AbortSignal
138
138
  code: upstreamCodeForComboFailure(response, errorCodeFromText(text)),
139
139
  // A passthrough candidate returns its upstream body unchanged, so the code is not provenance.
140
140
  verifiedPlanRefusal: isVerifiedModelNotInPlanResponse(response),
141
+ // The text is the whole bounded body, judged as the combo reader judges it.
142
+ ...(text && (response.status === 400 || response.status === 422)
143
+ ? { providerModerationRefusal: isProviderModerationRefusal(response.status, text, undefined, true) } : {}),
141
144
  }) === "hop";
142
145
  } catch {
143
146
  return false;
@@ -161,8 +164,17 @@ function finishFailedPolicyAttempt(logCtx: RequestLogContext, status: number): v
161
164
  delete logCtx.usageFromBridge;
162
165
  delete logCtx.upstreamError;
163
166
  delete logCtx.terminalHttpStatus;
167
+ delete logCtx.observedTerminalStatus;
164
168
  delete logCtx.terminalErrorCode;
165
169
  delete logCtx.terminalIncompleteReason;
170
+ delete logCtx.cacheAffinity;
171
+ delete logCtx.cacheAffinityReason;
172
+ delete logCtx.affinityKeptEntryId;
173
+ delete logCtx.affinityKeyEntryId;
174
+ delete logCtx.affinityProviderName;
175
+ delete logCtx.affinityModel;
176
+ delete logCtx.cacheAffinityApplicable;
177
+ delete logCtx.terminalSource;
166
178
  }
167
179
 
168
180
  /**
@@ -1,4 +1,7 @@
1
+ import { responseReplayOwnerKey } from "../../responses/state/replay-owner";
2
+ import { isPlaintextV2AgentMessagesEnabled } from "../../config/multi-agent-surface";
1
3
  import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
4
+ import { failLinkTurnExpansion, markLinkTurnMissing, observeLinkTurnExpansion } from "../link-turn";
2
5
  import { inputAdmissionRefusalMessage } from "./input-admission";
3
6
  import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
4
7
  import { markProxyError } from "../../lib/client-error-body";
@@ -6,7 +9,9 @@ import { completeClaudeBridgePoolIdentity } from "../claude-bridge-pool-session"
6
9
  import type { HandleResponsesOptions, ResponsesRequestContext, ResponsesAdmissionState, ResponsesDispatchers } from "./core-options";
7
10
  import type { PolicyRequestEvidence } from "../../routing/evaluator";
8
11
  import type { RequestLogContext } from "../request-log";
9
- import { markProtocolEntry, protocolMarkFeatures } from "../../protocols/trace";
12
+ import { addProtocolEntryReason, markProtocolEntry, protocolMarkFeatures } from "../../protocols/trace";
13
+ import { nativeMessagesToolScopeDenial } from "../messages-native-scope";
14
+ import { advisorServerToolDestination } from "../../adapters/anthropic/advisor-tool";
10
15
  import { isAntigravityRoute } from "../antigravity-direct-eligibility";
11
16
  import { capturePolicyRequestRoute, assertPolicyNormalizedRoute, recordPolicyPreparedDestination, policyCandidateRefusalResponse, MandatoryToolChoiceUnavailableError, mandatoryToolChoiceUnavailableResponse } from "./policy-request-scope";
12
17
  import {
@@ -14,7 +19,7 @@ import {
14
19
  restoreCachedEncryptedAgentTasks,
15
20
  recoverEncryptedAgentTaskWithResult,
16
21
  } from "./agent-task-recovery";
17
- import { readJsonRequestBody, resolveInboundBodyLimitBytes } from "../request-decompress";
22
+ import { admitParsedJsonRequestBody, readJsonRequestBody, resolveInboundBodyLimitBytes, takeParsedRequestBody } from "../request-decompress";
18
23
  import {
19
24
  clientCancelledResponse,
20
25
  decodeRequestErrorResponse,
@@ -69,6 +74,7 @@ import {
69
74
  import {
70
75
  copyPreviousResponseReplayProvenance,
71
76
  expandPreviousResponseInput,
77
+ previousResponseRestoredPrefixLength,
72
78
  previousResponseReplayFailure,
73
79
  markBodyNonPersistable,
74
80
  previousResponseProviderState,
@@ -183,6 +189,7 @@ import {
183
189
  } from "./account-change-state";
184
190
 
185
191
  import { redactHostedImageDisplayPaths } from "../responses-hosted-image-display";
192
+ import { eagerCodexToolCatalogSurface, warnEagerCodexToolCatalog } from "./codex-tool-catalog";
186
193
 
187
194
  /** Policy-routing evidence. The direct lane's settings-only body has no conversation to scan. */
188
195
  function routeEvidence(options: Pick<HandleResponsesOptions, "directRequest">, parsed: OcxParsedRequest): PolicyRequestEvidence {
@@ -243,7 +250,9 @@ export async function prepareResponsesRequest(
243
250
  const agentTaskRecovery = agentTaskRecoveryConfig(config);
244
251
  let body: unknown;
245
252
  try {
246
- body = await readJsonRequestBody(req, translatorBudget, resolveInboundBodyLimitBytes(config.maxInboundBodyBytes));
253
+ const limit = resolveInboundBodyLimitBytes(config.maxInboundBodyBytes);
254
+ const attached = takeParsedRequestBody(req);
255
+ body = attached ? admitParsedJsonRequestBody(attached.body, limit, translatorBudget) : await readJsonRequestBody(req, translatorBudget, limit);
247
256
  } catch (err) {
248
257
  if (options.abortSignal?.aborted || req.signal.aborted) {
249
258
  return clientCancelledResponse();
@@ -431,12 +440,17 @@ export async function prepareResponsesRequest(
431
440
  // parent all present the same parent id. `codexConversationIdentity` already reads this header
432
441
  // for the same reason, and a surface that must tell siblings apart needs it too (#5033).
433
442
  const inboundOwnThreadId = req.headers.get("thread-id")?.trim() || undefined;
443
+ const replayPrincipal = options.replayPrincipal
444
+ ? options.replayPrincipal.clientPrincipalId : resolveContextPrincipal(req, config, options.admission);
445
+ const strictReplay = options.plaintextV2Decision ?? isPlaintextV2AgentMessagesEnabled(config);
446
+ const replayOwnerKey = strictReplay ? responseReplayOwnerKey(replayPrincipal, inboundOwnThreadId) : undefined;
447
+ const replayThreadId = strictReplay ? inboundOwnThreadId : inboundClientThreadId;
434
448
  const cursorClientThreadId = codexPoolAffinityKey(req.headers);
435
449
  const originalBody = body;
436
450
  if (options.comboReplaySnapshot) {
437
451
  copyPreviousResponseReplayProvenance(options.comboReplaySnapshot.sourceBody, body);
438
452
  } else {
439
- body = expandPreviousResponseInput(body, inboundClientThreadId);
453
+ body = expandPreviousResponseInput(body, replayThreadId, replayOwnerKey);
440
454
  const replayFailure = previousResponseReplayFailure(body);
441
455
  if (replayFailure?.reason === "scope_mismatch") {
442
456
  // Bounded and content-free: no task scope and nothing about the retained entry.
@@ -444,6 +458,7 @@ export async function prepareResponsesRequest(
444
458
  }
445
459
  // Local replay failures require full client replay.
446
460
  if (replayFailure) {
461
+ failLinkTurnExpansion(options.linkTurn, req, logCtx, body, replayFailure.reason);
447
462
  return markProxyError(formatErrorResponse(
448
463
  400,
449
464
  "previous_response_not_found",
@@ -454,8 +469,20 @@ export async function prepareResponsesRequest(
454
469
  const previousResponseInputExpanded = options.comboReplaySnapshot?.previousResponseInputExpanded
455
470
  ?? (body !== originalBody
456
471
  && typeof (body as { previous_response_id?: unknown }).previous_response_id === "string");
472
+ // Remote Link holds and request-log fields (design T4 sections 5, 9.1): the expanded input, before any upstream I/O.
473
+ if (!options.comboReplaySnapshot) observeLinkTurnExpansion(options.linkTurn, req, logCtx, body, previousResponseInputExpanded ? "chained"
474
+ : body && typeof body === "object" && typeof (body as { previous_response_id?: unknown }).previous_response_id === "string" ? "unexpanded" : "none");
457
475
  options.responsesInstructionImage ||= responsesHasInstructionImage(body);
458
476
  options.responsesFileImage ||= responsesHasFileImage(body);
477
+ // Counted after replay expansion so the catalog this request pays for is the one measured:
478
+ // input restored from stored continuation state is history, and the prefix removes it.
479
+ if (inboundWire === "responses" && !concreteSelection) {
480
+ warnEagerCodexToolCatalog(body, req.headers, {
481
+ surface: eagerCodexToolCatalogSurface(body, options.compactionRecoveryKind),
482
+ replayPrefixLength: previousResponseRestoredPrefixLength(body),
483
+ logicalRequest: logCtx,
484
+ });
485
+ }
459
486
 
460
487
  // Spawn-message compatibility (both directions): agent_message task payloads ride in
461
488
  // encrypted_content slots as plaintext. Rewrite them to input_text on the RAW body BEFORE
@@ -523,6 +550,7 @@ export async function prepareResponsesRequest(
523
550
  parsed._anthropicServerTools = options.anthropicServerTools;
524
551
  parsed._anthropicServerReplay = options.anthropicServerReplay;
525
552
  parsed._anthropicSystemCachePrefix = options.anthropicSystemCachePrefix;
553
+ parsed._anthropicInbound = true;
526
554
  if (parsed.options.textFormat?.type === "json_schema") parsed._structuredOutputConformance = true;
527
555
  }
528
556
  parsed._promptCacheKeyIsSharedCohort = options.promptCacheKeyIsSharedCohort;
@@ -600,10 +628,13 @@ export async function prepareResponsesRequest(
600
628
  }
601
629
  return formatErrorResponse(400, "invalid_request_error", err instanceof Error ? err.message : String(err));
602
630
  }
631
+ parsed._plaintextV2Decision = strictReplay;
603
632
  options.onRequestBodyRead?.();
604
- const responseStateOptions = (force = false): { force?: boolean; clientThreadId?: string } => ({
633
+ const responseStateOptions = (force = false) => ({
634
+ replayOwnerKey,
635
+ compiledPlaintext: parsed._plaintextV2EverPrepared === true,
605
636
  ...(force ? { force: true } : {}),
606
- ...(parsed._clientThreadId ? { clientThreadId: parsed._clientThreadId } : {}),
637
+ ...((strictReplay ? inboundOwnThreadId : parsed._clientThreadId) ? { clientThreadId: strictReplay ? inboundOwnThreadId : parsed._clientThreadId } : {}),
607
638
  });
608
639
  const resolvedConversationId = conversationIdFromResponsesRequest({
609
640
  clientThreadId: parsed._clientThreadId,
@@ -1154,6 +1185,8 @@ export async function prepareResponsesRequest(
1154
1185
  try {
1155
1186
  const reparsed = parseRequest(body);
1156
1187
  const kept: Array<keyof OcxParsedRequest> = [
1188
+ "_plaintextV2Decision",
1189
+ "_plaintextV2EverPrepared",
1157
1190
  "_previousResponseInputExpanded",
1158
1191
  "_providerContinuation",
1159
1192
  "_providerContinuationCandidate",
@@ -1412,6 +1445,7 @@ export async function prepareResponsesRequest(
1412
1445
  hasUnexpandedPreviousResponse
1413
1446
  && isCanonicalOpenAiForwardProvider(route.provider)
1414
1447
  ) {
1448
+ markLinkTurnMissing(logCtx);
1415
1449
  return markProxyError(formatErrorResponse(
1416
1450
  400,
1417
1451
  "previous_response_not_found",
@@ -1438,6 +1472,7 @@ export async function prepareResponsesRequest(
1438
1472
  // An unknown adapter is left to the resolution error it already raises below.
1439
1473
  : continuationWire === undefined || PROVIDER_OWNED_CONTINUATION_WIRES.has(continuationWire);
1440
1474
  if (!upstreamOwnsOmittedHistory) {
1475
+ markLinkTurnMissing(logCtx);
1441
1476
  return markProxyError(formatErrorResponse(
1442
1477
  400,
1443
1478
  "previous_response_not_found",
@@ -1497,6 +1532,15 @@ export async function prepareResponsesRequest(
1497
1532
  if (!routeAllowedByScope(admissionScope, scopedDestination)) {
1498
1533
  return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(new AdmissionModelDeniedError(inboundSelector, scopedDestination), logCtx));
1499
1534
  }
1535
+ // A typed Advisor runs its own model server-side on this provider (#8448). The native lane refuses
1536
+ // a declaration outside the caller's scope; the Advisor is optional here, so it is not forwarded.
1537
+ const serverTools = parsed._anthropicServerTools;
1538
+ const scopedServerTools = serverTools?.filter(tool =>
1539
+ !nativeMessagesToolScopeDenial(admissionScope, route.providerName, route.modelId, { tools: [tool] }));
1540
+ if (serverTools && scopedServerTools && scopedServerTools.length !== serverTools.length) {
1541
+ parsed._anthropicServerTools = scopedServerTools;
1542
+ if (advisorServerToolDestination(route.provider)) addProtocolEntryReason(logCtx, "advisor-tool-outside-model-scope");
1543
+ }
1500
1544
  // Attribute local auth/cooldown failures to the public selector too; exact auth may fail before
1501
1545
  // the normal post-resolution provider label is assigned.
1502
1546
  if (route.codexAccountNamespace) {
@@ -9,6 +9,7 @@ import { isRec } from "../../claude/inbound-records";
9
9
  import { isOpenCodeGoResponsesUrl } from "../../adapters/opencode-go-additional-tools";
10
10
  import { buildResponsesTransport } from "../../adapters/openai-responses/transport";
11
11
  import { anthropicBillingPhysicalFetch } from "../../providers/anthropic-billing-ownership";
12
+ import { passiveKeyPhysicalFetch } from "../../providers/passive-key-observation";
12
13
  import { rebindPhysicalSend } from "../../lib/request-execution-budget";
13
14
  import { anthropicModelQuotaFor } from "../../oauth/anthropic-model-quota";
14
15
  import { anthropicRatePolicyFor } from "../../oauth/anthropic-rate-limit-policy";
@@ -82,6 +83,7 @@ import {
82
83
  import { renameRoutedIdentityInContext } from "../../adapters/identity";
83
84
  import { resolveCopilotApiBaseUrl } from "../../oauth/github-copilot";
84
85
  import {
86
+ providerAffinityGenerationIsCurrent,
85
87
  providerApiKeySelectionIsCurrent,
86
88
  resolveCurrentProviderApiKeyTransport,
87
89
  } from "../../providers/api-key-selection";
@@ -97,7 +99,7 @@ import { recordAnthropicAccountQuotaFromHeadersForInstance, hasPassiveAccountQuo
97
99
  import { checkOutboundBodySize, describeOutboundBodyRefusal } from "./outbound-body-guard";
98
100
  import { formatErrorResponse } from "../../bridge";
99
101
  import { bindRouteReasoningReplayScope } from "./core-replay";
100
- import { assignNativeLogConversationId, sessionIdHeaderFromRequest, normalizeLogConversationId } from "../request-log-conversation";
102
+ import { affinityLaneFromRequest, assignNativeLogConversationId, normalizeLogConversationId, sessionIdHeaderFromRequest } from "../request-log-conversation";
101
103
  import { redactSecretString } from "../../lib/redact";
102
104
  import { captureAccountAutoPauseAttempt } from "../../oauth/account-auto-pause";
103
105
  import { selectProactiveApiKeyTransport } from "../../providers/key-failover";
@@ -799,6 +801,7 @@ export async function prepareResponsesTransport(
799
801
  throw new Error("OAuth account selection changed before dispatch");
800
802
  }
801
803
  } else {
804
+ if (!providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)) throw new Error("Provider affinity selection is no longer available");
802
805
  let current = resolveCurrentProviderApiKeyTransport(config, route.providerName, route.provider);
803
806
  if (!current && (route.provider._apiKeyAttempt?.distributed || (route.provider.requestPacing?.enabled
804
807
  && (route.provider.requestPacing.keys || route.provider.requestPacing.keySelection === "round-robin")))) {
@@ -885,7 +888,7 @@ export async function prepareResponsesTransport(
885
888
  const beforePhysicalSend = (): void => {
886
889
  incoming.abortSignal?.throwIfAborted();
887
890
  if (sent) {
888
- if (binding?.kind === "api-key" && binding.provider._apiKeyAttempt?.distributed
891
+ if (binding?.kind === "api-key" && (binding.provider._apiKeyAttempt?.distributed || binding.provider._apiKeyAttempt?.cacheAffinity)
889
892
  && !selectionIsCurrent(binding)) throw new Error("API key became unavailable during the turn");
890
893
  return;
891
894
  }
@@ -979,7 +982,7 @@ export async function prepareResponsesTransport(
979
982
  // WS eligibility (egress, pacing, URL) was checked for the provider it was built for; a
980
983
  // provider reselected above was not, so it takes the HTTP fallback under its own route.
981
984
  const physicalFetch = ((input, physicalInit) => ws?.provider === route.provider ? execute(input, physicalInit) : sendWithConnectionPolicy(
982
- distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target),
985
+ passiveKeyPhysicalFetch(distributedKeyPhysicalFetch(anthropicBillingPhysicalFetch(fetchImpl, route.providerName, route.provider), route.providerName, route.provider, target), config, route.providerName, route.provider),
983
986
  input,
984
987
  { ...physicalInit, redirect: "manual",
985
988
  ...physicalSendObserverInit(observeAutoPause, destination instanceof Request ? destination.url : String(destination), deferredCopilotNote ? commitKeyAttemptSend : undefined),
@@ -1295,6 +1298,8 @@ export async function prepareResponsesTransport(
1295
1298
  // The Transport variant, not the bare picker: the picker answers with the PERSISTED row, and
1296
1299
  // a built-in provider stored in its valid minimal form would lose the adapter id, base URL
1297
1300
  // and static headers registry backfill supplies, throwing `Unknown adapter: undefined`.
1301
+ const affinityLane = affinityLaneFromRequest(req, logCtx, config, options.admission, options.replayPrincipal);
1302
+ if (affinityLane) logCtx.affinityLane = affinityLane;
1298
1303
  let proactiveKeyProvider: OcxProviderConfig | null;
1299
1304
  try {
1300
1305
  proactiveKeyProvider = selectProactiveApiKeyTransport(
@@ -1302,6 +1307,8 @@ export async function prepareResponsesTransport(
1302
1307
  route.providerName,
1303
1308
  route.provider,
1304
1309
  parsed.options.promptCacheKey,
1310
+ Date.now(),
1311
+ { lane: affinityLane, model: route.modelId, log: logCtx, continuation: parsed.context.messages.at(-1)?.role === "toolResult" },
1305
1312
  );
1306
1313
  } catch (err) {
1307
1314
  if (err instanceof OAuthAccountPausedError) {