@bitkyc08/opencodex 2.100.2 → 2.100.4

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 (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  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/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -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.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -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/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -10,17 +10,56 @@ import { assertServiceAuthEnvironment } from "./auth-preflight";
10
10
  import { assertServiceEnvironmentMatchesInstall } from "./guards";
11
11
  import { installLaunchd, restartLaunchdJob } from "./launchd";
12
12
  import type { LaunchdInstallOutcome } from "./launchd";
13
- import { TASK, writeServiceInstallState, serviceSourceDir, resolveServiceOwnership, serviceLauncherPathDiagnostic } from "./state";
13
+ import { TASK, writeServiceInstallState, serviceSourceDir, resolveServiceOwnership, serviceLauncherPathDiagnostic, windowsLauncherVbsPath, windowsServiceScriptPath } from "./state";
14
14
  import type { ServiceOwnership, ServiceOwnershipResolution } from "./state";
15
15
  import { installSystemd } from "./systemd";
16
- import { writeWindowsSchedulerAssets, reregisterWindowsSchedulerTask, windowsSchedulerRegistrationMatchesSnapshot, restoreWindowsSchedulerTaskIfAbsent, startWindows, stopWindows, statusWindowsXml } from "./windows-ops";
16
+ import { writeWindowsSchedulerAssets, reregisterWindowsSchedulerTask, windowsSchedulerRegistrationMatchesSnapshot, restoreWindowsSchedulerTaskIfAbsent, startWindows, stopWindows, statusWindowsXml, snapshotWindowsSchedulerAssets } from "./windows-ops";
17
17
  import { probeWindowsSchedulerTask, SCHEDULER_SETTLE_DELAYS_MS, settleDelay } from "./windows-scheduler";
18
18
  import type { WindowsSchedulerTaskProbe } from "./windows-scheduler";
19
19
  import { taskXmlSection, taskXmlWithoutCommentsAndCdata, taskXmlElementCount, taskXmlOptionalValueEquals, windowsTaskRegistrationOwnedByAttempt, windowsTaskHasSessionRecoveryTriggers, windowsTaskRegistrationHealthy, windowsTaskRegistrationRefreshableLegacy } from "./windows-taskxml";
20
20
  import type { ExpectedWindowsTaskUserId } from "./windows-taskxml";
21
21
  import { win32 } from "node:path";
22
22
  import { assertNoDesktopSupervision, createSupervisionLatch, type SupervisionInspector, type SupervisionLatch } from "./desktop-command-guard";
23
+ import { prepareDisconnectedClientServiceRestart } from "./disconnected-client-restart";
24
+ import type { HeldRestartReceipt } from "./restart-proxy-stop";
25
+ import { killWindowsSchedulerWrappers } from "../lib/windows-service-wrappers";
26
+ import { clearPendingTeardown, pendingTeardownPathFor } from "../config/pending-teardown";
23
27
 
28
+ /** Append what the caller's state means to an error, keeping the error itself (its class and code). */
29
+ function withContext(error: unknown, context: string): unknown {
30
+ if (error instanceof Error) { error.message = `${error.message} ${context}`; return error; }
31
+ return new Error(`${String(error)} ${context}`);
32
+ }
33
+
34
+ /**
35
+ * Release the deferred-teardown receipts a scheduler restart kept, each once a replacement serves
36
+ * the endpoint it names. Returns the receipts kept: client routing still names those endpoints,
37
+ * and `ocx stop` finishes an abandoned receipt by restoring native client routing.
38
+ */
39
+ async function releaseRestartReceipts(
40
+ held: readonly HeldRestartReceipt[],
41
+ confirm?: (receipt: HeldRestartReceipt, stoppedPids: readonly number[]) => Promise<boolean>,
42
+ ): Promise<HeldRestartReceipt[]> {
43
+ const stoppedPids = held.map(receipt => receipt.pid);
44
+ const kept: HeldRestartReceipt[] = [];
45
+ for (const receipt of held) {
46
+ const serving = await (confirm ?? (async (target: HeldRestartReceipt, pids: readonly number[]) => {
47
+ const { schedulerReplacementServing } = await import("./orchestration");
48
+ return schedulerReplacementServing(target.endpoint, pids);
49
+ }))(receipt, stoppedPids);
50
+ if (!serving) { kept.push(receipt); continue; }
51
+ if (!clearPendingTeardown(receipt.nonce)) {
52
+ console.warn(`⚠️ Could not remove the restart's teardown receipt ${pendingTeardownPathFor(receipt.nonce)}; the next 'ocx stop' finishes it.`);
53
+ }
54
+ }
55
+ return kept;
56
+ }
57
+
58
+ const RESTART_RECEIPT_KEPT = "The restart kept its teardown receipt, because client routing still points at the stopped proxy's port and no replacement was proven to serve it. "
59
+ + "Once a proxy serves there, run 'ocx stop' and then 'ocx service start'; if none does, 'ocx stop' restores native client routing.";
60
+
61
+ /** What a scheduler restart's stops kept, shared with the wrapper that settles it on failure. */
62
+ type RestartReceiptState = { held: HeldRestartReceipt[]; startIssued: boolean };
24
63
  /**
25
64
  * The two CLI verbs `repairService` serves. They differ on ONE platform and ONE case: a
26
65
  * macOS job that is already loaded from the current plist, which `repair` must not touch and
@@ -35,7 +74,25 @@ export interface RepairServiceDeps extends RuntimePreflightDeps {
35
74
  assertEnv?: () => void;
36
75
  assertAuth?: () => void;
37
76
  writeSchedulerAssets?: (runtime: DurableBunRuntime) => void;
77
+ /** Captures the current scheduler assets and returns their restore; see snapshotWindowsSchedulerAssets. */
78
+ snapshotSchedulerAssets?: () => () => void;
38
79
  stopScheduler?: () => void;
80
+ /** Same installation-scoped wrapper cleanup used by service stop/install. */
81
+ killServiceWrappers?: () => void;
82
+ /** Bounded post-stop respawn verification; null proves no proxy answered. */
83
+ schedulerProxyStillLive?: () => Promise<{ port: number } | null>;
84
+ /**
85
+ * Stops the home-verified tracked proxy with a receipt-backed deferred stop, and throws for a proxy
86
+ * that still answers but cannot be verified (stopTrackedProxyForServiceRestart); failures propagate.
87
+ */
88
+ stopTrackedProxy?: () => Promise<unknown>;
89
+ /**
90
+ * After the scheduler start, whether a replacement other than the stopped pids serves; only then
91
+ * does the restart release the deferred-teardown receipts its stops kept (schedulerReplacementServing).
92
+ */
93
+ confirmSchedulerReplacement?: (receipt: HeldRestartReceipt, stoppedPids: readonly number[]) => Promise<boolean>;
94
+ /** Refuses a restart that must not stop this home's live proxy (assertSchedulerRestartTargetAllowed). */
95
+ assertSchedulerRestartTarget?: () => Promise<void>;
39
96
  startScheduler?: () => void;
40
97
  writeSchedulerState?: (runtime: DurableBunRuntime) => void;
41
98
  writeNativeState?: (runtime: DurableBunRuntime) => void;
@@ -70,6 +127,7 @@ export interface RepairServiceDeps extends RuntimePreflightDeps {
70
127
  schedulerLauncher?: string;
71
128
  /** Test seam — defaults to process.platform so Linux CI cannot hit real installSystemd. */
72
129
  platform?: NodeJS.Platform;
130
+ prepareDisconnectedClientRestart?: () => Promise<void>;
73
131
  /** Test seam for a recorded temporary launcher. */
74
132
  launcherPathDiagnostic?: () => string | null;
75
133
  }
@@ -156,6 +214,19 @@ export async function assertSchedulerRegistrationBeforeStart(
156
214
  * macOS/Linux: re-run the user-level install/reload path.
157
215
  */
158
216
  export async function repairService(deps: RepairServiceDeps = {}): Promise<void> {
217
+ const restart: RestartReceiptState = { held: [], startIssued: false };
218
+ try {
219
+ await repairServiceWith(deps, restart);
220
+ } catch (error) {
221
+ if (restart.held.length === 0) throw error;
222
+ // A recovery start may have brought a proxy back on the stopped endpoint; only then may the
223
+ // receipt go. Otherwise the error names what was kept and how to finish it.
224
+ const kept = restart.startIssued ? await releaseRestartReceipts(restart.held, deps.confirmSchedulerReplacement) : restart.held;
225
+ throw kept.length > 0 ? withContext(error, RESTART_RECEIPT_KEPT) : error;
226
+ }
227
+ }
228
+
229
+ async function repairServiceWith(deps: RepairServiceDeps, restart: RestartReceiptState): Promise<void> {
159
230
  const latch = deps.supervisionLatch ?? createSupervisionLatch();
160
231
  assertNoDesktopSupervision(deps.inspectSupervision, latch);
161
232
  const diagnose = deps.diagnose ?? diagnoseService;
@@ -193,8 +264,55 @@ export async function repairService(deps: RepairServiceDeps = {}): Promise<void>
193
264
  const temporaryLauncher = (deps.launcherPathDiagnostic ?? (() => serviceLauncherPathDiagnostic(undefined, platform, true)))();
194
265
  if (temporaryLauncher) console.warn(`⚠️ ${temporaryLauncher}`);
195
266
 
267
+ const assertRestartOwnership = () => {
268
+ assertNoDesktopSupervision(deps.inspectSupervision, latch);
269
+ (deps.assertEnv ?? assertServiceEnvironmentMatchesInstall)();
270
+ const current = (deps.readOwnership ?? resolveServiceOwnership)();
271
+ if (!Bun.deepEquals(current, ownership, true)) throw new Error("Service ownership changed during restart.");
272
+ };
273
+ // Ends the task instance only. The wrappers it leaves running still supervise the proxy, so they
274
+ // are cleaned up after that proxy accepted its stop (below): removing them first left a survivor
275
+ // whose stop was refused or unverifiable with nothing to restart it (#8416).
276
+ let schedulerStopped = false;
277
+ // Deferred-teardown receipts the scheduler restart's stops kept: client routing still names the
278
+ // stopped endpoints, so they are released only once a replacement serves (end of the scheduler path).
279
+ const holdRestartReceipt = (receipt: HeldRestartReceipt) => { restart.held.push(receipt); };
280
+ const stopSchedulerForRestart = (beforeStop: () => void) => {
281
+ if (schedulerStopped) return;
282
+ beforeStop();
283
+ (deps.stopScheduler ?? stopWindows)();
284
+ schedulerStopped = true;
285
+ };
286
+ // Defer cleanup until the selected backend's registration has been verified.
287
+ const prepareDisconnectedRestart = async (verifyRegistration?: () => void) => {
288
+ if (deps.verb !== "restart") return;
289
+ const beforeStop = () => { assertRestartOwnership(); verifyRegistration?.(); };
290
+ beforeStop();
291
+ const schedulerBackend = platform === "win32" && diag.backend !== "native";
292
+ await (deps.prepareDisconnectedClientRestart ?? (() => prepareDisconnectedClientServiceRestart({
293
+ beforeStop,
294
+ ...(schedulerBackend ? { stop: async (pid: number) => {
295
+ const { stopProxyForServiceRestart } = await import("./restart-proxy-stop");
296
+ return stopProxyForServiceRestart(pid, holdRestartReceipt);
297
+ } } : {}),
298
+ stopManager: async () => {
299
+ const { platformOps } = await import("./orchestration");
300
+ const ops = platformOps(diag.backend === "native" ? "native" : "scheduler", { platform });
301
+ if (!ops) throw new Error("Service manager is unavailable; restart stopped.");
302
+ // The import yields; repeat ownership and registration proof immediately before stop.
303
+ beforeStop();
304
+ if (platform === "win32" && diag.backend !== "native") {
305
+ stopSchedulerForRestart(beforeStop);
306
+ return;
307
+ }
308
+ ops.stop();
309
+ },
310
+ })))();
311
+ };
312
+
196
313
  if (platform === "win32") {
197
314
  if (diag.backend === "native") {
315
+ if (deps.verb === "restart") await prepareDisconnectedRestart();
198
316
  await (deps.repairNative ?? ((selected: DurableBunRuntime) => installWinswService(defaultWinswEntry(serviceSourceDir, selected))))(runtime);
199
317
  assertNoDesktopSupervision(deps.inspectSupervision, latch);
200
318
  (deps.writeNativeState ?? ((selected: DurableBunRuntime) => writeServiceInstallState("native", undefined, {}, selected)))(runtime);
@@ -256,8 +374,103 @@ export async function repairService(deps: RepairServiceDeps = {}): Promise<void>
256
374
  : "Task Scheduler registration is not a recognized legacy OpenCodex definition; it was preserved for manual review.",
257
375
  );
258
376
  }
259
- try { (deps.stopScheduler ?? stopWindows)(); } catch { /* not running */ }
260
- (deps.writeSchedulerAssets ?? writeWindowsSchedulerAssets)(runtime);
377
+ const verifyRegistrationBeforeStop = () => {
378
+ let currentXml = "";
379
+ try { currentXml = readSchedulerXml(); } catch { /* Refuse unreadable registration below. */ }
380
+ if (!currentXml.trim()) throw new Error("Task Scheduler registration became unreadable before stop; it was preserved and not stopped.");
381
+ if (!windowsSchedulerRegistrationMatchesSnapshot(currentXml, registeredXml)) {
382
+ throw new Error("Task Scheduler registration changed before stop; it was preserved and not stopped.");
383
+ }
384
+ };
385
+ // Capture the assets the verified registration runs before anything is stopped. A snapshot that
386
+ // cannot be read (an ACL refusal) then refuses while the service is still running, rather than
387
+ // after the stop, where the failed-rewrite recovery below could never start it again.
388
+ const restoreAssets = (deps.snapshotSchedulerAssets ?? snapshotWindowsSchedulerAssets)();
389
+ if (deps.verb === "restart") {
390
+ await (deps.assertSchedulerRestartTarget ?? (async () => {
391
+ const { assertSchedulerRestartTargetAllowed } = await import("./orchestration");
392
+ return assertSchedulerRestartTargetAllowed();
393
+ }))();
394
+ await prepareDisconnectedRestart(verifyRegistrationBeforeStop);
395
+ assertRestartOwnership();
396
+ verifyRegistrationBeforeStop();
397
+ stopSchedulerForRestart(() => { assertRestartOwnership(); verifyRegistrationBeforeStop(); });
398
+ // `schtasks /end` does not reach the wrapper's child, so a Home or a connected Child proxy
399
+ // survives it. Stop that home-verified proxy with a receipt-backed deferred stop: the task is
400
+ // still registered, so a bare /api/stop is refused as respawnable, and this restart is what
401
+ // verifies the respawn window below. A refused stop propagates with the wrappers untouched.
402
+ const stopTracked = deps.stopTrackedProxy ?? (async () => {
403
+ const { stopTrackedProxyForServiceRestart } = await import("./orchestration");
404
+ return stopTrackedProxyForServiceRestart(holdRestartReceipt);
405
+ });
406
+ const stillLive = deps.schedulerProxyStillLive ?? (async () => {
407
+ const { proxyStillLiveAfterStop } = await import("./orchestration");
408
+ return proxyStillLiveAfterStop({ canRespawn: true });
409
+ });
410
+ assertRestartOwnership();
411
+ verifyRegistrationBeforeStop();
412
+ try {
413
+ await stopTracked();
414
+ } catch (error) {
415
+ throw withContext(error, "The scheduler wrappers that supervise it were left in place.");
416
+ }
417
+ assertRestartOwnership();
418
+ verifyRegistrationBeforeStop();
419
+ (deps.killServiceWrappers ?? (() => killWindowsSchedulerWrappers({
420
+ scriptPath: windowsServiceScriptPath(),
421
+ launcherPath: windowsLauncherVbsPath(),
422
+ })))();
423
+ let live = await stillLive();
424
+ if (live) {
425
+ // A wrapper can respawn its child between the proxy's exit and the cleanup above. Nothing
426
+ // brings it back once the wrappers are gone, so stop that one the same way and look again.
427
+ // The wrappers are already gone here: a stop that fails now leaves that proxy unsupervised,
428
+ // and the restart says so instead of implying anything still watches it.
429
+ const unsupervised = "A proxy a scheduler wrapper restarted before the wrapper cleanup is still running, and the wrappers that supervised it were already removed, so nothing restarts it if it exits. "
430
+ + "Stop it with 'ocx stop', then run 'ocx service restart' again.";
431
+ assertRestartOwnership();
432
+ verifyRegistrationBeforeStop();
433
+ try {
434
+ await stopTracked();
435
+ live = await stillLive();
436
+ } catch (error) {
437
+ throw withContext(error, unsupervised);
438
+ }
439
+ if (live) throw new Error(unsupervised);
440
+ }
441
+ assertRestartOwnership();
442
+ verifyRegistrationBeforeStop();
443
+ } else {
444
+ try { (deps.stopScheduler ?? stopWindows)(); } catch { /* not running */ }
445
+ }
446
+ // The proxy is stopped now. A rewrite that fails (a read-only asset, an ACL refusal) must not
447
+ // leave it stopped: put the previous assets back and start the registration verified above,
448
+ // which still runs them (the snapshot above), then report the original failure.
449
+ try {
450
+ (deps.writeSchedulerAssets ?? writeWindowsSchedulerAssets)(runtime);
451
+ } catch (err) {
452
+ const recoveryErrors: unknown[] = [];
453
+ try { restoreAssets(); } catch (error) { recoveryErrors.push(error); }
454
+ if (recoveryErrors.length === 0) {
455
+ try {
456
+ await assertSchedulerSnapshotBeforeStart(
457
+ readSchedulerXml,
458
+ registeredXml,
459
+ deps.settleSchedulerRead ?? settleDelay,
460
+ "Task Scheduler registration changed after the failed asset write; it was preserved and not started.",
461
+ "Task Scheduler registration became unreadable after the failed asset write; it was preserved and not started.",
462
+ );
463
+ assertNoDesktopSupervision(deps.inspectSupervision, latch);
464
+ (deps.startScheduler ?? startWindows)(); restart.startIssued = true;
465
+ } catch (error) {
466
+ recoveryErrors.push(error);
467
+ }
468
+ }
469
+ if (recoveryErrors.length > 0) {
470
+ throw new AggregateError([err, ...recoveryErrors], "Scheduler assets could not be written, and the previous registration was not restarted.");
471
+ }
472
+ throw err;
473
+ }
261
474
  // Rewriting the on-disk assets does not touch the definition Task Scheduler holds, so a
262
475
  // task registered by an older version keeps its old triggers forever: status reports it
263
476
  // stale, tells the user to run repair, and repair changes nothing it complains about.
@@ -349,7 +562,7 @@ export async function repairService(deps: RepairServiceDeps = {}): Promise<void>
349
562
  "Task Scheduler state remained unreadable before restart; the registration was preserved and not started.",
350
563
  );
351
564
  assertNoDesktopSupervision(deps.inspectSupervision, latch);
352
- (deps.startScheduler ?? startWindows)();
565
+ (deps.startScheduler ?? startWindows)(); restart.startIssued = true;
353
566
  } catch (error) {
354
567
  recoveryErrors.push(error);
355
568
  }
@@ -375,10 +588,14 @@ export async function repairService(deps: RepairServiceDeps = {}): Promise<void>
375
588
  "Task Scheduler registration became unreadable before restart; it was preserved and not started.",
376
589
  );
