@bitkyc08/opencodex 2.100.2 → 2.100.4

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 (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.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.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -1,12 +1,16 @@
1
1
  import { existsSync, readFileSync } from "node:fs";
2
2
  import { randomBytes } from "node:crypto";
3
3
  import { normalizeRecordedClient, type UsageClient } from "../usage/client";
4
- import { stampApiKeyAccountLabel, usesApiKeyAccount } from "../providers/label";
4
+ import { anthropicAccountTagField, stampApiKeyAccountLabel, usesApiKeyAccount } from "../providers/label";
5
+ import { finalizeProviderCacheAffinity } from "./request-log-cache-affinity";
6
+ import { aggregateAttemptUsage } from "./request-log-attempt-usage";
7
+ export { aggregateAttemptUsage } from "./request-log-attempt-usage";
8
+
5
9
  import { KEY_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
6
10
  import { attemptAccountChanged, sealRequestAttemptIdentity } from "./request-log-account-rotation";
7
11
  export { sealRequestAttemptIdentity };
8
12
  export { noteAttemptRecoveryWithheld } from "./request-log-attempt-recovery";
9
- import { captureUpstreamTerminalDiagnostics, upstreamDiagnosticLogFields, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
13
+ import { bareVerdictRowErrorCode, captureUpstreamTerminalDiagnostics, guardedRowCopy, linkLogField, notifyLinkTurnFinal, upstreamDiagnosticLogFields, type LinkRequestLogCarrier, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
10
14
  export { noteUpstreamRequestId } from "./request-log-terminal-status";
11
15
  import { readBoundedResponseBody } from "../lib/bounded-body";
12
16
  import type { ResponsesTerminalStatus } from "../bridge";
@@ -23,7 +27,7 @@ import { CODEX_CONFIG_PATH, readRootTomlString } from "../codex/paths";
23
27
  import type { CodexAffinityMove, CodexAffinityReason } from "../codex/routing";
24
28
  import type { CodexAuthContext } from "../codex/auth-context";
25
29
  import { readCodexCatalogPath } from "../codex/catalog";
26
- import type { AttemptTierOutcome, OcxProviderConfig, OcxUsage } from "../types";
30
+ import type { AttemptTierOutcome, CacheAffinityLogReason, CacheAffinityOutcome, OcxProviderConfig, OcxUsage } from "../types";
27
31
  import { normalizeRouteDecisionTrace, type RouteDecisionTraceV1 } from "../routing/trace";
28
32
  import { parseProtocolTraceV1, type ProtocolTraceV1 } from "../protocols/dto";
29
33
  import { protocolTraceForRequest } from "../protocols/trace";
@@ -41,12 +45,15 @@ import {
41
45
  isKnownAdmissionKind,
42
46
  isKnownAffinityMove,
43
47
  isKnownAffinityReason,
48
+ isKnownCacheAffinity,
49
+ isKnownCacheAffinityReason,
44
50
  isKnownCacheTelemetryProvenance,
45
51
  isKnownInboundProtocol,
46
52
  isKnownTerminalSource,
47
53
  isKnownTransportPhase,
48
54
  isKnownUsageSurface,
49
55
  isCodexUsageAccountLogLabel,
56
+ isAnthropicAccountTag,
50
57
  isLogicalRequestId,
51
58
  isValidReasoningWireValue,
52
59
  normalizeClaudeCompatibilityUsageLog,
@@ -94,6 +101,7 @@ import {
94
101
  } from "../usage/jev-stats";
95
102
  import { generationWindowFields, recordGenerationEvent } from "./request-log-generation-window";
96
103
  import type { RequestMetricsRecorder } from "./request-metrics";
104
+ import { requestBodyField, requestBodyLogField, type RequestBodyEntryField, type RequestBodyLogContext } from "./request-body-facts";
97
105
  import type {
98
106
  CacheDiagnosticDraft,
99
107
  CacheDiagnosticFinalFacts,
@@ -117,7 +125,7 @@ export function cacheDiagnosticsObserving(): boolean {
117
125
  return cacheDiagnosticHooks()?.enabled() === true;
118
126
  }
119
127
 
120
- export interface RequestLogContext extends UpstreamErrorDiagnostics {
128
+ export interface RequestLogContext extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyLogContext {
121
129
  model: string;
122
130
  provider: string;
123
131
  client?: UsageClient;
@@ -244,6 +252,10 @@ export interface RequestLogContext extends UpstreamErrorDiagnostics {
244
252
  * responsesUsage in src/bridge.ts), so SSE/JSON re-parsing must not overwrite the raw
245
253
  * provenance — a synthetic cached_tokens:0 is NOT a measured cache read. */
246
254
  usageFromBridge?: boolean;
255
+ /** Set once the client-facing body carries an estimated usage the provider never sent (#7427).
256
+ * The provider's own body was inspected before the estimate was added, so a later parse of
257
+ * the client body must not record the estimate as provider-reported usage. */
258
+ usageEstimatedForClient?: boolean;
247
259
  /** Secret-redacted upstream error reason (e.g. the granular Cursor "rate limit exceeded…"
248
260
  * message) extracted from a `response.failed` SSE payload or non-streaming error body, so the
249
261
  * request log / GUI shows the actual upstream failure rather than only the HTTP-mapped code. */
@@ -274,6 +286,20 @@ export interface RequestLogContext extends UpstreamErrorDiagnostics {
274
286
  * Codex pool account was not the issuer. Never an account identifier.
275
287
  */
276
288
  conversationStateScrub?: "account-change";
289
+ /** Explicit session lane for provider cache affinity; internal only, never persisted raw. */
290
+ affinityLane?: string;
291
+ affinityKeyEntryId?: string;
292
+ /** Configured provider owning the serving entry, independent of combo display labels. */
293
+ affinityProviderName?: string;
294
+ /** Whether provider cache affinity applies to this request's provider at all. */
295
+ cacheAffinityApplicable?: boolean;
296
+ /** Entry the consult kept this request on, when it did; rotation may still move it. */
297
+ affinityKeptEntryId?: string;
298
+ /** Model identity affinity consults with; recording reuses it so virtual models match. */
299
+ affinityModel?: string;
300
+ /** Provider cache-affinity outcome for this request (bounded enum, persisted on the entry). */
301
+ cacheAffinity?: CacheAffinityOutcome;
302
+ cacheAffinityReason?: CacheAffinityLogReason;
277
303
  transportPhase?: "pre_headers" | "mid_stream" | "terminal_sse";
278
304
  terminalSource?: "upstream" | "synthetic";
279
305
  /** Closed failure evidence supplied by the transport, never inferred from provider text. */
@@ -307,7 +333,7 @@ export function rebindCacheDiagnosticBody(
307
333
  cacheDiagnosticHooks()?.rebind(body, draft);
308
334
  }
309
335
 
310
- export interface RequestLogEntry extends UpstreamErrorDiagnostics {
336
+ export interface RequestLogEntry extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyEntryField {
311
337
  requestId: string;
312
338
  client?: UsageClient;
313
339
  /** The logical request this row belongs to (#4546); absent on rows written without a budget. */
@@ -338,6 +364,8 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
338
364
  * since both leave it undefined. */
339
365
  inboundProtocol?: "responses" | "chat" | "messages";
340
366
  accountLogLabel?: string;
367
+ /** Anthropic pool account of `provider` (#8383): its p-label, beside the unchanged `accountLogLabel`. */
368
+ accountTag?: `p${string}`;
341
369
  /** Best-effort chat/session correlation for Logs grouping (#330). */
342
370
  conversationId?: string;
343
371
  requestedModel?: string;
@@ -389,6 +417,9 @@ export interface RequestLogEntry extends UpstreamErrorDiagnostics {
389
417
  affinity?: CodexAffinityMove;
390
418
  /** Why that decision was made (#4546): a move is the expensive event, so it names its cause. */
391
419
  affinityReason?: CodexAffinityReason;
420
+ /** Provider cache-affinity outcome: kept on, newly bound to, or released from a key-pool credential. */
421
+ cacheAffinity?: CacheAffinityOutcome;
422
+ cacheAffinityReason?: CacheAffinityLogReason;
392
423
  /**
393
424
  * Set when this request dropped account-bound continuation after a Codex pool
394
425
  * account change. Never an account identifier.
@@ -491,7 +522,8 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
491
522
  const protocolTrace = parseProtocolTraceV1(entry.protocolTrace);
492
523
  // projectErrorDetail bounds the tier fields (top-level and per attempt) itself, so this stays safe
493
524
  // for a row that did not come through the disk reader; attempts are copied before it edits them.
494
- const attempts = Array.isArray(entry.attempts) ? entry.attempts.map(attempt => ({ ...attempt })) : entry.attempts;
525
+ const attempts = Array.isArray(entry.attempts) ? entry.attempts.map(({ accountTag, ...attempt }) => ({ ...attempt,
526
+ ...(isAnthropicAccountTag(accountTag) ? { accountTag } : {}) })) : entry.attempts;
495
527
  return projectErrorDetail({
496
528
  requestId: entry.requestId,
497
529
  ...(isLogicalRequestId(entry.logicalRequestId) ? { logicalRequestId: entry.logicalRequestId } : {}),
@@ -502,11 +534,12 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
502
534
  ...(entry.firstOutputMs !== undefined ? { firstOutputMs: entry.firstOutputMs } : {}),
503
535
  ...(entry.genStartMs !== undefined ? { genStartMs: entry.genStartMs } : {}),
504
536
  ...(entry.lastOutputMs !== undefined ? { lastOutputMs: entry.lastOutputMs } : {}),
505
- ...(isKnownUsageSurface(entry.surface) ? { surface: entry.surface } : {}),
537
+ ...(isKnownUsageSurface(entry.surface) ? { surface: entry.surface } : {}), ...linkLogField(entry.link), ...requestBodyField(entry.requestBody),
506
538
  ...(entry.conversationId ? { conversationId: entry.conversationId } : {}),
507
539
  ...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
508
540
  ? { accountLogLabel: entry.accountLogLabel }
509
541
  : {}),
542
+ ...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
510
543
  ...(entry.requestedModel ? { requestedModel: entry.requestedModel } : {}),
511
544
  ...(entry.requestedAlias ? { requestedAlias: entry.requestedAlias } : {}),
512
545
  ...(entry.shadowCallRewrittenFrom
@@ -544,6 +577,7 @@ export function requestLogEntryFromPersistedUsage(entry: PersistedUsageEntry): R
544
577
  ? { cacheProvenance: entry.cacheProvenance }
545
578
  : {}),
546
579
  ...persistedAffinityFields(entry),
580
+ ...persistedCacheAffinityFields(entry),
547
581
  ...(isKnownTransportPhase(entry.transportPhase) ? { transportPhase: entry.transportPhase } : {}),
548
582
  ...(isKnownTerminalSource(entry.terminalSource) ? { terminalSource: entry.terminalSource } : {}),
549
583
  ...(routeDecision ? { routeDecision } : {}),
@@ -572,6 +606,16 @@ function persistedAffinityFields(
572
606
  };
573
607
  }
574
608
 
609
+ function persistedCacheAffinityFields(
610
+ entry: Pick<RequestLogEntry, "cacheAffinity" | "cacheAffinityReason">,
611
+ ): Pick<PersistedUsageEntry, "cacheAffinity" | "cacheAffinityReason"> {
612
+ if (!isKnownCacheAffinity(entry.cacheAffinity)) return {};
613
+ return {
614
+ cacheAffinity: entry.cacheAffinity,
615
+ ...(isKnownCacheAffinityReason(entry.cacheAffinityReason) ? { cacheAffinityReason: entry.cacheAffinityReason } : {}),
616
+ };
617
+ }
618
+
575
619
  /**
576
620
  * Hydration guard: persisted traces are re-normalized before they enter the
577
621
  * in-memory ring buffer so a hand-edited or corrupt row cannot poison the DTO.
@@ -701,10 +745,11 @@ export function addRequestLog(entry: RequestLogEntry) {
701
745
  // reaches usage.jsonl — which is where the per-key rollup reads from.
702
746
  ...(entry.apiKeyId ? { apiKeyId: entry.apiKeyId } : {}),
703
747
  ...(isKnownAdmissionKind(entry.admissionKind) ? { admissionKind: entry.admissionKind } : {}),
704
- ...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}),
748
+ ...(isKnownInboundProtocol(entry.inboundProtocol) ? { inboundProtocol: entry.inboundProtocol } : {}), ...linkLogField(entry.link), ...requestBodyField(entry.requestBody),
705
749
  ...(isCodexUsageAccountLogLabel(entry.accountLogLabel)
706
750
  ? { accountLogLabel: entry.accountLogLabel }
707
751
  : {}),
752
+ ...(isAnthropicAccountTag(entry.accountTag) ? { accountTag: entry.accountTag } : {}),
708
753
  ...(entry.conversationId ? { conversationId: entry.conversationId } : {}),
709
754
  ...(entry.resolvedModel ? { resolvedModel: entry.resolvedModel } : {}),
710
755
  ...(entry.servedModel ? { servedModel: entry.servedModel } : {}),
@@ -744,6 +789,7 @@ export function addRequestLog(entry: RequestLogEntry) {
744
789
  ? { cacheProvenance: entry.cacheProvenance }
745
790
  : {}),
746
791
  ...persistedAffinityFields(entry),
792
+ ...persistedCacheAffinityFields(entry),
747
793
  ...(isKnownTransportPhase(entry.transportPhase) ? { transportPhase: entry.transportPhase } : {}),
748
794
  ...(isKnownTerminalSource(entry.terminalSource) ? { terminalSource: entry.terminalSource } : {}),
749
795
  ...failureDiagnostics,
@@ -1007,7 +1053,7 @@ export function applyResponseLogMetadata(logCtx: RequestLogContext, payload: unk
1007
1053
  logCtx.activeTierMetadata?.observeResponseServiceTier(serviceTier);
1008
1054
  }
1009
1055
  const usage = usageFromResponsesPayload((source as { usage?: unknown }).usage);
1010
- if (usage && !logCtx.usageFromBridge) {
1056
+ if (usage && !logCtx.usageFromBridge && !logCtx.usageEstimatedForClient) {
1011
1057
  if (!recordKeyWireAttemptUsage(logCtx, usage)) {
1012
1058
  logCtx.usage = usage;
1013
1059
  if (logCtx.activeAttempt) logCtx.activeAttempt.usage = usage;
@@ -1128,7 +1174,7 @@ export function inspectResponseLogSsePayloadParsed(
1128
1174
  if (parsed !== undefined) recordGenerationEvent(logCtx, (parsed as { type?: unknown } | null)?.type);
1129
1175
  if (parsed !== undefined) applyResponseLogMetadata(logCtx, parsed);
1130
1176
  else logCtx.activeTierMetadata?.markResponseUnparseable();
1131
- captureUpstreamErrorParsed(logCtx, payload, parsed);
1177
+ captureUpstreamErrorParsed(logCtx, payload, parsed, true);
1132
1178
  if (debugEnabled) {
1133
1179
  if (!sseAlreadyMarked) {
1134
1180
  logCtx.usageDebugBodyKind = "sse";
@@ -1162,11 +1208,11 @@ function captureUpstreamError(logCtx: RequestLogContext, text: string | null): v
1162
1208
  function captureUpstreamErrorParsed(
1163
1209
  logCtx: RequestLogContext,
1164
1210
  text: string,
1165
- parsed: unknown | undefined,
1211
+ parsed: unknown | undefined, untypedSse = false,
1166
1212
  ): void {
1167
1213
  if (parsed !== undefined && parsed !== null) {
1168
1214
  const json = parsed as UpstreamErrorPayload;
1169
- captureUpstreamTerminalDiagnostics(logCtx, json);
1215
+ if (!captureUpstreamTerminalDiagnostics(logCtx, json, untypedSse)) return;
1170
1216
  const reason = json?.response?.incomplete_details?.reason;
1171
1217
  if (json.type === "response.incomplete"
1172
1218
  && logCtx.terminalIncompleteReason === undefined
@@ -1177,7 +1223,7 @@ function captureUpstreamErrorParsed(
1177
1223
  if (logCtx.upstreamError) return;
1178
1224
  const message = upstreamErrorMessageFromPayload(parsed);
1179
1225
  if (typeof message === "string" && message.trim()) {
1180
- logCtx.upstreamError = redactSecretString(message).slice(0, 500);
1226
+ logCtx.upstreamError = guardedRowCopy(logCtx, message);
1181
1227
  return;
1182
1228
  }
1183
1229
  // No human-readable error message: fall back to the structured incomplete reason emitted by
@@ -1186,7 +1232,7 @@ function captureUpstreamErrorParsed(
1186
1232
  // mapped HTTP code.
1187
1233
  if (typeof reason === "string" && reason.trim()) {
1188
1234
  const incomplete = incompleteReasonDetail(reason.trim()); // A known reason also gets a closed row detail.
1189
- logCtx.upstreamError = redactSecretString(incomplete.text).slice(0, 500);
1235
+ logCtx.upstreamError = guardedRowCopy(logCtx, incomplete.text);
1190
1236
  if (incomplete.detail) logCtx.failureDetail = incomplete.detail;
1191
1237
  }
1192
1238
  return;
@@ -1194,7 +1240,7 @@ function captureUpstreamErrorParsed(
1194
1240
  if (logCtx.upstreamError) return;
1195
1241
  const trimmed = text.trim();
1196
1242
  if (trimmed) {
1197
- logCtx.upstreamError = redactSecretString(trimmed).slice(0, 500);
1243
+ logCtx.upstreamError = guardedRowCopy(logCtx, trimmed);
1198
1244
  }
1199
1245
  }
1200
1246
 
@@ -1429,7 +1475,7 @@ export function addFinalRequestLog(
1429
1475
  ): void {
1430
1476
  const intercept = finalRequestLogInterceptors.get(logCtx);
1431
1477
  if (intercept) { intercept(status, meta); return; }
1432
- writeFinalRequestLog(requestId, start, logCtx, status, meta, addLog);
1478
+ writeFinalRequestLog(requestId, start, logCtx, status, meta, addLog); notifyLinkTurnFinal(logCtx, meta?.terminalStatus);
1433
1479
  }
1434
1480
 
1435
1481
  function writeFinalRequestLog(
@@ -1448,7 +1494,7 @@ function writeFinalRequestLog(
1448
1494
  ? 499
1449
1495
  : status;
1450
1496
  // Locally assigned codes name proxy refusals that status and upstream text cannot reconstruct.
1451
- const errorCode = logCtx.errorCode ?? requestLogErrorCode(
1497
+ const errorCode = logCtx.errorCode ?? bareVerdictRowErrorCode(logCtx) ?? requestLogErrorCode(
1452
1498
  effectiveStatus,
1453
1499
  logCtx.upstreamError,
1454
1500
  logCtx.terminalErrorCode,
@@ -1471,7 +1517,7 @@ function writeFinalRequestLog(
1471
1517
  // The final row and its active physical attempt describe the same terminal. Preserve the
1472
1518
  // semantic code on both so detailed attempt telemetry cannot regress to a generic status code.
1473
1519
  const attemptErrorCode = attemptStatus === undefined ? errorCode : attemptStatus < 400 ? undefined
1474
- : logCtx.errorCode ?? requestLogErrorCode(attemptStatus, logCtx.upstreamError, logCtx.terminalErrorCode, false);
1520
+ : logCtx.errorCode ?? bareVerdictRowErrorCode(logCtx) ?? requestLogErrorCode(attemptStatus, logCtx.upstreamError, logCtx.terminalErrorCode, false);
1475
1521
  if (attemptErrorCode) logCtx.activeAttempt.errorCode = attemptErrorCode;
1476
1522
  else delete logCtx.activeAttempt.errorCode;
1477
1523
  }
@@ -1557,6 +1603,14 @@ function writeFinalRequestLog(
1557
1603
  cacheProvenance,
1558
1604
  ...(logCtx.cacheDiagnosticDraft ? { draft: logCtx.cacheDiagnosticDraft } : {}),
1559
1605
  });
1606
+ // Provider cache affinity: this is the one seam every request passes exactly
1607
+ // once with its terminal status, the credential that ultimately served (the
1608
+ // entry id captured beside the account label at each stamp, rotations
1609
+ // included), and cache usage already normalized from whichever adapter
1610
+ // answered. A success binds or refreshes the conversation on that
1611
+ // credential; a quota/auth terminal releases it so the next request is
1612
+ // placed fresh instead of re-offered a credential that just refused.
1613
+ finalizeProviderCacheAffinity(logCtx, effectiveStatus, logCtx.usage ?? loggedUsage);
1560
1614
  // Sanitize at the logging layer, not only at the one call site that populates this today.
1561
1615
  // The value originates in an upstream-supplied model id, so an unsanitized newline would
1562
1616
  // let a single field forge a record boundary in any line-oriented log viewer. Doing it here
@@ -1578,13 +1632,14 @@ function writeFinalRequestLog(
1578
1632
  ...(logCtx.surface ? { surface: logCtx.surface } : {}),
1579
1633
  ...(logCtx.apiKeyId ? { apiKeyId: logCtx.apiKeyId } : {}),
1580
1634
  ...(logCtx.admissionKind ? { admissionKind: logCtx.admissionKind } : {}),
1581
- ...(logCtx.inboundProtocol ? { inboundProtocol: logCtx.inboundProtocol } : {}),
1635
+ ...(logCtx.inboundProtocol ? { inboundProtocol: logCtx.inboundProtocol } : {}), ...linkLogField(logCtx.link), ...requestBodyLogField(logCtx),
1582
1636
  ...(logCtx.localTerminalReason
1583
1637
  ? { localTerminalReason: sanitizeLogMetadataString(logCtx.localTerminalReason) }
1584
1638
  : {}),
1585
1639
  ...(isCodexUsageAccountLogLabel(logCtx.accountLogLabel)
1586
1640
  ? { accountLogLabel: logCtx.accountLogLabel }
1587
1641
  : {}),
1642
+ ...anthropicAccountTagField(isCombo ? undefined : logCtx.provider),
1588
1643
  ...(logCtx.conversationId ? { conversationId: logCtx.conversationId } : {}),
1589
1644
  ...(logCtx.requestedModel ? { requestedModel: logCtx.requestedModel } : {}),
1590
1645
  ...(logCtx.requestedAlias ? { requestedAlias: logCtx.requestedAlias } : {}),
@@ -1625,6 +1680,8 @@ function writeFinalRequestLog(
1625
1680
  ...(loggedUsage || cacheProvenance !== "unknown" ? { cacheProvenance } : {}),
1626
1681
  ...(logCtx.affinity ? { affinity: logCtx.affinity } : {}),
1627
1682
  ...(logCtx.affinityReason ? { affinityReason: logCtx.affinityReason } : {}),
1683
+ ...(logCtx.cacheAffinity ? { cacheAffinity: logCtx.cacheAffinity } : {}),
1684
+ ...(logCtx.cacheAffinityReason ? { cacheAffinityReason: logCtx.cacheAffinityReason } : {}),
1628
1685
  ...(logCtx.conversationStateScrub === "account-change"
1629
1686
  ? { conversationStateScrub: "account-change" }
1630
1687
  : {}),
@@ -1919,67 +1976,6 @@ export function finishRequestAttempt(
1919
1976
  return attempt;
1920
1977
  }
1921
1978
 
1922
- export function aggregateAttemptUsage(
1923
- attempts: readonly PersistedUsageAttempt[],
1924
- ): FinalizedUsageResult {
1925
- // A usage-less attempt that never reached upstream spent nothing (summary.ts `spentNothing`),
1926
- // so it cannot leave the row's usage unknown.
1927
- const measured = attempts.filter(attempt => attempt.usage
1928
- || (attempt.sendCount !== 0 && attempt.locallyAnswered !== true));
1929
- const status: UsageStatus = measured.length > 0
1930
- && measured.every(attempt => attempt.usageStatus === "unsupported")
1931
- ? "unsupported"
1932
- : measured.some(attempt => (
1933
- attempt.usageStatus === "unreported" || attempt.usageStatus === "unsupported"
1934
- ))
1935
- ? "unreported"
1936
- : measured.some(attempt => attempt.usageStatus === "estimated")
1937
- ? "estimated"
1938
- : measured.length > 0
1939
- ? "reported"
1940
- : "unreported";
1941
-
1942
- const usages = attempts.flatMap(attempt => attempt.usage ? [attempt.usage] : []);
1943
- if (usages.length === 0) return { status };
1944
-
1945
- const sumOptional = (
1946
- key: "cachedInputTokens" | "cacheReadInputTokens" | "cacheCreationInputTokens" | "cacheCreation1hInputTokens"
1947
- | "reasoningOutputTokens" | "providerCredits",
1948
- ): number | undefined => {
1949
- const present = usages.flatMap(usage => (
1950
- typeof usage[key] === "number" ? [usage[key] as number] : []
1951
- ));
1952
- return present.length > 0 ? present.reduce((sum, value) => sum + value, 0) : undefined;
1953
- };
1954
- const cachedInputTokens = sumOptional("cachedInputTokens");
1955
- // Readers take `cacheReadInputTokens ?? cachedInputTokens` (usage/cost.ts), so once any attempt
1956
- // reports the read field, an attempt that only reports `cachedInputTokens` must count in it too.
1957
- const cacheReadInputTokens = sumOptional("cacheReadInputTokens") === undefined ? undefined
1958
- : usages.reduce((sum, usage) => sum + (usage.cacheReadInputTokens ?? usage.cachedInputTokens ?? 0), 0);
1959
- const cacheCreationInputTokens = sumOptional("cacheCreationInputTokens");
1960
- const cacheCreation1hInputTokens = sumOptional("cacheCreation1hInputTokens");
1961
- const reasoningOutputTokens = sumOptional("reasoningOutputTokens");
1962
- const providerCredits = sumOptional("providerCredits");
1963
- const totalTokens = usages.reduce(
1964
- (sum, usage) => sum + (usageTotalTokens(usage) ?? 0),
1965
- 0,
1966
- );
1967
- const aggregate: OcxUsage = {
1968
- inputTokens: usages.reduce((sum, usage) => sum + usage.inputTokens, 0),
1969
- outputTokens: usages.reduce((sum, usage) => sum + usage.outputTokens, 0),
1970
- totalTokens,
1971
- ...(cachedInputTokens !== undefined ? { cachedInputTokens } : {}),
1972
- ...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
1973
- ...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
1974
- ...(cacheCreation1hInputTokens !== undefined ? { cacheCreation1hInputTokens } : {}),
1975
- ...(reasoningOutputTokens !== undefined ? { reasoningOutputTokens } : {}),
1976
- ...(providerCredits !== undefined ? { providerCredits } : {}),
1977
- ...(status === "estimated" ? { estimated: true } : {}),
1978
- ...(usages.every(usage => usage.upstreamReported) ? { upstreamReported: true as const } : {}),
1979
- };
1980
- return { usage: aggregate, status, totalTokens };
1981
- }
1982
-
1983
1979
  export function getRequestLogEntries(): RequestLogEntry[] { return requestLog; }
1984
1980
 
1985
1981
  /** Test-only process-state reset for isolated integration harnesses. */
@@ -0,0 +1,32 @@
1
+ import { mutatePersistedConfig } from "../config";
2
+ import { adoptReserveCapabilityMigration, isReserveCapabilityMigrated, migrateReserveCapability } from "../config/reserve-capability";
3
+ import type { OcxConfig } from "../types";
4
+
5
+ /**
6
+ * Persist the one-time Reserve seed at startup (#4961), so a later hand edit of authless cannot move
7
+ * Reserve. The seed is the file's current authless value: the value being migrated.
8
+ *
9
+ * Only the two Reserve fields are adopted, in place: earlier startup migrations may hold in-memory
10
+ * results whose persistence was unavailable, and the loaded object carries identity-keyed state
11
+ * (file-backed provenance) that a copy would lose. On failure nothing is marked, so the legacy
12
+ * reading continues and the next persisted write seeds from the file instead.
13
+ */
14
+ export function migrateStartupReserveCapability(
15
+ config: OcxConfig,
16
+ mutate: typeof mutatePersistedConfig = mutatePersistedConfig,
17
+ ): OcxConfig {
18
+ if (isReserveCapabilityMigrated(config)) return config;
19
+ try {
20
+ const outcome = mutate(fresh => ({ changed: migrateReserveCapability(fresh), value: fresh }));
21
+ if (outcome.status === "unavailable") {
22
+ console.warn(`[reserve-capability-migration] Persistence unavailable (${outcome.reason}); Reserve still follows codexDesktopAuthless until the next config write.`);
23
+ return config;
24
+ }
25
+ adoptReserveCapabilityMigration(config, outcome.value);
26
+ return config;
27
+ } catch {
28
+ // Do not log the exception: filesystem errors may contain private paths.
29
+ console.warn("[reserve-capability-migration] Persistence failed; Reserve still follows codexDesktopAuthless until the next config write.");
30
+ return config;
31
+ }
32
+ }
@@ -1,4 +1,5 @@
1
1
  import { carryProxyError, proxyErrorPresentation, isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
2
+ import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
2
3
  import { bindAnthropicRejectionResponse } from "../../adapters/anthropic-rejection-memo";
3
4
  import { deferPhysicalSendReporter } from "./deferred-send-reporter";
4
5
  import { responsesSpendTarget } from "./request-spend-target";
@@ -363,7 +364,7 @@ export function createAdapterContinuations(
363
364
  // A synthesized replay refusal is not a rate limit; replaying the continuation on
364
365
  // it would re-send a turn whose first send may already have been processed.
365
366
  && !isNonReplayableResponse(response) && !isSameTargetRetryHold(response)
366
- && rateLimitPolicy !== null
367
+ && rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
367
368
  && adapterExchange.rateLimitRetries < rateLimitPolicy.attempts
368
369
  // The main recovery loop and the passthrough ladder both consult the shared remainder
369
370
  // here; this loop did not, so a request whose budget was already spent could still
@@ -30,6 +30,7 @@ import { isNonReplayableResponse } from "../../lib/upstream-retry";
30
30
  import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
31
31
  import { currentTurnToolBridgeMaps, guardEmptyToolCatalogEvents, guardEmptyToolCatalogStream } from "../../lib/empty-tool-catalog";
32
32
  import { guardCompactionSummary } from "../../responses/compaction-summary";
33
+ import { settleAnthropicPerMessageEffort } from "../../adapters/anthropic/per-message-effort";
33
34
 
34
35
  /** One responsibility of the Responses request pipeline; state owners are explicit. */
35
36
  export async function deliverAdapterResponse(
@@ -208,6 +209,7 @@ export async function deliverAdapterResponse(
208
209
  // direct client encoder from the fold of the same events.
209
210
  const onCompletedResponse = (response: Record<string, unknown>, providerState?: OcxProviderContinuationState) => {
210
211
  if (!options.abortSignal?.aborted) thinkingSignatureRecovery.rememberSuccess(response);
212
+ settleAnthropicPerMessageEffort(parsed, response, transportState.activeAdapter.name);
211
213
  const served = transportState.sentOAuthSnapshot;
212
214
  if (transportState.activeAdapter.name === "kiro" && response.status === "completed" && served
213
215
  && noteKiroServedSuccess(served.accountId, served.generation)) persistKiroAccountState();
@@ -270,6 +272,7 @@ export async function deliverAdapterResponse(
270
272
  bareCustomToolNames,
271
273
  enforceDeclaredToolNames: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
272
274
  terminalRefusalAsFailed: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
275
+ escapeMemoryCitationTags: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
273
276
  toolParameterSchemas,
274
277
  ...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
275
278
  ...(routedCompaction ? { compaction: true, compactionRetention: parsed._compactionRetention } : {}),
@@ -381,6 +384,7 @@ export async function deliverAdapterResponse(
381
384
  declaredToolNames,
382
385
  bareCustomToolNames,
383
386
  enforceDeclaredToolNames: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
387
+ escapeMemoryCitationTags: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
384
388
  toolParameterSchemas,
385
389
  freeformToolNames,
386
390
  toolSearchToolNames,
@@ -1,4 +1,5 @@
1
1
  import { recordUpstreamProviderErrorDetail } from "../request-log-failure-detail";
2
+ import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
2
3
  import { clientFacingModelText } from "../../lib/error-destination";
3
4
  import { responsesSpendTarget } from "./request-spend-target";
4
5
  import { projectLocalModelRefusalLog } from "../request-log-failure-detail";
@@ -63,6 +64,7 @@ import {
63
64
  sleepWithAbort,
64
65
  } from "../../lib/upstream-retry";
65
66
  import { describeUpstreamConnectFailure } from "./upstream-error";
67
+ import { createProviderOfflineResendWait } from "../../lib/offline-resend";
66
68
  import type { OpaqueBlobRecoveryGuard } from "./core-opaque-recovery";
67
69
  import type { AttemptRecoveryKind } from "../../usage/log";
68
70
  import type { OAuthAccessSnapshot } from "../../oauth";
@@ -91,6 +93,7 @@ import {
91
93
  quarantineKiroSuspendedAccount,
92
94
  failoverAccountSnapshot,
93
95
  rotateAntigravityAccountOnAuthRefusal,
96
+ rotateAntigravityAccountOnUpstreamFault,
94
97
  } from "../../oauth/generic-account-failover";
95
98
  import {
96
99
  attemptOpaqueBlobRecovery,
@@ -110,7 +113,6 @@ import { isFixedCodexAccount } from "./core-codex-account";
110
113
  import { recordSubagentQuotaFailureForThreadSpawn } from "../../codex/subagent-model-fallback";
111
114
  import {
112
115
  CYBER_POLICY_ERROR_CODE,
113
- SEND_BUDGET_EXHAUSTED_CODE,
114
116
  } from "../../lib/errors";
115
117
  import { resolveClientRetryAfter } from "../../lib/retry-after";
116
118
  import { cancelBodyOnAbort } from "../../lib/abort";
@@ -119,10 +121,12 @@ import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
119
121
  import { mapCodexAuthContextErrorToResponse } from "./codex-auth-error";
120
122
  import { chargeWorkflowSends } from "../../lib/workflow-budget";
121
123
  import { hasWorkflowSendObserver } from "../../lib/request-execution-budget";
122
- import { isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
124
+ import { isAntigravityAccessDeniedRefusal, isAntigravityValidationRefusal } from "./antigravity-validation-refusal";
123
125
  import { createAntigravityModelDenialRecovery, recoverAntigravityAccount } from "./antigravity-model-denial-recovery";
124
- import { unboundPoolSpendRefusalResponse, workflowSendCeilingRefusalResponse } from "../workflow-refusal";
126
+ import { isAntigravityFaultRotatable } from "./antigravity-fault-rotation";
127
+ import { adapterSendBudgetRefusal } from "../workflow-refusal";
125
128
  import { AdmissionModelDeniedError, admissionModelDeniedResponse, projectAdmissionModelDeniedLog } from "../admission-model-scope";
129
+ import { rejectAnthropicPerMessageEffort } from "../../adapters/anthropic/per-message-effort";
126
130
  /** One responsibility of the Responses request pipeline; state owners are explicit. */
127
131
  export async function prepareAdapterExchange(
128
132
  requestContext: Pick<ResponsesRequestContext, "options" | "config" | "logCtx" | "req">,
@@ -521,6 +525,7 @@ export async function prepareAdapterExchange(
521
525
  abortSignal: upstream.signal,
522
526
  label: safeHostLabel(builtInitialRequest.url), destination: errorDestinationLabel(builtInitialRequest.url),
523
527
  claimAmbiguousResend: claimPreHeaderResend,
528
+ offlineWait: options.comboAttempt ? undefined : createProviderOfflineResendWait(route.providerName, route.provider, builtInitialRequest.url, config.offlineResendWaitSec),
524
529
  ...(sendBudgetState.workflowRootId || sendBudgetState.adapterSendBudget?.spendEnforced || options.comboDispatchPermit || transientPolicy || resetPolicy || compactPrepaid || options.comboAttempt
525
530
  || billingPoolRequest || autoPauseEnabled
526
531
  ? {
@@ -577,8 +582,7 @@ export async function prepareAdapterExchange(
577
582
  // blaming the provider makes the caller send the whole turn again -- the amplification this
578
583
  // budget exists to stop. The passthrough path has answered 429 here since #4546.
579
584
  if (err instanceof SendBudgetExhaustedError) {
580
- return unboundPoolSpendRefusalResponse(logCtx) ?? workflowSendCeilingRefusalResponse(logCtx, sendBudgetState.workflowRootId)
581
- ?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message));
585
+ return adapterSendBudgetRefusal(logCtx, sendBudgetState.workflowRootId, err.message);
582
586
  }
583
587
  const msg = describeUpstreamConnectFailure(err, connectMs);
584
588
  return formatErrorResponse(502, "upstream_error", msg);
@@ -612,6 +616,9 @@ export async function prepareAdapterExchange(
612
616
  const consoleGoUploadRetryGuard: { attempted: boolean } = { attempted: false };
613
617
  let oauth401ReplayAttempted = transportState.oauth401ReplayAttempted;
614
618
  let antigravityAuthRotationAttempted = false;
619
+ let antigravityFaultRotationAttempted = false;
620
+ const antigravityFaultRotatable = (response: Response) => isAntigravityFaultRotatable(route.providerName, response,
621
+ transportState, antigravityPoolActivated, antigravityFaultRotationAttempted);
615
622
  // Direct requests get one reasoning-effort downgrade. Combo candidates may walk down the
616
623
  // published ladder one refused rung at a time; the request send budget bounds those retries.
617
624
  const reasoningEffortDowngradeGuard: { attempted: boolean } = { attempted: false };
@@ -864,8 +871,7 @@ export async function prepareAdapterExchange(
864
871
  // Same rule on the recovery leg: the ladder refused to send again, so the answer names
865
872
  // this proxy rather than the provider it never reached.
866
873
  if (err instanceof SendBudgetExhaustedError) {
867
- return { failed: unboundPoolSpendRefusalResponse(logCtx) ?? workflowSendCeilingRefusalResponse(logCtx, sendBudgetState.workflowRootId)
868
- ?? markProxyError(formatErrorResponse(429, SEND_BUDGET_EXHAUSTED_CODE, err.message)) };
874
+ return { failed: adapterSendBudgetRefusal(logCtx, sendBudgetState.workflowRootId, err.message) };
869
875
  }
870
876
  const msg = describeUpstreamConnectFailure(err, connectMs);
871
877
  return { failed: formatErrorResponse(502, "upstream_error", msg) };
@@ -879,14 +885,14 @@ export async function prepareAdapterExchange(
879
885
  const rotateAntigravityAuth = async (
880
886
  failedResponse: Response,
881
887
  recovery: AttemptRecoveryKind,
882
- modelAccountId?: string,
888
+ // An account id (model-404 recovery already chose it) or a selector; the 403 refusal default.
889
+ pick: string | ((sent: { accountId: string; generation: string }) => string | null) = sent =>
890
+ rotateAntigravityAccountOnAuthRefusal(antigravityPoolActivated, sent.accountId, sent.generation, route.modelId),
883
891
  ): Promise<Response | null> => {
884
892
  const sent = transportState.replayOAuthCredentialSnapshot ?? transportState.sentOAuthSnapshot;
885
893
  if (!antigravityPoolActivated || !sent
886
894
  || transportState.genericFailovers >= transportState.genericFailoverLimit) return null;
887
- const nextId = modelAccountId ?? rotateAntigravityAccountOnAuthRefusal(
888
- antigravityPoolActivated, sent.accountId, sent.generation, route.modelId,
889
- );
895
+ const nextId = typeof pick === "string" ? pick : pick(sent);
890
896
  if (!nextId) return null;
891
897
  const adapterOwnsDispatch = transportState.activeAdapter.fetchResponse !== undefined;
892
898
  return recoverAntigravityAccount({ nextId, failedResponse, adapterOwnsDispatch,
@@ -933,6 +939,7 @@ export async function prepareAdapterExchange(
933
939
 
934
940
  // Preserve the terminal verdict through adapter and combo error formatting.
935
941
  // This also covers a reset reached by a 401/429/413 recovery refetch.
942
+ await rejectAnthropicPerMessageEffort(parsed, upstreamResponse, upstream.signal);
936
943
  if (isNonReplayableResponse(upstreamResponse)) {
937
944
  try {
938
945
  return await sanitizeNonReplayableUpstreamError(upstreamResponse, upstream.signal);
@@ -1078,15 +1085,26 @@ export async function prepareAdapterExchange(
1078
1085
 
1079
1086
  if (route.providerName === "google-antigravity" && upstreamResponse.status === 403
1080
1087
  && transportState.activeAdapter.name === "google"
1081
- && antigravityPoolActivated && !antigravityAuthRotationAttempted
1088
+ && antigravityPoolActivated
1082
1089
  && !isNonReplayableResponse(upstreamResponse)
1083
1090
  && transportState.genericFailovers < transportState.genericFailoverLimit
1084
- && await isAntigravityValidationRefusal(upstreamResponse, options.abortSignal)) {
1091
+ && (!antigravityAuthRotationAttempted && await isAntigravityValidationRefusal(upstreamResponse, options.abortSignal)
1092
+ // A plain access-denied 403 keeps rotating while siblings remain: each refused account is
1093
+ // cooled before the hop, so the ring advances and `genericFailoverLimit` bounds the sends.
1094
+ || await isAntigravityAccessDeniedRefusal(upstreamResponse, options.abortSignal))) {
1085
1095
  antigravityAuthRotationAttempted = true;
1086
1096
  const rotated = await rotateAntigravityAuth(upstreamResponse, "oauth-account-403");
1087
1097
  if (rotated) { upstreamResponse = rotated; continue recovery; }
1088
1098
  }
1089
1099
 
1100
+ // A 502/503/504 that outlived the same-account ladder replays once on a live sibling.
1101
+ if (antigravityFaultRotatable(upstreamResponse)) {
1102
+ antigravityFaultRotationAttempted = true;
1103
+ const rotated = await rotateAntigravityAuth(upstreamResponse, "transient-5xx", sent =>
1104
+ rotateAntigravityAccountOnUpstreamFault(antigravityPoolActivated, sent.accountId, sent.generation, route.modelId));
1105
+ if (rotated) { upstreamResponse = rotated; continue recovery; }
1106
+ }
1107
+
1090
1108
  // Static API-key pools can recover a credential-scoped 401 without abandoning the
1091
1109
  // provider: one revoked or mistyped key says nothing about its siblings. OAuth providers
1092
1110
  // refresh above and never enter here — `hasKeyPoolFailover` rejects oauth/forward modes.
@@ -1230,7 +1248,7 @@ export async function prepareAdapterExchange(
1230
1248
  // key on rate-limit blips; only after the attempts are exhausted does failover run.
1231
1249
  while (
1232
1250
  upstreamResponse.status === 429 && !isSameTargetRetryHold(upstreamResponse)
1233
- && rateLimitPolicy !== null
1251
+ && rateLimitPolicy !== null && providerAffinityGenerationIsCurrent(config, route.providerName, route.provider)
1234
1252
  && rateLimitRetries < rateLimitPolicy.attempts
1235
1253
  && !sendBudgetExhausted()
1236
1254
  ) {
@@ -1631,8 +1649,9 @@ export async function prepareAdapterExchange(
1631
1649
  }
1632
1650
  upstreamResponse = result;
1633
1651
  // The hop's permit is already settled by the dispatch boundary above; continuing
1634
- // only skips the remaining arms, it does not abandon a reservation.
1635
- if (isNonReplayableResponse(upstreamResponse)) continue recovery;
1652
+ // only skips the remaining arms, it does not abandon a reservation. A replacement's
1653
+ // surviving 502/503/504 re-enters recovery so the one-hop fault rotation can run.
1654
+ if (isNonReplayableResponse(upstreamResponse) || antigravityFaultRotatable(upstreamResponse)) continue recovery;
1636
1655
  } catch (err) {
1637
1656
  // A local admission denial is terminal for the whole request: rotating to another
1638
1657
  // account cannot re-scope the key, so the refusal answers in place of the 429.
@@ -1745,7 +1764,7 @@ export async function prepareAdapterExchange(
1745
1764
  transportState.genericFailovers += 1;
1746
1765
  try { void failedResponse.body?.cancel().catch(() => {}); } catch { /* already consumed/closed */ }
1747
1766
  upstreamResponse = result;
1748
- if (isNonReplayableResponse(upstreamResponse)) continue recovery;
1767
+ if (isNonReplayableResponse(upstreamResponse) || antigravityFaultRotatable(upstreamResponse)) continue recovery;
1749
1768
  } catch {
1750
1769
  hop.permit?.release();
1751
1770
  break;