@bitkyc08/opencodex 2.100.1 → 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 (624) 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-BV4ms9U9.js +1 -0
  6. package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/index-DQtCRNAw.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.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-BedmOsE7.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-Dy5_wfTT.js +1 -0
  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 +6 -4
  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/native-exec.ts +3 -2
  38. package/src/adapters/cursor/protobuf-request.ts +8 -8
  39. package/src/adapters/cursor/tool-guidance.ts +3 -3
  40. package/src/adapters/cursor/tool-wording.ts +10 -1
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
  43. package/src/adapters/google-antigravity-wire.ts +15 -6
  44. package/src/adapters/google-truncation.ts +4 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +17 -4
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/openai-chat/tool-schema.ts +9 -0
  54. package/src/adapters/openai-responses/tool-schema.ts +18 -4
  55. package/src/adapters/run-turn-queue.ts +139 -5
  56. package/src/adapters/upstream-http-error.ts +4 -2
  57. package/src/adapters/zed.ts +3 -0
  58. package/src/advisor/consult.ts +15 -4
  59. package/src/advisor/context.ts +12 -3
  60. package/src/advisor/runtime.ts +35 -5
  61. package/src/advisor/settings.ts +8 -0
  62. package/src/advisor/synthetic-tool.ts +21 -8
  63. package/src/bridge/response-json.ts +11 -2
  64. package/src/bridge/sse.ts +51 -9
  65. package/src/claude/auth-detect.ts +21 -33
  66. package/src/claude/chat-tool-dispatch.ts +233 -0
  67. package/src/claude/desktop-3p.ts +11 -5
  68. package/src/claude/desktop-gateway-state.ts +2 -0
  69. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  70. package/src/claude/desktop-remote-store.ts +24 -4
  71. package/src/claude/inbound-content-options.ts +31 -16
  72. package/src/claude/inbound-tool-loading.ts +42 -17
  73. package/src/claude/outbound.ts +13 -3
  74. package/src/cli/account-api.ts +23 -1
  75. package/src/cli/account-auth.ts +54 -21
  76. package/src/cli/account-extended.ts +60 -6
  77. package/src/cli/account-key-quota.ts +56 -7
  78. package/src/cli/account.ts +5 -3
  79. package/src/cli/advisor.ts +7 -4
  80. package/src/cli/alias.ts +38 -1
  81. package/src/cli/capabilities-access-remote.ts +137 -2
  82. package/src/cli/capabilities-accounts.ts +3 -3
  83. package/src/cli/capabilities-agents-routing.ts +17 -10
  84. package/src/cli/capabilities-base.ts +43 -18
  85. package/src/cli/capabilities-integrations.ts +2 -2
  86. package/src/cli/capabilities-provider-models.ts +18 -2
  87. package/src/cli/capabilities-route-to.ts +43 -0
  88. package/src/cli/capabilities.ts +2 -0
  89. package/src/cli/capability-contracts.ts +1 -1
  90. package/src/cli/claude-desktop.ts +30 -11
  91. package/src/cli/claude.ts +36 -17
  92. package/src/cli/codex-launcher.ts +3 -1
  93. package/src/cli/codex-shim-autorestore.ts +5 -42
  94. package/src/cli/config-command.ts +38 -2
  95. package/src/cli/config-root-startup.ts +34 -0
  96. package/src/cli/connect.ts +124 -19
  97. package/src/cli/desktop-runtime-guidance.ts +1 -1
  98. package/src/cli/disconnect-runtime.ts +168 -0
  99. package/src/cli/dispatch.ts +54 -12
  100. package/src/cli/export-command.ts +1 -1
  101. package/src/cli/gui-pair-client.ts +29 -5
  102. package/src/cli/gui.ts +10 -5
  103. package/src/cli/help-catalog.ts +11 -0
  104. package/src/cli/help.ts +5 -4
  105. package/src/cli/hub.ts +18 -1
  106. package/src/cli/index.ts +83 -92
  107. package/src/cli/inspect.ts +11 -2
  108. package/src/cli/integrations.ts +26 -1
  109. package/src/cli/link-capture.ts +64 -0
  110. package/src/cli/link-child-ops.ts +314 -0
  111. package/src/cli/link-cleanup.ts +8 -5
  112. package/src/cli/link-diagnostics.ts +67 -0
  113. package/src/cli/link-enrollment.ts +158 -12
  114. package/src/cli/link-operations.ts +52 -0
  115. package/src/cli/link-recover.ts +152 -0
  116. package/src/cli/link-routes.ts +87 -0
  117. package/src/cli/link-status-child.ts +137 -0
  118. package/src/cli/link-status-traffic.ts +34 -0
  119. package/src/cli/link.ts +327 -37
  120. package/src/cli/message-command.ts +1 -1
  121. package/src/cli/message-mcp-command.ts +23 -10
  122. package/src/cli/models-runtime.ts +3 -3
  123. package/src/cli/opencode.ts +3 -1
  124. package/src/cli/pi-sync.ts +35 -0
  125. package/src/cli/preflight-exemptions.ts +46 -0
  126. package/src/cli/registry.ts +29 -12
  127. package/src/cli/restart-failure.ts +5 -2
  128. package/src/cli/root.ts +5 -1
  129. package/src/cli/route-to.ts +172 -0
  130. package/src/cli/runtime-api.ts +5 -8
  131. package/src/cli/status.ts +3 -1
  132. package/src/cli/stop-approval.ts +66 -19
  133. package/src/cli/stop-report.ts +23 -0
  134. package/src/cli/stop-windows-checked.ts +304 -0
  135. package/src/cli/sync-command.ts +70 -13
  136. package/src/cli/sync-fanout.ts +81 -99
  137. package/src/cli/sync-flags.ts +40 -3
  138. package/src/cli/sync-link-status.ts +18 -2
  139. package/src/cli/sync-update-guard.ts +7 -2
  140. package/src/cli/system-restart-client.ts +3 -2
  141. package/src/cli/uninstall-plan.ts +77 -5
  142. package/src/cli/uninstall-stop.ts +152 -0
  143. package/src/cli/v2-input.ts +10 -6
  144. package/src/cli/v2-local-output.ts +3 -2
  145. package/src/cli/v2-runtime.ts +10 -3
  146. package/src/cli/v2.ts +22 -7
  147. package/src/client/connect.ts +321 -34
  148. package/src/client/link-home-features.ts +27 -0
  149. package/src/client/link-home.ts +92 -4
  150. package/src/client/link-ingress.ts +21 -3
  151. package/src/client/link-join.ts +12 -2
  152. package/src/client/link-parity-reporter.ts +60 -6
  153. package/src/client/link-readiness.ts +16 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel-status.ts +76 -0
  161. package/src/client/link-tunnel.ts +56 -5
  162. package/src/client/link-websocket-limits.ts +89 -0
  163. package/src/client/link-websocket.ts +586 -0
  164. package/src/client/link-ws-advertisement.ts +100 -0
  165. package/src/client/link-ws-framer.ts +241 -0
  166. package/src/client/link-ws-transport.ts +177 -0
  167. package/src/client/machine-api.ts +13 -2
  168. package/src/client/machine-listener.ts +48 -7
  169. package/src/client/route-intent-apply.ts +293 -0
  170. package/src/client/route-intent-file-originals.ts +97 -0
  171. package/src/client/route-intent-native-originals.ts +201 -0
  172. package/src/client/route-intent-watch.ts +141 -0
  173. package/src/client/runtime-restart.ts +127 -5
  174. package/src/client/runtime.ts +61 -15
  175. package/src/client/state.ts +30 -0
  176. package/src/client/sync-expectation.ts +36 -2
  177. package/src/client/sync-runtime.ts +7 -0
  178. package/src/clients/config-export/alias-selectors.ts +63 -40
  179. package/src/clients/config-export/contracts.ts +2 -0
  180. package/src/clients/config-export/nested-selectors.ts +42 -0
  181. package/src/clients/config-export.ts +36 -4
  182. package/src/codex/account-resume-health.ts +41 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/login-flow.ts +6 -0
  187. package/src/codex/auth-api/routes.ts +35 -2
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +21 -6
  190. package/src/codex/catalog/gather-capture.ts +10 -2
  191. package/src/codex/catalog/parsing.ts +7 -3
  192. package/src/codex/catalog/provider-models.ts +67 -23
  193. package/src/codex/catalog/retained-sync.ts +2 -1
  194. package/src/codex/catalog/routed-gather.ts +1 -1
  195. package/src/codex/catalog-auto-refresh.ts +11 -0
  196. package/src/codex/cli-update-job.ts +35 -13
  197. package/src/codex/convergence-types.ts +2 -0
  198. package/src/codex/convergence.ts +2 -2
  199. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  200. package/src/codex/features.ts +2 -2
  201. package/src/codex/history-provider.ts +31 -0
  202. package/src/codex/inject/multi-agent-v2.ts +9 -3
  203. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  204. package/src/codex/inject/plan.ts +20 -2
  205. package/src/codex/inject.ts +2 -0
  206. package/src/codex/journal-config-restore.ts +217 -0
  207. package/src/codex/journal.ts +75 -6
  208. package/src/codex/main-account.ts +23 -30
  209. package/src/codex/native-main-auth-file.ts +104 -0
  210. package/src/codex/native-profile-manager.ts +4 -3
  211. package/src/codex/native-profile-store.ts +3 -61
  212. package/src/codex/orca-import.ts +10 -1
  213. package/src/codex/quota-history.ts +13 -0
  214. package/src/codex/quota-window-conflict.ts +103 -0
  215. package/src/codex/quota.ts +134 -7
  216. package/src/codex/subagent-model-fallback.ts +3 -1
  217. package/src/codex/websocket-activity.ts +171 -16
  218. package/src/codex/websocket-registry.ts +11 -4
  219. package/src/combos/cooldown-store.ts +228 -0
  220. package/src/combos/failover.ts +760 -35
  221. package/src/config/dashboard-trusted-proxy.ts +83 -0
  222. package/src/config/diagnostics.ts +28 -0
  223. package/src/config/feature-flags.ts +9 -0
  224. package/src/config/live-reconcile.ts +10 -1
  225. package/src/config/load-degrade.ts +12 -1
  226. package/src/config/multi-agent-surface.ts +28 -5
  227. package/src/config/pending-teardown.ts +60 -3
  228. package/src/config/process-state.ts +175 -4
  229. package/src/config/provider-validation.ts +4 -4
  230. package/src/config/salvage.ts +1 -0
  231. package/src/config/schema/config-schema.ts +12 -3
  232. package/src/config/schema/leaf-validators.ts +43 -14
  233. package/src/config/windows-process-command-line.ts +107 -0
  234. package/src/generated/compatibility-version.json +1077 -429
  235. package/src/generated/model-metadata.ts +1 -1
  236. package/src/images/loop.ts +3 -0
  237. package/src/integrations/model-name-guard.ts +25 -0
  238. package/src/integrations/route-intent-catalog.ts +26 -0
  239. package/src/integrations/route-intent-connected.ts +262 -0
  240. package/src/integrations/route-intent-contract.ts +55 -0
  241. package/src/integrations/route-intent-disconnect.ts +109 -0
  242. package/src/integrations/route-intent-initial.ts +64 -0
  243. package/src/integrations/route-intent-state.ts +117 -0
  244. package/src/integrations/route-intent-tick.ts +65 -0
  245. package/src/integrations/route-intent.ts +212 -0
  246. package/src/integrations/writer.ts +44 -11
  247. package/src/lib/catalog-etag.ts +10 -0
  248. package/src/lib/client-error-body.ts +15 -0
  249. package/src/lib/client-retry-after.ts +29 -0
  250. package/src/lib/config-ownership.ts +13 -0
  251. package/src/lib/context-overflow-verdict.ts +266 -9
  252. package/src/lib/desktop-gui-origin.ts +28 -0
  253. package/src/lib/errors.ts +1 -1
  254. package/src/lib/failure-detail.ts +72 -3
  255. package/src/lib/gui-pair-capability.ts +2 -1
  256. package/src/lib/hard-refusal.ts +259 -0
  257. package/src/lib/messages-error-body.ts +4 -1
  258. package/src/lib/outbound-credential-registry.ts +362 -4
  259. package/src/lib/paced-stream.ts +34 -0
  260. package/src/lib/passive-key-fetch-proof.ts +30 -0
  261. package/src/lib/passive-read.ts +5 -0
  262. package/src/lib/process-control.ts +76 -12
  263. package/src/lib/redact.ts +84 -8
  264. package/src/lib/state-store-registrations.ts +11 -0
  265. package/src/lib/state-store-sweeper.ts +4 -0
  266. package/src/lib/supervisor-markers.ts +18 -0
  267. package/src/lib/terminal-safe-text.ts +58 -0
  268. package/src/lib/translator-budget.ts +3 -2
  269. package/src/lib/upstream-retry.ts +14 -4
  270. package/src/link/alias-lock.ts +119 -0
  271. package/src/link/child-activity.ts +83 -0
  272. package/src/link/child-binary-cache-fill.d.mts +50 -0
  273. package/src/link/child-binary-cache-fill.mjs +494 -0
  274. package/src/link/child-binary-cache-start.ts +73 -0
  275. package/src/link/child-binary-source.ts +12 -5
  276. package/src/link/child-catalog-freshness.ts +149 -0
  277. package/src/link/child-gated-ocx.ts +135 -0
  278. package/src/link/child-observations.ts +206 -0
  279. package/src/link/child-observe.ts +121 -0
  280. package/src/link/child-ops-engine.ts +230 -0
  281. package/src/link/child-ops-host.ts +138 -0
  282. package/src/link/child-ops-runners.ts +319 -0
  283. package/src/link/child-ops-scheduler.ts +207 -0
  284. package/src/link/child-ops-types.ts +89 -0
  285. package/src/link/child-parity.ts +23 -4
  286. package/src/link/child-policy.ts +93 -0
  287. package/src/link/child-update-contract.ts +174 -0
  288. package/src/link/codex-settings.ts +1 -1
  289. package/src/link/compatibility.ts +18 -1
  290. package/src/link/diagnostics-read.ts +163 -0
  291. package/src/link/diagnostics.ts +20 -7
  292. package/src/link/explicit-route.ts +209 -0
  293. package/src/link/link-recover.ts +113 -0
  294. package/src/link/management-routes.ts +3 -1
  295. package/src/link/operation-recovery-slot.ts +44 -0
  296. package/src/link/operations-journal.ts +408 -0
  297. package/src/link/paths.ts +5 -0
  298. package/src/link/peer-report.ts +1 -1
  299. package/src/link/relay-auth.ts +14 -0
  300. package/src/link/remote-plant.ts +152 -14
  301. package/src/link/remote-platform.ts +21 -10
  302. package/src/link/remote-probe.ts +11 -3
  303. package/src/link/remote-windows.ts +88 -12
  304. package/src/link/request-compression.ts +30 -0
  305. package/src/link/residual-recovery.ts +54 -0
  306. package/src/link/retirement.ts +128 -0
  307. package/src/link/route-intent-watch.ts +41 -0
  308. package/src/link/route-intent.ts +209 -0
  309. package/src/link/route-proof.ts +82 -0
  310. package/src/link/route-rounds.ts +579 -0
  311. package/src/link/route-select.ts +95 -0
  312. package/src/link/route-trust.ts +96 -0
  313. package/src/link/ssh-argv.ts +285 -43
  314. package/src/link/ssh-capture-redact.ts +253 -0
  315. package/src/link/ssh-capture.ts +497 -0
  316. package/src/link/ssh-runner.ts +141 -14
  317. package/src/link/status-projection.ts +160 -0
  318. package/src/link/store.ts +54 -1
  319. package/src/link/supervisor.ts +543 -55
  320. package/src/link/sync-fanout-classify.ts +114 -0
  321. package/src/link/sync-then-restart.ts +65 -0
  322. package/src/link/tombstones.ts +209 -0
  323. package/src/link/traffic.ts +178 -0
  324. package/src/link/tunnel-state.ts +10 -4
  325. package/src/link/ws-activity-holds.ts +474 -0
  326. package/src/local-credentials/publication-fence.ts +20 -1
  327. package/src/messaging/mcp-queue-rpc.ts +3 -2
  328. package/src/messaging/mcp-queue-server.ts +21 -1
  329. package/src/messaging/mcp-reply-tools.ts +24 -9
  330. package/src/messaging/mcp-reply-wait.ts +70 -0
  331. package/src/messaging/mcp-resume-tools.ts +25 -0
  332. package/src/messaging/remote-enrollment.ts +3 -3
  333. package/src/messaging/remote-tunnels.ts +2 -2
  334. package/src/messaging/resume-permissions.ts +27 -0
  335. package/src/messaging/rpc.ts +46 -2
  336. package/src/oauth/account-resume-health.ts +60 -0
  337. package/src/oauth/anthropic-continuity.ts +23 -7
  338. package/src/oauth/anthropic-routing.ts +5 -2
  339. package/src/oauth/anthropic.ts +22 -2
  340. package/src/oauth/claude-keychain-read.ts +78 -68
  341. package/src/oauth/index.ts +25 -6
  342. package/src/oauth/local-token-detect.ts +8 -29
  343. package/src/oauth/login-cli-errors.ts +5 -1
  344. package/src/oauth/login-cli.ts +33 -18
  345. package/src/oauth/login-flow-state.ts +26 -3
  346. package/src/oauth/meta-muse.ts +1 -1
  347. package/src/oauth/store.ts +51 -1
  348. package/src/oauth/xai.ts +248 -14
  349. package/src/protocols/contract.ts +4 -0
  350. package/src/protocols/encoders/messages.ts +1 -0
  351. package/src/providers/alias-template.ts +48 -0
  352. package/src/providers/anthropic-billing-ownership.ts +2 -0
  353. package/src/providers/anthropic-output-caps.ts +46 -0
  354. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  355. package/src/providers/antigravity-effort-families.ts +11 -3
  356. package/src/providers/antigravity-models.ts +32 -9
  357. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  358. package/src/providers/api-key-pause-state.ts +23 -0
  359. package/src/providers/api-key-pause.ts +71 -10
  360. package/src/providers/api-key-resolve.ts +49 -7
  361. package/src/providers/api-key-response-ownership.ts +2 -0
  362. package/src/providers/api-key-selection-capture.ts +3 -1
  363. package/src/providers/api-key-selection.ts +54 -11
  364. package/src/providers/api-keys.ts +24 -7
  365. package/src/providers/cache-affinity-identity.ts +73 -0
  366. package/src/providers/cache-affinity.ts +256 -0
  367. package/src/providers/claude-cli-usage-state.ts +11 -6
  368. package/src/providers/claude-cli-usage.ts +27 -9
  369. package/src/providers/codex-capacity.ts +11 -2
  370. package/src/providers/default-aliases.ts +98 -20
  371. package/src/providers/google-vertex-model-discovery.ts +510 -0
  372. package/src/providers/key-failover.ts +136 -14
  373. package/src/providers/key-store.ts +3 -3
  374. package/src/providers/kiro-models.ts +3 -5
  375. package/src/providers/label.ts +31 -5
  376. package/src/providers/mistral-transport.ts +17 -4
  377. package/src/providers/model-discovery-config.ts +31 -0
  378. package/src/providers/model-discovery-diagnostic.ts +34 -3
  379. package/src/providers/model-discovery.ts +43 -7
  380. package/src/providers/model-rename-fields.ts +5 -0
  381. package/src/providers/muse-key-quota.ts +14 -6
  382. package/src/providers/new-model-policy-runtime.ts +17 -4
  383. package/src/providers/new-model-policy.ts +30 -4
  384. package/src/providers/openai-sidecar.ts +15 -2
  385. package/src/providers/passive-key-observation.ts +252 -0
  386. package/src/providers/provider-id-rewrite.ts +3 -0
  387. package/src/providers/quota/account-cache.ts +53 -34
  388. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  389. package/src/providers/quota/anthropic-usage-windows.ts +19 -9
  390. package/src/providers/quota/passive-key-limits.ts +272 -0
  391. package/src/providers/quota/passive-wire-model.ts +126 -0
  392. package/src/providers/quota/report-cache.ts +112 -5
  393. package/src/providers/quota/vendor-probes-key.ts +73 -0
  394. package/src/providers/quota/vendor-probes-oauth.ts +57 -3
  395. package/src/providers/quota-key-accounts.ts +22 -10
  396. package/src/providers/quota-mistral-budget.ts +18 -0
  397. package/src/providers/quota-types.ts +43 -0
  398. package/src/providers/quota.ts +31 -32
  399. package/src/providers/reasoning-metadata.ts +1051 -12
  400. package/src/providers/registry/entries-core.ts +34 -16
  401. package/src/providers/registry/entries-extended.ts +32 -0
  402. package/src/providers/registry/model-seeds.ts +35 -0
  403. package/src/providers/resolved-model-policy.ts +7 -0
  404. package/src/providers/routed-config.ts +8 -3
  405. package/src/providers/xai-transport.ts +3 -0
  406. package/src/quota/reset-observer.ts +4 -2
  407. package/src/quota/reset-seen-store.ts +9 -0
  408. package/src/quota/window-mapping.ts +1 -0
  409. package/src/quota-pool/assemble.ts +4 -1
  410. package/src/remote/features.ts +17 -0
  411. package/src/responses/anthropic-progress.ts +10 -4
  412. package/src/responses/citation-markers.ts +231 -0
  413. package/src/responses/hosted-tool-policy.ts +56 -12
  414. package/src/responses/spill-store.ts +5 -1
  415. package/src/responses/state/replay-input.ts +50 -0
  416. package/src/responses/state/replay-owner.ts +24 -0
  417. package/src/responses/state/snapshot-codec.ts +9 -0
  418. package/src/responses/state/spill-queue.ts +1 -0
  419. package/src/responses/state.ts +42 -60
  420. package/src/router.ts +4 -2
  421. package/src/routing/home-route-capture.ts +123 -0
  422. package/src/routing/home-route-intent.ts +200 -0
  423. package/src/routing/route-intent-state.ts +178 -0
  424. package/src/routing/route-to-live-settings.ts +35 -0
  425. package/src/routing/route-to-local.ts +145 -0
  426. package/src/routing/route-to-status.ts +94 -0
  427. package/src/routing/route-to-sync-child.ts +32 -0
  428. package/src/server/adapter-resolve.ts +21 -1
  429. package/src/server/admitted-http-turn.ts +3 -0
  430. package/src/server/auth-cors.ts +109 -8
  431. package/src/server/bare-upstream-error.ts +220 -0
  432. package/src/server/catalog-download.ts +3 -5
  433. package/src/server/chat-native.ts +25 -7
  434. package/src/server/claude-messages.ts +8 -5
  435. package/src/server/codex-model-list.ts +2 -1
  436. package/src/server/configured-credentials.ts +37 -5
  437. package/src/server/gui-desktop-authorization.ts +36 -0
  438. package/src/server/gui-pair-delivery.ts +6 -3
  439. package/src/server/gui-session.ts +10 -1
  440. package/src/server/images.ts +41 -13
  441. package/src/server/inbound-body-admission.ts +17 -4
  442. package/src/server/index/link-listener.ts +203 -11
  443. package/src/server/index/link-management.ts +15 -1
  444. package/src/server/index/link-relay-sessions.ts +128 -8
  445. package/src/server/index/link-websocket-limits.ts +136 -0
  446. package/src/server/index/link-websocket.ts +692 -0
  447. package/src/server/index/optional-listeners.ts +115 -7
  448. package/src/server/index/route-intent-watch.ts +47 -0
  449. package/src/server/index/serve-contract.ts +86 -0
  450. package/src/server/index/serve-options.ts +35 -86
  451. package/src/server/index/startup-warnings.ts +8 -2
  452. package/src/server/index/websocket-handler.ts +26 -4
  453. package/src/server/index.ts +12 -2
  454. package/src/server/inference/client-encoder-delivery.ts +2 -0
  455. package/src/server/inspection-tee.ts +39 -2
  456. package/src/server/lifecycle.ts +2 -0
  457. package/src/server/link-turn.ts +137 -0
  458. package/src/server/management/advisor-routes.ts +10 -2
  459. package/src/server/management/agent-settings-routes.ts +50 -16
  460. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  461. package/src/server/management/config-routes.ts +7 -1
  462. package/src/server/management/context.ts +9 -2
  463. package/src/server/management/desktop-authorization.ts +41 -0
  464. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  465. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  466. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  467. package/src/server/management/home-integration-decision.ts +89 -0
  468. package/src/server/management/integration-routes.ts +208 -81
  469. package/src/server/management/link-child-ops-routes.ts +218 -0
  470. package/src/server/management/link-child-preflight.ts +31 -0
  471. package/src/server/management/link-diagnostics-route.ts +29 -0
  472. package/src/server/management/link-enrollment.ts +199 -47
  473. package/src/server/management/link-operation.ts +609 -0
  474. package/src/server/management/link-recover-route.ts +103 -0
  475. package/src/server/management/link-route-edit.ts +173 -0
  476. package/src/server/management/link-route-request.ts +62 -0
  477. package/src/server/management/link-route-state.ts +92 -6
  478. package/src/server/management/link-routes.ts +563 -51
  479. package/src/server/management/link-traffic-status.ts +13 -0
  480. package/src/server/management/model-routes.ts +122 -36
  481. package/src/server/management/model-rows.ts +2 -1
  482. package/src/server/management/native-integration-routes.ts +176 -70
  483. package/src/server/management/oauth-account-routes.ts +69 -17
  484. package/src/server/management/protocol-routes.ts +7 -0
  485. package/src/server/management/provider-completion-test.ts +4 -4
  486. package/src/server/management/provider-overwrite-carry.ts +39 -3
  487. package/src/server/management/provider-routes.ts +80 -72
  488. package/src/server/management/provider-routing-quota.ts +45 -0
  489. package/src/server/management/route-registry.ts +25 -3
  490. package/src/server/management/route-to-routes.ts +257 -0
  491. package/src/server/management/system-restart.ts +4 -2
  492. package/src/server/management/usage-aggregate-cache.ts +101 -66
  493. package/src/server/management-api.ts +17 -3
  494. package/src/server/management-auth.ts +13 -1
  495. package/src/server/messages-native-preflight.ts +27 -4
  496. package/src/server/messages-native.ts +22 -5
  497. package/src/server/persistent-gui-session.ts +6 -3
  498. package/src/server/proxy-liveness.ts +33 -6
  499. package/src/server/relay-eager.ts +36 -12
  500. package/src/server/relay.ts +183 -116
  501. package/src/server/request-body-facts.ts +48 -0
  502. package/src/server/request-decompress.ts +65 -2
  503. package/src/server/request-log-account-rotation.ts +6 -0
  504. package/src/server/request-log-attempt-usage.ts +69 -0
  505. package/src/server/request-log-cache-affinity.ts +60 -0
  506. package/src/server/request-log-conversation.ts +45 -2
  507. package/src/server/request-log-failure-detail.ts +59 -1
  508. package/src/server/request-log-terminal-status.ts +210 -24
  509. package/src/server/request-log.ts +71 -79
  510. package/src/server/responses/adapter-continuation.ts +2 -1
  511. package/src/server/responses/adapter-delivery.ts +2 -0
  512. package/src/server/responses/adapter-dispatch.ts +40 -51
  513. package/src/server/responses/advisor-plan-slot.ts +33 -1
  514. package/src/server/responses/advisor-question.ts +21 -0
  515. package/src/server/responses/advisor-slot.ts +10 -3
  516. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  517. package/src/server/responses/buffered-sse-json.ts +9 -3
  518. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  519. package/src/server/responses/codex-tool-catalog.ts +156 -0
  520. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  521. package/src/server/responses/combo-stream-preflight.ts +701 -81
  522. package/src/server/responses/compact.ts +47 -12
  523. package/src/server/responses/context-overflow.ts +58 -2
  524. package/src/server/responses/core-codex-account.ts +17 -3
  525. package/src/server/responses/core-combo-failure.ts +37 -4
  526. package/src/server/responses/core-combo-native.ts +3 -1
  527. package/src/server/responses/core-combo.ts +62 -7
  528. package/src/server/responses/core-errors.ts +8 -3
  529. package/src/server/responses/core-lifetime.ts +3 -2
  530. package/src/server/responses/core-normalize.ts +3 -1
  531. package/src/server/responses/core-opaque-recovery.ts +45 -2
  532. package/src/server/responses/core-options.ts +18 -0
  533. package/src/server/responses/core.ts +2 -0
  534. package/src/server/responses/fetch-helpers.ts +15 -10
  535. package/src/server/responses/native-replay-guard.ts +57 -0
  536. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  537. package/src/server/responses/outbound-request-body.ts +29 -0
  538. package/src/server/responses/passthrough-completion.ts +105 -8
  539. package/src/server/responses/passthrough-delivery.ts +31 -11
  540. package/src/server/responses/passthrough-dispatch.ts +99 -106
  541. package/src/server/responses/policy-fallback.ts +13 -1
  542. package/src/server/responses/request-prepare.ts +50 -6
  543. package/src/server/responses/request-transport.ts +53 -17
  544. package/src/server/responses/reset-replay.ts +104 -4
  545. package/src/server/responses/run-turn-execution.ts +58 -30
  546. package/src/server/responses/sidecar-execution.ts +14 -0
  547. package/src/server/responses/terminal-error-redaction.ts +222 -25
  548. package/src/server/responses/ws-upstream.ts +2 -2
  549. package/src/server/sse-payload-rewrite.ts +3 -2
  550. package/src/server/stop-service-route.ts +85 -0
  551. package/src/server/system-env-shell.ts +12 -1
  552. package/src/server/system-env.ts +5 -3
  553. package/src/server/windows-tcp-drop.ts +21 -4
  554. package/src/server/workflow-refusal.ts +8 -0
  555. package/src/server/ws-bridge.ts +191 -12
  556. package/src/service/cli-windows-stop.ts +189 -0
  557. package/src/service/cli.ts +41 -12
  558. package/src/service/disconnected-client-restart.ts +60 -0
  559. package/src/service/guarded-manager-target.ts +18 -1
  560. package/src/service/health.ts +99 -6
  561. package/src/service/launchd.ts +84 -31
  562. package/src/service/orchestration.ts +418 -91
  563. package/src/service/repair.ts +223 -6
  564. package/src/service/restart-proxy-stop.ts +79 -0
  565. package/src/service/service-child-ownership.ts +6 -2
  566. package/src/service/windows-checked-stop-live.ts +467 -0
  567. package/src/service/windows-checked-stop.ts +435 -0
  568. package/src/service/windows-command-line-token.ts +23 -0
  569. package/src/service/windows-guarded-manager.ts +77 -34
  570. package/src/service/windows-ops.ts +38 -56
  571. package/src/service/windows-process-evidence.ts +292 -0
  572. package/src/service/windows-process-native.ts +262 -0
  573. package/src/service/windows-service-stop.ts +321 -0
  574. package/src/service/windows-stop-binding.ts +187 -0
  575. package/src/service/windows-stop-budget.ts +123 -0
  576. package/src/service/windows-stop-confirm.ts +158 -0
  577. package/src/service/windows-stop-deadline.ts +56 -0
  578. package/src/service.ts +2 -2
  579. package/src/types/claude-tool-loading.ts +48 -0
  580. package/src/types/config.ts +47 -53
  581. package/src/types/link.ts +20 -0
  582. package/src/types/multi-agent.ts +13 -0
  583. package/src/types/provider.ts +68 -2
  584. package/src/types/request.ts +4 -0
  585. package/src/types.ts +4 -0
  586. package/src/update/guarded-runtime-ops.ts +5 -7
  587. package/src/update/index.ts +25 -10
  588. package/src/update/install-detection.mjs +3 -1
  589. package/src/update/job-pinned-start.ts +2 -0
  590. package/src/update/job-windows-restart.ts +19 -32
  591. package/src/update/job.ts +12 -5
  592. package/src/update/npm-install.d.mts +11 -0
  593. package/src/update/npm-install.mjs +44 -7
  594. package/src/update/orchestrated-entry.ts +1 -1
  595. package/src/update/orchestrated-node-driver.mjs +3 -2
  596. package/src/update/orchestrated-pnpm.d.mts +4 -0
  597. package/src/update/orchestrated-pnpm.mjs +50 -6
  598. package/src/update/orchestrated-session.d.mts +3 -1
  599. package/src/update/orchestrated-session.mjs +21 -6
  600. package/src/update/pnpm-global-install.d.mts +21 -3
  601. package/src/update/pnpm-global-install.mjs +322 -19
  602. package/src/update/pnpm-store-layout.mjs +46 -0
  603. package/src/update/sync-update-mutex.d.mts +3 -2
  604. package/src/update/sync-update-mutex.mjs +57 -8
  605. package/src/update/transactional-install.d.mts +3 -1
  606. package/src/update/transactional-install.mjs +545 -12
  607. package/src/update/windows-installer-marker.d.mts +1 -0
  608. package/src/update/windows-installer-marker.mjs +44 -0
  609. package/src/usage/expected-prices.ts +8 -0
  610. package/src/usage/filter-index.ts +326 -77
  611. package/src/usage/ledger-scanner.ts +15 -0
  612. package/src/usage/link-log-fields.ts +48 -0
  613. package/src/usage/log.ts +43 -2
  614. package/src/usage/request-body.ts +37 -0
  615. package/src/web-search/loop.ts +3 -0
  616. package/src/web-search/parse.ts +21 -2
  617. package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
  618. package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
  619. package/gui/dist/assets/index-Bziu8gTy.css +0 -2
  620. package/gui/dist/assets/index-OYzhQUNP.js +0 -94
  621. package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
  622. package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
  623. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
  624. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -24,10 +24,23 @@ function resultKey(type: string, id: string): string {
24
24
  return createHash("sha256").update(JSON.stringify([type, id])).digest("hex");
25
25
  }
