@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1

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-D5qUBOoF.js +60 -0
  5. package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
  6. package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
  7. package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
  8. package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
  10. package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
  11. package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
  12. package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
  13. package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
  14. package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.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,23 +1,23 @@
1
+ import { credentialRecoveryStatus } from "../request-log-attempt-recovery";
2
+ import { sealCredentialRefusal } from "../credential-recovery-attempt";
1
3
  import { carryProxyError, proxyErrorPresentation, isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
2
4
  import { providerAffinityGenerationIsCurrent } from "../../providers/api-key-selection";
3
5
  import { bindAnthropicRejectionResponse } from "../../adapters/anthropic-rejection-memo";
6
+ import { hostedAdvisorCredentials } from "../../adapters/anthropic/advisor-tool";
4
7
  import { deferPhysicalSendReporter } from "./deferred-send-reporter";
5
8
  import { responsesSpendTarget } from "./request-spend-target";
6
- import { rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
7
- import type { ResponsesRequestContext } from "./core-options";
9
+ import { adapterResponseSpendObserver, bindAdapterResponseSpend } from "./request-spend";
10
+ import { anthropicRefusalCredentialChanged, rotateAnthropicAccountOnResponseForInstance } from "../../oauth/anthropic-account-refusal";
11
+ import { responsesTimeoutProvider, type ResponsesRequestContext } from "./core-options";
8
12
  import type { PreparedResponsesRequest } from "./request-prepare";
9
13
  import type { ResponsesTransport } from "./request-transport";
10
14
  import type { ResponsesSidecarAuth } from "./request-sidecar-auth";
11
15
  import type { ResponsesSendBudget } from "./request-send-budget";
12
16
  import type { AdapterExchange } from "./adapter-dispatch";
13
- import type { OcxParsedRequest, AdapterEvent } from "../../types";
17
+ import type { OcxParsedRequest, AdapterEvent, OcxUsage } from "../../types";
14
18
  import type { AttemptRecoveryKind } from "../../usage/log";
15
19
  import type { AdapterRequest } from "../../adapters/base";
16
20
  import {
17
- recordAdapterReasoning,
18
- recordAdapterTier,
19
- sealRequestAttemptIdentity,
20
- recordAttemptCredentialSource,
21
21
  } from "../request-log";
22
22
  import { noteAttemptRecoveryWithheld } from "../request-log";
23
23
  import { withProviderRequestSlot } from "../../providers/request-pacing";
@@ -39,6 +39,7 @@ import {
39
39
  } from "../../lib/upstream-retry";
40
40
  import { unwrapUpstreamRetryEvidenceError } from "../../codex/auth-context";
41
41
  import { AdmissionModelDeniedError, MODEL_NOT_ALLOWED_FOR_KEY } from "../admission-model-scope";
42
+ import { HostedAdvisorSpendRefusal } from "./policy-request-scope";
42
43
  import { redactSecretString } from "../../lib/redact";
43
44
  import { resolveWireProtocolOverride } from "../adapter-resolve";
44
45
  import { bindRouteReasoningReplayScope } from "./core-replay";
@@ -66,7 +67,7 @@ import {
66
67
  readResponseStreamWithInactivity,
67
68
  ResponseBodyInactivityError,
68
69
  } from "../../lib/response-body-inactivity";
69
- import { resolveStallTimeoutMs } from "../../stall-timeout";
70
+ import { providerStallTimeoutSec, resolveStallTimeoutMs } from "../../stall-timeout";
70
71
  import { guardTerminalEventStream } from "./terminal-guard";
71
72
 
72
73
  /** One responsibility of the Responses request pipeline; state owners are explicit. */
@@ -104,7 +105,7 @@ export function createAdapterContinuations(
104
105
  | "genericFailoverLimit" | "anthropicFailoverLimit"
105
106
  | "applyFailoverSnapshot"
106
107
  | "replayOAuthCredentialSnapshot"
107
- | "noteRoutedAttemptSend"
108
+ | "commitAdapterAttemptSend" | "createCredentialReplayAttempt" | "isCurrentInferenceResponse"
108
109
  >,
109
110
  sidecarState: Pick<ResponsesSidecarAuth, "routedCompaction">,
110
111
  sendBudgetState: Pick<
@@ -161,6 +162,7 @@ export function createAdapterContinuations(
161
162
  return { type: "error", message: "client closed request during terminal continuation", status: 499 };
162
163
  }
163
164
  const refusal = unwrapUpstreamRetryEvidenceError(error);
165
+ if (refusal instanceof HostedAdvisorSpendRefusal) return refusal.event();
164
166
  if (refusal instanceof AdmissionModelDeniedError || refusal instanceof SendBudgetExhaustedError) rememberProxyErrorMessage(logCtx, refusal.message, { status: refusal instanceof AdmissionModelDeniedError ? 403 : 429,
165
167
  type: refusal instanceof AdmissionModelDeniedError ? MODEL_NOT_ALLOWED_FOR_KEY : "rate_limit_error", code: refusal instanceof AdmissionModelDeniedError ? MODEL_NOT_ALLOWED_FOR_KEY : refusal.code, presentation: refusal instanceof AdmissionModelDeniedError ? "scope" : "send" });
166
168
  if (refusal instanceof AdmissionModelDeniedError) {
@@ -220,6 +222,8 @@ export function createAdapterContinuations(
220
222
  * replays).
221
223
  */
222
224
  const fetchContinuation = async (recoveryKind?: AttemptRecoveryKind): Promise<Response> => {
225
+ const replay = recoveryKind && credentialRecoveryStatus(recoveryKind) !== undefined && response && logCtx.activeAttempt?.sendCount
226
+ ? transportState.createCredentialReplayAttempt(response.status, recoveryKind) : undefined;
223
227
  let continuationRequest: AdapterRequest | undefined;
224
228
  if (transportState.sameTargetRequest !== undefined && transportState.sameTargetParsed === nextParsed && transportState.sameTargetToken === transportState.transportToken) {
225
229
  // Same target (key/adapter/parsed/tier unchanged): replay the exact cached request.
@@ -233,8 +237,6 @@ export function createAdapterContinuations(
233
237
  abortSignal: upstream.signal,
234
238
  ...(transportState.imageTierBias > 0 ? { imageTierBias: transportState.imageTierBias } : {}),
235
239
  });
236
- recordAdapterReasoning(logCtx, continuationRequest);
237
- recordAdapterTier(logCtx, continuationRequest);
238
240
  } catch (err) {
239
241
  // The main body is already streaming, so there is no HTTP error surface: release
240
242
  // any partial body observation and surface the failure as an in-stream error via
@@ -253,12 +255,19 @@ export function createAdapterContinuations(
253
255
  const continuationEstimate = typeof builtContinuationRequest.usageLog?.inputTokens === "number"
254
256
  ? builtContinuationRequest.usageLog.inputTokens
255
257
  : undefined;
256
- if (continuationEstimate !== undefined) logCtx.usageLogInputTokens = continuationEstimate;
257
- // Optional recovery label for same-target / failover continuation sends.
258
- const replayKind: AttemptRecoveryKind | undefined = recoveryKind;
258
+ const commit = (physicalRecovery?: AttemptRecoveryKind): void => {
259
+ const adapter = transportState.activeAdapter.name;
260
+ if (replay) replay(builtContinuationRequest, adapter, physicalRecovery);
261
+ else transportState.commitAdapterAttemptSend(builtContinuationRequest, adapter, physicalRecovery ?? recoveryKind);
262
+ };
259
263
  try {
260
264
  if (transportState.activeAdapter.fetchResponse) {
261
- transportState.noteRoutedAttemptSend(continuationEstimate, replayKind);
265
+ let published = false;
266
+ const publish = (): void => {
267
+ if (published) return;
268
+ commit();
269
+ published = true;
270
+ };
262
271
  const producer = adapterDispatchBudget?.beginSpendProducer?.();
263
272
  try {
264
273
  return await withProviderRequestSlot(route.providerName, route.provider, nextParsed.modelId, upstream.signal, pacingSlot =>
@@ -267,13 +276,17 @@ export function createAdapterContinuations(
267
276
  abortSignal: upstream.signal,
268
277
  timeoutMs: route.provider.authMode === "forward" ? connectMs : 0,
269
278
  sendBudget: adapterDispatchBudget,
270
- onPhysicalSend: send => noteAdapterPhysicalSend(continuationEstimate, send),
279
+ onPhysicalSend: send => {
280
+ if (transportState.activeAdapter.reportsPhysicalSends) publish();
281
+ noteAdapterPhysicalSend(continuationEstimate, send);
282
+ },
271
283
  onRecoveryWithheld: noteAdapterRecoveryWithheld,
272
284
  stream: nextParsed.stream,
273
285
  executor: providerFetch(route.provider, options.codexWsRuntimeIdentity, {
274
286
  pacingSlotAcquired: true,
275
287
  pacingSlot,
276
- dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed),
288
+ dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed, "adapter", true),
289
+ onPhysicalDispatch: publish,
277
290
  providerName: route.providerName,
278
291
  modelId: nextParsed.modelId,
279
292
  }),
@@ -287,13 +300,14 @@ export function createAdapterContinuations(
287
300
  ? fetchWithTransientRetry
288
301
  : fetchWithResetRetry;
289
302
  const continuationReporter = transientSendReporter();
290
- const deferredContinuation = (continuationTransientPolicy || sendBudgetState.adapterSendBudget?.spendEnforced)
291
- && route.providerName === "github-copilot" && route.provider.authMode !== "forward"
303
+ const countsContinuationSends = continuationTransientPolicy || anthropicInstance || sendBudgetState.adapterSendBudget?.spendEnforced;
304
+ const deferredContinuation = countsContinuationSends && (hostedAdvisorCredentials.has(builtContinuationRequest)
305
+ || ((continuationTransientPolicy || sendBudgetState.adapterSendBudget?.spendEnforced)
306
+ && route.providerName === "github-copilot" && route.provider.authMode !== "forward"))
292
307
  ? deferPhysicalSendReporter(continuationReporter) : undefined;
293
- return await fetchContinuationWithRetryPolicy(
308
+ const continuationResponse = await fetchContinuationWithRetryPolicy(
294
309
  recovery => {
295
310
  sendBudgetState.adapterSendBudget?.startRequest?.(responsesSpendTarget(logCtx, route.providerName));
296
- transportState.noteRoutedAttemptSend(continuationEstimate, recovery ?? replayKind);
297
311
  return fetchWithHeaderTimeout(
298
312
  builtContinuationRequest.url,
299
313
  applyUpstreamRecoveryInit({
@@ -305,10 +319,11 @@ export function createAdapterContinuations(
305
319
  route.provider.authMode === "forward" ? connectMs : 0,
306
320
  nextParsed.stream,
307
321
  providerFetch(route.provider, options.codexWsRuntimeIdentity, {
308
- dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed),
309
- onPhysicalDispatch: deferredContinuation ? () => {
310
- if (!deferredContinuation.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtContinuationRequest.url));
311
- } : undefined,
322
+ dispatchOverride: oauthDispatch(builtContinuationRequest, nextParsed, "adapter", true),
323
+ onPhysicalDispatch: () => {
324
+ if (deferredContinuation && !deferredContinuation.beforeDispatch()) throw new SendBudgetExhaustedError(errorDestinationLabel(builtContinuationRequest.url));
325
+ commit(recovery);
326
+ },
312
327
  providerName: route.providerName,
313
328
  modelId: nextParsed.modelId,
314
329
  }),
@@ -320,7 +335,7 @@ export function createAdapterContinuations(
320
335
  // Same request-scoped budget as the initial send and the 429/rotation refetches:
321
336
  // a terminal-guard continuation is another leg of ONE request, so handing it a
322
337
  // fresh `attempts` would let one request exceed the configured total-send ceiling.
323
- ...(continuationTransientPolicy || anthropicInstance || sendBudgetState.adapterSendBudget?.spendEnforced
338
+ ...(countsContinuationSends
324
339
  ? {
325
340
  attempts: Math.min(continuationTransientPolicy?.attempts ?? 1,
326
341
  remainingTransientSendBudget(continuationTransientPolicy?.attempts ?? 1)
@@ -329,7 +344,11 @@ export function createAdapterContinuations(
329
344
  }
330
345
  : {}),
331
346
  },
332
- );
347
+ );
348
+ if (nextParsed._anthropicImageOwner && sendBudgetState.adapterSendBudget?.spendEnforced) {
349
+ bindAdapterResponseSpend(continuationResponse, continuationReporter.recordUsage);
350
+ }
351
+ return continuationResponse;
333
352
  } finally {
334
353
  builtContinuationRequest.releaseBodyObservation?.();
335
354
  }
@@ -383,6 +402,7 @@ export function createAdapterContinuations(
383
402
  // loop; only after the attempts are exhausted does the continuation fail over.
384
403
  while (
385
404
  response.status === 429
405
+ && transportState.isCurrentInferenceResponse(response)
386
406
  && !replaySetupFailed
387
407
  // A synthesized replay refusal is not a rate limit; replaying the continuation on
388
408
  // it would re-send a turn whose first send may already have been processed.
@@ -429,6 +449,7 @@ export function createAdapterContinuations(
429
449
  }
430
450
  }
431
451
 
452
+ if (response.status === 429 && !transportState.isCurrentInferenceResponse(response)) break;
432
453
  if (response.status === 429 && !isNonReplayableResponse(response) && hasKeyPoolFailover(route.provider)) {
433
454
  const rotated = rotateProviderTransportOn429(config, route.providerName, route.provider, {
434
455
  retryAfter: response.headers.get("retry-after"),
@@ -437,6 +458,7 @@ export function createAdapterContinuations(
437
458
  promptCacheKey: nextParsed.options.promptCacheKey,
438
459
  });
439
460
  if (rotated) {
461
+ sealCredentialRefusal(logCtx, response.status, "key-429");
440
462
  try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
441
463
  route.provider = rotated;
442
464
  try { await transportState.resolveCopilotSelection(nextParsed); }
@@ -487,9 +509,13 @@ export function createAdapterContinuations(
487
509
  if (!nextAccountId) hop.permit?.release();
488
510
  if (nextAccountId) {
489
511
  captureRefusalAttribution();
512
+ const recovery = response.status === 401 ? "oauth-401"
513
+ : response.status === 403 ? "oauth-account-403" : "anthropic-oauth-429";
490
514
  try {
491
515
  const admitted = await commitResolvedOAuthSelection(await anthropicRoutingFor(anthropicInstance).getAnthropicPoolAccessSnapshot(nextAccountId));
492
516
  if (!admitted) throw new Error("OAuth selection changed during recovery");
517
+ const changed = anthropicRefusalCredentialChanged(response, admitted);
518
+ if (changed) sealCredentialRefusal(logCtx, response.status, recovery);
493
519
  transportState.anthropicPoolAccountId = admitted.accountId;
494
520
  transportState.anthropicPoolFailovers += 1;
495
521
  route.provider = { ...route.provider, apiKey: admitted.accessToken };
@@ -509,10 +535,8 @@ export function createAdapterContinuations(
509
535
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
510
536
  });
511
537
  }
512
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
513
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
514
- nextContinuationRecoveryKind = response.status === 401 ? "oauth-401"
515
- : response.status === 403 ? "oauth-account-403" : "anthropic-oauth-429";
538
+
539
+ nextContinuationRecoveryKind = changed ? recovery : "rate-limit-429";
516
540
  sendBudgetState.pendingHopPermit = hop.permit;
517
541
  refusalPendingReplay = response;
518
542
  continue;
@@ -577,6 +601,7 @@ export function createAdapterContinuations(
577
601
  )) noteAttemptRecoveryWithheld(logCtx.activeAttempt, "rotation-send-budget");
578
602
  if (!nextAccountId) hop.permit?.release();
579
603
  if (nextAccountId) {
604
+ sealCredentialRefusal(logCtx, response.status, "oauth-account-429");
580
605
  try {
581
606
  // The FULL snapshot through the shared helper, never a bare bearer: Antigravity
582
607
  // pairs an account-matched projectId with its token and Kiro carries routing
@@ -609,8 +634,7 @@ export function createAdapterContinuations(
609
634
  adapterName: transportState.activeAdapter.name,
610
635
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
611
636
  });
612
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
613
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
637
+
614
638
  // The replay goes out on the next iteration. An adapter that owns its ladder
615
639
  // reserves for that send itself, so hand this reservation down rather than let it
616
640
  // take a second one for the same replay. A helper-routed replay carries the
@@ -668,6 +692,7 @@ export function createAdapterContinuations(
668
692
  )) noteAttemptRecoveryWithheld(logCtx.activeAttempt, "rotation-send-budget");
669
693
  if (!nextAccountId) hop.permit?.release();
670
694
  if (nextAccountId) {
695
+ sealCredentialRefusal(logCtx, response.status, "oauth-account-429");
671
696
  try { void response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
672
697
  try {
673
698
  // The FULL snapshot through the shared helper, never a bare bearer: Antigravity
@@ -700,8 +725,7 @@ export function createAdapterContinuations(
700
725
  adapterName: transportState.activeAdapter.name,
701
726
  oauthCredentialSnapshot: transportState.replayOAuthCredentialSnapshot,
702
727
  });
703
- sealRequestAttemptIdentity(logCtx.activeAttempt, logCtx.provider, transportState.activeAdapter.name, logCtx.accountLogLabel);
704
- recordAttemptCredentialSource(logCtx.activeAttempt, route.providerName, route.provider, transportState.activeAdapter.name);
728
+
705
729
  // The replay goes out on the next iteration. An adapter that owns its ladder
706
730
  // reserves for that send itself, so hand this reservation down rather than let it
707
731
  // take a second one for the same replay. A helper-routed replay carries the
@@ -770,18 +794,25 @@ export function createAdapterContinuations(
770
794
  // The shared signal is not aborted on timeout: this generator must still emit
771
795
  // the error that the already-live Responses bridge turns into a terminal.
772
796
  const parse = async function* (current: Response): AsyncGenerator<AdapterEvent> {
773
- const bodyInactivityMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl) });
797
+ const bodyInactivityMs = resolveStallTimeoutMs(providerStallTimeoutSec(config, responsesTimeoutProvider(options, route.provider)), { localUpstream: isLocalUpstream(transportState.sameTargetRequest?.url ?? route.provider.baseUrl) });
774
798
  if (!current.ok) {
775
799
  yield await adapterExchange.thinkingSignatureRecovery.projectHttpFailure(current, upstream.signal);
776
- } else if (nextParsed.stream) {
777
- yield* readResponseStreamWithInactivity(current, upstream.signal, bodyInactivityMs,
778
- guarded => transportState.activeAdapter.parseStream(guarded, translatorBudget, logCtx.activeTierMetadata));
779
- } else if (transportState.activeAdapter.parseResponse) {
780
- yield* await readResponseBodyWithInactivity(current, upstream.signal, bodyInactivityMs,
781
- guarded => transportState.activeAdapter.parseResponse!(guarded, translatorBudget, logCtx.activeTierMetadata));
782
- } else {
800
+ return;
801
+ }
802
+ if (!nextParsed.stream && !transportState.activeAdapter.parseResponse) {
783
803
  try { void current.body?.cancel().catch(() => {}); } catch { /* closed */ }
784
804
  yield { type: "error", message: "Provider continuation does not support response parsing" };
805
+ return;
806
+ }
807
+ const observeSpend = adapterResponseSpendObserver(current);
808
+ const events = nextParsed.stream
809
+ ? readResponseStreamWithInactivity(current, upstream.signal, bodyInactivityMs,
810
+ guarded => transportState.activeAdapter.parseStream(guarded, translatorBudget, logCtx.activeTierMetadata))
811
+ : await readResponseBodyWithInactivity(current, upstream.signal, bodyInactivityMs,
812
+ guarded => transportState.activeAdapter.parseResponse!(guarded, translatorBudget, logCtx.activeTierMetadata));
813
+ for await (const event of events) {
814
+ observeSpend?.(event);
815
+ yield event;
785
816
  }
786
817
  };
787
818
  yield* adapterExchange.thinkingSignatureRecovery.wrap(parse(response), async function* () {
@@ -806,7 +837,8 @@ export function createAdapterContinuations(
806
837
  }
807
838
  };
808
839
 
809
- const fetchGuardedEmptyCompletionRetry = (): AsyncIterable<AdapterEvent> => {
840
+ // The delivery's onHiddenUsage, so a re-ask inside the retry keeps its legs off the client terminal (#8877).
841
+ const fetchGuardedEmptyCompletionRetry = (onHiddenUsage?: (usage: OcxUsage) => void): AsyncIterable<AdapterEvent> => {
810
842
  const retryEvents = fetchTerminalGuardContinuation(parsed, "empty-completion", true);
811
843
  const terminalGuardedRetry = terminalGuardEnabled
812
844
  ? guardTerminalEventStream({
@@ -815,6 +847,7 @@ export function createAdapterContinuations(
815
847
  adapterName: transportState.activeAdapter.name,
816
848
  maxAutoContinuations: 1,
817
849
  continuation: next => fetchTerminalGuardContinuation(next, undefined, !parsed.stream),
850
+ onHiddenUsage,
818
851
  })
819
852
  : retryEvents;
820
853
  return parsed._advisorGuard
@@ -1,5 +1,5 @@
1
1
  import { proxyErrorPresentation, isProxyError, rememberProxyErrorMessage } from "../../lib/client-error-body";
2
- import type { ResponsesRequestContext } from "./core-options";
2
+ import { responsesTimeoutProvider, type ResponsesRequestContext } from "./core-options";
3
3
  import type { PreparedResponsesRequest } from "./request-prepare";
4
4
  import type { ResponsesTransport } from "./request-transport";
5
5
  import type { ResponsesSidecarAuth } from "./request-sidecar-auth";
@@ -8,9 +8,10 @@ import type { ResponsesCompletionPolicy } from "./completion-policy";
8
8
  import type { AdapterExchange } from "./adapter-dispatch";
9
9
  import type { AdapterContinuations } from "./adapter-continuation";
10
10
  import { guardTerminalEventStream } from "./terminal-guard";
11
- import { guardEmptyCompletionEventStream } from "./empty-completion-guard";
11
+ import { guardEmptyCompletionEventStream, mergeUsage } from "./empty-completion-guard";
12
+ import { UNDECLARED_TOOL_CALL_ERROR_CODE } from "../../lib/errors";
12
13
  import { bridgeToResponsesSSE, buildResponseJSON, formatErrorResponse } from "../../bridge";
13
- import type { OcxProviderContinuationState, AdapterEvent } from "../../types";
14
+ import type { OcxProviderContinuationState, AdapterEvent, OcxUsage } from "../../types";
14
15
  import { rememberResponseState } from "../../responses/state";
15
16
  import { trackStreamLifetime } from "../lifecycle";
16
17
  import { awaitThoughtSignatureDurability } from "../../responses/thought-signature-replay";
@@ -20,7 +21,7 @@ import {
20
21
  readResponseStreamWithInactivity,
21
22
  ResponseBodyInactivityError,
22
23
  } from "../../lib/response-body-inactivity";
23
- import { resolveStallTimeoutMs } from "../../stall-timeout";
24
+ import { providerStallTimeoutSec, resolveStallTimeoutMs } from "../../stall-timeout";
24
25
  import { clientEncoderForDelivery, deliverClientEncodedResponse } from "../inference/client-encoder-delivery";
25
26
  import { noteKiroServedSuccess } from "../../providers/kiro-usage";
26
27
  import { persistKiroAccountState } from "../../providers/kiro-account-state-disk";
@@ -31,6 +32,7 @@ import { isCanonicalOpenAiForwardProvider } from "../../providers/openai-tiers";
31
32
  import { currentTurnToolBridgeMaps, guardEmptyToolCatalogEvents, guardEmptyToolCatalogStream } from "../../lib/empty-tool-catalog";
32
33
  import { guardCompactionSummary } from "../../responses/compaction-summary";
33
34
  import { settleAnthropicPerMessageEffort } from "../../adapters/anthropic/per-message-effort";
35
+ import { adapterResponseSpendObserver } from "./request-spend";
34
36
 
35
37
  /** One responsibility of the Responses request pipeline; state owners are explicit. */
36
38
  export async function deliverAdapterResponse(
@@ -47,7 +49,7 @@ export async function deliverAdapterResponse(
47
49
  | "turnMembership"
48
50
  | "completedToolBlocks"
49
51
  >,
50
- transportState: Pick<ResponsesTransport, "activeAdapter" | "bindKeyUsageFromBridge" | "sentOAuthSnapshot">,
52
+ transportState: Pick<ResponsesTransport, "activeAdapter" | "bindKeyUsageFromBridge" | "sentOAuthSnapshot" | "trackGuardedOAuthAttemptUsage">,
51
53
  sidecarState: Pick<ResponsesSidecarAuth, "routedCompaction">,
52
54
  responseEffects: Pick<
53
55
  ResponsesEffects,
@@ -76,6 +78,8 @@ export async function deliverAdapterResponse(
76
78
  fetchGuardedEmptyCompletionRetry,
77
79
  isContinuationBodyStall,
78
80
  } = continuationState;
81
+ const preserveEmptyCompletionRetryError = (event: AdapterEvent) =>
82
+ (event.type === "error" && event.code === UNDECLARED_TOOL_CALL_ERROR_CODE) || isContinuationBodyStall(event);
79
83
  const { emptyCompletionGuardEnabled } = completionPolicy;
80
84
  const {
81
85
  cancelResponseCompletion,
@@ -84,8 +88,10 @@ export async function deliverAdapterResponse(
84
88
  notifyResponseComplete,
85
89
  } = responseEffects;
86
90
  const { routedCompaction } = sidecarState;
87
- const bodyInactivityMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream });
91
+ const stallTimeoutSec = () => providerStallTimeoutSec(config, responsesTimeoutProvider(options, route.provider));
92
+ const bodyInactivityMs = resolveStallTimeoutMs(stallTimeoutSec(), { localUpstream });
88
93
  const upstreamRequestsStream = parsed.stream || isCanonicalOpenAiForwardProvider(route.provider);
94
+ const observeInitialSpend = adapterResponseSpendObserver(upstreamResponse);
89
95
  const recoverThinkingSignature = (events: AsyncIterable<AdapterEvent>): AsyncIterable<AdapterEvent> =>
90
96
  thinkingSignatureRecovery.wrap(events, async function* () {
91
97
  const result = await refetchThinkingSignature();
@@ -106,7 +112,8 @@ export async function deliverAdapterResponse(
106
112
  return;
107
113
  }
108
114
  try {
109
- const bodyInactivityMs = resolveStallTimeoutMs(config.stallTimeoutSec, { localUpstream: adapterExchange.localUpstream });
115
+ const observeRetrySpend = adapterResponseSpendObserver(response);
116
+ const bodyInactivityMs = resolveStallTimeoutMs(stallTimeoutSec(), { localUpstream: adapterExchange.localUpstream });
110
117
  const retryEvents = upstreamRequestsStream
111
118
  ? readResponseStreamWithInactivity(response, upstream.signal, bodyInactivityMs,
112
119
  guarded => transportState.activeAdapter.parseStream(guarded, translatorBudget, logCtx.activeTierMetadata))
@@ -115,6 +122,7 @@ export async function deliverAdapterResponse(
115
122
  guarded => transportState.activeAdapter.parseResponse!(guarded, translatorBudget, logCtx.activeTierMetadata));
116
123
  })();
117
124
  for await (const event of retryEvents) {
125
+ observeRetrySpend?.(event);
118
126
  options.onCompactionRecoveryAdapterEvent?.(event);
119
127
  yield event;
120
128
  }
@@ -128,6 +136,19 @@ export async function deliverAdapterResponse(
128
136
  const clientToolCatalog = requestState.clientToolCatalogRestriction && route.provider.authMode !== "forward"
129
137
  ? requestState.clientToolCatalogRestriction : undefined;
130
138
  const deliveryToolBridgeMaps = currentTurnToolBridgeMaps(toolBridgeMaps, clientToolCatalog);
139
+ if (terminalGuardEnabled) transportState.trackGuardedOAuthAttemptUsage();
140
+ // Legs the terminal guard re-asked: the client terminal carries only the final leg's usage
141
+ // (clients size their context window from it, #8877), while the request log meters every leg
142
+ // that was sent. Hidden legs add counters only: their context checkpoint and raw wire usage
143
+ // are not the final terminal's (same split as the web-search loop).
144
+ let terminalGuardHiddenUsage: OcxUsage | undefined;
145
+ const onHiddenUsage = ({ contextTotalTokens: _context, rawUsage: _raw, ...counters }: OcxUsage): void => {
146
+ terminalGuardHiddenUsage = mergeUsage(terminalGuardHiddenUsage, counters);
147
+ };
148
+ const bindDeliveredUsage = (usage: OcxUsage | undefined): void => {
149
+ // A re-asked leg was dispatched, so a delivered leg without a credit reading leaves the credits incomplete (#8452).
150
+ transportState.bindKeyUsageFromBridge(mergeUsage(terminalGuardHiddenUsage, usage, terminalGuardHiddenUsage !== undefined));
151
+ };
131
152
 
132
153
 
133
154
  if (parsed.stream) {
@@ -150,6 +171,7 @@ export async function deliverAdapterResponse(
150
171
  bodyInactivityMs,
151
172
  response => transportState.activeAdapter.parseStream(response, translatorBudget, logCtx.activeTierMetadata, { completedToolBlocks: outputItemIds !== undefined }),
152
173
  )) {
174
+ observeInitialSpend?.(event);
153
175
  options.onCompactionRecoveryAdapterEvent?.(event);
154
176
  yield event;
155
177
  }
@@ -175,6 +197,7 @@ export async function deliverAdapterResponse(
175
197
  adapterName: transportState.activeAdapter.name,
176
198
  maxAutoContinuations: 1,
177
199
  continuation: next => fetchTerminalGuardContinuation(next, undefined, !parsed.stream),
200
+ onHiddenUsage,
178
201
  })
179
202
  : recoveredEvents;
180
203
  // Optional advisor guard (registered per request by the sidecar planner; absent unless the
@@ -197,8 +220,8 @@ export async function deliverAdapterResponse(
197
220
  const completionGuardedEventStream = emptyCompletionGuardEnabled
198
221
  ? guardEmptyCompletionEventStream({
199
222
  firstEvents: advisorStream,
200
- continuation: fetchGuardedEmptyCompletionRetry,
201
- preserveRetryError: isContinuationBodyStall,
223
+ continuation: () => fetchGuardedEmptyCompletionRetry(onHiddenUsage),
224
+ preserveRetryError: preserveEmptyCompletionRetryError,
202
225
  })
203
226
  : advisorStream;
204
227
  const catalogGuardedEventStream = guardEmptyToolCatalogStream(completionGuardedEventStream, clientToolCatalog, translatorBudget);
@@ -245,14 +268,14 @@ export async function deliverAdapterResponse(
245
268
  hideRawReasoning: parsed.options.hideRawReasoning,
246
269
  toolNsMap, declaredToolNames, toolParameterSchemas, freeformToolNames, bareCustomToolNames, toolSearchToolNames,
247
270
  },
248
- stallTimeoutSec: config.stallTimeoutSec,
271
+ stallTimeoutSec: stallTimeoutSec(),
249
272
  get localUpstream() { return adapterExchange.localUpstream; },
250
273
  turnAdmissionLease: options.turnAdmissionLease,
251
274
  ...(options.onFirstOutput ? { onFirstOutput: options.onFirstOutput } : {}),
252
275
  stopUpstream: () => { cancelResponseCompletion(); upstream.abort(); },
253
276
  onStreamDone: cleanupUpstreamAbort,
254
277
  onCompletedResponse,
255
- bindUsage: usage => transportState.bindKeyUsageFromBridge(usage),
278
+ bindUsage: bindDeliveredUsage,
256
279
  });
257
280
  }
258
281
  const sseStream = bridgeToResponsesSSE(
@@ -263,11 +286,12 @@ export async function deliverAdapterResponse(
263
286
  replayCacheScope: parsed._reasoningReplayScope,
264
287
  ...(outputItemIds ? { outputItemIds } : {}),
265
288
  ...(options.forceEmptyResponseId ? { responseId: "" } : {}),
266
- stallTimeoutSec: config.stallTimeoutSec,
289
+ stallTimeoutSec: stallTimeoutSec(),
267
290
  get localUpstream() { return adapterExchange.localUpstream; },
268
291
  hideThinkingSummary: parsed.options.hideThinkingSummary,
269
292
  chatRawReasoningVisible: options.chatRawReasoningVisible,
270
293
  hideRawReasoning: parsed.options.hideRawReasoning,
294
+ rawReasoningAsSummary: parsed.options.rawReasoningAsSummary,
271
295
  declaredToolNames,
272
296
  bareCustomToolNames,
273
297
  enforceDeclaredToolNames: options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
@@ -280,10 +304,8 @@ export async function deliverAdapterResponse(
280
304
  textFormat: parsed.options.textFormat,
281
305
  // Same grok-surface split as the runTurn branch above.
282
306
  ...(logCtx.surface === "grok" ? { heartbeatStyle: "comment" as const } : {}),
283
- onUsage: usage => {
284
- // Raw adapter usage, pre wire-normalization (see the runTurn branch above).
285
- transportState.bindKeyUsageFromBridge(usage);
286
- },
307
+ // Raw adapter usage, pre wire-normalization (see the runTurn branch above).
308
+ onUsage: bindDeliveredUsage,
287
309
  onCompletedResponse,
288
310
  },
289
311
  );
@@ -317,7 +339,10 @@ export async function deliverAdapterResponse(
317
339
  response => transportState.activeAdapter.parseResponse!(response, translatorBudget, logCtx.activeTierMetadata),
318
340
  ));
319
341
  }
320
- for (const event of initialEvents) options.onCompactionRecoveryAdapterEvent?.(event);
342
+ for (const event of initialEvents) {
343
+ observeInitialSpend?.(event);
344
+ options.onCompactionRecoveryAdapterEvent?.(event);
345
+ }
321
346
  const recoveredEvents: AdapterEvent[] = [];
322
347
  for await (const event of recoverThinkingSignature((async function* () { yield* initialEvents; })())) {
323
348
  recoveredEvents.push(event);
@@ -331,6 +356,7 @@ export async function deliverAdapterResponse(
331
356
  adapterName: transportState.activeAdapter.name,
332
357
  maxAutoContinuations: 1,
333
358
  continuation: next => fetchTerminalGuardContinuation(next, undefined, !parsed.stream),
359
+ onHiddenUsage,
334
360
  })) guardedEvents.push(event);
335
361
  } else {
336
362
  guardedEvents = recoveredEvents;
@@ -350,8 +376,8 @@ export async function deliverAdapterResponse(
350
376
  events = [];
351
377
  for await (const event of guardEmptyCompletionEventStream({
352
378
  firstEvents: (async function* () { yield* guardedEvents; })(),
353
- continuation: fetchGuardedEmptyCompletionRetry,
354
- preserveRetryError: isContinuationBodyStall,
379
+ continuation: () => fetchGuardedEmptyCompletionRetry(onHiddenUsage),
380
+ preserveRetryError: preserveEmptyCompletionRetryError,
355
381
  })) events.push(event);
356
382
  } else {
357
383
  events = guardedEvents;
@@ -380,6 +406,7 @@ export async function deliverAdapterResponse(
380
406
  hideThinkingSummary: parsed.options.hideThinkingSummary,
381
407
  chatRawReasoningVisible: options.chatRawReasoningVisible,
382
408
  hideRawReasoning: parsed.options.hideRawReasoning,
409
+ rawReasoningAsSummary: parsed.options.rawReasoningAsSummary,
383
410
  toolNsMap,
384
411
  declaredToolNames,
385
412
  bareCustomToolNames,
@@ -392,9 +419,7 @@ export async function deliverAdapterResponse(
392
419
  completeOnMaxOutputTokens: config.completeOnMaxOutputTokens === true && options.inboundWire !== "chat" && options.inboundWire !== "anthropic",
393
420
  textFormat: parsed.options.textFormat,
394
421
  onProviderState: state => { providerState = state; },
395
- onUsage: usage => {
396
- transportState.bindKeyUsageFromBridge(usage);
397
- },
422
+ onUsage: bindDeliveredUsage,
398
423
  });
399
424
  // See the streaming branch: compaction turns skip the continuation cache.
400
425
  if (!routedCompaction) {