@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,3 +1,4 @@
1
+ import type { AnthropicImageRecovery } from "../server/responses/image-context-recovery";
1
2
  import { bindAnthropicRejectionResponse } from "../adapters/anthropic-rejection-memo";
2
3
  import { anthropicDeclaredTools } from "../adapters/anthropic-tool-catalog";
3
4
  import { enableAnthropicReplayCapture, takeAnthropicReplay, bindAnthropicReplay, type AnthropicReplaySnapshot } from "../adapters/anthropic-replay";
@@ -13,6 +14,8 @@ import { isTruncatedStopReason } from "../responses/truncated-stop-reason";
13
14
  import { bridgeToResponsesSSE } from "../bridge";
14
15
  import { guardEmptyToolCatalogStream, type ClientToolCatalogRestriction } from "../lib/empty-tool-catalog";
15
16
  import { emptyCompletionRetryFailedEvent, mergeUsage } from "../server/responses/empty-completion-guard";
17
+ import { analyzeTerminalTurn, buildContinuationRequest } from "../server/responses/terminal-guard";
18
+ import { withMissingCreditReading } from "../usage/credit-billing";
16
19
  import { markSidecarContextOverflow, sidecarLoopTerminalEvent, upstreamErrorCode, type SidecarLoopFailure } from "../server/responses/context-overflow";
17
20
  import { markVerifiedModelNotInPlanResponse, MODEL_NOT_IN_PLAN_CODE, UNDECLARED_TOOL_CALL_ERROR_CODE, verifiedPlanRefusalMessage } from "../lib/errors";
18
21
  import { runWebSearch, type SidecarOutcome, type SidecarOutcomeRecorder, type SidecarSettings } from "./executor";
@@ -24,8 +27,11 @@ import { runExaWebSearch } from "./exa-executor";
24
27
  import type { WebSearchBackendId } from "./index";
25
28
  import { pacingHeaderDeadline } from "./header-deadline";
26
29
  import { redactSecretString } from "../lib/redact";
30
+ import { recordLocalFailureDetail, type FailureDetail } from "../server/request-log-failure-detail";
27
31
  import { readBoundedResponseBody } from "../lib/bounded-body";
28
- import { applyUpstreamRecoveryInit, fetchWithResetRetry, prepareSameTarget429Wait, isNonReplayableResponse, isSameTargetRetryHold, SendBudgetExhaustedError } from "../lib/upstream-retry";
32
+ import { applyUpstreamRecoveryInit, fetchWithResetRetry, prepareSameTarget429Wait, isNonReplayableResponse, isSameTargetRetryHold, RESET_RETRY_MAX_ATTEMPTS, SendBudgetExhaustedError } from "../lib/upstream-retry";
33
+ import { unwrapUpstreamRetryEvidenceError } from "../codex/auth-context";
34
+ import { HostedAdvisorSpendRefusal } from "../server/responses/policy-request-scope";
29
35
  import { rateLimitRetryDelayMs } from "../providers/key-failover";
30
36
  import { RequestPacingQueueOverloadError } from "../providers/request-pacing";
