@bitkyc08/opencodex 2.100.5 → 2.100.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (536) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +2 -0
  3. package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
  4. package/gui/dist/assets/App-CsZ1Gr7S.js +60 -0
  5. package/gui/dist/assets/Tray-CVqm4S4W.js +1 -0
  6. package/gui/dist/assets/brand-mark-BebhnAtV.js +1 -0
  7. package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
  8. package/gui/dist/assets/index-CEeMegqE.js +138 -0
  9. package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-COdzmORE.js} +1 -1
  10. package/gui/dist/classic/assets/App-BJgUWNJ8.js +59 -0
  11. package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
  12. package/gui/dist/classic/assets/Tray-BDlcOLDK.js +1 -0
  13. package/gui/dist/classic/assets/index-B9Jgli_W.js +138 -0
  14. package/gui/dist/classic/assets/usage-companion-chart-vbzDcND0.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.lock +62 -0
  18. package/native/ocx-child/Cargo.toml +1 -0
  19. package/native/ocx-child/src/journal.rs +32 -10
  20. package/native/ocx-child/src/state.rs +2 -1
  21. package/native/ocx-child/src/toml_surgeon.rs +183 -72
  22. package/package.json +2 -2
  23. package/src/adapters/agy-acp/acp.ts +202 -0
  24. package/src/adapters/agy-acp/adapter.ts +554 -0
  25. package/src/adapters/agy-acp/binary.ts +79 -0
  26. package/src/adapters/agy-acp/options.ts +163 -0
  27. package/src/adapters/agy-acp/output-redaction.ts +270 -0
  28. package/src/adapters/agy-acp/policy.ts +105 -0
  29. package/src/adapters/agy-acp/process.ts +218 -0
  30. package/src/adapters/anthropic/account-metadata.ts +4 -1
  31. package/src/adapters/anthropic/advisor-tool.ts +43 -9
  32. package/src/adapters/anthropic/client-identity.ts +2 -0
  33. package/src/adapters/anthropic.ts +102 -14
  34. package/src/adapters/antigravity-refusal.ts +5 -1
  35. package/src/adapters/base.ts +25 -2
  36. package/src/adapters/claude-cli/adapter.ts +1 -0
  37. package/src/adapters/claude-cli/usage-admission.ts +12 -9
  38. package/src/adapters/codebuddy/adapter.ts +1 -0
  39. package/src/adapters/command-code.ts +2 -2
  40. package/src/adapters/cursor/http1-bidi.ts +7 -2
  41. package/src/adapters/cursor/live-transport.ts +2 -0
  42. package/src/adapters/cursor/request-builder.ts +4 -4
  43. package/src/adapters/cursor/tool-naming.ts +5 -5
  44. package/src/adapters/cursor/transport-retry.ts +14 -8
  45. package/src/adapters/cursor/transport.ts +2 -0
  46. package/src/adapters/cursor.ts +8 -2
  47. package/src/adapters/google-error-details.ts +105 -0
  48. package/src/adapters/google-errors.ts +183 -31
  49. package/src/adapters/google-http.ts +66 -22
  50. package/src/adapters/google-truncation.ts +48 -3
  51. package/src/adapters/google-vertex-endpoint.ts +12 -1
  52. package/src/adapters/google.ts +54 -26
  53. package/src/adapters/kiro/adapter.ts +39 -38
  54. package/src/adapters/kiro/stream.ts +59 -9
  55. package/src/adapters/kiro-retry.ts +5 -3
  56. package/src/adapters/m365-copilot/LICENSE +21 -0
  57. package/src/adapters/m365-copilot/fenced.ts +745 -0
  58. package/src/adapters/m365-copilot/images.ts +89 -0
  59. package/src/adapters/m365-copilot/tools.ts +284 -0
  60. package/src/adapters/m365-copilot/transport.ts +232 -0
  61. package/src/adapters/m365-copilot.ts +143 -0
  62. package/src/adapters/openai-chat/tool-schema.ts +2 -2
  63. package/src/adapters/openai-responses/passthrough.ts +1 -0
  64. package/src/adapters/openai-responses/reasoning.ts +23 -3
  65. package/src/adapters/physical-send.ts +11 -4
  66. package/src/adapters/qoder/adapter.ts +17 -3
  67. package/src/adapters/registry.ts +15 -1
  68. package/src/adapters/zed.ts +2 -1
  69. package/src/advisor/consult.ts +1 -0
  70. package/src/bridge/response-json.ts +6 -2
  71. package/src/bridge/sse.ts +21 -9
  72. package/src/chat/inbound.ts +11 -8
  73. package/src/chat/outbound.ts +28 -7
  74. package/src/claude/context-windows.ts +32 -8
  75. package/src/claude/desktop-3p.ts +18 -14
  76. package/src/claude/desktop-picker-platform.ts +1 -1
  77. package/src/claude/desktop-picker.ts +3 -3
  78. package/src/claude/inbound-content-options.ts +11 -1
  79. package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
  80. package/src/claude/intercept/picker-ca.ts +162 -27
  81. package/src/claude/intercept/picker-trust-linux.ts +411 -0
  82. package/src/claude/intercept/picker-trust.ts +35 -3
  83. package/src/claude/intercept/runtime.ts +2 -2
  84. package/src/claude/subagent-force-status.ts +24 -5
  85. package/src/claude/subscription-reserve.ts +87 -0
  86. package/src/cli/account-api.ts +3 -0
  87. package/src/cli/account-auth.ts +65 -11
  88. package/src/cli/account-extended.ts +1 -1
  89. package/src/cli/account-next-actions.ts +4 -1
  90. package/src/cli/account-policy-dto.ts +1 -1
  91. package/src/cli/account-policy.ts +6 -3
  92. package/src/cli/account-probe.ts +66 -0
  93. package/src/cli/account.ts +8 -2
  94. package/src/cli/capabilities-accounts.ts +8 -1
  95. package/src/cli/capabilities-agents-routing.ts +2 -2
  96. package/src/cli/capabilities-base.ts +4 -4
  97. package/src/cli/capabilities-integrations.ts +44 -4
  98. package/src/cli/capabilities-provider-models.ts +6 -0
  99. package/src/cli/claude-context-settings.ts +60 -0
  100. package/src/cli/claude-desktop.ts +2 -2
  101. package/src/cli/claude.ts +15 -7
  102. package/src/cli/client-start-fence.ts +64 -1
  103. package/src/cli/combo-result.ts +1 -0
  104. package/src/cli/combo-stats.ts +1 -1
  105. package/src/cli/combo.ts +19 -2
  106. package/src/cli/config-command.ts +21 -8
  107. package/src/cli/connect.ts +16 -0
  108. package/src/cli/cross-home-owner.ts +65 -18
  109. package/src/cli/dispatch.ts +4 -0
  110. package/src/cli/gateway-client-command.ts +128 -0
  111. package/src/cli/index.ts +98 -97
  112. package/src/cli/init.ts +20 -4
  113. package/src/cli/integrations.ts +23 -3
  114. package/src/cli/launcher-context.ts +12 -1
  115. package/src/cli/link.ts +24 -5
  116. package/src/cli/models-runtime-subcommands.ts +1 -0
  117. package/src/cli/models-runtime.ts +32 -0
  118. package/src/cli/start-owner-fence.ts +5 -2
  119. package/src/cli/status.ts +3 -3
  120. package/src/cli/stop-client-process.ts +51 -0
  121. package/src/cli/stop-restore.ts +383 -36
  122. package/src/cli/sync-command.ts +2 -2
  123. package/src/cli/uninstall-client-state.ts +7 -0
  124. package/src/client/connect.ts +72 -13
  125. package/src/client/hub-client.ts +38 -0
  126. package/src/client/hub-relay.ts +61 -36
  127. package/src/client/hub-session.ts +106 -0
  128. package/src/client/lifecycle-lock.ts +6 -1
  129. package/src/client/link-relay.ts +2 -1
  130. package/src/client/machine-listener.ts +60 -1
  131. package/src/client/runtime-restart.ts +1 -0
  132. package/src/client/runtime.ts +104 -34
  133. package/src/client/state.ts +11 -0
  134. package/src/client/stop-darwin-process.ts +73 -0
  135. package/src/client/stop-file-routing.ts +49 -0
  136. package/src/client/stop-native-handoff.ts +108 -0
  137. package/src/client/stop-routing.ts +41 -7
  138. package/src/client/stop-teardown-owner.ts +173 -0
  139. package/src/client/sync-runtime.ts +23 -4
  140. package/src/clients/config-export/opencode-wire.ts +24 -0
  141. package/src/clients/config-export.ts +28 -19
  142. package/src/codex/auth-api/login-flow.ts +68 -33
  143. package/src/codex/auth-api/main-account-probe.ts +3 -3
  144. package/src/codex/auth-api/pool-quota-probe.ts +8 -7
  145. package/src/codex/auth-api/routes.ts +1 -1
  146. package/src/codex/catalog/aggregation.ts +22 -10
  147. package/src/codex/catalog/gather-capture.ts +11 -2
  148. package/src/codex/catalog/m365-copilot-models.ts +52 -0
  149. package/src/codex/catalog/provider-models.ts +126 -53
  150. package/src/codex/catalog/routed-gather.ts +26 -12
  151. package/src/codex/catalog-admission.ts +4 -6
  152. package/src/codex/catalog-auto-refresh.ts +4 -2
  153. package/src/codex/catalog-self-heal.ts +4 -2
  154. package/src/codex/control-plane-models.ts +6 -0
  155. package/src/codex/convergence.ts +10 -0
  156. package/src/codex/desktop-app/picker-freshness.ts +3 -14
  157. package/src/codex/desktop-app/types.ts +6 -0
  158. package/src/codex/desktop-app/windows-command-payload.ts +9 -0
  159. package/src/codex/desktop-app/windows.ts +20 -12
  160. package/src/codex/desktop-compatibility/installed-build.ts +61 -58
  161. package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
  162. package/src/codex/desktop-compatibility/runtime.ts +51 -14
  163. package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
  164. package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
  165. package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
  166. package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
  167. package/src/codex/inject/config-toml.ts +67 -73
  168. package/src/codex/inject/plan.ts +11 -10
  169. package/src/codex/inject/remove.ts +4 -1
  170. package/src/codex/inject.ts +1 -0
  171. package/src/codex/journal-config-restore.ts +31 -4
  172. package/src/codex/journal.ts +16 -4
  173. package/src/codex/model-cache.ts +98 -27
  174. package/src/codex/native-residue.ts +14 -13
  175. package/src/codex/paths.ts +65 -28
  176. package/src/codex/quota-observation-freshness.ts +4 -0
  177. package/src/codex/quota.ts +71 -8
  178. package/src/codex/routing/selection.ts +32 -8
  179. package/src/combos/capability-policy.ts +31 -0
  180. package/src/combos/failover.ts +82 -74
  181. package/src/combos/identifiers.ts +2 -2
  182. package/src/combos/index.ts +3 -0
  183. package/src/combos/jev-model-backend.ts +12 -4
  184. package/src/combos/jev-session-pin-config.ts +22 -9
  185. package/src/combos/jev.ts +15 -4
  186. package/src/combos/request-capability.ts +214 -0
  187. package/src/combos/request.ts +22 -15
  188. package/src/combos/resolve.ts +5 -2
  189. package/src/combos/suggestion-channel.ts +89 -0
  190. package/src/combos/types.ts +14 -1
  191. package/src/config/account-auto-pause-revisions.ts +33 -10
  192. package/src/config/atomic-write.ts +1 -1
  193. package/src/config/codex-ws-incremental-setting.ts +34 -0
  194. package/src/config/diagnostics.ts +47 -8
  195. package/src/config/live-topology.ts +4 -2
  196. package/src/config/load-degrade.ts +96 -2
  197. package/src/config/mutation-lock.ts +7 -3
  198. package/src/config/paths.ts +3 -0
  199. package/src/config/pending-teardown.ts +19 -3
  200. package/src/config/process-state.ts +30 -12
  201. package/src/config/provider-validation.ts +10 -0
  202. package/src/config/salvage.ts +2 -2
  203. package/src/config/schema/account-auto-pause.ts +15 -1
  204. package/src/config/schema/agy-acp-references.ts +257 -0
  205. package/src/config/schema/config-schema.ts +32 -0
  206. package/src/config/schema/leaf-validators.ts +42 -0
  207. package/src/config/schema/subscription-reserve.ts +33 -0
  208. package/src/config/windows-process-command-line.ts +27 -9
  209. package/src/config.ts +6 -0
  210. package/src/generated/compatibility-version.json +806 -402
  211. package/src/images/loop.ts +79 -39
  212. package/src/integrations/catalog-refresh.ts +19 -1
  213. package/src/integrations/gateway-clients/agy.ts +340 -0
  214. package/src/integrations/gateway-clients/antigravity.ts +224 -0
  215. package/src/integrations/gateway-clients/index.ts +89 -0
  216. package/src/integrations/gateway-clients/io.ts +278 -0
  217. package/src/integrations/gateway-clients/types.ts +80 -0
  218. package/src/integrations/route-intent-disconnect.ts +37 -21
  219. package/src/lib/app-owned-memory-stores.ts +9 -0
  220. package/src/lib/cloud-code-appeal-link.ts +30 -0
  221. package/src/lib/errors.ts +32 -0
  222. package/src/lib/executor-physical-send-receipt.ts +42 -0
  223. package/src/lib/failure-detail.ts +1 -0
  224. package/src/lib/gcp-adc.ts +5 -0
  225. package/src/lib/http-date.ts +91 -0
  226. package/src/lib/lab-passive-linker-registration.ts +2 -1
  227. package/src/lib/local-chat-completion.ts +13 -3
  228. package/src/lib/local-internal-call-capability.ts +1 -3
  229. package/src/lib/messages-error-body.ts +2 -1
  230. package/src/lib/outbound-credential-registry.ts +40 -4
  231. package/src/lib/pinned-http.ts +7 -2
  232. package/src/lib/process-control.ts +1 -0
  233. package/src/lib/provider-egress.ts +16 -0
  234. package/src/lib/provider-outbound.ts +3 -0
  235. package/src/lib/redact-folding.ts +12 -3
  236. package/src/lib/redact.ts +37 -19
  237. package/src/lib/request-execution-budget.ts +241 -32
  238. package/src/lib/request-peer-scope.ts +64 -0
  239. package/src/lib/response-send-readings.ts +41 -0
  240. package/src/lib/state-store-registrations.ts +5 -0
  241. package/src/lib/tool-envelope-echo-filter.ts +33 -5
  242. package/src/lib/upstream-condition.ts +10 -3
  243. package/src/lib/upstream-retry.ts +95 -20
  244. package/src/lib/windows-secret-acl.ts +24 -7
  245. package/src/link/child-activity.ts +60 -4
  246. package/src/link/codex-settings.ts +2 -1
  247. package/src/link/relay-auth.ts +1 -0
  248. package/src/link/route-rounds.ts +32 -9
  249. package/src/link/status-projection.ts +42 -5
  250. package/src/link/supervisor.ts +96 -11
  251. package/src/link/tunnel-history.ts +5 -0
  252. package/src/oauth/account-auto-pause-policy.ts +72 -19
  253. package/src/oauth/account-auto-pause.ts +40 -16
  254. package/src/oauth/anthropic-account-refusal.ts +7 -0
  255. package/src/oauth/anthropic-continuity.ts +70 -9
  256. package/src/oauth/anthropic-identity.ts +75 -11
  257. package/src/oauth/anthropic-login-slot.ts +258 -0
  258. package/src/oauth/anthropic-routing.ts +24 -9
  259. package/src/oauth/anthropic-send-ownership.ts +4 -3
  260. package/src/oauth/anthropic.ts +30 -11
  261. package/src/oauth/health.ts +7 -2
  262. package/src/oauth/index.ts +50 -48
  263. package/src/oauth/key-providers.ts +2 -0
  264. package/src/oauth/login-cli.ts +11 -0
  265. package/src/oauth/login-flow-state.ts +10 -4
  266. package/src/oauth/m365-copilot-browser.ts +222 -0
  267. package/src/oauth/m365-copilot-web-session.ts +25 -0
  268. package/src/oauth/m365-copilot.ts +57 -0
  269. package/src/oauth/model-discovery-auth.ts +5 -0
  270. package/src/oauth/plan.ts +44 -0
  271. package/src/oauth/pool-kernel.ts +22 -8
  272. package/src/oauth/pool-settings-capability.ts +14 -3
  273. package/src/oauth/reauth-precheck.ts +27 -0
  274. package/src/oauth/store-anthropic-instance.ts +3 -1
  275. package/src/oauth/store.ts +121 -23
  276. package/src/oauth/types.ts +27 -2
  277. package/src/protocols/codecs/chat-ir.ts +7 -4
  278. package/src/protocols/codecs/gemini-interactions.ts +770 -0
  279. package/src/protocols/codecs/gemini.ts +470 -0
  280. package/src/protocols/contract.ts +2 -0
  281. package/src/protocols/encoders/adapter-events.ts +5 -3
  282. package/src/protocols/encoders/chat.ts +23 -7
  283. package/src/protocols/settings.ts +3 -0
  284. package/src/providers/account-quota-disk.ts +26 -8
  285. package/src/providers/api-key-pause.ts +2 -2
  286. package/src/providers/api-key-response-ownership.ts +14 -4
  287. package/src/providers/claude-cli-usage-state.ts +1 -0
  288. package/src/providers/claude-cli-usage.ts +24 -7
  289. package/src/providers/default-aliases.ts +11 -5
  290. package/src/providers/derive.ts +5 -1
  291. package/src/providers/fastwire.ts +6 -5
  292. package/src/providers/free-directory.ts +2 -2
  293. package/src/providers/google-vertex-location.ts +2 -1
  294. package/src/providers/google-vertex-model-discovery.ts +22 -0
  295. package/src/providers/key-failover.ts +18 -23
  296. package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
  297. package/src/providers/m365-copilot-discovery.ts +68 -0
  298. package/src/providers/m365-copilot-models.ts +32 -0
  299. package/src/providers/model-rename-fields.ts +6 -0
  300. package/src/providers/new-model-policy-runtime.ts +27 -6
  301. package/src/providers/openai-forward-destination.ts +19 -0
  302. package/src/providers/openai-tiers-destination.ts +3 -19
  303. package/src/providers/quota/account-cache.ts +183 -27
  304. package/src/providers/quota/anthropic-account-quota.ts +21 -17
  305. package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
  306. package/src/providers/quota/anthropic-decision-windows.ts +7 -3
  307. package/src/providers/quota/anthropic-usage-windows.ts +34 -4
  308. package/src/providers/quota/antigravity-account-probe.ts +165 -0
  309. package/src/providers/quota/antigravity.ts +71 -3
  310. package/src/providers/quota/vendor-probes-oauth.ts +52 -28
  311. package/src/providers/quota-decision-publication.ts +1 -1
  312. package/src/providers/quota-decision-snapshot.ts +4 -1
  313. package/src/providers/quota-types.ts +2 -0
  314. package/src/providers/quota.ts +8 -7
  315. package/src/providers/registry/agy-acp-models.ts +3 -0
  316. package/src/providers/registry/entries-core.ts +9 -0
  317. package/src/providers/registry/entries-extended.ts +60 -0
  318. package/src/providers/registry/model-seeds.ts +51 -0
  319. package/src/providers/request-pacing.ts +37 -7
  320. package/src/providers/service-tier.ts +2 -0
  321. package/src/providers/xai-privacy-mode.ts +52 -0
  322. package/src/remote/hub-management-relay.ts +74 -0
  323. package/src/responses/id-limits.ts +2 -0
  324. package/src/responses/input-media.ts +15 -3
  325. package/src/responses/parser-tools.ts +74 -11
  326. package/src/responses/parser.ts +16 -14
  327. package/src/responses/provider-opaque-metadata.ts +10 -0
  328. package/src/responses/reasoning-envelope.ts +3 -0
  329. package/src/responses/schema.ts +2 -3
  330. package/src/responses/spill-store.ts +5 -3
  331. package/src/responses/state/connection-scope.ts +232 -0
  332. package/src/responses/state/entry-types.ts +47 -0
  333. package/src/responses/state/snapshot-codec.ts +75 -14
  334. package/src/responses/state/snapshot-select.ts +2 -0
  335. package/src/responses/state/spill-codec.ts +59 -0
  336. package/src/responses/state/spill-queue.ts +11 -2
  337. package/src/responses/state.ts +178 -159
  338. package/src/router.ts +2 -6
  339. package/src/routing/compatibility/behavior.ts +6 -2
  340. package/src/routing/compatibility/subject.ts +17 -12
  341. package/src/routing/machine-weighted-routing.ts +58 -0
  342. package/src/server/advisor-admission-scope.ts +15 -7
  343. package/src/server/auth-cors.ts +27 -0
  344. package/src/server/chat-completions.ts +37 -17
  345. package/src/server/chat-native-eligibility.ts +21 -0
  346. package/src/server/chat-native.ts +15 -6
  347. package/src/server/claude-messages.ts +54 -6
  348. package/src/server/credential-recovery-attempt.ts +32 -0
  349. package/src/server/effort-policy.ts +6 -3
  350. package/src/server/gemini-inbound.ts +267 -0
  351. package/src/server/gemini-interactions-inbound.ts +229 -0
  352. package/src/server/gemini-interactions-store.ts +129 -0
  353. package/src/server/gemini-native-catalog.ts +64 -0
  354. package/src/server/gemini-native-log.ts +33 -0
  355. package/src/server/gemini-native-paths.ts +88 -0
  356. package/src/server/gemini-native-wire.ts +201 -0
  357. package/src/server/gemini-native.ts +218 -0
  358. package/src/server/grok-upstream-envelope-echo.ts +8 -2
  359. package/src/server/hub-relay-auth.ts +87 -0
  360. package/src/server/hub-usage-windows.ts +135 -0
  361. package/src/server/hub-usage.ts +16 -3
  362. package/src/server/inbound-body-admission.ts +2 -1
  363. package/src/server/index/anthropic-model-listing.ts +75 -0
  364. package/src/server/index/gemini-routes.ts +147 -0
  365. package/src/server/index/link-management.ts +3 -22
  366. package/src/server/index/link-relay-sessions.ts +71 -13
  367. package/src/server/index/link-websocket.ts +2 -0
  368. package/src/server/index/passive-management-read.ts +55 -0
  369. package/src/server/index/serve-options.ts +93 -107
  370. package/src/server/index/websocket-handler.ts +15 -2
  371. package/src/server/index.ts +10 -0
  372. package/src/server/inference/client-encoder-delivery.ts +2 -1
  373. package/src/server/inference/context.ts +33 -6
  374. package/src/server/management/agent-settings-routes.ts +33 -16
  375. package/src/server/management/claude-code-settings-patch.ts +6 -0
  376. package/src/server/management/combo-routes.ts +21 -1
  377. package/src/server/management/combo-suggestion-routes.ts +212 -0
  378. package/src/server/management/config-routes.ts +12 -4
  379. package/src/server/management/context.ts +2 -0
  380. package/src/server/management/gateway-client-routes.ts +62 -0
  381. package/src/server/management/integration-routes.ts +5 -0
  382. package/src/server/management/link-routes.ts +5 -1
  383. package/src/server/management/m365-copilot-provider-probe.ts +23 -0
  384. package/src/server/management/model-routes.ts +32 -2
  385. package/src/server/management/model-rows.ts +36 -3
  386. package/src/server/management/oauth-account-routes.ts +68 -15
  387. package/src/server/management/protocol-settings-patch.ts +1 -0
  388. package/src/server/management/provider-omitted-fields.ts +25 -0
  389. package/src/server/management/provider-overwrite-carry.ts +33 -8
  390. package/src/server/management/provider-routes.ts +10 -16
  391. package/src/server/management/request-history-routes.ts +2 -2
  392. package/src/server/management/route-registry.ts +10 -0
  393. package/src/server/management/shared.ts +118 -30
  394. package/src/server/management/sibling-guard.ts +2 -1
  395. package/src/server/management/system-routes.ts +6 -0
  396. package/src/server/management-auth.ts +8 -1
  397. package/src/server/messages-native-scope.ts +19 -0
  398. package/src/server/messages-native.ts +156 -59
  399. package/src/server/messages-shared.ts +6 -0
  400. package/src/server/models-capabilities.ts +24 -0
  401. package/src/server/native-chat-bridge.ts +259 -0
  402. package/src/server/ollama-inbound.ts +36 -184
  403. package/src/server/passive-route-linker.ts +3 -1
  404. package/src/server/port-reclaim.ts +48 -4
  405. package/src/server/proxy-liveness.ts +79 -22
  406. package/src/server/relay.ts +16 -9
  407. package/src/server/request-log-account-rotation.ts +2 -1
  408. package/src/server/request-log-attempt-recovery.ts +24 -2
  409. package/src/server/request-log-attempt-usage.ts +5 -4
  410. package/src/server/request-log-committed-terminal.ts +87 -0
  411. package/src/server/request-log-failure-attribution.ts +3 -3
  412. package/src/server/request-log-failure-detail.ts +34 -0
  413. package/src/server/request-log-key-failure.ts +27 -0
  414. package/src/server/request-log-terminal-status.ts +25 -12
  415. package/src/server/request-log.ts +59 -63
  416. package/src/server/responses/adapter-continuation.ts +77 -44
  417. package/src/server/responses/adapter-delivery.ts +47 -22
  418. package/src/server/responses/adapter-dispatch.ts +150 -149
  419. package/src/server/responses/advisor-retention.ts +12 -4
  420. package/src/server/responses/advisor-slot.ts +97 -2
  421. package/src/server/responses/agent-task-recovery.ts +44 -11
  422. package/src/server/responses/agy-acp-preflight.ts +41 -0
  423. package/src/server/responses/anthropic-image-context.ts +44 -0
  424. package/src/server/responses/antigravity-validation-refusal.ts +25 -1
  425. package/src/server/responses/buffered-sse-json.ts +18 -1
  426. package/src/server/responses/codex-ws-correlation.ts +5 -2
  427. package/src/server/responses/codex-ws-exchange.ts +91 -8
  428. package/src/server/responses/codex-ws-incremental.ts +136 -0
  429. package/src/server/responses/codex-ws-pool.ts +22 -8
  430. package/src/server/responses/codex-ws-request.ts +5 -0
  431. package/src/server/responses/codex-ws-send-accounting.ts +8 -0
  432. package/src/server/responses/codex-ws-session.ts +14 -0
  433. package/src/server/responses/codex-ws-wire.ts +44 -22
  434. package/src/server/responses/combo-admission-snapshot.ts +93 -0
  435. package/src/server/responses/combo-required-tool-stream.ts +16 -4
  436. package/src/server/responses/combo-selection-keepalive.ts +5 -0
  437. package/src/server/responses/combo-stream-preflight.ts +182 -73
  438. package/src/server/responses/compact-response-body.ts +27 -0
  439. package/src/server/responses/compact.ts +174 -121
  440. package/src/server/responses/compaction-recovery.ts +7 -0
  441. package/src/server/responses/core-codex-account.ts +88 -62
  442. package/src/server/responses/core-combo-failure.ts +15 -0
  443. package/src/server/responses/core-combo-native.ts +12 -1
  444. package/src/server/responses/core-combo.ts +340 -94
  445. package/src/server/responses/core-normalize.ts +19 -12
  446. package/src/server/responses/core-opaque-recovery.ts +15 -4
  447. package/src/server/responses/core-options.ts +50 -5
  448. package/src/server/responses/core-pipeline.ts +11 -0
  449. package/src/server/responses/core.ts +7 -1
  450. package/src/server/responses/empty-completion-guard.ts +21 -7
  451. package/src/server/responses/estimated-usage.ts +2 -1
  452. package/src/server/responses/fetch-helpers.ts +95 -19
  453. package/src/server/responses/history-slim.ts +204 -0
  454. package/src/server/responses/hosted-advisor-spend.ts +49 -0
  455. package/src/server/responses/image-context-recovery.ts +199 -0
  456. package/src/server/responses/input-admission.ts +36 -11
  457. package/src/server/responses/jev-model-invoke.ts +23 -16
  458. package/src/server/responses/non-replayable-error.ts +12 -2
  459. package/src/server/responses/passthrough-build-error.ts +5 -3
  460. package/src/server/responses/passthrough-delivery.ts +74 -33
  461. package/src/server/responses/passthrough-dispatch.ts +170 -197
  462. package/src/server/responses/policy-fallback.ts +7 -2
  463. package/src/server/responses/policy-request-scope.ts +36 -2
  464. package/src/server/responses/replay-owner.ts +20 -0
  465. package/src/server/responses/request-prepare.ts +97 -16
  466. package/src/server/responses/request-send-budget.ts +97 -25
  467. package/src/server/responses/request-sidecar-auth.ts +138 -65
  468. package/src/server/responses/request-spend-target.ts +13 -1
  469. package/src/server/responses/request-spend.ts +228 -47
  470. package/src/server/responses/request-transport.ts +395 -70
  471. package/src/server/responses/run-turn-execution.ts +40 -9
  472. package/src/server/responses/sidecar-execution.ts +214 -67
  473. package/src/server/responses/sidecar-send-budget.ts +9 -9
  474. package/src/server/responses/terminal-guard.ts +35 -9
  475. package/src/server/responses/ws-upstream.ts +27 -6
  476. package/src/server/responses-phase-inference.ts +32 -9
  477. package/src/server/responses-terminal-repair.ts +14 -35
  478. package/src/server/system-env.ts +8 -5
  479. package/src/server/ws-bridge.ts +23 -17
  480. package/src/service/health-sentinel-linux.ts +16 -7
  481. package/src/service/systemd.ts +11 -2
  482. package/src/service/windows-checked-stop-live.ts +60 -55
  483. package/src/service/windows-checked-stop.ts +29 -11
  484. package/src/service/windows-guarded-manager.ts +14 -26
  485. package/src/service/windows-process-evidence.ts +82 -74
  486. package/src/service/windows-process-native.ts +69 -20
  487. package/src/service/windows-service-stop.ts +14 -12
  488. package/src/service/windows-stop-binding.ts +14 -5
  489. package/src/service/windows-stop-confirm.ts +1 -1
  490. package/src/service/windows-task-instance-stop.ts +98 -0
  491. package/src/service/windows-taskxml.ts +30 -7
  492. package/src/sidecar/anthropic-binding.ts +1 -1
  493. package/src/stall-timeout.ts +30 -0
  494. package/src/telemetry/aggregate.ts +6 -3
  495. package/src/types/account-auto-pause.ts +19 -1
  496. package/src/types/accounts.ts +21 -0
  497. package/src/types/anthropic-account-pool.ts +1 -1
  498. package/src/types/combo-capability-policy.ts +19 -0
  499. package/src/types/config.ts +22 -2
  500. package/src/types/provider.ts +42 -8
  501. package/src/types/request.ts +15 -0
  502. package/src/types/tools.ts +22 -5
  503. package/src/types/wire.ts +1 -0
  504. package/src/types.ts +4 -0
  505. package/src/update/check-types.ts +2 -0
  506. package/src/update/job.ts +8 -3
  507. package/src/update/managed-release.ts +6 -0
  508. package/src/update/orchestrated-entry.ts +13 -4
  509. package/src/update/refresh-scheduler.ts +17 -7
  510. package/src/usage/attempt-delivery.ts +6 -0
  511. package/src/usage/cache-provenance.ts +71 -0
  512. package/src/usage/cost.ts +216 -27
  513. package/src/usage/credit-billing.ts +88 -0
  514. package/src/usage/jev-stats.ts +13 -9
  515. package/src/usage/log.ts +5 -33
  516. package/src/usage/summary.ts +8 -43
  517. package/src/usage/user-cost-overlays.ts +13 -1
  518. package/src/vision/index.ts +8 -3
  519. package/src/vision/plan.ts +28 -14
  520. package/src/vision/routed-describe.ts +24 -36
  521. package/src/web-search/header-deadline.ts +14 -3
  522. package/src/web-search/index.ts +6 -4
  523. package/src/web-search/loop.ts +240 -78
  524. package/src/web-search/progress-stream.ts +29 -2
  525. package/src/web-search/run-turn-loop.ts +5 -1
  526. package/gui/dist/assets/App-BGP8I0V4.css +0 -1
  527. package/gui/dist/assets/App-BRExzhwL.js +0 -60
  528. package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
  529. package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
  530. package/gui/dist/assets/index-DJxM-imn.css +0 -2
  531. package/gui/dist/assets/index-Dy1jIGty.js +0 -138
  532. package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
  533. package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
  534. package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
  535. package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
  536. package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
