@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
@@ -22,10 +22,10 @@ import type { OcxTool } from "../types";
22
22
  import { contentPartsToText, parseDataUrl } from "./image";
23
23
  import { bindVertexRequestAuthority, GCP_CREDENTIAL_MARKER_PREFIX, gcpCredentialMarkerAccount, getVertexAccessTokenWithAuthority } from "../lib/gcp-adc";
24
24
  import { isProviderApiKeyPaused, ProviderApiKeyPausedError } from "../providers/api-key-pause";
25
- import { fetchAntigravityWithRetry, fetchVertexWithRetry } from "./google-http";
25
+ import { fetchAntigravityWithRetry, fetchVertexWithRetry, GOOGLE_HOSTED_ITERATION_SEND_LIMIT } from "./google-http";
26
26
  import { safeAntigravityHttpErrorMessage, safeVertexHttpErrorMessage } from "./google-errors";
27
27
  import { readDisplaySafeErrorPayloadText } from "./upstream-http-error";
28
- import { isVertexTruncatedTurn, vertexTruncationErrorEvent } from "./google-truncation";
28
+ import { googleModeLabel, googlePromptBlockedEvent, googleStopReason, isGoogleTruncatedTurn, vertexTruncationErrorEvent } from "./google-truncation";
29
29
  import { antigravitySessionAnchor, antigravityUserAgentForWireModel, antigravitySessionId, isLikelyRealThoughtSignature, sanitizeAntigravityClaudeSignatures } from "./google-antigravity-wire";
30
30
  import { summarizeGoogleWireShape } from "./google-wire-shape";
31
31
  import { compileGoogleWireBody } from "./google-wire-compiler";
