@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
@@ -0,0 +1,214 @@
1
+ import { nativeContextLimits } from "../codex/catalog/metadata";
2
+ import { effectiveAdapterContract } from "../adapters/registry";
3
+ import { getModelMetadataCaseInsensitive, resolveMetadataProvider } from "../generated/model-metadata";
4
+ import { errorDestinationText, providerErrorDestinationLabel } from "../lib/error-destination";
5
+ import { isCodexReasoningEffort, modelRecordValue, resolveEffortAtOrBelow } from "../reasoning-effort";
6
+ import { parseRequest } from "../responses/parser";
7
+ import { checkComboTargetInputAdmission } from "../server/responses/input-admission";
8
+ import type { OcxComboTarget, OcxConfig, OcxParsedRequest, OcxProviderConfig } from "../types";
9
+ import { requiresVisionPreprocessing } from "../vision/plan";
10
+ import { customRowInputModalities } from "../vision/eligibility";
11
+ import { comboRequestHasAudioInput, comboRequestHasImageInput } from "./request";
12
+ import { targetKey, type NormalizedComboConfig } from "./types";
13
+
14
+ /**
15
+ * How one `union` combo member serves this request.
16
+ *
17
+ * `native` takes it as is. `degraded` takes it after a local rewrite the child request already
18
+ * owns (the vision sidecar describes the image). `unable` cannot take it at all and is skipped.
19
+ */
20
+ export type ComboTargetService = "native" | "degraded" | "unable";
21
+
22
+ export interface ComboTargetRoute {
23
+ providerName: string;
24
+ provider: OcxProviderConfig;
25
+ modelId: string;
26
+ codexAccountId?: string;
27
+ }
28
+
29
+ /** Resolves a combo target to its concrete route; `undefined` when it does not resolve. */
30
+ export type ComboTargetRouter = (target: Pick<OcxComboTarget, "provider" | "model">) => ComboTargetRoute | undefined;
31
+
32
+ type ComboCapabilityConfig = Pick<OcxConfig, "providers" | "customModels" | "providerContextCaps" | "visionSidecar">;
33
+
34
+ type ComboVisionProbe = (route: ComboTargetRoute, parsed: OcxParsedRequest) => Promise<boolean>;
35
+
36
+ function comboTargetAcceptsAudio(config: ComboCapabilityConfig, route: ComboTargetRoute | undefined): boolean {
37
+ if (!route) return false;
38
+ const { provider, providerName, modelId } = route;
39
+ const wire = effectiveAdapterContract(provider.adapter).wire;
40
+ if (wire !== "openai-chat" && wire !== "openai-responses") return false;
41
+ const declared = Object.hasOwn(provider.modelCapabilities ?? {}, modelId)
42
+ ? provider.modelCapabilities?.[modelId]?.inputModalities : undefined;
43
+ const modalities = declared ?? customRowInputModalities(config, providerName, modelId)
44
+ ?? modelRecordValue(provider.modelInputModalities, modelId) ?? provider.inputModalities
45
+ ?? getModelMetadataCaseInsensitive(resolveMetadataProvider(providerName) ?? providerName, modelId)?.input;
46
+ return modalities?.includes("audio") === true;
47
+ }
48
+
49
+ /** What the admitted members cannot serve. */
50
+ export type ComboUnservable = false | "audio" | "image" | "context";
51
+
52
+ export interface ComboCapabilityGate {
53
+ /** Selection filter: false only for a member that cannot serve this request. */
54
+ eligible: (target: Pick<OcxComboTarget, "provider" | "model">) => boolean;
55
+ /** No enabled member can serve the request as is; the caller applies `onUnservable`. */
56
+ unservable: ComboUnservable;
57
+ /** The child must still have a plan if it needs to describe images before sending. */
58
+ requiresVisionPlan: ComboCapabilityGate["eligible"];
59
+ /** Members that fit and can serve the turn once the combo permits omission. */
60
+ imageDegradationEligible: ComboCapabilityGate["eligible"];
61
+ }
62
+
63
+ const OPEN_GATE: ComboCapabilityGate = {
64
+ eligible: () => true, unservable: false, requiresVisionPlan: () => false,
65
+ imageDegradationEligible: () => false,
66
+ };
67
+
68
+ interface ContextFit {
69
+ fits: boolean;
70
+ /** Known context window, or null when the target publishes none (fail-open, like the child). */
71
+ window: number | null;
72
+ }
73
+
74
+ /**
75
+ * Context fit for one member: the estimated input must sit inside the member's input ceiling, and,
76
+ * when the caller declares an output allowance, the strict combo admission the child applies
77
+ * (`checkComboTargetInputAdmission`) must also pass. Without a declared allowance the child falls
78
+ * back to the loose 2.5x pathological-input gate, which would let a member far too small through,
79
+ * so the filter is the stricter of the two. The estimator overcounts on purpose, so the filter
80
+ * leaves a member slightly early rather than late. An unresolved route or unknown window fits,
81
+ * matching the child's fail-open.
82
+ */
83
+ function comboTargetContextFit(
84
+ config: ComboCapabilityConfig,
85
+ parsed: OcxParsedRequest | undefined,
86
+ route: ComboTargetRoute | undefined,
87
+ ): ContextFit {
88
+ if (!parsed || !route) return { fits: true, window: null };
89
+ const result = checkComboTargetInputAdmission(
90
+ { ...parsed, modelId: route.modelId }, route.provider, route.providerName, route.modelId, nativeContextLimits(config),
91
+ );
92
+ if (result.ceiling === null) return { fits: true, window: null };
93
+ return { fits: result.admitted && result.estimatedTokens <= result.ceiling, window: result.contextWindow ?? result.ceiling };
94
+ }
95
+
96
+ /** The request as the child will parse it. */
97
+ function parseComboInput(body: unknown): OcxParsedRequest | undefined {
98
+ try {
99
+ return parseRequest(body);
100
+ } catch {
101
+ return undefined;
102
+ }
103
+ }
104
+
105
+ /**
106
+ * Request-side half of `capabilityPolicy: "union"`. The catalog advertises the union of member
107
+ * capabilities and the minimum member window. Dispatch can try the largest compatible member
108
+ * when context is unservable, so a request may need something only some members
109
+ * have. Audio requires a member that accepts it. Members that can degrade an image stay
110
+ * eligible (keeping the subscription order and the prompt cache); members that cannot take the
111
+ * image, or whose window cannot hold the input, are filtered.
112
+ *
113
+ * When no enabled, admitted member can serve, the gate reports why:
114
+ * - `"audio"`: no member declares audio input. The caller refuses without discarding audio.
115
+ * - `"context"`: no member can hold the input. Only the members with the largest known window stay
116
+ * eligible; the caller sends there with the loose direct-request admission (`onUnservable:
117
+ * "degrade"`) or refuses before any send (`"reject"`).
118
+ * - `"image"`: every member that can hold the input is unable to take the image. Those members stay
119
+ * eligible and the child strips the image, or the caller refuses.
120
+ */
121
+ export async function comboCapabilityGate(
122
+ config: ComboCapabilityConfig,
123
+ combo: Pick<NormalizedComboConfig, "capabilityPolicy" | "targets">,
124
+ body: unknown,
125
+ route: ComboTargetRouter,
126
+ isAdmitted: (target: NormalizedComboConfig["targets"][number], route: ComboTargetRoute | undefined, parsed: OcxParsedRequest | undefined) => boolean = () => true,
127
+ canDescribe?: ComboVisionProbe,
128
+ ): Promise<ComboCapabilityGate> {
129
+ if (combo.capabilityPolicy !== "union") return OPEN_GATE;
130
+ const hasImage = comboRequestHasImageInput(body);
131
+ const hasAudio = comboRequestHasAudioInput(body);
132
+ const parsed = parseComboInput(body);
133
+ const contextInput = parsed?._compactionRequest ? undefined : parsed;
134
+ if (!hasImage && !hasAudio && !contextInput) return OPEN_GATE;
135
+ let hasAdmittedTarget = false;
136
+ const visionChecks = new Map<string, ComboTargetRoute>();
137
+ const judged = new Map<string, { image: ComboTargetService; context: ContextFit }>();
138
+ for (const target of combo.targets) {
139
+ if (config.providers[target.provider]?.disabled === true) continue;
140
+ const key = targetKey(target);
141
+ const resolved = route(target);
142
+ if (!isAdmitted(target, resolved, parsed)) continue;
143
+ hasAdmittedTarget = true;
144
+ if (judged.has(key)) continue;
145
+ if (hasAudio && !comboTargetAcceptsAudio(config, resolved)) continue;
146
+ const context = comboTargetContextFit(config, contextInput, resolved);
147
+ const needsDescription = hasImage && context.fits && resolved
148
+ && requiresVisionPreprocessing(config, resolved.provider, resolved.modelId, resolved.providerName);
149
+ judged.set(key, { image: needsDescription ? "unable" : "native", context });
150
+ if (needsDescription && parsed && config.visionSidecar?.enabled !== false) visionChecks.set(key, resolved);
151
+ }
152
+ // Finish evaluating admission metadata for all members before any asynchronous
153
+ // sidecar planning can observe or trigger a configuration change.
154
+ if (parsed && canDescribe) {
155
+ for (const [key, resolved] of visionChecks) {
156
+ if (await canDescribe(resolved, parsed)) judged.get(key)!.image = "degraded";
157
+ }
158
+ }
159
+ if (!hasAdmittedTarget) return OPEN_GATE;
160
+ const verdicts = [...judged.values()];
161
+ if (verdicts.length === 0) return { ...OPEN_GATE, eligible: () => false, unservable: "audio" };
162
+ const filter = (keep: (verdict: { image: ComboTargetService; context: ContextFit }) => boolean): ComboCapabilityGate["eligible"] =>
163
+ target => {
164
+ const verdict = judged.get(targetKey(target));
165
+ return verdict !== undefined && keep(verdict);
166
+ };
167
+ if (verdicts.some(v => v.context.fits && v.image !== "unable")) {
168
+ return {
169
+ eligible: filter(v => v.context.fits && v.image !== "unable"),
170
+ unservable: false,
171
+ requiresVisionPlan: filter(v => v.image === "degraded"),
172
+ imageDegradationEligible: filter(v => v.context.fits && v.image !== "native"),
173
+ };
174
+ }
175
+ if (verdicts.some(v => v.context.fits)) {
176
+ return { ...OPEN_GATE, eligible: filter(v => v.context.fits), unservable: "image" };
177
+ }
178
+ const largest = Math.max(...verdicts.map(v => v.context.window ?? 0));
179
+ return { ...OPEN_GATE, eligible: filter(v => (v.context.window ?? 0) === largest), unservable: "context" };
180
+ }
181
+
182
+ /**
183
+ * `union` + `adaptive` combos advertise the union of their members' effort ladders, so a caller
184
+ * can pick a rung this member lacks (xhigh against a low/medium/high lane). Snap it to the
185
+ * highest rung at or below, the rule the default effort already uses, instead of forwarding a
186
+ * value the member would reject or silently ignore. A rung below the whole ladder rises to its
187
+ * lowest rung, as `resolveEffortAtOrBelow` does for the default effort.
188
+ */
189
+ export function clampComboCallerEffort(
190
+ body: Record<string, unknown>,
191
+ ladder: readonly string[] | undefined,
192
+ target: Pick<OcxComboTarget, "provider">,
193
+ ): void {
194
+ if (!ladder || ladder.length === 0) return;
195
+ const clamp = (effort: unknown): string | undefined => {
196
+ if (typeof effort !== "string" || !isCodexReasoningEffort(effort) || ladder.includes(effort)) return undefined;
197
+ const clamped = resolveEffortAtOrBelow(effort, ladder);
198
+ if (clamped) {
199
+ console.debug("[opencodex] combo effort clamped to target ladder", {
200
+ provider: errorDestinationText(providerErrorDestinationLabel(target.provider)),
201
+ requestedEffort: effort,
202
+ effort: clamped,
203
+ });
204
+ }
205
+ return clamped;
206
+ };
207
+ const reasoning = body.reasoning;
208
+ if (reasoning && typeof reasoning === "object" && !Array.isArray(reasoning)) {
209
+ const clamped = clamp((reasoning as Record<string, unknown>).effort);
210
+ if (clamped) body.reasoning = { ...(reasoning as Record<string, unknown>), effort: clamped };
211
+ }
212
+ const flat = clamp(body.reasoning_effort);
213
+ if (flat) body.reasoning_effort = flat;
214
+ }
@@ -34,25 +34,26 @@ export function comboIdFromRawBody(body: unknown, config: OcxConfig): string | n
34
34
  * `input` tree (message content and function_call_output.output).