31
37
  import {
@@ -34,11 +40,13 @@ import {
34
40
  TranslatorBudgetExceededError,
35
41
  } from "../lib/translator-budget";
36
42
  import { formatWebSearchResults } from "./format-result";
37
- import { parseStreamWithProgress, RoutedModelInactivityError, WebSearchConsumerInactivityError, WebSearchStreamProtocolError, WebSearchAdapterEventError } from "./progress-stream";
43
+ import { parseStreamWithProgress, withHeartbeats, RoutedModelInactivityError, WebSearchConsumerInactivityError, WebSearchStreamProtocolError, WebSearchAdapterEventError } from "./progress-stream";
38
44
  import { WEB_SEARCH_TOOL_NAME } from "./synthetic-tool";
39
45
  import { newSidecarSearchCellId, rememberSidecarSearch, restoreSidecarSearchResults } from "./sidecar-search-replay";
40
46
  import {
41
47
  ADVISOR_TOOL_NAME,
48
+ advisorToolAllowed,
49
+ createAdvisorCallResolver,
42
50
  MAX_ADVISOR_CONTINUATIONS_PER_REQUEST,
43
51
  parseAdvisorQuestionArgs,
44
52
  type AdvisorSidecarStep,
@@ -91,7 +99,10 @@ function parseQueries(argsBuf: string): string[] {
91
99
  * (Codex never sees the synthetic tool); every other event — text, thinking, real tool calls, done —
92
100
  * is preserved in order.
93
101
  */
94
- export function scanEventsForWebSearch(events: AdapterEvent[], options: { advisor?: boolean; clientAdvisorAllowed?: boolean } = {}): {
102
+ export function scanEventsForWebSearch(
103
+ events: AdapterEvent[],
104
+ resolveAdvisorCall: ReturnType<typeof createAdvisorCallResolver> = name => name === ADVISOR_TOOL_NAME ? "refused" : undefined,
105
+ ): {
95
106
  calls: WebSearchCall[];
96
107
  passthrough: AdapterEvent[];
97
108
  hasRealToolCall: boolean;
@@ -102,13 +113,12 @@ export function scanEventsForWebSearch(events: AdapterEvent[], options: { adviso
102
113
  let hasRealToolCall = false;
103
114
  let hasMalformedToolCall = false;
104
115
  let refusal: Extract<AdapterEvent, { type: "error" }> | undefined;
105
- let pending: { name: string; id: string; argsBuf: string; closed: boolean; events: AdapterEvent[]; providerMetadata?: OcxProviderOpaqueToolCallMetadata } | null = null;
116
+ let pending: { name: string; id: string; argsBuf: string; closed: boolean; advisor: boolean; events: AdapterEvent[]; providerMetadata?: OcxProviderOpaqueToolCallMetadata } | null = null;
106
117
  const isBlank = (value: string): boolean => value.trim().length === 0;
107
118
  const flushPending = (): void => {
108
119
  // A pending call that never saw tool_call_end is structurally malformed.
109
120
  if (pending && !pending.closed) hasMalformedToolCall = true;
110
- const advisor = options.advisor === true && pending?.name === ADVISOR_TOOL_NAME;
111
- if (pending && pending.name !== WEB_SEARCH_TOOL_NAME && !advisor) {
121
+ if (pending && pending.name !== WEB_SEARCH_TOOL_NAME && !pending.advisor) {
112
122
  passthrough.push(...pending.events);
113
123
  if (pending.closed && !isBlank(pending.id) && !isBlank(pending.name)) hasRealToolCall = true;
114
124
  }
@@ -121,14 +131,17 @@ export function scanEventsForWebSearch(events: AdapterEvent[], options: { adviso
121
131
  }
122
132
  if (e.type === "tool_call_start") {
123
133
  flushPending();
124
- if (e.name === ADVISOR_TOOL_NAME && !options.advisor && !options.clientAdvisorAllowed) {
134
+ const disposition = resolveAdvisorCall(e.name);
135
+ if (disposition === "refused") {
125
136
  refusal = { type: "error", status: 502, errorType: "upstream_error", code: UNDECLARED_TOOL_CALL_ERROR_CODE,
126
137
  message: "routed provider emitted advisor outside the current iteration's permitted tool catalog" };
127
138
  passthrough.push(refusal);
128
139
  continue;
129
140
  }
130
141
  if (isBlank(e.id) || isBlank(e.name)) hasMalformedToolCall = true;
131
- pending = { name: e.name, id: e.id, argsBuf: "", closed: false, events: [e], providerMetadata: e.providerMetadata };
142
+ const start = typeof disposition === "object" && disposition.clientWireName !== e.name
143
+ ? { ...e, name: disposition.clientWireName } : e;
144
+ pending = { name: start.name, id: e.id, argsBuf: "", closed: false, advisor: disposition === "synthetic", events: [start], providerMetadata: e.providerMetadata };
132
145
  } else if (e.type === "tool_call_delta") {
133
146
  // Orphan delta (no open call) is malformed.
134
147
  if (!pending) hasMalformedToolCall = true;
@@ -143,13 +156,12 @@ export function scanEventsForWebSearch(events: AdapterEvent[], options: { adviso
143
156
  } else {
144
157
  pending.events.push(e);
145
158
  pending.closed = true;
146
- const advisor = options.advisor === true && pending.name === ADVISOR_TOOL_NAME;
147
159
  if (e.incomplete) {
148
160
  hasMalformedToolCall = true;
149
- if (!advisor) passthrough.push(...pending.events);
161
+ if (!pending.advisor) passthrough.push(...pending.events);
150
162
  } else if (pending.name === WEB_SEARCH_TOOL_NAME) {
151
163
  calls.push({ id: pending.id, queries: parseQueries(pending.argsBuf), providerMetadata: pending.providerMetadata });
152
- } else if (advisor) {
164
+ } else if (pending.advisor) {
153
165
  calls.push({
154
166
  id: pending.id,
155
167
  kind: "advisor",
@@ -187,23 +199,6 @@ async function* replay(events: AdapterEvent[]): AsyncGenerator<AdapterEvent> {
187
199
  for (const e of events) yield e;
188
200
  }
189
201
 
190
- /**
191
- * Keeps the Responses bridge alive while an internal sidecar await is pending. Rejections retain
192
- * their original error, and each timeout is cleared on completion, failure, or generator return.
193
- */
194
- async function* withHeartbeats<T>(promise: Promise<T>): AsyncGenerator<AdapterEvent, T> {
195
- const tracked = promise.then(value => ({ value }));
196
- for (;;) {
197
- let timer: number | undefined;
198
- const heartbeat = new Promise<undefined>(resolve => { timer = setTimeout(resolve, 1_000); });
199
- let result: { value: T } | undefined;
200
- try { result = await Promise.race([tracked, heartbeat]); }
201
- finally { if (timer) clearTimeout(timer); }
202
- if (result) return result.value;
203
- yield { type: "heartbeat" };
204
- }
205
- }
206
-
207
202
  function terminalUsage(events: AdapterEvent[]): OcxUsage | undefined {
208
203
  for (const e of events) if (e.type === "done" || e.type === "incomplete") return e.usage;
209
204
  return undefined;
@@ -216,6 +211,15 @@ function countersOnly(usage: OcxUsage | undefined): OcxUsage | undefined {
216
211
  return counters;
217
212
  }
218
213
 
214
+ function withTerminalUsageMetadata(cumulative: OcxUsage, terminal: OcxUsage | undefined): OcxUsage {
215
+ const { contextTotalTokens: _context, rawUsage: _raw, ...counters } = cumulative;
216
+ return {
217
+ ...counters,
218
+ ...(terminal?.contextTotalTokens !== undefined ? { contextTotalTokens: terminal.contextTotalTokens } : {}),
219
+ ...(terminal?.rawUsage !== undefined ? { rawUsage: terminal.rawUsage } : {}),
220
+ };
221
+ }
222
+
219
223
  /**
220
224
  * Collect the thinking block that preceded a web_search call in this iteration's events, so the
221
225
  * replayed assistant turn can carry it. Anthropic extended thinking REQUIRES the assistant
@@ -342,12 +346,20 @@ class LoopError extends Error {
342
346
  message: string,
343
347
  readonly event?: Extract<AdapterEvent, { type: "error" }>,
344
348
  readonly detail?: Pick<SidecarLoopFailure, "upstreamCode" | "nonReplayable" | "verifiedPlanRefusal">,
349
+ /** A deadline this proxy enforced; logged as local failure detail, never as upstream evidence. */
350
+ readonly localFailure?: FailureDetail,
345
351
  ) {
346
352
  super(message);
347
353
  this.name = "LoopError";
348
354
  }
349
355
  }
350
356
 
357
+ /** The response-header deadline verdict; the wire status and text are the pre-existing ones. */
358
+ function headerDeadlineError(connectTimeoutMs: number): LoopError {
359
+ return new LoopError(504, `Provider response-header timeout after ${connectTimeoutMs}ms during web-search`,
360
+ undefined, undefined, { code: "header_timeout", value: connectTimeoutMs });
361
+ }
362
+
351
363
  function loopFailure(e: LoopError): SidecarLoopFailure {
352
364
  return { status: e.status, message: e.message, ...(e.event ? { event: e.event } : {}), ...e.detail };
353
365
  }
@@ -360,6 +372,7 @@ export interface WebSearchLoopDeps {
360
372
  parsed: OcxParsedRequest;
361
373
  /** The global emptyCompletionRetry opt-in; the loop applies it only to final openai-chat iterations. */
362
374
  emptyCompletionRetry?: boolean;
375
+ terminalContinuationGuard?: boolean;
363
376
  advisor?: AdvisorSidecarStep;
364
377
  /** Chat delivery only; never copied into parsed generation options. */
365
378
  chatRawReasoningVisible?: boolean;
@@ -401,6 +414,8 @@ export interface WebSearchLoopDeps {
401
414
  connectTimeoutMs?: number;
402
415
  /** Continuous routed-model response-body raw-byte inactivity deadline. Default 200000ms. */
403
416
  routedModelStallTimeoutMs?: number;
417
+ /** Best-effort notification before publication. Observer exceptions leave the timeout response intact. */
418
+ onLocalFailure?: () => void;
404
419
  /**
405
420
  * Effective bridge stall deadline for this turn (seconds). Computed by planWebSearch
406
421
  * (webSearchStallTimeoutSec) to cover response-header wait, routed-model body inactivity, and one
@@ -418,17 +433,26 @@ export interface WebSearchLoopDeps {
418
433
  /** Raw adapter usage at the terminal event, pre wire-normalization (see bridgeToResponsesSSE onUsage). */
419
434
  onUsage?: (usage: OcxUsage | undefined) => void;
420
435
  proxyErrorContext?: object;
436
+ /** Sizes the ingress-owned model-send allowance before the first dispatch. */
437
+ configureModelSendAllowance?: (baseSends: number) => void;
421
438
  /**
422
439
  * After an `on429` rotation, offered the usage of the hidden iterations the left credential
423
- * served. Returning true means it was billed to that credential's attempt, so `onUsage` will not
440
+ * served, including undefined when no usage arrived. Returning true hands off the old attempt,
441
+ * so `onUsage` will not
424
442
  * report it again.
425
443
  */
426
- onRotatedUsage?: (usage: OcxUsage) => boolean;
444
+ onRotatedUsage?: (usage: OcxUsage | undefined) => boolean;
427
445
  /** Observe the exact adapter request selected for each routed-model iteration. */
428
446
  onRequestBuilt?: (request: AdapterRequest) => void;
429
447
  /** Request-scoped executor retains the core's selection binding across loop retries. */
430
448
  thinkingRecovery?: ReturnType<typeof createAnthropicThinkingRecovery>;
431
- fetchForRequest?: (request: AdapterRequest, parsed: OcxParsedRequest, adapter: ProviderAdapter, recovery?: AttemptRecoveryKind) => typeof globalThis.fetch;
449
+ imageRecovery?: AnthropicImageRecovery;
450
+ /** A receipt-aware executor calls onPhysicalDispatch after final local admission, once per send. */
451
+ fetchForRequest?: (request: AdapterRequest, parsed: OcxParsedRequest, adapter: ProviderAdapter,
452
+ recovery: AttemptRecoveryKind | undefined, onPhysicalDispatch: () => void) =>
453
+ typeof globalThis.fetch & { reportsPhysicalDispatch?: true };
454
+ /** Observe finalized worker sends from both generic and adapter-owned transports. */
455
+ onPhysicalSend?: IncomingMeta["onPhysicalSend"];
432
456
  /** Called before each routed-model dispatch in the loop, for attempt telemetry. Same-target 429 replays pass the `rate-limit-429` recovery kind. */
433
457
  onAttemptSend?: (recovery?: AttemptRecoveryKind) => void;
434
458
  /**
@@ -448,6 +472,7 @@ export interface WebSearchLoopDeps {
448
472
  * A rotation may cross ACCOUNTS, not just keys, and the attempt row is where an operator reads
449
473
  * which one happened. A rotator that knows which kind it performed returns it alongside the
450
474
  * adapter -- the same `{ adapter, recoveryKind }` shape `onCredentialError` already uses below.
475
+ * The usage snapshot includes any dispatched refusal before this hook can seal the attempt.
451
476
  */
452
477
  on429?: (
453
478
  retryAfterHeader: string | null,
@@ -455,6 +480,7 @@ export interface WebSearchLoopDeps {
455
480
  retryParsed?: OcxParsedRequest,
456
481
  // A 403 requires this complete response; status-only callbacks retain 429 semantics.
457
482
  originalResponse?: Response,
483
+ hiddenUsage?: OcxUsage,
458
484
  ) =>
459
485
  | { adapter: ProviderAdapter; recoveryKind: AttemptRecoveryKind }
460
486
  | null
@@ -493,6 +519,14 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
493
519
  const messages: OcxMessage[] = [...parsed.context.messages];
494
520
  const replaySnapshots = new Set<AnthropicReplaySnapshot>();
495
521
  const loopT0 = Date.now();
522
+ // A deadline this proxy enforced ends the turn: the row keeps its closed detail and the same text
523
+ // is no longer read as upstream evidence. The context text is the one the wire carries, so the
524
+ // status-derived error code and every retry decision read exactly what they read before.
525
+ const recordLocalLoopFailure = (e: unknown): void => {
526
+ if (!(e instanceof LoopError) || !e.localFailure || !deps.proxyErrorContext) return;
527
+ recordLocalFailureDetail(deps.proxyErrorContext as { upstreamError?: string; failureDetail?: FailureDetail }, e.message, e.localFailure);
528
+ try { deps.onLocalFailure?.(); } catch { /* Keep the original timeout response. */ }
529
+ };
496
530
  let allTools = adapter.name === "anthropic" ? anthropicDeclaredTools(parsed) : parsed.context.tools ?? [];
497
531
  let activeToolChoice = parsed.options.toolChoice;
498
532
  let forcedNudgeAdded = false;
@@ -516,27 +550,57 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
516
550
 
517
551
  // Hard iteration bound (termination safety net); forceAnswer normally ends the loop sooner.
518
552
  // One iteration beyond the forced answer is reserved for its empty-answer recovery below.
519
- // An authorized Chat empty-completion retry adds its own iteration (see completionRetries in the
520
- // loop bound), so ordinary iterations, including repeat placeholders for a failed query that never
521
- // advance searchesExecuted, cannot use up the slot the retry needs.
522
- const HARD_CAP = maxSearches + 3 + (deps.advisor ? MAX_ADVISOR_CONTINUATIONS_PER_REQUEST : 0);
553
+ // Each authorized Chat recovery adds its own iteration. Ordinary iterations, including repeat
554
+ // placeholders for a failed query, cannot use up either recovery's slot.
555
+ const forcedAnswerRetries = 1;
556
+ const HARD_CAP = maxSearches + 2 + forcedAnswerRetries + (deps.advisor ? MAX_ADVISOR_CONTINUATIONS_PER_REQUEST : 0);
523
557
  let emptyAnswerRetries = 0;
524
558
  let completionRetries = 0;
559
+ let terminalContinuations = 0;
560
+ let pendingContinuationMessages: OcxMessage[] | undefined;
525
561
  // Every iteration re-sends the full context, but only the last one's terminal reaches the bridge.
526
562
  // Search-calling passes and the discarded empty forced answer are summed here and added to what
527
563
  // onUsage reports, so the request log meters what was actually sent. The client-facing terminal
528
564
  // keeps the last iteration's usage: Codex and Claude Code size the context window from it, and
529
565
  // a sum would read as a context several times larger and trigger early auto-compaction.
530
566
  let hiddenUsage: OcxUsage | undefined;
567
+ let hiddenLegs = 0;
568
+ let pendingLegs = 0;
569
+ let errorUsage: OcxUsage | undefined;
570
+ const mergePendingUsage = (previous: OcxUsage | undefined, usage: OcxUsage | undefined): OcxUsage | undefined => {
571
+ if (pendingLegs === 0) return previous;
572
+ const reading = pendingLegs > 1 ? withMissingCreditReading(usage) : usage;
573
+ return mergeUsage(previous, reading, hiddenLegs > 0);
574
+ };
575
+ const takeUsage = (usage: OcxUsage | undefined): void => {
576
+ if (pendingLegs === 0) return;
577
+ hiddenUsage = mergePendingUsage(countersOnly(hiddenUsage), usage);
578
+ hiddenLegs += pendingLegs;
579
+ pendingLegs = 0;
580
+ };
581
+ // After a terminal re-ask an incomplete or failed terminal carries the summed usage, like the
582
+ // plain guard (#8877). Taking the final leg first leaves the bridge's onUsage one sum to report.
583
+ const withReaskSum = (events: AdapterEvent[]): AdapterEvent[] => {
584
+ if (terminalContinuations === 0) return events;
585
+ const index = events.findIndex(event => event.type === "incomplete" || event.type === "error"
586
+ || (event.type === "done" && isTruncatedStopReason(event.stopReason)));
587
+ const terminal = events[index];
588
+ if (terminal?.type !== "incomplete" && terminal?.type !== "error" && terminal?.type !== "done") return events;
589
+ takeUsage(terminal.usage);
590
+ if (!hiddenUsage) return events;
591
+ const summed = [...events];
592
+ summed[index] = { ...terminal, usage: withTerminalUsageMetadata(hiddenUsage, terminal.usage) };
593
+ return summed;
594
+ };
531
595
  let accountRefusalOutputStarted = false;
532
596
  const connectTimeoutMs = deps.connectTimeoutMs ?? 200_000;
533
597
  const routedModelStallTimeoutMs = deps.routedModelStallTimeoutMs ?? 200_000;
534
598
 
535
599
  interface IterationResponse {
600
+ parsed: OcxParsedRequest;
536
601
  response: Response;
537
602
  responseAdapter: ProviderAdapter;
538
- clientAdvisorAllowed: boolean;
539
- syntheticAdvisorAllowed: boolean;
603
+ resolveAdvisorCall: ReturnType<typeof createAdvisorCallResolver>;
540
604
  recover?: (error: WebSearchAdapterEventError) => Promise<IterationResponse | undefined>;
541
605
  }
542
606
  type IterationSplit = ReturnType<typeof scanEventsForWebSearch> & {
@@ -555,6 +619,15 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
555
619
  // configured replay count in total (a per-round reset would multiply it by maxSearches).
556
620
  const rateLimitRetryPolicy = deps.retryOn429Policy ?? null;
557
621
  let rateLimitRetries = 0;
622
+ // The 429 ladder and thinking-signature recovery are request-scoped. Each
623
+ // model dispatch can use its transport's full retry ladder.
624
+ // An authorized Chat terminal re-ask is one more loop iteration (terminalContinuations in the
625
+ // loop bound), so the default allowance funds it; explicit and Combo caps never expand.
626
+ deps.configureModelSendAllowance?.((deps.adapter.hostedIterationSendLimit ?? RESET_RETRY_MAX_ATTEMPTS) * (
627
+ HARD_CAP + Number(Boolean(deps.emptyCompletionRetry))
628
+ + Number(deps.terminalContinuationGuard === true && deps.adapter.name === "openai-chat")
629
+ + (rateLimitRetryPolicy?.attempts ?? 0) + Number(Boolean(deps.thinkingRecovery))
630
+ ));
558
631
 
559
632
  const requireSuccessfulHeaders = async (prepared: IterationResponse): Promise<void> => {
560
633
  if (!prepared.response.ok) {
@@ -629,6 +702,11 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
629
702
  if (forceAnswer && executedSearchCount > 0) iterMessages = [...messages, forcedAnswerNudge()];
630
703
  if (recoveringEmptyAnswer) iterMessages = [...iterMessages, forcedAnswerRetryNudge()];
631
704
  }
705
+ if (pendingContinuationMessages) {
706
+ iterMessages = [...iterMessages, ...pendingContinuationMessages];
707
+ messages.push(...pendingContinuationMessages);
708
+ pendingContinuationMessages = undefined;
709
+ }
632
710
  const iterParsed: OcxParsedRequest = {
633
711
  ...parsed, stream: true,
634
712
  options: recoveringEmptyAnswer
@@ -654,6 +732,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
654
732
  * header deadline. The caller owns same-target 429 replays and key rotation around it.
655
733
  */
656
734
  const fetchOnce = async (requestAdapter: ProviderAdapter, recovery?: AttemptRecoveryKind): Promise<IterationResponse> => {
735
+ errorUsage = undefined;
657
736
  let request: AdapterRequest;
658
737
  if (cachedRequest !== undefined && cachedAdapter === requestAdapter) {
659
738
  request = cachedRequest;
@@ -672,19 +751,39 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
672
751
  cachedRequest = request;
673
752
  cachedAdapter = requestAdapter;
674
753
  }
675
- const requestFetch = headerDeadline.pacedFetch(deps.fetchForRequest?.(request, iterParsed, requestAdapter, recovery) ?? routedProviderFetch);
676
754
  let response: Response;
755
+ let awaitingHeaders = true;
756
+ let physicalSends = 0;
757
+ let dispatchCandidate: { recovery?: AttemptRecoveryKind } | undefined;
758
+ const onPhysicalDispatch = () => {
759
+ if (!dispatchCandidate) return;
760
+ const send = dispatchCandidate;
761
+ dispatchCandidate = undefined;
762
+ // An adapter-owned stream retry's usage is already combined by its parser.
763
+ if (awaitingHeaders) pendingLegs++;
764
+ const receipt = { ...send, ordinal: ++physicalSends };
765
+ if (requestAdapter.fetchResponse) deps.incomingMeta.onPhysicalSend?.(receipt);
766
+ deps.onPhysicalSend?.(receipt);
767
+ };
768
+ const routedExecutor = deps.fetchForRequest?.(request, iterParsed, requestAdapter, recovery, onPhysicalDispatch);
769
+ const executor = routedExecutor ?? routedProviderFetch;
770
+ const noteDispatchCandidate = (recovery?: AttemptRecoveryKind) => {
771
+ dispatchCandidate = recovery ? { recovery } : {};
772
+ if (!routedExecutor?.reportsPhysicalDispatch) onPhysicalDispatch();
773
+ };
677
774
  try {
678
775
  if (requestAdapter.fetchResponse) {
679
- deps.onAttemptSend?.(recovery);
680
776
  response = await requestAdapter.fetchResponse(request, {
681
777
  abortSignal: headerDeadline.signal,
682
778
  timeoutMs: connectTimeoutMs,
683
779
  returnRawErrors: true,
684
780
  stream: true,
685
781
  sendBudget: deps.incomingMeta.sendBudget,
686
- onPhysicalSend: deps.incomingMeta.onPhysicalSend,
687
- executor: requestFetch,
782
+ onPhysicalSend: send => {
783
+ if (awaitingHeaders && send.ordinal === 1) deps.onAttemptSend?.(recovery);
784
+ noteDispatchCandidate(send.recovery ?? recovery);
785
+ },
786
+ executor: headerDeadline.pacedFetch(executor),
688
787
  onRecoveryWithheld: deps.incomingMeta.onRecoveryWithheld,
689
788
  });
690
789
  } else {
@@ -693,7 +792,11 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
693
792
  // Record every helper-driven send (the callback runs for the first attempt and
694
793
  // each connection-reset replay); preserve the caller's recovery kind
695
794
  // (rate-limit-429 / key-429) when the retry layer supplies none.
696
- deps.onAttemptSend?.(retryRecovery ?? recovery);
795
+ const requestFetch = headerDeadline.pacedFetch(executor, () => {
796
+ const attemptRecovery = retryRecovery ?? recovery;
797
+ deps.onAttemptSend?.(attemptRecovery);
798
+ noteDispatchCandidate(attemptRecovery);
799
+ });
697
800
  const h = new Headers(request.headers);
698
801
  if (!h.has("accept-encoding")) h.set("accept-encoding", "identity");
699
802
  // A connection-reset replay must leave the half-closed pooled socket, not just
@@ -713,22 +816,19 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
713
816
  );
714
817
  }
715
818
  } finally {
819
+ awaitingHeaders = false;
716
820
  request.releaseBodyObservation?.();
717
821
  }
718
822
  bindAnthropicRejectionResponse(request, response);
719
823
  const iterTools = iterParsed.context.tools ?? [];
720
- const toolAllowed = toolChoiceToolPredicate(iterParsed.options.toolChoice, iterTools);
721
- const clientAdvisorAllowed = iterTools.some(tool => !tool.advisor && !tool.namespace
722
- && tool.name === ADVISOR_TOOL_NAME && toolAllowed(tool));
723
824
  const declaredAdvisor = iterTools.find(tool => tool.advisor && tool.name === ADVISOR_TOOL_NAME);
724
825
  // Exhaustion removes the declaration, but its paired limit result still belongs
725
826
  // to the sidecar. A tools-disabled recovery revokes that permission too.
726
- const advisorCandidate = declaredAdvisor ?? { name: ADVISOR_TOOL_NAME };
727
827
  const syntheticAdvisorAllowed = !!deps.advisor && !recoveringEmptyAnswer
728
828
  && (!!declaredAdvisor || deps.advisor.exhausted())
729
- && toolChoiceToolPredicate(iterParsed.options.toolChoice,
730
- declaredAdvisor ? iterTools : [...iterTools, advisorCandidate])(advisorCandidate);
731
- return { response, responseAdapter: requestAdapter, clientAdvisorAllowed, syntheticAdvisorAllowed };
829
+ && advisorToolAllowed(iterParsed, declaredAdvisor);
830
+ return { parsed: iterParsed, response, responseAdapter: requestAdapter,
831
+ resolveAdvisorCall: createAdvisorCallResolver(iterParsed, syntheticAdvisorAllowed, parsed.context.tools) };
732
832
  };
733
833
 
734
834
  const recover = async (error: WebSearchAdapterEventError): Promise<IterationResponse | undefined> => {
@@ -745,8 +845,9 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
745
845
  return replacement;
746
846
  } catch (error) {
747
847
  if (signal.aborted) throw new LoopError(499, "client closed request during web-search");
748
- if (headerDeadline.didExpire()) throw new LoopError(504,
749
- `Provider response-header timeout after ${connectTimeoutMs}ms during web-search`);
848
+ if (headerDeadline.didExpire()) throw headerDeadlineError(connectTimeoutMs);
849
+ const refusal = unwrapUpstreamRetryEvidenceError(error);
850
+ if (refusal instanceof HostedAdvisorSpendRefusal) throw new LoopError(400, refusal.message, refusal.event());
750
851
  if (error instanceof LoopError || error instanceof SendBudgetExhaustedError || isTranslatorBudgetExceededError(error)) throw error;
751
852
  throw new LoopError(502, `Provider unreachable: ${error instanceof Error ? error.message : String(error)}`);
752
853
  } finally {
@@ -797,10 +898,15 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
797
898
  && (isAnthropicInstanceId(deps.incomingMeta?.providerName) || deps.incomingMeta?.providerName === "google-antigravity")
798
899
  && !accountRefusalOutputStarted)
799
900
  || (iterParsed._kiroAuthContext && (prepared.response.status === 400 || prepared.response.status === 403))) && deps.on429) {
901
+ const refusalUsage = mergePendingUsage(countersOnly(hiddenUsage), undefined);
800
902
  const rotated = await deps.on429(prepared.response.headers.get("retry-after"), prepared.response.headers,
801
- iterParsed, prepared.response);
903
+ iterParsed, prepared.response, refusalUsage);
802
904
  if (!rotated) break;
803
- if (hiddenUsage && deps.onRotatedUsage?.(hiddenUsage)) hiddenUsage = undefined;
905
+ takeUsage(undefined);
906
+ if (hiddenLegs > 0 && deps.onRotatedUsage?.(hiddenUsage)) {
907
+ hiddenUsage = undefined;
908
+ hiddenLegs = 0;
909
+ }
804
910
  const retainRefusal = prepared.response.status === 403
805
911
  && deps.incomingMeta?.providerName === "google-antigravity" && rotated.recoveryKind === "oauth-account-403";
806
912
  // Keep the bounded refusal readable until the sibling actually returns headers.
@@ -824,7 +930,19 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
824
930
  prepared = replacement;
825
931
  }
826
932
 
827
- if (await deps.thinkingRecovery?.prepareHttp(prepared.response, prepared.responseAdapter.name, iterParsed)) {
933
+ let imageReplacement: AdapterRequest | undefined;
934
+ if (deps.imageRecovery && prepared.response.status === 413) {
935
+ headerDeadline.clear();
936
+ const recovered = yield* withHeartbeats(deps.imageRecovery(prepared.response, iterParsed, prepared.responseAdapter, signal), signal);
937
+ prepared.response = recovered.response;
938
+ imageReplacement = recovered.request;
939
+ if (recovered.response.ok && imageReplacement) {
940
+ messages.splice(0, messages.length, ...iterParsed.context.messages);
941
+ parsed._anthropicImageOwner = iterParsed._anthropicImageOwner;
942
+ cachedRequest = imageReplacement;
943
+ }
944
+ }
945
+ if (!imageReplacement && await deps.thinkingRecovery?.prepareHttp(prepared.response, prepared.responseAdapter.name, iterParsed)) {
828
946
  try { void prepared.response.body?.cancel().catch(() => {}); } catch { /* closed */ }
829
947
  cachedRequest = undefined;
830
948
  cachedAdapter = undefined;
@@ -838,10 +956,10 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
838
956
  return { ...prepared, recover };
839
957
  } catch (error) {
840
958
  if (isTranslatorBudgetExceededError(error) || error instanceof SendBudgetExhaustedError) throw error;
841
- if (headerDeadline.didExpire()) {
842
- throw new LoopError(504, `Provider response-header timeout after ${connectTimeoutMs}ms during web-search`);
843
- }
959
+ if (headerDeadline.didExpire()) throw headerDeadlineError(connectTimeoutMs);
844
960
  if (signal.aborted) throw new LoopError(499, "client closed request during web-search");
961
+ const refusal = unwrapUpstreamRetryEvidenceError(error);
962
+ if (refusal instanceof HostedAdvisorSpendRefusal) throw new LoopError(400, refusal.message, refusal.event());
845
963
  if (error instanceof LoopError || error instanceof RequestPacingQueueOverloadError) throw error;
846
964
  throw new LoopError(502, `Provider unreachable: ${error instanceof Error ? error.message : String(error)}`);
847
965
  } finally {
@@ -887,7 +1005,10 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
887
1005
  translatorBudget,
888
1006
  preserveAdapterError: deps.thinkingRecovery !== undefined,
889
1007
  // A pass that fails was still billed; the error path reports it with the hidden passes.
890
- onErrorUsage: usage => { hiddenUsage = mergeUsage(hiddenUsage, usage); },
1008
+ onErrorUsage: usage => {
1009
+ errorUsage = usage;
1010
+ takeUsage(usage);
1011
+ },
891
1012
  })) {
892
1013
  if (event.type === "done") {
893
1014
  anthropicReplay = takeAnthropicReplay(event);
@@ -925,8 +1046,10 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
925
1046
  throw new LoopError(event.status ?? 502, event.message, event);
926
1047
  }
927
1048
  if (error instanceof LoopError) throw error;
928
- if (error instanceof RoutedModelInactivityError) throw new LoopError(504, error.message);
929
- if (error instanceof WebSearchConsumerInactivityError) throw new LoopError(504, error.message);
1049
+ if (error instanceof RoutedModelInactivityError) throw new LoopError(504, error.message, undefined, undefined,
1050
+ { code: "generation_timeout", value: error.timeoutMs });
1051
+ if (error instanceof WebSearchConsumerInactivityError) throw new LoopError(504, error.message, undefined, undefined,
1052
+ { code: "turn_inactivity", value: error.timeoutMs });
930
1053
  if (error instanceof WebSearchStreamProtocolError) throw new LoopError(502, error.message);
931
1054
  throw new LoopError(502, `Provider stream error: ${error instanceof Error ? error.message : String(error)}`);
932
1055
  } finally { releaseCapture(); }
@@ -945,7 +1068,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
945
1068
  throw new LoopError(502, terminal.message, terminal.code === "context_length_exceeded" ? terminal : undefined);
946
1069
  }
947
1070
  deps.thinkingRecovery?.observeIteration(events);
948
- return { ...scanEventsForWebSearch(events, { advisor: prepared.syntheticAdvisorAllowed, clientAdvisorAllowed: prepared.clientAdvisorAllowed }), streamedPassthroughCount, events, anthropicReplay };
1071
+ return { ...scanEventsForWebSearch(events, prepared.resolveAdvisorCall), streamedPassthroughCount, events, anthropicReplay };
949
1072
  };
950
1073
 
951
1074
  /**
@@ -1138,6 +1261,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1138
1261
  } catch (e) {
1139
1262
  if (abortSignal) abortSignal.removeEventListener("abort", linkAbort);
1140
1263
  if (e instanceof LoopError) {
1264
+ recordLocalLoopFailure(e);
1141
1265
  const failure = loopFailure(e);
1142
1266
  const failed = markSidecarContextOverflow(jsonError(e.status, e.message, e.event), failure);
1143
1267
  if (failure.verifiedPlanRefusal) markVerifiedModelNotInPlanResponse(failed);
@@ -1172,7 +1296,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1172
1296
  async function* produce(): AsyncGenerator<AdapterEvent> {
1173
1297
  let prepared = firstPrepared;
1174
1298
  try {
1175
- for (let i = 0; i < HARD_CAP + completionRetries; i++) {
1299
+ for (let i = 0; i < HARD_CAP + completionRetries + terminalContinuations; i++) {
1176
1300
  const forceAnswer = searchesExecuted >= maxSearches;
1177
1301
  try {
1178
1302
  // First loop turn reuses the eager HEADERS. Subsequent header acquisitions run here.
@@ -1205,10 +1329,31 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1205
1329
  && !split.passthrough.some(event => event.type === "error" || event.type === "incomplete")
1206
1330
  && !signal.aborted && !split.hasMalformedToolCall && !split.hasRealToolCall
1207
1331
  && split.streamedPassthroughCount === 0 && !hasVisibleAssistantText(split.passthrough)) {
1208
- hiddenUsage = mergeUsage(hiddenUsage, final.usage);
1332
+ takeUsage(final.usage);
1209
1333
  if (completionRetries++ === 0) { yield { type: "heartbeat" }; continue; }
1210
1334
  throw new LoopError(502, "Provider completed without usable output after one retry", emptyCompletionRetryFailedEvent());
1211
1335
  }
1336
+ // Use the existing action/plan classifier and keep all hosted tool results.
1337
+ const currentParsed = prepared.parsed;
1338
+ if (deps.terminalContinuationGuard && adapter.name === "openai-chat"
1339
+ && final?.type === "done" && !isTruncatedStopReason(final.stopReason)
1340
+ && !signal.aborted && !split.hasMalformedToolCall && split.calls.length === 0
1341
+ && analyzeTerminalTurn(currentParsed, split.passthrough).decision === "continue") {
1342
+ takeUsage(final.usage);
1343
+ if (terminalContinuations > 0) {
1344
+ throw new LoopError(502, "Provider announced work again without calling a tool", {
1345
+ type: "error", status: 502, code: "terminal_continuation_failed",
1346
+ message: "Provider announced work again without calling a tool", errorType: "server_error" });
1347
+ }
1348
+ terminalContinuations++;
1349
+ // Save only the continuation's additions. Iteration-only nudges are rebuilt for the re-ask.
1350
+ const continuation = buildContinuationRequest({
1351
+ ...currentParsed, context: { ...currentParsed.context, messages },
1352
+ }, split.passthrough);
1353
+ pendingContinuationMessages = continuation.context.messages.slice(messages.length);
1354
+ yield { type: "assistant_boundary" };
1355
+ continue;
1356
+ }
1212
1357
  // #1001: a forced-answer pass that ends `done` must have produced
1213
1358
  // usable output — never a malformed tool call, and never silence.
1214
1359
  if (forceAnswer) {
@@ -1219,7 +1364,7 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1219
1364
  && isTruncatedStopReason(terminalEvent.stopReason)) {
1220
1365
  // A provider refusal or truncation is authoritative, even without text.
1221
1366
  // Preserve it once; neither an empty-answer retry nor a generic 502 applies.
1222
- yield* replay(split.passthrough.slice(split.streamedPassthroughCount));
1367
+ yield* replay(withReaskSum(split.passthrough.slice(split.streamedPassthroughCount)));
1223
1368
  return;
1224
1369
  }
1225
1370
  if (terminalEvent?.type === "done"
@@ -1237,8 +1382,8 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1237
1382
  stopReason: terminalEvent.stopReason,
1238
1383
  eventTypes: [...new Set(split.passthrough.map(event => event.type))],
1239
1384
  }));
1240
- hiddenUsage = mergeUsage(hiddenUsage, terminalEvent.usage);
1241
- if (!split.hasMalformedToolCall && !split.hasRealToolCall && emptyAnswerRetries === 0) {
1385
+ takeUsage(terminalEvent.usage);
1386
+ if (!split.hasMalformedToolCall && !split.hasRealToolCall && emptyAnswerRetries < forcedAnswerRetries) {
1242
1387
  emptyAnswerRetries++;
1243
1388
  console.warn("[web-search-loop] empty forced answer — retrying once with tool calls disabled");
1244
1389
  yield { type: "heartbeat" };
@@ -1257,10 +1402,10 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1257
1402
  }
1258
1403
  // Live-streamed leading events are exactly the first N passthrough entries — replay
1259
1404
  // only the buffered tail so nothing reaches the client twice.
1260
- yield* replay(split.passthrough.slice(split.streamedPassthroughCount));
1405
+ yield* replay(withReaskSum(split.passthrough.slice(split.streamedPassthroughCount)));
1261
1406
  return;
1262
1407
  }
1263
- hiddenUsage = mergeUsage(hiddenUsage, terminalUsage(split.passthrough));
1408
+ takeUsage(terminalUsage(split.passthrough));
1264
1409
  if (split.calls.some(call => call.kind === "advisor")) {
1265
1410
  const continuationError = deps.advisor!.beginLeg();
1266
1411
  if (continuationError) {
@@ -1310,27 +1455,34 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1310
1455
  }
1311
1456
  if (split.calls.some(call => call.kind === "advisor")) yield { type: "assistant_boundary" };
1312
1457
  } catch (e) {
1313
- // The bridge reports no usage for either error; the iterations already sent still count.
1314
- if (hiddenUsage) deps.onUsage?.(hiddenUsage);
1315
- if (isTranslatorBudgetExceededError(e)) {
1316
- yield {
1458
+ recordLocalLoopFailure(e);
1459
+ takeUsage(e instanceof LoopError ? e.event?.usage : undefined);
1460
+ const event: AdapterEvent = isTranslatorBudgetExceededError(e)
1461
+ ? {
1317
1462
  type: "error",
1318
1463
  status: 502,
1319
1464
  errorType: "upstream_error",
1320
1465
  code: e.code,
1321
1466
  message: "upstream translation buffer exceeded the safe limit",
1322
- };
1323
- } else {
1324
- if (e instanceof SendBudgetExhaustedError) yield { type: "error", status: 429,
1325
- errorType: "rate_limit_error", code: e.code, message: e.message, retryable: false };
1467
+ }
1468
+ : e instanceof SendBudgetExhaustedError
1469
+ ? { type: "error", status: 429, errorType: "rate_limit_error", code: e.code, message: e.message, retryable: false }
1326
1470
  // A later iteration's overflow ends the turn as the main path's terminal
1327
1471
  // context_length_exceeded, so Codex compacts instead of resending (#7316).
1328
- else yield (e instanceof LoopError ? sidecarLoopTerminalEvent(loopFailure(e)) : undefined)
1472
+ : (e instanceof LoopError ? sidecarLoopTerminalEvent(loopFailure(e)) : undefined)
1329
1473
  ?? (e instanceof LoopError && e.event ? e.event
1330
1474
  : e instanceof LoopError && deps.thinkingRecovery
1331
1475
  ? { type: "error", status: e.status, errorType: "upstream_error", message: e.message }
1332
1476
  : { type: "error", message: e instanceof Error ? e.message : String(e) });
1477
+ // The bridge reports an error only if it carries usage. Settle exactly once: after a
1478
+ // terminal re-ask the failed terminal itself carries the sum (#8877), and the bridge
1479
+ // reports it; otherwise the hidden legs are reported here.
1480
+ if (!event.usage && hiddenUsage && terminalContinuations > 0 && event.type === "error") {
1481
+ yield { ...event, usage: withTerminalUsageMetadata(hiddenUsage, errorUsage) };
1482
+ return;
1333
1483
  }
1484
+ if (!event.usage && hiddenUsage) deps.onUsage?.(withTerminalUsageMetadata(hiddenUsage, errorUsage));
1485
+ yield event;
1334
1486
  return;
1335
1487
  }
1336
1488
  }
@@ -1361,9 +1513,19 @@ export async function runWithWebSearch(deps: WebSearchLoopDeps): Promise<Respons
1361
1513
  hideThinkingSummary: parsed.options.hideThinkingSummary,
1362
1514
  chatRawReasoningVisible: deps.chatRawReasoningVisible,
1363
1515
  hideRawReasoning: parsed.options.hideRawReasoning,
1516
+ rawReasoningAsSummary: parsed.options.rawReasoningAsSummary,
1364
1517
  ...(deps.stallTimeoutSec !== undefined ? { stallTimeoutSec: deps.stallTimeoutSec } : {}),
1365
1518
  ...(deps.onFirstOutput ? { onFirstOutput: deps.onFirstOutput } : {}),
1366
- ...(deps.onUsage ? { onUsage: (usage: OcxUsage | undefined) => deps.onUsage?.(mergeUsage(countersOnly(hiddenUsage), usage)) } : {}),
1519
+ ...(deps.onUsage ? {
1520
+ onUsage: (usage: OcxUsage | undefined) => {
1521
+ if (pendingLegs > 0) {
1522
+ deps.onUsage?.(mergePendingUsage(countersOnly(hiddenUsage), usage));
1523
+ return;
1524
+ }
1525
+ // The error path already settled this leg's counters; retain only its terminal metadata.
1526
+ deps.onUsage?.(hiddenUsage ? withTerminalUsageMetadata(hiddenUsage, usage) : usage);
1527
+ },
1528
+ } : {}),
1367
1529
  ...(deps.onCompletedResponse ? { onCompletedResponse: deps.onCompletedResponse } : {}),
1368
1530
  },
1369
1531
  );