@@ -1,6 +1,7 @@
1
1
  import { randomUUID } from "node:crypto";
2
2
  import type { RequestSendObserver } from "../../lib/request-execution-budget";
3
- import { sharedSpendLedger, sharedSpendPolicy, type SpendReservationLedger, type SpendScopes, type SpendSeed, type SpendReservationProof, type SpendAdmissionPolicy } from "../../lib/spend-reservation-ledger";
3
+ import type { AdapterEvent } from "../../types";
4
+ import { sharedSpendLedger, sharedSpendPolicy, type SpendReservationLedger, type SpendScopes, type SpendSeed, type SpendReservationProof, type SpendAdmissionPolicy, type SpendReservationRequest } from "../../lib/spend-reservation-ledger";
4
5
  import { SpendLedgerOwnerError } from "../../lib/spend-ledger-owner";
5
6
  import { markLocalRequestLogRefusal, type RequestLogContext } from "../request-log";
6
7
  import { chargeWorkflowSends, recordWorkflowRefusalEvent, reserveWorkflowSend, workflowDenialSummary, type WorkflowDenial, type WorkflowSpendDenialDetail } from "../../lib/workflow-budget";
@@ -12,9 +13,42 @@ export interface TerminalSpendUsage {
12
13
  outputTokens?: number;
13
14
  }