@@ -342,7 +342,8 @@ function geminiToolResultParts(
342
342
  ): unknown[] {
343
343
  const functionResponse: Record<string, unknown> = {
344
344
  name: wireName,
345
- response: { result: geminiToolResultText(msg.content) },
345
+ // Google documents an "error" key for a call that failed to execute; CPA writes it on every route.
346
+ response: msg.isError ? { error: geminiToolResultText(msg.content) } : { result: geminiToolResultText(msg.content) },
346
347
  id: wireCallId,
347
348
  };
348
349
  const images = toolResultImageParts(msg.content);
@@ -403,6 +404,8 @@ function messagesToGeminiFormat(
403
404
 
404
405
  const contents: unknown[] = [];
405
406
  const replayedCallIds: string[] = [];
407
+ // On Cloud Code Assist the identity model is the routed wire model.
408
+ const claudeOnCloudCodeAssist = isCloudCodeAssist && /^claude-/i.test(identityModelId);
406
409
 
407
410
  const callIds = createToolCallIdAllocator();
408
411
  for (const msg of parsed.context.messages) {
@@ -469,6 +472,12 @@ function messagesToGeminiFormat(
469
472
  parts.push({ inline_data: { mime_type: p.mediaType, data: p.data } });
470
473
  continue;
471
474
  }
475
+ // Gemini accepts WAV and MP3 bytes as inline_data. Antigravity hands Claude models an
476
+ // Anthropic message, which has no audio block, so they keep the text marker.
477
+ if (p.type === "audio" && !claudeOnCloudCodeAssist) {
478
+ parts.push({ inline_data: { mime_type: p.format === "mp3" ? "audio/mp3" : "audio/wav", data: p.data } });
479
+ continue;
480
+ }
472
481
  // Drop empty/malformed text instead of emitting `{ text: "" }` or a bare `{}` part.
473
482
  const textPart = geminiTextPart(p.text);
474
483
  if (textPart) parts.push(textPart);
@@ -671,7 +680,7 @@ function toolChoiceToGeminiToolConfig(parsed: OcxParsedRequest): Record<string,
671
680
  return {
672
681
  functionCallingConfig: {
673
682
  mode: "ANY",
674
- allowedFunctionNames: [resolveToolChoiceWireName(parsed.context.tools, choice.name)],
683
+ allowedFunctionNames: [resolveToolChoiceWireName(parsed.context.tools, choice.name, choice)],
675
684
  },
676
685
  };
677
686
  }
@@ -679,8 +688,11 @@ function toolChoiceToGeminiToolConfig(parsed: OcxParsedRequest): Record<string,
679
688
  function usageFromGemini(usage: Record<string, number> | undefined): OcxUsage | undefined {
680
689
  if (!usage) return undefined;
681
690
  return {
682
- inputTokens: usage.promptTokenCount ?? 0,
683
- outputTokens: usage.candidatesTokenCount ?? 0,
691
+ // Google reports tool-use prompt tokens (search grounding, URL context) beside the prompt.
692
+ inputTokens: (usage.promptTokenCount ?? 0) + (usage.toolUsePromptTokenCount ?? 0),
693
+ // Google reports thinking beside candidates. Every other adapter's output includes reasoning
694
+ // (telemetry clamps reasoning to output, src/telemetry/aggregate.ts), and Google bills it as output.
695
+ outputTokens: (usage.candidatesTokenCount ?? 0) + (usage.thoughtsTokenCount ?? 0),
684
696
  ...(usage.cachedContentTokenCount !== undefined ? { cachedInputTokens: usage.cachedContentTokenCount } : {}),
685
697
  ...(usage.thoughtsTokenCount !== undefined ? { reasoningOutputTokens: usage.thoughtsTokenCount } : {}),
686
698
  };
@@ -989,6 +1001,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
989
1001
  // 429 rotation and raw error formatting.
990
1002
  ...(provider.googleMode === "vertex" || provider.googleMode === "cloud-code-assist"
991
1003
  ? {
1004
+ hostedIterationSendLimit: GOOGLE_HOSTED_ITERATION_SEND_LIMIT,
992
1005
  fetchResponse: async (request: AdapterRequest, ctx?: AdapterFetchContext): Promise<Response> => {
993
1006
  const res = await (provider.googleMode === "cloud-code-assist" ? fetchAntigravityWithRetry : fetchVertexWithRetry)(
994
1007
  request,
@@ -1366,6 +1379,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1366
1379
  };
1367
1380
  let pendingUsage: OcxUsage | undefined;
1368
1381
  let toolCallsStarted = 0;
1382
+ let sawVisibleOutput = false;
1369
1383
  let lastFinishReason: string | undefined;
1370
1384
  let sawAnyFrame = false;
1371
1385
  let sawTerminalSignal = false;
@@ -1438,6 +1452,13 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1438
1452
  // absent key and an empty array are already skipped here; `null` joins them. A non-null
1439
1453
  // non-array container is still claimed structure the parser cannot read, and stays
1440
1454
  // terminal.
1455
+ // A prompt Google refused before generating arrives as promptFeedback with no candidates.
1456
+ const feedback = root.promptFeedback;
1457
+ if ((rawCandidates === undefined || rawCandidates === null || (Array.isArray(rawCandidates) && rawCandidates.length === 0))
1458
+ && isGoogleRecord(feedback) && typeof feedback.blockReason === "string" && feedback.blockReason) {
1459
+ yield googlePromptBlockedEvent(googleModeLabel(provider.googleMode), feedback.blockReason, pendingUsage);
1460
+ return "terminate";
1461
+ }
1441
1462
  if (rawCandidates === undefined || rawCandidates === null) return "continue";
1442
1463
  if (!Array.isArray(rawCandidates)) {
1443
1464
  yield invalidGoogleShapeEvent({
@@ -1515,6 +1536,8 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1515
1536
  const textEvent = googlePartTextEvent(part, returnsThoughtSummaries);
1516
1537
  if (textEvent) {
1517
1538
  emittedContentEvent = true;
1539
+ // Thought text is not visible output: a thoughts-only turn that drops its answer fails closed.
1540
+ if (textEvent.type === "text_delta") sawVisibleOutput = true;
1518
1541
  yield textEvent;
1519
1542
  }
1520
1543
  const inline = (part as { inlineData?: { mimeType?: string; data?: string } }).inlineData;
@@ -1526,6 +1549,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1526
1549
  const filePath = await materializeInlineImage(inline.data, imageBudget);
1527
1550
  const escapedPath = artifactMarkdownUrl(filePath);
1528
1551
  emittedContentEvent = true;
1552
+ sawVisibleOutput = true;
1529
1553
  yield { type: "text_delta", text: `\n![image](${escapedPath})\n` };
1530
1554
  } catch {
1531
1555
  yield { type: "error", message: "failed to materialize inline image" };
@@ -1537,6 +1561,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1537
1561
  const id = `call_${crypto.randomUUID().slice(0, 8)}`;
1538
1562
  toolCallsStarted++;
1539
1563
  emittedContentEvent = true;
1564
+ sawVisibleOutput = true;
1540
1565
  const restoredName = restoreGoogleToolName(functionCall.name);
1541
1566
  yield {
1542
1567
  type: "tool_call_start",
@@ -1602,22 +1627,19 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1602
1627
  return;
1603
1628
  } else if ((yield* handleDataLine(residual)) === "terminate") return;
1604
1629
  }
1605
- // Fail-closed: a turn cut off mid tool call (MAX_TOKENS / MALFORMED_FUNCTION_CALL) surfaces
1606
- // an error instead of a silently-incomplete done. Mirrors kiro-truncation.
1607
- if ((provider.googleMode === "vertex" || provider.googleMode === "cloud-code-assist")
1608
- && isVertexTruncatedTurn(lastFinishReason, toolCallsStarted)) {
1609
- yield vertexTruncationErrorEvent(lastFinishReason, toolCallsStarted, pendingUsage);
1630
+ // Fail-closed on every Google mode: a turn cut off mid tool call (MAX_TOKENS /
1631
+ // MALFORMED_FUNCTION_CALL), or one whose output Google dropped before anything visible
1632
+ // arrived (UNEXPECTED_TOOL_CALL / MALFORMED_RESPONSE), surfaces an error instead of a
1633
+ // silently incomplete done. Mirrors kiro-truncation.
1634
+ if (isGoogleTruncatedTurn(lastFinishReason, toolCallsStarted, sawVisibleOutput)) {
1635
+ yield vertexTruncationErrorEvent(lastFinishReason, toolCallsStarted, pendingUsage, googleModeLabel(provider.googleMode));
1610
1636
  return;
1611
1637
  }
1612
1638
  if (!sawAnyFrame || !sawTerminalSignal) {
1613
1639
  yield { type: "error", message: "upstream stream ended without a terminal signal — possible truncation" };
1614
1640
  return;
1615
1641
  }
1616
- const stopReason = lastFinishReason === "MAX_TOKENS"
1617
- ? "max_tokens"
1618
- : ["SAFETY", "RECITATION", "BLOCKLIST", "PROHIBITED_CONTENT", "SPII"].includes(lastFinishReason ?? "")
1619
- ? "content_filter"
1620
- : undefined;
1642
+ const stopReason = googleStopReason(lastFinishReason);
1621
1643
  yield {
1622
1644
  type: "done",
1623
1645
  usage: pendingUsage,
@@ -1746,6 +1768,11 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1746
1768
  }
1747
1769
  const candidates = rawCandidates as { finishReason?: string }[] | undefined;
1748
1770
  if (!candidates?.length) {
1771
+ const feedback = (json as { promptFeedback?: unknown }).promptFeedback;
1772
+ if (isGoogleRecord(feedback) && typeof feedback.blockReason === "string" && feedback.blockReason) {
1773
+ return finish([googlePromptBlockedEvent(googleModeLabel(provider.googleMode), feedback.blockReason,
1774
+ usageFromGemini(json.usageMetadata as Record<string, number> | undefined))]);
1775
+ }
1749
1776
  return finish([{ type: "error", message: "google response contained no candidates" }]);
1750
1777
  }
1751
1778
  const rawCandidate: unknown = candidates[0];
@@ -1760,6 +1787,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1760
1787
  }
1761
1788
  const candidate = rawCandidate as { content?: unknown; finishReason?: string };
1762
1789
  let toolCallsStarted = 0;
1790
+ let sawVisibleOutput = false;
1763
1791
  const imageBudget = createImageBudget();
1764
1792
  const rawContent: unknown = candidate.content;
1765
1793
  const invalidContent = diagnoseGoogleContent(rawContent);
@@ -1786,7 +1814,10 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1786
1814
  pendingThoughtSig = sig;
1787
1815
  }
1788
1816
  const textEvent = googlePartTextEvent(part, returnsThoughtSummaries);
1789
- if (textEvent) events.push(textEvent);
1817
+ if (textEvent) {
1818
+ if (textEvent.type === "text_delta") sawVisibleOutput = true;
1819
+ events.push(textEvent);
1820
+ }
1790
1821
  const inline = (part as { inlineData?: { mimeType?: string; data?: string } }).inlineData;
1791
1822
  if (inline && typeof inline.data === "string") {
1792
1823
  if (inline.data.length > MAX_ENCODED_BYTES_PER_IMAGE) {
@@ -1795,6 +1826,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1795
1826
  try {
1796
1827
  const filePath = await materializeInlineImage(inline.data, imageBudget);
1797
1828
  const escapedPath = artifactMarkdownUrl(filePath);
1829
+ sawVisibleOutput = true;
1798
1830
  events.push({ type: "text_delta", text: `\n![image](${escapedPath})\n` });
1799
1831
  } catch {
1800
1832
  events.push({ type: "error", message: "failed to materialize inline image" });
@@ -1805,6 +1837,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1805
1837
  if (functionCall) {
1806
1838
  const id = `call_${crypto.randomUUID().slice(0, 8)}`;
1807
1839
  toolCallsStarted++;
1840
+ sawVisibleOutput = true;
1808
1841
  events.push({
1809
1842
  type: "tool_call_start",
1810
1843
  id,
@@ -1817,14 +1850,13 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1817
1850
  }
1818
1851
  }
1819
1852
 
1820
- // Fail-closed truncation, same as the stream path: a non-stream turn cut off mid tool call
1821
- // (MAX_TOKENS / MALFORMED_FUNCTION_CALL) surfaces an error instead of a silent done.
1822
- if ((provider.googleMode === "vertex" || provider.googleMode === "cloud-code-assist")
1823
- && isVertexTruncatedTurn(candidate.finishReason, toolCallsStarted)) {
1853
+ // Fail-closed, same rule as the stream path, on every Google mode.
1854
+ if (isGoogleTruncatedTurn(candidate.finishReason, toolCallsStarted, sawVisibleOutput)) {
1824
1855
  return finish([vertexTruncationErrorEvent(
1825
1856
  candidate.finishReason,
1826
1857
  toolCallsStarted,
1827
1858
  usageFromGemini(json.usageMetadata as Record<string, number> | undefined),
1859
+ googleModeLabel(provider.googleMode),
1828
1860
  )]);
1829
1861
  }
1830
1862
 
@@ -1834,11 +1866,7 @@ export function createGoogleAdapter(provider: OcxProviderConfig): ProviderAdapte
1834
1866
  // turn as completed — and, on a compaction turn, installs the half-written summary as
1835
1867
  // replacement history (#422).
1836
1868
  const finishReason = candidate.finishReason as string | undefined;
1837
- const stopReason = finishReason === "MAX_TOKENS"
1838
- ? "max_tokens"
1839
- : ["SAFETY", "RECITATION", "BLOCKLIST", "PROHIBITED_CONTENT", "SPII"].includes(finishReason ?? "")
1840
- ? "content_filter"
1841
- : undefined;
1869
+ const stopReason = googleStopReason(finishReason);
1842
1870
  events.push({
1843
1871
  type: "done",
1844
1872
  usage: usageFromGemini(usage),
@@ -6,6 +6,7 @@ import {
6
6
  type TranslatorBudget,
7
7
  } from "../../lib/translator-budget";
8
8
  import { resolveKiroApiRegion, resolveKiroRequestProfile } from "../../oauth/kiro";
9
+ import { withMissingCreditReading } from "../../usage/credit-billing";
9
10
  import type {
10
11
  AdapterEvent,
11
12
  OcxParsedRequest,
@@ -18,7 +19,7 @@ import { safeKiroHttpErrorMessage } from "../kiro-errors";
18
19
  import { calibrateKiroEstimate } from "../kiro-calibration";
19
20
  import { normalizeKiroImages } from "../kiro-images";
20
21
  import type { KiroCompletionMode } from "../kiro-constants";
21
- import { fetchKiroWithRetry } from "../kiro-retry";
22
+ import { fetchKiroWithRetry, KIRO_FETCH_SEND_LIMIT } from "../kiro-retry";
22
23
  import { fingerprint, invocationId, osTag } from "../kiro-wire";
23
24
  import { hasTrailingDeliveredFinalAnswer } from "./conversation";
24
25
  import { buildKiroPayload } from "./payload";
@@ -192,6 +193,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
192
193
  assistantText,
193
194
  _sawReasoning,
194
195
  budget,
196
+ onDispatch,
195
197
  ) => {
196
198
  if (!requestSnapshot) throw new Error("Kiro completion retry lost its request state");
197
199
  if (requestAbortSignal?.aborted) {
@@ -258,9 +260,10 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
258
260
  // And reported nothing, so the sends it paid for were invisible. Its own first send is
259
261
  // the completion retry itself: the first attempt produced progress without a final
260
262
  // answer, which is the same recovery class the generic empty-completion guard records.
261
- ...(requestOnPhysicalSend
262
- ? { onPhysicalSend: (send: KiroPhysicalSend) => forwardPhysicalSend(send, fallbackOrdinalBase, "empty-completion") }
263
- : {}),
263
+ onPhysicalSend: (send: KiroPhysicalSend) => {
264
+ onDispatch?.();
265
+ if (requestOnPhysicalSend) forwardPhysicalSend(send, fallbackOrdinalBase, "empty-completion");
266
+ },
264
267
  });
265
268
  return {
266
269
  response,
@@ -277,8 +280,34 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
277
280
  }
278
281
  };
279
282
 
283
+ async function* parseResponseStream(response: Response, budget: TranslatorBudget): AsyncGenerator<AdapterEvent> {
284
+ // Only the successful header-time response can provide metering. Capture this before the
285
+ // parser starts its own fallback, which separately tracks its missing readings.
286
+ const missingHeaderReading = physicalSendsObserved > 1;
287
+ for await (const event of parseKiroStream(
288
+ response,
289
+ budget,
290
+ modelId,
291
+ inputTokens,
292
+ contextWindow,
293
+ toolNameMap,
294
+ conversationId,
295
+ completionMode,
296
+ completionMode === "required" ? fallbackFactory : undefined,
297
+ contextInputEstimate,
298
+ structuredOutput,
299
+ )) {
300
+ if (missingHeaderReading && (event.type === "done" || event.type === "incomplete" || event.type === "error")) {
301
+ yield { ...event, usage: withMissingCreditReading(event.usage) };
302
+ } else {
303
+ yield event;
304
+ }
305
+ }
306
+ }
307
+
280
308
  return {
281
309
  name: "kiro",
310
+ hostedIterationSendLimit: 2 * KIRO_FETCH_SEND_LIMIT, // Initial fetch and one bounded completion retry.
282
311
  // A replayed history that already ENDS with a delivered final answer has nothing to ask Kiro.
283
312
  // Before this hook the adapter still appended a trailing user turn — a neutral acknowledgement,
284
313
  // but structurally still a prompt — and performed a real inference, so the model answered the
@@ -317,21 +346,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
317
346
  },
318
347
 
319
348
  /** Parse a streaming Kiro response, with the bounded retry wired to this request. */
320
- parseStream(response: Response, budget: TranslatorBudget): AsyncGenerator<AdapterEvent> {
321
- return parseKiroStream(
322
- response,
323
- budget,
324
- modelId,
325
- inputTokens,
326
- contextWindow,
327
- toolNameMap,
328
- conversationId,
329
- completionMode,
330
- completionMode === "required" ? fallbackFactory : undefined,
331
- contextInputEstimate,
332
- structuredOutput,
333
- );
334
- },
349
+ parseStream: parseResponseStream,
335
350
 
336
351
  fetchResponse(request: AdapterRequest, ctx?: AdapterFetchContext): Promise<Response> {
337
352
  // The normal Responses path supplies cancellation at fetch time rather than build time.
@@ -341,16 +356,14 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
341
356
  requestExecutor = ctx?.executor;
342
357
  requestTimeoutMs = ctx?.timeoutMs;
343
358
  if (ctx?.sendBudget) requestSendBudget = ctx.sendBudget;
344
- if (ctx?.onPhysicalSend) requestOnPhysicalSend = ctx.onPhysicalSend;
359
+ requestOnPhysicalSend = ctx?.onPhysicalSend;
345
360
  // Reset per fetch call, because `ordinal` is defined within one call and the caller records
346
361
  // ordinal 1 of each new attempt itself. The text fallback that follows this attempt then
347
362
  // continues THIS attempt's sequence rather than an earlier one's.
348
363
  physicalSendsObserved = 0;
349
- // Routed through the same forwarder as the fallback so both legs share one ordinal
350
- // sequence; a context without an observer is passed through untouched.
351
- return fetchKiroWithRetry(request, requestOnPhysicalSend
352
- ? { ...ctx, returnRawErrors: true, onPhysicalSend: (send: KiroPhysicalSend) => forwardPhysicalSend(send, 0) }
353
- : { ...ctx, returnRawErrors: true });
364
+ return fetchKiroWithRetry(request, {
365
+ ...ctx, returnRawErrors: true, onPhysicalSend: send => forwardPhysicalSend(send, 0),
366
+ });
354
367
  },
355
368
 
356
369
  formatErrorBody(status: number, headers: Headers, payloadText: string): string {
@@ -365,19 +378,7 @@ export function createKiroAdapter(provider: OcxProviderConfig): ProviderAdapter
365
378
  async parseResponse(response: Response, budget: TranslatorBudget): Promise<AdapterEvent[]> {
366
379
  const events: AdapterEvent[] = [];
367
380
  try {
368
- for await (const e of parseKiroStream(
369
- response,
370
- budget,
371
- modelId,
372
- inputTokens,
373
- contextWindow,
374
- toolNameMap,
375
- conversationId,
376
- completionMode,
377
- completionMode === "required" ? fallbackFactory : undefined,
378
- contextInputEstimate,
379
- structuredOutput,
380
- )) {
381
+ for await (const e of parseResponseStream(response, budget)) {
381
382
  retainTranslatedEvent(e, budget, events.at(-1));
382
383
  events.push(e);
383
384
  }
@@ -5,6 +5,8 @@ import {
5
5
  type TranslatorBudget,
6
6
  } from "../../lib/translator-budget";
7
7
  import type { AdapterEvent, OcxUsage } from "../../types";
8
+ import { reportResponseSendReading } from "../../lib/response-send-readings";
9
+ import { sumCreditReadings, withMissingCreditReading } from "../../usage/credit-billing";
8
10
  import { recordKiroCalibration, rekeyKiroCalibration } from "../kiro-calibration";
9
11
  import {
10
12
  KIRO_COMPLETION_TOOL_NAME,
@@ -57,6 +59,18 @@ interface KiroAttemptResult extends KiroAttemptParseResult {
57
59
  releaseRetained(): void;
58
60
  }
59
61
 
62
+ /**
63
+ * The token usage Kiro reported for the one physical response an attempt parsed, if it reported
64
+ * any. A response without a tokenUsage frame (an empty body, a credit meter alone) still gets a
65
+ * local estimate for the client and the request log, but an estimate is not a reading and must
66
+ * not settle the send that produced it.
67
+ */
68
+ function attemptReading(result: KiroAttemptParseResult): OcxUsage | undefined {
69
+ const terminal = result.terminal;
70
+ const usage = terminal && "usage" in terminal && terminal.usage ? terminal.usage : result.usage;
71
+ return usage?.upstreamReported === true && !usage.estimated ? usage : undefined;
72
+ }
73
+
60
74
  interface KiroAttemptRetention {
61
75
  trackReplacement(previousBytes: number, nextBytes: number): void;
62
76
  retainEvent(event: AdapterEvent, bytes: number): void;
@@ -158,6 +172,8 @@ export type KiroFallbackFactory = (
158
172
  assistantText: string,
159
173
  sawReasoning: boolean,
160
174
  budget: TranslatorBudget,
175
+ /** Invoked once for each physical send, including transport replays. */
176
+ onDispatch?: () => void,
161
177
  ) => Promise<KiroFallbackAttempt>;
162
178
 
163
179
  function mergeKiroUsage(
@@ -165,8 +181,11 @@ function mergeKiroUsage(
165
181
  second: OcxUsage | undefined,
166
182
  preserveFirstContextGrowth = false,
167
183
  ): OcxUsage | undefined {
168
- if (!first) return second;
169
- if (!second) return first;
184
+ const providerCredits = sumCreditReadings([first?.providerCredits, second?.providerCredits]);
185
+ if (!first || !second) {
186
+ const usage = first ?? second;
187
+ return usage && { ...usage, ...(providerCredits !== undefined ? { providerCredits } : {}) };
188
+ }
170
189
  const sumOptional = (key: keyof OcxUsage): number | undefined => {
171
190
  const a = first[key];
172
191
  const b = second[key];
@@ -198,7 +217,7 @@ function mergeKiroUsage(
198
217
  ...(sumOptional("cachedInputTokens") !== undefined ? { cachedInputTokens: sumOptional("cachedInputTokens") } : {}),
199
218
  ...(sumOptional("cacheReadInputTokens") !== undefined ? { cacheReadInputTokens: sumOptional("cacheReadInputTokens") } : {}),
200
219
  ...(sumOptional("cacheCreationInputTokens") !== undefined ? { cacheCreationInputTokens: sumOptional("cacheCreationInputTokens") } : {}),
201
- ...(sumOptional("providerCredits") !== undefined ? { providerCredits: sumOptional("providerCredits") } : {}),
220
+ ...(providerCredits !== undefined ? { providerCredits } : {}),
202
221
  ...(sumOptional("reasoningOutputTokens") !== undefined ? { reasoningOutputTokens: sumOptional("reasoningOutputTokens") } : {}),
203
222
  ...(first.estimated || second.estimated ? { estimated: true } : {}),
204
223
  ...(first.upstreamReported && second.upstreamReported ? { upstreamReported: true as const } : {}),
@@ -1299,6 +1318,20 @@ export async function* parseKiroStream(
1299
1318
  return;
1300
1319
  }
1301
1320
 
1321
+ // The retry below is a second physical send inside this parse, and the terminal will sum both
1322
+ // readings. Report the first response's reading now so it settles the send that produced it;
1323
+ // a retry that reports nothing then stays unresolved instead of absorbing this reading.
1324
+ // A first response with no reading of its own is marked unmetered only once the retry has
1325
+ // left: a retry refused before dispatch keeps it the request's one routed send, which settles
1326
+ // with the request's aggregate usage like any other single send.
1327
+ const firstReading = attemptReading(firstResult);
1328
+ let firstReadingReported = false;
1329
+ const reportFirstReading = (): void => {
1330
+ if (firstReadingReported) return;
1331
+ firstReadingReported = true;
1332
+ reportResponseSendReading(response, firstReading);
1333
+ };
1334
+ if (firstReading) reportFirstReading();
1302
1335
  yield { type: "heartbeat" };
1303
1336
  // Failed validation releases held progress. Keep those failures non-retryable so a later
1304
1337
  // replay cannot duplicate it; successful validation instead discards the superseded text.
@@ -1306,14 +1339,18 @@ export async function* parseKiroStream(
1306
1339
  let firstAssistantText = firstResult.assistantText;
1307
1340
  const firstHadAssistantText = firstAssistantText.length > 0;
1308
1341
  let fallback: KiroFallbackAttempt;
1342
+ let fallbackSends = 0;
1309
1343
  try {
1310
1344
  fallback = await fallbackFactory(
1311
1345
  firstResult.providerState?.kiro.conversationId ?? conversationId,
1312
1346
  firstAssistantText,
1313
1347
  firstResult.sawReasoning,
1314
1348
  budget,
1349
+ () => { fallbackSends++; reportFirstReading(); },
1315
1350
  );
1316
1351
  } catch (err) {
1352
+ // A retry the factory already sent read nothing back: mark it unmetered.
1353
+ if (fallbackSends > 0) reportResponseSendReading(response, undefined);
1317
1354
  yield* firstResult.drainDeferred(dropHeldProse);
1318
1355
  firstAssistantText = "";
1319
1356
  firstResult.assistantText = "";
@@ -1325,7 +1362,7 @@ export async function* parseKiroStream(
1325
1362
  status: 502,
1326
1363
  errorType: "upstream_error",
1327
1364
  code: "translation_buffer_limit",
1328
- usage: firstResult.usage,
1365
+ usage: fallbackSends > 0 ? mergeKiroUsage(firstResult.usage, undefined) : firstResult.usage,
1329
1366
  };
1330
1367
  return;
1331
1368
  }
@@ -1335,10 +1372,15 @@ export async function* parseKiroStream(
1335
1372
  status: err instanceof Error && err.name === "TimeoutError" ? 504 : 502,
1336
1373
  errorType: "upstream_error",
1337
1374
  retryable: !priorEmittedOutput,
1338
- usage: firstResult.usage,
1375
+ usage: fallbackSends > 0 ? mergeKiroUsage(firstResult.usage, undefined) : firstResult.usage,
1339
1376
  };
1340
1377
  return;
1341
1378
  }
1379
+ // A transport timeout before the retry's dispatch receipt comes back as a synthetic 504 with
1380
+ // no send behind it. Readings below are reported only for a retry that left, so the first
1381
+ // response stays the one routed send and settles with the request total.
1382
+ const retryDispatched = fallbackSends > 0;
1383
+ if (retryDispatched) reportFirstReading();
1342
1384
  // The factory has retained its retry serialization. First-attempt progress remains charged
1343
1385
  // until the second attempt decides whether it is superseded or must be released.
1344
1386
  firstAssistantText = "";
@@ -1346,6 +1388,8 @@ export async function* parseKiroStream(
1346
1388
  firstResult.releaseCollectors();
1347
1389
  fallback.releaseRequestBody?.();
1348
1390
  if (!fallback.response.ok) {
1391
+ // An HTTP failure body carries no usage: the retry stays unresolved at its reservation.
1392
+ if (retryDispatched) reportResponseSendReading(response, undefined);
1349
1393
  yield* firstResult.drainDeferred(dropHeldProse);
1350
1394
  const payload = await readDisplaySafeErrorPayloadText(fallback.response, fallback.abortSignal);
1351
1395
  const failure = classifyKiroHttpError(fallback.response.status, fallback.response.headers, payload);
@@ -1356,11 +1400,16 @@ export async function* parseKiroStream(
1356
1400
  errorType: failure.errorType,
1357
1401
  code: failure.code,
1358
1402
  retryable: priorEmittedOutput ? false : failure.retryable,
1359
- usage: firstResult.usage,
1403
+ usage: mergeKiroUsage(firstResult.usage, undefined),
1360
1404
  };
1361
1405
  return;
1362
1406
  }
1363
1407
 
1408
+ // Only the final response can expose a metering snapshot. A reset/replay (or another
1409
+ // send discarded inside the retry transport) leaves at least one reading unknown.
1410
+ const mergeFallbackUsage = (usage: OcxUsage | undefined) => mergeKiroUsage(
1411
+ firstResult.usage, fallbackSends > 1 ? withMissingCreditReading(usage) : usage, firstHadAssistantText,
1412
+ );
1364
1413
  const secondResult = yield* parseKiroAttempt(
1365
1414
  fallback.response,
1366
1415
  budget,
@@ -1376,12 +1425,13 @@ export async function* parseKiroStream(
1376
1425
  firstResult,
1377
1426
  structuredOutput,
1378
1427
  );
1428
+ reportResponseSendReading(response, attemptReading(secondResult));
1379
1429
  try {
1380
1430
  if (!secondResult.terminal) {
1381
1431
  yield retryableKiroIncomplete(
1382
1432
  "empty_kiro_fallback",
1383
1433
  "Kiro's bounded completion retry ended without a terminal result",
1384
- mergeKiroUsage(firstResult.usage, secondResult.usage, firstHadAssistantText)
1434
+ mergeFallbackUsage(secondResult.usage)
1385
1435
  ?? { inputTokens, outputTokens: 0, estimated: true },
1386
1436
  secondResult.providerState ?? firstResult.providerState,
1387
1437
  !priorEmittedOutput,
@@ -1395,7 +1445,7 @@ export async function* parseKiroStream(
1395
1445
  ...(secondResult.terminal.type === "incomplete" && priorEmittedOutput
1396
1446
  ? { retryable: false as const }
1397
1447
  : {}),
1398
- usage: mergeKiroUsage(firstResult.usage, secondResult.terminal.usage, firstHadAssistantText),
1448
+ usage: mergeFallbackUsage(secondResult.terminal.usage),
1399
1449
  providerState: secondResult.terminal.providerState ?? firstResult.providerState,
1400
1450
  };
1401
1451
  return;
@@ -1403,7 +1453,7 @@ export async function* parseKiroStream(
1403
1453
  yield {
1404
1454
  ...secondResult.terminal,
1405
1455
  ...(secondResult.terminal.type === "error"
1406
- ? { usage: mergeKiroUsage(firstResult.usage, secondResult.terminal.usage, firstHadAssistantText) }
1456
+ ? { usage: mergeFallbackUsage(secondResult.terminal.usage) }
1407
1457
  : {}),
1408
1458
  };
1409
1459
  } finally {
@@ -1,4 +1,5 @@
1
1
  import type { AdapterFetchContext, AdapterRequest } from "./base";
2
+ import { fetchWithPhysicalSendReceipt } from "../lib/executor-physical-send-receipt";
2
3
  import type { AttemptRecoveryKind } from "../usage/log";
3
4
  import { classifyKiroHttpError, safeKiroHttpErrorMessage } from "./kiro-errors";
4
5
  import { normalizeUpstreamHttpErrorResponse } from "./upstream-http-error";
@@ -20,6 +21,8 @@ const RESET_ATTEMPTS = 3;
20
21
  const RESET_RETRY_BASE_MS = 150;
21
22
  const RESET_RETRY_MAX_MS = 1_000;
22
23
  const THROTTLE_ATTEMPTS = 3;
24
+ // A throttle round can try both the runtime and legacy endpoint.
25
+ export const KIRO_FETCH_SEND_LIMIT = THROTTLE_ATTEMPTS * 2 * RESET_ATTEMPTS;
23
26
  const CANONICAL_RUNTIME_HOST = /^runtime\.([a-z]{2}(?:-[a-z]+)+-\d)\.kiro\.dev$/i;
24
27
  const ENDPOINT_ERROR_MARKERS = [
25
28
  "unknownoperation",
@@ -201,11 +204,10 @@ async function fetchWithResetRecovery(
201
204
  ...(recovered ? { keepalive: false } : {}),
202
205
  }, timeoutMs, ctx.abortSignal, ctx.stream, (async (input, init) => {
203
206
  try {
204
- const run = async (): Promise<Response> => {
207
+ const run = () => fetchWithPhysicalSendReceipt(executor.unpacedFetch ?? executor, input, init, () => {
205
208
  if (permit && !permit.use()) throw new SendBudgetExhaustedError(errorDestinationLabel(destination));
206
209
  notePhysicalSend(attempt > 0);
207
- return (executor.unpacedFetch ?? executor)(input, init);
208
- };
210
+ });
209
211
  return await (permit?.execute ? permit.execute(run) : run());
210
212
  } catch (error) {
211
213
  if (ctx.abortSignal?.aborted) throw abortError(ctx.abortSignal);
@@ -0,0 +1,21 @@
1
+ MIT License
2
+
3
+ Copyright (c) 2026 Alexandra Østermark
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining a copy
6
+ of this software and associated documentation files (the "Software"), to deal
7
+ in the Software without restriction, including without limitation the rights
8
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9
+ copies of the Software, and to permit persons to whom the Software is
10
+ furnished to do so, subject to the following conditions:
11
+
12
+ The above copyright notice and this permission notice shall be included in all
13
+ copies or substantial portions of the Software.
14
+
15
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21
+ SOFTWARE.