@bitkyc08/opencodex 2.100.2 → 2.100.3

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 (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -69,7 +69,11 @@ fn json_safe_nonneg_int(val: &serde_json::Value) -> Option<u64> {
69
69
  None
70
70
  }
71
71
 
72
- /// Strict exact-key parser matching `parseLinkChildParityReport` in `src/link/child-parity.ts`.
72
+ /// Strict exact-key parser for the five-key base report `ocx-child` sends, capped at
73
+ /// `LINK_CHILD_PARITY_MAX_BYTES` (1 KiB). It is narrower than the Home's TypeScript parser
74
+ /// (`parseLinkChildParityReport` in `src/link/child-parity.ts`), which also accepts the extended
75
+ /// report carrying `appliedRouteIntentDigest` and `routeClientOutcomes` and caps the body at 8 KiB.
76
+ /// `ocx-child` never reads route intent, so it never sends those fields.
73
77
  pub fn parse_link_child_parity_report(raw_json: &str) -> Option<LinkChildParityReport> {
74
78
  if raw_json.len() > LINK_CHILD_PARITY_MAX_BYTES {
75
79
  return None;
@@ -1078,23 +1078,30 @@ impl FileLock {
1078
1078
  /// Lock `path`, creating its parent private only if it is missing. An existing parent keeps
1079
1079
  /// its permissions; the lock file itself is created owner-only.
1080
1080
  pub fn try_acquire_nonblocking(path: &Path) -> Result<Self, LockAcquireError> {
1081
- Self::acquire_inner(path, false, true)
1081
+ Self::acquire_inner(path, false, true, false)
1082
1082
  }
1083
1083
 
1084
1084
  pub fn acquire_blocking(path: &Path) -> Result<Self, LockAcquireError> {
1085
- Self::acquire_inner(path, true, true)
1085
+ Self::acquire_inner(path, true, true, false)
1086
1086
  }
1087
1087
 
1088
1088
  /// Lock a file inside a directory the caller does not own (such as `CODEX_HOME`), leaving
1089
1089
  /// the directory's permissions untouched. The lock file itself is created private.
1090
1090
  pub fn acquire_in_existing_dir(path: &Path, blocking: bool) -> Result<Self, LockAcquireError> {
1091
- Self::acquire_inner(path, blocking, false)
1091
+ Self::acquire_inner(path, blocking, false, false)
1092
+ }
1093
+
1094
+ /// A shared (reader) lock on a file inside an existing directory, never blocking: many
1095
+ /// holders at once, refused only while someone holds it exclusively.
1096
+ pub fn try_acquire_shared_in_existing_dir(path: &Path) -> Result<Self, LockAcquireError> {
1097
+ Self::acquire_inner(path, false, false, true)
1092
1098
  }
1093
1099
 
1094
1100
  fn acquire_inner(
1095
1101
  path: &Path,
1096
1102
  blocking: bool,
1097
1103
  create_missing_parent: bool,
1104
+ shared: bool,
1098
1105
  ) -> Result<Self, LockAcquireError> {
1099
1106
  let parent = path.parent().ok_or(LockAcquireError::Io)?;
1100
1107
  // A symlinked parent is refused rather than followed, as ensure_private_dir did.
@@ -1146,9 +1153,11 @@ impl FileLock {
1146
1153
  #[cfg(unix)]
1147
1154
  {
1148
1155
  use std::os::fd::AsRawFd;
1156
+ const LOCK_SH: i32 = 1;
1149
1157
  const LOCK_EX: i32 = 2;
1150
1158
  const LOCK_NB: i32 = 4;
1151
- let op = if blocking { LOCK_EX } else { LOCK_EX | LOCK_NB };
1159
+ let mode = if shared { LOCK_SH } else { LOCK_EX };
1160
+ let op = if blocking { mode } else { mode | LOCK_NB };
1152
1161
  // SAFETY: `file` owns a valid open descriptor.
1153
1162
  let rc = unsafe { flock(file.as_raw_fd(), op) };
1154
1163
  if rc != 0 {
@@ -1160,10 +1169,11 @@ impl FileLock {
1160
1169
  use std::os::windows::io::AsRawHandle;
1161
1170
  const LOCKFILE_FAIL_IMMEDIATELY: u32 = 1;
1162
1171
  const LOCKFILE_EXCLUSIVE_LOCK: u32 = 2;
1172
+ let mode = if shared { 0 } else { LOCKFILE_EXCLUSIVE_LOCK };
1163
1173
  let flags = if blocking {
1164
- LOCKFILE_EXCLUSIVE_LOCK
1174
+ mode
1165
1175
  } else {
1166
- LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY
1176
+ mode | LOCKFILE_FAIL_IMMEDIATELY
1167
1177
  };
1168
1178
  let mut ov = Overlapped {
1169
1179
  internal: 0,
@@ -1323,6 +1333,50 @@ pub fn resolve_codex_home() -> PathBuf {
1323
1333
  pub enum PurgeExecutableOutcome {
1324
1334
  Removed,
1325
1335
  SkippedUnmanagedPath,
1336
+ /// Another ocx-child relay (of any OpenCodex home) runs from the planted binary.
1337
+ InUse,
1338
+ }
1339
+
1340
+ /// Lock file beside the managed planted binary. Every relay serving from that binary holds it
1341
+ /// shared for its lifetime; a purge takes it exclusively, without waiting, and keeps the binary
1342
+ /// when it cannot. The binary is one per OS user, shared by every ocx-child home of that user.
1343
+ pub const PLANT_IN_USE_LOCK: &str = ".ocx-child-in-use.lock";
1344
+
1345
+ /// Hold the planted binary's in-use lock shared when `exe_path` is the managed planted binary.
1346
+ /// Refuses while a purge holds it, so a relay never starts from a binary being removed. "Managed"
1347
+ /// is decided by the path (the managed directory and name), never by the file still existing: a
1348
+ /// relay whose binary a purge removed just before it took the lock finds it gone and refuses.
1349
+ pub fn hold_managed_plant_in_use(
1350
+ exe_path: &Path,
1351
+ user_home: &Path,
1352
+ local_appdata: Option<&Path>,
1353
+ ) -> Result<Option<FileLock>, String> {
1354
+ // Linux names an unlinked executable "<path> (deleted)" in /proc/self/exe.
1355
+ let unlinked = exe_path
1356
+ .to_str()
1357
+ .and_then(|p| p.strip_suffix(" (deleted)"))
1358
+ .map(PathBuf::from);
1359
+ let exe_path = unlinked.as_deref().unwrap_or(exe_path);
1360
+ if !is_managed_plant_location(exe_path, user_home, local_appdata)? {
1361
+ return Ok(None);
1362
+ }
1363
+ let parent = exe_path
1364
+ .parent()
1365
+ .ok_or_else(|| "missing parent".to_owned())?;
1366
+ let lock = match FileLock::try_acquire_shared_in_existing_dir(&parent.join(PLANT_IN_USE_LOCK)) {
1367
+ Ok(lock) => lock,
1368
+ Err(LockAcquireError::Busy) => {
1369
+ return Err("the planted ocx-child is being purged".to_owned());
1370
+ }
1371
+ Err(LockAcquireError::Io) => {
1372
+ return Err("cannot open the planted ocx-child in-use lock".to_owned());
1373
+ }
1374
+ };
1375
+ if unlinked.is_some() || !fs::symlink_metadata(exe_path).is_ok_and(|m| m.file_type().is_file())
1376
+ {
1377
+ return Err("the planted ocx-child was purged".to_owned());
1378
+ }
1379
+ Ok(Some(lock))
1326
1380
  }
1327
1381
 
1328
1382
  fn reject_managed_subpath_symlinks(root: &Path, components: &[&str]) -> Result<PathBuf, String> {
@@ -1343,6 +1397,17 @@ pub fn is_managed_plant_executable(
1343
1397
  if !fs::symlink_metadata(exe_path).is_ok_and(|m| m.file_type().is_file()) {
1344
1398
  return Ok(false);
1345
1399
  }
1400
+ is_managed_plant_location(exe_path, user_home, local_appdata)
1401
+ }
1402
+
1403
+ /// `exe_path` names the managed planted binary (its directory and file name), whether or not the
1404
+ /// file is there.
1405
+ fn is_managed_plant_location(
1406
+ exe_path: &Path,
1407
+ user_home: &Path,
1408
+ local_appdata: Option<&Path>,
1409
+ ) -> Result<bool, String> {
1410
+ reject_symlink(exe_path)?;
1346
1411
  let Some(parent) = exe_path.parent() else {
1347
1412
  return Ok(false);
1348
1413
  };
@@ -1378,6 +1443,20 @@ pub fn purge_managed_executable(
1378
1443
  if !is_managed_plant_executable(exe_path, user_home, local_appdata)? {
1379
1444
  return Ok(PurgeExecutableOutcome::SkippedUnmanagedPath);
1380
1445
  }
1446
+ let in_use_path = exe_path
1447
+ .parent()
1448
+ .ok_or_else(|| "missing parent".to_owned())?
1449
+ .join(PLANT_IN_USE_LOCK);
1450
+ let _exclusive = match FileLock::acquire_in_existing_dir(&in_use_path, false) {
1451
+ Ok(lock) => lock,
1452
+ Err(LockAcquireError::Busy) => return Ok(PurgeExecutableOutcome::InUse),
1453
+ Err(LockAcquireError::Io) => {
1454
+ return Err("cannot open the planted ocx-child in-use lock".to_owned());
1455
+ }
1456
+ };
1457
+ crate::test_hooks::barrier("purge-holding-in-use");
1458
+ // The lock file stays: unlinking it while held would let a relay lock a fresh file of the same
1459
+ // name and keep serving while the binary goes. The emptied directory therefore stays as well.
1381
1460
  #[cfg(unix)]
1382
1461
  {
1383
1462
  fs::remove_file(exe_path).map_err(|e| {
@@ -1485,3 +1564,70 @@ mod lock_parent_tests {
1485
1564
  }
1486
1565
  }
1487
1566
  }
1567
+ #[cfg(test)]
1568
+ mod managed_plant_in_use_tests {
1569
+ use super::*;
1570
+
1571
+ struct Scratch(PathBuf);
1572
+ impl Drop for Scratch {
1573
+ fn drop(&mut self) {
1574
+ let _ = fs::remove_dir_all(&self.0);
1575
+ }
1576
+ }
1577
+
1578
+ fn managed_home() -> (Scratch, PathBuf) {
1579
+ let home = std::env::temp_dir().join(format!(
1580
+ "ocx-child-plant-in-use-{}-{}",
1581
+ std::process::id(),
1582
+ random_hex(6).unwrap()
1583
+ ));
1584
+ let bin = home.join(".cache").join("opencodex").join("bin");
1585
+ fs::create_dir_all(&bin).unwrap();
1586
+ let exe = bin.join(if cfg!(windows) {
1587
+ "ocx-child.exe"
1588
+ } else {
1589
+ "ocx-child"
1590
+ });
1591
+ (Scratch(home), exe)
1592
+ }
1593
+
1594
+ #[test]
1595
+ fn a_relay_whose_managed_binary_is_gone_refuses_instead_of_serving_unlocked() {
1596
+ let (home, exe) = managed_home();
1597
+ assert_eq!(
1598
+ hold_managed_plant_in_use(&exe, &home.0, None)
1599
+ .err()
1600
+ .as_deref(),
1601
+ Some("the planted ocx-child was purged")
1602
+ );
1603
+ fs::write(&exe, b"binary").unwrap();
1604
+ assert!(
1605
+ hold_managed_plant_in_use(&exe, &home.0, None)
1606
+ .unwrap()
1607
+ .is_some()
1608
+ );
1609
+ #[cfg(target_os = "linux")]
1610
+ {
1611
+ // /proc/self/exe after the binary was unlinked.
1612
+ let deleted = PathBuf::from(format!("{} (deleted)", exe.display()));
1613
+ assert_eq!(
1614
+ hold_managed_plant_in_use(&deleted, &home.0, None)
1615
+ .err()
1616
+ .as_deref(),
1617
+ Some("the planted ocx-child was purged")
1618
+ );
1619
+ }
1620
+ }
1621
+
1622
+ #[test]
1623
+ fn a_binary_outside_the_managed_directory_holds_nothing() {
1624
+ let (home, _) = managed_home();
1625
+ let elsewhere = home.0.join("ocx-child");
1626
+ fs::write(&elsewhere, b"binary").unwrap();
1627
+ assert!(
1628
+ hold_managed_plant_in_use(&elsewhere, &home.0, None)
1629
+ .unwrap()
1630
+ .is_none()
1631
+ );
1632
+ }
1633
+ }
@@ -70,7 +70,7 @@ pub struct DeadlineStream {
70
70
  }
71
71
 
72
72
  impl DeadlineStream {
73
- fn new(stream: TcpStream, deadline: Option<Instant>, per_read: Duration) -> Self {
73
+ pub(crate) fn new(stream: TcpStream, deadline: Option<Instant>, per_read: Duration) -> Self {
74
74
  Self {
75
75
  stream,
76
76
  deadline,
@@ -173,11 +173,52 @@ impl RequestLimits<'_> {
173
173
  }
174
174
  }
175
175
 
176
+ /// A writer whose next write call can be given its own timeout.
177
+ pub(crate) trait TimedWrite: Write {
178
+ fn set_write_timeout_left(&mut self, left: Duration) -> std::io::Result<()>;
179
+ }
180
+
181
+ impl TimedWrite for TcpStream {
182
+ fn set_write_timeout_left(&mut self, left: Duration) -> std::io::Result<()> {
183
+ self.set_write_timeout(Some(left))
184
+ }
185
+ }
186
+
187
+ /// Write all of `buf` before `deadline`: every write call gets only the time left (at most `cap`), so
188
+ /// a peer draining a little at a time cannot stretch the whole write past the deadline.
189
+ pub(crate) fn write_all_before<W: TimedWrite>(
190
+ w: &mut W,
191
+ mut buf: &[u8],
192
+ deadline: Instant,
193
+ cap: Duration,
194
+ now: &dyn Fn() -> Instant,
195
+ ) -> std::io::Result<()> {
196
+ while !buf.is_empty() {
197
+ let left = deadline.saturating_duration_since(now()).min(cap);
198
+ if left.is_zero() {
199
+ return Err(std::io::Error::new(
200
+ std::io::ErrorKind::TimedOut,
201
+ "write deadline exceeded",
202
+ ));
203
+ }
204
+ w.set_write_timeout_left(left)?;
205
+ match w.write(buf) {
206
+ Ok(0) => return Err(std::io::ErrorKind::WriteZero.into()),
207
+ Ok(n) => buf = &buf[n..],
208
+ Err(e) if e.kind() == std::io::ErrorKind::Interrupted => {}
209
+ Err(e) => return Err(e),
210
+ }
211
+ }
212
+ w.flush()
213
+ }
214
+
176
215
  pub struct AuthenticatedUpstream {
177
216
  pub reader: BufReader<DeadlineStream>,
178
217
  pub writer: TcpStream,
179
218
  pub nonce: String,
180
219
  pub connection_generation: Option<String>,
220
+ /// Whether this very answer named the link WebSocket as on (verified; link_ws_advert).
221
+ pub link_ws_on: bool,
181
222
  }
182
223
 
183
224
  fn url_encode_component(s: &str) -> String {
@@ -210,6 +251,16 @@ pub fn open_authenticated_upstream(
210
251
  )
211
252
  }
212
253
 
254
+ /// The Home leg of a link WebSocket (link_ws.rs): a data preflight on one connection, bounded by one
255
+ /// setup deadline and cancellable by stop.
256
+ pub(crate) fn open_link_ws_upstream(
257
+ tunnel_port: u16,
258
+ creds: &RelayCredentials,
259
+ limits: RequestLimits<'_>,
260
+ ) -> Result<AuthenticatedUpstream, UpstreamError> {
261
+ open_authenticated_upstream_with(tunnel_port, creds, false, limits)
262
+ }
263
+
213
264
  fn open_authenticated_upstream_with(
214
265
  tunnel_port: u16,
215
266
  creds: &RelayCredentials,
@@ -238,6 +289,8 @@ fn open_authenticated_upstream_with(
238
289
  let challenge =
239
290
  create_relay_challenge(&creds.token_fingerprint, &creds.api_key_id, &creds.link_id)
240
291
  .map_err(UpstreamError::RelayAuthFailed)?;
292
+ // Taken before the preflight is written: it orders this answer's link WebSocket state.
293
+ let preflight_seq = crate::link_ws_advert::next_preflight();
241
294
 
242
295
  let target = format!(
243
296
  "{LINK_RELAY_AUTH_PATH}?version={LINK_RELAY_AUTH_VERSION}&key={}&link={}&nonce={}&proof={}",
@@ -254,10 +307,20 @@ fn open_authenticated_upstream_with(
254
307
  preflight.push_str(&format!("{LINK_RELAY_PROBE_HEADER}: 1\r\n"));
255
308
  }
256
309
  preflight.push_str("\r\n");
257
- writer
258
- .write_all(preflight.as_bytes())
259
- .and_then(|()| writer.flush())
260
- .map_err(|e| UpstreamError::HomeUnreachable(format!("preflight write failed: {e}")))?;
310
+ // With a whole-request deadline every write call gets only the time left; without one, as before.
311
+ match limits.deadline {
312
+ Some(deadline) => write_all_before(
313
+ &mut writer,
314
+ preflight.as_bytes(),
315
+ deadline,
316
+ AUTH_TIMEOUT,
317
+ &Instant::now,
318
+ ),
319
+ None => writer
320
+ .write_all(preflight.as_bytes())
321
+ .and_then(|()| writer.flush()),
322
+ }
323
+ .map_err(|e| UpstreamError::HomeUnreachable(format!("preflight write failed: {e}")))?;
261
324
 
262
325
  let resp = read_response_head(&mut reader).map_err(|e| match e {
263
326
  FramingError::Eof => {
@@ -310,18 +373,27 @@ fn open_authenticated_upstream_with(
310
373
  verified_gen = Some(gen_val.to_owned());
311
374
  }
312
375
  }
376
+ let link_ws_on = crate::link_ws_advert::answer_is_on(
377
+ &resp.headers,
378
+ &creds.token_fingerprint,
379
+ &creds.api_key_id,
380
+ &creds.link_id,
381
+ &challenge.nonce,
382
+ );
383
+ crate::link_ws_advert::apply(&creds.link_id, preflight_seq, link_ws_on);
313
384
 
314
385
  Ok(AuthenticatedUpstream {
315
386
  reader,
316
387
  writer,
317
388
  nonce: challenge.nonce,
318
389
  connection_generation: verified_gen,
390
+ link_ws_on,
319
391
  })
320
392
  }
321
393
 
322
394
  /// Request head carrying the link token, built in one allocation of its final size so no
323
395
  /// partial copy is left behind, and wiped on drop.
324
- fn token_request_head(
396
+ pub(crate) fn token_request_head(
325
397
  before: &str,
326
398
  auth_kind: RelayAuthKind,
327
399
  token: &[u8],
@@ -658,32 +730,55 @@ fn serve_foreground_inner(
658
730
  continue;
659
731
  }
660
732
  let control_shared = Arc::clone(&shared);
661
- let control_count = Arc::clone(&control_active);
733
+ let control_slot = ControlSlot(Arc::clone(&control_active));
662
734
  thread::spawn(move || {
735
+ // Returned however the thread ends, a panic included.
736
+ let _slot = control_slot;
663
737
  let _ = handle_client_connection(
664
738
  client_stream,
665
739
  &control_shared,
666
740
  ConnectionMode::ControlOnly,
667
741
  );
668
- control_count.fetch_sub(1, Ordering::SeqCst);
669
742
  });
670
743
  continue;
671
744
  }
672
745
  let worker_shared = Arc::clone(&shared);
746
+ let permit = WorkerPermit(sem_clone);
673
747
  thread::spawn(move || {
748
+ // Returned however the worker ends, a panic included, so a panic never shrinks the pool.
749
+ let _permit = permit;
674
750
  let _ = handle_client_connection(client_stream, &worker_shared, ConnectionMode::Full);
675
- let (lock, cv) = &*sem_clone;
676
- let mut active = lock.lock().unwrap_or_else(|e| e.into_inner());
677
- *active = active.saturating_sub(1);
678
- cv.notify_one();
679
751
  });
680
752
  }
681
753
 
682
754
  shared.signal_shutdown();
755
+ // Link WebSocket sockets close (1001, best effort) and are shut down within the close bound.
756
+ crate::link_ws::stop_all();
683
757
  let _ = parity_handle.join();
684
758
  Ok(())
685
759
  }
686
760
 
761
+ /// One of the `MAX_CONCURRENT_WORKERS` admissions, returned when the worker thread ends.
762
+ struct WorkerPermit(Arc<(Mutex<usize>, Condvar)>);
763
+
764
+ impl Drop for WorkerPermit {
765
+ fn drop(&mut self) {
766
+ let (lock, cv) = &*self.0;
767
+ let mut active = lock.lock().unwrap_or_else(|e| e.into_inner());
768
+ *active = active.saturating_sub(1);
769
+ cv.notify_one();
770
+ }
771
+ }
772
+
773
+ /// One of the `MAX_CONTROL_CONNECTIONS` control slots, returned when the control thread ends.
774
+ struct ControlSlot(Arc<AtomicUsize>);
775
+
776
+ impl Drop for ControlSlot {
777
+ fn drop(&mut self) {
778
+ self.0.fetch_sub(1, Ordering::SeqCst);
779
+ }
780
+ }
781
+
687
782
  fn run_parity_loop(shared: Arc<SharedServerState>) {
688
783
  let backoffs_ms: [u64; 5] = [2_000, 5_000, 15_000, 30_000, 60_000];
689
784
  let mut failures = 0usize;
@@ -909,13 +1004,18 @@ fn handle_client_connection(
909
1004
  &[],
910
1005
  br#"{"error":{"message":"cross-origin data-plane request blocked","type":"invalid_request_error","code":"origin_rejected"}}"#,
911
1006
  ),
912
- RouteDecision::Reject426Websocket => write_json_response(
913
- &mut writer,
914
- 426,
915
- "Upgrade Required",
916
- &[],
917
- br#"{"error":{"message":"Responses WebSocket transport is disabled; use HTTP","type":"invalid_request_error","code":"upgrade_required"}}"#,
918
- ),
1007
+ RouteDecision::Reject426Websocket => {
1008
+ // The link WebSocket is tried only with ocx-child's gate open and the Home's "on" applied for
1009
+ // the current link; otherwise today's 426, with no network I/O.
1010
+ if crate::link_ws_advert::gate_open()
1011
+ && let StateReadOutcome::Valid(st) = read_child_state(&shared.paths.state_file)
1012
+ && let Ok(creds) = shared.load_live_creds()
1013
+ && crate::link_ws_advert::advertised(&creds.link_id)
1014
+ {
1015
+ return crate::link_ws::serve(&mut reader, &mut writer, &req, st.tunnel_port, creds);
1016
+ }
1017
+ crate::link_ws::write_upgrade_required(&mut writer)
1018
+ }
919
1019
  RouteDecision::Reject404 => {
920
1020
  write_json_response(&mut writer, 404, "Not Found", &[], br#"{"error":"not_found"}"#)
921
1021
  }
@@ -1286,3 +1386,34 @@ fn relay_request(
1286
1386
  let _ = stream_upstream_to_chunked_client(&mut upstream.reader, client_writer, up_framing, cap);
1287
1387
  Ok(())
1288
1388
  }
1389
+
1390
+ #[cfg(test)]
1391
+ mod worker_permit_tests {
1392
+ use super::*;
1393
+
1394
+ #[test]
1395
+ fn a_worker_that_panics_still_returns_its_admission_permit() {
1396
+ let sem = Arc::new((Mutex::new(1usize), Condvar::new()));
1397
+ let permit = WorkerPermit(Arc::clone(&sem));
1398
+ let joined = thread::spawn(move || {
1399
+ let _permit = permit;
1400
+ panic!("panic injected by a test");
1401
+ })
1402
+ .join();
1403
+ assert!(joined.is_err());
1404
+ assert_eq!(*sem.0.lock().unwrap_or_else(|e| e.into_inner()), 0);
1405
+ }
1406
+
1407
+ #[test]
1408
+ fn a_control_thread_that_panics_still_returns_its_slot() {
1409
+ let count = Arc::new(AtomicUsize::new(1));
1410
+ let slot = ControlSlot(Arc::clone(&count));
1411
+ let joined = thread::spawn(move || {
1412
+ let _slot = slot;
1413
+ panic!("panic injected by a test");
1414
+ })
1415
+ .join();
1416
+ assert!(joined.is_err());
1417
+ assert_eq!(count.load(Ordering::SeqCst), 0);
1418
+ }
1419
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bitkyc08/opencodex",
3
- "version": "2.100.2",
3
+ "version": "2.100.3",
4
4
  "description": "Universal provider proxy for OpenAI Codex & Claude Code — use any LLM with Codex CLI/App/SDK and Claude Code",
5
5
  "type": "module",
6
6
  "main": "./bin/package-main.mjs",
@@ -70,7 +70,7 @@
70
70
  "build:remote-workspace-helper": "cargo build --release --locked --manifest-path native/remote-workspace-helper/Cargo.toml",
71
71
  "test:remote-workspace-helper": "cargo test --locked --manifest-path native/remote-workspace-helper/Cargo.toml",
72
72
  "build:ocx-child": "cargo build --release --locked --manifest-path native/ocx-child/Cargo.toml",
73
- "test:ocx-child": "cargo test --locked --manifest-path native/ocx-child/Cargo.toml",
73
+ "test:ocx-child": "cargo test --locked --manifest-path native/ocx-child/Cargo.toml && cargo test --locked --manifest-path native/ocx-child/Cargo.toml --features link-ws-test-gate",
74
74
  "build:standalone": "bun scripts/build-standalone.ts",
75
75
  "test:macos": "swift run --package-path app MenuBarCoreTests",
76
76
  "prepare:package": "bun scripts/prepare-package.ts",
@@ -136,5 +136,5 @@
136
136
  "url": "https://github.com/lidge-jun/opencodex/issues"
137
137
  },
138
138
  "license": "MIT",
139
- "gitHead": "61147ec681bc8374d350e0eae08b71c117c6df30"
139
+ "gitHead": "873ec9b3b8ddf63f06738748d9132d779abefb42"
140
140
  }