14
15
 
16
+ type RecordSendUsage = (usage: TerminalSpendUsage) => void;
17
+ /**
18
+ * Which routed send a reading covers: the send that was newest when the parse started (the one
19
+ * that produced the response being parsed), or the send that is newest now (a retry the parser
20
+ * dispatched itself, whose response it has just finished reading).
21
+ */
22
+ export type RoutedSendReadingCover = "issuing" | "newest";
23
+ const adapterResponseSpend = new WeakMap<Response, RecordSendUsage>();
24
+
25
+ /** Bind an image-recovery response after its retry ladder has finished reporting sends. */
26
+ export function bindAdapterResponseSpend(response: Response, record: RecordSendUsage | undefined): void {
27
+ if (response.ok && record) adapterResponseSpend.set(response, record);
28
+ }
29
+
30
+ /** Observe raw adapter events before guards and bridges merge usage across sends. */
31
+ export function adapterResponseSpendObserver(response: Response): ((event: AdapterEvent) => void) | undefined {
32
+ const record = adapterResponseSpend.get(response);
33
+ if (!record) return;
34
+ return event => {
35
+ if ("usage" in event && event.usage && adapterResponseSpend.delete(response)) record(event.usage);
36
+ };
37
+ }
38
+
15
39
  /** Settles one request's durable spend entries once its terminal usage is known. */
