@bitkyc08/opencodex 2.100.5 → 2.100.6-preview.20261119.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (536) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +2 -0
  3. package/gui/dist/assets/App-BI8LQ7Qk.css +1 -0
  4. package/gui/dist/assets/App-D5qUBOoF.js +60 -0
  5. package/gui/dist/assets/Tray-DMwQSAli.js +1 -0
  6. package/gui/dist/assets/brand-mark-ycThul7d.js +1 -0
  7. package/gui/dist/assets/index-Bp_GaFFu.js +138 -0
  8. package/gui/dist/assets/index-BtwVlpeQ.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-Bquysdn5.js → segment-thumb-features-BLUW2Fb1.js} +1 -1
  10. package/gui/dist/classic/assets/App-CoiVLRW3.css +1 -0
  11. package/gui/dist/classic/assets/App-D39mkP2w.js +59 -0
  12. package/gui/dist/classic/assets/Tray-nUmdL7K9.js +1 -0
  13. package/gui/dist/classic/assets/index-BJ4uxZk0.js +138 -0
  14. package/gui/dist/classic/assets/usage-companion-chart-DFoYm2RY.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.lock +62 -0
  18. package/native/ocx-child/Cargo.toml +1 -0
  19. package/native/ocx-child/src/journal.rs +32 -10
  20. package/native/ocx-child/src/state.rs +2 -1
  21. package/native/ocx-child/src/toml_surgeon.rs +183 -72
  22. package/package.json +2 -2
  23. package/src/adapters/agy-acp/acp.ts +202 -0
  24. package/src/adapters/agy-acp/adapter.ts +554 -0
  25. package/src/adapters/agy-acp/binary.ts +79 -0
  26. package/src/adapters/agy-acp/options.ts +163 -0
  27. package/src/adapters/agy-acp/output-redaction.ts +270 -0
  28. package/src/adapters/agy-acp/policy.ts +105 -0
  29. package/src/adapters/agy-acp/process.ts +218 -0
  30. package/src/adapters/anthropic/account-metadata.ts +4 -1
  31. package/src/adapters/anthropic/advisor-tool.ts +43 -9
  32. package/src/adapters/anthropic/client-identity.ts +2 -0
  33. package/src/adapters/anthropic.ts +102 -14
  34. package/src/adapters/antigravity-refusal.ts +5 -1
  35. package/src/adapters/base.ts +25 -2
  36. package/src/adapters/claude-cli/adapter.ts +1 -0
  37. package/src/adapters/claude-cli/usage-admission.ts +12 -9
  38. package/src/adapters/codebuddy/adapter.ts +1 -0
  39. package/src/adapters/command-code.ts +2 -2
  40. package/src/adapters/cursor/http1-bidi.ts +7 -2
  41. package/src/adapters/cursor/live-transport.ts +2 -0
  42. package/src/adapters/cursor/request-builder.ts +4 -4
  43. package/src/adapters/cursor/tool-naming.ts +5 -5
  44. package/src/adapters/cursor/transport-retry.ts +14 -8
  45. package/src/adapters/cursor/transport.ts +2 -0
  46. package/src/adapters/cursor.ts +8 -2
  47. package/src/adapters/google-error-details.ts +105 -0
  48. package/src/adapters/google-errors.ts +183 -31
  49. package/src/adapters/google-http.ts +66 -22
  50. package/src/adapters/google-truncation.ts +48 -3
  51. package/src/adapters/google-vertex-endpoint.ts +12 -1
  52. package/src/adapters/google.ts +54 -26
  53. package/src/adapters/kiro/adapter.ts +39 -38
  54. package/src/adapters/kiro/stream.ts +59 -9
  55. package/src/adapters/kiro-retry.ts +5 -3
  56. package/src/adapters/m365-copilot/LICENSE +21 -0
  57. package/src/adapters/m365-copilot/fenced.ts +745 -0
  58. package/src/adapters/m365-copilot/images.ts +89 -0
  59. package/src/adapters/m365-copilot/tools.ts +284 -0
  60. package/src/adapters/m365-copilot/transport.ts +232 -0
  61. package/src/adapters/m365-copilot.ts +143 -0
  62. package/src/adapters/openai-chat/tool-schema.ts +2 -2
  63. package/src/adapters/openai-responses/passthrough.ts +1 -0
  64. package/src/adapters/openai-responses/reasoning.ts +23 -3
  65. package/src/adapters/physical-send.ts +11 -4
  66. package/src/adapters/qoder/adapter.ts +17 -3
  67. package/src/adapters/registry.ts +15 -1
  68. package/src/adapters/zed.ts +2 -1
  69. package/src/advisor/consult.ts +1 -0
  70. package/src/bridge/response-json.ts +6 -2
  71. package/src/bridge/sse.ts +21 -9
  72. package/src/chat/inbound.ts +11 -8
  73. package/src/chat/outbound.ts +28 -7
  74. package/src/claude/context-windows.ts +32 -8
  75. package/src/claude/desktop-3p.ts +18 -14
  76. package/src/claude/desktop-picker-platform.ts +1 -1
  77. package/src/claude/desktop-picker.ts +3 -3
  78. package/src/claude/inbound-content-options.ts +11 -1
  79. package/src/claude/intercept/picker-ca-cleanup.ts +17 -5
  80. package/src/claude/intercept/picker-ca.ts +162 -27
  81. package/src/claude/intercept/picker-trust-linux.ts +411 -0
  82. package/src/claude/intercept/picker-trust.ts +35 -3
  83. package/src/claude/intercept/runtime.ts +2 -2
  84. package/src/claude/subagent-force-status.ts +24 -5
  85. package/src/claude/subscription-reserve.ts +87 -0
  86. package/src/cli/account-api.ts +3 -0
  87. package/src/cli/account-auth.ts +65 -11
  88. package/src/cli/account-extended.ts +1 -1
  89. package/src/cli/account-next-actions.ts +4 -1
  90. package/src/cli/account-policy-dto.ts +1 -1
  91. package/src/cli/account-policy.ts +6 -3
  92. package/src/cli/account-probe.ts +66 -0
  93. package/src/cli/account.ts +8 -2
  94. package/src/cli/capabilities-accounts.ts +8 -1
  95. package/src/cli/capabilities-agents-routing.ts +2 -2
  96. package/src/cli/capabilities-base.ts +4 -4
  97. package/src/cli/capabilities-integrations.ts +44 -4
  98. package/src/cli/capabilities-provider-models.ts +6 -0
  99. package/src/cli/claude-context-settings.ts +60 -0
  100. package/src/cli/claude-desktop.ts +2 -2
  101. package/src/cli/claude.ts +15 -7
  102. package/src/cli/client-start-fence.ts +64 -1
  103. package/src/cli/combo-result.ts +1 -0
  104. package/src/cli/combo-stats.ts +1 -1
  105. package/src/cli/combo.ts +19 -2
  106. package/src/cli/config-command.ts +21 -8
  107. package/src/cli/connect.ts +16 -0
  108. package/src/cli/cross-home-owner.ts +65 -18
  109. package/src/cli/dispatch.ts +4 -0
  110. package/src/cli/gateway-client-command.ts +128 -0
  111. package/src/cli/index.ts +98 -97
  112. package/src/cli/init.ts +20 -4
  113. package/src/cli/integrations.ts +23 -3
  114. package/src/cli/launcher-context.ts +12 -1
  115. package/src/cli/link.ts +24 -5
  116. package/src/cli/models-runtime-subcommands.ts +1 -0
  117. package/src/cli/models-runtime.ts +32 -0
  118. package/src/cli/start-owner-fence.ts +5 -2
  119. package/src/cli/status.ts +3 -3
  120. package/src/cli/stop-client-process.ts +51 -0
  121. package/src/cli/stop-restore.ts +383 -36
  122. package/src/cli/sync-command.ts +2 -2
  123. package/src/cli/uninstall-client-state.ts +7 -0
  124. package/src/client/connect.ts +72 -13
  125. package/src/client/hub-client.ts +38 -0
  126. package/src/client/hub-relay.ts +61 -36
  127. package/src/client/hub-session.ts +106 -0
  128. package/src/client/lifecycle-lock.ts +6 -1
  129. package/src/client/link-relay.ts +2 -1
  130. package/src/client/machine-listener.ts +60 -1
  131. package/src/client/runtime-restart.ts +1 -0
  132. package/src/client/runtime.ts +104 -34
  133. package/src/client/state.ts +11 -0
  134. package/src/client/stop-darwin-process.ts +73 -0
  135. package/src/client/stop-file-routing.ts +49 -0
  136. package/src/client/stop-native-handoff.ts +108 -0
  137. package/src/client/stop-routing.ts +41 -7
  138. package/src/client/stop-teardown-owner.ts +173 -0
  139. package/src/client/sync-runtime.ts +23 -4
  140. package/src/clients/config-export/opencode-wire.ts +24 -0
  141. package/src/clients/config-export.ts +28 -19
  142. package/src/codex/auth-api/login-flow.ts +68 -33
  143. package/src/codex/auth-api/main-account-probe.ts +3 -3
  144. package/src/codex/auth-api/pool-quota-probe.ts +8 -7
  145. package/src/codex/auth-api/routes.ts +1 -1
  146. package/src/codex/catalog/aggregation.ts +22 -10
  147. package/src/codex/catalog/gather-capture.ts +11 -2
  148. package/src/codex/catalog/m365-copilot-models.ts +52 -0
  149. package/src/codex/catalog/provider-models.ts +126 -53
  150. package/src/codex/catalog/routed-gather.ts +26 -12
  151. package/src/codex/catalog-admission.ts +4 -6
  152. package/src/codex/catalog-auto-refresh.ts +4 -2
  153. package/src/codex/catalog-self-heal.ts +4 -2
  154. package/src/codex/control-plane-models.ts +6 -0
  155. package/src/codex/convergence.ts +10 -0
  156. package/src/codex/desktop-app/picker-freshness.ts +3 -14
  157. package/src/codex/desktop-app/types.ts +6 -0
  158. package/src/codex/desktop-app/windows-command-payload.ts +9 -0
  159. package/src/codex/desktop-app/windows.ts +20 -12
  160. package/src/codex/desktop-compatibility/installed-build.ts +61 -58
  161. package/src/codex/desktop-compatibility/runtime-ownership.ts +11 -5
  162. package/src/codex/desktop-compatibility/runtime.ts +51 -14
  163. package/src/codex/desktop-compatibility/windows-activation-source.ts +28 -13
  164. package/src/codex/desktop-compatibility/windows-package-command.ts +73 -33
  165. package/src/codex/desktop-compatibility/windows-package-launch.ts +41 -9
  166. package/src/codex/desktop-compatibility/windows-package-proof.ts +104 -0
  167. package/src/codex/inject/config-toml.ts +67 -73
  168. package/src/codex/inject/plan.ts +11 -10
  169. package/src/codex/inject/remove.ts +4 -1
  170. package/src/codex/inject.ts +1 -0
  171. package/src/codex/journal-config-restore.ts +31 -4
  172. package/src/codex/journal.ts +16 -4
  173. package/src/codex/model-cache.ts +98 -27
  174. package/src/codex/native-residue.ts +14 -13
  175. package/src/codex/paths.ts +65 -28
  176. package/src/codex/quota-observation-freshness.ts +4 -0
  177. package/src/codex/quota.ts +71 -8
  178. package/src/codex/routing/selection.ts +32 -8
  179. package/src/combos/capability-policy.ts +31 -0
  180. package/src/combos/failover.ts +82 -74
  181. package/src/combos/identifiers.ts +2 -2
  182. package/src/combos/index.ts +3 -0
  183. package/src/combos/jev-model-backend.ts +12 -4
  184. package/src/combos/jev-session-pin-config.ts +22 -9
  185. package/src/combos/jev.ts +15 -4
  186. package/src/combos/request-capability.ts +214 -0
  187. package/src/combos/request.ts +22 -15
  188. package/src/combos/resolve.ts +5 -2
  189. package/src/combos/suggestion-channel.ts +89 -0
  190. package/src/combos/types.ts +14 -1
  191. package/src/config/account-auto-pause-revisions.ts +33 -10
  192. package/src/config/atomic-write.ts +1 -1
  193. package/src/config/codex-ws-incremental-setting.ts +34 -0
  194. package/src/config/diagnostics.ts +47 -8
  195. package/src/config/live-topology.ts +4 -2
  196. package/src/config/load-degrade.ts +96 -2
  197. package/src/config/mutation-lock.ts +7 -3
  198. package/src/config/paths.ts +3 -0
  199. package/src/config/pending-teardown.ts +19 -3
  200. package/src/config/process-state.ts +30 -12
  201. package/src/config/provider-validation.ts +10 -0
  202. package/src/config/salvage.ts +2 -2
  203. package/src/config/schema/account-auto-pause.ts +15 -1
  204. package/src/config/schema/agy-acp-references.ts +257 -0
  205. package/src/config/schema/config-schema.ts +32 -0
  206. package/src/config/schema/leaf-validators.ts +42 -0
  207. package/src/config/schema/subscription-reserve.ts +33 -0
  208. package/src/config/windows-process-command-line.ts +27 -9
  209. package/src/config.ts +6 -0
  210. package/src/generated/compatibility-version.json +806 -402
  211. package/src/images/loop.ts +79 -39
  212. package/src/integrations/catalog-refresh.ts +19 -1
  213. package/src/integrations/gateway-clients/agy.ts +340 -0
  214. package/src/integrations/gateway-clients/antigravity.ts +224 -0
  215. package/src/integrations/gateway-clients/index.ts +89 -0
  216. package/src/integrations/gateway-clients/io.ts +278 -0
  217. package/src/integrations/gateway-clients/types.ts +80 -0
  218. package/src/integrations/route-intent-disconnect.ts +37 -21
  219. package/src/lib/app-owned-memory-stores.ts +9 -0
  220. package/src/lib/cloud-code-appeal-link.ts +30 -0
  221. package/src/lib/errors.ts +32 -0
  222. package/src/lib/executor-physical-send-receipt.ts +42 -0
  223. package/src/lib/failure-detail.ts +1 -0
  224. package/src/lib/gcp-adc.ts +5 -0
  225. package/src/lib/http-date.ts +91 -0
  226. package/src/lib/lab-passive-linker-registration.ts +2 -1
  227. package/src/lib/local-chat-completion.ts +13 -3
  228. package/src/lib/local-internal-call-capability.ts +1 -3
  229. package/src/lib/messages-error-body.ts +2 -1
  230. package/src/lib/outbound-credential-registry.ts +40 -4
  231. package/src/lib/pinned-http.ts +7 -2
  232. package/src/lib/process-control.ts +1 -0
  233. package/src/lib/provider-egress.ts +16 -0
  234. package/src/lib/provider-outbound.ts +3 -0
  235. package/src/lib/redact-folding.ts +12 -3
  236. package/src/lib/redact.ts +37 -19
  237. package/src/lib/request-execution-budget.ts +241 -32
  238. package/src/lib/request-peer-scope.ts +64 -0
  239. package/src/lib/response-send-readings.ts +41 -0
  240. package/src/lib/state-store-registrations.ts +5 -0
  241. package/src/lib/tool-envelope-echo-filter.ts +33 -5
  242. package/src/lib/upstream-condition.ts +10 -3
  243. package/src/lib/upstream-retry.ts +95 -20
  244. package/src/lib/windows-secret-acl.ts +24 -7
  245. package/src/link/child-activity.ts +60 -4
  246. package/src/link/codex-settings.ts +2 -1
  247. package/src/link/relay-auth.ts +1 -0
  248. package/src/link/route-rounds.ts +32 -9
  249. package/src/link/status-projection.ts +42 -5
  250. package/src/link/supervisor.ts +96 -11
  251. package/src/link/tunnel-history.ts +5 -0
  252. package/src/oauth/account-auto-pause-policy.ts +72 -19
  253. package/src/oauth/account-auto-pause.ts +40 -16
  254. package/src/oauth/anthropic-account-refusal.ts +7 -0
  255. package/src/oauth/anthropic-continuity.ts +70 -9
  256. package/src/oauth/anthropic-identity.ts +75 -11
  257. package/src/oauth/anthropic-login-slot.ts +258 -0
  258. package/src/oauth/anthropic-routing.ts +24 -9
  259. package/src/oauth/anthropic-send-ownership.ts +4 -3
  260. package/src/oauth/anthropic.ts +30 -11
  261. package/src/oauth/health.ts +7 -2
  262. package/src/oauth/index.ts +50 -48
  263. package/src/oauth/key-providers.ts +2 -0
  264. package/src/oauth/login-cli.ts +11 -0
  265. package/src/oauth/login-flow-state.ts +10 -4
  266. package/src/oauth/m365-copilot-browser.ts +222 -0
  267. package/src/oauth/m365-copilot-web-session.ts +25 -0
  268. package/src/oauth/m365-copilot.ts +57 -0
  269. package/src/oauth/model-discovery-auth.ts +5 -0
  270. package/src/oauth/plan.ts +44 -0
  271. package/src/oauth/pool-kernel.ts +22 -8
  272. package/src/oauth/pool-settings-capability.ts +14 -3
  273. package/src/oauth/reauth-precheck.ts +27 -0
  274. package/src/oauth/store-anthropic-instance.ts +3 -1
  275. package/src/oauth/store.ts +121 -23
  276. package/src/oauth/types.ts +27 -2
  277. package/src/protocols/codecs/chat-ir.ts +7 -4
  278. package/src/protocols/codecs/gemini-interactions.ts +770 -0
  279. package/src/protocols/codecs/gemini.ts +470 -0
  280. package/src/protocols/contract.ts +2 -0
  281. package/src/protocols/encoders/adapter-events.ts +5 -3
  282. package/src/protocols/encoders/chat.ts +23 -7
  283. package/src/protocols/settings.ts +3 -0
  284. package/src/providers/account-quota-disk.ts +26 -8
  285. package/src/providers/api-key-pause.ts +2 -2
  286. package/src/providers/api-key-response-ownership.ts +14 -4
  287. package/src/providers/claude-cli-usage-state.ts +1 -0
  288. package/src/providers/claude-cli-usage.ts +24 -7
  289. package/src/providers/default-aliases.ts +11 -5
  290. package/src/providers/derive.ts +5 -1
  291. package/src/providers/fastwire.ts +6 -5
  292. package/src/providers/free-directory.ts +2 -2
  293. package/src/providers/google-vertex-location.ts +2 -1
  294. package/src/providers/google-vertex-model-discovery.ts +22 -0
  295. package/src/providers/key-failover.ts +18 -23
  296. package/src/providers/m365-copilot-discovery-fetch.ts +17 -0
  297. package/src/providers/m365-copilot-discovery.ts +68 -0
  298. package/src/providers/m365-copilot-models.ts +32 -0
  299. package/src/providers/model-rename-fields.ts +6 -0
  300. package/src/providers/new-model-policy-runtime.ts +27 -6
  301. package/src/providers/openai-forward-destination.ts +19 -0
  302. package/src/providers/openai-tiers-destination.ts +3 -19
  303. package/src/providers/quota/account-cache.ts +183 -27
  304. package/src/providers/quota/anthropic-account-quota.ts +21 -17
  305. package/src/providers/quota/anthropic-cooldown-recovery.ts +57 -27
  306. package/src/providers/quota/anthropic-decision-windows.ts +7 -3
  307. package/src/providers/quota/anthropic-usage-windows.ts +34 -4
  308. package/src/providers/quota/antigravity-account-probe.ts +165 -0
  309. package/src/providers/quota/antigravity.ts +71 -3
  310. package/src/providers/quota/vendor-probes-oauth.ts +52 -28
  311. package/src/providers/quota-decision-publication.ts +1 -1
  312. package/src/providers/quota-decision-snapshot.ts +4 -1
  313. package/src/providers/quota-types.ts +2 -0
  314. package/src/providers/quota.ts +8 -7
  315. package/src/providers/registry/agy-acp-models.ts +3 -0
  316. package/src/providers/registry/entries-core.ts +9 -0
  317. package/src/providers/registry/entries-extended.ts +60 -0
  318. package/src/providers/registry/model-seeds.ts +51 -0
  319. package/src/providers/request-pacing.ts +37 -7
  320. package/src/providers/service-tier.ts +2 -0
  321. package/src/providers/xai-privacy-mode.ts +52 -0
  322. package/src/remote/hub-management-relay.ts +74 -0
  323. package/src/responses/id-limits.ts +2 -0
  324. package/src/responses/input-media.ts +15 -3
  325. package/src/responses/parser-tools.ts +74 -11
  326. package/src/responses/parser.ts +16 -14
  327. package/src/responses/provider-opaque-metadata.ts +10 -0
  328. package/src/responses/reasoning-envelope.ts +3 -0
  329. package/src/responses/schema.ts +2 -3
  330. package/src/responses/spill-store.ts +5 -3
  331. package/src/responses/state/connection-scope.ts +232 -0
  332. package/src/responses/state/entry-types.ts +47 -0
  333. package/src/responses/state/snapshot-codec.ts +75 -14
  334. package/src/responses/state/snapshot-select.ts +2 -0
  335. package/src/responses/state/spill-codec.ts +59 -0
  336. package/src/responses/state/spill-queue.ts +11 -2
  337. package/src/responses/state.ts +178 -159
  338. package/src/router.ts +2 -6
  339. package/src/routing/compatibility/behavior.ts +6 -2
  340. package/src/routing/compatibility/subject.ts +17 -12
  341. package/src/routing/machine-weighted-routing.ts +58 -0
  342. package/src/server/advisor-admission-scope.ts +15 -7
  343. package/src/server/auth-cors.ts +27 -0
  344. package/src/server/chat-completions.ts +37 -17
  345. package/src/server/chat-native-eligibility.ts +21 -0
  346. package/src/server/chat-native.ts +15 -6
  347. package/src/server/claude-messages.ts +54 -6
  348. package/src/server/credential-recovery-attempt.ts +32 -0
  349. package/src/server/effort-policy.ts +6 -3
  350. package/src/server/gemini-inbound.ts +267 -0
  351. package/src/server/gemini-interactions-inbound.ts +229 -0
  352. package/src/server/gemini-interactions-store.ts +129 -0
  353. package/src/server/gemini-native-catalog.ts +64 -0
  354. package/src/server/gemini-native-log.ts +33 -0
  355. package/src/server/gemini-native-paths.ts +88 -0
  356. package/src/server/gemini-native-wire.ts +201 -0
  357. package/src/server/gemini-native.ts +218 -0
  358. package/src/server/grok-upstream-envelope-echo.ts +8 -2
  359. package/src/server/hub-relay-auth.ts +87 -0
  360. package/src/server/hub-usage-windows.ts +135 -0
  361. package/src/server/hub-usage.ts +16 -3
  362. package/src/server/inbound-body-admission.ts +2 -1
  363. package/src/server/index/anthropic-model-listing.ts +75 -0
  364. package/src/server/index/gemini-routes.ts +147 -0
  365. package/src/server/index/link-management.ts +3 -22
  366. package/src/server/index/link-relay-sessions.ts +71 -13
  367. package/src/server/index/link-websocket.ts +2 -0
  368. package/src/server/index/passive-management-read.ts +55 -0
  369. package/src/server/index/serve-options.ts +93 -107
  370. package/src/server/index/websocket-handler.ts +15 -2
  371. package/src/server/index.ts +10 -0
  372. package/src/server/inference/client-encoder-delivery.ts +2 -1
  373. package/src/server/inference/context.ts +33 -6
  374. package/src/server/management/agent-settings-routes.ts +33 -16
  375. package/src/server/management/claude-code-settings-patch.ts +6 -0
  376. package/src/server/management/combo-routes.ts +21 -1
  377. package/src/server/management/combo-suggestion-routes.ts +212 -0
  378. package/src/server/management/config-routes.ts +12 -4
  379. package/src/server/management/context.ts +2 -0
  380. package/src/server/management/gateway-client-routes.ts +62 -0
  381. package/src/server/management/integration-routes.ts +5 -0
  382. package/src/server/management/link-routes.ts +5 -1
  383. package/src/server/management/m365-copilot-provider-probe.ts +23 -0
  384. package/src/server/management/model-routes.ts +32 -2
  385. package/src/server/management/model-rows.ts +36 -3
  386. package/src/server/management/oauth-account-routes.ts +68 -15
  387. package/src/server/management/protocol-settings-patch.ts +1 -0
  388. package/src/server/management/provider-omitted-fields.ts +25 -0
  389. package/src/server/management/provider-overwrite-carry.ts +33 -8
  390. package/src/server/management/provider-routes.ts +10 -16
  391. package/src/server/management/request-history-routes.ts +2 -2
  392. package/src/server/management/route-registry.ts +10 -0
  393. package/src/server/management/shared.ts +118 -30
  394. package/src/server/management/sibling-guard.ts +2 -1
  395. package/src/server/management/system-routes.ts +6 -0
  396. package/src/server/management-auth.ts +8 -1
  397. package/src/server/messages-native-scope.ts +19 -0
  398. package/src/server/messages-native.ts +156 -59
  399. package/src/server/messages-shared.ts +6 -0
  400. package/src/server/models-capabilities.ts +24 -0
  401. package/src/server/native-chat-bridge.ts +259 -0
  402. package/src/server/ollama-inbound.ts +36 -184
  403. package/src/server/passive-route-linker.ts +3 -1
  404. package/src/server/port-reclaim.ts +48 -4
  405. package/src/server/proxy-liveness.ts +79 -22
  406. package/src/server/relay.ts +16 -9
  407. package/src/server/request-log-account-rotation.ts +2 -1
  408. package/src/server/request-log-attempt-recovery.ts +24 -2
  409. package/src/server/request-log-attempt-usage.ts +5 -4
  410. package/src/server/request-log-committed-terminal.ts +87 -0
  411. package/src/server/request-log-failure-attribution.ts +3 -3
  412. package/src/server/request-log-failure-detail.ts +34 -0
  413. package/src/server/request-log-key-failure.ts +27 -0
  414. package/src/server/request-log-terminal-status.ts +25 -12
  415. package/src/server/request-log.ts +59 -63
  416. package/src/server/responses/adapter-continuation.ts +77 -44
  417. package/src/server/responses/adapter-delivery.ts +47 -22
  418. package/src/server/responses/adapter-dispatch.ts +150 -149
  419. package/src/server/responses/advisor-retention.ts +12 -4
  420. package/src/server/responses/advisor-slot.ts +97 -2
  421. package/src/server/responses/agent-task-recovery.ts +44 -11
  422. package/src/server/responses/agy-acp-preflight.ts +41 -0
  423. package/src/server/responses/anthropic-image-context.ts +44 -0
  424. package/src/server/responses/antigravity-validation-refusal.ts +25 -1
  425. package/src/server/responses/buffered-sse-json.ts +18 -1
  426. package/src/server/responses/codex-ws-correlation.ts +5 -2
  427. package/src/server/responses/codex-ws-exchange.ts +91 -8
  428. package/src/server/responses/codex-ws-incremental.ts +136 -0
  429. package/src/server/responses/codex-ws-pool.ts +22 -8
  430. package/src/server/responses/codex-ws-request.ts +5 -0
  431. package/src/server/responses/codex-ws-send-accounting.ts +8 -0
  432. package/src/server/responses/codex-ws-session.ts +14 -0
  433. package/src/server/responses/codex-ws-wire.ts +44 -22
  434. package/src/server/responses/combo-admission-snapshot.ts +93 -0
  435. package/src/server/responses/combo-required-tool-stream.ts +16 -4
  436. package/src/server/responses/combo-selection-keepalive.ts +5 -0
  437. package/src/server/responses/combo-stream-preflight.ts +182 -73
  438. package/src/server/responses/compact-response-body.ts +27 -0
  439. package/src/server/responses/compact.ts +174 -121
  440. package/src/server/responses/compaction-recovery.ts +7 -0
  441. package/src/server/responses/core-codex-account.ts +88 -62
  442. package/src/server/responses/core-combo-failure.ts +15 -0
  443. package/src/server/responses/core-combo-native.ts +12 -1
  444. package/src/server/responses/core-combo.ts +340 -94
  445. package/src/server/responses/core-normalize.ts +19 -12
  446. package/src/server/responses/core-opaque-recovery.ts +15 -4
  447. package/src/server/responses/core-options.ts +50 -5
  448. package/src/server/responses/core-pipeline.ts +11 -0
  449. package/src/server/responses/core.ts +7 -1
  450. package/src/server/responses/empty-completion-guard.ts +21 -7
  451. package/src/server/responses/estimated-usage.ts +2 -1
  452. package/src/server/responses/fetch-helpers.ts +95 -19
  453. package/src/server/responses/history-slim.ts +204 -0
  454. package/src/server/responses/hosted-advisor-spend.ts +49 -0
  455. package/src/server/responses/image-context-recovery.ts +199 -0
  456. package/src/server/responses/input-admission.ts +36 -11
  457. package/src/server/responses/jev-model-invoke.ts +23 -16
  458. package/src/server/responses/non-replayable-error.ts +12 -2
  459. package/src/server/responses/passthrough-build-error.ts +5 -3
  460. package/src/server/responses/passthrough-delivery.ts +74 -33
  461. package/src/server/responses/passthrough-dispatch.ts +170 -197
  462. package/src/server/responses/policy-fallback.ts +7 -2
  463. package/src/server/responses/policy-request-scope.ts +36 -2
  464. package/src/server/responses/replay-owner.ts +20 -0
  465. package/src/server/responses/request-prepare.ts +97 -16
  466. package/src/server/responses/request-send-budget.ts +97 -25
  467. package/src/server/responses/request-sidecar-auth.ts +138 -65
  468. package/src/server/responses/request-spend-target.ts +13 -1
  469. package/src/server/responses/request-spend.ts +228 -47
  470. package/src/server/responses/request-transport.ts +395 -70
  471. package/src/server/responses/run-turn-execution.ts +40 -9
  472. package/src/server/responses/sidecar-execution.ts +214 -67
  473. package/src/server/responses/sidecar-send-budget.ts +9 -9
  474. package/src/server/responses/terminal-guard.ts +35 -9
  475. package/src/server/responses/ws-upstream.ts +27 -6
  476. package/src/server/responses-phase-inference.ts +32 -9
  477. package/src/server/responses-terminal-repair.ts +14 -35
  478. package/src/server/system-env.ts +8 -5
  479. package/src/server/ws-bridge.ts +23 -17
  480. package/src/service/health-sentinel-linux.ts +16 -7
  481. package/src/service/systemd.ts +11 -2
  482. package/src/service/windows-checked-stop-live.ts +60 -55
  483. package/src/service/windows-checked-stop.ts +29 -11
  484. package/src/service/windows-guarded-manager.ts +14 -26
  485. package/src/service/windows-process-evidence.ts +82 -74
  486. package/src/service/windows-process-native.ts +69 -20
  487. package/src/service/windows-service-stop.ts +14 -12
  488. package/src/service/windows-stop-binding.ts +14 -5
  489. package/src/service/windows-stop-confirm.ts +1 -1
  490. package/src/service/windows-task-instance-stop.ts +98 -0
  491. package/src/service/windows-taskxml.ts +30 -7
  492. package/src/sidecar/anthropic-binding.ts +1 -1
  493. package/src/stall-timeout.ts +30 -0
  494. package/src/telemetry/aggregate.ts +6 -3
  495. package/src/types/account-auto-pause.ts +19 -1
  496. package/src/types/accounts.ts +21 -0
  497. package/src/types/anthropic-account-pool.ts +1 -1
  498. package/src/types/combo-capability-policy.ts +19 -0
  499. package/src/types/config.ts +22 -2
  500. package/src/types/provider.ts +42 -8
  501. package/src/types/request.ts +15 -0
  502. package/src/types/tools.ts +22 -5
  503. package/src/types/wire.ts +1 -0
  504. package/src/types.ts +4 -0
  505. package/src/update/check-types.ts +2 -0
  506. package/src/update/job.ts +8 -3
  507. package/src/update/managed-release.ts +6 -0
  508. package/src/update/orchestrated-entry.ts +13 -4
  509. package/src/update/refresh-scheduler.ts +17 -7
  510. package/src/usage/attempt-delivery.ts +6 -0
  511. package/src/usage/cache-provenance.ts +71 -0
  512. package/src/usage/cost.ts +216 -27
  513. package/src/usage/credit-billing.ts +88 -0
  514. package/src/usage/jev-stats.ts +13 -9
  515. package/src/usage/log.ts +5 -33
  516. package/src/usage/summary.ts +8 -43
  517. package/src/usage/user-cost-overlays.ts +13 -1
  518. package/src/vision/index.ts +8 -3
  519. package/src/vision/plan.ts +28 -14
  520. package/src/vision/routed-describe.ts +24 -36
  521. package/src/web-search/header-deadline.ts +14 -3
  522. package/src/web-search/index.ts +6 -4
  523. package/src/web-search/loop.ts +240 -78
  524. package/src/web-search/progress-stream.ts +29 -2
  525. package/src/web-search/run-turn-loop.ts +5 -1
  526. package/gui/dist/assets/App-BGP8I0V4.css +0 -1
  527. package/gui/dist/assets/App-BRExzhwL.js +0 -60
  528. package/gui/dist/assets/Tray-DHCWAn8V.js +0 -1
  529. package/gui/dist/assets/brand-mark-C70PuQ3j.js +0 -1
  530. package/gui/dist/assets/index-DJxM-imn.css +0 -2
  531. package/gui/dist/assets/index-Dy1jIGty.js +0 -138
  532. package/gui/dist/classic/assets/App-B4j-Txmb.css +0 -1
  533. package/gui/dist/classic/assets/App-CaC-E6Vl.js +0 -59
  534. package/gui/dist/classic/assets/Tray-BG253fiL.js +0 -1
  535. package/gui/dist/classic/assets/index-CR_AThOp.js +0 -138
  536. package/gui/dist/classic/assets/quota-summary-B7KQPpEC.js +0 -1