35
35
  */
36
36
  export function comboRequestHasImageInput(body: unknown): boolean {
37
- if (!body || typeof body !== "object" || Array.isArray(body)) return false;
38
- return responsesInputHasImage((body as { input?: unknown }).input);
37
+ return comboRequestHasMediaInput(body, "input_image");
38
+ }
39
+
40
+ export function comboRequestHasAudioInput(body: unknown): boolean {
41
+ return comboRequestHasMediaInput(body, "input_audio");
39
42
  }
40
43
 
41
- function responsesInputHasImage(input: unknown): boolean {
42
- if (typeof input === "string" || input == null) return false;
43
- if (!Array.isArray(input)) return false;
44
- return input.some(responsesInputNodeHasImage);
44
+ function comboRequestHasMediaInput(body: unknown, type: "input_image" | "input_audio"): boolean {
45
+ if (!body || typeof body !== "object" || Array.isArray(body)) return false;
46
+ const { input } = body as { input?: unknown };
47
+ return Array.isArray(input) && input.some(node => responsesInputNodeHasMedia(node, type));
45
48
  }
46
49
 
47
- function responsesInputNodeHasImage(value: unknown): boolean {
50
+ function responsesInputNodeHasMedia(value: unknown, type: "input_image" | "input_audio"): boolean {
48
51
  if (!value || typeof value !== "object") return false;
49
- if (Array.isArray(value)) return value.some(responsesInputNodeHasImage);
52
+ if (Array.isArray(value)) return value.some(node => responsesInputNodeHasMedia(node, type));
50
53
  const record = value as Record<string, unknown>;
51
- if (record.type === "input_image") return true;
54
+ if (record.type === type) return true;
52
55
  // Message content parts and nested function_call_output content/output arrays.
53
- if (record.content !== undefined && responsesInputNodeHasImage(record.content)) return true;
54
- if (record.output !== undefined && responsesInputNodeHasImage(record.output)) return true;
55
- return false;
56
+ return responsesInputNodeHasMedia(record.content, type) || responsesInputNodeHasMedia(record.output, type);
56
57
  }
57
58
 
58
59
  /**
@@ -73,8 +74,7 @@ export function concreteComboRequestBody(
73
74
  if (defaultEffortMode === "force" && (!defaultEffort || !isCodexReasoningEffort(defaultEffort))) {
74
75
  throw new Error("force combo default effort requires a valid defaultEffort");
75
76
  }
76
- if (targetReasoningEfforts?.length === 0
77
- || (reasoningEffortMode === "adaptive" && targetReasoningEfforts === undefined)) {
77
+ if (comboStripsReasoningControls(targetReasoningEfforts, reasoningEffortMode)) {
78
78
  stripUnsupportedReasoningControls(clone);
79
79
  }
80
80
  if (!defaultEffort || !isCodexReasoningEffort(defaultEffort)) return clone;
@@ -130,7 +130,14 @@ export function concreteComboRequestBody(
130
130
  return clone;
131
131
  }
132
132
 
133
- function stripUnsupportedReasoningControls(body: Record<string, unknown>): void {
133
+ export function comboStripsReasoningControls(
134
+ ladder: readonly string[] | undefined,
135
+ mode: OcxComboReasoningEffortMode,
136
+ ): boolean {
137
+ return ladder?.length === 0 || (mode === "adaptive" && ladder === undefined);
138
+ }
139
+
140
+ export function stripUnsupportedReasoningControls(body: Record<string, unknown>): void {
134
141
  const reasoning = body.reasoning;
135
142
  if (reasoning && typeof reasoning === "object" && !Array.isArray(reasoning)) {
136
143
  const next = { ...(reasoning as Record<string, unknown>) };
@@ -617,6 +617,8 @@ export function advanceComboAfterFailure(
617
617
  cooldownMs?: number;
618
618
  eligible?: (target: NormalizedComboTarget) => boolean;
619
619
  cooldownScope?: ComboFailureCooldownScope;
620
+ /** A request-local deadline can advance the ladder without penalizing its target. */
621
+ recordFailure?: boolean;
620
622
  onCooldownRecorded?: (target: Pick<OcxComboTarget, "provider" | "model">) => void;
621
623
  status?: number;
622
624
  code?: string | null;
@@ -625,7 +627,7 @@ export function advanceComboAfterFailure(
625
627
  failedAccount?: string;
626
628
  } = {},
627
629
  ): ComboPick | null {
628
- noteComboFailure(pick.comboId, pick.target, pick.writerGeneration);
630
+ if (options.recordFailure !== false) noteComboFailure(pick.comboId, pick.target, pick.writerGeneration);
629
631
  const combo = getCombo(config, pick.comboId);
630
632
  // A 429 from a pooled provider names the ACCOUNT that is spent, not the target. The pool
631
633
  // records that account's own cooldown and rotates past it, so cooling the target here blacks
@@ -643,7 +645,7 @@ export function advanceComboAfterFailure(
643
645
  && (options.status === 429 ? options.cooldownScope === "target" : options.status === 402);
644
646
  // "none" records no cooldown at all: the failure described the request, not the target, so
645
647
  // the target must stay immediately selectable for the next (differently shaped) request.
646
- if (options.cooldownScope !== "none" && !accountScoped) {
648
+ if (options.recordFailure !== false && options.cooldownScope !== "none" && !accountScoped) {
647
649
  const cooldownTargets = options.cooldownScope === "provider" && combo
648
650
  ? combo.targets.filter(target => target.provider === pick.target.provider)
649
651
  : [pick.target];
@@ -665,6 +667,7 @@ export function advanceComboAfterFailure(
665
667
  && combo.targets.some(target => !target.lastResort);
666
668
  return pickComboTarget(config, pick.comboId, {
667
669
  exclude: pick.attempted,
670
+ preview: options.recordFailure === false,
668
671
  now: options.now,
669
672
  cooldownReprobeTargets: pick.cooldownReprobeTargets
670
673
  ? Object.entries(pick.cooldownReprobeTargets)
@@ -0,0 +1,89 @@
1
+ import { isCanonicalOpenAiForwardProvider, normalizedBaseUrl } from "../providers/openai-forward-destination";
2
+
3
+ export interface SuggestionProvider {
4
+ name: string;
5
+ disabled?: boolean;
6
+ hiddenFromPicker?: boolean;
7
+ authMode?: string;
8
+ canonicalOpenAiForward?: boolean;
9
+ knownSubscriptionOAuth?: boolean;
10
+ googleMode?: string;
11
+ vertexCredentialKind?: string;
12
+ adapter?: string;
13
+ baseUrl?: string;
14
+ }
15
+
16
+ /**
17
+ * Placement preference only. Every suggested target can incur charges. Order members are suggested in: a subscription from the model's own maker, any other
18
+ * subscription, Vertex credit, then pay-per-use keys and relays.
19
+ */
20
+ export type ChannelTier = "own-subscription" | "subscription" | "vertex" | "metered";
21
+ export const TIER_RANK: Record<ChannelTier, number> = { "own-subscription": 0, subscription: 1, vertex: 2, metered: 3 };
22
+
23
+ /** No `max`: it names distinct models (`gpt-5.1-codex-max` is not `gpt-5.1-codex` at max effort). */
24
+ export const EFFORT_SUFFIX = /-(?:minimal|low|medium|high|xhigh)$/;
25
+
26
+ /**
27
+ * One model's name across providers: no `provider/` prefix, lowercase, runs of spaces,
28
+ * underscores and dashes as one dash, a version dot as a dash (`claude-opus-5.5` is
29
+ * `claude-opus-5-5`), and no trailing effort suffix (`gpt-6.1-sol-high` is `gpt-6-1-sol`;
30
+ * `gpt-5.1-codex-max-high` is `gpt-5-1-codex-max`).
31
+ */
32
+ export function normalizeModelName(id: string): string {
33
+ let name = id.trim().toLowerCase();
34
+ name = name.slice(name.lastIndexOf("/") + 1);
35
+ name = name.replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
36
+ name = name.replace(/(\d)\.(?=\d)/g, "$1-");
37
+ return name.replace(EFFORT_SUFFIX, "");
38
+ }
39
+
40
+ const MODEL_MAKERS: ReadonlyArray<[RegExp, string]> = [
41
+ [/^claude/, "anthropic"],
42
+ [/^(?:gpt|o\d|codex|chatgpt)/, "openai"],
43
+ [/^(?:gemini|gemma)/, "google"],
44
+ [/^grok/, "xai"],
45
+ [/^kimi/, "moonshot"],
46
+ ];
47
+
48
+ // Keep this allowlist aligned with the documented subscription channels in structure/config.md.
49
+ const SUBSCRIPTION_OAUTH_CHANNELS = [
50
+ { name: "xai", adapter: "openai-chat", baseUrl: "https://api.x.ai/v1", maker: "xai" },
51
+ { name: "xai", adapter: "openai-chat", baseUrl: "https://cli-chat-proxy.grok.com/v1", maker: "xai" },
52
+ { name: "kimi", adapter: "openai-chat", baseUrl: "https://api.kimi.com/coding/v1", maker: "moonshot" },
53
+ { name: "kimi-responses", adapter: "openai-responses", baseUrl: "https://api.kimi.com/coding/v1", maker: "moonshot" },
54
+ ] as const;
55
+
56
+ function subscriptionMaker(provider: SuggestionProvider): string | undefined {
57
+ if (provider.authMode === "forward") {
58
+ return provider.canonicalOpenAiForward !== false && isCanonicalOpenAiForwardProvider(provider) ? "openai" : undefined;
59
+ }
60
+ return provider.knownSubscriptionOAuth === false ? undefined : oauthSubscriptionMaker(provider);
61
+ }
62
+
63
+ export function oauthSubscriptionMaker(provider: SuggestionProvider): string | undefined {
64
+ if (provider.authMode !== "oauth" || !provider.baseUrl) return undefined;
65
+ const baseUrl = normalizedBaseUrl(provider.baseUrl);
66
+ return SUBSCRIPTION_OAUTH_CHANNELS.find((channel) =>
67
+ channel.name === provider.name && channel.adapter === provider.adapter && channel.baseUrl === baseUrl
68
+ )?.maker;
69
+ }
70
+
71
+ function hostOf(baseUrl: string | undefined): string {
72
+ if (!baseUrl) return "";
73
+ try {
74
+ return new URL(baseUrl).hostname.toLowerCase();
75
+ } catch {
76
+ return "";
77
+ }
78
+ }
79
+
80
+ export function channelTier(provider: SuggestionProvider, model: string): ChannelTier {
81
+ const host = hostOf(provider.baseUrl);
82
+ if (provider.authMode === "forward"
83
+ && (provider.canonicalOpenAiForward === false || !isCanonicalOpenAiForwardProvider(provider))) return "metered";
84
+ if (provider.googleMode === "vertex" || provider.vertexCredentialKind || /(?:^|[.-])aiplatform\.googleapis\.com$/.test(host) || /vertex/i.test(provider.name)) return "vertex";
85
+ const providerMaker = subscriptionMaker(provider);
86
+ if (!providerMaker) return "metered";
87
+ const modelMaker = MODEL_MAKERS.find(([re]) => re.test(normalizeModelName(model)))?.[1];
88
+ return modelMaker !== undefined && modelMaker === providerMaker ? "own-subscription" : "subscription";
89
+ }
@@ -7,7 +7,7 @@ import {
7
7
  } from "./jev-session-pin-config";
8
8
  import { isCodexReasoningEffort, isDeclaredReasoningEffort } from "../reasoning-effort";
9
9
  import { SUPPORTED_NATIVE_OPENAI_SLUGS } from "../codex/catalog/native-models";
10
- import type { OcxComboConfig, OcxComboCooldownWaitPolicy, OcxComboDefaultEffort, OcxComboDefaultEffortMode, OcxComboJevEffortMode, OcxComboReasoningEffortMode, OcxComboStrategy, OcxComboTarget, OcxProviderConfig } from "../types";
10
+ import type { OcxComboCapabilityPolicy, OcxComboConfig, OcxComboCooldownWaitPolicy, OcxComboDefaultEffort, OcxComboDefaultEffortMode, OcxComboJevEffortMode, OcxComboOnUnservable, OcxComboReasoningEffortMode, OcxComboStrategy, OcxComboTarget, OcxProviderConfig } from "../types";
11
11
  import { COMBO_NAMESPACE, isValidComboId, resolveComboId, targetKey } from "./identifiers";
12
12
  import {
13
13
  CANONICAL_JEV_DECISION_PROVIDER,
@@ -78,6 +78,10 @@ export interface NormalizedComboConfig {
78
78
  * (for example one whose effort swaps the upstream model id) is never re-tiered.
79
79
  */
80
80
  jevEffortMode: OcxComboJevEffortMode;
81
+ /** Catalog derivation and per-request member filtering; absent means `intersection`, the legacy rule. */
82
+ capabilityPolicy?: Extract<OcxComboCapabilityPolicy, "union">;
83
+ /** `union` only: what to do when no member can serve the request; absent means `degrade`. */
84
+ onUnservable?: Extract<OcxComboOnUnservable, "reject">;
81
85
  /** Disable image input; `auto` preserves the intersection derived from all targets. */
82
86
  imageInput: "auto" | "disabled";
83
87
  /** Trimmed public alias, or null when the combo keeps the default `combo/<id>` slug. */
@@ -302,6 +306,12 @@ export function comboConfigIssues(
302
306
  message: 'reasoningEffortMode must be "strict" or "adaptive"',
303
307
  });
304
308
  }
309
+ if (body.capabilityPolicy !== undefined && body.capabilityPolicy !== "intersection" && body.capabilityPolicy !== "union") {
310
+ issues.push({ path: ["capabilityPolicy"], message: 'capabilityPolicy must be "intersection" or "union"' });
311
+ }
312
+ if (body.onUnservable !== undefined && body.onUnservable !== "degrade" && body.onUnservable !== "reject") {
313
+ issues.push({ path: ["onUnservable"], message: 'onUnservable must be "degrade" or "reject"' });
314
+ }
305
315
 
306
316
  if (body.alias !== undefined) {
307
317
  if (typeof body.alias !== "string") {
@@ -584,6 +594,9 @@ export function normalizeComboConfig(raw: OcxComboConfig): NormalizedComboConfig
584
594
  defaultEffortMode: raw.defaultEffortMode === "force" && defaultEffort !== null ? "force" : "fallback",
585
595
  reasoningEffortMode: raw.reasoningEffortMode === "adaptive" ? "adaptive" : "strict",
586
596
  jevEffortMode: raw.jevEffortMode === "client" ? "client" : "decide",
597
+ // Sparse like `allowMeteredTargets`: the default shape stays exactly what it was before the policy existed.
598
+ ...(raw.capabilityPolicy === "union" ? { capabilityPolicy: "union" as const } : {}),
599
+ ...(raw.onUnservable === "reject" ? { onUnservable: "reject" as const } : {}),
587
600
  imageInput: raw.imageInput === "disabled" ? "disabled" : "auto",
588
601
  alias: alias || null,
589
602
  nativeAlias: raw.nativeAlias === true,
@@ -2,13 +2,15 @@ import * as z from "zod/v4";
2
2
  import { randomUUID } from "node:crypto";
3
3
  import { readFileSync } from "node:fs";
4
4
  import type { OcxConfig } from "../types";
5
+ import { isCanonicalAntigravityUrl } from "../lib/provider-tls-profile";
5
6
  import { getConfigPath } from "./paths";
6
7
 
7
8
  type PolicyConfig = { providers?: unknown; accountAutoPausePolicyRevisions?: unknown };
8
9
  // fingerprint follows the live config; diskFingerprint follows the last observed disk state, so a
9
10
  // detached load compares disk with disk and still fences an observed external policy change.
10
11
  type Observed = { diskRevision: string; localGen: number; unknown: boolean; fingerprint: string; diskFingerprint: string };
11
- export type AccountAutoPauseFence = { configPath: string; diskRevision: string; localGen: number; threshold: number; route: string };
12
+ export type AccountAutoPauseFence = { configPath: string; diskRevision: string; localGen: number; threshold: number; conclusiveOnly: boolean; route: string };
13
+ export type EffectiveAccountAutoPause = { threshold: number; conclusiveOnly: boolean };
12
14
  const observed = new Map<string, Map<string, Observed>>();
13
15
  // One process-wide allocator for every new entry and every advance: a deleted and recreated name
14
16
  // can never reproduce an old {diskRevision, localGen} pair, even when both read "legacy".
@@ -38,9 +40,30 @@ function provider(config: PolicyConfig, name: string): Record<string, unknown> |
38
40
  function route(row: Record<string, unknown> | undefined): string {
39
41
  return JSON.stringify([row?.baseUrl, row?.adapter, row?.authMode]);
40
42
  }
43
+ /**
44
+ * The policy a provider row actually runs. An explicit opt-in counts every permanent account
45
+ * refusal against its threshold. A row with no policy at all pauses only on a refusal the upstream
46
+ * itself marks permanent and account-wide, and only where one exists: a Cloud Code Assist OAuth
47
+ * provider on a first-party Google destination pauses the sending account on the first Terms of
48
+ * Service ban (#8752). A custom `baseUrl` could relay any refusal, so it needs the explicit opt-in.
49
+ * `enabled: false` opts out.
50
+ */
51
+ export function effectiveAccountAutoPause(row: unknown): EffectiveAccountAutoPause | undefined {
52
+ const p = record(row);
53
+ if (!p) return;
54
+ if (p.accountAutoPause === undefined) {
55
+ return p.adapter === "google" && p.googleMode === "cloud-code-assist" && p.authMode === "oauth"
56
+ && typeof p.baseUrl === "string" && isCanonicalAntigravityUrl(p.baseUrl) ? { threshold: 1, conclusiveOnly: true } : undefined;
57
+ }
58
+ const policy = record(p.accountAutoPause);
59
+ if (policy?.enabled !== true) return;
60
+ const threshold = policy.consecutiveFailures ?? 2;
61
+ return typeof threshold === "number" && Number.isInteger(threshold) && threshold >= 1 && threshold <= 100
62
+ ? { threshold, conclusiveOnly: false } : undefined;
63
+ }
41
64
  export function accountAutoPauseFingerprint(row: unknown): string {
42
- const p = record(row), policy = record(p?.accountAutoPause);
43
- return JSON.stringify([!!p, policy?.enabled === true, policy?.consecutiveFailures ?? 2, p?.disabled === true, route(p)]);
65
+ const p = record(row), effective = effectiveAccountAutoPause(p);
66
+ return JSON.stringify([!!p, effective?.threshold ?? null, effective?.conclusiveOnly ?? null, p?.disabled === true, route(p)]);
44
67
  }
45
68
  export function snapshotAutoPauseFingerprints(config: PolicyConfig): Map<string, string> {
46
69
  return new Map(Object.entries(record(config.providers) ?? {}).map(([name, row]) => [name, accountAutoPauseFingerprint(row)]));
@@ -51,7 +74,8 @@ export function normalizeAccountAutoPauseRevisions(before: PolicyConfig | undefi
51
74
  const names = new Set(Object.keys(old ?? {}));
52
75
  for (const config of [before, persisted]) {
53
76
  for (const [name, row] of Object.entries(record(config?.providers) ?? {})) {
54
- if (record(row)?.accountAutoPause !== undefined) names.add(name);
77
+ // A Cloud Code Assist row runs the default policy with no key, so it is tracked as well.
78
+ if (record(row)?.accountAutoPause !== undefined || effectiveAccountAutoPause(row)) names.add(name);
55
79
  }
56
80
  }
57
81
  // Records follow the providers that exist after disk-only preservation; a deleted provider's
@@ -114,10 +138,9 @@ export function captureAccountAutoPauseFence(config: OcxConfig, name: string): A
114
138
  // live snapshot must not re-enroll it; adoption by load, reload or save is required.
115
139
  if (!observed.has(getConfigPath())) observeAccountAutoPauseRevisions(config);
116
140
  const state = observed.get(getConfigPath())?.get(name);
117
- const p = provider(config, name), policy = record(p?.accountAutoPause);
118
- const threshold = policy?.consecutiveFailures ?? 2;
119
- if (!state || state.unknown || !p || p.disabled === true || policy?.enabled !== true || typeof threshold !== "number" || !Number.isInteger(threshold) || threshold < 1 || threshold > 100) return;
120
- return { configPath: getConfigPath(), diskRevision: state.diskRevision, localGen: state.localGen, threshold, route: route(p) };
141
+ const p = provider(config, name), effective = effectiveAccountAutoPause(p);
142
+ if (!state || state.unknown || !p || p.disabled === true || !effective) return;
143
+ return { configPath: getConfigPath(), diskRevision: state.diskRevision, localGen: state.localGen, ...effective, route: route(p) };
121
144
  }
122
145
  export function accountAutoPauseFenceIsLocal(name: string, fence: AccountAutoPauseFence): boolean {
123
146
  const state = observed.get(fence.configPath)?.get(name);
@@ -129,8 +152,8 @@ export function accountAutoPauseFenceMatchesDisk(name: string, fence: AccountAut
129
152
  if (!accountAutoPauseFenceIsLocal(name, fence)) return false;
130
153
  try {
131
154
  const disk = fresh ?? JSON.parse(readFileSync(fence.configPath, "utf8").replace(/^\uFEFF/, "")) as PolicyConfig;
132
- const map = revisions(disk), p = provider(disk, name), policy = record(p?.accountAutoPause);
155
+ const map = revisions(disk), p = provider(disk, name), effective = effectiveAccountAutoPause(p);
133
156
  return map !== null && (revisionFor(map, name) ?? "legacy") === fence.diskRevision && !!p && p.disabled !== true
134
- && policy?.enabled === true && (policy.consecutiveFailures ?? 2) === fence.threshold && route(p) === fence.route;
157
+ && effective?.threshold === fence.threshold && effective.conclusiveOnly === fence.conclusiveOnly && route(p) === fence.route;
135
158
  } catch { return false; }
136
159
  }
@@ -222,7 +222,7 @@ function carryHardenAcrossContentWrite(path: string): void {
222
222
  * worse than reporting it. The throw that matters is the temp's own `fsync`, which runs before
223
223
  * the rename and stops it.
224
224
  */
225
- function syncParentDirectory(target: string): void {
225
+ export function syncParentDirectory(target: string): void {
226
226
  if (process.platform === "win32") return;
227
227
  let descriptor: number | undefined;
228
228
  try {
@@ -0,0 +1,34 @@
1
+ /**
2
+ * Process-local opt-in for incremental Codex WebSocket uploads. Default off.
3
+ * Lives in the config layer so config loading never pulls the Responses transport into a
4
+ * Child or Hub client's load graph; the transport subscribes to drop retained state on disable.
5
+ */
6
+ import type { OcxConfig } from "../types";
7
+ import { setCodexWsReuseAcrossTurns } from "./codex-ws-reuse-setting";
8
+
9
+ let incrementalUpload = false;
10
+ const disableListeners = new Set<() => void>();
11
+
12
+ export function setCodexWsIncrementalUpload(enabled: boolean): void {
13
+ incrementalUpload = enabled;
14
+ if (!enabled) for (const listener of disableListeners) listener();
15
+ }
16
+
17
+ export function codexWsIncrementalUploadEnabled(): boolean {
18
+ return incrementalUpload;
19
+ }
20
+
21
+ export function onCodexWsIncrementalUploadDisabled(listener: () => void): void {
22
+ disableListeners.add(listener);
23
+ }
24
+
25
+ /**
26
+ * Sole owner of both Codex WS process flags: bound from the adopted live server config only, so
27
+ * detached `loadConfig()` reads (CLI, `/api/sync`, management snapshots) never toggle socket reuse,
28
+ * enable incremental sends, or clear retained state. Incremental upload implies cross-turn reuse.
29
+ */
30
+ export function bindCodexWsIncrementalConfig(config: Pick<OcxConfig, "codexWsIncrementalUpload" | "codexWsReuseAcrossTurns">): void {
31
+ const enabled = config.codexWsIncrementalUpload === true;
32
+ setCodexWsIncrementalUpload(enabled);
33
+ setCodexWsReuseAcrossTurns(config.codexWsReuseAcrossTurns === true || enabled);
34
+ }