16
40
  export interface RequestSpendSettlement {
17
41
  settle(usage: TerminalSpendUsage | undefined): void;
42
+ /**
43
+ * Bind the usage a routed response reports to the routed send that is latest when its parse
44
+ * starts. Legs run in sequence, so that send is the one that produced the response (#8902).
45
+ * A parser that dispatches its own retry (Kiro's completion retry) reports one reading per
46
+ * physical response; each later reading covers the routed send that is newest when it arrives.
47
+ * A send keeps the first reading bound to it, and a send with none stays unresolved. A null
48
+ * reading marks the send unmetered: its response reported no usage of its own, so it stays
49
+ * unresolved even when it is the last routed send the aggregate fallback would settle.
50
+ */
51
+ captureRoutedSendUsage?(): ((usage: TerminalSpendUsage | null, cover?: RoutedSendReadingCover) => void) | undefined;
18
52
  }
19
53
 
20
54
  export interface SpendTargetIdentity extends SpendScopes {
@@ -29,10 +63,13 @@ export interface SpendTargetIdentity extends SpendScopes {
29
63
  * unkeyed same-scope lookup.
30
64
  */
31
65
  readonly explicitEstimate?: boolean;
66
+ /** An opted-in retry owns a fresh reservation using the request's estimate. */
67
+ readonly freshRetry?: boolean;
32
68
  }
33
69
  export interface RequestSpendReporter {
34
70
  start(seed: SpendSeed, ordinal: number): void;
35
71
  rebindTarget(target: SpendTargetIdentity, ordinal: number): boolean;
72
+ recordUsage(ordinal: number, usage: TerminalSpendUsage | null): void;
36
73
  report(sends: number): void;
37
74
  close(): void;
38
75
  }
@@ -49,6 +86,26 @@ export interface RequestSpendTracker extends RequestSendObserver, RequestSpendSe
49
86
  requestFinalSettlement(usage: TerminalSpendUsage | undefined): void;
50
87
  }
