@bitkyc08/opencodex 2.100.5 → 2.100.6

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 (536) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +2 -0
  3. package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
  4. package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
  5. package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
  6. package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
  7. package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
  8. package/gui/dist/assets/index-CEeMegqE.js +138 -0
  9. package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
  10. package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
  11. package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
  12. package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
  13. package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
  14. package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.lock +62 -0
  18. package/native/ocx-child/Cargo.toml +1 -0
  19. package/native/ocx-child/src/journal.rs +32 -10
  20. package/native/ocx-child/src/state.rs +2 -1
  21. package/native/ocx-child/src/toml_surgeon.rs +183 -72
  22. package/package.json +2 -2
  23. package/src/adapters/agy-acp/acp.ts +202 -0
  24. package/src/adapters/agy-acp/adapter.ts +554 -0
  25. package/src/adapters/agy-acp/binary.ts +79 -0
  26. package/src/adapters/agy-acp/options.ts +163 -0
  27. package/src/adapters/agy-acp/output-redaction.ts +270 -0
  28. package/src/adapters/agy-acp/policy.ts +105 -0
  29. package/src/adapters/agy-acp/process.ts +218 -0
  30. package/src/adapters/anthropic/account-metadata.ts +4 -1
  31. package/src/adapters/anthropic/advisor-tool.ts +43 -9
  32. package/src/adapters/anthropic/client-identity.ts +2 -0
  33. package/src/adapters/anthropic.ts +102 -14
  34. package/src/adapters/antigravity-refusal.ts +5 -1
  35. package/src/adapters/base.ts +25 -2
  36. package/src/adapters/claude-cli/adapter.ts +1 -0
  37. package/src/adapters/claude-cli/usage-admission.ts +12 -9
  38. package/src/adapters/codebuddy/adapter.ts +1 -0
  39. package/src/adapters/command-code.ts +2 -2
  40. package/src/adapters/cursor/http1-bidi.ts +7 -2
  41. package/src/adapters/cursor/live-transport.ts +2 -0
  42. package/src/adapters/cursor/request-builder.ts +4 -4
  43. package/src/adapters/cursor/tool-naming.ts +5 -5
  44. package/src/adapters/cursor/transport-retry.ts +14 -8
  45. package/src/adapters/cursor/transport.ts +2 -0
  46. package/src/adapters/cursor.ts +8 -2
  47. package/src/adapters/google-error-details.ts +105 -0
  48. package/src/adapters/google-errors.ts +183 -31
  49. package/src/adapters/google-http.ts +66 -22
  50. package/src/adapters/google-truncation.ts +48 -3
  51. package/src/adapters/google-vertex-endpoint.ts +12 -1
  52. package/src/adapters/google.ts +54 -26
  53. package/src/adapters/kiro/adapter.ts +39 -38
  54. package/src/adapters/kiro/stream.ts +59 -9
  55. package/src/adapters/kiro-retry.ts +5 -3
  56. package/src/adapters/m365-copilot/LICENSE +21 -0
  57. package/src/adapters/m365-copilot/fenced.ts +745 -0
  58. package/src/adapters/m365-copilot/images.ts +89 -0
  59. package/src/adapters/m365-copilot/tools.ts +284 -0
  60. package/src/adapters/m365-copilot/transport.ts +232 -0
  61. package/src/adapters/m365-copilot.ts +143 -0
  62. package/src/adapters/openai-chat/tool-schema.ts +2 -2
  63. package/src/adapters/openai-responses/passthrough.ts +1 -0
  64. package/src/adapters/openai-responses/reasoning.ts +23 -3
  65. package/src/adapters/physical-send.ts +11 -4
  66. package/src/adapters/qoder/adapter.ts +17 -3
  67. package/src/adapters/registry.ts +15 -1
  68. package/src/adapters/zed.ts +2 -1
  69. package/src/advisor/consult.ts +1 -0
  70. package/src/bridge/response-json.ts +6 -2
  71. package/src/bridge/sse.ts +21 -9
  72. package/src/chat/inbound.ts +11 -8
  73. package/src/chat/outbound.ts +28 -7
  74. package/src/claude/context-windows.ts +32 -8
  75. package/src/claude/desktop-3p.ts +18 -14
  76. package/src/claude/desktop-picker-platform.ts +1 -1
  77. package/src/claude/desktop-picker.ts +3 -3
  78. package/src/claude/inbound-content-options.ts +11 -1
  79. package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
  80. package/src/claude/intercept/picker-ca.ts +162 -27
  81. package/src/claude/intercept/picker-trust-linux.ts +411 -0
  82. package/src/claude/intercept/picker-trust.ts +35 -3
  83. package/src/claude/intercept/runtime.ts +2 -2
  84. package/src/claude/subagent-force-status.ts +24 -5
  85. package/src/claude/subscription-reserve.ts +87 -0
  86. package/src/cli/account-api.ts +3 -0
  87. package/src/cli/account-auth.ts +65 -11
  88. package/src/cli/account-extended.ts +1 -1
  89. package/src/cli/account-next-actions.ts +4 -1
  90. package/src/cli/account-policy-dto.ts +1 -1
  91. package/src/cli/account-policy.ts +6 -3
  92. package/src/cli/account-probe.ts +66 -0
  93. package/src/cli/account.ts +8 -2
  94. package/src/cli/capabilities-accounts.ts +8 -1
  95. package/src/cli/capabilities-agents-routing.ts +2 -2
  96. package/src/cli/capabilities-base.ts +4 -4
  97. package/src/cli/capabilities-integrations.ts +44 -4
  98. package/src/cli/capabilities-provider-models.ts +6 -0
  99. package/src/cli/claude-context-settings.ts +60 -0
  100. package/src/cli/claude-desktop.ts +2 -2
  101. package/src/cli/claude.ts +15 -7
  102. package/src/cli/client-start-fence.ts +64 -1
  103. package/src/cli/combo-result.ts +1 -0
  104. package/src/cli/combo-stats.ts +1 -1
  105. package/src/cli/combo.ts +19 -2
  106. package/src/cli/config-command.ts +21 -8
  107. package/src/cli/connect.ts +16 -0
  108. package/src/cli/cross-home-owner.ts +65 -18
  109. package/src/cli/dispatch.ts +4 -0
  110. package/src/cli/gateway-client-command.ts +128 -0
  111. package/src/cli/index.ts +98 -97
  112. package/src/cli/init.ts +20 -4
  113. package/src/cli/integrations.ts +23 -3
  114. package/src/cli/launcher-context.ts +12 -1
  115. package/src/cli/link.ts +24 -5
  116. package/src/cli/models-runtime-subcommands.ts +1 -0
  117. package/src/cli/models-runtime.ts +32 -0
  118. package/src/cli/start-owner-fence.ts +5 -2
  119. package/src/cli/status.ts +3 -3
  120. package/src/cli/stop-client-process.ts +51 -0
  121. package/src/cli/stop-restore.ts +383 -36
  122. package/src/cli/sync-command.ts +2 -2
  123. package/src/cli/uninstall-client-state.ts +7 -0
  124. package/src/client/connect.ts +72 -13
  125. package/src/client/hub-client.ts +38 -0
  126. package/src/client/hub-relay.ts +61 -36
  127. package/src/client/hub-session.ts +106 -0
  128. package/src/client/lifecycle-lock.ts +6 -1
  129. package/src/client/link-relay.ts +2 -1
  130. package/src/client/machine-listener.ts +60 -1
  131. package/src/client/runtime-restart.ts +1 -0
  132. package/src/client/runtime.ts +104 -34
  133. package/src/client/state.ts +11 -0
  134. package/src/client/stop-darwin-process.ts +73 -0
  135. package/src/client/stop-file-routing.ts +49 -0
  136. package/src/client/stop-native-handoff.ts +108 -0
  137. package/src/client/stop-routing.ts +41 -7
  138. package/src/client/stop-teardown-owner.ts +173 -0
  139. package/src/client/sync-runtime.ts +23 -4
  140. package/src/clients/config-export/opencode-wire.ts +24 -0
  141. package/src/clients/config-export.ts +28 -19
  142. package/src/codex/auth-api/login-flow.ts +68 -33
  143. package/src/codex/auth-api/main-account-probe.ts +3 -3
  144. package/src/codex/auth-api/pool-quota-probe.ts +8 -7
  145. package/src/codex/auth-api/routes.ts +1 -1
  146. package/src/codex/catalog/aggregation.ts +22 -10
  147. package/src/codex/catalog/gather-capture.ts +11 -2
  148. package/src/codex/catalog/m365-copilot-models.ts +52 -0
  149. package/src/codex/catalog/provider-models.ts +126 -53
  150. package/src/codex/catalog/routed-gather.ts +26 -12
  151. package/src/codex/catalog-admission.ts +4 -6
  152. package/src/codex/catalog-auto-refresh.ts +4 -2
  153. package/src/codex/catalog-self-heal.ts +4 -2
  154. package/src/codex/control-plane-models.ts +6 -0
  155. package/src/codex/convergence.ts +10 -0
  156. package/src/codex/desktop-app/picker-freshness.ts +3 -14
  157. package/src/codex/desktop-app/types.ts +6 -0
  158. package/src/codex/desktop-app/windows-command-payload.ts +9 -0
  159. package/src/codex/desktop-app/windows.ts +20 -12
  160. package/src/codex/desktop-compatibility/installed-build.ts +61 -58
  161. package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
  162. package/src/codex/desktop-compatibility/runtime.ts +51 -14
  163. package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
  164. package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
  165. package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
  166. package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
  167. package/src/codex/inject/config-toml.ts +67 -73
  168. package/src/codex/inject/plan.ts +11 -10
  169. package/src/codex/inject/remove.ts +4 -1
  170. package/src/codex/inject.ts +1 -0
  171. package/src/codex/journal-config-restore.ts +31 -4
  172. package/src/codex/journal.ts +16 -4
  173. package/src/codex/model-cache.ts +98 -27
  174. package/src/codex/native-residue.ts +14 -13
  175. package/src/codex/paths.ts +65 -28
  176. package/src/codex/quota-observation-freshness.ts +4 -0
  177. package/src/codex/quota.ts +71 -8
  178. package/src/codex/routing/selection.ts +32 -8
  179. package/src/combos/capability-policy.ts +31 -0
  180. package/src/combos/failover.ts +82 -74
  181. package/src/combos/identifiers.ts +2 -2
  182. package/src/combos/index.ts +3 -0
  183. package/src/combos/jev-model-backend.ts +12 -4
  184. package/src/combos/jev-session-pin-config.ts +22 -9
  185. package/src/combos/jev.ts +15 -4
  186. package/src/combos/request-capability.ts +214 -0
  187. package/src/combos/request.ts +22 -15
  188. package/src/combos/resolve.ts +5 -2
  189. package/src/combos/suggestion-channel.ts +89 -0
  190. package/src/combos/types.ts +14 -1
  191. package/src/config/account-auto-pause-revisions.ts +33 -10
  192. package/src/config/atomic-write.ts +1 -1
  193. package/src/config/codex-ws-incremental-setting.ts +34 -0
  194. package/src/config/diagnostics.ts +47 -8
  195. package/src/config/live-topology.ts +4 -2
  196. package/src/config/load-degrade.ts +96 -2
  197. package/src/config/mutation-lock.ts +7 -3
  198. package/src/config/paths.ts +3 -0
  199. package/src/config/pending-teardown.ts +19 -3
  200. package/src/config/process-state.ts +30 -12
  201. package/src/config/provider-validation.ts +10 -0
  202. package/src/config/salvage.ts +2 -2
  203. package/src/config/schema/account-auto-pause.ts +15 -1
  204. package/src/config/schema/agy-acp-references.ts +257 -0
  205. package/src/config/schema/config-schema.ts +32 -0
  206. package/src/config/schema/leaf-validators.ts +42 -0
  207. package/src/config/schema/subscription-reserve.ts +33 -0
  208. package/src/config/windows-process-command-line.ts +27 -9
  209. package/src/config.ts +6 -0
  210. package/src/generated/compatibility-version.json +806 -402
  211. package/src/images/loop.ts +79 -39
  212. package/src/integrations/catalog-refresh.ts +19 -1
  213. package/src/integrations/gateway-clients/agy.ts +340 -0
  214. package/src/integrations/gateway-clients/antigravity.ts +224 -0
  215. package/src/integrations/gateway-clients/index.ts +89 -0
  216. package/src/integrations/gateway-clients/io.ts +278 -0
  217. package/src/integrations/gateway-clients/types.ts +80 -0
  218. package/src/integrations/route-intent-disconnect.ts +37 -21
  219. package/src/lib/app-owned-memory-stores.ts +9 -0
  220. package/src/lib/cloud-code-appeal-link.ts +30 -0
  221. package/src/lib/errors.ts +32 -0
  222. package/src/lib/executor-physical-send-receipt.ts +42 -0
  223. package/src/lib/failure-detail.ts +1 -0
  224. package/src/lib/gcp-adc.ts +5 -0
  225. package/src/lib/http-date.ts +91 -0
  226. package/src/lib/lab-passive-linker-registration.ts +2 -1
  227. package/src/lib/local-chat-completion.ts +13 -3
  228. package/src/lib/local-internal-call-capability.ts +1 -3
  229. package/src/lib/messages-error-body.ts +2 -1
  230. package/src/lib/outbound-credential-registry.ts +40 -4
  231. package/src/lib/pinned-http.ts +7 -2
  232. package/src/lib/process-control.ts +1 -0
  233. package/src/lib/provider-egress.ts +16 -0
  234. package/src/lib/provider-outbound.ts +3 -0
  235. package/src/lib/redact-folding.ts +12 -3
  236. package/src/lib/redact.ts +37 -19
  237. package/src/lib/request-execution-budget.ts +241 -32
  238. package/src/lib/request-peer-scope.ts +64 -0
  239. package/src/lib/response-send-readings.ts +41 -0
  240. package/src/lib/state-store-registrations.ts +5 -0
  241. package/src/lib/tool-envelope-echo-filter.ts +33 -5
  242. package/src/lib/upstream-condition.ts +10 -3
  243. package/src/lib/upstream-retry.ts +95 -20
  244. package/src/lib/windows-secret-acl.ts +24 -7
  245. package/src/link/child-activity.ts +60 -4
  246. package/src/link/codex-settings.ts +2 -1
  247. package/src/link/relay-auth.ts +1 -0
  248. package/src/link/route-rounds.ts +32 -9
  249. package/src/link/status-projection.ts +42 -5
  250. package/src/link/supervisor.ts +96 -11
  251. package/src/link/tunnel-history.ts +5 -0
  252. package/src/oauth/account-auto-pause-policy.ts +72 -19
  253. package/src/oauth/account-auto-pause.ts +40 -16
  254. package/src/oauth/anthropic-account-refusal.ts +7 -0
  255. package/src/oauth/anthropic-continuity.ts +70 -9
  256. package/src/oauth/anthropic-identity.ts +75 -11
  257. package/src/oauth/anthropic-login-slot.ts +258 -0
  258. package/src/oauth/anthropic-routing.ts +24 -9
  259. package/src/oauth/anthropic-send-ownership.ts +4 -3
  260. package/src/oauth/anthropic.ts +30 -11
  261. package/src/oauth/health.ts +7 -2
  262. package/src/oauth/index.ts +50 -48
  263. package/src/oauth/key-providers.ts +2 -0
  264. package/src/oauth/login-cli.ts +11 -0
  265. package/src/oauth/login-flow-state.ts +10 -4
  266. package/src/oauth/m365-copilot-browser.ts +222 -0
  267. package/src/oauth/m365-copilot-web-session.ts +25 -0
  268. package/src/oauth/m365-copilot.ts +57 -0
  269. package/src/oauth/model-discovery-auth.ts +5 -0
  270. package/src/oauth/plan.ts +44 -0
  271. package/src/oauth/pool-kernel.ts +22 -8
  272. package/src/oauth/pool-settings-capability.ts +14 -3
  273. package/src/oauth/reauth-precheck.ts +27 -0
  274. package/src/oauth/store-anthropic-instance.ts +3 -1
  275. package/src/oauth/store.ts +121 -23
  276. package/src/oauth/types.ts +27 -2
  277. package/src/protocols/codecs/chat-ir.ts +7 -4
  278. package/src/protocols/codecs/gemini-interactions.ts +770 -0
  279. package/src/protocols/codecs/gemini.ts +470 -0
  280. package/src/protocols/contract.ts +2 -0
  281. package/src/protocols/encoders/adapter-events.ts +5 -3
  282. package/src/protocols/encoders/chat.ts +23 -7
  283. package/src/protocols/settings.ts +3 -0
  284. package/src/providers/account-quota-disk.ts +26 -8
  285. package/src/providers/api-key-pause.ts +2 -2
  286. package/src/providers/api-key-response-ownership.ts +14 -4
  287. package/src/providers/claude-cli-usage-state.ts +1 -0
  288. package/src/providers/claude-cli-usage.ts +24 -7
  289. package/src/providers/default-aliases.ts +11 -5
  290. package/src/providers/derive.ts +5 -1
  291. package/src/providers/fastwire.ts +6 -5
  292. package/src/providers/free-directory.ts +2 -2
  293. package/src/providers/google-vertex-location.ts +2 -1
  294. package/src/providers/google-vertex-model-discovery.ts +22 -0
  295. package/src/providers/key-failover.ts +18 -23
  296. package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
  297. package/src/providers/m365-copilot-discovery.ts +68 -0
  298. package/src/providers/m365-copilot-models.ts +32 -0
  299. package/src/providers/model-rename-fields.ts +6 -0
  300. package/src/providers/new-model-policy-runtime.ts +27 -6
  301. package/src/providers/openai-forward-destination.ts +19 -0
  302. package/src/providers/openai-tiers-destination.ts +3 -19
  303. package/src/providers/quota/account-cache.ts +183 -27
  304. package/src/providers/quota/anthropic-account-quota.ts +21 -17
  305. package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
  306. package/src/providers/quota/anthropic-decision-windows.ts +7 -3
  307. package/src/providers/quota/anthropic-usage-windows.ts +34 -4
  308. package/src/providers/quota/antigravity-account-probe.ts +165 -0
  309. package/src/providers/quota/antigravity.ts +71 -3
  310. package/src/providers/quota/vendor-probes-oauth.ts +52 -28
  311. package/src/providers/quota-decision-publication.ts +1 -1
  312. package/src/providers/quota-decision-snapshot.ts +4 -1
  313. package/src/providers/quota-types.ts +2 -0
  314. package/src/providers/quota.ts +8 -7
  315. package/src/providers/registry/agy-acp-models.ts +3 -0
  316. package/src/providers/registry/entries-core.ts +9 -0
  317. package/src/providers/registry/entries-extended.ts +60 -0
  318. package/src/providers/registry/model-seeds.ts +51 -0
  319. package/src/providers/request-pacing.ts +37 -7
  320. package/src/providers/service-tier.ts +2 -0
  321. package/src/providers/xai-privacy-mode.ts +52 -0
  322. package/src/remote/hub-management-relay.ts +74 -0
  323. package/src/responses/id-limits.ts +2 -0
  324. package/src/responses/input-media.ts +15 -3
  325. package/src/responses/parser-tools.ts +74 -11
  326. package/src/responses/parser.ts +16 -14
  327. package/src/responses/provider-opaque-metadata.ts +10 -0
  328. package/src/responses/reasoning-envelope.ts +3 -0
  329. package/src/responses/schema.ts +2 -3
  330. package/src/responses/spill-store.ts +5 -3
  331. package/src/responses/state/connection-scope.ts +232 -0
  332. package/src/responses/state/entry-types.ts +47 -0
  333. package/src/responses/state/snapshot-codec.ts +75 -14
  334. package/src/responses/state/snapshot-select.ts +2 -0
  335. package/src/responses/state/spill-codec.ts +59 -0
  336. package/src/responses/state/spill-queue.ts +11 -2
  337. package/src/responses/state.ts +178 -159
  338. package/src/router.ts +2 -6
  339. package/src/routing/compatibility/behavior.ts +6 -2
  340. package/src/routing/compatibility/subject.ts +17 -12
  341. package/src/routing/machine-weighted-routing.ts +58 -0
  342. package/src/server/advisor-admission-scope.ts +15 -7
  343. package/src/server/auth-cors.ts +27 -0
  344. package/src/server/chat-completions.ts +37 -17
  345. package/src/server/chat-native-eligibility.ts +21 -0
  346. package/src/server/chat-native.ts +15 -6
  347. package/src/server/claude-messages.ts +54 -6
  348. package/src/server/credential-recovery-attempt.ts +32 -0
  349. package/src/server/effort-policy.ts +6 -3
  350. package/src/server/gemini-inbound.ts +267 -0
  351. package/src/server/gemini-interactions-inbound.ts +229 -0
  352. package/src/server/gemini-interactions-store.ts +129 -0
  353. package/src/server/gemini-native-catalog.ts +64 -0
  354. package/src/server/gemini-native-log.ts +33 -0
  355. package/src/server/gemini-native-paths.ts +88 -0
  356. package/src/server/gemini-native-wire.ts +201 -0
  357. package/src/server/gemini-native.ts +218 -0
  358. package/src/server/grok-upstream-envelope-echo.ts +8 -2
  359. package/src/server/hub-relay-auth.ts +87 -0
  360. package/src/server/hub-usage-windows.ts +135 -0
  361. package/src/server/hub-usage.ts +16 -3
  362. package/src/server/inbound-body-admission.ts +2 -1
  363. package/src/server/index/anthropic-model-listing.ts +75 -0
  364. package/src/server/index/gemini-routes.ts +147 -0
  365. package/src/server/index/link-management.ts +3 -22
  366. package/src/server/index/link-relay-sessions.ts +71 -13
  367. package/src/server/index/link-websocket.ts +2 -0
  368. package/src/server/index/passive-management-read.ts +55 -0
  369. package/src/server/index/serve-options.ts +93 -107
  370. package/src/server/index/websocket-handler.ts +15 -2
  371. package/src/server/index.ts +10 -0
  372. package/src/server/inference/client-encoder-delivery.ts +2 -1
  373. package/src/server/inference/context.ts +33 -6
  374. package/src/server/management/agent-settings-routes.ts +33 -16
  375. package/src/server/management/claude-code-settings-patch.ts +6 -0
  376. package/src/server/management/combo-routes.ts +21 -1
  377. package/src/server/management/combo-suggestion-routes.ts +212 -0
  378. package/src/server/management/config-routes.ts +12 -4
  379. package/src/server/management/context.ts +2 -0
  380. package/src/server/management/gateway-client-routes.ts +62 -0
  381. package/src/server/management/integration-routes.ts +5 -0
  382. package/src/server/management/link-routes.ts +5 -1
  383. package/src/server/management/m365-copilot-provider-probe.ts +23 -0
  384. package/src/server/management/model-routes.ts +32 -2
  385. package/src/server/management/model-rows.ts +36 -3
  386. package/src/server/management/oauth-account-routes.ts +68 -15
  387. package/src/server/management/protocol-settings-patch.ts +1 -0
  388. package/src/server/management/provider-omitted-fields.ts +25 -0
  389. package/src/server/management/provider-overwrite-carry.ts +33 -8
  390. package/src/server/management/provider-routes.ts +10 -16
  391. package/src/server/management/request-history-routes.ts +2 -2
  392. package/src/server/management/route-registry.ts +10 -0
  393. package/src/server/management/shared.ts +118 -30
  394. package/src/server/management/sibling-guard.ts +2 -1
  395. package/src/server/management/system-routes.ts +6 -0
  396. package/src/server/management-auth.ts +8 -1
  397. package/src/server/messages-native-scope.ts +19 -0
  398. package/src/server/messages-native.ts +156 -59
  399. package/src/server/messages-shared.ts +6 -0
  400. package/src/server/models-capabilities.ts +24 -0
  401. package/src/server/native-chat-bridge.ts +259 -0
  402. package/src/server/ollama-inbound.ts +36 -184
  403. package/src/server/passive-route-linker.ts +3 -1
  404. package/src/server/port-reclaim.ts +48 -4
  405. package/src/server/proxy-liveness.ts +79 -22
  406. package/src/server/relay.ts +16 -9
  407. package/src/server/request-log-account-rotation.ts +2 -1
  408. package/src/server/request-log-attempt-recovery.ts +24 -2
  409. package/src/server/request-log-attempt-usage.ts +5 -4
  410. package/src/server/request-log-committed-terminal.ts +87 -0
  411. package/src/server/request-log-failure-attribution.ts +3 -3
  412. package/src/server/request-log-failure-detail.ts +34 -0
  413. package/src/server/request-log-key-failure.ts +27 -0
  414. package/src/server/request-log-terminal-status.ts +25 -12
  415. package/src/server/request-log.ts +59 -63
  416. package/src/server/responses/adapter-continuation.ts +77 -44
  417. package/src/server/responses/adapter-delivery.ts +47 -22
  418. package/src/server/responses/adapter-dispatch.ts +150 -149
  419. package/src/server/responses/advisor-retention.ts +12 -4
  420. package/src/server/responses/advisor-slot.ts +97 -2
  421. package/src/server/responses/agent-task-recovery.ts +44 -11
  422. package/src/server/responses/agy-acp-preflight.ts +41 -0
  423. package/src/server/responses/anthropic-image-context.ts +44 -0
  424. package/src/server/responses/antigravity-validation-refusal.ts +25 -1
  425. package/src/server/responses/buffered-sse-json.ts +18 -1
  426. package/src/server/responses/codex-ws-correlation.ts +5 -2
  427. package/src/server/responses/codex-ws-exchange.ts +91 -8
  428. package/src/server/responses/codex-ws-incremental.ts +136 -0
  429. package/src/server/responses/codex-ws-pool.ts +22 -8
  430. package/src/server/responses/codex-ws-request.ts +5 -0
  431. package/src/server/responses/codex-ws-send-accounting.ts +8 -0
  432. package/src/server/responses/codex-ws-session.ts +14 -0
  433. package/src/server/responses/codex-ws-wire.ts +44 -22
  434. package/src/server/responses/combo-admission-snapshot.ts +93 -0
  435. package/src/server/responses/combo-required-tool-stream.ts +16 -4
  436. package/src/server/responses/combo-selection-keepalive.ts +5 -0
  437. package/src/server/responses/combo-stream-preflight.ts +182 -73
  438. package/src/server/responses/compact-response-body.ts +27 -0
  439. package/src/server/responses/compact.ts +174 -121
  440. package/src/server/responses/compaction-recovery.ts +7 -0
  441. package/src/server/responses/core-codex-account.ts +88 -62
  442. package/src/server/responses/core-combo-failure.ts +15 -0
  443. package/src/server/responses/core-combo-native.ts +12 -1
  444. package/src/server/responses/core-combo.ts +340 -94
  445. package/src/server/responses/core-normalize.ts +19 -12
  446. package/src/server/responses/core-opaque-recovery.ts +15 -4
  447. package/src/server/responses/core-options.ts +50 -5
  448. package/src/server/responses/core-pipeline.ts +11 -0
  449. package/src/server/responses/core.ts +7 -1
  450. package/src/server/responses/empty-completion-guard.ts +21 -7
  451. package/src/server/responses/estimated-usage.ts +2 -1
  452. package/src/server/responses/fetch-helpers.ts +95 -19
  453. package/src/server/responses/history-slim.ts +204 -0
  454. package/src/server/responses/hosted-advisor-spend.ts +49 -0
  455. package/src/server/responses/image-context-recovery.ts +199 -0
  456. package/src/server/responses/input-admission.ts +36 -11
  457. package/src/server/responses/jev-model-invoke.ts +23 -16
  458. package/src/server/responses/non-replayable-error.ts +12 -2
  459. package/src/server/responses/passthrough-build-error.ts +5 -3
  460. package/src/server/responses/passthrough-delivery.ts +74 -33
  461. package/src/server/responses/passthrough-dispatch.ts +170 -197
  462. package/src/server/responses/policy-fallback.ts +7 -2
  463. package/src/server/responses/policy-request-scope.ts +36 -2
  464. package/src/server/responses/replay-owner.ts +20 -0
  465. package/src/server/responses/request-prepare.ts +97 -16
  466. package/src/server/responses/request-send-budget.ts +97 -25
  467. package/src/server/responses/request-sidecar-auth.ts +138 -65
  468. package/src/server/responses/request-spend-target.ts +13 -1
  469. package/src/server/responses/request-spend.ts +228 -47
  470. package/src/server/responses/request-transport.ts +395 -70
  471. package/src/server/responses/run-turn-execution.ts +40 -9
  472. package/src/server/responses/sidecar-execution.ts +214 -67
  473. package/src/server/responses/sidecar-send-budget.ts +9 -9
  474. package/src/server/responses/terminal-guard.ts +35 -9
  475. package/src/server/responses/ws-upstream.ts +27 -6
  476. package/src/server/responses-phase-inference.ts +32 -9
  477. package/src/server/responses-terminal-repair.ts +14 -35
  478. package/src/server/system-env.ts +8 -5
  479. package/src/server/ws-bridge.ts +23 -17
  480. package/src/service/health-sentinel-linux.ts +16 -7
  481. package/src/service/systemd.ts +11 -2
  482. package/src/service/windows-checked-stop-live.ts +60 -55
  483. package/src/service/windows-checked-stop.ts +29 -11
  484. package/src/service/windows-guarded-manager.ts +14 -26
  485. package/src/service/windows-process-evidence.ts +82 -74
  486. package/src/service/windows-process-native.ts +69 -20
  487. package/src/service/windows-service-stop.ts +14 -12
  488. package/src/service/windows-stop-binding.ts +14 -5
  489. package/src/service/windows-stop-confirm.ts +1 -1
  490. package/src/service/windows-task-instance-stop.ts +98 -0
  491. package/src/service/windows-taskxml.ts +30 -7
  492. package/src/sidecar/anthropic-binding.ts +1 -1
  493. package/src/stall-timeout.ts +30 -0
  494. package/src/telemetry/aggregate.ts +6 -3
  495. package/src/types/account-auto-pause.ts +19 -1
  496. package/src/types/accounts.ts +21 -0
  497. package/src/types/anthropic-account-pool.ts +1 -1
  498. package/src/types/combo-capability-policy.ts +19 -0
  499. package/src/types/config.ts +22 -2
  500. package/src/types/provider.ts +42 -8
  501. package/src/types/request.ts +15 -0
  502. package/src/types/tools.ts +22 -5
  503. package/src/types/wire.ts +1 -0
  504. package/src/types.ts +4 -0
  505. package/src/update/check-types.ts +2 -0
  506. package/src/update/job.ts +8 -3
  507. package/src/update/managed-release.ts +6 -0
  508. package/src/update/orchestrated-entry.ts +13 -4
  509. package/src/update/refresh-scheduler.ts +17 -7
  510. package/src/usage/attempt-delivery.ts +6 -0
  511. package/src/usage/cache-provenance.ts +71 -0
  512. package/src/usage/cost.ts +216 -27
  513. package/src/usage/credit-billing.ts +88 -0
  514. package/src/usage/jev-stats.ts +13 -9
  515. package/src/usage/log.ts +5 -33
  516. package/src/usage/summary.ts +8 -43
  517. package/src/usage/user-cost-overlays.ts +13 -1
  518. package/src/vision/index.ts +8 -3
  519. package/src/vision/plan.ts +28 -14
  520. package/src/vision/routed-describe.ts +24 -36
  521. package/src/web-search/header-deadline.ts +14 -3
  522. package/src/web-search/index.ts +6 -4
  523. package/src/web-search/loop.ts +240 -78
  524. package/src/web-search/progress-stream.ts +29 -2
  525. package/src/web-search/run-turn-loop.ts +5 -1
  526. package/gui/dist/assets/App-BGP8I0V4.css +0 -1
  527. package/gui/dist/assets/App-BRExzhwL.js +0 -60
  528. package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
  529. package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
  530. package/gui/dist/assets/index-DJxM-imn.css +0 -2
  531. package/gui/dist/assets/index-Dy1jIGty.js +0 -138
  532. package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
  533. package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
  534. package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
  535. package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
  536. package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
