@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,135 @@
1
+ import type { OcxConfig } from "../types";
2
+ import { parseAuthorizationScheme } from "../lib/authorization-scheme";
3
+ import { getCredentialOwnedAccountQuota } from "../providers/quota/account-cache";
4
+ import { getAccountSet } from "../oauth/store";
5
+ import { isCanonicalOpenAiForwardProvider, OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers-destination";
6
+ import { isSelectableCodexPoolAccount } from "../codex/account-id";
7
+ import { readCodexAccountRecord } from "../codex/account-store";
8
+ import { getAccountQuota, getAccountQuotaHistory } from "../codex/quota";
9
+ import { resetAtToMs } from "../codex/quota-types";
10
+ import { resolveAdmissionModelScope } from "./admission-model-scope";
11
+ import { isAllowedRequestOrigin, resolveDataPlaneAdmissionSecret, withCors, type RequestPolicyView } from "./auth-cors";
12
+
13
+ interface UsageWindow {
14
+ label: string;
15
+ provider: string;
16
+ percent: number;
17
+ limited: boolean;
18
+ /** Epoch milliseconds. */
19
+ resetsAt: number;
20
+ }
21
+
22
+ const LABEL_CONTROL_CHARS = /[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g;
23
+ const CUSTOM_WINDOW_LABELS = new Map<string, readonly string[]>([
24
+ ["cursor", ["First-party models", "API usage"]],
25
+ ["devin", ["Daily"]],
26
+ ["google-antigravity", ["Gem", "Gem (Weekly)", "Cla", "Cla (Weekly)"]],
27
+ ]);
28
+
29
+ function knownCustomLabel(provider: string, label: string): string | undefined {
30
+ const normalized = label.replace(LABEL_CONTROL_CHARS, "").trim();
31
+ return CUSTOM_WINDOW_LABELS.get(provider)?.find(known => known === normalized);
32
+ }
33
+
34
+ function collectWindow(
35
+ windows: Map<string, UsageWindow>,
36
+ provider: string,
37
+ label: string,
38
+ used: number | undefined,
39
+ resetsAt: number | undefined,
40
+ rejected = false,
41
+ ): void {
42
+ if (typeof used !== "number" || !Number.isFinite(used)) return;
43
+ if (typeof resetsAt !== "number" || resetsAt <= Date.now() || !Number.isFinite(new Date(resetsAt).getTime())) return;
44
+ const percent = Math.min(100, Math.max(0, used));
45
+ const limited = rejected || percent === 100;
46
+ const previous = windows.get(label);
47
+ if (!previous || percent > previous.percent) {
48
+ windows.set(label, { label: `${provider} ${label}`, provider, percent, limited: limited || previous?.limited === true, resetsAt });
49
+ } else if (limited) {
50
+ previous.limited = true;
51
+ }
52
+ }
53
+
54
+ const CODEX_WINDOW_LABELS = [
55
+ ["short", "Short window"], ["weekly", "Weekly"], ["monthly", "Monthly"],
56
+ ] as const;
57
+
58
+ function collectCodexWindows(windows: Map<string, UsageWindow>, id: string): void {
59
+ const quota = getAccountQuota(id);
60
+ if (!quota) return;
61
+ // The display cache carries bars forward across partial updates. Require a
62
+ // matching observation owned by this account's current credential identity.
63
+ const { observations } = getAccountQuotaHistory(id);
64
+ const newestFirst = observations.reverse().flatMap(sample => sample.windows);
65
+ for (const [slot, label] of CODEX_WINDOW_LABELS) {
66
+ const reset = quota[`${slot}ResetAt`];
67
+ const percent = quota[`${slot}Percent`];
68
+ if (reset === undefined || percent === undefined) continue;
69
+ const resetMs = resetAtToMs(reset);
70
+ const observed = newestFirst.find(window => window.family === "account" && window.window === slot);
71
+ if (observed?.usedPercent === percent && observed.resetAtMs === resetMs) {
72
+ collectWindow(windows, "ChatGPT", slot === "short" && observed.windowSeconds === 18_000 ? "5-hour" : label, percent, resetMs);
73
+ }
74
+ }
75
+ }
76
+
77
+ /** Project cached quota for a single upstream account selected by the authenticated key's scope. */
78
+ export function handleHubUsageWindows(req: Request, config: OcxConfig, policy: RequestPolicyView): Response {
79
+ const reply = (body: unknown, status = 200) => withCors(Response.json(body, {
80
+ status, headers: { "cache-control": "no-store" },
81
+ }), req, policy);
82
+ const error = (code: string, message: string, status: number) => reply({ error: { code, message } }, status);
83
+ const dedicated = req.headers.get("x-opencodex-api-key")?.trim();
84
+ const authorization = parseAuthorizationScheme(req.headers.get("authorization"));
85
+ const token = dedicated || (authorization.kind === "bearer" ? authorization.token : "");
86
+ const admission = resolveDataPlaneAdmissionSecret(token, config, dedicated ? "dedicated" : "bearer", {
87
+ linkIngress: policy.linkIngress?.allowedKeyIds,
88
+ });
89
+ const scope = admission?.kind === "configured" ? resolveAdmissionModelScope(config, admission) : undefined;
90
+ const [provider] = scope?.providers ?? [];
91
+ if (!provider || scope?.providers.length !== 1 || scope.models.length !== 0 || scope.allOf) {
92
+ return error("usage_windows_unauthorized", "A configured client key scoped to one provider and all its models is required", 401);
93
+ }
94
+ if (!isAllowedRequestOrigin(req, policy)) return error("origin_rejected", "Cross-origin request blocked", 403);
95
+ if (config.runtimeRole !== "hub") return error("usage_windows_not_a_hub", "Usage windows are served only by a hub", 404);
96
+ const matchingProviders = Object.entries(config.providers).filter(([name]) => name.trim().toLowerCase() === provider);
97
+ if (matchingProviders.length !== 1) return reply({ windows: [] });
98
+ const [providerName, providerConfig] = matchingProviders[0]!;
99
+ if (providerConfig.disabled === true) return reply({ windows: [] });
100
+
101
+ // Count registered candidates before reading any cache. An empty cache for a
102
+ // second account is no evidence that the key owns just one account.
103
+ const ambiguousAccount = () => error("usage_windows_account_scope_required", "Usage windows require a single upstream account", 403);
104
+ const windows = new Map<string, UsageWindow>();
105
+ if (providerName === OPENAI_CODEX_PROVIDER_ID && isCanonicalOpenAiForwardProvider(providerConfig)) {
106
+ if (providerConfig.codexAccountMode === "direct") return reply({ windows: [] });
107
+ const pool = (config.codexAccounts ?? []).filter(isSelectableCodexPoolAccount);
108
+ if (pool.length > 1) return ambiguousAccount();
109
+ const account = pool[0];
110
+ if (!account) return reply({ windows: [] });
111
+ const record = readCodexAccountRecord(account.id);
112
+ if (!record?.credential || record.deletedAt != null || record.codexValidationPending) return reply({ windows: [] });
113
+ collectCodexWindows(windows, account.id);
114
+ } else {
115
+ const accounts = getAccountSet(providerName)?.accounts ?? [];
116
+ if (accounts.length > 1) return ambiguousAccount();
117
+ const account = accounts[0];
118
+ if (!account) return reply({ windows: [] });
119
+ const quota = getCredentialOwnedAccountQuota(providerName, account.id);
120
+ if (!quota) return reply({ windows: [] });
121
+ const name = providerName.charAt(0).toUpperCase() + providerName.slice(1);
122
+ collectWindow(windows, name, "5-hour", quota.fiveHourPercent, quota.fiveHourResetAt);
123
+ collectWindow(windows, name, "Weekly", quota.weeklyPercent, quota.weeklyResetAt);
124
+ collectWindow(windows, name, "Monthly", quota.monthlyPercent, quota.monthlyResetAt);
125
+ const customWindows = (quota.customWindows ?? []).flatMap(custom => {
126
+ if (custom.scope === "model" || custom.modelId !== undefined) return [];
127
+ const label = knownCustomLabel(provider, custom.label);
128
+ return label ? [{ ...custom, label }] : [];
129
+ });
130
+ for (const custom of customWindows.sort((a, b) => a.label.localeCompare(b.label))) {
131
+ collectWindow(windows, name, custom.label, custom.percent, custom.resetAt, custom.rejected);
132
+ }
133
+ }
134
+ return reply({ windows: [...windows.values()] });
135
+ }
@@ -19,10 +19,24 @@ export async function handleHubUsage(req: Request, config: OcxConfig, policy: Re
19
19
  if (!isAllowedRequestOrigin(req, policy)) return error("origin_rejected", "Cross-origin request blocked", 403);
20
20
  if (config.runtimeRole !== "hub") return error("hub_usage_not_a_hub", "Usage is served here only by a hub", 404);
21
21
  const keyId = admission.keyId;
22
+ const stillAdmitted = () => {
23
+ const current = resolveDataPlaneAdmissionSecret(token, config, "dedicated", options);
24
+ return current?.kind === "configured" && current.keyId === keyId;
25
+ };
26
+ return withCors(await serveKeyScopedHubUsage(new URL(req.url).searchParams, keyId, stillAdmitted), req, policy);
27
+ }
28
+
29
+ /** Shared projection for authorized Hub clients, with a post-read enrollment check. */
30
+ export async function serveKeyScopedHubUsage(
31
+ query: URLSearchParams, keyId: string, stillAdmitted: () => boolean,
32
+ ): Promise<Response> {
33
+ const reply = (body: unknown, status = 200) => Response.json(body, {
34
+ status, headers: { "cache-control": "no-store" },
35
+ });
36
+ const error = (code: string, message: string, status: number) => reply({ error: { code, message } }, status);
22
37
  // The existing aggregate filter trims IDs. Never let that normalization turn
23
38
  // this authenticated identity into another configured key (or no filter).
24
39
  if (!keyId || keyId.trim() !== keyId) return error("hub_usage_key_id_invalid", "Client key identity needs repair on the hub", 403);
25
- const query = new URL(req.url).searchParams;
26
40
  const allowed = new Set(["range", "surface", "provider", "model", "since", "until", "client"]);
27
41
  for (const key of query.keys()) {
28
42
  if (!allowed.has(key) || query.getAll(key).length !== 1) return error("hub_usage_query_invalid", "Unknown or repeated usage option", 400);
@@ -43,8 +57,7 @@ export async function handleHubUsage(req: Request, config: OcxConfig, policy: Re
43
57
  apiKeyId: keyId, provider: query.get("provider"), model: query.get("model"),
44
58
  ...(client !== null ? { sourceFilter: { client: client as UsageSourceClient, device: { kind: "key", id: keyId } } } : {}),
45
59
  }, window);
46
- const current = resolveDataPlaneAdmissionSecret(token, config, "dedicated", options);
47
- if (current?.kind !== "configured" || current.keyId !== keyId) {
60
+ if (!stillAdmitted()) {
48
61
  return error("hub_usage_unauthorized", "The client key changed during the read", 401);
49
62
  }
50
63
  const summary = aggregate.accumulator.summarize(parseRange(rangeInput), Date.now(), parseUsageSurface(surfaceInput));
@@ -8,6 +8,7 @@ import { codexCompatibleUrl } from "../codex/context-compat";
8
8
  import { addFinalRequestLog, markLocalRequestLogRefusal } from "./request-log";
9
9
  import type { WorkflowRefusalLog } from "./workflow-refusal";
10
10
  import { inboundBodyBudget, bindInboundBodyLease, type InboundBodyBudget } from "./inbound-body-budget";
11
+ import { isGeminiBodyPath } from "./gemini-native-paths";
11
12
  import { OLLAMA_JSON_BODY_ROUTES } from "./ollama-native-paths";
12
13
 
13
14
  export { configureInboundBodyBudget, MAX_CONCURRENT_INBOUND_BODY_BYTES } from "./inbound-body-budget";
@@ -163,7 +164,7 @@ export async function withRaisedInboundBodyAdmission(
163
164
  // Native Ollama generation routes are served only on the authenticated listener, so they sit in
164
165
  // their own set: the loopback oracle checks CONFIGURABLE_JSON_BODY_ROUTES against that allowlist.
165
166
  const raised = maxBytes > MAX_DECOMPRESSED_BODY_BYTES;
166
- if (req.method !== "POST" || !(CONFIGURABLE_JSON_BODY_ROUTES.has(pathname) || OLLAMA_JSON_BODY_ROUTES.has(pathname))
167
+ if (req.method !== "POST" || !(CONFIGURABLE_JSON_BODY_ROUTES.has(pathname) || OLLAMA_JSON_BODY_ROUTES.has(pathname) || isGeminiBodyPath(pathname))
167
168
  || !(raised || encodedBody(req)) || req.signal.aborted) {
168
169
  return work();
169
170
  }
@@ -0,0 +1,75 @@
1
+ import {
2
+ buildDesktop3pRegistry,
3
+ desktop3pModelOptions,
4
+ generateDesktop3pModels,
5
+ resolvableDesktop3pAlias,
6
+ } from "../../claude/desktop-3p";
7
+ import type { DesktopDiscoveryInputs } from "../../claude/desktop-discovery-inputs";
8
+ import type { OcxConfig } from "../../types";
9
+ import { jsonResponse, type RequestPolicyView } from "../auth-cors";
10
+
11
+ export function desktopSnapshotBusyResponse(req: Request, policy: RequestPolicyView): Response {
12
+ const response = jsonResponse({ error: {
13
+ type: "server_error", code: "desktop_snapshot_busy", message: "Desktop model snapshot is temporarily unavailable",
14
+ } }, 503, req, policy);
15
+ response.headers.set("Retry-After", "1");
16
+ response.headers.set("Cache-Control", "no-store");
17
+ return response;
18
+ }
19
+
20
+ export async function renderAnthropicModelListing(options: {
21
+ req: Request;
22
+ url: URL;
23
+ policy: RequestPolicyView;
24
+ config: OcxConfig;
25
+ desktopInputs: DesktopDiscoveryInputs;
26
+ wantsDesktopConfig: boolean;
27
+ canInstallAliases: () => boolean;
28
+ fastEligible: (model: { provider: string; id: string; supportsServiceTier?: boolean }) => boolean;
29
+ }): Promise<Response> {
30
+ const { req, url, policy, config, desktopInputs, wantsDesktopConfig, canInstallAliases, fastEligible } = options;
31
+ if (wantsDesktopConfig) {
32
+ if (!canInstallAliases()) return desktopSnapshotBusyResponse(req, policy);
33
+ const enabled = config.claudeCode?.enabled !== false;
34
+ const models = enabled ? generateDesktop3pModels(
35
+ desktopInputs.nativeSlugs, desktopInputs.routedModels,
36
+ config.claudeCode?.desktopProfile, desktopInputs.nativeContextCap,
37
+ desktop3pModelOptions(config.claudeCode),
38
+ ) : [];
39
+ const response = jsonResponse({ version: 1, models }, 200, req, policy);
40
+ response.headers.set("Cache-Control", "no-store");
41
+ return response;
42
+ }
43
+ if (config.claudeCode?.enabled === false) return jsonResponse({ data: [] }, 200, req, policy);
44
+ const { buildAnthropicModelInfos, configuredRoutedDisplayName } = await import("../../claude/model-info");
45
+ const { resolveAutoContext } = await import("../../claude/context-windows");
46
+ if (canInstallAliases()) {
47
+ buildDesktop3pRegistry(
48
+ desktopInputs.nativeSlugs, desktopInputs.routedModels,
49
+ config.claudeCode?.desktopProfile, desktopInputs.nativeContextCap,
50
+ );
51
+ }
52
+ // Per-surface id family (devlog 050): explicit ?ids= wins; otherwise the
53
+ // Claude Code CLI discovery UA (`claude-code/<version>`, binary n_()) gets
54
+ // readable claude-ocx ids and every other client (Desktop 3P) keeps the
55
+ // hashed family its config was written with. Unknown UA -> hashed (safe).
56
+ const idsParam = url.searchParams.get("ids");
57
+ const idStyle = idsParam === "cli"
58
+ ? "readable" as const
59
+ : idsParam === "desktop"
60
+ ? "desktop3p" as const
61
+ : (/^claude-code\//i.test(req.headers.get("user-agent") ?? "") ? "readable" as const : "desktop3p" as const);
62
+ const data = buildAnthropicModelInfos(
63
+ desktopInputs.nativeSlugs,
64
+ desktopInputs.routedModels,
65
+ resolveAutoContext(config.claudeCode),
66
+ idStyle,
67
+ resolvableDesktop3pAlias,
68
+ desktopInputs.nativeContextCap,
69
+ config.fastMode,
70
+ // Explicit opt-out omits the Fast predicate.
71
+ config.fastRows !== false ? fastEligible : undefined,
72
+ { modelPickerOrder: config.modelPickerOrder, featured: config.subagentModels }, configuredRoutedDisplayName(config),
73
+ );
74
+ return jsonResponse({ data }, 200, req, policy);
75
+ }
@@ -0,0 +1,147 @@
1
+ /**
2
+ * Dispatcher arm for the Gemini-compatible inbound API (the google-genai SDK with a custom base
3
+ * URL, `agy` with the genai wire protocol). Like the Ollama arm it runs only for the exact native
4
+ * paths and reuses the data-plane gates; refusals keep their status and retry advice and are
5
+ * reshaped into the Gemini error body. Gemini clients authenticate with `x-goog-api-key` or a
6
+ * `?key=` query parameter, so the request is cloned with that credential moved onto
7
+ * `x-opencodex-api-key` and the query key dropped; the key is never logged or forwarded.
8
+ */
9
+ import { ADVISOR_INTERNAL_CAPABILITY_HEADER } from "../../lib/local-internal-call-capability";
10
+ import { clientFacingModelLabel, clientFacingModelText } from "../../lib/error-destination";
11
+ import { classifyUsageClient } from "../../usage/client";
12
+ import { admissionFields, isAllowedRequestOrigin, resolveApiAuth, resolveResponsesApiAuth, withCors } from "../auth-cors";
13
+ import { AdmissionModelDeniedError, projectAdmissionModelDeniedLog, routeAllowedByScope } from "../admission-model-scope";
14
+ import { SIDECAR_INTERNAL_CAPABILITY_HEADER } from "../advisor-admission-scope";
15
+ import { withCallerSessionIdentity } from "../caller-session-identity";
16
+ import { captureAdmissionPolicy } from "../capture-admission-policy";
17
+ import { isDraining } from "../lifecycle";
18
+ import { geminiRouteAllowHeader, geminiRouteAllows, parseGeminiNativePath, type GeminiNativeRoute } from "../gemini-native-paths";
19
+ import { geminiError, handleGeminiCountTokens, handleGeminiGeneration, handleGeminiModel, handleGeminiModels, toGeminiRefusal } from "../gemini-inbound";
20
+ import { handleGeminiInteraction, handleGeminiInteractionResource } from "../gemini-interactions-inbound";
21
+ import { nativeGeminiDestination } from "../gemini-native-catalog";
22
+ import { handleGeminiNative } from "../gemini-native";
23
+ import { logGeminiNativeDelivery } from "../gemini-native-log";
24
+ import { nativeInnerErrorMessage } from "../native-chat-bridge";
25
+ import { nextRequestLogId, type RequestLogContext } from "../request-log";
26
+ import { runAdmittedBodyWork } from "../inbound-body-admission";
27
+ import { disableResponsesRequestTimeout } from "../responses";
28
+ import { withRequestLogId } from "./startup-warnings";
29
+ import type { OllamaRouteDeps } from "./ollama-routes";
30
+
31
+ export type GeminiRouteDeps = OllamaRouteDeps;
32
+
33
+ /** Move the Gemini credential onto the proxy's dedicated header and drop it from the URL. */
34
+ function withProxyCredential(req: Request, url: URL): Request {
35
+ const headers = new Headers(req.headers);
36
+ const key = headers.get("x-goog-api-key")?.trim() || url.searchParams.get("key")?.trim();
37
+ headers.delete("x-goog-api-key");
38
+ if (key && !headers.get("x-opencodex-api-key")?.trim()) headers.set("x-opencodex-api-key", key);
39
+ const clean = new URL(url);
40
+ clean.searchParams.delete("key");
41
+ const init: RequestInit & { duplex?: "half" } = { method: req.method, headers, signal: req.signal };
42
+ if (req.body) { init.body = req.body; init.duplex = "half"; }
43
+ return new Request(clean, init);
44
+ }
45
+
46
+ /** Returns undefined when the path is not one of the native routes. */
47
+ export async function dispatchGeminiRoute(original: Request, url: URL, deps: GeminiRouteDeps): Promise<Response | undefined> {
48
+ const route = parseGeminiNativePath(url.pathname);
49
+ if (!route) return undefined;
50
+ const response = await handleGeminiRoute(route, original, url, deps);
51
+ if (route.kind === "interactions" || route.kind === "interaction" || route.kind === "interaction-cancel") {
52
+ // A cached success or miss must never cross the interaction owner's credential boundary.
53
+ response.headers.set("Cache-Control", "no-store");
54
+ }
55
+ return response;
56
+ }
57
+
58
+ async function handleGeminiRoute(route: GeminiNativeRoute, original: Request, url: URL, deps: GeminiRouteDeps): Promise<Response> {
59
+ const { config, policy } = deps;
60
+ if (!geminiRouteAllows(route, original.method)) {
61
+ const refused = geminiError(405, `method ${original.method} not allowed`);
62
+ refused.headers.set("Allow", geminiRouteAllowHeader(route));
63
+ return withCors(refused, original, policy);
64
+ }
65
+ const generation = route.kind === "interactions"
66
+ || (route.kind === "method" && (route.method === "generateContent" || route.method === "streamGenerateContent"));
67
+ if (generation) disableResponsesRequestTimeout(original, deps.requestServer);
68
+ const req = withProxyCredential(original, url);
69
+ if (route.kind === "interaction" || route.kind === "interaction-cancel") {
70
+ // Stored interactions take the same admission as creating them, so the keys that can read or
71
+ // delete one are exactly the keys that can create one.
72
+ const admission = resolveResponsesApiAuth(req, policy);
73
+ if (!admission) return withCors(geminiError(401, "opencodex API key required"), original, policy);
74
+ if (!isAllowedRequestOrigin(req, policy)) return withCors(geminiError(403, "cross-origin data-plane request blocked"), original, policy);
75
+ return withCors(handleGeminiInteractionResource(route, req, config, admission), original, policy);
76
+ }
77
+ if (!generation) {
78
+ // Model discovery never forwards Authorization upstream, so the broader admission set is safe.
79
+ const admission = resolveApiAuth(req, policy);
80
+ if (!admission) return withCors(geminiError(401, "opencodex API key required"), original, policy);
81
+ if (!isAllowedRequestOrigin(req, policy)) return withCors(geminiError(403, "cross-origin data-plane request blocked"), original, policy);
82
+ const response = route.kind === "models" ? handleGeminiModels(config, req, admission)
83
+ : route.kind === "model" ? handleGeminiModel(config, req, admission, route.model)
84
+ // countTokens reads and decodes a body, so it holds the shared body allowance until its
85
+ // answer settles; it sends nothing upstream and takes no turn slot.
86
+ : route.kind === "method" && route.method === "countTokens"
87
+ ? await runAdmittedBodyWork(req, policy, config.maxInboundBodyBytes,
88
+ () => handleGeminiCountTokens(config, req, admission, route.model), undefined, toGeminiRefusal,
89
+ () => geminiError(499, "request cancelled"))
90
+ : route.kind === "method" ? geminiError(501, `${route.method} is not supported`)
91
+ : geminiError(405, "method not allowed");
92
+ return withCors(response, original, policy);
93
+ }
94
+ if (isDraining()) return withCors(toGeminiRefusal(deps.drainingResponse(req, policy)), original, policy);
95
+ const admission = resolveResponsesApiAuth(req, policy);
96
+ if (!admission) return withCors(geminiError(401, "opencodex API key required"), original, policy);
97
+ if (!isAllowedRequestOrigin(req, policy)) return withCors(geminiError(403, "cross-origin data-plane request blocked"), original, policy);
98
+ const start = Date.now();
99
+ const requestId = nextRequestLogId(start);
100
+ const logCtx: RequestLogContext = {
101
+ model: "unknown",
102
+ provider: "unknown",
103
+ ...deps.requestMetricsLogContext,
104
+ client: classifyUsageClient(req.headers),
105
+ ...admissionFields(admission),
106
+ };
107
+ const sessionReq = withCallerSessionIdentity(req, admission);
108
+ // Discovery-style clients spell the parameter `$alt`.
109
+ const sse = (url.searchParams.get("alt") ?? url.searchParams.get("$alt")) === "sse";
110
+ // Expose an id only when the handler or a logged refusal owns the history row.
111
+ let ownsRequestLog = false;
112
+ const advisorAdmissionPolicy = captureAdmissionPolicy(config, admission);
113
+ const response = await deps.runAdmittedHttpTurn(sessionReq, policy, async turnAdmissionLease => {
114
+ ownsRequestLog = true;
115
+ // Internal Advisor and sidecar hops keep the Chat bridge's capability and inherited-policy checks.
116
+ const native = route.kind === "method" && url.pathname.startsWith("/v1beta/") && !sessionReq.headers.has(ADVISOR_INTERNAL_CAPABILITY_HEADER)
117
+ && !sessionReq.headers.has(SIDECAR_INTERNAL_CAPABILITY_HEADER)
118
+ ? nativeGeminiDestination(config, sessionReq, route.model) : undefined;
119
+ if (native && route.kind === "method") {
120
+ const modelLabel = clientFacingModelLabel(route.model);
121
+ logCtx.requestedModel = clientFacingModelText(modelLabel);
122
+ let result: Response;
123
+ if (!routeAllowedByScope(advisorAdmissionPolicy.modelScope, native.route)) {
124
+ projectAdmissionModelDeniedLog(new AdmissionModelDeniedError(modelLabel, native.route), logCtx);
125
+ result = geminiError(403, nativeInnerErrorMessage(403));
126
+ } else {
127
+ logCtx.model = native.route.modelId;
128
+ logCtx.provider = native.route.providerName;
129
+ const delivery = route.method === "streamGenerateContent" ? (sse ? "sse" : "array") : undefined;
130
+ result = await handleGeminiNative(sessionReq, config, native.wireModel, delivery, turnAdmissionLease, undefined, logCtx);
131
+ }
132
+ return withCors(logGeminiNativeDelivery(result, sessionReq, requestId, start, logCtx), original, policy);
133
+ }
134
+ const ids = { requestId, start, turnAdmissionLease, admission, advisorAdmissionPolicy };
135
+ return withCors(
136
+ route.kind === "method"
137
+ ? await handleGeminiGeneration(route.method as "generateContent" | "streamGenerateContent", route.model, sse, sessionReq, config, logCtx, ids)
138
+ : await handleGeminiInteraction(sessionReq, config, logCtx, ids),
139
+ original,
140
+ policy,
141
+ );
142
+ }, { requestId, start, logCtx, onLogged: () => { ownsRequestLog = true; } }, {
143
+ mapRefusal: toGeminiRefusal,
144
+ onAdmissionError: () => geminiError(499, "request cancelled"),
145
+ });
146
+ return ownsRequestLog ? withRequestLogId(response, requestId) : response;
147
+ }
@@ -9,9 +9,9 @@
9
9
  * They run as passive reads (`src/lib/passive-read.ts`): no discovery, config write or diagnostic (#6959).
10
10
  */
11
11
  import type { OcxConfig } from "../../types";
12
- import { handleManagementAPI, type ManagementApiDeps } from "../management-api";
12
+ import type { ManagementApiDeps } from "../management-api";
13
13
  import type { ManagementSessionControl } from "../management-auth";
14
- import { runPassiveRead } from "../../lib/passive-read";
14
+ import { dispatchPassiveManagementRead } from "./passive-management-read";
15
15
  import { LINK_CODEX_SETTINGS_PATH, LINK_ROUTE_INTENT_PATH, LINK_ROUTE_CATALOG_PATH, linkManagementRouteAllowed, linkManagementTarget } from "../../link/management-routes";
16
16
  import { projectRouteCatalogFacts } from "../../integrations/route-intent-catalog";
17
17
  import { readLinkRouteIntent } from "./route-intent-watch";
@@ -24,7 +24,6 @@ import { packageVersion } from "../../lib/package-version";
24
24
  import { parseUsageSource } from "../../usage/source-filter";
25
25
 
26
26
  const VERSION = packageVersion("0.0.0");
27
- const KEPT_RESPONSE_HEADERS = ["content-type", "content-language", "etag", "last-modified"];
28
27
  const REPORT_READ_TIMEOUT_MS = 5_000;
29
28
 
30
29
  function notFound(): Response {
@@ -105,23 +104,5 @@ export async function handleLinkManagementRequest(
105
104
  return refused(403, "link_usage_scope_refused");
106
105
  }
107
106
  }
108
- const local = new URL(`${target.pathname}${target.search}`, "http://127.0.0.1");
109
- // The handlers branch on GET; an admitted HEAD runs as GET and its body is dropped below.
110
- const inner = new Request(local.href, {
111
- method: "GET",
112
- headers: { accept: "application/json", host: "127.0.0.1" },
113
- });
114
- const response = await runPassiveRead(() =>
115
- handleManagementAPI(inner, local, config, deps, undefined, sessionControl, { trustedLoopback: false }));
116
- if (!response) return notFound();
117
- const headers = new Headers({ "cache-control": "no-store" });
118
- for (const name of KEPT_RESPONSE_HEADERS) {
119
- const value = response.headers.get(name);
120
- if (value) headers.set(name, value);
121
- }
122
- if (req.method === "HEAD") {
123
- try { await response.body?.cancel(); } catch { /* best effort */ }
124
- return new Response(null, { status: response.status, headers });
125
- }
126
- return new Response(response.body, { status: response.status, headers });
107
+ return dispatchPassiveManagementRead(req.method, target.pathname + target.search, config, deps, sessionControl);
127
108
  }
@@ -1,17 +1,43 @@
1
1
  import type { Server } from "bun";
2
2
  import { createHash } from "node:crypto";
3
3
  import {
4
- LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION, LINK_RELAY_CONNECTION_HEADER,
4
+ LINK_RELAY_AUTH_FAILED_CODE, LINK_RELAY_AUTH_PATH, LINK_RELAY_AUTH_TIMEOUT_MS, LINK_RELAY_AUTH_VERSION, LINK_RELAY_CONNECTION_HEADER,
5
5
  LINK_RELAY_CONNECTION_PROOF_HEADER, LINK_RELAY_PROBE_HEADER, LINK_RELAY_SESSION_HEADER, linkConnectionProof,
6
6
  linkRelayProof, linkRelayProofMatches, LINK_RELAY_WS_STATE_HEADER, LINK_RELAY_WS_STATE_PROOF_HEADER, linkWebsocketStateProof,
7
7
  } from "../../link/relay-auth";
8
8
  import { parseLinkPeerReport, type LinkPeerObservations } from "../../link/peer-report";
9
- import { linkActivityCounts, type LinkActivity } from "../../link/child-activity";
9
+ import { linkActivityCounts, type LinkActivity, type LinkHttpDeliveryOutcome } from "../../link/child-activity";
10
+ import { HOME_UNREACHABLE_CODE } from "../../client/home-unreachable";
10
11
  import type { LinkSessionGrant, LinkUpgradeOutcome } from "./link-websocket";
11
12
  import type { LinkTrafficBook } from "../../link/traffic";
12
13
  import { LINK_HOME_FEATURES_HEADER } from "../../link/request-compression";
13
14
  import { linkRelayWaitObserver } from "./link-websocket-limits";
14
15
 
16
+ const RELAY_ERROR_BODY_LIMIT = 4_096;
17
+
18
+ /** Inspect small JSON 503s only as their bytes are relayed, without reading ahead or delaying headers. */
19
+ function observeRelayError(response: Response) {
20
+ if (response.status !== 503 || !/^application\/json(?:\s*;|$)/i.test(response.headers.get("content-type") ?? "")) return;
21
+ let bytes: Uint8Array | undefined = new Uint8Array(RELAY_ERROR_BODY_LIMIT);
22
+ let length = 0;
23
+ return {
24
+ append(chunk: Uint8Array): void {
25
+ if (!bytes) return;
26
+ if (length + chunk.byteLength > bytes.byteLength) { bytes = undefined; return; }
27
+ bytes.set(chunk, length);
28
+ length += chunk.byteLength;
29
+ },
30
+ failed(): boolean {
31
+ if (!bytes) return false;
32
+ try {
33
+ const body: unknown = JSON.parse(new TextDecoder().decode(bytes.subarray(0, length)));
34
+ const code = body && typeof body === "object" && "code" in body ? body.code : undefined;
35
+ return code === HOME_UNREACHABLE_CODE || code === LINK_RELAY_AUTH_FAILED_CODE;
36
+ } catch { return false; }
37
+ },
38
+ };
39
+ }
40
+
15
41
  /** A 200 `GET /v1/catalog` whose body the Child read to the end (wp2 catalog freshness). */
16
42
  export interface LinkCatalogServed { linkId: string | null; keyId: string | null; etag: string }
17
43
 
@@ -23,6 +49,7 @@ interface Session {
23
49
  expiresAt: number;
24
50
  timer: ReturnType<typeof setTimeout>;
25
51
  release: () => void;
52
+ generation: string | undefined;
26
53
  }
27
54
 
28
55
  export interface LinkRelaySessionOptions {
@@ -147,18 +174,20 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
147
174
  if (req.headers.get(LINK_RELAY_PROBE_HEADER) === "1") return answer();
148
175
  const release = acquire();
149
176
  const timer = setTimeout(() => { consume(nonce)?.release(); }, reservationMs);
150
- sessions.set(nonce, { peer, keyId, linkId, fingerprint, release, timer, expiresAt: Date.now() + reservationMs });
177
+ sessions.set(nonce, { peer, keyId, linkId, fingerprint, release, timer, expiresAt: Date.now() + reservationMs, generation });
151
178
  return answer();
152
179
  }
153
180
  const nonce = req.headers.get(LINK_RELAY_SESSION_HEADER);
154
181
  let release: () => void;
155
182
  let sessionLink: string | null = null;
183
+ let sessionGeneration: string | undefined;
156
184
  if (nonce !== null) {
157
185
  // A proof received on one HTTP socket never authorizes another socket, even on the same port.
158
186
  const session = consume(nonce);
159
187
  if (!session) return refuse();
160
188
  release = session.release;
161
189
  sessionLink = session.linkId;
190
+ sessionGeneration = session.generation;
162
191
  if (session.peer !== peerOf(req, server as Server<unknown>) || Date.now() >= session.expiresAt
163
192
  || !options.fingerprints(session.keyId, session.linkId).includes(session.fingerprint)) {
164
193
  release(); return refuse();
@@ -186,13 +215,28 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
186
215
  release = () => { end(); lease(); };
187
216
  };
188
217
  if (countsActivity && sessionLink !== null) beginActivity();
218
+ let endDelivery: ((outcome: LinkHttpDeliveryOutcome) => void) | undefined;
219
+ if (countsActivity && sessionLink !== null && sessionGeneration !== undefined) {
220
+ // Attribution is display-only. A session reserved just before a reconnect cannot move
221
+ // the activity book back to a previous generation when its data request arrives later.
222
+ try {
223
+ if (sessionGeneration === options.connectionGeneration?.(sessionLink)) {
224
+ endDelivery = options.activity!.beginHttpDelivery(sessionLink, sessionGeneration);
225
+ }
226
+ } catch { /* the relay proceeds even if the observation is unavailable */ }
227
+ }
189
228
  let decideObservation: ((accepted: boolean) => void) | undefined;
190
229
  if (sessionLink !== null && req.method === "POST" && url.pathname === "/v1/responses") {
191
230
  try { decideObservation = options.observeResponsesRequest?.(sessionLink, req) ?? undefined; } catch { /* observation never blocks the request */ }
192
231
  }
193
232
  let flow: ReturnType<LinkTrafficBook["begin"]> | undefined;
194
- // Accounting never keeps a lease: every path ends its flow through here and goes on to release.
195
- const endFlow = (complete: boolean): void => { try { flow?.end(complete); } catch { /* the request's own outcome is the one reported */ } };
233
+ // Observations never keep a lease: every path ends its flow here and goes on to release.
234
+ const endFlow = (complete: boolean, delivery?: LinkHttpDeliveryOutcome): void => {
235
+ if (delivery) {
236
+ try { endDelivery?.(delivery); } catch { /* the request's own outcome is the one reported */ }
237
+ }
238
+ try { flow?.end(complete); } catch { /* the request's own outcome is the one reported */ }
239
+ };
196
240
  try {
197
241
  flow = sessionLink !== null ? options.traffic?.begin(sessionLink) : undefined;
198
242
  if (flow) {
@@ -209,7 +253,7 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
209
253
  // Socket cancellation before headers is terminal too; an upstream handler that is
210
254
  // settling its own cleanup cannot keep a dead transport's listener lease forever.
211
255
  // An abort before headers also decides a pending body observation (not accepted) and drops its unclaimed turn token.
212
- const beforeHeadersAbort = () => { decideObservation?.(false); endFlow(false); release(); };
256
+ const beforeHeadersAbort = () => { decideObservation?.(false); endFlow(false, "client_cancelled"); release(); };
213
257
  req.signal.addEventListener("abort", beforeHeadersAbort, { once: true });
214
258
  if (req.signal.aborted) beforeHeadersAbort();
215
259
  try {
@@ -217,8 +261,9 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
217
261
  decideObservation?.(response.status < 400 && !req.signal.aborted);
218
262
  req.signal.removeEventListener("abort", beforeHeadersAbort);
219
263
  if (countsActivity && sessionLink === null && response.status < 400 && !req.signal.aborted) beginActivity();
220
- if (!response.body || req.method === "HEAD") { endFlow(true); release(); return response; }
264
+ if (!response.body || req.method === "HEAD") { endFlow(true, "observed"); release(); return response; }
221
265
  const reader = response.body.getReader();
266
+ const relayError = endDelivery ? observeRelayError(response) : undefined;
222
267
  const catalogHash = options.catalogServed && req.method === "GET" && url.pathname === "/v1/catalog" && url.search === ""
223
268
  && response.status === 200 ? createHash("sha256") : null;
224
269
  const catalogKeyId = sessionLink === null ? response.headers.get("x-opencodex-key-id") : null;
@@ -247,7 +292,7 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
247
292
  };
248
293
  const cancel = async (reason?: unknown) => {
249
294
  cancelled = true;
250
- endFlow(false);
295
+ endFlow(false, "client_cancelled");
251
296
  try { await reader.cancel(reason); } finally { finish(); }
252
297
  };
253
298
  const aborted = () => { void cancel(req.signal.reason).catch(() => {}); };
@@ -256,21 +301,34 @@ export function createLinkRelaySessions(options: LinkRelaySessionOptions) {
256
301
  const body = new ReadableStream<Uint8Array>({
257
302
  async pull(controller) {
258
303
  stopWaiting();
304
+ let next;
305
+ try {
306
+ next = await reader.read();
307
+ } catch (error) {
308
+ endFlow(false, cancelled || req.signal.aborted ? "client_cancelled" : "upstream_failure");
309
+ finish(); controller.error(error);
310
+ return;
311
+ }
259
312
  try {
260
- const next = await reader.read();
261
- if (next.done) { endFlow(!cancelled); finish(); controller.close(); if (!cancelled) reportCatalog(); }
262
- else {
313
+ if (next.done) {
314
+ controller.close();
315
+ endFlow(!cancelled, cancelled ? "client_cancelled" : relayError?.failed() ? "upstream_failure" : "observed");
316
+ finish(); if (!cancelled) reportCatalog();
317
+ } else {
318
+ relayError?.append(next.value);
263
319
  catalogHash?.update(next.value); flow?.fromHome(next.value.byteLength); controller.enqueue(next.value);
264
320
  if (waitObserver && !ended) { waiting = true; tellWaiting(true); }
265
321
  }
266
- } catch (error) { endFlow(false); finish(); controller.error(error); }
322
+ } catch (error) {
323
+ endFlow(false, "client_cancelled"); finish(); controller.error(error);
324
+ }
267
325
  },
268
326
  cancel,
269
327
  }, { highWaterMark: 0 });
270
328
  return new Response(body, { status: response.status, statusText: response.statusText, headers: response.headers });
271
329
  } catch (error) {
272
330
  decideObservation?.(false); req.signal.removeEventListener("abort", beforeHeadersAbort);
273
- endFlow(false); release();
331
+ endFlow(false, req.signal.aborted ? "client_cancelled" : "upstream_failure"); release();
274
332
  throw error;
275
333
  }
276
334
  },
@@ -485,6 +485,8 @@ export function createLinkWebsocketGate(deps: LinkWebsocketGateDeps) {
485
485
  sessionLaneIdFromRequest(req.headers),
486
486
  classifyUsageClient(req.headers),
487
487
  );
488
+ // A Remote Link socket is never local, even though its tunnel arrives on a loopback socket.
489
+ Object.assign(data, { peerLocal: false });
488
490
  binding = { linkId: grant.linkId, keyId: grant.keyId, fingerprint: grant.fingerprint, fenced: false, leases };
489
491
  data.nativeControlDisabled = true;
490
492
  data.link = binding;