51
88
 
89
+ /** Freeze only the numeric ceilings. Accounting mode is chosen at physical spend admission. */
90
+ export function captureRequestSpendPolicy(policy: SpendAdmissionPolicy = sharedSpendPolicy()): SpendAdmissionPolicy {
91
+ return Object.freeze({ root: Object.freeze({ ...policy.root }), identity: Object.freeze({ ...policy.identity }), pool: Object.freeze({ ...policy.pool }) });
92
+ }
93
+
94
+ /**
95
+ * The aggregate usage left for the last routed send once the other routed sends settled their own
96
+ * readings, so no token is booked twice. Undefined when those readings account for all of it: the
97
+ * last send then reported nothing of its own and stays unresolved.
98
+ */
99
+ function netOfOtherSends(total: TerminalSpendUsage | undefined, others: readonly (TerminalSpendUsage | null | undefined)[]): TerminalSpendUsage | undefined {
100
+ const settled = others.filter((usage): usage is TerminalSpendUsage => usage !== undefined && usage !== null);
101
+ if (!total || settled.length === 0) return total;
102
+ const remaining = (key: keyof TerminalSpendUsage): number | undefined => typeof total[key] === "number"
103
+ ? Math.max(0, total[key] - settled.reduce((sum, usage) => sum + (usage[key] ?? 0), 0)) : undefined;
104
+ const inputTokens = remaining("inputTokens");
105
+ const outputTokens = remaining("outputTokens");
106
+ return inputTokens || outputTokens ? { inputTokens, outputTokens } : undefined;
107
+ }
108
+
52
109
  /**
53
110
  * One request's entries in the durable spend ledger (#4707).
54
111
  *
@@ -62,11 +119,13 @@ export interface RequestSpendTracker extends RequestSendObserver, RequestSpendSe
62
119
  * so one entry per increment is one entry per send -- and a dispatch path added later cannot
63
120
  * forget to book, which is how the previous wiring attempt ended up with no caller at all.
64
121
  *
65
- * Settlement follows what the request actually learned. The terminal usage belongs to the LAST
66
- * send that left, so that one settles with the real figure. Every earlier send failed without
67
- * reporting usage of its own and may still have been billed, so it becomes unresolved spend
68
- * rather than free. A request that ends with no usage at all -- a cancel, a lost stream --
69
- * leaves all of them unresolved, which is the conservative answer this ledger exists to give.
122
+ * Image-recovery receipts carry their own usage, or null if usage is unknown. A request with one
123
+ * routed send settles it with the aggregate terminal usage. When a request makes several routed
124
+ * sends (a terminal-guard re-ask, an empty-completion retry, a hosted-search iteration), each send
125
+ * settles with the usage its own response reported (#8902). The last routed send falls back to the
126
+ * aggregate net of what the other sends reported, and is left unresolved if nothing remains or if
127
+ * its response was marked unmetered. Other unknown sends remain unresolved at their reservation
128
+ * estimates.
70
129
  */
