@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
@@ -0,0 +1,259 @@
1
+ /**
2
+ * Shared plumbing for native ingresses that translate onto the internal Chat Completions path
3
+ * (the Ollama-compatible and Gemini-compatible routes). It holds what is identical across them:
4
+ * the identity-only internal request, Retry-After and refusal vocabulary, fixed error text by
5
+ * status, and the SSE-to-native stream pump with its settlement and cancellation rules. The
6
+ * protocol-specific parts (frame shapes, error bodies) stay in each ingress.
7
+ */
8
+ import { isUnattendedAgyAcpHttpTurn } from "../adapters/agy-acp/policy";
9
+ import { parseRetryAfterMs } from "../combos";
10
+ import type { AdmissionLease } from "../lib/admission";
11
+ import { WORKFLOW_LOCAL_REFUSAL_HEADER } from "../lib/workflow-budget";
12
+ import type { OcxConfig } from "../types";
13
+ import type { CapturedAdmissionPolicy } from "../types/admission-policy";
14
+ import type { DataPlaneAdmission } from "./auth-cors";
15
+ import { handleChatCompletions } from "./chat-completions";
16
+ import type { NativeFinalLog } from "./native-final-log";
17
+ import type { RequestLogContext } from "./request-log";
18
+ import { linkRequestSessionLane } from "./request-log-conversation";
19
+
20
+ // Session and workflow identity only: lineage, session lanes and the workflow root's spend
21
+ // ceiling read these from the request Chat sees. Never authorization, cookies or admission keys.
22
+ const IDENTITY_HEADERS = ["session_id", "session-id", "thread-id", "x-session-id", "x-codex-parent-thread-id"] as const;
23
+
24
+ /** Dispatch translated Chat while keeping the original turn label in process-local policy state. */
25
+ export function handleNativeChat(
26
+ req: Request,
27
+ originalBody: unknown,
28
+ chatJson: string,
29
+ config: OcxConfig,
30
+ logCtx: RequestLogContext,
31
+ ids: NativeLogIds,
32
+ ): Promise<Response> {
33
+ const agyAcpUnattendedHttpTurn = isUnattendedAgyAcpHttpTurn(req.headers, originalBody);
34
+ const headers = new Headers({ "content-type": "application/json" });
35
+ for (const name of IDENTITY_HEADERS) {
36
+ const value = req.headers.get(name);
37
+ if (value !== null) headers.set(name, value);
38
+ }
39
+ const internal = new Request(new URL("/v1/chat/completions", req.url), { method: "POST", headers, body: chatJson, signal: req.signal });
40
+ linkRequestSessionLane(req, internal);
41
+ return handleChatCompletions(internal, config, logCtx, {
42
+ ...ids, suppressProtocolTrace: true, agyAcpUnattendedHttpTurn,
43
+ });
44
+ }
45
+
46
+ /** The request-log and admission identity a native handler passes to the inner Chat path. */
47
+ export interface NativeLogIds {
48
+ requestId: string;
49
+ start: number;
50
+ turnAdmissionLease?: AdmissionLease;
51
+ admission?: DataPlaneAdmission;
52
+ advisorAdmissionPolicy?: CapturedAdmissionPolicy;
53
+ }
54
+
55
+ /** Upper bound for the retry advice a native surface passes on. */
56
+ export const NATIVE_MAX_RETRY_AFTER_SECONDS = 3600;
57
+
58
+ /**
59
+ * Retry-After as an integer we format ourselves. The incoming value may come from an upstream,
60
+ * so only the parsed delay crosses this boundary, never its bytes; unparseable values are dropped.
61
+ */
62
+ export function nativeRetryAfter(value: string | null | undefined, now = Date.now()): string | undefined {
63
+ if (value?.trim() === "0") return "0";
64
+ const ms = parseRetryAfterMs(value, now);
65
+ if (ms === undefined) return undefined;
66
+ return String(Math.min(NATIVE_MAX_RETRY_AFTER_SECONDS, Math.max(0, Math.ceil(ms / 1000))));
67
+ }
68
+
69
+ /**
70
+ * The local refusal codes native surfaces pass on, each mapped to a constant defined here. The
71
+ * emitted header value is always the constant; an incoming value only selects it, and any value
72
+ * not in this table is dropped.
73
+ */
74
+ const LOCAL_REFUSAL_CODES: ReadonlyMap<string, string> = new Map([
75
+ ["workflow_sends_exhausted", "workflow_sends_exhausted"],
76
+ ["workflow_children_exhausted", "workflow_children_exhausted"],
77
+ ["workflow_concurrency_exhausted", "workflow_concurrency_exhausted"],
78
+ ["workflow_spend_exhausted", "workflow_spend_exhausted"],
79
+ ["workflow_tracking_exhausted", "workflow_tracking_exhausted"],
80
+ ["workflow_send_replayed", "workflow_send_replayed"],
81
+ ["workflow_pool_history_unresolved", "workflow_pool_history_unresolved"],
82
+ ["workflow_spend_undurable", "workflow_spend_undurable"],
83
+ ]);
84
+
85
+ export interface NativeRefusalParts {
86
+ status: number;
87
+ message: string;
88
+ retryAfter: string | null;
89
+ /** A constant from the known workflow refusal codes, never the incoming header value. */
90
+ localRefusalCode?: string;
91
+ }
92
+
93
+ /** Reduce an existing proxy refusal (capacity, workflow, drain) to its status, fixed text and retry advice. */
94
+ export function nativeRefusalParts(response: Response): NativeRefusalParts {
95
+ try { void response.body?.cancel().catch(() => {}); } catch { /* already consumed */ }
96
+ const message = response.status === 429 ? "request budget exhausted; retry later"
97
+ : response.status === 499 ? "request cancelled"
98
+ : response.status === 503 ? "server temporarily unavailable; retry later" : "request refused";
99
+ const code = LOCAL_REFUSAL_CODES.get(response.headers.get(WORKFLOW_LOCAL_REFUSAL_HEADER) ?? "");
100
+ return { status: response.status, message, retryAfter: response.headers.get("retry-after"), ...(code !== undefined ? { localRefusalCode: code } : {}) };
101
+ }
102
+
103
+ /** Put the workflow refusal constant on a native refusal and expose it to browsers. */
104
+ export function applyLocalRefusalCode(native: Response, code: string | undefined): Response {
105
+ if (code === undefined) return native;
106
+ native.headers.set(WORKFLOW_LOCAL_REFUSAL_HEADER, code);
107
+ native.headers.set("Access-Control-Expose-Headers", WORKFLOW_LOCAL_REFUSAL_HEADER);
108
+ return native;
109
+ }
110
+
111
+ /**
112
+ * Native error text is chosen by status only. The inner body can carry upstream-authored text,
113
+ * which may echo a credential no pattern recognizes, so it is drained and never forwarded.
114
+ */
115
+ const INNER_ERROR_MESSAGES: Readonly<Record<number, string>> = {
116
+ 400: "request rejected",
117
+ 401: "upstream authentication failed",
118
+ 402: "upstream payment required",
119
+ 403: "request not permitted",
120
+ 404: "model not found",
121
+ 408: "upstream request timed out",
122
+ 409: "request conflict",
123
+ 413: "request too large",
124
+ 422: "request rejected",
125
+ 429: "rate limited; retry later",
126
+ 499: "request cancelled",
127
+ 500: "upstream request failed",
128
+ 502: "upstream request failed",
129
+ 503: "upstream unavailable; retry later",
130
+ 504: "upstream request timed out",
131
+ };
132
+
133
+ export function nativeInnerErrorMessage(status: number): string {
134
+ return INNER_ERROR_MESSAGES[status] ?? (status >= 500 ? "upstream request failed" : "request failed");
135
+ }
136
+
137
+ export async function drainedInnerErrorMessage(response: Response): Promise<string> {
138
+ await response.body?.cancel().catch(() => {});
139
+ return nativeInnerErrorMessage(response.ok ? 502 : response.status);
140
+ }
141
+
142
+ /** A client that left before the outer outcome was committed owns a 499 row, whatever the inner path reported. */
143
+ export function commitCancelled(finalLog: NativeFinalLog): void {
144
+ finalLog.commit({ status: 499, closeReason: "client_cancel" });
145
+ }
146
+
147
+ export type NativeStreamTerminal = { ok: true; frames(): Uint8Array[] } | { ok: false; error: string };
148
+
149
+ /** The protocol-specific half of a native stream: how Chat chunks become frames. */
150
+ export interface NativeStreamTranslator {
151
+ contentType: string;
152
+ /** One parsed Chat chunk to zero or more encoded frames. Throwing marks the stream failed. */
153
+ chunk(parsed: unknown): Uint8Array[];
154
+ /** Evaluated once at end of stream, before settlement is known; frames are produced only on success. */
155
+ terminal(): NativeStreamTerminal;
156
+ /** Encoded frames that end a stream that failed or did not settle. */
157
+ failure(message: string): Uint8Array[];
158
+ /** Release translator-owned buffers after success, failure, or cancellation. */
159
+ dispose?(): void;
160
+ }
161
+
162
+ /**
163
+ * Pump an inner Chat SSE body through a translator. A stream's terminal frames are emitted only
164
+ * after the Chat stream reached EOF and the inner path settled, so trailing usage is included and
165
+ * a later error never follows a success terminal. The row is committed exactly once through
166
+ * the final log; a client that cancels, even while settlement is pending, owns a 499 row.
167
+ */
168
+ export function streamNativeFromChat(translator: NativeStreamTranslator, body: ReadableStream<Uint8Array>, finalLog: NativeFinalLog, signal: AbortSignal): Response {
169
+ const reader = body.getReader();
170
+ const decoder = new TextDecoder();
171
+ let pending = "";
172
+ // ended: no further reads or frames. cancelled: the client went away, possibly while end() waits.
173
+ let ended = false;
174
+ let cancelled = false;
175
+ // The inner Chat path can finalize on EOF after [DONE], so keep draining to EOF before ending.
176
+ let sawDone = false;
177
+ const cancelInner = () => { try { void reader.cancel().catch(() => {}); } catch { /* released */ } };
178
+ const end = async (controller: ReadableStreamDefaultController<Uint8Array>, failure?: string) => {
179
+ if (ended) return;
180
+ ended = true;
181
+ if (failure !== undefined) {
182
+ cancelInner();
183
+ translator.dispose?.();
184
+ }
185
+ const terminal = failure === undefined ? translator.terminal() : undefined;
186
+ const settled = await finalLog.waitForInner();
187
+ try {
188
+ if (cancelled || signal.aborted) {
189
+ commitCancelled(finalLog);
190
+ try { controller.close(); } catch { /* already cancelled by the client */ }
191
+ return;
192
+ }
193
+ if (terminal?.ok === true && settled) {
194
+ for (const frame of terminal.frames()) controller.enqueue(frame);
195
+ finalLog.commit({ status: 200, terminalStatus: "completed", closeReason: "terminal" });
196
+ } else {
197
+ const message = failure ?? (terminal?.ok === false ? terminal.error : "request did not complete");
198
+ for (const frame of translator.failure(message)) controller.enqueue(frame);
199
+ finalLog.commit({ status: 502, terminalStatus: "failed", closeReason: "terminal" });
200
+ }
201
+ controller.close();
202
+ } catch {
203
+ // The client cancelled between settlement and the terminal frames; the row still lands once.
204
+ commitCancelled(finalLog);
205
+ } finally {
206
+ if (failure === undefined) translator.dispose?.();
207
+ }
208
+ };
209
+ // Returns how many frames were enqueued. Finish and usage chunks may enqueue nothing.
210
+ const consume = (controller: ReadableStreamDefaultController<Uint8Array>, block: string): number => {
211
+ let emitted = 0;
212
+ for (const raw of block.split("\n")) {
213
+ const text = raw.trimEnd();
214
+ if (!text.startsWith("data:")) continue;
215
+ // Chat ends at [DONE]; any later data (an error frame, say) means the stream did not settle cleanly.
216
+ if (sawDone) throw new Error("data after the Chat stream terminator");
217
+ const payload = text.slice(5).trim();
218
+ if (payload === "[DONE]") { sawDone = true; continue; }
219
+ for (const frame of translator.chunk(JSON.parse(payload))) { controller.enqueue(frame); emitted++; }
220
+ }
221
+ return emitted;
222
+ };
223
+ return new Response(new ReadableStream<Uint8Array>({
224
+ // A pull that resolves without enqueueing is not called again, so keep reading until this
225
+ // pull has produced a frame or ended the stream.
226
+ async pull(controller) {
227
+ try {
228
+ while (!ended) {
229
+ const { done, value } = await reader.read();
230
+ if (done) {
231
+ pending += decoder.decode();
232
+ if (pending) consume(controller, pending);
233
+ pending = "";
234
+ await end(controller);
235
+ return;
236
+ }
237
+ pending += decoder.decode(value, { stream: true });
238
+ const boundary = pending.lastIndexOf("\n");
239
+ if (boundary < 0) continue;
240
+ const complete = pending.slice(0, boundary);
241
+ pending = pending.slice(boundary + 1);
242
+ if (consume(controller, complete) > 0) return;
243
+ }
244
+ } catch {
245
+ await end(controller, signal.aborted ? "request cancelled" : "upstream stream failed");
246
+ }
247
+ },
248
+ async cancel() {
249
+ cancelled = true;
250
+ // When end() is already waiting for settlement it sees the flag and writes the 499 row.
251
+ if (ended) return;
252
+ ended = true;
253
+ cancelInner();
254
+ translator.dispose?.();
255
+ await finalLog.waitForInner();
256
+ commitCancelled(finalLog);
257
+ },
258
+ }, { highWaterMark: 0 }), { status: 200, headers: { "content-type": translator.contentType } });
259
+ }
@@ -9,38 +9,34 @@
9
9
  */