@@ -1,30 +1,31 @@
1
- import { recordUpstreamProviderErrorDetail } from "../request-log-failure-detail";
1
+ import { projectLocalModelRefusalLog, recordUpstreamProviderErrorDetail } from "../request-log-failure-detail";
2
2
  import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
3
3
  import { clientFacingModelText } from "../../lib/error-destination";
4
+ import { createAnthropicImageRecovery, recoverAdapterImageContext, retainAdapterFailureResponse } from "./image-context-recovery";
4
5
  import { responsesSpendTarget } from "./request-spend-target";
5
- import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
6
- import { markProxyError, carryProxyError, isProxyError } from "../../lib/client-error-body";
7
- import { codexAdapterBuildRefusal } from "./passthrough-build-error";
6
+ import { bindAdapterResponseSpend } from "./request-spend";
7
+ import { markProxyError, isProxyError } from "../../lib/client-error-body";
8
+ import { adapterBuildRefusal } from "./passthrough-build-error";
8
9
  import { createAutoPauseRefreshErrorMapper, recoverAutoPausedAccount } from "./account-auto-pause-recovery";
9
10
  import { wasAccountAutoPaused, wasPermanentAccountRefusal } from "../../oauth/account-auto-pause";
11
+ import { effectiveAccountAutoPause } from "../../config/account-auto-pause-revisions";
10
12
  import { bindAnthropicRejectionResponse } from "../../adapters/anthropic-rejection-memo";
