@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
@@ -42,6 +42,40 @@ export function upstreamErrorIsLocal(logCtx: object): boolean {
42
42
  return localOnly.has(logCtx);
43
43
  }
44
44
 
45
+ /** One attempt's local verdict on a reused context: the proxy-text mark and the detail recorded with it. */
46
+ export interface LocalFailureState { local: boolean; detail?: FailureDetail }
47
+
48
+ /**
49
+ * End an attempt on a context the next attempt reuses: drop its local verdict so the next attempt's
50
+ * upstream evidence counts again. Returns the verdict so a rolled-back attempt can restore it.
51
+ */
52
+ export function takeLocalFailureState(logCtx: { failureDetail?: FailureDetail }): LocalFailureState {
53
+ if (!localOnly.delete(logCtx)) return { local: false };
54
+ const detail = logCtx.failureDetail;
55
+ delete logCtx.failureDetail;
56
+ return detail ? { local: true, detail } : { local: true };
57
+ }
58
+
59
+ /** Put back the verdict a rolled-back attempt replaced; a non-local verdict only clears the mark. */
60
+ export function restoreLocalFailureState(logCtx: { failureDetail?: FailureDetail }, state: LocalFailureState): void {
61
+ if (!state.local) {
62
+ localOnly.delete(logCtx);
63
+ return;
64
+ }
65
+ localOnly.add(logCtx);
66
+ if (state.detail) logCtx.failureDetail = state.detail;
67
+ }
68
+
69
+ /** Carry a selected attempt's local verdict across request-log contexts. */
70
+ export function carryLocalFailureState(
71
+ source: { upstreamError?: string; failureDetail?: FailureDetail },
72
+ target: { upstreamError?: string; failureDetail?: FailureDetail },
73
+ ): void {
74
+ const local = upstreamErrorIsLocal(source);
75
+ restoreLocalFailureState(target, { local, detail: source.failureDetail });
76
+ if (local) target.upstreamError = source.upstreamError;
77
+ }
78
+
45
79
  const INCOMPLETE_REASONS: Readonly<Record<string, readonly [string, FailureDetailCode]>> = {
46
80
  max_output_tokens: ["Output reached the requested token limit (max_output_tokens)", "output_limit"],
47
81
  upstream_stall_timeout: ["Upstream stalled: no data for the stall-timeout window (upstream_stall_timeout)", "stall_timeout"],
@@ -0,0 +1,27 @@
1
+ import { KEY_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
2
+ import { readBoundedResponseBody } from "../lib/bounded-body";
3
+ import type { OcxUsage } from "../types";
4
+ import { sealedCredentialRefusals } from "./request-log-attempt-recovery";
5
+ import { recordKeyWireAttemptUsage, usageFromResponsesPayload, type RequestLogContext } from "./request-log";
6
+
7
+ /** Preserve metered JSON failures before recovery consumes/cancels their body. */
8
+ export async function recordKeyAttemptFailure(logCtx: RequestLogContext, response: Response, signal?: AbortSignal,
9
+ includeUnattributed = false): Promise<OcxUsage | undefined> {
10
+ const attempt = logCtx.activeAttempt;
11
+ const keyAttempt = attempt && !sealedCredentialRefusals.has(attempt) && KEY_ACCOUNT_LOG_LABEL_RE.test(attempt.accountLogLabel ?? "") ? attempt : undefined;
12
+ if (!keyAttempt && !includeUnattributed) return;
13
+ const ordinal = keyAttempt?.ordinal;
14
+ if (keyAttempt) keyAttempt.status = response.status;
15
+ const cancelOriginal = (): void => { try { void response.body?.cancel().catch(() => {}); } catch { /* closed */ } };
16
+ signal?.addEventListener("abort", cancelOriginal, { once: true });
17
+ try {
18
+ if (signal?.aborted) { cancelOriginal(); return; }
19
+ const body = await readBoundedResponseBody(response.clone(), { signal, totalTimeoutMs: 1000, inactivityTimeoutMs: 1000 });
20
+ if (body.truncated || body.oversized) return;
21
+ const value = JSON.parse(body.text);
22
+ const usage = usageFromResponsesPayload(value?.usage ?? value?.response?.usage);
23
+ if (usage && keyAttempt && logCtx.activeAttempt === keyAttempt && keyAttempt.ordinal === ordinal) recordKeyWireAttemptUsage(logCtx, usage);
24
+ return usage;
25
+ } catch { /* Absent/malformed usage remains unknown; recovery still owns the response. */ }
26
+ finally { signal?.removeEventListener("abort", cancelOriginal); }
27
+ }
@@ -8,12 +8,17 @@ import {
8
8
  isCyberPolicyMessage,
9
9
  isRateLimitOrQuotaFailureMessage,
10
10
  recognizedUpstreamError,
11
+ responsesCompletionError,
11
12
  upstreamErrorMessageFromPayload,
12
13
  } from "../lib/errors";
13
14
  import { redactSecretString } from "../lib/redact";
14
15
  import { SENT_VALUE_GUARD_SCAN_CHARS, outboundCredentials, type OutboundCredentialRegistry } from "../lib/outbound-credential-registry";
15
16
  import { configuredCredentials, containsConfiguredCredentialExcerpt, type ConfiguredCredentials } from "./configured-credentials";
16
17
  import { isUntypedBareUpstreamError, reduceBareUpstreamEvidence, wrappedServerErrorStatus, type BareUpstreamError, type BareUpstreamEvidence } from "./bare-upstream-error";
18
+ import type { CommittedIncompleteReason } from "../combos/failover";
19
+ import { committedIncompleteReason } from "./request-log-committed-terminal";
20
+
21
+ import { upstreamErrorIsLocal } from "./request-log-failure-detail";
17
22
 
18
23
  /** First bounded upstream diagnostics shared by request contexts and final rows. */
19
24
  export interface UpstreamErrorDiagnostics {
@@ -25,6 +30,7 @@ export interface UpstreamErrorDiagnostics {
25
30
  interface TerminalStatusContext extends UpstreamErrorDiagnostics {
26
31
  terminalHttpStatus?: number;
27
32
  terminalErrorCode?: typeof CYBER_POLICY_ERROR_CODE;
33
+ committedIncompleteReason?: CommittedIncompleteReason | null;
28
34
  upstreamError?: string;
29
35
  }
30
36
 
@@ -37,8 +43,10 @@ export interface UpstreamErrorPayload {
37
43
  status_code?: unknown;
38
44
  error?: { type?: unknown; code?: unknown; message?: unknown };
39
45
  last_error?: { type?: unknown; code?: unknown; message?: unknown };
46
+ incomplete_details?: { reason?: unknown };
40
47
  response?: {
41
48
  error?: { type?: unknown; code?: unknown; message?: unknown };
49
+ last_error?: { type?: unknown; code?: unknown; message?: unknown };
42
50
  incomplete_details?: { code?: unknown; message?: unknown; reason?: unknown };
43
51
  };
44
52
  }
@@ -93,7 +101,7 @@ function noteBoundedDiagnostic(
93
101
  if (!isClosedDiagnosticVocabulary(field, value) && repeatsRequestSentValue(logCtx, value)) return;
94
102
  logCtx[field] = value;
95
103
  const status = logCtx.terminalHttpStatus;
96
- if (status === undefined || status >= 500) {
104
+ if (!upstreamErrorIsLocal(logCtx) && (status === undefined || status >= 500)) {
97
105
  // Service logs persist too: print only closed-vocabulary values, never an upstream id or code.
98
106
  const { upstreamErrorCode: rawCode, upstreamErrorType: type } = upstreamDiagnosticLogFields(logCtx);
99
107
  const code = rawCode !== undefined && KNOWN_BARE_ERROR_CODES.has(rawCode) ? rawCode : undefined;
@@ -197,6 +205,9 @@ export function captureUpstreamTerminalDiagnostics(logCtx: TerminalStatusContext
197
205
  // keeps inspecting (the metadata consumer, the WS observer) may see a later genuine terminal,
198
206
  // which owns nothing on the row, exactly like a bare frame after a genuine terminal.
199
207
  if (prior?.terminal === true) return false;
208
+ if (type === "response.incomplete" && !genuineTerminals.has(logCtx) && logCtx.committedIncompleteReason === undefined) {
209
+ logCtx.committedIncompleteReason = committedIncompleteReason(json);
210
+ }
200
211
  genuineTerminals.add(logCtx);
201
212
  // A reader of the client stream (the WebSocket log) also sees the relay's own synthesized
202
213
  // response.failed. It renders the winning bare verdict, so the row keeps that verdict, and the
@@ -223,11 +234,11 @@ export function captureUpstreamTerminalDiagnostics(logCtx: TerminalStatusContext
223
234
  // hide that ownership from it and leave the stale status on the row.
224
235
  captureTerminalHttpStatus(logCtx, json);
225
236
  noteBoundedDiagnostic(logCtx, "upstreamErrorCode",
226
- json.error?.code ?? json.last_error?.code ?? json.response?.error?.code
237
+ json.error?.code ?? json.last_error?.code ?? json.response?.error?.code ?? json.response?.last_error?.code
227
238
  // A bare top-level code (new in 2.83.0) has no envelope contract, so only a known class is kept.
228
239
  ?? (typeof json.code === "string" && KNOWN_BARE_ERROR_CODES.has(json.code) ? json.code : undefined));
229
240
  noteBoundedDiagnostic(logCtx, "upstreamErrorType",
230
- json.error?.type ?? json.last_error?.type ?? json.response?.error?.type);
241
+ json.error?.type ?? json.last_error?.type ?? json.response?.error?.type ?? json.response?.last_error?.type);
231
242
  return true;
232
243
  }
233
244
  // A buffered JSON body is not a stream in which a later frame could supersede an earlier one,
@@ -360,12 +371,12 @@ function captureTerminalHttpStatus(
360
371
  logCtx.terminalHttpStatus = status;
361
372
  if (type === "error") provisionalStatuses.set(logCtx, status);
362
373
  };
363
- // A completed terminal only retires provisional bare-error evidence; it records no status.
364
- if (type === "response.completed") return;
365
- const responseError = json.response?.error;
374
+ // Clean completions only retire provisional bare-error evidence.
375
+ const completionError = responsesCompletionError(json);
376
+ if (type === "response.completed" && completionError == null) return;
366
377
  const responseDetails = json.response?.incomplete_details;
367
378
  const candidates: Array<{ type?: unknown; code?: unknown; message?: unknown } | undefined> = [
368
- json.error, json.last_error, responseError, responseDetails, json,
379
+ json.error, json.last_error, json.response?.error, json.response?.last_error, responseDetails, json,
369
380
  ];
370
381
  const policy = candidates.some(candidate => (
371
382
  candidate?.code === null || typeof candidate?.code === "string"
@@ -419,13 +430,15 @@ function captureTerminalHttpStatus(
419
430
  if (wrapped !== undefined) noteStatus(wrapped);
420
431
  return;
421
432
  }
422
- if (type !== "response.failed" || !responseError || typeof responseError !== "object") return;
423
- const responseCode = responseError.code === null || typeof responseError.code === "string"
424
- ? responseError.code
433
+ const terminalError = type === "response.completed" ? completionError
434
+ : type === "response.failed" ? json.response?.error : undefined;
435
+ if (!terminalError || typeof terminalError !== "object") return;
436
+ const responseCode = terminalError.code === null || typeof terminalError.code === "string"
437
+ ? terminalError.code
425
438
  : undefined;
426
439
  noteStatus(httpStatusFromTerminalError({
427
- type: typeof responseError.type === "string" ? responseError.type : undefined,
440
+ type: typeof terminalError.type === "string" ? terminalError.type : undefined,
428
441
  code: responseCode,
429
- message: typeof responseError.message === "string" ? responseError.message : undefined,
442
+ message: typeof terminalError.message === "string" ? terminalError.message : undefined,
430
443
  }));
431
444
  }
@@ -6,13 +6,12 @@ import { finalizeProviderCacheAffinity } from "./request-log-cache-affinity";
6
6
  import { aggregateAttemptUsage } from "./request-log-attempt-usage";
7
7
  export { aggregateAttemptUsage } from "./request-log-attempt-usage";
8
8
 
9
- import { KEY_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
10
9
  import { attemptAccountChanged, sealRequestAttemptIdentity } from "./request-log-account-rotation";
11
10
  export { sealRequestAttemptIdentity };
11
+ import { credentialRecoveryStatus, retainRefusedAccount, sealedCredentialRefusals } from "./request-log-attempt-recovery";
12
12
  export { noteAttemptRecoveryWithheld } from "./request-log-attempt-recovery";
13
13
  import { bareVerdictRowErrorCode, captureUpstreamTerminalDiagnostics, guardedRowCopy, linkLogField, notifyLinkTurnFinal, upstreamDiagnosticLogFields, type LinkRequestLogCarrier, type UpstreamErrorDiagnostics, type UpstreamErrorPayload } from "./request-log-terminal-status";
14
14
  export { noteUpstreamRequestId } from "./request-log-terminal-status";
15
- import { readBoundedResponseBody } from "../lib/bounded-body";
16
15
  import type { ResponsesTerminalStatus } from "../bridge";
17
16
  import {
18
17
  classifyError,
@@ -21,6 +20,7 @@ import {
21
20
  isClientClosedMessage,
22
21
  isCyberPolicyCode,
23
22
  isUpstreamResetReplayRefusedMessage,
23
+ responsesCompletionError,
24
24
  upstreamErrorMessageFromPayload,
25
25
  } from "../lib/errors";
26
26
  import { CODEX_CONFIG_PATH, readRootTomlString } from "../codex/paths";
@@ -36,6 +36,8 @@ import type { RequestSpendSettlement } from "./responses/request-spend";
36
36
  import type { AdapterTierMetadata } from "../providers/fastwire";
37
37
  import { UPSTREAM_RESET_REPLAY_REFUSED_CODE } from "../lib/upstream-retry";
38
38
  import { redactSecretString, sanitizeLogMetadataString } from "../lib/redact";
39
+ export { registerCommittedTerminalCooldownHandler } from "./request-log-committed-terminal";
40
+ import { reportCommittedTerminalCooldown, type CommittedComboLogFields } from "./request-log-committed-terminal";
39
41
  import type { UpstreamCondition } from "../lib/upstream-condition";
40
42
  import { boundedServiceTier, errorDetailFor, projectErrorDetail } from "../usage/error-detail";
41
43
  import { incompleteReasonDetail, upstreamErrorIsLocal, type FailureDetail } from "./request-log-failure-detail";
@@ -125,7 +127,7 @@ export function cacheDiagnosticsObserving(): boolean {
125
127
  return cacheDiagnosticHooks()?.enabled() === true;
126
128
  }
127
129
 
128
- export interface RequestLogContext extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyLogContext {
130
+ export interface RequestLogContext extends UpstreamErrorDiagnostics, LinkRequestLogCarrier, RequestBodyLogContext, CommittedComboLogFields {
129
131
  model: string;
130
132
  provider: string;
131
133
  client?: UsageClient;
@@ -252,10 +254,11 @@ export interface RequestLogContext extends UpstreamErrorDiagnostics, LinkRequest
252
254
  * responsesUsage in src/bridge.ts), so SSE/JSON re-parsing must not overwrite the raw
253
255
  * provenance — a synthetic cached_tokens:0 is NOT a measured cache read. */
254
256
  usageFromBridge?: boolean;
255
- /** Set once the client-facing body carries an estimated usage the provider never sent (#7427).
256
- * The provider's own body was inspected before the estimate was added, so a later parse of
257
- * the client body must not record the estimate as provider-reported usage. */
258
- usageEstimatedForClient?: boolean;
257
+ /** Process-owned provenance when a later parse of the client body must skip its usage.
258
+ * The original provider usage, when present, is already recorded on this context. */
259
+ clientResponseUsage?: "estimated" | "synthetic";
260
+ /** A committed keepalive's native child owns raw usage; only the outer client-body log tap skips it. */
261
+ clientSseUsageAlreadyInspected?: boolean;
259
262
  /** Secret-redacted upstream error reason (e.g. the granular Cursor "rate limit exceeded…"
260
263
  * message) extracted from a `response.failed` SSE payload or non-streaming error body, so the
261
264
  * request log / GUI shows the actual upstream failure rather than only the HTTP-mapped code. */
@@ -834,7 +837,7 @@ export function recordFirstOutput(
834
837
  if (!Number.isFinite(requestStartedAt) || !Number.isFinite(now)) return;
835
838
  const requestElapsed = Math.max(0, now - requestStartedAt);
836
839
  if (logCtx.firstOutputMs === undefined) logCtx.firstOutputMs = requestElapsed;
837
- if (logCtx.activeAttempt && logCtx.activeAttempt.firstOutputMs === undefined) {
840
+ if (logCtx.activeAttempt && !sealedCredentialRefusals.has(logCtx.activeAttempt) && logCtx.activeAttempt.firstOutputMs === undefined) {
838
841
  const attemptStartedAt = logCtx.activeAttemptStartedAt ?? requestStartedAt;
839
842
  logCtx.activeAttempt.firstOutputMs = Math.max(0, now - attemptStartedAt);
840
843
  }
@@ -843,7 +846,7 @@ export function recordFirstOutput(
843
846
  /** Snapshot target-specific requested effort even for runTurn adapters with no AdapterRequest. */
844
847
  export function recordAttemptRequestedEffort(logCtx: RequestLogContext): void {
845
848
  const attempt = logCtx.activeAttempt;
846
- if (!attempt) return;
849
+ if (!attempt || sealedCredentialRefusals.has(attempt)) return;
847
850
  delete attempt.requestedEffort;
848
851
  try {
849
852
  if (typeof logCtx.requestedEffort === "string" && logCtx.requestedEffort) {
@@ -859,6 +862,7 @@ export function recordAdapterReasoning(
859
862
  logCtx: RequestLogContext,
860
863
  request: AdapterRequest,
861
864
  ): void {
865
+ if (logCtx.activeAttempt && sealedCredentialRefusals.has(logCtx.activeAttempt)) return;
862
866
  delete logCtx.effectiveEffort;
863
867
  delete logCtx.reasoningWireField;
864
868
  delete logCtx.reasoningWireValue;
@@ -917,6 +921,7 @@ export function recordAdapterTierMetadata(
917
921
  logCtx: RequestLogContext,
918
922
  metadata: AdapterTierMetadata | undefined,
919
923
  ): void {
924
+ if (logCtx.activeAttempt && sealedCredentialRefusals.has(logCtx.activeAttempt)) return;
920
925
  delete logCtx.tierOutcome;
921
926
  delete logCtx.activeTierMetadata;
922
927
  const attempt = logCtx.activeAttempt;
@@ -1021,7 +1026,7 @@ export function catalogModelSupportsServiceTier(modelId: string, serviceTier: st
1021
1026
  }
1022
1027
  }
1023
1028
 
1024
- export function applyResponseLogMetadata(logCtx: RequestLogContext, payload: unknown): void {
1029
+ export function applyResponseLogMetadata(logCtx: RequestLogContext, payload: unknown, collectUsage = true): void {
1025
1030
  if (!payload || typeof payload !== "object") return;
1026
1031
  if (logCtx.observedTerminalStatus === undefined) {
1027
1032
  const eventType = (payload as { type?: unknown }).type;
@@ -1030,7 +1035,7 @@ export function applyResponseLogMetadata(logCtx: RequestLogContext, payload: unk
1030
1035
  ? (response as { status?: unknown }).status
1031
1036
  : (payload as { status?: unknown }).status;
1032
1037
  if (eventType === "response.completed") {
1033
- logCtx.observedTerminalStatus = "completed";
1038
+ logCtx.observedTerminalStatus = responsesCompletionError(payload) == null ? "completed" : "failed";
1034
1039
  } else if (eventType === "response.failed") {
1035
1040
  logCtx.observedTerminalStatus = "failed";
1036
1041
  } else if (eventType === "response.incomplete") {
@@ -1052,11 +1057,12 @@ export function applyResponseLogMetadata(logCtx: RequestLogContext, payload: unk
1052
1057
  } else if (Object.prototype.hasOwnProperty.call(source, "service_tier")) {
1053
1058
  logCtx.activeTierMetadata?.observeResponseServiceTier(serviceTier);
1054
1059
  }
1055
- const usage = usageFromResponsesPayload((source as { usage?: unknown }).usage);
1056
- if (usage && !logCtx.usageFromBridge && !logCtx.usageEstimatedForClient) {
1060
+ const usage = collectUsage && !logCtx.usageFromBridge && !logCtx.clientResponseUsage
1061
+ ? usageFromResponsesPayload((source as { usage?: unknown }).usage) : undefined;
1062
+ if (usage) {
1057
1063
  if (!recordKeyWireAttemptUsage(logCtx, usage)) {
1058
1064
  logCtx.usage = usage;
1059
- if (logCtx.activeAttempt) logCtx.activeAttempt.usage = usage;
1065
+ if (logCtx.activeAttempt && !sealedCredentialRefusals.has(logCtx.activeAttempt)) logCtx.activeAttempt.usage = usage;
1060
1066
  }
1061
1067
  // Counts taken off a wire, not reported raw. The zero-default token-detail objects strict
1062
1068
  // clients require are indistinguishable here from a measured zero, so the cache detail these
@@ -1167,12 +1173,13 @@ export function inspectResponseLogSsePayloadParsed(
1167
1173
  logCtx: RequestLogContext,
1168
1174
  payload: string | null,
1169
1175
  parsed: unknown | undefined,
1176
+ collectUsage = true,
1170
1177
  ): void {
1171
1178
  if (!payload || payload.trim() === "[DONE]") return;
1172
1179
  const debugEnabled = isUsageDebugEnabled();
1173
1180
  const sseAlreadyMarked = logCtx.usageDebugBodyKind === "sse";
1174
1181
  if (parsed !== undefined) recordGenerationEvent(logCtx, (parsed as { type?: unknown } | null)?.type);
1175
- if (parsed !== undefined) applyResponseLogMetadata(logCtx, parsed);
1182
+ if (parsed !== undefined) applyResponseLogMetadata(logCtx, parsed, collectUsage);
1176
1183
  else logCtx.activeTierMetadata?.markResponseUnparseable();
1177
1184
  captureUpstreamErrorParsed(logCtx, payload, parsed, true);
1178
1185
  if (debugEnabled) {
@@ -1436,7 +1443,7 @@ function cloneKeyUsage(usage: OcxUsage | undefined): OcxUsage | undefined {
1436
1443
  export function recordKeyWireAttemptUsage(logCtx: RequestLogContext, usage: OcxUsage | undefined): boolean {
1437
1444
  if (!usage) return false;
1438
1445
  const attempt = logCtx.activeAttempt;
1439
- if (!attempt || !keyUsageOwners.has(attempt) || !keyWireUsageBaselines.has(attempt)) return false;
1446
+ if (!attempt || sealedCredentialRefusals.has(attempt) || !keyUsageOwners.has(attempt) || !keyWireUsageBaselines.has(attempt)) return false;
1440
1447
  const baseline = keyWireUsageBaselines.get(attempt);
1441
1448
  const current = { ...usage };
1442
1449
  attempt.usage = baseline
@@ -1505,7 +1512,8 @@ function writeFinalRequestLog(
1505
1512
  const closeReason = effectiveStatus === 499
1506
1513
  ? "client_cancel"
1507
1514
  : meta?.closeReason;
1508
- if (logCtx.activeAttempt) {
1515
+ const sealedRefusal = retainRefusedAccount(logCtx);
1516
+ if (logCtx.activeAttempt && !sealedRefusal) {
1509
1517
  finishRequestAttempt(
1510
1518
  logCtx.activeAttempt,
1511
1519
  attemptStatus ?? effectiveStatus,
@@ -1535,10 +1543,10 @@ function writeFinalRequestLog(
1535
1543
  // A coordinated write derives the request pair from a copy and re-derives the attempt's own.
1536
1544
  ...(logCtx.activeAttempt ? { attempt: attemptStatus === undefined ? logCtx.activeAttempt : { ...logCtx.activeAttempt } } : {}),
1537
1545
  });
1538
- if (attemptStatus !== undefined && logCtx.activeAttempt) attributePhysicalAttempt(logCtx.activeAttempt);
1546
+ if (attemptStatus !== undefined && logCtx.activeAttempt && !sealedRefusal) attributePhysicalAttempt(logCtx.activeAttempt);
1539
1547
  // The one seam every request passes exactly once, whatever transport served it and however
1540
- // it ended. The terminal usage belongs to the last send that left; the ledger resolves every
1541
- // earlier send of this request as unresolved spend rather than handing its tokens back.
1548
+ // it ended. The ledger gives per-send usage precedence over terminal usage and keeps unknown
1549
+ // physical spend unresolved.
1542
1550
  logCtx.spendTracker?.settle(logCtx.usage);
1543
1551
  const existing = finalizedUsage(
1544
1552
  logCtx.providerAdapter ?? logCtx.provider,
@@ -1559,11 +1567,11 @@ function writeFinalRequestLog(
1559
1567
  ...(attempt.deliverySummary ? { deliverySummary: { ...attempt.deliverySummary } } : {}),
1560
1568
  }));
1561
1569
  const isCombo = logCtx.comboId !== undefined && (attempts?.length ?? 0) > 0;
1562
- // A key or account rotation splits the attempt and clears `logCtx.usage`, so a multi-attempt
1563
- // request totals from its attempts, combo or not. One attempt keeps the request-level usage
1564
- // (and its input estimate); a locally answered row sent nothing and keeps its own.
1565
- const aggregate = isCombo || ((attempts?.length ?? 0) > 1 && logCtx.localTerminalReason === undefined)
1566
- ? aggregateAttemptUsage(attempts ?? [])
1570
+ // Rotations split usage across attempts. A detached recovery can be the only send, with no
1571
+ // active attempt or request-level usage. An ordinary single attempt keeps the row's usage.
1572
+ const aggregate = attempts?.length && (isCombo || (logCtx.localTerminalReason === undefined
1573
+ && (attempts.length > 1 || (!logCtx.activeAttempt && attempts[0]?.usage))))
1574
+ ? aggregateAttemptUsage(attempts)
1567
1575
  : null;
1568
1576
  const loggedUsage = aggregate?.usage ?? existing.usage;
1569
1577
  const usageStatus = aggregate?.status ?? existing.status;
@@ -1622,6 +1630,7 @@ function writeFinalRequestLog(
1622
1630
  // Keyed by the live attempt objects, not the detached copies above.
1623
1631
  const protocolTrace = protocolTraceForRequest(logCtx, logCtx.attempts);
1624
1632
  // Projected before any writer (an injected one too): the row keeps only proxy-owned error facts.
1633
+ reportCommittedTerminalCooldown(logCtx, meta, attempts, effectiveStatus);
1625
1634
  addLog(projectErrorDetail({
1626
1635
  requestId,
1627
1636
  ...(isLogicalRequestId(logicalRequestId) ? { logicalRequestId } : {}),
@@ -1667,9 +1676,9 @@ function writeFinalRequestLog(
1667
1676
  ...(meta?.terminalStatus ? { terminalStatus: meta.terminalStatus } : {}),
1668
1677
  ...(closeReason ? { closeReason } : {}),
1669
1678
  ...(logCtx.upstreamError && !upstreamErrorIsLocal(logCtx) ? { upstreamError: logCtx.upstreamError } : {}), ...(logCtx.failureDetail ? { failureDetail: logCtx.failureDetail } : {}),
1670
- ...(logCtx.upstreamCondition ? { upstreamCondition: logCtx.upstreamCondition } : {}),
1671
- ...upstreamDiagnosticLogFields(logCtx),
1672
- usageStatus,
1679
+ ...(logCtx.upstreamCondition && !upstreamErrorIsLocal(logCtx) ? { upstreamCondition: logCtx.upstreamCondition } : {}),
1680
+ // A local verdict's failed frame is proxy-authored; its code/type are not upstream diagnostics.
1681
+ ...(upstreamErrorIsLocal(logCtx) ? {} : upstreamDiagnosticLogFields(logCtx)), usageStatus,
1673
1682
  ...(loggedUsage ? { usage: loggedUsage } : {}),
1674
1683
  ...(totalTokens !== undefined ? { totalTokens } : {}),
1675
1684
  ...(attempts !== undefined ? { attempts } : {}),
@@ -1814,28 +1823,10 @@ export function beginRequestAttempt(
1814
1823
  };
1815
1824
  }
1816
1825
 
1817
- /** Preserve metered JSON failures before key recovery consumes/cancels their body. */
1818
- export async function recordKeyAttemptFailure(logCtx: RequestLogContext, response: Response, signal?: AbortSignal): Promise<void> {
1819
- const attempt = logCtx.activeAttempt;
1820
- if (!attempt || !KEY_ACCOUNT_LOG_LABEL_RE.test(attempt.accountLogLabel ?? "")) return;
1821
- attempt.status = response.status;
1822
- const cancelOriginal = (): void => { try { void response.body?.cancel().catch(() => {}); } catch { /* closed */ } };
1823
- signal?.addEventListener("abort", cancelOriginal, { once: true });
1824
- try {
1825
- if (signal?.aborted) { cancelOriginal(); return; }
1826
- const body = await readBoundedResponseBody(response.clone(), { signal, totalTimeoutMs: 1000, inactivityTimeoutMs: 1000 });
1827
- if (body.truncated || body.oversized) return;
1828
- const value = JSON.parse(body.text);
1829
- const usage = usageFromResponsesPayload(value?.usage ?? value?.response?.usage);
1830
- if (usage) recordKeyWireAttemptUsage(logCtx, usage);
1831
- } catch { /* Absent/malformed usage remains unknown; recovery still owns the response. */ }
1832
- finally { signal?.removeEventListener("abort", cancelOriginal); }
1833
- }
1834
-
1835
1826
  /** Add raw per-response usage before a bridge combines multiple rounds for the client. */
1836
1827
  export function recordKeyAttemptUsage(logCtx: RequestLogContext, usage: OcxUsage | undefined): void {
1837
1828
  const attempt = logCtx.activeAttempt;
1838
- if (!attempt || !usage) return;
1829
+ if (!attempt || sealedCredentialRefusals.has(attempt) || !usage) return;
1839
1830
  attempt.usage = attempt.usage
1840
1831
  ? aggregateAttemptUsage([{ ...attempt, usageStatus: attempt.usage.estimated ? "estimated" : "reported" },
1841
1832
  { ...attempt, usage, usageStatus: usage.estimated ? "estimated" : "reported" }]).usage
@@ -1858,20 +1849,18 @@ export function noteProviderAttemptSend(
1858
1849
  stampApiKeyAccountLabel(logCtx, providerName, provider);
1859
1850
  const next = logCtx.accountLogLabel;
1860
1851
  if (attempt && usesApiKeyAccount(provider)) keyUsageOwners.add(attempt);
1861
- if (attempt && attempt.sendCount > 0 && (attemptAccountChanged(previous, next, attempt.provider, logCtx.provider)
1852
+ const recoveryStatus = credentialRecoveryStatus(recovery);
1853
+ if (attempt && attempt.sendCount > 0 && (sealedCredentialRefusals.has(attempt) || recoveryStatus !== undefined
1854
+ || attemptAccountChanged(previous, next, attempt.provider, logCtx.provider)
1862
1855
  || resolved && (attempt.model !== resolved.model || attempt.adapter !== resolved.adapter))) {
1863
- // An input estimate is not evidence that a failed send used that many tokens.
1864
- delete attempt.inputTokenEstimate;
1865
- // An account-scoped recovery kind names the status the sealed account answered.
1866
- finishRequestAttempt(attempt, attempt.status >= 100 ? attempt.status
1867
- : recovery === "key-401" || recovery === "oauth-401" ? 401 : recovery === "oauth-account-403" ? 403
1868
- : recovery === "oauth-account-402" ? 402 : recovery?.includes("429") ? 429 : 502,
1869
- Date.now() - (logCtx.activeAttemptStartedAt ?? Date.now()), attempt.usage);
1870
- // This attempt is being sealed because a NAMED recovery rejected it, so the recovery kind
1871
- // is direct evidence here rather than an inference from history. Without this the sealed
1872
- // attempt would reach the ledger with no attribution at all: the finalization seam below
1873
- // only ever sees the last attempt of the request.
1874
- attributeSealedAttempt(attempt, recovery);
1856
+ if (!sealedCredentialRefusals.delete(attempt)) {
1857
+ delete attempt.inputTokenEstimate;
1858
+ finishRequestAttempt(attempt, attempt.status >= 100 ? attempt.status
1859
+ : recoveryStatus ?? (recovery === "rate-limit-429" ? 429 : 502),
1860
+ Date.now() - (logCtx.activeAttemptStartedAt ?? Date.now()), attempt.usage);
1861
+ // Finalization sees only the live segment, so attribute this refusal before snapshotting it.
1862
+ attributeSealedAttempt(attempt, recovery);
1863
+ }
1875
1864
  const completed = { ...attempt, recoveryKinds: [...attempt.recoveryKinds],
1876
1865
  ...(attempt.usage ? { usage: { ...attempt.usage } } : {}),
1877
1866
  ...(attempt.deliverySummary ? { deliverySummary: { ...attempt.deliverySummary } } : {}),
@@ -1881,10 +1870,16 @@ export function noteProviderAttemptSend(
1881
1870
  if (index >= 0) attempts.splice(index, 0, completed);
1882
1871
  else attempts.push(completed, attempt);
1883
1872
  const fresh = beginRequestAttempt(completed.ordinal + 1, providerName, completed.model, completed.adapter);
1873
+ if (completed.labRouteSubjectId && completed.provider === logCtx.provider
1874
+ && (!resolved || (completed.model === resolved.model && completed.adapter === resolved.adapter))) {
1875
+ fresh.labRouteSubjectId = completed.labRouteSubjectId;
1876
+ }
1884
1877
  // Effort/tier metadata describes the request and is captured before the physical send.
1885
- for (const key of ["requestedEffort", "effectiveEffort", "reasoningWireField", "reasoningWireValue", "tierOutcome"] as const) {
1878
+ for (const key of ["requestedEffort", "effectiveEffort", "reasoningWireField", "reasoningWireValue"] as const) {
1886
1879
  if (completed[key] !== undefined) Object.assign(fresh, { [key]: completed[key] });
1887
1880
  }
1881
+ // The response observer owns this live object; the sealed row keeps its snapshot.
1882
+ if (attempt.tierOutcome) fresh.tierOutcome = attempt.tierOutcome;
1888
1883
  for (const key of Object.keys(attempt)) delete (attempt as unknown as Record<string, unknown>)[key];
1889
1884
  Object.assign(attempt, fresh);
1890
1885
  delete logCtx.usage;
@@ -1908,7 +1903,7 @@ export function recordAttemptCredentialSource(
1908
1903
  provider: Pick<OcxProviderConfig, "authMode" | "baseUrl" | "adapter">,
1909
1904
  adapterName: string = provider.adapter,
1910
1905
  ): void {
1911
- if (!attempt) return;
1906
+ if (!attempt || sealedCredentialRefusals.has(attempt)) return;
1912
1907
  // Rebinding an attempt to an unrecognized route must not retain its previous attribution.
1913
1908
  delete attempt.credentialSource;
1914
1909
  if (providerName !== "xai"
@@ -1933,7 +1928,7 @@ export function noteAttemptSend(
1933
1928
  inputTokenEstimate: number | undefined,
1934
1929
  recovery?: AttemptRecoveryKind,
1935
1930
  ): void {
1936
- if (!attempt) return;
1931
+ if (!attempt || sealedCredentialRefusals.has(attempt)) return;
1937
1932
  attempt.sendCount += 1;
1938
1933
  if (typeof inputTokenEstimate === "number"
1939
1934
  && Number.isFinite(inputTokenEstimate)
@@ -1956,6 +1951,7 @@ export function finishRequestAttempt(
1956
1951
  durationMs: number,
1957
1952
  usage?: OcxUsage,
1958
1953
  ): PersistedUsageAttempt {
1954
+ if (sealedCredentialRefusals.has(attempt)) return attempt;
1959
1955
  const finalized = finalizedUsage(
1960
1956
  attempt.adapter,
1961
1957
  usage ?? attempt.usage,