10
10
  import { OllamaCodecError, consumeOllamaChatChunk, createOllamaStreamState, ollamaBufferedResponse, ollamaStreamTerminal, ollamaToChat, type OllamaKind } from "../protocols/codecs/ollama";
11
11
  import { createTranslatorBudget, isTranslatorBudgetExceededError } from "../lib/translator-budget";
12
- import { parseRetryAfterMs } from "../combos";
13
- import { WORKFLOW_LOCAL_REFUSAL_HEADER } from "../lib/workflow-budget";
14
12
  import type { OcxConfig } from "../types";
15
13
  import type { DataPlaneAdmission } from "./auth-cors";
16
- import type { CapturedAdmissionPolicy } from "../types/admission-policy";
17
- import type { AdmissionLease } from "../lib/admission";
18
14
  import { resolveAdmissionModelScope, routeAllowedByScope } from "./admission-model-scope";
19
- import { handleChatCompletions } from "./chat-completions";
20
15
  import { VERSION } from "./management-api";
16
+ import {
17
+ NATIVE_MAX_RETRY_AFTER_SECONDS,
18
+ applyLocalRefusalCode,
19
+ commitCancelled,
20
+ drainedInnerErrorMessage,
21
+ handleNativeChat,
22
+ nativeInnerErrorMessage,
23
+ nativeRefusalParts,
24
+ nativeRetryAfter,
25
+ streamNativeFromChat,
26
+ type NativeLogIds,
27
+ } from "./native-chat-bridge";
21
28
  import { createNativeFinalLog, type NativeFinalLog } from "./native-final-log";