13
+ import { hostedAdvisorCredentials } from "../../adapters/anthropic/advisor-tool";
11
14
  import { deferPhysicalSendReporter } from "./deferred-send-reporter";
12
15
  import { usesApiKeyAccount } from "../../providers/label";
13
16
  import { spendLedgerStorageErrorResponse } from "./spend-storage-error";
14
17
  import { classifyAnthropic429 } from "../../oauth/anthropic-rate-limit-policy";
15
- import { rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
18
+ import { anthropicRefusalCredentialChanged, rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
16
19
  import { authorizeResendForRecovery } from "../../lib/request-resend-gate";
17
20
  import { ambiguousResendAllowanceFor, selfContainedResponsesBody } from "./reset-replay";
18
- import { transientSendCapFor } from "./request-send-budget";
19
- import { isNonReplayableResponse, isSameTargetRetryHold } from "../../lib/upstream-retry";
21
+ import { transientSendCapFor, type ResponsesSendBudget } from "./request-send-budget";
20
22
  import { sanitizeNonReplayableUpstreamError } from "./non-replayable-error";
21
23
  import { isLocalUpstream } from "../../lib/local-upstream";
22
- import { resolveConnectTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
23
- import type { ResponsesRequestContext, ResponsesAdmissionState } from "./core-options";
24
+ import { providerConnectTimeoutMs, providerStallTimeoutSec, resolveConnectTimeoutMs, resolveStallTimeoutMs } from "../../stall-timeout";
25
+ import { responsesTimeoutProvider, type ResponsesRequestContext, type ResponsesAdmissionState } from "./core-options";
24
26
  import type { PreparedResponsesRequest } from "./request-prepare";
25
27
  import type { ResponsesTransport } from "./request-transport";
26
28
  import type { ResponsesEffects } from "./response-effects";
27
- import type { ResponsesSendBudget } from "./request-send-budget";
28
29
  import { linkAbortSignal } from "./core-lifetime";
29
30
  import type { AdapterRequest } from "../../adapters/base";
30
31
  import type { AdapterEvent } from "../../types";
@@ -36,11 +37,12 @@ import {
36
37
  sealRequestAttemptIdentity,
37
38
  recordAttemptCredentialSource,
38
39
  } from "../request-log";
40
+ import { credentialRecoveryStatus } from "../request-log-attempt-recovery";
39
41
  import { anthropicPoolCooldownResponse, clientCancelledResponse, readDisplaySafeErrorText } from "./core-errors";
40
42
  import { isTranslatorBudgetExceededError } from "../../lib/translator-budget";
41
43
  import { redactSecretString } from "../../lib/redact";
42
44
  import { rewriteUpstreamPolicyRefusal } from "./policy-refusal";
43
- import { carryPolicyCandidateRefusal } from "./policy-request-scope";
45
+ import { carryPolicyCandidateRefusal, HostedAdvisorSpendRefusal } from "./policy-request-scope";
44
46
  import { withProviderRequestSlot } from "../../providers/request-pacing";
45
47
  import { providerFetch, fetchWithHeaderTimeout, safeHostLabel } from "./fetch-helpers";
46
48
  import { isAnthropicBillingKeyPool, rotateAnthropicBillingKeyOnResponse } from "../../providers/anthropic-billing-recovery";
@@ -57,6 +59,7 @@ import {
57
59
  import {
58
60
  fetchWithTransientRetry,
59
61
  fetchWithResetRetry,
62
+ isNonReplayableResponse, isSameTargetRetryHold,
60
63
  applyUpstreamRecoveryInit,
61
64
  SendBudgetExhaustedError, errorDestinationLabel,
62
65
  UpstreamRetryEvidenceError,
@@ -72,10 +75,10 @@ import { publicOAuthErrorPresentation, OAuthAccountPausedError, OAuthLoginRequir
72
75
  import { getAccountSet, markAccountNeedsReauthIfGeneration } from "../../oauth/store";
73
76
  import { tryKiroAlternateAfterTerminalRefresh } from "../../oauth/kiro-terminal-failover";
74
77
  import { classifyKiroRefusal } from "../../adapters/kiro-refusal";
75
- import { classifyAntigravityRefusal } from "../../adapters/antigravity-refusal";
76
78
  import { normalizeFinalKiroHttpError } from "../../adapters/kiro-retry";
77
79
  import { noteKiroMonthlyRefusal } from "../../providers/kiro-usage";
78
80
  import { persistKiroAccountState } from "../../providers/kiro-account-state-disk";
81
+ import { isXaiGrokOAuth, isXaiLegacyPrivacyError, xaiPrivacyModeRefusal } from "../../providers/xai-privacy-mode";
79
82
  import { isXaiResponsesDestination, resolveProviderTransport } from "../../providers/xai-transport";
80
83
  import { resolveCopilotApiBaseUrl } from "../../oauth/github-copilot";
81
84
  import { resolveWireProtocolOverride } from "../adapter-resolve";
@@ -110,9 +113,7 @@ import { streamingContextOverflowResponse, jsonContextOverflowResponse, lateAttr
110
113
  import { OllamaLateAttributionBudgetError } from "../../adapters/ollama-native";
111
114
  import { isFixedCodexAccount } from "./core-codex-account";
112
115
  import { recordSubagentQuotaFailureForThreadSpawn } from "../../codex/subagent-model-fallback";
113
- import {
114
- CYBER_POLICY_ERROR_CODE,
115
- } from "../../lib/errors";
116
+ import { CYBER_POLICY_ERROR_CODE } from "../../lib/errors";
116
117
  import { resolveClientRetryAfter } from "../../lib/retry-after";
117
118
  import { cancelBodyOnAbort } from "../../lib/abort";
118
119
  import { createCodexAuthDispatchGuard, releaseCodexAuthContextProbeLease, unwrapUpstreamRetryEvidenceError } from "../../codex/auth-context";
@@ -120,7 +121,7 @@ import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
120
121
  import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
121
122
  import { chargeWorkflowSends } from "../../lib/workflow-budget";
122
123
  import { hasWorkflowSendObserver } from "../../lib/request-execution-budget";
123
- import { isAntigravityAccessDeniedRefusal, isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
124
+ import { captureAntigravityQuarantineTrust, classifyAntigravityQuarantine, isAntigravityAccessDeniedRefusal, isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
124
125
  import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
125
126
  import { isAntigravityFaultRotatable } from "./antigravity-fault-rotation";
126
127
  import { adapterSendBudgetRefusal } from "../workflow-refusal";
@@ -146,6 +147,7 @@ export async function prepareAdapterExchange(
146
147
  ResponsesTransport,
147
148
  | "activeAdapter"
148
149
  | "adapter"
150
+ | "pinAnthropicImageRecovery"
149
151
  | "sameTargetRequest"
150
152
  | "sameTargetParsed"
151
153
  | "sameTargetToken"
@@ -173,7 +175,8 @@ export async function prepareAdapterExchange(
173
175
  | "genericFailovers"
174
176
  | "genericFailoverLimit" | "anthropicFailoverLimit"
175
177
  | "applyFailoverSnapshot"
176
- | "noteRoutedAttemptSend" | "attemptSendDeferred" | "deferPhysicalAttribution"
178
+ | "noteRoutedAttemptSend" | "attemptSendDeferred" | "deferPhysicalAttribution" | "commitAdapterAttemptSend"
179
+ | "createCredentialReplayAttempt" | "credentialReplayHandoff"
177
180
  >,
178
181
  responseEffects: Pick<ResponsesEffects, "cancelResponseCompletion" | "notifyResponseComplete" | "refreshRequestToolAliases">,
179
182
  sendBudgetState: Pick<
@@ -182,8 +185,8 @@ export async function prepareAdapterExchange(
182
185
  | "adapterDispatchBudget"
183
186
  | "noteAdapterPhysicalSend"
184
187
  | "noteAdapterRecoveryWithheld"
188
+ | "imageRecoverySendReporter"
185
189
  | "remainingTransientSendBudget"
186
- | "adapterSendBudget"
187
190
  | "transientSendReporter"
188
191
  | "recoverySendAllowance"
189
192
  | "recoveryClassFor"
@@ -194,6 +197,7 @@ export async function prepareAdapterExchange(
194
197
  | "claimAmbiguousResend"
195
198
  | "sendsUsed"
196
199
  | "targetSendsUsed"
200
+ | "compactHandoffSendCeiling"
197
201
  | "initialSendAllowance"
198
202
  | "noteInitialDispatch"
199
203
  >,
@@ -261,21 +265,21 @@ export async function prepareAdapterExchange(
261
265
  ?? formatErrorResponse(502, "upstream_error", "GitHub Copilot Auto negotiation failed.");
262
266
  }
263
267
  };
264
- // Where this exchange dials. Local upstreams (loopback / private / `.local` / `.lan`) are
265
- // operator-trusted and often CPU-bound, so an unset stall budget resolves to disabled for them.
268
+ // Trusted local upstreams default to no stall timeout.
266
269
  const localUpstream = isLocalUpstream(route.provider.baseUrl);
267
270
  // Header arrival and body silence are separate clocks (structure/transports/timeouts.md).
268
- const connectMs = resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream });
269
- const sendConnectMs = () => route.provider.authMode === "forward" ? resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: isLocalUpstream(route.provider.baseUrl) }) : 0;
271
+ const connectTimeoutMs = () => providerConnectTimeoutMs(config, responsesTimeoutProvider(options, route.provider));
272
+ const connectMs = resolveConnectTimeoutMs(connectTimeoutMs(), { localUpstream });
273
+ const sendConnectMs = () => route.provider.authMode === "forward" ? resolveConnectTimeoutMs(connectTimeoutMs(), { localUpstream: isLocalUpstream(route.provider.baseUrl) }) : 0;
270
274
  transportState.activeAdapter = transportState.adapter;
271
275
  const antigravityPoolActivated = route.providerName === "google-antigravity"
272
276
  && isGenericOAuthFailoverEnabled(config, route.providerName);
273
277
  const antigravityDenial = createAntigravityModelDenialRecovery();
278
+ const antigravityQuarantineTrust = captureAntigravityQuarantineTrust(route.providerName);
274
279
  // One immutable, body-safe outbound request per same-target sequence (URL, serialized body,
275
- // auth headers, generated compat headers). Same-target 429 replays reuse it verbatim; the
276
- // builder runs again only after a key/account/adapter rotation, an oauth refresh, or an
277
- // image-tier bias change (transportToken bump). `body` is always a serialized string, so
278
- // reuse is safe, and releaseBodyObservation is idempotent per build.
280
+ // Reuse the cached body while the parsed request, credential, wire and tier are unchanged.
281
+ const handoffReplay = transportState.credentialReplayHandoff;
282
+ transportState.credentialReplayHandoff = undefined;
279
283
  let initialRequest: AdapterRequest | undefined;
280
284
  let inputTokenEstimate: number | undefined;
281
285
  // An adapter may know the turn needs no inference at all — Kiro's replayed history ending in a
@@ -342,12 +346,13 @@ export async function prepareAdapterExchange(
342
346
  abortSignal: upstream.signal,
343
347
  });
344
348
  refreshRequestToolAliases(initialRequest);
345
- recordAdapterReasoning(logCtx, initialRequest);
346
- recordAdapterTier(logCtx, initialRequest);
349
+ if (!handoffReplay && !transportState.activeAdapter.fetchResponse) {
350
+ recordAdapterReasoning(logCtx, initialRequest); recordAdapterTier(logCtx, initialRequest);
351
+ }
347
352
  inputTokenEstimate = typeof initialRequest.usageLog?.inputTokens === "number"
348
353
  ? initialRequest.usageLog.inputTokens
349
354
  : undefined;
350
- if (inputTokenEstimate !== undefined) logCtx.usageLogInputTokens = inputTokenEstimate;
355
+ if (!handoffReplay && inputTokenEstimate !== undefined) logCtx.usageLogInputTokens = inputTokenEstimate;
351
356
  } catch (err) {
352
357
  // A throwing buildRequest never returned a request; if a post-build step threw, release
353
358
  // the serialized-body observation (idempotent) so the translator budget is not leaked.
@@ -365,8 +370,8 @@ export async function prepareAdapterExchange(
365
370
  code: "translation_buffer_limit",
366
371
  });
367
372
  }
368
- const authRefusal = codexAdapterBuildRefusal(err, admissionState.authCtx, route.codexAccountNamespace);
369
- if (authRefusal) return authRefusal;
373
+ const buildRefusal = adapterBuildRefusal(err, admissionState.authCtx, route.codexAccountNamespace);
374
+ if (buildRefusal) return buildRefusal;
370
375
  const msg = err instanceof Error ? err.message : String(err);
371
376
  return formatErrorResponse(400, "invalid_request_error", redactSecretString(msg));
372
377
  }
@@ -374,42 +379,42 @@ export async function prepareAdapterExchange(
374
379
  // Capture it in a const so the fetch callbacks read a narrowed, immutable value
375
380
  // (TypeScript drops narrowing for a `let` captured by a nested function).
376
381
  const builtInitialRequest = initialRequest;
382
+ type CredentialReplay = ReturnType<typeof transportState.createCredentialReplayAttempt>;
377
383
  transportState.sameTargetRequest = builtInitialRequest;
378
384
  transportState.sameTargetParsed = parsed;
379
385
  transportState.sameTargetToken = transportState.transportToken;
380
- /**
381
- * Invalidate the same-target request cache. Every credential/adapter/parsed mutation MUST
382
- * go through here: the cache keys on `parsed` REFERENCE identity, so an in-place mutation
383
- * is invisible to it and a missed bump would replay a request built with a stale key.
384
- */
385
386
 
386
387
  const initialRecovery = route.providerName === "github-copilot"
387
388
  ? sendBudgetState.pendingHopPermit?.sendClass === "auth-recovery" ? "oauth-account-429"
388
389
  : transportState.oauth401ReplayAttempted ? "oauth-401" : undefined
389
390
  : undefined;
390
391
  let upstreamResponse: Response;
391
- // Preserve bounded terminal bytes without retaining the refused send's pacing lease.
392
- // Reading the owned body to EOF (or cancelling on its bound) frees capacity BEFORE
393
- // replacement admission; keeping that live body would wait on its own concurrency slot.
394
- const retainFailureResponse = async (): Promise<Response> => {
395
- const original = upstreamResponse;
396
- const text = await readDisplaySafeErrorText(original, upstream.signal, "");
397
- const headers = new Headers(original.headers);
398
- headers.delete("content-length");
399
- headers.delete("content-encoding");
400
- upstreamResponse = carryProxyError(original, new Response(text, { status: original.status, statusText: original.statusText, headers }));
401
- return upstreamResponse;
402
- };
403
- const autoPauseEnabled = config.providers[route.providerName]?.accountAutoPause?.enabled === true;
392
+ const retainFailureResponse = async () => upstreamResponse = (await retainAdapterFailureResponse(upstreamResponse, upstream.signal)).response;
393
+ const imageRecovery = route.provider.anthropicImageContextRecovery === true && transportState.activeAdapter.name === "anthropic"
394
+ ? createAnthropicImageRecovery(requestContext, requestState, transportState, sendBudgetState, connectMs)
395
+ : undefined;
396
+ const autoPauseEnabled = effectiveAccountAutoPause(config.providers[route.providerName]) !== undefined;
404
397
  const billingPoolRequest = isAnthropicBillingKeyPool(route.provider);
398
+ // Hosted Advisor revalidates the credential after the upstream rewrite, before the receipt.
399
+ const shouldDeferGenericSend = (request: AdapterRequest) => billingPoolRequest
400
+ || (route.providerName === "github-copilot" && route.provider.authMode !== "forward")
401
+ || hostedAdvisorCredentials.has(request);
405
402
  let billingRecoveryActive = false;
403
+ const reserveCompactRetrySpend = () => sendBudgetState.compactHandoffSendCeiling !== undefined
404
+ && sendBudgetState.adapterSendBudget?.spendEnforced === true;
406
405
  const genericRefetchCountsSends = () => !!sendBudgetState.workflowRootId || options.comboAttempt === true || sendBudgetState.adapterSendBudget?.spendEnforced === true
407
406
  || transientRetryPolicyFor(route.provider) !== null || resetReplayPolicyFor(route.provider) !== null
408
- || !!anthropicInstance || billingPoolRequest || billingRecoveryActive || autoPauseEnabled;
407
+ || !!anthropicInstance || billingPoolRequest || billingRecoveryActive || autoPauseEnabled || imageRecovery !== undefined;
409
408
  let handoffPermit: ResponsesSendBudget["pendingHopPermit"];
410
409
  try {
411
410
  if (transportState.activeAdapter.fetchResponse) {
412
- transportState.noteRoutedAttemptSend(inputTokenEstimate, initialRecovery);
411
+ let published = false;
412
+ const publish = (): void => {
413
+ if (published) return;
414
+ if (handoffReplay) handoffReplay(builtInitialRequest, transportState.activeAdapter.name);
415
+ else transportState.commitAdapterAttemptSend(builtInitialRequest, transportState.activeAdapter.name, initialRecovery);
416
+ published = true;
417
+ };
413
418
  const producer = adapterDispatchBudget?.beginSpendProducer?.();
414
419
  try {
415
420
  upstreamResponse = await withProviderRequestSlot(route.providerName, route.provider, route.modelId, upstream.signal, pacingSlot =>
@@ -418,13 +423,17 @@ export async function prepareAdapterExchange(
418
423
  abortSignal: upstream.signal,
419
424
  timeoutMs: sendConnectMs(),
420
425
  sendBudget: adapterDispatchBudget,
421
- onPhysicalSend: send => { antigravityDenial.beforeSend(); noteAdapterPhysicalSend(inputTokenEstimate, send); },
426
+ onPhysicalSend: send => {
427
+ if (transportState.activeAdapter.reportsPhysicalSends) publish();
428
+ antigravityDenial.beforeSend(); noteAdapterPhysicalSend(inputTokenEstimate, send);
429
+ },
422
430
  onRecoveryWithheld: noteAdapterRecoveryWithheld,
423
431
  stream: parsed.stream,
424
432
  executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
425
433
  pacingSlotAcquired: true,
426
434
  pacingSlot,
427
- dispatchOverride: oauthDispatch(builtInitialRequest),
435
+ dispatchOverride: oauthDispatch(builtInitialRequest, parsed, "adapter", true),
436
+ onPhysicalDispatch: publish,
428
437
  providerName: route.providerName,
429
438
  modelId: route.modelId,
430
439
  beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
@@ -480,7 +489,7 @@ export async function prepareAdapterExchange(
480
489
  ? fetchWithTransientRetry
481
490
  : fetchWithResetRetry;
482
491
  const initialReporter = transientSendReporter(compactPrepaid ?? options.comboDispatchPermit);
483
- const deferredInitial = (billingPoolRequest || route.providerName === "github-copilot" && route.provider.authMode !== "forward") && !receiptMode ? deferPhysicalSendReporter(initialReporter) : undefined;
492
+ const deferredInitial = !receiptMode && shouldDeferGenericSend(builtInitialRequest) ? deferPhysicalSendReporter(initialReporter) : undefined;
484
493
  try { upstreamResponse = await fetchWithRetryPolicy(
485
494
  recovery => {
486
495
  // Unconfigured generic sends may omit the counting reporter. Capture policy
@@ -492,14 +501,14 @@ export async function prepareAdapterExchange(
492
501
  compactPrepaidUsed = true;
493
502
  }
494
503
  // Key transport keeps this metadata pending until it binds the actual selection.
495
- transportState.noteRoutedAttemptSend(inputTokenEstimate, recovery ?? initialRecovery);
504
+ if (!handoffReplay) transportState.noteRoutedAttemptSend(inputTokenEstimate, recovery ?? initialRecovery);
496
505
  return fetchWithHeaderTimeout(builtInitialRequest.url, applyUpstreamRecoveryInit({
497
506
  method: builtInitialRequest.method,
498
507
  headers: builtInitialRequest.headers,
499
508
  body: builtInitialRequest.body,
500
509
  }, recovery), upstream.signal, sendConnectMs(), parsed.stream,
501
510
  providerFetch(route.provider, options.codexWsRuntimeIdentity, {
502
- dispatchOverride: oauthDispatch(builtInitialRequest),
511
+ dispatchOverride: oauthDispatch(builtInitialRequest, parsed, "adapter", Boolean(handoffReplay)),
503
512
  providerName: route.providerName,
504
513
  modelId: route.modelId,
505
514
  onPhysicalDispatch: () => {
@@ -516,6 +525,7 @@ export async function prepareAdapterExchange(
516
525
  sendBudgetState.noteInitialDispatch(compactPrepaid && !compactPrepaidUsed ? compactPrepaid : undefined);
517
526
  compactPrepaidUsed = true;
518
527
  }
528
+ handoffReplay?.(builtInitialRequest, transportState.activeAdapter.name, recovery);
519
529
  },
520
530
  beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
521
531
  ? createCodexAuthDispatchGuard(admissionState.authCtx, options.codexAuthPolicy ?? config, route.modelId, options.admission, options.visionDescribeTerminal === true) : undefined,
@@ -525,9 +535,10 @@ export async function prepareAdapterExchange(
525
535
  abortSignal: upstream.signal,
526
536
  label: safeHostLabel(builtInitialRequest.url), destination: errorDestinationLabel(builtInitialRequest.url),
527
537
  claimAmbiguousResend: claimPreHeaderResend,
538
+ reserveRetrySpend: reserveCompactRetrySpend,
528
539
  offlineWait: options.comboAttempt ? undefined : createProviderOfflineResendWait(route.providerName, route.provider, builtInitialRequest.url, config.offlineResendWaitSec),
529
540
  ...(sendBudgetState.workflowRootId || sendBudgetState.adapterSendBudget?.spendEnforced || options.comboDispatchPermit || transientPolicy || resetPolicy || compactPrepaid || options.comboAttempt
530
- || anthropicInstance || billingPoolRequest || autoPauseEnabled
541
+ || anthropicInstance || billingPoolRequest || autoPauseEnabled || imageRecovery
531
542
  ? {
532
543
  // A pending compaction permit already booked this leg's first physical send.
533
544
  ...(transientPolicy || resetPolicy || compactPrepaid || options.comboAttempt || anthropicInstance || autoPauseEnabled
@@ -556,6 +567,7 @@ export async function prepareAdapterExchange(
556
567
  return storageRefusal;
557
568
  }
558
569
  const refusal = err instanceof UpstreamRetryEvidenceError ? err.cause : err;
570
+ if (refusal instanceof HostedAdvisorSpendRefusal) return refusal.response();
559
571
  if (refusal instanceof AdmissionModelDeniedError) {
560
572
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
561
573
  return admissionModelDeniedResponse(projectAdmissionModelDeniedLog(refusal, logCtx));
@@ -624,22 +636,15 @@ export async function prepareAdapterExchange(
624
636
  const reasoningEffortDowngradeGuard: { attempted: boolean } = { attempted: false };
625
637
  // At most one Anthropic fast-mode downgrade per request, for the same reason.
626
638
  const anthropicFastDowngradeGuard: { attempted: boolean } = { attempted: false };
627
- /**
628
- * Rebuild the request from the current parsed input (and any image-tier bias) and refetch
629
- * it once, tagging the attempt with the given recovery kind. Rebuilds are deterministic
630
- * for the same parsed request, so same-target replays stay byte-identical.
631
- */
632
639
  const rebuildAndRefetch = async (
633
640
  recovery: AttemptRecoveryKind,
634
- /**
635
- * Called at the dispatch boundary — after the request is rebuilt and shaped, immediately
636
- * before the send. A caller holding a reserved hop confirms it here rather than before the
637
- * rebuild, because a build failure returns `{ failed }` without ever reaching the wire and
638
- * a permit confirmed earlier would keep the charge for a send that never happened.
639
- */
641
+ // A caller holding a reserved hop confirms it after the rebuilt send is admitted.
640
642
  onDispatch?: () => void,
641
643
  preserveFailureResponse?: Response,
644
+ staged?: CredentialReplay,
642
645
  ): Promise<Response | { failed: Response }> => {
646
+ const replay = staged ?? (!logCtx.activeAttempt?.sendCount || credentialRecoveryStatus(recovery) === undefined ? undefined
647
+ : transportState.createCredentialReplayAttempt(upstreamResponse.status, recovery));
643
648
  let replacementAdmitted = false, dispatchConfirmed = false;
644
649
  // Only budgets without a physical observer need this legacy workflow report.
645
650
  let fastDowngradeWorkflowCharged = false;
@@ -662,11 +667,12 @@ export async function prepareAdapterExchange(
662
667
  abortSignal: upstream.signal,
663
668
  ...(transportState.imageTierBias > 0 ? { imageTierBias: transportState.imageTierBias } : {}),
664
669
  });
665
- recordAdapterReasoning(logCtx, retryRequest);
666
- recordAdapterTier(logCtx, retryRequest);
670
+ if (!replay && !transportState.activeAdapter.fetchResponse) {
671
+ recordAdapterReasoning(logCtx, retryRequest); recordAdapterTier(logCtx, retryRequest);
672
+ }
667
673
  } catch (err) {
668
- const authRefusal = options.abortSignal?.aborted ? undefined : codexAdapterBuildRefusal(err, admissionState.authCtx, route.codexAccountNamespace, () => { cleanupUpstreamAbort(); upstream.abort(); });
669
- if (authRefusal) return { failed: authRefusal };
674
+ const buildRefusal = options.abortSignal?.aborted ? undefined : adapterBuildRefusal(err, admissionState.authCtx, route.codexAccountNamespace, () => { cleanupUpstreamAbort(); upstream.abort(); });
675
+ if (buildRefusal) return { failed: buildRefusal };
670
676
  // A rotated credential that cannot be shaped keeps the refusal it was meant to
671
677
  // replace. The image-tier and reasoning-effort rebuilds are different: the request itself
672
678
  // failed to shape, and their established build-error contracts stay authoritative.
@@ -697,32 +703,39 @@ export async function prepareAdapterExchange(
697
703
  const retryEstimate = typeof retryRequest.usageLog?.inputTokens === "number"
698
704
  ? retryRequest.usageLog.inputTokens
699
705
  : undefined;
700
- if (retryEstimate !== undefined) logCtx.usageLogInputTokens = retryEstimate;
701
- if (!transportState.deferPhysicalAttribution) {
702
- logCtx.providerAdapter = transportState.activeAdapter.name;
703
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
706
+ if (!replay) {
707
+ if (retryEstimate !== undefined) logCtx.usageLogInputTokens = retryEstimate;
708
+ if (!transportState.deferPhysicalAttribution) {
709
+ logCtx.providerAdapter = transportState.activeAdapter.name;
710
+ sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
711
+ }
712
+ recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
704
713
  }
705
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
706
714
  try {
707
715
  try {
708
716
  if (transportState.activeAdapter.fetchResponse) {
709
- transportState.noteRoutedAttemptSend(retryEstimate, recovery);
717
+ const publish = () => {
718
+ if (dispatchConfirmed) return;
719
+ upstream.signal.throwIfAborted();
720
+ onDispatch?.();
721
+ dispatchConfirmed = true;
722
+ if (replay) replay(retryRequest, transportState.activeAdapter.name);
723
+ else transportState.commitAdapterAttemptSend(retryRequest, transportState.activeAdapter.name, recovery);
724
+ replacementAdmitted = true;
725
+ };
710
726
  const producer = adapterDispatchBudget?.beginSpendProducer?.();
711
727
  try {
712
728
  return await withProviderRequestSlot(route.providerName, route.provider, route.modelId, upstream.signal, pacingSlot => {
713
- // The dispatch boundary is HERE, not before the pacing wait: that wait can reject for
714
- // an abort, a saturated queue, an expired slot or a removed provider, and none of
715
- // those reach the wire. Confirming earlier would hold the charge for a send that the
716
- // pacer refused.
717
- if (!dispatchConfirmed) { onDispatch?.(); dispatchConfirmed = true; }
718
729
  return transportState.activeAdapter.fetchResponse!(retryRequest, {
719
730
  kiroPreferAccountFailover: route.providerName === "kiro" && isGenericOAuthFailoverEnabled(config, "kiro"),
720
731
  abortSignal: upstream.signal,
721
732
  timeoutMs: sendConnectMs(),
722
733
  sendBudget: adapterDispatchBudget,
723
734
  onPhysicalSend: send => {
724
- if (preserveFailureResponse) replacementAdmitted = true;
725
- antigravityDenial.beforeSend(); noteAdapterPhysicalSend(retryEstimate, send);
735
+ antigravityDenial.beforeSend();
736
+ // An adapter that supplies its own guarded receipt can bypass providerFetch.
737
+ if (transportState.activeAdapter.reportsPhysicalSends) publish();
738
+ noteAdapterPhysicalSend(retryEstimate, send);
726
739
  chargeFastDowngradeWorkflowSend();
727
740
  },
728
741
  onRecoveryWithheld: noteAdapterRecoveryWithheld,
@@ -730,7 +743,8 @@ export async function prepareAdapterExchange(
730
743
  executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
731
744
  pacingSlotAcquired: true,
732
745
  pacingSlot,
733
- dispatchOverride: oauthDispatch(retryRequest),
746
+ dispatchOverride: oauthDispatch(retryRequest, parsed, "adapter", true),
747
+ onPhysicalDispatch: publish,
734
748
  providerName: route.providerName,
735
749
  modelId: route.modelId,
736
750
  beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
@@ -740,12 +754,7 @@ export async function prepareAdapterExchange(
740
754
  });
741
755
  } finally { producer?.close(); }
742
756
  }
743
- // #2643 review: this leg used to call fetchWithHeaderTimeout directly, so an
744
- // opted-in provider's transient-5xx policy applied to the initial send and to
745
- // native chat but was silently bypassed here — a 429 that recovered into a
746
- // retryable 503 got no retry on the Responses path. Route it through the same
747
- // selection, and pass what is LEFT of the request-scoped budget rather than a
748
- // fresh one, so a recovery loop cannot multiply total upstream sends.
757
+ // An opted-in 5xx ladder spends only the remainder of this request's budget.
749
758
  const refetchTransientPolicy = transientRetryPolicyFor(route.provider);
750
759
  const refetchWithPolicy = (route.provider.adapter === "google" || refetchTransientPolicy)
751
760
  ? fetchWithTransientRetry
@@ -768,39 +777,36 @@ export async function prepareAdapterExchange(
768
777
  : undefined;
769
778
  let refetchPermitUsed = false;
770
779
  const refetchReporter = refetchAllowance ? transientSendReporter(refetchAllowance.permit) : undefined;
771
- const deferredRefetch = (billingPoolRequest || options.comboAttempt || route.providerName === "github-copilot" && route.provider.authMode !== "forward") && refetchReporter
772
- ? deferPhysicalSendReporter(refetchReporter) : undefined;
773
- const pendingKeyMetadata = deferredRefetch && transportState.attemptSendDeferred();
780
+ const deferredRefetch = refetchReporter && (shouldDeferGenericSend(retryRequest) || options.comboAttempt) ? deferPhysicalSendReporter(refetchReporter) : undefined;
781
+ const pendingKeyMetadata = !replay && deferredRefetch && transportState.attemptSendDeferred();
774
782
  try {
775
- return await refetchWithPolicy(
783
+ const response = await refetchWithPolicy(
776
784
  recoveryKind => {
777
785
  sendBudgetState.adapterSendBudget?.startRequest?.(responsesSpendTarget(logCtx, route.providerName));
778
- // Prepare key metadata before the guarded transport commits its attempt;
779
- // counters and permits still wait for the physical executor after pacing.
780
786
  if (pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
781
787
  const confirmDispatch = () => {
782
788
  if (refetchAllowance?.permit && !refetchPermitUsed && (!onDispatch || refetchAllowance.permit !== prepaid)) {
783
789
  if (!refetchAllowance.permit.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
784
790
  refetchPermitUsed = true;
785
791
  }
786
- if (!pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
787
- // Counted Combo/pool sends confirm at the physical executor; legacy
788
- // helper paths retain their existing thunk admission boundary.
792
+ if (!replay && !pendingKeyMetadata) transportState.noteRoutedAttemptSend(retryEstimate, recoveryKind ?? recovery);
789
793
  if (!dispatchConfirmed) { onDispatch?.(); dispatchConfirmed = true; }
790
794
  if (preserveFailureResponse) replacementAdmitted = true;
791
795
  if (!refetchAllowance) chargeFastDowngradeWorkflowSend();
792
796
  };
793
- if (!deferredRefetch) confirmDispatch();
797
+ if (!deferredRefetch && !replay) confirmDispatch();
794
798
  return fetchWithHeaderTimeout(retryRequest.url,
795
799
  applyUpstreamRecoveryInit({
796
800
  method: retryRequest.method, headers: retryRequest.headers, body: retryRequest.body,
797
801
  }, recoveryKind), upstream.signal, sendConnectMs(), parsed.stream,
798
802
  providerFetch(route.provider, options.codexWsRuntimeIdentity, {
799
- dispatchOverride: oauthDispatch(retryRequest),
800
- onPhysicalDispatch: deferredRefetch ? () => {
801
- if (!deferredRefetch.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
802
- confirmDispatch();
803
- } : undefined,
803
+ dispatchOverride: oauthDispatch(retryRequest, parsed, "adapter", Boolean(replay)),
804
+ onPhysicalDispatch: () => {
805
+ if (replay) upstream.signal.throwIfAborted();
806
+ if (deferredRefetch && !deferredRefetch.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(retryRequest.url));
807
+ if (deferredRefetch || replay) confirmDispatch();
808
+ replay?.(retryRequest, transportState.activeAdapter.name, recoveryKind);
809
+ },
804
810
  providerName: route.providerName,
805
811
  modelId: route.modelId,
806
812
  beforeDispatch: isCanonicalOpenAiForwardProvider(route.provider)
@@ -811,6 +817,7 @@ export async function prepareAdapterExchange(
811
817
  abortSignal: upstream.signal,
812
818
  label: safeHostLabel(retryRequest.url), destination: errorDestinationLabel(retryRequest.url),
813
819
  claimAmbiguousResend: claimPreHeaderResend,
820
+ reserveRetrySpend: reserveCompactRetrySpend,
814
821
  ...(refetchAllowance
815
822
  ? {
816
823
  attempts: refetchAllowance.attempts,
@@ -819,6 +826,10 @@ export async function prepareAdapterExchange(
819
826
  : {}),
820
827
  },
821
828
  );
829
+ if (parsed._anthropicImageOwner && sendBudgetState.adapterSendBudget?.spendEnforced) {
830
+ bindAdapterResponseSpend(response, refetchReporter?.recordUsage);
831
+ }
832
+ return response;
822
833
  } finally {
823
834
  // Refund only a reservation whose send never reached its admission boundary.
824
835
  // A used or externally settled permit ignores this.
@@ -836,11 +847,12 @@ export async function prepareAdapterExchange(
836
847
  return { failed: storageRefusal };
837
848
  }
838
849
  const scopeRefusal = unwrapUpstreamRetryEvidenceError(err);
839
- if (!options.abortSignal?.aborted && scopeRefusal instanceof AdmissionModelDeniedError) {
850
+ if (!options.abortSignal?.aborted && (scopeRefusal instanceof AdmissionModelDeniedError || scopeRefusal instanceof HostedAdvisorSpendRefusal)) {
840
851
  cleanupUpstreamAbort();
841
852
  upstream.abort();
842
853
  releaseCodexAuthContextProbeLease(admissionState.authCtx);
843
- return { failed: admissionModelDeniedResponse(projectAdmissionModelDeniedLog(scopeRefusal, logCtx)) };
854
+ return { failed: scopeRefusal instanceof HostedAdvisorSpendRefusal ? scopeRefusal.response()
855
+ : admissionModelDeniedResponse(projectAdmissionModelDeniedLog(scopeRefusal, logCtx)) };
844
856
  }
845
857
  const codexRefusal = !options.abortSignal?.aborted && mapCodexAuthContextErrorToResponse(unwrapUpstreamRetryEvidenceError(err), {
846
858
  now: Date.now(), accountSelector: route.codexAccountNamespace,
@@ -900,7 +912,8 @@ export async function prepareAdapterExchange(
900
912
  !adapterOwnsDispatch && genericRefetchCountsSends()),
901
913
  applyFailoverSnapshot, setPermit: permit => { sendBudgetState.pendingHopPermit = permit; },
902
914
  complete: () => { transportState.genericFailovers += 1; },
903
- refetch: onDispatch => rebuildAndRefetch(recovery, onDispatch, failedResponse),
915
+ refetch: onDispatch => rebuildAndRefetch(recovery, onDispatch, failedResponse,
916
+ transportState.createCredentialReplayAttempt(failedResponse.status, recovery)),
904
917
  prepare: () => {
905
918
  invalidateSameTargetRequest();
906
919
  transportState.activeAdapter = resolveSelectionAdapter(
@@ -911,10 +924,6 @@ export async function prepareAdapterExchange(
911
924
  adapterName: transportState.activeAdapter.name,
912
925
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
913
926
  });
914
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider,
915
- transportState.activeAdapter.name, logCtx.accountLogLabel);
916
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName,
917
- route.provider, transportState.activeAdapter.name);
918
927
  },
919
928
  });
920
929
  };
@@ -942,7 +951,8 @@ export async function prepareAdapterExchange(
942
951
  await rejectAnthropicPerMessageEffort(parsed, upstreamResponse, upstream.signal);
943
952
  if (isNonReplayableResponse(upstreamResponse)) {
944
953
  try {
945
- return await sanitizeNonReplayableUpstreamError(upstreamResponse, upstream.signal);
954
+ return await sanitizeNonReplayableUpstreamError(upstreamResponse, upstream.signal,
955
+ isXaiGrokOAuth(route.providerName, route.provider) ? logCtx : undefined);
946
956
  } finally { cleanupUpstreamAbort(); }
947
957
  }
948
958
  bindAnthropicRejectionResponse(transportState.sameTargetRequest, upstreamResponse);
@@ -964,6 +974,7 @@ export async function prepareAdapterExchange(
964
974
  && !sendBudgetExhausted()
965
975
  ) {
966
976
  oauth401ReplayAttempted = transportState.oauth401ReplayAttempted = true;
977
+ const replay = transportState.createCredentialReplayAttempt(upstreamResponse.status, "oauth-401");
967
978
  let refreshed: OAuthAccessSnapshot;
968
979
  try {
969
980
  refreshed = await refreshResolvedOAuthSelection(transportState.sentOAuthSnapshot);
@@ -1008,10 +1019,6 @@ export async function prepareAdapterExchange(
1008
1019
  adapterName: transportState.activeAdapter.name,
1009
1020
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
1010
1021
  });
1011
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider,
1012
- transportState.activeAdapter.name, logCtx.accountLogLabel);
1013
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName,
1014
- route.provider, transportState.activeAdapter.name);
1015
1022
  sendBudgetState.pendingHopPermit = hop.permit;
1016
1023
  const result = await rebuildAndRefetch("oauth-account-429", () => {
1017
1024
  if (!adapterOwnsDispatch && hop.permit?.use() === false) throw new SendBudgetExhaustedError();
@@ -1069,7 +1076,7 @@ export async function prepareAdapterExchange(
1069
1076
  adapterName: transportState.activeAdapter.name,
1070
1077
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
1071
1078
  });
1072
- const result = await rebuildAndRefetch("oauth-401");
1079
+ const result = await rebuildAndRefetch("oauth-401", undefined, undefined, replay);
1073
1080
  if ("failed" in result) return result.failed;
1074
1081
  upstreamResponse = result;
1075
1082
  continue recovery;
@@ -1240,12 +1247,7 @@ export async function prepareAdapterExchange(
1240
1247
  }
1241
1248
  }
1242
1249
 
1243
- // Same-target 429 wait-and-retry (opt-in `retryOn429`, issue #487). Codex never retries
1244
- // 429 itself (it retries 5xx only), and single-key pools cannot use the failover below,
1245
- // so wait (Retry-After or the fixed interval) and replay the IDENTICAL request on the
1246
- // same key first. Pre-stream only: a 429 arrives before any bytes are relayed, so the
1247
- // replay is lossless. Runs before key failover so "primary-first" setups keep the same
1248
- // key on rate-limit blips; only after the attempts are exhausted does failover run.
1250
+ // Honor retryOn429 on the same key before rotating it (#487).
1249
1251
  while (
1250
1252
  upstreamResponse.status === 429 && !isSameTargetRetryHold(upstreamResponse)
1251
1253
  && rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
@@ -1253,11 +1255,11 @@ export async function prepareAdapterExchange(
1253
1255
  && !sendBudgetExhausted()
1254
1256
  ) {
1255
1257
  rateLimitRetries += 1;
1256
- // Release unread body + deliberate wait via the shared same-target helper.
1257
1258
  const retryAfterHeader = upstreamResponse.headers.get("retry-after");
1259
+ const preceding = reserveCompactRetrySpend() ? await retainFailureResponse() : undefined;
1258
1260
  try {
1259
1261
  for await (const _ of prepareSameTarget429Wait({
1260
- body: upstreamResponse.body,
1262
+ body: preceding ? null : upstreamResponse.body,
1261
1263
  signal: options.abortSignal,
1262
1264
  delayMs: rateLimitRetryDelayMs(rateLimitPolicy, retryAfterHeader, Date.now()),
1263
1265
  })) {
@@ -1268,15 +1270,15 @@ export async function prepareAdapterExchange(
1268
1270
  upstream.abort();
1269
1271
  return clientCancelledResponse();
1270
1272
  }
1271
- // Client cancellation wins over any stale timer edge: re-check before dispatching the
1272
- // replay so an adapter never starts work for a request the client already abandoned.
1273
+ // Recheck cancellation after the wait.
1273
1274
  if (options.abortSignal?.aborted || upstream.signal.aborted) {
1274
1275
  cleanupUpstreamAbort();
1275
1276
  upstream.abort();
1276
1277
  return clientCancelledResponse();
1277
1278
  }
1278
- const result = await rebuildAndRefetch("rate-limit-429");
1279
+ const result = await rebuildAndRefetch("rate-limit-429", undefined, preceding);
1279
1280
  if ("failed" in result) return result.failed;
1281
+ void preceding?.body?.cancel().catch(() => undefined);
1280
1282
  upstreamResponse = result;
1281
1283
  // The refusal is a 429 too: without this the while condition is still true and the
1282
1284
  // next configured attempt replays it on the same target.
@@ -1417,13 +1419,12 @@ export async function prepareAdapterExchange(
1417
1419
  adapterName: transportState.activeAdapter.name,
1418
1420
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
1419
1421
  });
1420
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
1421
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
1422
1422
  // The replay IS this hop's send; the dispatching layer settles the reservation.
1423
1423
  sendBudgetState.pendingHopPermit = hop.permit;
1424
1424
  let result: Response | { failed: Response };
1425
1425
  try {
1426
- result = await rebuildAndRefetch(upstreamResponse.status === 401 ? "oauth-401"
1426
+ result = await rebuildAndRefetch(!anthropicRefusalCredentialChanged(upstreamResponse, admitted) ? "rate-limit-429"
1427
+ : upstreamResponse.status === 401 ? "oauth-401"
1427
1428
  : upstreamResponse.status === 403 ? "oauth-account-403" : "anthropic-oauth-429",
1428
1429
  () => { if (!adapterOwnsDispatch && hop.permit?.use() === false) throw new SendBudgetExhaustedError(); });
1429
1430
  } finally {
@@ -1497,6 +1498,7 @@ export async function prepareAdapterExchange(
1497
1498
  hop.permit?.release();
1498
1499
  break;
1499
1500
  }
1501
+ const replay = transportState.createCredentialReplayAttempt(upstreamResponse.status, "oauth-account-429");
1500
1502
  try {
1501
1503
  // The FULL snapshot, not just the bearer: Antigravity pairs an account-matched
1502
1504
  // projectId with its token and Kiro carries routing metadata, so a token-only swap
@@ -1517,8 +1519,6 @@ export async function prepareAdapterExchange(
1517
1519
  adapterName: transportState.activeAdapter.name,
1518
1520
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
1519
1521
  });
1520
- if (!transportState.deferPhysicalAttribution) sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
1521
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
1522
1522
  // The replay IS this hop's send, so hand the reservation down and let the layer that
1523
1523
  // dispatches settle it: `adapterDispatchBudget` spends it on the adapter's first
1524
1524
  // reservation, and the retry helper's reporter settles the external booking.
@@ -1533,7 +1533,7 @@ export async function prepareAdapterExchange(
1533
1533
  // exhausted request and stops sending on.
1534
1534
  result = await rebuildAndRefetch("oauth-account-429", () => {
1535
1535
  if (!adapterOwnsDispatch && hop.permit?.use() === false) throw new SendBudgetExhaustedError();
1536
- }, upstreamResponse);
1536
+ }, upstreamResponse, replay);
1537
1537
  } finally {
1538
1538
  sendBudgetState.pendingHopPermit = undefined;
1539
1539
  }
@@ -1622,8 +1622,6 @@ export async function prepareAdapterExchange(
1622
1622
  adapterName: transportState.activeAdapter.name,
1623
1623
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
1624
1624
  });
1625
- if (!transportState.deferPhysicalAttribution) sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
1626
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
1627
1625
  // The replay IS this hop's send, so hand the reservation down and let the layer that
1628
1626
  // dispatches settle it: `adapterDispatchBudget` spends it on the adapter's first
1629
1627
  // reservation, and the retry helper's reporter settles the external booking.
@@ -1684,8 +1682,7 @@ export async function prepareAdapterExchange(
1684
1682
  && route.providerName === "google-antigravity"
1685
1683
  && transportState.genericFailoverAccountId
1686
1684
  ) {
1687
- const refusal = classifyAntigravityRefusal(upstreamResponse.status,
1688
- await readDisplaySafeErrorText(upstreamResponse.clone(), upstream.signal, ""));
1685
+ const refusal = await classifyAntigravityQuarantine(upstreamResponse, route.provider, antigravityQuarantineTrust, upstream.signal);
1689
1686
  if (refusal.kind === "other") break;
1690
1687
  const sent = transportState.sentOAuthSnapshot;
1691
1688
  const failedAccountId = transportState.genericFailoverAccountId;
@@ -1694,7 +1691,7 @@ export async function prepareAdapterExchange(
1694
1691
  // snapshot there is no owner for this write, so skip marking.
1695
1692
  if (!sent || sent.accountId !== failedAccountId) break;
1696
1693
  try {
1697
- await markAccountNeedsReauthIfGeneration(route.providerName, failedAccountId, sent.generation, undefined, "verify_account");
1694
+ await markAccountNeedsReauthIfGeneration(route.providerName, failedAccountId, sent.generation, undefined, refusal.kind);
1698
1695
  } catch {
1699
1696
  // A failed quarantine write must preserve the refusal, not authorize another send.
1700
1697
  break recovery;
@@ -1744,8 +1741,6 @@ export async function prepareAdapterExchange(
1744
1741
  adapterName: transportState.activeAdapter.name,
1745
1742
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
1746
1743
  });
1747
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
1748
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
1749
1744
  sendBudgetState.pendingHopPermit = hop.permit;
1750
1745
  let result: Response | { failed: Response };
1751
1746
  try {
@@ -1792,8 +1787,12 @@ export async function prepareAdapterExchange(
1792
1787
  upstreamResponse = opaqueBlobRecovery.response;
1793
1788
  continue recovery;
1794
1789
  }
1795
- // Anthropic 413 request_too_large: rebuild once with every image one tier lower
1796
- // (spiral guard: single attempt). The biased response re-enters the 429 check above.
1790
+ if (imageRecovery && upstreamResponse.status === 413) {
1791
+ const recovered = await recoverAdapterImageContext(imageRecovery, upstreamResponse, parsed, transportState, upstream.signal, refreshRequestToolAliases);
1792
+ if (!recovered) { cleanupUpstreamAbort(); return clientCancelledResponse(); }
1793
+ upstreamResponse = recovered;
1794
+ break recovery;
1795
+ }
1797
1796
  if (shouldAttemptImageTierRetry({
1798
1797
  status: upstreamResponse.status,
1799
1798
  adapterName: transportState.activeAdapter.name,
@@ -1868,12 +1867,13 @@ export async function prepareAdapterExchange(
1868
1867
  if (!upstreamResponse.ok) {
1869
1868
  if (route.providerName === "kiro")
1870
1869
  upstreamResponse = await normalizeFinalKiroHttpError(upstreamResponse, upstream.signal);
1870
+ const grokOAuth = isXaiGrokOAuth(route.providerName, route.provider);
1871
1871
  if (options.comboAttempt) {
1872
1872
  // No pre-read guard: `consumeComboFailure` -> `readBoundedResponseBody` reads
1873
1873
  // `response.body` itself with the abort signal threaded through, and the combo
1874
1874
  // contract is that this body's getter is touched exactly once. A guard here would be
1875
1875
  // a second `.body` access for no gain, since the bounded reader owns settlement.
1876
- const failure = await consumeComboFailure(upstreamResponse, options.abortSignal, Date.now(), logCtx, !isProxyError(upstreamResponse))
1876
+ const failure = await consumeComboFailure(upstreamResponse, options.abortSignal, Date.now(), logCtx, !isProxyError(upstreamResponse), grokOAuth)
1877
1877
  .finally(cleanupUpstreamAbort);
1878
1878
  options.onConsumedComboFailure?.(failure);
1879
1879
  return failure.response;
@@ -1888,6 +1888,7 @@ export async function prepareAdapterExchange(
1888
1888
  } finally {
1889
1889
  cleanupUpstreamAbort();
1890
1890
  }
1891
+ if (grokOAuth && isXaiLegacyPrivacyError(upstreamResponse.status, errorText)) return xaiPrivacyModeRefusal(logCtx);
1891
1892
  // The provider's own body (not a proxy-normalized one) may name its closed error class (#8446).
1892
1893
  if (!isProxyError(upstreamResponse)) recordUpstreamProviderErrorDetail(logCtx, upstreamResponse.status, errorText, upstreamResponse);
1893
1894
  if (upstreamResponse.status === 413) {
@@ -1972,8 +1973,8 @@ export async function prepareAdapterExchange(
1972
1973
  return {
1973
1974
  upstream,
1974
1975
  cleanupUpstreamAbort,
1975
- get connectMs() { return resolveConnectTimeoutMs(config.connectTimeoutMs, { localUpstream: this.localUpstream }); },
1976
- get stallTimeoutMs() { return resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: this.localUpstream }); },
1976
+ get connectMs() { return resolveConnectTimeoutMs(connectTimeoutMs(), { localUpstream: this.localUpstream }); },
1977
+ get stallTimeoutMs() { return resolveStallTimeoutMs(providerStallTimeoutSec(config, responsesTimeoutProvider(options, route.provider)), { localUpstream: this.localUpstream }); },
1977
1978
  get localUpstream() { return isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl); },
1978
1979
  upstreamResponse,
1979
1980
  thinkingSignatureRecovery,