@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
package/src/types.ts CHANGED
@@ -11,6 +11,7 @@ export {
11
11
  isCodeModeMcpDirectName,
12
12
  toolChoiceAliases,
13
13
  createToolChoiceResolver,
14
+ isQualifiedToolChoiceName,
14
15
  toolChoiceCandidates,
15
16
  toolAllowedByChoice,
16
17
  resolveToolChoiceWireName,
@@ -29,6 +30,7 @@ export type { AnthropicInstanceId } from "./providers/anthropic-instance-id";
29
30
  export { ANTHROPIC_INSTANCE_IDS, ANTHROPIC_PRIMARY_INSTANCE, ANTHROPIC_POOL2_INSTANCE, isAnthropicInstanceId } from "./providers/anthropic-instance-id";
30
31
  export type { AnthropicAccountPoolConfig, AnthropicModelRoute } from "./types/anthropic-account-pool";
31
32
  export type { OcxComboJevEffortMode } from "./types/combo-jev-effort-mode";
33
+ export type { OcxComboCapabilityPolicy, OcxComboOnUnservable } from "./types/combo-capability-policy";
32
34
  export {
33
35
  UPSTREAM_HTTP_VERSION_VALUES,
34
36
  REASONING_SUMMARY_DELIVERY_VALUES,
@@ -153,6 +155,8 @@ export type {
153
155
  CodexAccount,
154
156
  CodexAccountCredentials,
155
157
  CodexAccountCredentialRecord,
158
+ CodexAccountLoginConfig,
159
+ CodexAuthMethod,
156
160
  } from "./types/accounts";
157
161
 
158
162
  export type { OcxTelemetryConfig, OcxTelemetryDecision } from "./types/telemetry";
@@ -5,5 +5,7 @@ export interface UpdateCheckDeps {
5
5
  detectInstall: () => Installer;
6
6
  detectInstallOwnership?: () => InstallOwnership;
7
7
  latestVersion: (tag: Channel) => string | null;
8
+ /** True when this process runs from a release directory deployed by an external updater. */
9
+ managedReleaseDirectory?: () => boolean;
8
10
  miseUpdateCommand?: (ownership: InstallOwnership) => string | null;
9
11
  }
package/src/update/job.ts CHANGED
@@ -42,6 +42,7 @@ import {
42
42
  resolvePnpmActiveLauncher,
43
43
  } from "./index";
44
44
  import type { UpdateCheckDeps } from "./check-types";
45
+ import { managedReleaseDirectory } from "./managed-release";
45
46
  export type { UpdateCheckDeps } from "./check-types";
46
47
  import type { PnpmGlobalOwner } from "./pnpm-global-install.mjs";
47
48
  import { isNewer } from "./notify";
@@ -136,6 +137,7 @@ const defaultCheckDeps: UpdateCheckDeps = {
136
137
  detectInstall,
137
138
  detectInstallOwnership,
138
139
  latestVersion,
140
+ managedReleaseDirectory,
139
141
  miseUpdateCommand,
140
142
  };
141
143
 
@@ -470,16 +472,19 @@ export function checkForUpdate(
470
472
  const ownership = deps.detectInstallOwnership?.();
471
473
  const installer = ownership?.installer ?? deps.detectInstall();
472
474
  const channel = requestedChannel ?? normalizeUpdateChannel(null, current);
473
- const latest = installer === "source" || installer === "standalone" ? null : deps.latestVersion(channel);
475
+ const managedRelease = installer === "source" && deps.managedReleaseDirectory?.() === true;
476
+ const latest = (installer === "source" && !managedRelease) || installer === "standalone" ? null : deps.latestVersion(channel);
474
477
  const updateAvailable = !!latest && isNewer(latest, current, channel);
475
478
  let reason: string | undefined;
476
- let command = installer === "standalone" ? STANDALONE_UPDATE_HINT : installer === "source"
479
+ let command = installer === "standalone" ? STANDALONE_UPDATE_HINT : managedRelease ? "" : installer === "source"
477
480
  ? manualSourceCommand()
478
481
  : installer === "mise"
479
482
  ? (ownership && deps.miseUpdateCommand?.(ownership)) ?? ""
480
483
  : updateExecutionCommand(installer, channel).display;
481
484
 
482
- if (installer === "source" || installer === "standalone") {
485
+ if (managedRelease) {
486
+ reason = latest ? "managed_release" : "latest_unavailable";
487
+ } else if (installer === "source" || installer === "standalone") {
483
488
  reason = installer === "source" ? "source_checkout" : "standalone_install";
484
489
  } else if (installer === "mise") {
485
490
  reason = command ? "externally_managed" : "external_ownership_invalid";
@@ -0,0 +1,6 @@
1
+ import { trustedManagedReleaseOptIn } from "../cli/launcher-context";
2
+
3
+ /** Operators set this only when the host already manages this source installation's updates. */
4
+ export function managedReleaseDirectory(): boolean {
5
+ return trustedManagedReleaseOptIn();
6
+ }
@@ -10,7 +10,7 @@ import { resolveServiceOwnership } from "../service/state";
10
10
  import type { ServiceOwnershipResolution } from "../service/state";
11
11
  import { inspectDesktopSupervision, type SupervisionEvidence } from "../service/desktop-supervision.mjs";
12
12
  import { diagnoseService } from "../service/diagnostics";
13
- import { detectInstallOwnership, defaultUpdateTag, latestVersion } from "./index";
13
+ import { detectInstallOwnership, defaultUpdateTag, latestVersion, resolveCurrentPnpmGlobalOwner } from "./index";
14
14
  import { parseOrchestratedUpdateArgs, type OrchestratedUpdateArgs } from "./orchestrated-arguments.mjs";
15
15
  import { buildOrchestratedPlan, type PlanInputs } from "./orchestrated-plan";
16
16
  import { inspectLiveOrchestratedIdentity } from "./orchestrated-live-identity";
@@ -77,12 +77,21 @@ const defaultDeps: OrchestratedPlanDeps = {
77
77
  const cache = mkdtempSync(join(tmpdir(), "ocx-registry-probe-"));
78
78
  const overrides = { npm_config_cache: cache, npm_config_logs_dir: join(cache, "logs"), npm_config_logs_max: "0",
79
79
  npm_config_update_notifier: "false", pnpm_config_cache_dir: join(cache, "pnpm-cache"),
80
- npm_config_cache_dir: join(cache, "pnpm-cache"), npm_config_store_dir: join(cache, "pnpm-store"),
81
- pnpm_config_store_dir: join(cache, "pnpm-store"), pnpm_config_state_dir: join(cache, "pnpm-state"),
80
+ npm_config_cache_dir: join(cache, "pnpm-cache"), pnpm_config_state_dir: join(cache, "pnpm-state"),
82
81
  BUN_INSTALL_CACHE_DIR: join(cache, "bun-cache"), XDG_CACHE_HOME: join(cache, "xdg-cache"), XDG_STATE_HOME: join(cache, "xdg-state") };
83
82
  const keys = new Set(Object.keys(overrides).map(key => key.toLowerCase()));
84
83
  const env = { ...Object.fromEntries(Object.entries(process.env).filter(([key]) => !keys.has(key.toLowerCase()))), ...overrides };
85
- try { return latestVersion(selector, installer as "npm" | "pnpm" | "bun", undefined, probeSpawnSync, env); }
84
+ try {
85
+ if (installer === "pnpm") {
86
+ // Store proof must see the installed package's configured store. Only the version query uses the temporary store.
87
+ const proof = resolveCurrentPnpmGlobalOwner(undefined, { spawn: probeSpawnSync, env });
88
+ if (!proof.ok) return null;
89
+ const storeOverrides = { npm_config_store_dir: join(cache, "pnpm-store"), pnpm_config_store_dir: join(cache, "pnpm-store") };
90
+ const registryEnv = Object.fromEntries(Object.entries(env).filter(([key]) => !Object.hasOwn(storeOverrides, key.toLowerCase())));
91
+ return latestVersion(selector, installer, proof.owner, probeSpawnSync, { ...registryEnv, ...storeOverrides });
92
+ }
93
+ return latestVersion(selector, installer as "npm" | "bun", undefined, probeSpawnSync, env);
94
+ }
86
95
  finally { rmSync(cache, { recursive: true, force: true }); }
87
96
  },
88
97
  inFlight: () => isUpdateInFlight(getConfigDir()),
@@ -2,6 +2,7 @@ import { checkForUpdate, type UpdateCheckResult } from "./job";
2
2
  import { currentVersion, defaultUpdateTag, detectInstall, detectInstallOwnership, miseUpdateCommand, type Channel, type Installer } from "./index";
3
3
  import { isSourceBuildVersion, readVersionCache, REFRESH_INTERVAL_MS, writeFreshVersionCache } from "./notify";
4
4
  import { latestVersionAsync } from "./async-check";
5
+ import { managedReleaseDirectory } from "./managed-release";
5
6
 
6
7
  export const STALENESS_TICK_MS = 60 * 60 * 1000;
7
8
  export const RETRY_BASE_MS = 60_000;
@@ -13,6 +14,7 @@ export interface RefreshDeps {
13
14
  current: () => string;
14
15
  install: () => Installer;
15
16
  ownership: typeof detectInstallOwnership;
17
+ managedReleaseDirectory: () => boolean;
16
18
  guidance: typeof miseUpdateCommand;
17
19
  read: typeof readVersionCache;
18
20
  write: typeof writeFreshVersionCache;
@@ -27,6 +29,7 @@ const defaults: RefreshDeps = {
27
29
  current: currentVersion,
28
30
  install: detectInstall,
29
31
  ownership: detectInstallOwnership,
32
+ managedReleaseDirectory,
30
33
  guidance: miseUpdateCommand,
31
34
  read: readVersionCache,
32
35
  write: writeFreshVersionCache,
@@ -66,7 +69,7 @@ export function createRefreshScheduler(deps: RefreshDeps = defaults) {
66
69
  timer = deps.setTimer(() => { timer = undefined; void tick(); }, delay);
67
70
  timer.unref?.();
68
71
  };
69
- const lookup = (tag: Channel, automatic: boolean): Promise<string | null> => {
72
+ const lookup = (tag: Channel, installer: Installer, automatic: boolean): Promise<string | null> => {
70
73
  const existing = inFlight.get(tag);
71
74
  // An automatic tick joins only a flight of its own generation. A flight left over from a
72
75
  // stopped listener cannot write for the new one, so joining it would push the next check an
@@ -78,7 +81,7 @@ export function createRefreshScheduler(deps: RefreshDeps = defaults) {
78
81
  const epoch = generation;
79
82
  const seq = ++flightSeq;
80
83
  let explicitInterest = !automatic;
81
- const task = Promise.resolve().then(() => deps.lookup(tag, deps.install())).then(latest => {
84
+ const task = Promise.resolve().then(() => deps.lookup(tag, installer)).then(latest => {
82
85
  if (latest && (explicitInterest || (automatic && running && epoch === generation))
83
86
  && seq > (lastWrittenFlight.get(tag) ?? 0)) {
84
87
  lastWrittenFlight.set(tag, seq);
@@ -102,7 +105,7 @@ export function createRefreshScheduler(deps: RefreshDeps = defaults) {
102
105
  const tick = async () => {
103
106
  if (!running || !eligible()) return;
104
107
  const tag = channel();
105
- if (stale(tag) && deps.now() >= retryAt) await lookup(tag, true);
108
+ if (stale(tag) && deps.now() >= retryAt) await lookup(tag, deps.install(), true);
106
109
  schedule(retryAt > deps.now() ? Math.min(STALENESS_TICK_MS, retryAt - deps.now()) : STALENESS_TICK_MS);
107
110
  };
108
111
  return {
@@ -122,12 +125,19 @@ export function createRefreshScheduler(deps: RefreshDeps = defaults) {
122
125
  timer = undefined;
123
126
  },
124
127
  async check(tag: Channel): Promise<UpdateCheckResult> {
125
- const installer = deps.install();
126
- const latest = installer === "source" || installer === "standalone" || installer === "mise" ? null : await lookup(tag, false);
128
+ const ownership = deps.ownership();
129
+ const installer = ownership.installer;
130
+ const managedRelease = installer === "source" && deps.managedReleaseDirectory();
131
+ const latest = managedRelease
132
+ ? await lookup(tag, "npm", false)
133
+ : installer === "source" || installer === "standalone" || installer === "mise"
134
+ ? null
135
+ : await lookup(tag, installer, false);
127
136
  return checkForUpdate(tag, {
128
137
  currentVersion: deps.current,
129
- detectInstall: deps.install,
130
- detectInstallOwnership: deps.ownership,
138
+ detectInstall: () => installer,
139
+ detectInstallOwnership: () => ownership,
140
+ managedReleaseDirectory: () => managedRelease,
131
141
  miseUpdateCommand: deps.guidance,
132
142
  latestVersion: () => latest,
133
143
  });
@@ -117,6 +117,12 @@ function observeBufferedBody(body: Record<string, unknown>): { semanticBytes: nu
117
117
  const text = (part as Record<string, unknown>).text;
118
118
  if (typeof text === "string") semanticBytes += Buffer.byteLength(text, "utf8");
119
119
  }
120
+ const summary = Array.isArray(item.summary) ? item.summary : [];
121
+ for (const part of summary) {
122
+ if (part === null || typeof part !== "object") continue;
123
+ const { type, text } = part as Record<string, unknown>;
124
+ if (type === "summary_text" && typeof text === "string") semanticBytes += Buffer.byteLength(text, "utf8");
125
+ }
120
126
  }
121
127
  return { semanticBytes, sideEffects };
122
128
  }
@@ -0,0 +1,71 @@
1
+ import type { OcxUsage } from "../types";
2
+
3
+ /**
4
+ * Where a row's cache-token detail came from.
5
+ *
6
+ * Strict-client normalization emits zero-default token-detail objects on every bridged wire
7
+ * (`responsesUsage` in src/bridge.ts), so a `cached_tokens: 0` read back off that wire is a
8
+ * wire-compatibility artifact and not a measured cache miss. The three values stay distinct all
9
+ * the way to the summary because folding `synthesized` or `unknown` into `observed` is what
10
+ * lets a pool that discarded every warm prefix still report a plausible cache hit rate (#4546).
11
+ */
12
+ export type CacheTelemetryProvenance = "observed" | "synthesized" | "unknown";
13
+
14
+ /**
15
+ * Classify one usage record's cache detail.
16
+ *
17
+ * `wireParsed` means the counts were read back off a response wire rather than reported raw by
18
+ * the adapter. An all-zero cache detail from that source cannot be told apart from the zero
19
+ * defaults the normalizer writes, so it is `synthesized`; the same shape reported raw is a real
20
+ * zero and stays `observed`. A record with no cache fields at all is `unknown`, which is not a
21
+ * zero either.
22
+ */
23
+ export function classifyCacheTelemetryProvenance(
24
+ usage: OcxUsage | undefined,
25
+ options: { wireParsed?: boolean } = {},
26
+ ): CacheTelemetryProvenance {
27
+ if (!usage) return "unknown";
28
+ const present = [usage.cachedInputTokens, usage.cacheReadInputTokens, usage.cacheCreationInputTokens]
29
+ .filter((value): value is number => typeof value === "number" && Number.isFinite(value));
30
+ if (present.length === 0) return "unknown";
31
+ if (present.some(value => value > 0)) return "observed";
32
+ return options.wireParsed === true ? "synthesized" : "observed";
33
+ }
34
+
35
+ export function cacheTokensFromUsage(usage?: OcxUsage): {
36
+ read: number | undefined;
37
+ creation: number | undefined;
38
+ hasCacheTelemetry: boolean;
39
+ } {
40
+ if (!usage) return { read: undefined, creation: undefined, hasCacheTelemetry: false };
41
+ const creation = usage.cacheCreationInputTokens;
42
+ const read = typeof usage.cacheReadInputTokens === "number"
43
+ ? usage.cacheReadInputTokens
44
+ : typeof usage.cachedInputTokens === "number" && typeof creation === "number"
45
+ ? Math.max(0, usage.cachedInputTokens - creation)
46
+ : usage.cachedInputTokens;
47
+ const hasCacheTelemetry = typeof usage.cachedInputTokens === "number"
48
+ || typeof usage.cacheReadInputTokens === "number"
49
+ || typeof usage.cacheCreationInputTokens === "number";
50
+ return { read, creation, hasCacheTelemetry };
51
+ }
52
+
53
+ /**
54
+ * Cache tokens plus the provenance that says whether they may be averaged.
55
+ *
56
+ * A persisted `cacheProvenance` wins; a row written before the field existed is reconstructed
57
+ * from its own shape, which reproduces the previous reading exactly (telemetry present is
58
+ * observed, absent is unknown) so historical rows do not change meaning. Only `observed` reaches
59
+ * a hit-rate denominator: a synthesized zero was emitted for wire compatibility and an unknown
60
+ * was never measured, and averaging either as a zero is how a cold pool reports a warm cache.
61
+ */
62
+ export function cacheObservationFromUsage(
63
+ usage: OcxUsage | undefined,
64
+ provenance: CacheTelemetryProvenance | undefined,
65
+ ): { read: number | undefined; creation: number | undefined; provenance: CacheTelemetryProvenance } {
66
+ const { read, creation, hasCacheTelemetry } = cacheTokensFromUsage(usage);
67
+ // A row cannot have observed what it does not carry, so a stored label never opens the
68
+ // denominator for a record with no cache fields in it.
69
+ if (!usage || !hasCacheTelemetry) return { read, creation, provenance: "unknown" };
70
+ return { read, creation, provenance: provenance ?? classifyCacheTelemetryProvenance(usage) };
71
+ }
package/src/usage/cost.ts CHANGED
@@ -17,10 +17,13 @@ import {
17
17
  import type { AttemptTierOutcome, OcxUsage } from "../types";
18
18
  import type { PromptLengthPricing } from "../types/provider";
19
19
  import { canonicalFastTierMarker } from "../providers/fastwire";
20
+ import { CODEX_ACCOUNT_LOG_LABEL_RE } from "../codex/account-label";
20
21
  import { baseProviderLabel } from "../providers/label";
21
22
  import type { PersistedUsageAttempt, UsageStatus } from "./log";
23
+ import { cacheObservationFromUsage } from "./cache-provenance";
22
24
  import { canonicalAntigravityUsageModel } from "../providers/antigravity-models";
23
- import { activeAccountPricingProviders, activeConfiguredProviders, activeUserCostOverlays, userCostOverlayVersion } from "./user-cost-overlays";
25
+ import { activeAccountPricingProviders, activeConfiguredProviders, activeCreditPrices, activeUserCostOverlays, userCostOverlayVersion } from "./user-cost-overlays";
26
+ import { costTokensWithinBound, isValidCreditPriceBound, isRepresentableCreditCount, type CreditBilling } from "./credit-billing";
24
27
  import {
25
28
  EXPECTED_PRICE_OVERLAYS,
26
29
  findExpectedPriceOverlay,
@@ -45,7 +48,7 @@ export interface PriceResolutionOptions {
45
48
  allowModelLevelFallback?: boolean;
46
49
  }
47
50
 
48
- type AttemptCostInput = Pick<PersistedUsageAttempt, "ordinal" | "provider" | "model" | "usage" | "usageStatus" | "tierOutcome"> & PriceResolutionOptions;
51
+ type AttemptCostInput = Pick<PersistedUsageAttempt, "ordinal" | "provider" | "model" | "usage" | "usageStatus" | "tierOutcome" | "cacheProvenance"> & PriceResolutionOptions;
49
52
 
50
53
  /**
51
54
  * Service-tier provenance. `effectiveServiceTier()` collapses these with `??`,
@@ -93,7 +96,7 @@ export interface AttemptCostEstimate {
93
96
  ordinal: number;
94
97
  provider: string;
95
98
  model: string;
96
- tokens: CostTokens;
99
+ tokens: CostTokens | null;
97
100
  price: MatchedPrice;
98
101
  cost: CostBreakdown;
99
102
  estimated: boolean;
@@ -105,10 +108,15 @@ export interface AttemptCostEstimate {
105
108
  customThresholdApplied?: true;
106
109
  /** The numeric estimate is a known floor because the exact Priority price is unavailable. */
107
110
  priorityLowerBound?: boolean;
111
+ /**
112
+ * How this attempt was billed. Present only when provider credits priced it: `cost` is then
113
+ * `providerCredits x creditPriceUsd` and its four token fields carry no allocation.
114
+ */
115
+ billing?: CreditBilling;
108
116
  }
109
117
 
110
118
  export interface CostEstimate {
111
- tokens: CostTokens;
119
+ tokens: CostTokens | null;
112
120
  cost: CostBreakdown;
113
121
  estimated: boolean;
114
122
  attempts?: AttemptCostEstimate[];
@@ -119,8 +127,14 @@ export interface CostEstimate {
119
127
  contextTier?: ContextTierName;
120
128
  /** At least one request/attempt selected the user threshold rates. */
121
129
  customThresholdApplied?: true;
122
- /** The aggregate is a known floor because every priced attempt is a lower bound. */
130
+ /** The aggregate satisfies the lower-bound rule for its billing basis. */
123
131
  priorityLowerBound?: boolean;
132
+ /**
133
+ * Billing basis for the aggregate. `provider-credits` means every priced attempt shared one
134
+ * credit price and the credits are summed; `mixed` means the attempts were not all billed the
135
+ * same way, so the total is real but the split is only available per attempt.
136
+ */
137
+ billing?: CreditBilling;
124
138
  }
125
139
 
126
140
  function finiteNonNegative(value: number): boolean {
@@ -610,15 +624,119 @@ function isOpenRouterPriorityLowerBound(
610
624
  * catalogs), priority/long-context tiers applied. Null when usage or price is
611
625
  * missing so combos can fail closed.
612
626
  */
627
+ /**
628
+ * Credit price for a logged provider label, with the same precedence as token prices: an exact
629
+ * configured provider name first, then a config-owned account identity, then the base label of an
630
+ * account-suffixed row (`kiro-<account>`).
631
+ */
632
+ function creditPriceFor(provider: string, creditPrices: ReadonlyMap<string, number>): number | undefined {
633
+ if (creditPrices.size === 0) return undefined;
634
+ if (activeConfiguredProviders().has(provider)) return creditPrices.get(provider);
635
+ // Keep a configured alias's own namespace before baseProviderLabel canonicalizes it.
636
+ const cut = provider.lastIndexOf("-");
637
+ const ownNamespace = provider.slice(0, cut);
638
+ const suffix = provider.slice(cut + 1);
639
+ if (cut > 0 && (suffix === "main" || CODEX_ACCOUNT_LOG_LABEL_RE.test(suffix))
640
+ && activeConfiguredProviders().has(ownNamespace)
641
+ && baseProviderLabel(provider) !== provider) return creditPrices.get(ownNamespace);
642
+ const namespace = activeAccountPricingProviders().get(provider) ?? baseProviderLabel(provider);
643
+ return creditPrices.get(provider) ?? creditPrices.get(namespace);
644
+ }
645
+
646
+ /**
647
+ * Billed cost from provider credits, when the provider has a configured credit price.
648
+ *
649
+ * Three outcomes, because "not credit-priced" and "credit-priced but unrepresentable" are not the
650
+ * same answer:
651
+ * - `absent`: this row is not credit-priced, so the caller keeps its token estimate;
652
+ * - `billed`: the charge, with the credits and price that produced it;
653
+ * - `unrepresentable`: the row IS credit-priced but the numbers cannot be multiplied and
654
+ * serialized honestly. The caller must fail closed rather than fall back to a token estimate,
655
+ * which would report a different, invented amount for a row the operator asked to bill from
656
+ * credits.
657
+ */
658
+ type CreditCostResult =
659
+ | { kind: "absent" }
660
+ | { kind: "billed"; cost: CostBreakdown; billing: CreditBilling }
661
+ | { kind: "unrepresentable" };
662
+
663
+ function creditCost(provider: string, usage: OcxUsage, creditPrices: ReadonlyMap<string, number>): CreditCostResult {
664
+ const price = creditPriceFor(provider, creditPrices);
665
+ if (price === undefined) return { kind: "absent" };
666
+ const credits = usage.providerCredits;
667
+ if (typeof credits !== "number") {
668
+ // No output is not proof of a free request: locally synthesized and legacy usage can
669
+ // lack a credit observation even after a charge. Keep the legacy token fallback for
670
+ // rows with output, but do not invent an observed zero when output is absent.
671
+ if (usage.outputTokens === 0) return { kind: "unrepresentable" };
672
+ return { kind: "absent" };
673
+ }
674
+ // A reading that exists but is corrupt (NaN, Infinity, negative) is not a missing reading: it is
675
+ // evidence this row was supposed to be billed in credits and cannot be priced honestly. Falling
676
+ // back to tokens here would report a different amount for the reason the operator configured.
677
+ if (!isRepresentableCreditCount(credits)) return { kind: "unrepresentable" };
678
+ // Both inputs are bounded independently AND the product is re-checked: a finite price and a
679
+ // finite credit count can still multiply to Infinity, which JSON serializes as null.
680
+ if (!isValidCreditPriceBound(price)) return { kind: "unrepresentable" };
681
+ const total = credits * price;
682
+ if (!Number.isFinite(total)) return { kind: "unrepresentable" };
683
+ return {
684
+ kind: "billed",
685
+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total },
686
+ billing: { source: "provider-credits", providerCredits: credits, creditPriceUsd: price },
687
+ };
688
+ }
689
+
690
+ type CostInput = Pick<AttemptCostInput, "provider" | "model" | "usage" | "usageStatus" | "allowModelLevelFallback">;
691
+
692
+ function hasMeasuredUsage<T extends CostInput>(input: T): input is T & { usage: OcxUsage } {
693
+ return isMeasuredStatus(input.usageStatus) && !!input.usage;
694
+ }
695
+
696
+ /**
697
+ * True when this row WOULD have a credit price but its credits or price cannot produce a
698
+ * representable charge. Exported so the management DTO can name that failure instead of reporting
699
+ * the generic unmatched-price reason, which would imply a token estimate exists.
700
+ */
701
+ export function creditChargeUnrepresentable(input: CostInput): boolean {
702
+ return hasMeasuredUsage(input)
703
+ && creditCost(input.provider, input.usage, activeCreditPrices()).kind === "unrepresentable"
704
+ && !!resolveMatchedPrice(input.provider, input.model, undefined, undefined, input);
705
+ }
706
+
707
+ /**
708
+ * One attempt's cost and the basis it used. Null means fail closed: either the credit charge is
709
+ * unrepresentable, or the caller already decided the row is unpriced.
710
+ */
711
+ function resolveAttemptCost(
712
+ provider: string,
713
+ usage: OcxUsage,
714
+ creditPrices: ReadonlyMap<string, number>,
715
+ tokens: CostTokens | null,
716
+ cost4: Cost4,
717
+ ): { cost: CostBreakdown; billing?: CreditBilling } | null {
718
+ // The token bound is applied only on the token path. A credit charge is `credits x price`, so a
719
+ // row whose token count is merely too large to price from tokens still has an honest credit
720
+ // charge; refusing it would discard a number that never depended on those tokens.
721
+ const credit = creditCost(provider, usage, creditPrices);
722
+ if (credit.kind === "unrepresentable") return null;
723
+ if (credit.kind === "billed") return { cost: credit.cost, billing: credit.billing };
724
+ // A token estimate is `rate x tokens / 1e6`, and the rate bound alone leaves a corrupt token
725
+ // count free to produce `Infinity`, which JSON serializes as `null`. Fail closed instead of
726
+ // returning an invented number.
727
+ if (!tokens || !costTokensWithinBound(tokens)) return null;
728
+ return { cost: calculateCost(tokens, cost4) };
729
+ }
730
+
613
731
  export function estimateAttemptCost(
614
732
  attempt: AttemptCostInput,
615
733
  overlays: readonly ExpectedPriceOverlay[] = EXPECTED_PRICE_OVERLAYS,
616
734
  serviceTier?: ServiceTierInput,
617
735
  userOverlays: readonly ExpectedPriceOverlay[] = activeUserCostOverlays(),
736
+ creditPrices: ReadonlyMap<string, number> = activeCreditPrices(),
618
737
  ): AttemptCostEstimate | null {
619
- if (!isMeasuredStatus(attempt.usageStatus) || !attempt.usage) return null;
738
+ if (!hasMeasuredUsage(attempt)) return null;
620
739
  const tokens = normalizeCostTokens(attempt.usage);
621
- if (!tokens) return null;
622
740
  const price = resolveMatchedPrice(attempt.provider, attempt.model, overlays, userOverlays, attempt);
623
741
  if (!price) return null;
624
742
  const attemptServiceTier = attempt.tierOutcome
@@ -630,26 +748,86 @@ export function estimateAttemptCost(
630
748
  const [effectiveCost4, multiplier] = applyPriorityMultiplier(
631
749
  tieredCost4, price.provider, attempt.model, attemptServiceTier, contextTier, customThresholdApplied,
632
750
  );
633
- const priorityLowerBound = contextPriorityLowerBound
634
- || isOpenRouterPriorityLowerBound(price.provider, attempt.tierOutcome);
751
+ const billed = resolveAttemptCost(attempt.provider, attempt.usage, creditPrices, tokens, effectiveCost4);
752
+ if (!billed) return null;
753
+ // A credit charge is `providerCredits x creditPriceUsd`. The token rates were still resolved to
754
+ // decide whether this row falls back to them, but they did not produce the amount, so the
755
+ // `priorityLowerBound` they imply is a statement about a price nobody was charged. A lower bound
756
+ // is only honest for the rate that actually priced the row.
757
+ const priorityLowerBound = billed.billing === undefined
758
+ && (contextPriorityLowerBound || isOpenRouterPriorityLowerBound(price.provider, attempt.tierOutcome));
635
759
  return {
636
760
  ordinal: attempt.ordinal,
637
761
  provider: attempt.provider,
638
762
  model: attempt.model,
639
763
  tokens,
640
764
  price,
641
- cost: calculateCost(tokens, effectiveCost4),
642
- estimated: isEstimated(attempt.usage, attempt.usageStatus, price.status),
765
+ cost: billed.cost,
766
+ estimated: isEstimated(attempt.usage, attempt.usageStatus, billed.billing ? "verified" : price.status),
643
767
  ...(multiplier !== 1 ? { priorityMultiplier: multiplier } : {}),
644
768
  ...(contextTier ? { contextTier } : {}),
645
769
  ...(customThresholdApplied ? { customThresholdApplied } : {}),
646
770
  ...(priorityLowerBound ? { priorityLowerBound: true } : {}),
771
+ ...(billed.billing ? { billing: billed.billing } : {}),
647
772
  };
648
773
  }
649
774
 
775
+ /**
776
+ * Aggregate billing basis for a combo.
777
+ *
778
+ * `provider-credits` is claimed only when EVERY attempt was credit-billed at the same price, so
779
+ * summing their credits is a real total and the credit count is meaningful. One attempt at another
780
+ * price, or one token-priced attempt, makes the aggregate honest only as a sum: the components are
781
+ * visible per attempt, and the parent says `mixed` instead of presenting either split as the whole.
782
+ */
783
+ function comboBilling(estimates: readonly AttemptCostEstimate[], total: number): CreditBilling | undefined {
784
+ const creditAttempts = estimates.filter(est => est.billing?.source === "provider-credits");
785
+ if (creditAttempts.length === 0) return undefined;
786
+ const creditBilling = (est: AttemptCostEstimate) => est.billing as Extract<CreditBilling, { source: "provider-credits" }>;
787
+ // `mixed` is a claim about HOW the attempts were billed, so it is only ever set for an actual
788
+ // difference in basis. A same-price combo whose summed credit count happens to be large is not
789
+ // mixed — the per-attempt charges were each bounded before they were computed, and the summed
790
+ // total is re-checked here, so summing their credits is a real number too.
791
+ if (creditAttempts.length !== estimates.length) return { source: "mixed" };
792
+ const price = creditBilling(creditAttempts[0]!).creditPriceUsd;
793
+ if (!creditAttempts.every(est => creditBilling(est).creditPriceUsd === price)) return { source: "mixed" };
794
+ const providerCredits = creditAttempts.reduce((sum, est) => sum + creditBilling(est).providerCredits, 0);
795
+ if (!Number.isFinite(providerCredits) || !Number.isFinite(providerCredits * price)) {
796
+ // Unreachable while each attempt is bounded (and an overflowing sum would have failed the
797
+ // combo total above), but the honest answer is still "no single split": claiming a credit
798
+ // count would be an amount, and dropping the marker would let the four zero components be
799
+ // read as a token allocation.
800
+ return { source: "mixed" };
801
+ }
802
+ // The displayed split has to agree with the total it sits beside. Summed floats can differ in
803
+ // the last bits; anything larger means the aggregate is not `sum(credits) x price`.
804
+ if (Math.abs(providerCredits * price - total) > Math.max(1e-9, Math.abs(total) * 1e-9)) return { source: "mixed" };
805
+ return { source: "provider-credits", providerCredits, creditPriceUsd: price };
806
+ }
807
+
808
+ /**
809
+ * A token-only Combo requires every attempt to be a floor. Credit charges are exact at the
810
+ * configured price. With credit billing, at least one token-priced attempt must be a floor,
811
+ * and every other token-priced attempt must be a known floor or use non-estimated pricing
812
+ * and usage with observed cache detail.
813
+ */
814
+ function comboIsLowerBound(
815
+ attempts: readonly AttemptCostInput[],
816
+ estimates: readonly AttemptCostEstimate[],
817
+ billing: CreditBilling | undefined,
818
+ ): boolean {
819
+ if (!billing) return estimates.length > 0 && estimates.every(est => est.priorityLowerBound === true);
820
+ return estimates.some(est => est.billing === undefined && est.priorityLowerBound === true)
821
+ && estimates.every((est, index) => {
822
+ if (est.billing || est.priorityLowerBound) return true;
823
+ const { usage, cacheProvenance } = attempts[index]!;
824
+ return !est.estimated && cacheObservationFromUsage(usage, cacheProvenance).provenance === "observed";
825
+ });
826
+ }
827
+
650
828
  /**
651
829
  * Combo: price every attempt with its own rate and sum. Fail closed — if ANY
652
- * attempt is unpriced or unnormalizable, return null rather than a partial sum.
830
+ * attempt is unpriced, return null rather than a partial sum.
653
831
  */
654
832
  export function estimateComboCost(
655
833
  attempts: readonly AttemptCostInput[],
@@ -664,33 +842,39 @@ export function estimateComboCost(
664
842
  if (!estimate) return null;
665
843
  estimates.push(estimate);
666
844
  }
667
- const tokens: CostTokens = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
845
+ let tokens: CostTokens | null = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
668
846
  const cost: CostBreakdown = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 };
669
847
  for (const est of estimates) {
670
- tokens.input += est.tokens.input;
671
- tokens.output += est.tokens.output;
672
- tokens.cacheRead += est.tokens.cacheRead;
673
- tokens.cacheWrite += est.tokens.cacheWrite;
674
- if (est.tokens.cacheWrite1h) tokens.cacheWrite1h = (tokens.cacheWrite1h ?? 0) + est.tokens.cacheWrite1h;
848
+ if (!est.tokens) tokens = null;
849
+ if (tokens && est.tokens) {
850
+ tokens.input += est.tokens.input;
851
+ tokens.output += est.tokens.output;
852
+ tokens.cacheRead += est.tokens.cacheRead;
853
+ tokens.cacheWrite += est.tokens.cacheWrite;
854
+ if (est.tokens.cacheWrite1h) tokens.cacheWrite1h = (tokens.cacheWrite1h ?? 0) + est.tokens.cacheWrite1h;
855
+ }
675
856
  cost.input += est.cost.input;
676
857
  cost.output += est.cost.output;
677
858
  cost.cacheRead += est.cost.cacheRead;
678
859
  cost.cacheWrite += est.cost.cacheWrite;
679
860
  cost.total += est.cost.total;
680
861
  }
862
+ // A sum of individually representable charges can still leave the representable range. Fail
863
+ // closed rather than serve a total that serializes as null.
864
+ if (!Number.isFinite(cost.total) || (tokens && Object.values(tokens).some(value => !Number.isFinite(value)))) return null;
865
+ const billing = comboBilling(estimates, cost.total);
681
866
  return {
682
867
  tokens,
683
868
  cost,
684
869
  estimated: estimates.some(est => est.estimated),
685
870
  attempts: estimates,
871
+ ...(billing ? { billing } : {}),
686
872
  ...(estimates.some(est => est.priorityMultiplier && est.priorityMultiplier !== 1)
687
873
  ? { priorityMultiplier: estimates.find(est => est.priorityMultiplier)?.priorityMultiplier }
688
874
  : {}),
689
875
  ...(estimates.some(est => est.contextTier) ? { contextTier: "long" as const } : {}),
690
876
  ...(estimates.some(est => est.customThresholdApplied) ? { customThresholdApplied: true as const } : {}),
691
- ...(estimates.every(est => est.priorityLowerBound === true)
692
- ? { priorityLowerBound: true as const }
693
- : {}),
877
+ ...(comboIsLowerBound(attempts, estimates, billing) ? { priorityLowerBound: true as const } : {}),
694
878
  };
695
879
  }
696
880
 
@@ -706,10 +890,10 @@ export function estimateRequestCost(
706
890
  },
707
891
  overlays: readonly ExpectedPriceOverlay[] = EXPECTED_PRICE_OVERLAYS,
708
892
  userOverlays: readonly ExpectedPriceOverlay[] = activeUserCostOverlays(),
893
+ creditPrices: ReadonlyMap<string, number> = activeCreditPrices(),
709
894
  ): CostEstimate | null {
710
- if (!isMeasuredStatus(input.usageStatus) || !input.usage) return null;
895
+ if (!hasMeasuredUsage(input)) return null;
711
896
  const tokens = normalizeCostTokens(input.usage);
712
- if (!tokens) return null;
713
897
  const price = resolveMatchedPrice(input.provider, input.model, overlays, userOverlays, input);
714
898
  if (!price) return null;
715
899
  const [tieredCost4, contextTier, contextPriorityLowerBound, customThresholdApplied] = applyPromptLengthPricing(
@@ -718,19 +902,24 @@ export function estimateRequestCost(
718
902
  const [effectiveCost4, multiplier] = applyPriorityMultiplier(
719
903
  tieredCost4, price.provider, input.model, input.serviceTier, contextTier, customThresholdApplied,
720
904
  );
721
- const priorityLowerBound = contextPriorityLowerBound || isOpenRouterPriorityLowerBound(
905
+ const billed = resolveAttemptCost(input.provider, input.usage, creditPrices, tokens, effectiveCost4);
906
+ if (!billed) return null;
907
+ // See `estimateAttemptCost`: a credit charge is exact for its configured price, so it must not
908
+ // inherit the token-rate floor that the fallback path resolved on the way in.
909
+ const priorityLowerBound = billed.billing === undefined && (contextPriorityLowerBound || isOpenRouterPriorityLowerBound(
722
910
  price.provider,
723
911
  typeof input.serviceTier === "object" ? input.serviceTier.tierOutcome : undefined,
724
- );
912
+ ));
725
913
  return {
726
914
  tokens,
727
915
  price,
728
- cost: calculateCost(tokens, effectiveCost4),
729
- estimated: isEstimated(input.usage, input.usageStatus, price.status),
916
+ cost: billed.cost,
917
+ estimated: isEstimated(input.usage, input.usageStatus, billed.billing ? "verified" : price.status),
730
918
  ...(multiplier !== 1 ? { priorityMultiplier: multiplier } : {}),
731
919
  ...(contextTier ? { contextTier } : {}),
732
920
  ...(customThresholdApplied ? { customThresholdApplied } : {}),
733
921
  ...(priorityLowerBound ? { priorityLowerBound: true } : {}),
922
+ ...(billed.billing ? { billing: billed.billing } : {}),
734
923
  };
735
924
  }
736
925