22
- import { findOllamaRoute, linkRequestSessionLane, listOllamaRoutes, preflightOllamaRoute } from "./ollama-route-policy";
29
+ import { findOllamaRoute, listOllamaRoutes, preflightOllamaRoute } from "./ollama-route-policy";
23
30
  import { DecompressedBodyTooLargeError, readJsonRequestBody, resolveInboundBodyLimitBytes } from "./request-decompress";
24
31
  import { addFinalRequestLog, type RequestLogContext } from "./request-log";
25
32
 
26
33
  const SHOW_BODY_LIMIT_BYTES = 64 * 1024;
27
- // Session and workflow identity only: lineage, session lanes and the workflow root's spend
28
- // ceiling read these from the request Chat sees. Never authorization, cookies or admission keys.
29
- const IDENTITY_HEADERS = ["session_id", "session-id", "thread-id", "x-session-id", "x-codex-parent-thread-id"] as const;
30
34
 
31
35
  /** Upper bound for the retry advice this surface passes on. */
32
- export const OLLAMA_MAX_RETRY_AFTER_SECONDS = 3600;
36
+ export const OLLAMA_MAX_RETRY_AFTER_SECONDS = NATIVE_MAX_RETRY_AFTER_SECONDS;
33
37
 
34
- /**
35
- * Retry-After as an integer we format ourselves. The incoming value may come from an upstream,
36
- * so only the parsed delay crosses this boundary, never its bytes; unparseable values are dropped.
37
- */
38
- export function ollamaRetryAfter(value: string | null | undefined, now = Date.now()): string | undefined {
39
- if (value?.trim() === "0") return "0";
40
- const ms = parseRetryAfterMs(value, now);
41
- if (ms === undefined) return undefined;
42
- return String(Math.min(OLLAMA_MAX_RETRY_AFTER_SECONDS, Math.max(0, Math.ceil(ms / 1000))));
43
- }
38
+ /** Retry-After as an integer we format ourselves; see nativeRetryAfter. */
39
+ export const ollamaRetryAfter = nativeRetryAfter;
44
40
 
