@bitkyc08/opencodex 2.100.2 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -4,7 +4,9 @@ import { waitForPortAvailable } from "../server/ports";
4
4
  import { probeEndpointLiveness, probeHostname } from "../server/proxy-liveness";
5
5
  import type { GuardedManagerTarget } from "../service/guarded-manager-target";
6
6
  import type { ResolveJson } from "./resolve";
7
- import { STOP_SUMMARY_SCHEMA, type StopOutcome, type StopRunRecord, type StopServiceOutcome } from "./stop-report";
7
+ import { STOP_SUMMARY_SCHEMA, stopReasonFields, type StopOutcome, type StopRunRecord, type StopServiceOutcome, type StopServiceReason } from "./stop-report";
8
+
9
+ type MaybePromise<T> = T | Promise<T>;
8
10
 
9
11
  export interface StopApproval {
10
12
  pid: number;
@@ -36,15 +38,43 @@ function sameGuardedManager(
36
38
  current: GuardedManagerTarget,
37
39
  ): boolean {
38
40
  if (expected.kind === "absent") return current.kind === "absent";
41
+ if (expected.kind === "bound-stray") {
42
+ // The bound wrapper set is the identity (#7771): same PIDs with the same creation times.
43
+ if (current.kind !== "bound-stray" || current.pid !== expected.pid) return false;
44
+ const key = (set: { pid: number; startTime: number }[]) =>
45
+ set.map(wrapper => `${wrapper.pid}@${wrapper.startTime}`).sort().join(",");
46
+ return key(current.wrappers) === key(expected.wrappers);
47
+ }
39
48
  return current.kind === "bound" && current.pid === expected.pid
40
49
  && current.managerPid === expected.managerPid && current.backend === expected.backend;
41
50
  }
42
51
 
43
- export type StopApprovalParse = { ok: true; json: boolean; approval: StopApproval | null } | { ok: false };
52
+ export type StopApprovalParse =
53
+ | { ok: true; json: boolean; approval: StopApproval | null; deadlineMs: number | null }
54
+ | { ok: false };
44
55
 
45
- export function parseStopApproval(argv: string[]): StopApprovalParse {
46
- if (argv.length === 0) return { ok: true, json: false, approval: null };
47
- if (argv.every(arg => arg === "--json")) return { ok: true, json: true, approval: null };
56
+ /**
57
+ * --deadline-ms <n> (#7771): a positive decimal number of milliseconds, measured from this
58
+ * process's start; at most once, anywhere in the argument list. Removed here so the
59
+ * approval grammar below stays exactly what it was.
60
+ */
61
+ function takeStopDeadline(argv: string[]): { argv: string[]; deadlineMs: number | null } | null {
62
+ const at = argv.indexOf("--deadline-ms");
63
+ if (at < 0) return { argv, deadlineMs: null };
64
+ if (argv.indexOf("--deadline-ms", at + 1) >= 0) return null;
65
+ const raw = argv[at + 1];
66
+ if (raw === undefined || !/^\d+$/.test(raw)) return null;
67
+ const value = Number(raw);
68
+ if (!Number.isSafeInteger(value) || value <= 0) return null;
69
+ return { argv: [...argv.slice(0, at), ...argv.slice(at + 2)], deadlineMs: value };
70
+ }
71
+
72
+ export function parseStopApproval(input: string[]): StopApprovalParse {
73
+ const taken = takeStopDeadline(input);
74
+ if (!taken) return { ok: false };
75
+ const { argv, deadlineMs } = taken;
76
+ if (argv.length === 0) return { ok: true, json: false, approval: null, deadlineMs };
77
+ if (argv.every(arg => arg === "--json")) return { ok: true, json: true, approval: null, deadlineMs };
48
78
  const names = ["--expect-pid", "--expect-port", "--expect-hostname",
49
79
  "--expect-config-home", "--expect-cli-version", "--expect-compatibility-token"];
50
80
  if (argv.filter(arg => arg === "--json").length !== 1) return { ok: false };
@@ -68,7 +98,7 @@ export function parseStopApproval(argv: string[]): StopApprovalParse {
68
98
  const cliVersion = values.get("--expect-cli-version") ?? "";
69
99
  if (pid === null || port === null || !/^[a-f0-9]{64}$/.test(compatibilityToken)
70
100
  || !configHome || !cliVersion) return { ok: false };
71
- return { ok: true, json: true, approval: {
101
+ return { ok: true, json: true, deadlineMs, approval: {
72
102
  pid, port, hostname: values.get("--expect-hostname") ?? "",
73
103
  configHome, cliVersion, compatibilityToken,
74
104
  } };
@@ -104,23 +134,25 @@ export function stopApprovalMismatch(expected: StopApproval, now: ResolveJson):
104
134
  return null;
105
135
  }
106
136
 
107
- export function approvalChanged(detail?: string): StopOutcome {
137
+ export function approvalChanged(detail?: string, serviceStopReason?: StopServiceReason): StopOutcome {
108
138
  return { ok: false, summary: {
109
139
  schema: STOP_SUMMARY_SCHEMA, ok: false, outcome: "approval-changed", exitCode: 1,
110
140
  runtimeDown: false, service: "absent", proxy: "unknown", sharedTeardown: "skipped",
111
141
  ...(detail ? { detail } : {}),
142
+ ...stopReasonFields({ serviceStopReason }),
112
143
  message: `The approved runtime or managing CLI changed${detail ? `: ${detail}` : ""}; no stop was attempted.`,
113
144
  } };
114
145
  }
115
146
 
116
147
  export function managerStillActive(
117
148
  service: StopServiceOutcome,
118
- record?: Pick<StopRunRecord, "proxy" | "sharedTeardown">,
149
+ record?: Pick<StopRunRecord, "proxy" | "sharedTeardown" | "serviceStopReason" | "portHeldByForeign">,
119
150
  ): StopOutcome {
120
151
  return { ok: false, summary: {
121
152
  schema: STOP_SUMMARY_SCHEMA, ok: false, outcome: "manager-still-active", exitCode: 1,
122
153
  runtimeDown: false, service,
123
154
  proxy: record?.proxy ?? "unknown", sharedTeardown: record?.sharedTeardown ?? "skipped",
155
+ ...stopReasonFields(record ?? {}),
124
156
  message: "The approved runtime and service manager could not both be confirmed stopped.",
125
157
  } };
126
158
  }
@@ -129,14 +161,14 @@ export async function runApprovedStop(
129
161
  expected: StopApproval,
130
162
  read: () => Promise<ResolveJson | null>,
131
163
  tracked: () => TrackedRuntimeCheck,
132
- managerTarget: () => GuardedManagerTarget,
164
+ managerTarget: () => MaybePromise<GuardedManagerTarget>,
133
165
  stop: (snapshot: GuardedStopSnapshot) => Promise<StopOutcome>,
134
166
  ): Promise<StopOutcome> {
135
167
  let snapshot: GuardedStopSnapshot | null = null;
136
168
  try {
137
169
  const now = await read();
138
170
  const target = tracked();
139
- const manager = managerTarget();
171
+ const manager = await managerTarget();
140
172
  if (now === null) return approvalChanged("the runtime could not be re-resolved");
141
173
  const mismatch = stopApprovalMismatch(expected, now);
142
174
  if (mismatch !== null) return approvalChanged(mismatch);
@@ -149,9 +181,9 @@ export async function runApprovedStop(
149
181
  return approvalChanged("the tracked runtime record changed");
150
182
  }
151
183
  if (manager.kind === "unknown") {
152
- return approvalChanged(`the service manager could not be re-verified (${manager.reason})`);
184
+ return approvalChanged(`the service manager could not be re-verified (${manager.reason})`, manager.stopReason);
153
185
  }
154
- if (manager.kind === "bound" && manager.pid !== expected.pid) {
186
+ if ((manager.kind === "bound" || manager.kind === "bound-stray") && manager.pid !== expected.pid) {
155
187
  return approvalChanged("a different manager owns the approved runtime");
156
188
  }
157
189
  snapshot = { approval: expected, manager };
@@ -188,30 +220,40 @@ export async function settleApprovedTarget(
188
220
  export async function runGuardedManagerStep(
189
221
  snapshot: GuardedStopSnapshot,
190
222
  io: {
191
- revalidateManager: () => GuardedManagerTarget;
192
- stopManager: () => StopServiceOutcome;
223
+ revalidateManager: () => MaybePromise<GuardedManagerTarget>;
224
+ /** Async on every platform; on Windows it is Part A of the checked stop (#7771). */
225
+ stopManager: () => MaybePromise<StopServiceOutcome>;
193
226
  signalApproved: () => Promise<boolean>;
194
227
  settle: () => Promise<boolean>;
228
+ /**
229
+ * Windows Part B after settle (#7771): the approved endpoint stays free for the hold
230
+ * and no wrapper of this home came back. Runs only where stopManager ran.
231
+ */
232
+ confirmFreed?: () => Promise<boolean>;
195
233
  managerState: () => Promise<"inactive" | "active" | "unknown">;
196
234
  },
197
235
  ): Promise<{ service: StopServiceOutcome; effect: "stopped" | "approval-changed" | "manager-still-active" | "failed";
198
- proxy: "stopped" | "unknown"; handledByProxy: boolean; detail?: string }> {
236
+ proxy: "stopped" | "unknown"; handledByProxy: boolean; detail?: string; stopReason?: StopServiceReason }> {
199
237
  try {
200
- const current = io.revalidateManager();
238
+ const current = await io.revalidateManager();
201
239
  if (!sameGuardedManager(snapshot.manager, current)) {
202
240
  // An unprovable manager is not a proven change: name the observation failure,
203
241
  // not a swap, or the stop log loses why the revalidation could not answer.
204
242
  const detail = current.kind === "unknown"
205
243
  ? `the service manager could not be re-verified (${current.reason})`
206
244
  : "the service manager changed between approval and stop";
207
- return { service: "absent", effect: "approval-changed", proxy: "unknown", handledByProxy: false, detail };
245
+ return { service: "absent", effect: "approval-changed", proxy: "unknown", handledByProxy: false, detail,
246
+ ...(current.kind === "unknown" && current.stopReason ? { stopReason: current.stopReason } : {}) };
208
247
  }
209
248
  } catch {
210
249
  return { service: "absent", effect: "approval-changed", proxy: "unknown", handledByProxy: false,
211
250
  detail: "the service manager could not be re-validated" };
212
251
  }
213
- const service = snapshot.manager.kind === "absent" ? "absent" : io.stopManager();
214
- if (snapshot.manager.kind === "bound"
252
+ // The order is the #7771 contract: the manager and its wrappers end first (nothing can
253
+ // relaunch the child), then the approved PID gets its graceful signal and receipt.
254
+ const managed = snapshot.manager.kind !== "absent";
255
+ const service = managed ? await io.stopManager() : "absent";
256
+ if (managed
215
257
  && service !== "stopped" && service !== "stopped-respawnable") {
216
258
  return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy: false };
217
259
  }
@@ -231,6 +273,11 @@ export async function runGuardedManagerStep(
231
273
  if (!await io.settle()) {
232
274
  return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy };
233
275
  }
276
+ if (managed && io.confirmFreed) {
277
+ try {
278
+ if (!await io.confirmFreed()) return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy };
279
+ } catch { return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy }; }
280
+ }
234
281
  try {
235
282
  if (await io.managerState() !== "inactive") {
236
283
  return { service, effect: "manager-still-active", proxy: "unknown", handledByProxy };
@@ -41,6 +41,12 @@ export type StopSharedTeardownOutcome =
41
41
  | "failed"
42
42
  | "skipped";
43
43
 
44
+ /**
45
+ * Why the checked Windows service stop did not succeed (#7771). Additive on ocx-stop/1:
46
+ * absent when the CLI has no reason to name, so older documents read unchanged.
47
+ */
48
+ export type StopServiceReason = "access-denied" | "evidence-unreadable" | "unbound-wrapper" | "unverified-budget";
49
+
44
50
  /** Facts recorded where the stop path already decides them. */
45
51
  export interface StopRunRecord {
46
52
  /** What stopServiceIfInstalledDetailed returned, or "error" when it threw. */
@@ -53,6 +59,10 @@ export interface StopRunRecord {
53
59
  inheritedTeardownBlocks: boolean;
54
60
  /** A discharged receipt could not be removed from disk. */
55
61
  receiptClearFailed: boolean;
62
+ /** Windows checked stop: the reason a Part A or Part B result was not a success. */
63
+ serviceStopReason?: StopServiceReason;
64
+ /** Windows checked stop: Part B found another program on the port after ours were gone. */
65
+ portHeldByForeign?: boolean;
56
66
  }
57
67
 
58
68
  /** The internal booleans that already pick the process exit code. */
@@ -81,6 +91,10 @@ export interface StopSummaryJson {
81
91
  * run can name one. Additive on `ocx-stop/1`; absent on every other outcome.
82
92
  */
83
93
  detail?: string;
94
+ /** Additive (#7771): see StopRunRecord.serviceStopReason. Omitted when there is none. */
95
+ serviceStopReason?: StopServiceReason;
96
+ /** Additive (#7771): true or false once Part B ran, omitted otherwise; never null. */
97
+ portHeldByForeign?: boolean;
84
98
  }
85
99
 
86
100
  /** What handleStop returns: the pre-existing boolean plus the structured twin. */
@@ -126,6 +140,14 @@ function stopMessage(record: StopRunRecord, signals: StopRunSignals, outcome: St
126
140
  return "The stop failed.";
127
141
  }
128
142
 
143
+ /** The additive #7771 fields of a record, omitted when unset (never null). */
144
+ export function stopReasonFields(record: Partial<Pick<StopRunRecord, "serviceStopReason" | "portHeldByForeign">>): Pick<StopSummaryJson, "serviceStopReason" | "portHeldByForeign"> {
145
+ return {
146
+ ...(record.serviceStopReason ? { serviceStopReason: record.serviceStopReason } : {}),
147
+ ...(typeof record.portHeldByForeign === "boolean" ? { portHeldByForeign: record.portHeldByForeign } : {}),
148
+ };
149
+ }
150
+
129
151
  /** Pure mapper from the recorded run to the wire document. */
130
152
  export function summarizeStopRun(record: StopRunRecord, signals: StopRunSignals): StopSummaryJson {
131
153
  const outcome = stopOutcome(record, signals);
@@ -139,6 +161,7 @@ export function summarizeStopRun(record: StopRunRecord, signals: StopRunSignals)
139
161
  proxy: record.proxy,
140
162
  sharedTeardown: record.sharedTeardown,
141
163
  message: stopMessage(record, signals, outcome),
164
+ ...stopReasonFields(record),
142
165
  };
143
166
  }
144
167
 
@@ -0,0 +1,304 @@
1
+ /**
2
+ * ocx stop's side of the checked Windows service stop (#7771, 030 "Two parts").
3
+ *
4
+ * handleStopUnlocked in src/cli/index.ts keeps its structure; the Windows-specific
5
+ * decisions live here so that file does not grow:
6
+ *
7
+ * - snapshotless: Part A runs as the service stop, with admission against the stop
8
+ * deadline. A result other than stopped/absent holds the child stop (no POST), and a
9
+ * stopped result makes Part B replace the old respawn re-poll;
10
+ * - guarded: the manager inspection reads the evidence snapshot (windowsProcessSnapshot,
11
+ * native creation times on x64) once per inspection, and Part A binds against the
12
+ * revalidation's snapshot; Part B runs after settle on the approved endpoint, and its
13
+ * final enumeration is the one the manager-state checks share;
14
+ * - the teardown receipt carries the Part A record, so /api/stop skips a second Part A.
15
+ *
16
+ * Off Windows every function keeps today's behavior and timing.
17
+ */
18
+ import { recordPendingTeardownPartA, type PendingTeardownPartA } from "../config/pending-teardown";
19
+ import { readPid } from "../config/process-state";
20
+ import { observeGuardedManagerStopped, inspectGuardedManagerTarget, type GuardedManagerTarget } from "../service/guarded-manager-target";
21
+ // Through the barrel, like every other stop-path call, so the parent-stop fixtures can see it.
22
+ import { proxyStillLiveAfterStop, stopServiceIfInstalledDetailed, stopServiceIfInstalledReport } from "../service";
23
+ import type { ServiceStopOutcome } from "../service/orchestration";
24
+ import type { WindowsCheckedStopResult } from "../service/windows-checked-stop";
25
+ import { readScheduleServicePid, windowsProcessSnapshot, type WindowsStopProcessEntry } from "../service/windows-process-evidence";
26
+ import {
27
+ confirmWindowsServiceStop,
28
+ describeWindowsPartA,
29
+ describeWindowsPartB,
30
+ windowsPartARecord,
31
+ windowsServiceStopHooks,
32
+ windowsServiceStopPort,
33
+ windowsStopAdmission,
34
+ windowsStopReason,
35
+ windowsStopRemainingMs,
36
+ } from "../service/windows-service-stop";
37
+ import { WINDOWS_STOP_CAPS } from "../service/windows-stop-budget";
38
+ import type { StopRunRecord } from "./stop-report";
39
+
40
+ const EVIDENCE_SNAPSHOT_TIMEOUT_MS = 5_000;
41
+ const SCHEDULE_PID_TIMEOUT_MS = 2_000;
42
+ const ORPHAN_DISCOVERY_CAP_MS = WINDOWS_STOP_CAPS.orphanDiscovery;
43
+
44
+ interface WindowsStopState {
45
+ platform: NodeJS.Platform;
46
+ result: WindowsCheckedStopResult | null;
47
+ snapshotless: boolean;
48
+ port: number | null;
49
+ /** The evidence the last guarded inspection read; the bind reuses it. */
50
+ evidence: { snapshot: readonly WindowsStopProcessEntry[] | null; schedulePid: number | null } | null;
51
+ /** Part B's final enumeration, which the guarded manager-state checks share. */
52
+ partBSnapshot: readonly WindowsStopProcessEntry[] | null;
53
+ }
54
+
55
+ const state: WindowsStopState = {
56
+ platform: process.platform, result: null, snapshotless: false, port: null, evidence: null, partBSnapshot: null,
57
+ };
58
+
59
+ /** Test-only: simulate the platform the stop wiring acts for, and start from a clean run. */
60
+ export function resetOcxWindowsStopForTests(platform: NodeJS.Platform | null = null): void {
61
+ state.platform = platform ?? process.platform;
62
+ state.result = null;
63
+ state.snapshotless = false;
64
+ state.port = null;
65
+ state.evidence = null;
66
+ state.partBSnapshot = null;
67
+ }
68
+
69
+ function windows(): boolean {
70
+ return state.platform === "win32";
71
+ }
72
+
73
+ export function windowsStopRequiresReceipt(): boolean {
74
+ return windows();
75
+ }
76
+
77
+ function begin(snapshotless: boolean): void {
78
+ state.result = null;
79
+ state.snapshotless = snapshotless;
80
+ state.port = null;
81
+ state.partBSnapshot = null;
82
+ }
83
+
84
+ function annotate(nonce: string | undefined): void {
85
+ const record = state.result ? windowsPartARecord(state.result) : null;
86
+ if (!nonce || !record) return;
87
+ try {
88
+ recordPendingTeardownPartA(nonce, record);
89
+ } catch {
90
+ // Without the record the route runs its own capped Part A, which is today's behavior.
91
+ }
92
+ }
93
+
94
+ /** A stop that never reaches the service manager (a sibling, an already-stopped client). */
95
+ export function noServiceStop(): ServiceStopOutcome {
96
+ begin(false);
97
+ return "absent";
98
+ }
99
+
100
+ /** The snapshotless service stop: Part A on Windows, today's manager stop elsewhere. */
101
+ export async function stopServiceForOcxStop(io: {
102
+ receiptNonce: () => string | undefined;
103
+ inheritedReceipts: number;
104
+ }): Promise<ServiceStopOutcome> {
105
+ begin(true);
106
+ if (!windows()) return stopServiceIfInstalledDetailed();
107
+ state.port = windowsServiceStopPort();
108
+ const report = await stopServiceIfInstalledReport({
109
+ admission: windowsStopAdmission({ orphanDiscovery: readPid() === null, inheritedReceipts: io.inheritedReceipts }),
110
+ }, state.platform);
111
+ state.result = report.windows;
112
+ annotate(io.receiptNonce());
113
+ return report.outcome;
114
+ }
115
+
116
+ /** The record a receipt claimed after Part A carries (null before Part A or off Windows). */
117
+ export function windowsPartAReceiptRecord(): PendingTeardownPartA | null {
118
+ return state.result ? windowsPartARecord(state.result) : null;
119
+ }
120
+
121
+ /** Part A held the child stop; handleStopUnlocked skips the POST branch entirely. */
122
+ export function windowsChildStopHeld(): boolean {
123
+ const outcome = state.result?.outcome;
124
+ return windows() && state.snapshotless && outcome !== "stopped" && outcome !== "absent";
125
+ }
126
+
127
+ /** ocx uninstall's service stop: Part A on Windows (60 s deadline), today's stop elsewhere. */
128
+ export async function stopServiceForUninstall(): Promise<ServiceStopOutcome> {
129
+ begin(true);
130
+ if (!windows()) return stopServiceIfInstalledDetailed();
131
+ state.port = windowsServiceStopPort();
132
+ const report = await stopServiceIfInstalledReport({
133
+ admission: windowsStopAdmission({ orphanDiscovery: readPid() === null }),
134
+ }, state.platform);
135
+ state.result = report.windows;
136
+ return report.outcome;
137
+ }
138
+
139
+ /**
140
+ * ocx uninstall's restart-window check after the service was removed: Part B on Windows
141
+ * after a Part A stopped, the legacy re-poll otherwise. Throws when the window fails; a
142
+ * port held by another program does not stop an uninstall.
143
+ */
144
+ export async function verifyUninstallStopWindow(): Promise<void> {
145
+ if (!windowsPartBDue()) {
146
+ const survivor = await proxyStillLiveAfterStop({ canRespawn: true });
147
+ if (survivor) throw new Error(`a proxy is still listening on port ${survivor.port} after the service was removed; it is being respawned`);
148
+ return;
149
+ }
150
+ const result = await confirmWindowsServiceStop({ port: state.port ?? windowsServiceStopPort(), remainingMs: windowsStopRemainingMs() });
151
+ if (result.outcome === "freed") return;
152
+ if (result.outcome === "port-held-by-foreign") {
153
+ console.warn("⚠️ " + describeWindowsPartB(result));
154
+ return;
155
+ }
156
+ throw new Error(describeWindowsPartB(result));
157
+ }
158
+
159
+ /** Snapshotless Windows only: Part A stopped, so Part B confirms the port afterwards. */
160
+ export function windowsPartBDue(): boolean {
161
+ return windows() && state.snapshotless && state.result?.outcome === "stopped";
162
+ }
163
+
164
+ /**
165
+ * Part B owns the port wait after a stopped Part A on BOTH Windows paths (#7771).
166
+ *
167
+ * `windowsPartBDue` stays snapshotless-only because it also gates the legacy respawn
168
+ * re-poll (`schedulerCanRespawn`). This predicate is only about the port wait: on the
169
+ * guarded path Part B runs after `settle`, so `stopProxy`'s legacy 15 s
170
+ * `waitForStoppedPort` must not run on top of it.
171
+ */
172
+ export function windowsPartBOwnsPortWait(): boolean {
173
+ return windows() && state.result?.outcome === "stopped";
174
+ }
175
+
176
+ /**
177
+ * A Part A result other than stopped/absent holds the child stop (030 "Two parts"): no
178
+ * POST, the shared teardown skipped, proxy unknown. Records the additive reason.
179
+ */
180
+ export function windowsPartAHolds(record: StopRunRecord): boolean {
181
+ const result = state.result;
182
+ if (!windows() || !result || result.outcome === "stopped" || result.outcome === "absent") return false;
183
+ const reason = windowsStopReason(result);
184
+ if (reason) record.serviceStopReason = reason;
185
+ console.error(" " + describeWindowsPartA(result));
186
+ if (!state.snapshotless) return true;
187
+ record.proxy = "unknown";
188
+ console.error(" The proxy was left running and the shared teardown skipped: the service could relaunch it.");
189
+ return true;
190
+ }
191
+
192
+ /** Orphan discovery after a checked Windows stop is capped at 3 s (030 "Time budget"). */
193
+ export function orphanDiscoveryCap(): { deadlineAt?: number } {
194
+ return windowsPartBDue() ? { deadlineAt: Date.now() + ORPHAN_DISCOVERY_CAP_MS } : {};
195
+ }
196
+
197
+ /**
198
+ * After the child stop: true when the stop has to fail and hold the shared teardown.
199
+ * Windows runs Part B; a legacy respawnable stop keeps the old re-poll.
200
+ */
201
+ export async function stopWindowFailed(record: StopRunRecord): Promise<boolean> {
202
+ if (!windowsPartBDue()) {
203
+ const survivor = await proxyStillLiveAfterStop({ canRespawn: true });
204
+ if (!survivor) return false;
205
+ record.proxy = "respawned";
206
+ console.error("❌ A proxy is still listening on port " + survivor.port + " after the service stop; it is being respawned.");
207
+ console.error(" Skipping shared teardown: restoring client config while the proxy runs leaves both pointing at each other.");
208
+ return true;
209
+ }
210
+ const result = await confirmWindowsServiceStop({ port: state.port ?? windowsServiceStopPort(), remainingMs: windowsStopRemainingMs() });
211
+ record.portHeldByForeign = result.portHeldByForeign;
212
+ if (result.outcome === "freed") return false;
213
+ if (result.outcome === "port-held-by-foreign") {
214
+ console.warn("⚠️ " + describeWindowsPartB(result));
215
+ return false;
216
+ }
217
+ if (result.outcome === "survived") record.proxy = "respawned";
218
+ else {
219
+ record.proxy = "unknown";
220
+ record.serviceStopReason = "evidence-unreadable";
221
+ }
222
+ console.error("❌ " + describeWindowsPartB(result));
223
+ console.error(" Skipping shared teardown: restoring client config while the proxy runs leaves both pointing at each other.");
224
+ return true;
225
+ }
226
+
227
+ async function readEvidence(): Promise<NonNullable<WindowsStopState["evidence"]>> {
228
+ const hooks = windowsServiceStopHooks();
229
+ const [snapshot, schedulePid] = await Promise.all([
230
+ hooks?.snapshot ? hooks.snapshot() : windowsProcessSnapshot({ timeoutMs: EVIDENCE_SNAPSHOT_TIMEOUT_MS }),
231
+ hooks?.schedulePid ? hooks.schedulePid() : readScheduleServicePid({ timeoutMs: SCHEDULE_PID_TIMEOUT_MS }),
232
+ ]);
233
+ return { snapshot, schedulePid };
234
+ }
235
+
236
+ /**
237
+ * The guarded manager inspection. On Windows the process table is the evidence snapshot
238
+ * with creation times, read once here and kept: Part A binds against exactly this table.
239
+ */
240
+ export async function inspectGuardedTarget(
241
+ approvedPid: number,
242
+ approvedPort: number,
243
+ inspect: typeof inspectGuardedManagerTarget = inspectGuardedManagerTarget,
244
+ ): Promise<GuardedManagerTarget> {
245
+ if (!windows()) return inspect(approvedPid, approvedPort);
246
+ const evidence = await readEvidence();
247
+ state.evidence = evidence;
248
+ return inspect(approvedPid, approvedPort, {
249
+ win: {
250
+ winProcs: () => (evidence.snapshot ? [...evidence.snapshot] : null),
251
+ winSchedulePid: () => evidence.schedulePid,
252
+ },
253
+ });
254
+ }
255
+
256
+ /** The guarded stopManager: Part A on Windows, binding on the revalidation's snapshot. */
257
+ export async function stopGuardedManager(io: {
258
+ approvedPort: number;
259
+ receiptNonce: () => string | undefined;
260
+ inheritedReceipts: number;
261
+ }): Promise<ServiceStopOutcome> {
262
+ begin(false);
263
+ if (!windows()) return stopServiceIfInstalledDetailed();
264
+ state.port = io.approvedPort;
265
+ const report = await stopServiceIfInstalledReport({
266
+ admission: windowsStopAdmission({ orphanDiscovery: false, inheritedReceipts: io.inheritedReceipts }),
267
+ ...(state.evidence?.snapshot ? { bindSnapshot: state.evidence.snapshot } : {}),
268
+ }, state.platform);
269
+ state.result = report.windows;
270
+ annotate(io.receiptNonce());
271
+ return report.outcome;
272
+ }
273
+
274
+ /** The guarded Part B, after settle, on the approved endpoint. Off Windows: nothing to do. */
275
+ export async function confirmGuardedFreed(record: StopRunRecord): Promise<boolean> {
276
+ if (!windows() || state.snapshotless || state.result?.outcome !== "stopped" || state.port === null) return true;
277
+ const result = await confirmWindowsServiceStop({
278
+ port: state.port,
279
+ remainingMs: windowsStopRemainingMs(),
280
+ snapshot: async timeoutMs => {
281
+ const snapshot = await windowsProcessSnapshot({ timeoutMs });
282
+ state.partBSnapshot = snapshot;
283
+ return snapshot;
284
+ },
285
+ });
286
+ record.portHeldByForeign = result.portHeldByForeign;
287
+ if (result.outcome === "freed") return true;
288
+ if (result.outcome === "port-held-by-foreign") {
289
+ console.warn("⚠️ " + describeWindowsPartB(result));
290
+ return true;
291
+ }
292
+ if (result.outcome !== "survived") record.serviceStopReason = "evidence-unreadable";
293
+ console.error("❌ " + describeWindowsPartB(result));
294
+ return false;
295
+ }
296
+
297
+ /** The guarded manager-state checks; on Windows they share Part B's final enumeration. */
298
+ export function observeGuardedStopped(
299
+ manager: Exclude<GuardedManagerTarget, { kind: "unknown" }>,
300
+ observe: typeof observeGuardedManagerStopped = observeGuardedManagerStopped,
301
+ ): ReturnType<typeof observeGuardedManagerStopped> {
302
+ const snapshot = windows() ? state.partBSnapshot : null;
303
+ return snapshot ? observe(manager, { win: { winProcs: () => [...snapshot] } }) : observe(manager);
304
+ }