26
26
 
27
+ function resultKeyOfItem(item: unknown): string | null {
28
+ if (!record(item) || typeof item.type !== "string") return null;
29
+ const id = item.type === "mcp_approval_response" ? item.approval_request_id : item.call_id;
30
+ if (typeof id !== "string" || id.length > MAX_RESULT_ID_LENGTH) return null;
31
+ return resultKey(item.type === "local_shell_call_output" ? "function_call_output" : item.type, id);
32
+ }
33
+
34
+ /** The hashed result keys an input returns, in the tracker's own encoding (content-free). */
35
+ export function resultKeysOf(input: unknown): string[] {
36
+ if (!Array.isArray(input)) return [];
37
+ return input.map(resultKeyOfItem).filter((key): key is string => key !== null);
38
+ }
39
+
27
40
  /** Content-free activity owned by one admitted incoming Responses socket. */
28
41
  export class CodexWebSocketActivity {
29
42
  lastUsed = ++activityOrder;
30
- closing = false;
43
+ private closingFlag = false;
31
44
  private turns = 0;
32
45
  private pendingResults = new Set<string>();
33
46
  private returnedResults = new Set<string>();
@@ -35,11 +48,115 @@ export class CodexWebSocketActivity {
35
48
  private argumentCalls = new Map<string, { type: string; result: string | null }>();
36
49
  // Unknown/oversized identities cannot safely prove that client work finished.
37
50
  private untrackedResults = false;
51
+ // Remote Link sockets observe their own activity; local sockets register nothing.
52
+ private listeners: Array<() => void> = [];
53
+ private acceptedListeners: Array<(input: unknown) => void> = [];
54
+ private beginListeners: Array<(input: unknown) => void> = [];
55
+ /**
56
+ * Remote Link sockets only: a turn the shared handler never reports as accepted (notifyAccepted)
57
+ * puts the results it settled back to pending when it finishes, so a refused or failed turn cannot
58
+ * make unfinished client work look done. Local sockets keep settling at admission.
59
+ */
60
+ restoreRefusedResults = false;
61
+ private turnRecords = new Map<unknown, { seq: number; settled: string[]; accepted: boolean }>();
62
+ private turnSeq = 0;
63
+ // Keys an unaccepted turn put back, with that turn's sequence; a key observed again as new work
64
+ // loses its marker, so a late acceptance of an older turn never settles newer work.
65
+ private restoredKeys = new Map<string, number>();
66
+
67
+ get closing(): boolean { return this.closingFlag; }
68
+
69
+ set closing(value: boolean) {
70
+ if (this.closingFlag === value) return;
71
+ this.closingFlag = value;
72
+ this.changed();
73
+ }
38
74
 
39
75
  get idle(): boolean {
40
76
  return !this.closing && this.turns === 0 && this.pendingResults.size === 0 && !this.untrackedResults;
41
77
  }
42
78
 
79
+ /** A turn admitted on this socket has not finished, superseded cleanup included. */
80
+ get running(): boolean { return this.turns > 0; }
81
+
82
+ /** How many admitted turns have not finished, superseded cleanup included. */
83
+ get runningTurns(): number { return this.turns; }
84
+
85
+ /** The hashed keys of the results this socket is waiting for (content-free). */
86
+ pendingKeys(): string[] { return [...this.pendingResults]; }
87
+
88
+ /** Identities overflowed or were ambiguous: completion of client work cannot be proved. */
89
+ get untracked(): boolean { return this.untrackedResults; }
90
+
91
+ /** Read-only: whether this input returns at least one result the socket is waiting for. */
92
+ returnsPending(input: unknown): boolean {
93
+ if (this.untrackedResults || !Array.isArray(input)) return false;
94
+ for (const item of input) {
95
+ const key = this.resultKeyOf(item);
96
+ if (key !== null && this.pendingResults.has(key)) return true;
97
+ }
98
+ return false;
99
+ }
100
+
101
+ /** Called after any change that can move idle, running or the pending set. */
102
+ onChange(listener: () => void): () => void {
103
+ this.listeners.push(listener);
104
+ return () => { this.listeners = this.listeners.filter(candidate => candidate !== listener); };
105
+ }
106
+
107
+ /** Called with a turn's input when it begins (Remote Link: the hold sequence a later acceptance may settle up to). */
108
+ onBegin(listener: (input: unknown) => void): () => void {
109
+ this.beginListeners.push(listener);
110
+ return () => { this.beginListeners = this.beginListeners.filter(candidate => candidate !== listener); };
111
+ }
112
+
113
+ /**
114
+ * Called with a turn's input once the shared handler got a successful response for it, after turn,
115
+ * workflow and pipeline admission (notifyAccepted). Never for a warmup or any refusal.
116
+ */
117
+ onAccepted(listener: (input: unknown) => void): () => void {
118
+ this.acceptedListeners.push(listener);
119
+ return () => { this.acceptedListeners = this.acceptedListeners.filter(candidate => candidate !== listener); };
120
+ }
121
+
122
+ /** The shared handler's turn was accepted by every admission and the pipeline answered ok. */
123
+ notifyAccepted(input: unknown): void {
124
+ const record = this.turnRecords.get(input);
125
+ if (record) record.accepted = true;
126
+ // Only sockets that restore refused results (Remote Link) reconcile, and only against turns that
127
+ // began before the accepted one: newer turns own newer work, even when it reuses a call id.
128
+ const returned = new Set(this.restoreRefusedResults && record ? resultKeysOf(input) : []);
129
+ if (record && returned.size) {
130
+ // An older turn still finishing (superseded, refused) must not put these results back...
131
+ for (const other of this.turnRecords.values()) {
132
+ if (other.seq < record.seq) other.settled = other.settled.filter(key => !returned.has(key));
133
+ }
134
+ // ...and one an older turn already put back is settled again.
135
+ let changed = false;
136
+ for (const key of returned) {
137
+ const by = this.restoredKeys.get(key);
138
+ if (by !== undefined && by < record.seq && this.pendingResults.delete(key)) {
139
+ this.restoredKeys.delete(key);
140
+ // Not added to returnedResults: like beginTurn, a settled wait never suppresses a later
141
+ // call that reuses its id, even from an upstream that omits response.created.
142
+ changed = true;
143
+ }
144
+ }
145
+ if (changed) this.changed();
146
+ }
147
+ for (const listener of [...this.acceptedListeners]) {
148
+ try { listener(input); } catch { /* an observer never breaks the socket's own bookkeeping */ }
149
+ }
150
+ }
151
+
152
+ private changed(): void {
153
+ for (const listener of [...this.listeners]) {
154
+ try { listener(); } catch { /* an observer never breaks the socket's own bookkeeping */ }
155
+ }
156
+ }
157
+
158
+ private resultKeyOf(item: unknown): string | null { return resultKeyOfItem(item); }
159
+
43
160
  touch(): void {
44
161
  this.lastUsed = ++activityOrder;
45
162
  }
@@ -48,39 +165,64 @@ export class CodexWebSocketActivity {
48
165
  beginTurn(input: unknown): () => void {
49
166
  this.turns += 1;
50
167
  this.touch();
51
- this.acceptResults(input);
168
+ const record = { seq: ++this.turnSeq, settled: this.settleResults(input), accepted: false };
169
+ if (this.restoreRefusedResults) this.turnRecords.set(input, record);
170
+ for (const listener of [...this.beginListeners]) {
171
+ try { listener(input); } catch { /* an observer never breaks the socket's own bookkeeping */ }
172
+ }
52
173
  // Ordinary creates start a new response even when its upstream omits response.created.
53
174
  // Prior results settle old waits, but cannot suppress new calls reusing their IDs.
54
175
  this.returnedResults.clear();
55
176
  this.argumentCalls.clear();
56
177
  let finished = false;
178
+ this.changed();
57
179
  return () => {
58
180
  if (finished) return;
59
181
  finished = true;
182
+ if (this.turnRecords.get(input) === record) this.turnRecords.delete(input);
183
+ if (this.restoreRefusedResults && !record.accepted) this.restoreResults(record.settled, record.seq);
60
184
  this.turns -= 1;
61
185
  if (this.turns === 0) this.touch();
186
+ this.changed();
62
187
  };
63
188
  }
64
189
 
65
190
  /** Called only after admission or native control accepts the client's results. */
66
191
  acceptResults(input: unknown): void {
67
- if (this.untrackedResults) return;
192
+ if (this.settleResults(input).length) this.changed();
193
+ }
194
+
195
+ /** Settles returned results; the keys taken off the pending set. Notifies nobody. */
196
+ private settleResults(input: unknown): string[] {
197
+ const settled: string[] = [];
198
+ if (this.untrackedResults) return settled;
68
199
  if (Array.isArray(input)) {
69
200
  for (const item of input) {
70
- if (!record(item) || typeof item.type !== "string") continue;
71
- const id = item.type === "mcp_approval_response" ? item.approval_request_id : item.call_id;
72
- if (typeof id === "string" && id.length <= MAX_RESULT_ID_LENGTH) {
73
- // Ordinary Codex shell results use function_call_output; native steering
74
- // also accepts its explicit local_shell_call_output continuation stub.
75
- const type = item.type === "local_shell_call_output" ? "function_call_output" : item.type;
76
- const key = resultKey(type, id);
77
- if (this.pendingResults.delete(key)) {
78
- if (this.returnedResults.size >= MAX_PENDING_RESULTS) { this.protectUntracked(); return; }
79
- else this.returnedResults.add(key);
80
- }
201
+ // Ordinary Codex shell results use function_call_output; native steering
202
+ // also accepts its explicit local_shell_call_output continuation stub.
203
+ const key = this.resultKeyOf(item);
204
+ if (key !== null && this.pendingResults.delete(key)) {
205
+ settled.push(key);
206
+ this.restoredKeys.delete(key);
207
+ if (this.returnedResults.size >= MAX_PENDING_RESULTS) { this.protectUntracked(); return []; }
208
+ else this.returnedResults.add(key);
81
209
  }
82
210
  }
83
211
  }
212
+ return settled;
213
+ }
214
+
215
+ /** A refused turn's results are owed again (restoreRefusedResults). */
216
+ private restoreResults(keys: readonly string[], seq: number): void {
217
+ if (this.untrackedResults) return;
218
+ for (const key of keys) {
219
+ // Already pending means newer work under the same key: it keeps its own generation, untagged.
220
+ if (this.pendingResults.has(key)) continue;
221
+ this.returnedResults.delete(key);
222
+ if (this.pendingResults.size >= MAX_PENDING_RESULTS) { this.protectUntracked(); return; }
223
+ this.pendingResults.add(key);
224
+ this.restoredKeys.set(key, seq);
225
+ }
84
226
  }
85
227
 
86
228
  /** Preserve tool waits even when the response terminal omits its output array. */
@@ -133,7 +275,9 @@ export class CodexWebSocketActivity {
133
275
  if (this.untrackedResults) return;
134
276
  if (!record(item) || typeof item.type !== "string") return;
135
277
  // Hosted execution may publish both the call and its result in the output stream.
136
- this.acceptResults([item]);
278
+ // On a Remote Link socket only an accepted client turn returns a client result: provider-executed
279
+ // calls never become pending, so an upstream output settling one would be ambiguous (design 5).
280
+ if (!this.restoreRefusedResults) this.acceptResults([item]);
137
281
  if (!Object.hasOwn(resultTypes, item.type)) return;
138
282
  if (providerExecuted && isAuthorizedProviderExecutedCall(item, providerExecuted)) return;
139
283
  if (item.type === "tool_search_call" && item.execution !== "client") return;
@@ -147,9 +291,19 @@ export class CodexWebSocketActivity {
147
291
  }
148
292
 
149
293
  private observeResultKey(key: string): void {
294
+ // A call observed now is new work, whatever an older turn restored under the same key.
295
+ this.restoredKeys.delete(key);
296
+ // An in-flight turn may still restore an earlier call under this id. The key cannot tell the two
297
+ // generations apart, so the socket's results become untracked: its close leaves an operator-only
298
+ // hold rather than possibly forgetting either piece of owed work (Remote Link sockets only).
299
+ if (this.restoreRefusedResults) {
300
+ for (const record of this.turnRecords.values()) {
301
+ if (record.settled.includes(key)) { this.protectUntracked(); return; }
302
+ }
303
+ }
150
304
  if (this.pendingResults.has(key) || this.returnedResults.has(key)) return;
151
305
  if (this.pendingResults.size >= MAX_PENDING_RESULTS) this.protectUntracked();
152
- else this.pendingResults.add(key);
306
+ else { this.pendingResults.add(key); this.changed(); }
153
307
  }
154
308
 
155
309
  private protectUntracked(): void {
@@ -157,5 +311,6 @@ export class CodexWebSocketActivity {
157
311
  this.pendingResults.clear();
158
312
  this.returnedResults.clear();
159
313
  this.argumentCalls.clear();
314
+ this.changed();
160
315
  }
161
316
  }
@@ -7,11 +7,11 @@ export const MAX_TRACKED_CODEX_WEBSOCKETS = 128;
7
7
  const websocketGate = createAdmissionGate("codex_websockets", MAX_TRACKED_CODEX_WEBSOCKETS);
8
8
  const admittedSockets = new Set<ServerWebSocket<WsData>>();
9
9
 
10
- function reclaimOldestIdleSocket(): void {
10
+ function reclaimOldestIdleSocket(eligible: (ws: ServerWebSocket<WsData>) => boolean = () => true): void {
11
11
  let oldest: ServerWebSocket<WsData> | undefined;
12
12
  for (const ws of admittedSockets) {
13
13
  const activity = ws.data.responsesActivity;
14
- if (!activity?.idle || ws.data.nativeControl || ws.readyState !== 1 || ws.getBufferedAmount() !== 0) continue;
14
+ if (!activity?.idle || ws.data.nativeControl || ws.readyState !== 1 || ws.getBufferedAmount() !== 0 || !eligible(ws)) continue;
15
15
  if (!oldest || activity.lastUsed < oldest.data.responsesActivity!.lastUsed) oldest = ws;
16
16
  }
17
17
  if (!oldest) return;
@@ -25,8 +25,15 @@ function reclaimOldestIdleSocket(): void {
25
25
  }
26
26
  }
27
27
 
28
- export function tryReserveCodexWebSocket(): AdmissionReservation<ServerWebSocket<WsData>> | null {
29
- if (websocketGate.metrics().active >= MAX_TRACKED_CODEX_WEBSOCKETS) reclaimOldestIdleSocket();
28
+ /**
29
+ * A slot in the shared socket gate. A local upgrade may reclaim the least recently used idle
30
+ * socket when the gate is full. A Remote Link upgrade passes reclaim: "link" and may reclaim only
31
+ * an idle Remote Link socket, never a local client's; reclaim: false never reclaims.
32
+ */
33
+ export function tryReserveCodexWebSocket(options: { reclaim?: boolean | "link" } = {}): AdmissionReservation<ServerWebSocket<WsData>> | null {
34
+ if (options.reclaim !== false && websocketGate.metrics().active >= MAX_TRACKED_CODEX_WEBSOCKETS) {
35
+ reclaimOldestIdleSocket(options.reclaim === "link" ? ws => ws.data.link !== undefined : undefined);
36
+ }
30
37
  const gateLease = websocketGate.tryAcquire();
31
38
  if (!gateLease) return null;
32
39
  let socket: ServerWebSocket<WsData> | undefined;
@@ -0,0 +1,228 @@
1
+ /**
2
+ * Disk-backed cooldown map for combo targets.
3
+ *
4
+ * A cooldown that lives only in memory is forgotten on every restart, so a freshly restarted proxy
5
+ * re-offers a target that upstream said to leave alone until its reset. This Map subclass loads
6
+ * `<config dir>/combo-cooldowns.json` on first use and writes back what this process changed.
7
+ * Expiry is stored as an absolute epoch, so reset-aware cooldowns stay correct across restarts.
8
+ * Pattern adopted from Hermes-agent (MIT, NousResearch): rate-limit state persisted per
9
+ * (provider, model) so a restart does not retry a known-exhausted route.
10
+ *
11
+ * Several proxies can share one home, so a write never replaces the file wholesale:
12
+ * - `set()` marks its key dirty. A flush re-reads the file under the config mutation lock and
13
+ * overlays only dirty keys, keeping the later of the two expiries, so it never shortens a
14
+ * cooldown another process wrote and never rewrites a row it did not touch.
15
+ * - `dropLocal()` (and the Map `delete()`/`clear()` it backs) forgets a row in memory only. Expiry
16
+ * checks, sweeps and the revision-guarded probe lift use it, so an expired local copy can never
17
+ * erase a row another process has since extended.
18
+ * - Explicit key, prefix and global clears are the only deletes written to disk: they record
19
+ * user-requested clears (combo save, rename, delete). Prefix clears also remove peer rows absent
20
+ * from memory. Deletes exclude old disk rows before dirty values are overlaid, so a subsequent
21
+ * `set()` starts a new cooldown even when the cleared row had a later expiry.
22
+ * A busy lock or I/O failure keeps the pending state and retries with bounded backoff.
23
+ *
24
+ * Loading: once per config dir, on first use. Rows already in memory win; a file row loads only
25
+ * while unexpired and gets a fresh revision from the caller's counter (revisions are never stored).
26
+ * A running process does not re-read other processes' rows later.
27
+ */
28
+ import { mkdirSync, readFileSync } from "node:fs";
29
+ import { join } from "node:path";
30
+ import { atomicWriteFile } from "../config/atomic-write";
31
+ import { withConfigMutationLockSync } from "../config/mutation-lock";
32
+ import { getConfigDir } from "../config/paths";
33
+
34
+ export interface PersistableCooldown { cooldownUntil: number; revision: number; status?: number }
35
+ type StoredRow = { cooldownUntil: number; status?: number };
36
+
37
+ const FILE = "combo-cooldowns.json";
38
+ const FLUSH_DELAY_MS = 250;
39
+ const MAX_FLUSH_DELAY_MS = 4_000;
40
+ const MAX_LOAD_ATTEMPTS = 3;
41
+ const SHUTDOWN_ATTEMPTS = 5;
42
+ const SHUTDOWN_RETRY_MS = 200;
43
+
44
+ function errorCode(error: unknown): string | undefined {
45
+ return error && typeof error === "object" && "code" in error ? String((error as { code?: unknown }).code) : undefined;
46
+ }
47
+
48
+ /** Valid rows of the file. Missing file or unparsable JSON is empty; other read errors throw. */
49
+ function readStoredRows(path: string): Record<string, StoredRow> {
50
+ let text: string;
51
+ try {
52
+ text = readFileSync(path, "utf8");
53
+ } catch (error) {
54
+ if (errorCode(error) === "ENOENT") return {};
55
+ throw error;
56
+ }
57
+ let parsed: unknown;
58
+ try { parsed = JSON.parse(text); } catch { return {}; }
59
+ const rows: Record<string, StoredRow> = {};
60
+ if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return rows;
61
+ for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
62
+ const row = value as { cooldownUntil?: unknown; status?: unknown } | null;
63
+ if (typeof row?.cooldownUntil !== "number" || !Number.isFinite(row.cooldownUntil)) continue;
64
+ rows[key] = { cooldownUntil: row.cooldownUntil, ...(typeof row.status === "number" ? { status: row.status } : {}) };
65
+ }
66
+ return rows;
67
+ }
68
+
69
+ export class PersistedCooldownMap<V extends PersistableCooldown> extends Map<string, V> {
70
+ private loadedFor: string | undefined;
71
+ private failedLoadDir: string | undefined;
72
+ private failedLoads = 0;
73
+ private timer: ReturnType<typeof setTimeout> | undefined;
74
+ private delayMs = FLUSH_DELAY_MS;
75
+ private scheduledDir: string | undefined;
76
+ private readonly dirty = new Set<string>();
77
+ private readonly tombstones = new Set<string>();
78
+ private readonly clearedPrefixes = new Set<string>();
79
+ private clearAll = false;
80
+ private readonly nextRevision: () => number;
81
+
82
+ constructor(nextRevision: () => number) {
83
+ super();
84
+ this.nextRevision = nextRevision;
85
+ }
86
+
87
+ private ensureLoaded(): void {
88
+ const dir = getConfigDir();
89
+ if (this.loadedFor === dir) return;
90
+ if (this.failedLoadDir === dir && this.failedLoads >= MAX_LOAD_ATTEMPTS) return;
91
+ let rows: Record<string, StoredRow>;
92
+ try {
93
+ rows = readStoredRows(join(dir, FILE));
94
+ } catch {
95
+ // A transient read failure (permissions, a locked file on Windows) retries on a later access.
96
+ if (this.failedLoadDir !== dir) { this.failedLoadDir = dir; this.failedLoads = 0; }
97
+ this.failedLoads += 1;
98
+ return;
99
+ }
100
+ this.loadedFor = dir;
101
+ const now = Date.now();
102
+ for (const [key, row] of Object.entries(rows)) {
103
+ if (row.cooldownUntil <= now || super.has(key)) continue;
104
+ super.set(key, { cooldownUntil: row.cooldownUntil, revision: this.nextRevision(), ...(row.status !== undefined ? { status: row.status } : {}) } as V);
105
+ }
106
+ }
107
+
108
+ private pending(): boolean {
109
+ return this.clearAll || this.dirty.size > 0 || this.tombstones.size > 0 || this.clearedPrefixes.size > 0;
110
+ }
111
+
112
+ private schedule(): void {
113
+ this.scheduledDir ??= getConfigDir();
114
+ if (this.timer) return;
115
+ this.timer = setTimeout(() => { this.timer = undefined; this.flush(); }, this.delayMs);
116
+ (this.timer as { unref?: () => void }).unref?.();
117
+ }
118
+
119
+ /** Write pending changes now. Returns false, keeping them and rescheduling, if the write could not run. */
120
+ flush(): boolean {
121
+ if (!this.pending()) return true;
122
+ const dir = this.scheduledDir ?? getConfigDir();
123
+ const path = join(dir, FILE);
124
+ try {
125
+ withConfigMutationLockSync(() => {
126
+ const file = readStoredRows(path);
127
+ const now = Date.now();
128
+ const out: Record<string, StoredRow> = {};
129
+ const clearedPrefixes = [...this.clearedPrefixes];
130
+ if (!this.clearAll) {
131
+ for (const [key, row] of Object.entries(file)) {
132
+ if (row.cooldownUntil > now && !this.tombstones.has(key)
133
+ && !clearedPrefixes.some(prefix => key.startsWith(prefix))) out[key] = row;
134
+ }
135
+ }
136
+ for (const key of this.dirty) {
137
+ const own = super.get(key);
138
+ if (!own || own.cooldownUntil <= now) continue;
139
+ const other = out[key];
140
+ out[key] = other && other.cooldownUntil > own.cooldownUntil
141
+ ? other
142
+ : { cooldownUntil: own.cooldownUntil, ...(own.status !== undefined ? { status: own.status } : {}) };
143
+ }
144
+ mkdirSync(dir, { recursive: true });
145
+ atomicWriteFile(path, JSON.stringify(out));
146
+ }, dir);
147
+ } catch {
148
+ // Lock held by another process (busy_timeout 0) or an I/O error: keep everything and retry.
149
+ this.delayMs = Math.min(this.delayMs * 2, MAX_FLUSH_DELAY_MS);
150
+ if (!this.timer) this.schedule();
151
+ return false;
152
+ }
153
+ this.dirty.clear();
154
+ this.tombstones.clear();
155
+ this.clearedPrefixes.clear();
156
+ this.clearAll = false;
157
+ this.scheduledDir = undefined;
158
+ this.delayMs = FLUSH_DELAY_MS;
159
+ return true;
160
+ }
161
+
162
+ /** Bounded final write for process shutdown; never blocks for more than about a second. */
163
+ flushForShutdown(): void {
164
+ if (this.timer) { clearTimeout(this.timer); this.timer = undefined; }
165
+ for (let attempt = 0; attempt < SHUTDOWN_ATTEMPTS; attempt += 1) {
166
+ if (this.flush()) break;
167
+ if (this.timer) { clearTimeout(this.timer); this.timer = undefined; }
168
+ if (attempt < SHUTDOWN_ATTEMPTS - 1) Bun.sleepSync(SHUTDOWN_RETRY_MS);
169
+ }
170
+ if (this.timer) { clearTimeout(this.timer); this.timer = undefined; }
171
+ }
172
+
173
+ /** Forget a row in memory only (expiry, sweep, probe lift); nothing is written. */
174
+ dropLocal(key: string): boolean { this.ensureLoaded(); return super.delete(key); }
175
+
176
+ /** A user-requested clear of these keys, written to disk as deletes. */
177
+ clearPersisted(keys: Iterable<string>): void {
178
+ this.ensureLoaded();
179
+ for (const key of keys) {
180
+ super.delete(key);
181
+ this.dirty.delete(key);
182
+ this.tombstones.add(key);
183
+ }
184
+ this.schedule();
185
+ }
186
+
187
+ /** Clear a combo prefix in memory and in the fresh file read under the mutation lock. */
188
+ clearPrefixPersisted(prefix: string): void {
189
+ this.ensureLoaded();
190
+ for (const key of super.keys()) {
191
+ if (key.startsWith(prefix)) {
192
+ super.delete(key);
193
+ this.dirty.delete(key);
194
+ }
195
+ }
196
+ this.clearedPrefixes.add(prefix);
197
+ this.schedule();
198
+ }
199
+
200
+ /** A user-requested clear of every row, written to disk as a global reset. */
201
+ clearAllPersisted(): void {
202
+ this.ensureLoaded();
203
+ super.clear();
204
+ this.dirty.clear();
205
+ this.tombstones.clear();
206
+ this.clearedPrefixes.clear();
207
+ this.clearAll = true;
208
+ this.schedule();
209
+ }
210
+
211
+ override get(key: string): V | undefined { this.ensureLoaded(); return super.get(key); }
212
+ override has(key: string): boolean { this.ensureLoaded(); return super.has(key); }
213
+ override get size(): number { this.ensureLoaded(); return super.size; }
214
+ override keys(): MapIterator<string> { this.ensureLoaded(); return super.keys(); }
215
+ override values(): MapIterator<V> { this.ensureLoaded(); return super.values(); }
216
+ override entries(): MapIterator<[string, V]> { this.ensureLoaded(); return super.entries(); }
217
+ override [Symbol.iterator](): MapIterator<[string, V]> { this.ensureLoaded(); return super[Symbol.iterator](); }
218
+ override set(key: string, value: V): this {
219
+ this.ensureLoaded();
220
+ super.set(key, value);
221
+ // Keep queued clears until flush excludes the previous disk row, then overlays this value.
222
+ this.dirty.add(key);
223
+ this.schedule();
224
+ return this;
225
+ }
226
+ override delete(key: string): boolean { return this.dropLocal(key); }
227
+ override clear(): void { this.ensureLoaded(); super.clear(); }
228
+ }