@@ -1,3 +1,4 @@
1
+ import type { AnthropicImageRecovery } from "../server/responses/image-context-recovery";
1
2
  import type { createAnthropicThinkingRecovery } from "../server/responses/anthropic-thinking-recovery";
2
3
  import { markSidecarContextOverflow, sidecarLoopTerminalEvent, upstreamErrorCode, type SidecarLoopFailure } from "../server/responses/context-overflow";
3
4
  import { markVerifiedModelNotInPlanResponse, MODEL_NOT_IN_PLAN_CODE, verifiedPlanRefusalMessage } from "../lib/errors";
@@ -23,11 +24,14 @@ import { namespacedToolName, toolChoiceToolPredicate } from "../types";
23
24
  import { isAnthropicInstanceId } from "../providers/anthropic-instance-id";
24
25
  import { cloneProviderOpaqueToolCallMetadata } from "../responses/provider-opaque-metadata";
25
26
  import type { AttemptRecoveryKind } from "../usage/log";
27
+ import { sumCreditReadings, withMissingCreditReading } from "../usage/credit-billing";
26
28
  import { bridgeToResponsesSSE } from "../bridge";
27
29
  import { isTruncatedStopReason } from "../responses/truncated-stop-reason";
28
30
  import { clearableDeadline, idleDeadline } from "../lib/abort";