377
590
  assertNoDesktopSupervision(deps.inspectSupervision, latch);
378
- (deps.startScheduler ?? startWindows)();
591
+ (deps.startScheduler ?? startWindows)(); restart.startIssued = true;
379
592
  (deps.writeSchedulerState ?? ((selected: DurableBunRuntime) => writeServiceInstallState("scheduler", undefined, {}, selected)))(runtime);
593
+ const kept = await releaseRestartReceipts(restart.held, deps.confirmSchedulerReplacement);
594
+ restart.held = [];
595
+ if (kept.length > 0) console.warn(`⚠️ ${RESTART_RECEIPT_KEPT}`);
380
596
  return;
381
597
  }
598
+ if (deps.verb === "restart") await prepareDisconnectedRestart();
382
599
  if (platform === "darwin") {
383
600
  const outcome = (deps.repairLaunchd ?? installLaunchd)();
384
601
  // `installLaunchd` is the only function that knows whether it published anything, and its
@@ -0,0 +1,79 @@
1
+ import { claimPendingTeardown, clearPendingTeardown } from "../config/pending-teardown";
2
+ import { readRuntimePort, verifyPidIdentity } from "../config/process-state";
3
+ import { gracefulStopHost, ProxyOwnershipRefusedError, stopProxy } from "../lib/process-control";
4
+ import { proveLiveProxyOwnedByHome, SERVICE_STOP_LIVENESS } from "../server/proxy-liveness";
5
+
6
+ export type RestartStopEndpoint = { hostname: string; port: number };
7
+
8
+ /** A deferred-teardown receipt a restart keeps until a replacement serves its endpoint. */
9
+ export type HeldRestartReceipt = { nonce: string; pid: number; endpoint: RestartStopEndpoint };
10
+
11
+ export interface RestartProxyStopDeps {
12
+ readRuntime?: (pid: number) => { port: number; hostname?: string } | null;
13
+ /** Fresh proof that `pid` serves `endpoint` with this home's runtime attestation secret. */
14
+ prove?: (pid: number, endpoint: RestartStopEndpoint) => Promise<boolean>;
15
+ /** Writes the pending-teardown receipt and returns its nonce. */
16
+ claim?: (endpoint: RestartStopEndpoint) => string;
17
+ clear?: (nonce: string) => boolean;
18
+ stop?: typeof stopProxy;
19
+ /** Identity check rechecked before any forced stop (verifyPidIdentity). */
20
+ verify?: (pid: number) => number | null;
21
+ }
22
+
23
+ /**
24
+ * Stop a home-verified proxy for `ocx service restart` (#8416).
25
+ *
26
+ * A restart keeps its Task Scheduler task registered, so a bare POST /api/stop is answered with
27
+ * 409 respawnable_service: the proxy cannot verify, after it has exited, that no wrapper brings it
28
+ * back. The restart does verify that window itself (proxyStillLiveAfterStop), which is the contract
29
+ * a pending-teardown receipt carries for `ocx stop` (#3008). With a valid receipt for its own port
30
+ * named in the request, the route skips that refusal, defers its shared teardown, and the proxy
31
+ * exits keeping client routing for the replacement, as a service-managed crash and respawn does.
32
+ *
33
+ * The request carries this home's admin token, so it goes only to the endpoint this home's runtime
34
+ * record names for `pid`, and only after that listener proves possession of the record's
35
+ * attestation secret for a fresh challenge. A process that merely claims the pid in an unattested
36
+ * /healthz is never sent the token or stopped. Without a record or a proof, nothing is claimed or
37
+ * sent and the stop refuses; the caller then keeps whatever supervises that process.
38
+ *
39
+ * The receipt is written before the request and is an obligation: client routing still points at
40
+ * the stopped proxy's endpoint. Only a refusal proves nothing was deferred, so only a refusal
41
+ * releases it here (and is never forced; stopProxy throws it). Every other outcome, an accepted
42
+ * stop, an unanswered request that fell back to the kill ladder, or a failure on the way, hands
43
+ * the receipt to `hold`. The caller releases it once a replacement serves that endpoint; until
44
+ * then, a restart that fails or dies leaves it for the next `ocx stop` to finish.
45
+ */
46
+ export async function stopProxyForServiceRestart(
47
+ pid: number,
48
+ hold: (receipt: HeldRestartReceipt) => void,
49
+ deps: RestartProxyStopDeps = {},
50
+ ): Promise<boolean> {
51
+ const runtime = (deps.readRuntime ?? readRuntimePort)(pid);
52
+ if (!runtime?.port) {
53
+ throw new Error(`No runtime record of this home names proxy ${pid}, so its endpoint could not be proven; it was not stopped.`);
54
+ }
55
+ // The host the stop request will use (gracefulStopHost), so the proof is made against the very
56
+ // destination the admin token is then sent to, not a name that could resolve elsewhere.
57
+ const endpoint = { hostname: gracefulStopHost(runtime.hostname), port: runtime.port };
58
+ const proven = await (deps.prove ?? (async (target: number, at: RestartStopEndpoint) =>
59
+ await proveLiveProxyOwnedByHome({ pid: target, port: at.port, hostname: at.hostname, probeHostname: at.hostname, source: "runtime" }, SERVICE_STOP_LIVENESS) === "proven"))(pid, endpoint);
60
+ if (!proven) {
61
+ throw new Error(`Proxy ${pid} could not prove it serves this home's endpoint ${endpoint.hostname}:${endpoint.port}; this home's admin token was not sent to it and it was not stopped.`);
62
+ }
63
+ const nonce = (deps.claim ?? (target => claimPendingTeardown(target, "exact").nonce))(endpoint);
64
+ try {
65
+ const verify = deps.verify ?? verifyPidIdentity;
66
+ const stopped = await (deps.stop ?? stopProxy)(pid, {
67
+ deferSharedTeardownNonce: nonce, runtimeEndpoint: endpoint, runtimeEndpointOnly: true,
68
+ // The kill fallback only after the graceful request went unanswered, and only while pid is
69
+ // still the ocx start process this restart verified.
70
+ mayTerminate: () => verify(pid) === pid,
71
+ });
72
+ hold({ nonce, pid, endpoint });
73
+ return stopped;
74
+ } catch (error) {
75
+ if (error instanceof ProxyOwnershipRefusedError) (deps.clear ?? clearPendingTeardown)(nonce);
76
+ else hold({ nonce, pid, endpoint });
77
+ throw error;
78
+ }
79
+ }
@@ -31,8 +31,12 @@ export type ServiceChildOwnershipDeps = {
31
31
  serviceHostPaths?: () => readonly string[];
32
32
  };
33
33
 
34
- /** The env markers a real supervisor writes that an `ocx claude`/`ocx opencode` child does not. */
35
- function isMarkedSupervisedServiceChild(env: NodeJS.ProcessEnv): boolean {
34
+ /**
35
+ * The env markers a current supervisor writes that an `ocx claude`/`ocx opencode` child does not.
36
+ * Exported for the client restart (src/client/runtime-restart.ts), which takes only these markers as
37
+ * manager evidence; the parent-command-line inference below stays with the start-time ownership check.
38
+ */
39
+ export function isMarkedSupervisedServiceChild(env: NodeJS.ProcessEnv): boolean {
36
40
  return env[SERVICE_MANAGED_ENV] === "1" || env[WINDOWS_WRAPPER_PROTOCOL_ENV] === "1";
37
41
  }
38
42