45
41
  /**
46
42
  * Every Ollama error response is built from scratch: content type, our own error text, and
@@ -54,36 +50,10 @@ export function ollamaError(status: number, message: string, retryAfter?: string
54
50
  return new Response(JSON.stringify({ error: message }), { status, headers });
55
51
  }
56
52
 
57
- /**
58
- * The local refusal codes this surface passes on, each mapped to a constant defined here. The
59
- * emitted header value is always the constant; an incoming value only selects it, and any value
60
- * not in this table is dropped.
61
- */
62
- const LOCAL_REFUSAL_CODES: ReadonlyMap<string, string> = new Map([
63
- ["workflow_sends_exhausted", "workflow_sends_exhausted"],
64
- ["workflow_children_exhausted", "workflow_children_exhausted"],
65
- ["workflow_concurrency_exhausted", "workflow_concurrency_exhausted"],
66
- ["workflow_spend_exhausted", "workflow_spend_exhausted"],
67
- ["workflow_tracking_exhausted", "workflow_tracking_exhausted"],
68
- ["workflow_send_replayed", "workflow_send_replayed"],
69
- ["workflow_pool_history_unresolved", "workflow_pool_history_unresolved"],
70
- ["workflow_spend_undurable", "workflow_spend_undurable"],
71
- ]);
72
-
73
53
  /** Reshape an existing proxy refusal (capacity, workflow, drain) keeping its status and retry advice. */