29
31
  import { readBoundedResponseBody } from "../lib/bounded-body";
30
- import { applyUpstreamRecoveryInit, fetchWithResetRetry, prepareSameTarget429Wait, isNonReplayableResponse, isSameTargetRetryHold, SendBudgetExhaustedError } from "../lib/upstream-retry";
32
+ import { applyUpstreamRecoveryInit, fetchWithResetRetry, prepareSameTarget429Wait, isNonReplayableResponse, isSameTargetRetryHold, RESET_RETRY_MAX_ATTEMPTS, SendBudgetExhaustedError } from "../lib/upstream-retry";
33
+ import { unwrapUpstreamRetryEvidenceError } from "../codex/auth-context";
34
+ import { HostedAdvisorSpendRefusal } from "../server/responses/policy-request-scope";
31
35
  import { rateLimitRetryDelayMs } from "../providers/key-failover";
32
36
  import { releaseProviderRequestSlot, RequestPacingQueueOverloadError, sendTrackingRequestSlot, type ProviderRequestSlot } from "../providers/request-pacing";
33
37
  import {
@@ -37,7 +41,7 @@ import {
37
41
  TRANSLATOR_MAX_TURN_BYTES,
38
42
  TranslatorBudgetExceededError,
39
43
  } from "../lib/translator-budget";
40
- import { parseStreamWithProgress, RoutedModelInactivityError, WebSearchConsumerInactivityError, WebSearchStreamProtocolError, WebSearchAdapterEventError } from "../web-search/progress-stream";
44
+ import { parseStreamWithProgress, withHeartbeats, RoutedModelInactivityError, WebSearchConsumerInactivityError, WebSearchStreamProtocolError, WebSearchAdapterEventError } from "../web-search/progress-stream";
41
45
  import { fulfillImageCall } from "./fulfill";
42
46
  import { parseVideoCallArgs, pollVideoWithHeartbeats, buildVideoResult, createVideoBudget } from "./fulfill-video";
43
47
  import { submitVideoJob } from "./xai-video-client";
@@ -310,7 +314,9 @@ function loopFailure(e: LoopError): SidecarLoopFailure {
310
314
  * metadata, and the optional image/video bridge plans.
311
315
  */
312
316
  export interface ImageBridgeDeps {
317
+ configureModelSendAllowance?: (baseSends: number) => void;
313
318
  thinkingRecovery?: ReturnType<typeof createAnthropicThinkingRecovery>;
319
+ imageRecovery?: AnthropicImageRecovery;
314
320
  parsed: OcxParsedRequest;
315
321
  /** Chat delivery only; never copied into parsed generation options. */
316
322
  chatRawReasoningVisible?: boolean;
@@ -336,9 +342,9 @@ export interface ImageBridgeDeps {
336
342
  onIterationEnd?: () => void;
337
343
  /** Max image-generation rounds before forcing a final answer. Defaults to 3; clamped to [0, 10]. */
338
344
  maxRounds?: number;
339
- /** Connect / response-header budget for non-runTurn iterations. */
345
+ /** Response-header budget for HTTP iterations. Zero disables the timer. */
340
346
  connectTimeoutMs?: number;
341
- /** Stall budget (seconds) forwarded to bridgeToResponsesSSE; also bounds runTurn collect. */
347
+ /** Inactivity budget (seconds) for HTTP bodies, runTurn collection, and downstream SSE. Zero disables it. */
342
348
  stallTimeoutSec?: number;
343
349
  /** Provider-specific fetch (e.g. xAI transport wrapper). Falls back to global fetch. */
344
350
  fetchImpl?: typeof globalThis.fetch;
@@ -351,10 +357,11 @@ export interface ImageBridgeDeps {
351
357
  proxyErrorContext?: object;
352
358
  /**
353
359
  * After an `on429` rotation, offered the usage of the hidden iterations the left credential
354
- * served. Returning true means it was billed to that credential's attempt, so `onUsage` will not
360
+ * served, including undefined when no usage arrived. Returning true hands off the old attempt,
361
+ * so `onUsage` will not
355
362
  * report it again; the client terminal still includes it.
356
363
  */
357
- onRotatedUsage?: (usage: OcxUsage) => boolean;
364
+ onRotatedUsage?: (usage: OcxUsage | undefined) => boolean;
358
365
  /**
359
366
  * Optional 429 failover for the routed (non-xAI) model. Return a rebuilt adapter for the
360
367
  * rotated credential, or null when the pool is exhausted. Async hooks support OAuth refresh;
@@ -407,25 +414,28 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
407
414
  let adapter = deps.adapter;
408
415
  const maxRounds = clampImageMaxRounds(deps.maxRounds ?? DEFAULT_MAX_ROUNDS);
409
416
  const HARD_CAP = maxRounds + 1;
410
- const connectTimeoutMs = typeof deps.connectTimeoutMs === "number" && Number.isFinite(deps.connectTimeoutMs) && deps.connectTimeoutMs > 0
417
+ const connectTimeoutMs = typeof deps.connectTimeoutMs === "number" && Number.isFinite(deps.connectTimeoutMs) && deps.connectTimeoutMs >= 0
411
418
  ? Math.floor(deps.connectTimeoutMs)
412
419
  : CONNECT_TIMEOUT_MS;
413
- const stallTimeoutMs = typeof deps.stallTimeoutSec === "number" && Number.isFinite(deps.stallTimeoutSec) && deps.stallTimeoutSec > 0
420
+ const stallTimeoutMs = typeof deps.stallTimeoutSec === "number" && Number.isFinite(deps.stallTimeoutSec) && deps.stallTimeoutSec >= 0
414
421
  ? Math.floor(deps.stallTimeoutSec * 1000)
415
422
  : STALL_TIMEOUT_MS;
416
423
  const fetchImpl = deps.fetchImpl ?? globalThis.fetch;
417
424
  let paidImageCalls = 0;
418
425
  let paidVideoCalls = 0;
419
426
  let hiddenUsage: OcxUsage | undefined;
427
+ let hiddenLegs = 0;
428
+ let pendingLegs = 0;
420
429
  // Hidden usage already billed through onRotatedUsage: still on the client terminal, not in
421
430
  // ledgerUsage, which is what onUsage reports once a rotation has moved some.
422
431
  let rotatedUsage: OcxUsage | undefined;
432
+ let rotatedLegs = 0;
423
433
  let ledgerUsage: OcxUsage | undefined;
424
434
  let activeProducers = 0;
425
435
 
426
- const addUsage = (a: OcxUsage | undefined, b: OcxUsage | undefined): OcxUsage | undefined => {
427
- if (!a) return b;
428
- if (!b) return a;
436
+ const addUsage = (a: OcxUsage | undefined, b: OcxUsage | undefined, bothDispatched: boolean): OcxUsage | undefined => {
437
+ if (!a || !b) return bothDispatched ? withMissingCreditReading(a ?? b) : a ?? b;
438
+ const providerCredits = sumCreditReadings([a.providerCredits, b.providerCredits]);
429
439
  return {
430
440
  inputTokens: a.inputTokens + b.inputTokens,
431
441
  outputTokens: a.outputTokens + b.outputTokens,
@@ -447,15 +457,18 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
447
457
  ...(a.reasoningOutputTokens !== undefined || b.reasoningOutputTokens !== undefined
448
458
  ? { reasoningOutputTokens: (a.reasoningOutputTokens ?? 0) + (b.reasoningOutputTokens ?? 0) }
449
459
  : {}),
460
+ ...(providerCredits !== undefined ? { providerCredits } : {}),
450
461
  ...(a.estimated || b.estimated ? { estimated: true } : {}),
451
462
  };
452
463
  };
453
- const takeUsageFrom = (events: AdapterEvent[]): void => {
454
- for (const e of events) {
455
- if ((e.type === "done" || e.type === "incomplete") && e.usage) {
456
- hiddenUsage = addUsage(hiddenUsage, e.usage);
457
- }
458
- }
464
+ // A missing usage object still counts for a dispatched leg. A send replay without a
465
+ // terminal reading also counts, even if the replacement supplies its own reading.
466
+ const takeUsage = (usage: OcxUsage | undefined): void => {
467
+ if (pendingLegs === 0) return;
468
+ const reading = pendingLegs > 1 ? withMissingCreditReading(usage) : usage;
469
+ hiddenUsage = addUsage(hiddenUsage, reading, hiddenLegs > 0);
470
+ hiddenLegs += pendingLegs;
471
+ pendingLegs = 0;
459
472
  };
460
473
 
461
474
  const messages: OcxMessage[] = [...parsed.context.messages];
@@ -503,6 +516,8 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
503
516
  // what earlier rounds left of `attempts`, so a bounded multi-round turn can never exceed the
504
517
  // configured replay count in total (a per-round reset would multiply it by maxRounds).
505
518
  const rateLimitRetryPolicy = deps.retryOn429Policy ?? null;
519
+ deps.configureModelSendAllowance?.((adapter.hostedIterationSendLimit ?? RESET_RETRY_MAX_ATTEMPTS)
520
+ * (HARD_CAP + (rateLimitRetryPolicy?.attempts ?? 0)));
506
521
  let rateLimitRetries = 0;
507
522
 
508
523
  // Acquire one iteration's final response headers. The first call is drained eagerly so an initial
@@ -569,6 +584,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
569
584
  try {
570
585
  // Attempt telemetry must fire at dispatch time, not after collection.
571
586
  deps.onAttemptSend?.();
587
+ pendingLegs++;
572
588
  activeProducers++;
573
589
  let producer: Promise<void>;
574
590
  try {
@@ -618,7 +634,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
618
634
  // runTurn adapters signal errors via {type:"error"} events, not HTTP status codes.
619
635
  const errorEvent = events.find(e => e.type === "error");
620
636
  if (errorEvent && errorEvent.type === "error") {
621
- hiddenUsage = addUsage(hiddenUsage, errorEvent.usage);
637
+ takeUsage(errorEvent.usage);
622
638
  if (errorEvent.code === "translation_buffer_limit") {
623
639
  throw new TranslatorBudgetExceededError("retained_collectors", TRANSLATOR_MAX_TURN_BYTES);
624
640
  }
@@ -667,11 +683,11 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
667
683
  }
668
684
  const requestFetch = deps.fetchForRequest?.(request, iterParsed, requestAdapter, recovery) ?? fetchImpl;
669
685
  let response: Response;
686
+ let awaitingHeaders = true;
670
687
  try {
671
688
  if (requestAdapter.fetchResponse) {
672
689
  const slot = await paceThenResetHeaderDeadline();
673
690
  try {
674
- deps.onAttemptSend?.(recovery);
675
691
  response = await sendTrackingRequestSlot(slot, () => requestAdapter.fetchResponse!(request, {
676
692
  abortSignal: headerDeadline.signal,
677
693
  timeoutMs: connectTimeoutMs,
@@ -679,7 +695,15 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
679
695
  stream: true,
680
696
  executor: requestFetch,
681
697
  sendBudget: deps.incomingMeta.sendBudget,
682
- onPhysicalSend: deps.incomingMeta.onPhysicalSend,
698
+ onPhysicalSend: send => {
699
+ // Adapter-owned stream retries meter themselves. Only header-time sends
700
+ // can leave a missing reading for this iteration's terminal.
701
+ if (awaitingHeaders) {
702
+ if (send.ordinal === 1) deps.onAttemptSend?.(recovery);
703
+ pendingLegs++;
704
+ }
705
+ deps.incomingMeta.onPhysicalSend?.(send);
706
+ },
683
707
  onRecoveryWithheld: deps.incomingMeta.onRecoveryWithheld,
684
708
  }));
685
709
  } finally {
@@ -694,6 +718,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
694
718
  // each connection-reset replay); preserve the caller's recovery kind
695
719
  // (rate-limit-429 / key-429) when the retry layer supplies none.
696
720
  deps.onAttemptSend?.(retryRecovery ?? recovery);
721
+ pendingLegs++;
697
722
  const h = new Headers(request.headers);
698
723
  if (!h.has("accept-encoding")) h.set("accept-encoding", "identity");
699
724
  // Same reset-recovery parity as the web-search loop: the replay needs
@@ -714,6 +739,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
714
739
  );
715
740
  }
716
741
  } finally {
742
+ awaitingHeaders = false;
717
743
  request.releaseBodyObservation?.();
718
744
  }
719
745
  bindAnthropicRejectionResponse(request, response);
@@ -739,7 +765,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
739
765
  body: prepared.response.body,
740
766
  signal,
741
767
  delayMs: rateLimitRetryDelayMs(rateLimitRetryPolicy, retryAfterHeader, Date.now()),
742
- heartbeatIntervalMs: Math.min(10_000, Math.max(250, stallTimeoutMs / 2)),
768
+ heartbeatIntervalMs: stallTimeoutMs === 0 ? 10_000 : Math.min(10_000, Math.max(250, stallTimeoutMs / 2)),
743
769
  });
744
770
  } catch {
745
771
  throw new LoopError(499, "client closed request during image-bridge");
@@ -761,9 +787,12 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
761
787
  const rotated = await deps.on429(prepared.response.headers.get("retry-after"), prepared.response.headers,
762
788
  iterParsed, prepared.response);
763
789
  if (!rotated) break;
764
- if (hiddenUsage && deps.onRotatedUsage?.(hiddenUsage)) {
765
- rotatedUsage = addUsage(rotatedUsage, hiddenUsage);
790
+ takeUsage(undefined);
791
+ if (hiddenLegs > 0 && deps.onRotatedUsage?.(hiddenUsage)) {
792
+ rotatedUsage = addUsage(rotatedUsage, hiddenUsage, rotatedLegs > 0);
793
+ rotatedLegs += hiddenLegs;
766
794
  hiddenUsage = undefined;
795
+ hiddenLegs = 0;
767
796
  }
768
797
  try { void prepared.response.body?.cancel().catch(() => {}); } catch { /* already closed */ }
769
798
  adapter = rotated.adapter;
@@ -771,7 +800,19 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
771
800
  prepared = await fetchOnce(adapter, rotated.recoveryKind);
772
801
  }
773
802
 
774
- if (await deps.thinkingRecovery?.prepareHttp(prepared.response, prepared.responseAdapter.name, iterParsed)) {
803
+ let imageReplacement: AdapterRequest | undefined;
804
+ if (deps.imageRecovery && prepared.response.status === 413) {
805
+ headerDeadline.clear();
806
+ const recovered = yield* withHeartbeats(deps.imageRecovery(prepared.response, iterParsed, prepared.responseAdapter, signal), signal);
807
+ prepared.response = recovered.response;
808
+ imageReplacement = recovered.request;
809
+ if (recovered.response.ok && imageReplacement) {
810
+ messages.splice(0, messages.length, ...iterParsed.context.messages);
811
+ parsed._anthropicImageOwner = iterParsed._anthropicImageOwner;
812
+ cachedRequest = imageReplacement;
813
+ }
814
+ }
815
+ if (!imageReplacement && await deps.thinkingRecovery?.prepareHttp(prepared.response, prepared.responseAdapter.name, iterParsed)) {
775
816
  try { void prepared.response.body?.cancel().catch(() => {}); } catch { /* closed */ }
776
817
  cachedRequest = undefined;
777
818
  prepared = await fetchOnce(adapter, "opaque-blob-rejection");
@@ -834,6 +875,8 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
834
875
  throw new LoopError(504, `Provider response-header timeout after ${connectTimeoutMs}ms during image-bridge`);
835
876
  }
836
877
  if (signal.aborted) throw new LoopError(499, "client closed request during image-bridge");
878
+ const refusal = unwrapUpstreamRetryEvidenceError(error);
879
+ if (refusal instanceof HostedAdvisorSpendRefusal) throw new LoopError(400, refusal.message, refusal.event());
837
880
  if (error instanceof LoopError || error instanceof RequestPacingQueueOverloadError) throw error;
838
881
  throw new LoopError(502, `Provider unreachable: ${error instanceof Error ? error.message : String(error)}`);
839
882
  } finally {
@@ -865,7 +908,7 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
865
908
  yield* parseStreamWithProgress(current.response, current.responseAdapter.parseStream.bind(current.responseAdapter), {
866
909
  signal, inactivityTimeoutMs: stallTimeoutMs, translatorBudget,
867
910
  preserveAdapterError: deps.thinkingRecovery !== undefined,
868
- onErrorUsage: usage => { hiddenUsage = addUsage(hiddenUsage, usage); },
911
+ onErrorUsage: takeUsage,
869
912
  });
870
913
  } catch (error) {
871
914
  if (!(error instanceof WebSearchAdapterEventError)) throw error;
@@ -987,24 +1030,19 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
987
1030
  const shouldLoop = split.calls.length > 0 && !split.hasRealToolCall && !split.hasIncompleteToolCall && !forceFinal
988
1031
  && !split.passthrough.some(event => event.type === "incomplete" || event.type === "error"
989
1032
  || (event.type === "done" && isTruncatedStopReason(event.stopReason)));
1033
+ const terminalIndex = split.passthrough.findLastIndex(e => e.type === "done" || e.type === "incomplete");
1034
+ const terminal = split.passthrough[terminalIndex];
1035
+ if (terminal?.type === "done" || terminal?.type === "incomplete") takeUsage(terminal.usage);
990
1036
  if (!shouldLoop) {
991
- if (hiddenUsage || rotatedUsage) {
992
- for (let i = split.passthrough.length - 1; i >= 0; i--) {
993
- const e = split.passthrough[i];
994
- if (e?.type === "done" || e?.type === "incomplete") {
995
- ledgerUsage = addUsage(hiddenUsage, e.usage);
996
- split.passthrough[i] = { ...e, usage: addUsage(rotatedUsage, ledgerUsage) };
997
- break;
998
- }
999
- }
1037
+ ledgerUsage = hiddenUsage;
1038
+ if (terminal?.type === "done" || terminal?.type === "incomplete") {
1039
+ const usage = addUsage(rotatedUsage, ledgerUsage, rotatedLegs > 0 && hiddenLegs > 0);
1040
+ split.passthrough[terminalIndex] = { ...terminal, usage };
1000
1041
  }
1001
1042
  yield* replay(split.passthrough);
1002
1043
  return;
1003
1044
  }
1004
1045
 
1005
- // Discarded iteration still contributed tokens — accumulate for the final onUsage.
1006
- takeUsageFrom(split.passthrough);
1007
-
1008
1046
  for (const event of split.passthrough) {
1009
1047
  if (event.type === "text_delta" && event.anthropicThinkingSignature) yield event;
1010
1048
  }
@@ -1184,8 +1222,9 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
1184
1222
  });
1185
1223
  }
1186
1224
  } catch (e) {
1225
+ takeUsage(e instanceof LoopError ? e.event?.usage : undefined);
1187
1226
  ledgerUsage = hiddenUsage;
1188
- const usage = addUsage(rotatedUsage, hiddenUsage);
1227
+ const usage = addUsage(rotatedUsage, hiddenUsage, rotatedLegs > 0 && hiddenLegs > 0);
1189
1228
  if (isTranslatorBudgetExceededError(e)) {
1190
1229
  yield {
1191
1230
  type: "error",
@@ -1231,12 +1270,13 @@ export async function runWithImageBridge(deps: ImageBridgeDeps): Promise<Respons
1231
1270
  hideThinkingSummary: parsed.options.hideThinkingSummary,
1232
1271
  chatRawReasoningVisible: deps.chatRawReasoningVisible,
1233
1272
  hideRawReasoning: parsed.options.hideRawReasoning,
1273
+ rawReasoningAsSummary: parsed.options.rawReasoningAsSummary,
1234
1274
  stallTimeoutSec: deps.stallTimeoutSec,
1235
1275
  ...(deps.onFirstOutput ? { onFirstOutput: deps.onFirstOutput } : {}),
1236
1276
  ...(deps.onUsage ? {
1237
1277
  // Terminal done/incomplete already includes hiddenUsage (merged above). Do not
1238
1278
  // add it again here or request logs double-count multi-iteration image turns.
1239
- onUsage: (usage: OcxUsage | undefined) => deps.onUsage?.(rotatedUsage ? ledgerUsage : usage),
1279
+ onUsage: (usage: OcxUsage | undefined) => deps.onUsage?.(rotatedLegs > 0 ? ledgerUsage : usage),
1240
1280
  } : {}),
1241
1281
  ...(deps.onCompletedResponse ? { onCompletedResponse: deps.onCompletedResponse } : {}),
1242
1282
  },
@@ -9,10 +9,28 @@ import {
9
9
  type OwnedIntegrationRefreshOutcome,
10
10
  } from "./owned-refresh";
11
11
 
12
+ const CATALOG_REFRESH_CLIENTS: readonly IntegrationClientId[] = [
13
+ "mcode", "pi", "aside", "raycast", "omo", "cline", "commandcode", "dsh", "droid",
14
+ "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "gentle-shell", "hermes", "t3code",
15
+ ];
16
+
17
+ const CATALOG_REFRESH_EXCLUSIONS = {
18
+ catalog: ["mcode", "cline"],
19
+ serverSync: ["gentle-shell"],
20
+ unattended: ["cline", "gentle-shell"],
21
+ // The CLI delegates Pi and Aside to the serving proxy.
22
+ cliSync: ["pi", "aside", "gentle-shell"],
23
+ } satisfies Record<string, readonly IntegrationClientId[]>;
24
+
25
+ export function catalogRefreshClientIds(mode: keyof typeof CATALOG_REFRESH_EXCLUSIONS): IntegrationClientId[] {
26
+ const excluded: readonly IntegrationClientId[] = CATALOG_REFRESH_EXCLUSIONS[mode];
27
+ return CATALOG_REFRESH_CLIENTS.filter(clientId => !excluded.includes(clientId));
28
+ }
29
+
12
30
  /** Refresh only previously connected clients; a refused file never blocks its peers. */
13
31
  export async function refreshOwnedCatalogIntegrations(
14
32
  input: Omit<OwnedIntegrationRefreshInput, "clientId">,
15
- clientIds: readonly IntegrationClientId[] = ["pi", "aside", "raycast", "omo", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "gentle-shell", "hermes", "t3code"],
33
+ clientIds: readonly IntegrationClientId[] = catalogRefreshClientIds("catalog"),
16
34
  options: { refreshOnly?: boolean; admit?: () => boolean } = {},
17
35
  ): Promise<OwnedIntegrationRefreshOutcome[]> {
18
36
  // Client files are shared with the live proxy a sibling instance runs beside; their entries