71
130
  export function createRequestSpendTracker(
72
131
  logCtx: Pick<
@@ -75,6 +134,7 @@ export function createRequestSpendTracker(
75
134
  > & Partial<Pick<RequestLogContext, "localTerminalReason" | "terminalSource" | "errorCode" | "spendRefusalDetail">>,
76
135
  rootId: string | undefined,
77
136
  injected?: SpendReservationLedger,
137
+ capturedPolicy?: SpendAdmissionPolicy,
78
138
  ): RequestSpendTracker {
79
139
  // Resolved on the first CHARGE, not when the request is built. The shared ledger opens a
80
140
  // journal under the OpenCodex home, and a request that never dispatches -- refused at
@@ -83,7 +143,10 @@ export function createRequestSpendTracker(
83
143
  let ledgerRef: SpendReservationLedger | undefined = injected;
84
144
  const ledger = (): SpendReservationLedger => (ledgerRef ??= sharedSpendLedger());
85
145
  let admissionPolicy: SpendAdmissionPolicy | undefined;
146
+ const capturePolicy = (): SpendAdmissionPolicy => capturedPolicy ??= captureRequestSpendPolicy(ledgerRef?.policy);
86
147
  let initialEnforced: boolean | undefined;
148
+ let recoveryIdentityCeiling: number | undefined;
149
+ let prepaidSpend: WeakMap<SpendReservationProof, { identityId?: string; tokens: number; hasInputEstimate: boolean }> | undefined;
87
150
  // Outstanding entries; exact dispatch reports move their reservation to the end.
88
151
  const live: string[] = [];
89
152
  const pendingDispatch = new Set<string>();
@@ -95,25 +158,28 @@ export function createRequestSpendTracker(
95
158
  let finalRequested = false;
96
159
  let finalUsage: TerminalSpendUsage | undefined;
97
160
  let reporters = 0;
98
- const seeds = new Map<string, { seed: SpendSeed; started: boolean; reported: boolean; auxiliary: boolean; explicitEstimate: boolean; estimate?: { inputTokens: number; outputCeilingTokens: number } }>();
99
- const auxiliarySendIds = new Set<string>();
161
+ const seeds = new Map<string, { seed: SpendSeed; started: boolean; reported: boolean; auxiliary: boolean; independent: boolean; retryScopes?: SpendScopes; estimate?: { inputTokens: number; outputCeilingTokens: number } }>();
162
+ const nonTerminalSendIds = new Set<string>();
100
163
  // Abandoned capabilities retain cleanup ownership, never admission lookup.
101
164
  const retiredSeeds = new Set<SpendSeed>();
102
165
  const resolvedSendIds = new Set<string>();
103
166
  const completedSeeds = new Set<SpendSeed>();
104
- const physical = new Map<number, { seed: SpendSeed; sendId?: string; reportPending?: boolean; reportComplete?: boolean; estimate?: { inputTokens: number; outputCeilingTokens: number } }>();
167
+ const physical = new Map<number, { seed: SpendSeed; sendId?: string; reportPending?: boolean; reportComplete?: boolean;
168
+ estimate?: { inputTokens: number; outputCeilingTokens: number }; usage?: TerminalSpendUsage | null; observed?: TerminalSpendUsage | null }>();
169
+ // Legacy (unseeded) sends keyed by send id: the usage each routed response reported, or null
170
+ // when the response was marked unmetered.
171
+ const observedLegacy = new Map<string, TerminalSpendUsage | null>();
105
172
  const selectedScopes = (target: SpendTargetIdentity = {}): SpendScopes => ({
106
173
  ...(rootId !== undefined ? { rootId } : {}),
107
174
  ...(target.identityId ?? logCtx.accountLogLabel ? { identityId: target.identityId ?? logCtx.accountLogLabel } : {}),
108
175
  ...(target.poolId ?? logCtx.spendPoolId ?? logCtx.provider ? { poolId: target.poolId ?? logCtx.spendPoolId ?? logCtx.provider } : {}),
109
176
  });
110
- const applicable = (scopes: SpendScopes): boolean => {
111
- if (initialEnforced !== undefined) return initialEnforced;
112
- const policy = admissionPolicy ?? ledgerRef?.policy ?? sharedSpendPolicy();
113
- return (scopes.rootId !== undefined && policy.root.maxTokens !== undefined)
114
- || (scopes.identityId !== undefined && policy.identity.maxTokens !== undefined)
115
- || (scopes.poolId !== undefined && policy.pool.maxTokens !== undefined);
116
- };
177
+ const policyApplies = (policy: SpendAdmissionPolicy, scopes: SpendScopes): boolean =>
178
+ (scopes.rootId !== undefined && policy.root.maxTokens !== undefined)
179
+ || (scopes.identityId !== undefined && policy.identity.maxTokens !== undefined)
180
+ || (scopes.poolId !== undefined && policy.pool.maxTokens !== undefined);
181
+ const applicable = (scopes: SpendScopes): boolean => initialEnforced
182
+ ?? policyApplies(admissionPolicy ?? capturedPolicy ?? ledgerRef?.policy ?? sharedSpendPolicy(), scopes);
117
183
  const estimates = () => ({ inputTokens: logCtx.spendInputEstimateTokens ?? logCtx.usageLogInputTokens ?? 0,
118
184
  outputCeilingTokens: logCtx.spendOutputCeilingTokens ?? 0 });
119
185
  const seedState = (seed: SpendSeed) => [...seeds.values()].find(state => state.seed === seed);
@@ -125,13 +191,24 @@ export function createRequestSpendTracker(
125
191
  retryPhysicalReports();
126
192
  // All starts are booked before producers close. Ordinal, never callback order, owns usage.
127
193
  const entries = [...physical.entries()].sort((a, b) => a[0] - b[0]);
128
- const terminal = entries.findLast(([, entry]) => entry.sendId && !auxiliarySendIds.has(entry.sendId))?.[1].sendId;
194
+ const terminal = entries.findLast(([, entry]) => entry.sendId && !nonTerminalSendIds.has(entry.sendId))?.[1].sendId;
195
+ const routed = entries.filter(([, entry]) => entry.sendId && !nonTerminalSendIds.has(entry.sendId)).map(([, entry]) => entry);
196
+ const perSend = routed.length > 1;
197
+ const terminalFallback = perSend
198
+ ? netOfOtherSends(finalUsage, routed.filter(entry => entry.sendId !== terminal && entry.usage === undefined).map(entry => entry.observed))
199
+ : finalUsage;
129
200
  const ids: string[] = [];
130
201
  for (const [, entry] of entries) {
131
202
  if (!entry.sendId) return false;
132
- const reported = entry.sendId === terminal && (typeof finalUsage?.inputTokens === "number" || typeof finalUsage?.outputTokens === "number");
203
+ // Recovery pins set null at dispatch to opt this receipt out of the aggregate fallback.
204
+ // An unmetered response (observed null) opts out the same way.
205
+ const usage = entry.usage !== undefined ? entry.usage
206
+ : entry.observed === null ? null
207
+ : perSend && entry.observed ? entry.observed
208
+ : entry.sendId === terminal ? terminalFallback : undefined;
209
+ const reported = typeof usage?.inputTokens === "number" || typeof usage?.outputTokens === "number";
133
210
  if (!resolvedSendIds.has(entry.sendId)) {
134
- const ok = reported ? ledger().settle(entry.sendId, { inputTokens: finalUsage?.inputTokens ?? 0, outputTokens: finalUsage?.outputTokens ?? 0 })
211
+ const ok = reported ? ledger().settle(entry.sendId, { inputTokens: usage?.inputTokens ?? 0, outputTokens: usage?.outputTokens ?? 0 })
135
212
  : ledger().markLost(entry.sendId);
136
213
  if (!ok) return false;
137
214
  resolvedSendIds.add(entry.sendId);
@@ -242,6 +319,32 @@ export function createRequestSpendTracker(
242
319
  recordWorkflowRefusalEvent(rootId, "workflow-sends-exhausted");
243
320
  return false;
244
321
  };
322
+ const reserveObservedRecovery = (request: SpendReservationRequest, proof: SpendReservationProof | undefined) => {
323
+ const identityId = request.scopes.identityId;
324
+ if (resolved || !identityId || !proof || proof.ledger !== ledgerRef) return undefined;
325
+ const delta = prepaidSpend?.get(proof);
326
+ if (!delta) return undefined;
327
+ const bookedLedger = proof.ledger;
328
+ try {
329
+ const missingAccountTokens = (delta.identityId === identityId ? 0 : delta.tokens)
330
+ + (delta.hasInputEstimate ? 0 : request.inputTokens);
331
+ if (missingAccountTokens > 0) {
332
+ // Keep the delta's missing account liability live through resend admission.
333
+ // Preserve any prepaid output cap and estimate unpriced input at the full frame cost.
334
+ const booking = bookedLedger.reserve({ sendId: randomUUID(), scopes: { identityId },
335
+ inputTokens: missingAccountTokens, outputCeilingTokens: 0, admissionPolicy: request.admissionPolicy, alreadySent: true });
336
+ if (!booking.reserved) return booking;
337
+ live.push(booking.sendId);
338
+ nonTerminalSendIds.add(booking.sendId);
339
+ prepaidSpend?.delete(proof);
340
+ if (!bookedLedger.markDispatched(booking.sendId) || !booking.durable) return undefined;
341
+ }
342
+ return bookedLedger.reserve(request);
343
+ } catch (error) {
344
+ if (error instanceof SpendLedgerOwnerError) return undefined;
345
+ throw error;
346
+ }
347
+ };
245
348
  const tracker: RequestSpendTracker = {
246
349
  recordWorkflowSend() { chargeWorkflowSends(rootId, 1); },
247
350
  beforePhysicalSend(auxiliary = false) {
@@ -249,20 +352,27 @@ export function createRequestSpendTracker(
249
352
  },
250
353
  startRequest(target) {
251
354
  if (admissionPolicy) return;
252
- const policy = ledgerRef?.policy ?? sharedSpendPolicy();
253
- admissionPolicy = Object.freeze({ root: Object.freeze({ ...policy.root }), identity: Object.freeze({ ...policy.identity }), pool: Object.freeze({ ...policy.pool }) });
355
+ admissionPolicy = capturePolicy();
254
356
  initialEnforced = applicable(selectedScopes(target));
255
- if (!initialEnforced) admissionPolicy = Object.freeze({ root: Object.freeze({}), identity: Object.freeze({}), pool: Object.freeze({}) });
357
+ if (!initialEnforced) {
358
+ recoveryIdentityCeiling = admissionPolicy.identity.maxTokens;
359
+ admissionPolicy = Object.freeze({ root: Object.freeze({}), identity: Object.freeze({}), pool: Object.freeze({}) });
360
+ }
256
361
  },
362
+ // Combo prepayment can fix observe-only accounting before its child has an identity.
363
+ // Optional hosted work still consults the original ceilings, never the live ledger policy.
364
+ hasCapturedSpendCeiling(target) { return policyApplies(capturePolicy(), selectedScopes(target)); },
257
365
  get enforced(): boolean { return applicable(selectedScopes()); },
258
366
  get policyStarted(): boolean { return admissionPolicy !== undefined; },
259
- get spendAdmissionPolicy(): SpendAdmissionPolicy | undefined { return admissionPolicy; },
367
+ get spendAdmissionPolicy(): SpendAdmissionPolicy | undefined { return admissionPolicy ?? capturedPolicy; },
260
368
  ensureSeed(target, prepaidProof) {
261
369
  tracker.startRequest?.(target);
262
370
  if (resolved || finalRequested && reporters === 0) return undefined;
263
371
  const scopes = selectedScopes(target);
264
372
  if (!applicable(scopes)) return undefined;
265
- const key = JSON.stringify([scopes.rootId, scopes.identityId, scopes.poolId, target.targetKey]);
373
+ const independent = target.explicitEstimate === true || target.freshRetry === true;
374
+ const key = JSON.stringify([scopes.rootId, scopes.identityId, scopes.poolId, target.targetKey,
375
+ ...(target.freshRetry ? [randomUUID()] : [])]);
266
376
  const existing = seeds.get(key);
267
377
  if (existing) return existing.seed;
268
378
  if (prepaidProof?.ledger === ledger()) {
@@ -275,33 +385,34 @@ export function createRequestSpendTracker(
275
385
  }
276
386
  }
277
387
  }
278
- if (target.targetKey === undefined) {
388
+ if (target.targetKey === undefined && !target.freshRetry) {
279
389
  const same = [...seeds.entries()].find(([candidate, candidateState]) => {
280
390
  const identity = JSON.parse(candidate) as Array<string | undefined>;
281
- return candidateState.explicitEstimate !== true
391
+ return !candidateState.independent
282
392
  && identity[0] === (scopes.rootId ?? null) && identity[1] === (scopes.identityId ?? null) && identity[2] === (scopes.poolId ?? null);
283
393
  });
284
394
  if (same) return same[1].seed;
285
395
  }
286
396
  // Rebind an unused provisional anchor before selection changes. Dispatched anchors stay
287
- // live, and an explicit-estimate successor neither retires nor is retired by another leg:
397
+ // live, and an independent send neither retires nor is retired by another leg:
288
398
  // both directions would destroy a booking its own reporter still owns.
289
- for (const [oldKey, state] of seeds) if (!state.started && !state.explicitEstimate && !target.auxiliary && target.explicitEstimate !== true) {
399
+ for (const [oldKey, state] of seeds) if (!state.started && !state.independent && !target.auxiliary && !independent) {
290
400
  if (!retireSeed(oldKey, state.seed)) return undefined;
291
401
  }
292
402
  // Exact prepaid proofs originate from this tracker and are found above; foreign receipts
293
403
  // cannot enroll arbitrary scopes. Normal reservation remains the only initial admission.
294
404
  if (prepaidProof && prepaidProof.ledger !== ledger()) return undefined;
295
- const estimate = target.auxiliary || target.explicitEstimate ? target.estimate : undefined;
405
+ const estimate = target.freshRetry ? target.estimate ?? estimates()
406
+ : target.auxiliary || target.explicitEstimate ? target.estimate : undefined;
296
407
  const decision = ledger().reserveSeed({ sendId: randomUUID(), scopes, ...(estimate ?? estimates()), admissionPolicy }, tracker);
297
408
  if (!decision.reserved) {
298
409
  // Use the established denial mapping without making another reservation.
299
- refusal(decision.denial, !target.auxiliary);
410
+ refusal(decision.denial, !target.auxiliary && !target.freshRetry);
300
411
  return undefined;
301
412
  }
302
413
  seededAccounting = true;
303
414
  seeds.set(key, { seed: decision.seed, started: false, reported: false, auxiliary: target.auxiliary === true,
304
- explicitEstimate: target.explicitEstimate === true, estimate });
415
+ independent, estimate, ...(target.freshRetry ? { retryScopes: scopes } : {}) });
305
416
  return decision.seed;
306
417
  },
307
418
  releaseSeed(seed) {
@@ -331,17 +442,31 @@ export function createRequestSpendTracker(
331
442
  const owned = starts.find(start => start.ordinal === ordinal);
332
443
  if (closed || !entry || !owned || entry.sendId) throw new Error("Invalid spend reporter rebind");
333
444
  const old = seedState(entry.seed)!;
445
+ if (old.retryScopes) {
446
+ const next = selectedScopes(target);
447
+ if (old.retryScopes.identityId === next.identityId && old.retryScopes.poolId === next.poolId) return true;
448
+ }
334
449
  // A helper start is provisional until selection reaches the executor. If this is
335
450
  // the first start on its seed, abandon/rebind at NORMAL capacity before the wire.
336
451
  physical.delete(ordinal);
337
452
  old.started = [...physical.values()].some(start => start.seed === old.seed);
338
- const seed = tracker.ensureSeed(target);
339
- if (!seed) { starts.splice(starts.indexOf(owned), 1); return false; }
453
+ let seed: SpendSeed | undefined;
454
+ try {
455
+ if (old.retryScopes) tracker.releaseSeed?.(old.seed);
456
+ seed = tracker.ensureSeed(old.retryScopes ? { ...target, estimate: old.estimate, freshRetry: true } : target);
457
+ } finally {
458
+ if (!seed) starts.splice(starts.indexOf(owned), 1);
459
+ }
460
+ if (!seed) return false;
340
461
  physical.set(ordinal, { seed });
341
462
  owned.seed = seed;
342
463
  seedState(seed)!.started = true;
343
464
  return true;
344
465
  },
466
+ recordUsage(ordinal, usage) {
467
+ const entry = physical.get(ordinal);
468
+ if (!resolved && entry && starts.some(start => start.ordinal === ordinal)) entry.usage = usage;
469
+ },
345
470
  report(sends) {
346
471
  if (closed) return;
347
472
  const count = Number.isFinite(sends) ? Math.max(0, Math.trunc(sends)) : 0;
@@ -372,7 +497,7 @@ export function createRequestSpendTracker(
372
497
  entry.reportPending = true;
373
498
  const firstOrdinal = [...physical.entries()].filter(([, send]) => send.seed === seed).map(([order]) => order).sort((a, b) => a - b)[0];
374
499
  const sendId = entry.sendId ??= ordinal === firstOrdinal ? seed.sendId : randomUUID();
375
- if (state.auxiliary) auxiliarySendIds.add(sendId);
500
+ if (state.auxiliary) nonTerminalSendIds.add(sendId);
376
501
  const estimate = entry.estimate ??= state.estimate ?? estimates();
377
502
  if (sendId !== seed.sendId && !ledger().reserveReportedFromSeed(seed, { sendId, ...estimate })) {
378
503
  throw new Error("Already-sent spend could not be persisted");
@@ -385,6 +510,27 @@ export function createRequestSpendTracker(
385
510
  if (!finalRequested) { finalRequested = true; finalUsage = usage; }
386
511
  finalizeSeeds();
387
512
  },
513
+ captureRoutedSendUsage() {
514
+ if (resolved) return undefined;
515
+ if (seededAccounting) {
516
+ const newestRouted = () => [...physical.entries()].filter(([, entry]) => seedState(entry.seed)?.auxiliary !== true)
517
+ .reduce<number | undefined>((latest, [order]) => latest === undefined || order > latest ? order : latest, undefined);
518
+ const issuing = newestRouted();
519
+ if (issuing === undefined) return undefined;
520
+ return (usage, cover = "issuing") => {
521
+ const ordinal = cover === "issuing" ? issuing : newestRouted();
522
+ const entry = ordinal === undefined ? undefined : physical.get(ordinal);
523
+ if (!resolved && entry && entry.observed === undefined) entry.observed = usage;
524
+ };
525
+ }
526
+ const newestRouted = () => live.findLast(id => !nonTerminalSendIds.has(id));
527
+ const issuing = newestRouted();
528
+ if (issuing === undefined) return undefined;
529
+ return (usage, cover = "issuing") => {
530
+ const sendId = cover === "issuing" ? issuing : newestRouted();
531
+ if (!resolved && sendId !== undefined && !observedLegacy.has(sendId)) observedLegacy.set(sendId, usage);
532
+ };
533
+ },
388
534
  charge(options?: Parameters<RequestSendObserver["charge"]>[0]): boolean {
389
535
  tracker.startRequest?.(options?.scopes);
390
536
  // A send that has already left is RECORDED, never refused: the tokens are spent, and a
@@ -397,9 +543,19 @@ export function createRequestSpendTracker(
397
543
  if (alreadySent) chargeWorkflowSends(rootId, 1);
398
544
  else if (!claimWorkflowSend(!options?.auxiliary)) return false;
399
545
  }
546
+ const recovery = !alreadySent && options?.incrementalRecovery;
547
+ let estimate = options?.auxiliary && options.estimate ? options.estimate : estimates();
548
+ const hasInputEstimate = Number.isFinite(estimate.inputTokens) && estimate.inputTokens >= 1;
549
+ const needsRecoveryEstimate = !!recovery && !hasInputEstimate;
550
+ if (needsRecoveryEstimate) {
551
+ const inputTokens = recovery.inputEstimateTokens;
552
+ if (inputTokens === undefined || !Number.isSafeInteger(inputTokens) || inputTokens < 1) return false;
553
+ estimate = { ...estimate, inputTokens };
554
+ }
400
555
  if (!alreadySent && tracker.enforced) {
401
556
  const seed = tracker.ensureSeed({ ...options?.scopes, targetKey: options?.targetKey,
402
- ...(options?.auxiliary ? { auxiliary: true, estimate: options.estimate } : {}) });
557
+ ...(options?.auxiliary ? { auxiliary: true, estimate: options.estimate }
558
+ : recovery ? { explicitEstimate: true, estimate } : {}) });
403
559
  if (!seed) return false;
404
560
  options?.onReserved?.({ ledger: ledger(), sendId: seed.sendId });
405
561
  return true;
@@ -415,18 +571,26 @@ export function createRequestSpendTracker(
415
571
  ? { poolId: logCtx.spendPoolId ?? logCtx.provider }
416
572
  : {}),
417
573
  };
418
- const policy = admissionPolicy!;
574
+ const enforceRecovery = Boolean(recovery) && recoveryIdentityCeiling !== undefined;
575
+ const policy = enforceRecovery
576
+ ? { ...admissionPolicy!, identity: { maxTokens: recoveryIdentityCeiling } }
577
+ : admissionPolicy!;
419
578
  const enforced = (scopes.rootId !== undefined && policy.root.maxTokens !== undefined)
420
579
  || (scopes.identityId !== undefined && policy.identity.maxTokens !== undefined)
421
580
  || (scopes.poolId !== undefined && policy.pool.maxTokens !== undefined);
422
- const decision = bookedLedger.reserve({
581
+ const reservation: SpendReservationRequest = {
423
582
  sendId,
424
583
  scopes,
425
- admissionPolicy,
426
- ...(options?.auxiliary && options.estimate ? options.estimate : estimates()),
584
+ admissionPolicy: policy,
585
+ ...estimate,
427
586
  ...(alreadySent ? { alreadySent: true } : {}),
428
- });
587
+ };
588
+ const decision = recovery && enforceRecovery
589
+ ? reserveObservedRecovery(reservation, recovery.prepaidDelta)
590
+ : bookedLedger.reserve(reservation);
591
+ if (!decision) return false;
429
592
  if (!decision.reserved) {
593
+ if (enforceRecovery) { refusal(decision.denial, false); return false; }
430
594
  // An applicable ceiling cannot authorize an unbooked send, including when tracking
431
595
  // capacity is full. Unconfigured/nonapplicable requests remain observe-only, and a
432
596
  // physical send reported after dispatch cannot be refused retroactively.
@@ -434,9 +598,15 @@ export function createRequestSpendTracker(
434
598
  refusal(decision.denial, !options?.auxiliary);
435
599
  return false;
436
600
  }
437
- if (!alreadySent) options?.onReserved?.({ ledger: bookedLedger, sendId });
601
+ if (!alreadySent && options?.onReserved) {
602
+ const proof = { ledger: bookedLedger, sendId };
603
+ if (!recovery && recoveryIdentityCeiling !== undefined && decision.durable) {
604
+ (prepaidSpend ??= new WeakMap()).set(proof, { identityId: scopes.identityId, tokens: decision.tokens, hasInputEstimate });
605
+ }
606
+ options.onReserved(proof);
607
+ }
438
608
  live.push(sendId);
439
- if (options?.auxiliary) auxiliarySendIds.add(sendId);
609
+ if (options?.auxiliary) nonTerminalSendIds.add(sendId);
440
610
  if (options?.deferDispatch) pendingDispatch.add(sendId);
441
611
  else confirmOlderSends();
442
612
  // It has already left, so the reservation cannot be handed back for free: from here only
@@ -475,8 +645,16 @@ export function createRequestSpendTracker(
475
645
  if (seededAccounting) { tracker.requestFinalSettlement(usage); return; }
476
646
  try {
477
647
  if (!terminalProcessed && live.length > 0) {
478
- const terminalIndex = live.findLastIndex(sendId => !auxiliarySendIds.has(sendId));
648
+ const terminalIndex = live.findLastIndex(sendId => !nonTerminalSendIds.has(sendId));
479
649
  const terminal = live[terminalIndex];
650
+ const routed = live.filter(sendId => !nonTerminalSendIds.has(sendId));
651
+ const own = terminal === undefined ? undefined : observedLegacy.get(terminal);
652
+ // An unmetered terminal send reported nothing, whatever the aggregate says.
653
+ if (own === null) usage = undefined;
654
+ else if (routed.length > 1 && terminal !== undefined) {
655
+ usage = own
656
+ ?? netOfOtherSends(usage, routed.filter(sendId => sendId !== terminal).map(sendId => observedLegacy.get(sendId)));
657
+ }
480
658
  const reported = typeof usage?.inputTokens === "number" || typeof usage?.outputTokens === "number";
481
659
  if (terminal && reported) {
482
660
  ledger().settle(terminal, {
@@ -491,7 +669,11 @@ export function createRequestSpendTracker(
491
669
  terminalProcessed = true;
492
670
  }
493
671
  while (live.length > 0) {
494
- ledger().markLost(live[live.length - 1] as string);
672
+ const sendId = live[live.length - 1] as string;
673
+ const observed = observedLegacy.get(sendId);
674
+ if (observed && !nonTerminalSendIds.has(sendId)) {
675
+ ledger().settle(sendId, { inputTokens: observed.inputTokens ?? 0, outputTokens: observed.outputTokens ?? 0 });
676
+ } else ledger().markLost(sendId);
495
677
  live.pop();
496
678
  }
497
679
  resolved = true;
@@ -523,13 +705,12 @@ export function attachRequestSpendTracker(
523
705
  req: Pick<Request, "headers">,
524
706
  logCtx: RequestLogContext,
525
707
  ledger?: SpendReservationLedger,
708
+ capturedPolicy?: SpendAdmissionPolicy,
526
709
  ): RequestSpendTracker {
527
710
  const existing = logCtx.spendTracker as RequestSpendTracker | undefined;
528
711
  if (existing && trackerRequests.get(existing) === req) return existing;
529
712
  const rootId = req.headers.get("x-codex-parent-thread-id")?.trim() || undefined;
530
- const tracker = ledger === undefined
531
- ? createRequestSpendTracker(logCtx, rootId)
532
- : createRequestSpendTracker(logCtx, rootId, ledger);
713
+ const tracker = createRequestSpendTracker(logCtx, rootId, ledger, capturedPolicy);
533
714
  logCtx.spendTracker = tracker;
534
715
  trackerRequests.set(tracker, req);
535
716
  return tracker;