74
54
  export function toOllamaRefusal(response: Response): Response {
75
- try { void response.body?.cancel().catch(() => {}); } catch { /* already consumed */ }
76
- const message = response.status === 429 ? "request budget exhausted; retry later"
77
- : response.status === 499 ? "request cancelled"
78
- : response.status === 503 ? "server temporarily unavailable; retry later" : "request refused";
79
- const native = ollamaError(response.status, message, response.headers.get("retry-after"));
80
- // The workflow refusal names its local reason; only a recognized code selects our constant.
81
- const code = LOCAL_REFUSAL_CODES.get(response.headers.get(WORKFLOW_LOCAL_REFUSAL_HEADER) ?? "");
82
- if (code !== undefined) {
83
- native.headers.set(WORKFLOW_LOCAL_REFUSAL_HEADER, code);
84
- native.headers.set("Access-Control-Expose-Headers", WORKFLOW_LOCAL_REFUSAL_HEADER);
85
- }
86
- return native;
55
+ const parts = nativeRefusalParts(response);
56
+ return applyLocalRefusalCode(ollamaError(parts.status, parts.message, parts.retryAfter), parts.localRefusalCode);
87
57
  }
88
58
 
89
59
  export function handleOllamaVersion(): Response {
@@ -118,60 +88,14 @@ export async function handleOllamaShow(config: OcxConfig, req: Request, admissio
118
88
  return Response.json({ details: {}, model_info: {}, capabilities: ["completion"] });
119
89
  }
120
90
 
121
- export interface OllamaLogIds {
122
- requestId: string;
123
- start: number;
124
- turnAdmissionLease?: AdmissionLease;
125
- admission?: DataPlaneAdmission;
126
- advisorAdmissionPolicy?: CapturedAdmissionPolicy;
127
- }
91
+ export type OllamaLogIds = NativeLogIds;
128
92
 
129
93
  function failBeforeInner(ids: OllamaLogIds, logCtx: RequestLogContext, status: number, message: string): Response {
130
94
  addFinalRequestLog(ids.requestId, ids.start, logCtx, status, { closeReason: "non_stream" });
131
95
  return ollamaError(status, message);
132
96
  }
133
97
 
134
- function internalChatRequest(req: Request, chatJson: string): Request {
135
- const headers = new Headers({ "content-type": "application/json" });
136
- for (const name of IDENTITY_HEADERS) {
137
- const value = req.headers.get(name);
138
- if (value !== null) headers.set(name, value);
139
- }
140
- const internal = new Request(new URL("/v1/chat/completions", req.url), { method: "POST", headers, body: chatJson, signal: req.signal });
141
- linkRequestSessionLane(req, internal);
142
- return internal;
143
- }
144
-
145
- /**
146
- * Native error text is chosen by status only. The inner body can carry upstream-authored text,
147
- * which may echo a credential no pattern recognizes, so it is drained and never forwarded.
148
- */
149
- const INNER_ERROR_MESSAGES: Readonly<Record<number, string>> = {
150
- 400: "request rejected",
151
- 401: "upstream authentication failed",
152
- 402: "upstream payment required",
153
- 403: "request not permitted",
154
- 404: "model not found",
155
- 408: "upstream request timed out",
156
- 409: "request conflict",
157
- 413: "request too large",
158
- 422: "request rejected",
159
- 429: "rate limited; retry later",
160
- 499: "request cancelled",
161
- 500: "upstream request failed",
162
- 502: "upstream request failed",
163
- 503: "upstream unavailable; retry later",
164
- 504: "upstream request timed out",
165
- };
166
-
167
- export function ollamaInnerErrorMessage(status: number): string {
168
- return INNER_ERROR_MESSAGES[status] ?? (status >= 500 ? "upstream request failed" : "request failed");
169
- }
170
-
171
- async function innerErrorMessage(response: Response): Promise<string> {
172
- await response.body?.cancel().catch(() => {});
173
- return ollamaInnerErrorMessage(response.ok ? 502 : response.status);
174
- }
98
+ export const ollamaInnerErrorMessage = nativeInnerErrorMessage;
175
99
 
176
100
  /** /api/chat and /api/generate. `req` is the admitted, session-promoted request. */
177
101
  export async function handleOllamaGeneration(
@@ -183,9 +107,11 @@ export async function handleOllamaGeneration(
183
107
  ): Promise<Response> {
184
108
  const limit = resolveInboundBodyLimitBytes(config.maxInboundBodyBytes);
185
109
  const budget = createTranslatorBudget();
110
+ let originalBody: unknown;
186
111
  let chat: Record<string, unknown>;
187
112
  try {
188
- chat = ollamaToChat(kind, await readJsonRequestBody(req, budget, limit));
113
+ originalBody = await readJsonRequestBody(req, budget, limit);
114
+ chat = ollamaToChat(kind, originalBody);
189
115
  } catch (error) {
190
116
  if (req.signal.aborted) return failBeforeInner(ids, logCtx, 499, "request cancelled");
191
117
  if (error instanceof DecompressedBodyTooLargeError) return failBeforeInner(ids, logCtx, 413, "request body too large");
@@ -205,12 +131,11 @@ export async function handleOllamaGeneration(
205
131
  const stream = chat.stream === true;
206
132
  const chatJson = JSON.stringify(chat);
207
133
  if (Buffer.byteLength(chatJson) > limit) return failBeforeInner(ids, logCtx, 413, "request body too large");
208
- const internal = internalChatRequest(req, chatJson);
209
134
  const finalLog = createNativeFinalLog(ids.requestId, ids.start, logCtx);
210
135
  const createdAt = new Date().toISOString();
211
136
  let inner: Response;
212
137
  try {
213
- inner = await handleChatCompletions(internal, config, logCtx, { ...ids, suppressProtocolTrace: true });
138
+ inner = await handleNativeChat(req, originalBody, chatJson, config, logCtx, ids);
214
139
  } catch {
215
140
  await finalLog.waitForInner();
216
141
  if (req.signal.aborted) return cancelledNonStream(finalLog);
@@ -218,7 +143,7 @@ export async function handleOllamaGeneration(
218
143
  return ollamaError(502, "request failed");
219
144
  }
220
145
  if (!inner.ok || !inner.body) {
221
- const message = await innerErrorMessage(inner);
146
+ const message = await drainedInnerErrorMessage(inner);
222
147
  await finalLog.waitForInner();
223
148
  if (req.signal.aborted) return cancelledNonStream(finalLog);
224
149
  finalLog.commit({ status: inner.ok ? 502 : inner.status, terminalStatus: "failed", closeReason: "non_stream" });
@@ -231,7 +156,7 @@ export async function handleOllamaGeneration(
231
156
 
232
157
  /** A client that left before the outer outcome was committed owns a 499 row, whatever the inner path reported. */
233
158
  function cancelledNonStream(finalLog: NativeFinalLog): Response {
234
- finalLog.commit({ status: 499, closeReason: "client_cancel" });
159
+ commitCancelled(finalLog);
235
160
  return ollamaError(499, "request cancelled");
236
161
  }
237
162
 
@@ -261,89 +186,16 @@ const line = (record: unknown) => encoder.encode(`${JSON.stringify(record)}\n`);
261
186
 
262
187
  /** Exported for the settlement-window cancellation test; production callers go through handleOllamaGeneration. */
263
188
  export function streamOllama(kind: OllamaKind, model: string, createdAt: string, body: ReadableStream<Uint8Array>, finalLog: NativeFinalLog, signal: AbortSignal): Response {
264
- const reader = body.getReader();
265
- const decoder = new TextDecoder();
266
189
  const state = createOllamaStreamState(kind, model, createdAt);
267
- let pending = "";
268
- // ended: no further reads or records. cancelled: the client went away, possibly while end() waits.
269
- let ended = false;
270
- let cancelled = false;
271
- // The inner Chat path can finalize on EOF after [DONE], so keep draining to EOF before ending.
272
- let sawDone = false;
273
- const cancelInner = () => { try { void reader.cancel().catch(() => {}); } catch { /* released */ } };
274
- const commitCancelled = () => finalLog.commit({ status: 499, closeReason: "client_cancel" });
275
- const end = async (controller: ReadableStreamDefaultController<Uint8Array>, failure?: string) => {
276
- if (ended) return;
277
- ended = true;
278
- if (failure !== undefined) cancelInner();
279
- const terminal = failure === undefined ? ollamaStreamTerminal(state) : undefined;
280
- const settled = await finalLog.waitForInner();
281
- if (cancelled || signal.aborted) {
282
- commitCancelled();
283
- try { controller.close(); } catch { /* already cancelled by the client */ }
284
- return;
285
- }
286
- try {
287
- if (terminal?.done === true && settled) {
288
- controller.enqueue(line(terminal));
289
- finalLog.commit({ status: 200, terminalStatus: "completed", closeReason: "terminal" });
290
- } else {
291
- controller.enqueue(line({ error: failure ?? (typeof terminal?.error === "string" ? terminal.error : "request did not complete") }));
292
- finalLog.commit({ status: 502, terminalStatus: "failed", closeReason: "terminal" });
293
- }
294
- controller.close();
295
- } catch {
296
- // The client cancelled between settlement and the terminal record; the row still lands once.
297
- commitCancelled();
298
- }
299
- };
300
- // Returns how many native records were enqueued. Finish and usage frames enqueue nothing.
301
- const consume = (controller: ReadableStreamDefaultController<Uint8Array>, block: string): number => {
302
- let emitted = 0;
303
- for (const raw of block.split("\n")) {
304
- const text = raw.trimEnd();
305
- if (!text.startsWith("data:")) continue;
306
- // Chat ends at [DONE]; any later data (an error frame, say) means the stream did not settle cleanly.
307
- if (sawDone) throw new Error("data after the Chat stream terminator");
308
- const payload = text.slice(5).trim();
309
- if (payload === "[DONE]") { sawDone = true; continue; }
310
- for (const record of consumeOllamaChatChunk(state, JSON.parse(payload))) { controller.enqueue(line(record)); emitted++; }
311
- }
312
- return emitted;
313
- };
314
- return new Response(new ReadableStream<Uint8Array>({
315
- // A pull that resolves without enqueueing is not called again, so keep reading until this
316
- // pull has produced a record or ended the stream.
317
- async pull(controller) {
318
- try {
319
- while (!ended) {
320
- const { done, value } = await reader.read();
321
- if (done) {
322
- pending += decoder.decode();
323
- if (pending) consume(controller, pending);
324
- pending = "";
325
- await end(controller);
326
- return;
327
- }
328
- pending += decoder.decode(value, { stream: true });
329
- const boundary = pending.lastIndexOf("\n");
330
- if (boundary < 0) continue;
331
- const complete = pending.slice(0, boundary);
332
- pending = pending.slice(boundary + 1);
333
- if (consume(controller, complete) > 0) return;
334
- }
335
- } catch {
336
- await end(controller, signal.aborted ? "request cancelled" : "upstream stream failed");
337
- }
338
- },
339
- async cancel() {
340
- cancelled = true;
341
- // When end() is already waiting for settlement it sees the flag and writes the 499 row.
342
- if (ended) return;
343
- ended = true;
344
- cancelInner();
345
- await finalLog.waitForInner();
346
- commitCancelled();
190
+ return streamNativeFromChat({
191
+ contentType: "application/x-ndjson",
192
+ chunk: parsed => consumeOllamaChatChunk(state, parsed).map(line),
193
+ terminal() {
194
+ const record = ollamaStreamTerminal(state);
195
+ return record.done === true
196
+ ? { ok: true, frames: () => [line(record)] }
197
+ : { ok: false, error: typeof record.error === "string" ? record.error : "request did not complete" };
347
198
  },
348
- }, { highWaterMark: 0 }), { status: 200, headers: { "content-type": "application/x-ndjson" } });
199
+ failure: message => [line({ error: message })],
200
+ }, body, finalLog, signal);
349
201
  }
@@ -23,6 +23,7 @@ export type PassiveRouteLinker = (
23
23
  modelId: string,
24
24
  routed: OcxProviderConfig,
25
25
  inboundWire: InboundWire,
26
+ effectiveAdapter?: string,
26
27
  ) => string | null;
27
28
 
28
29
  let linker: PassiveRouteLinker | null = null;
@@ -46,10 +47,11 @@ export function resolvePassiveRouteSubjectId(
46
47
  modelId: string,
47
48
  routed: OcxProviderConfig,
48
49
  inboundWire: InboundWire,
50
+ effectiveAdapter?: string,
49
51
  ): string | null {
50
52
  if (!linker) return null;
51
53
  try {
52
- return linker(config, providerName, modelId, routed, inboundWire);
54
+ return linker(config, providerName, modelId, routed, inboundWire, effectiveAdapter);
53
55
  } catch {
54
56
  return null;
55
57
  }