@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
@@ -9,7 +9,7 @@ import { verifyOrchestratedInstall } from "./orchestrated-tree.mjs";
9
9
  import { decidePostStopUpdate } from "./stop-decision.mjs";
10
10
  import { existsSync, readFileSync, readdirSync, realpathSync } from "node:fs";
11
11
  import { fileURLToPath } from "node:url";
12
- import { dirname, join, resolve } from "node:path";
12
+ import { dirname, isAbsolute, join, resolve } from "node:path";
13
13
  import { getConfigDir, getConfigPath, loadConfig } from "../config";
14
14
  import { runConfigPreflight } from "./config-preflight";
15
15
  import { readPid, readRuntimePort, getRuntimePortPath } from "../config/process-state";
@@ -29,6 +29,7 @@ import type {
29
29
  } from "./install-detection.d.mts";
30
30
  import {
31
31
  pnpmOwnerInvocation,
32
+ pnpmOwnerEnvironment,
32
33
  readPnpmGlobalPackage,
33
34
  resolvePnpmGlobalOwner,
34
35
  runPnpmGlobalUpdate,
@@ -48,6 +49,7 @@ import { selfLaunchArgv } from "../lib/self-launch-argv";
48
49
  import { createLegacyUpdateSession, createOrchestratedChildSession, decodeOrchestratedExpect } from "./orchestrated-session.mjs";
49
50
  import { runPosixInstallerSync } from "./posix-install-supervisor.mjs";
50
51
  import { runWindowsInstallerSync } from "./npm-install.mjs";
52
+ import { staleUpdateMarkerHint } from "./sync-update-mutex.mjs";
51
53
  import { protectOrchestratedWorkerSignals } from "./orchestrated-child.mjs";
52
54
  import type { OrchestratedChildArgs } from "./orchestrated-arguments.mjs";
53
55
  import { PNPM_READ_CWD, withPnpmCommandCwd, pnpmReadEnvironment } from "./pnpm-read-policy.mjs";
@@ -117,18 +119,19 @@ function runPnpmCandidate(
117
119
  capture = false,
118
120
  probeSpawn: typeof probeSpawnSync = probeSpawnSync,
119
121
  probeEnv: NodeJS.ProcessEnv = process.env,
122
+ owner?: PnpmGlobalOwner,
120
123
  ): { status: number | null; stdout?: string | null; stderr?: string | null } {
121
- const invocation = pnpmInvocationForPath(commandPath, args);
124
+ const invocation = owner ? pnpmOwnerInvocation(owner, args, process.platform, probeEnv) : pnpmInvocationForPath(commandPath, args);
122
125
  if (!invocation) return { status: 1 };
123
- return probeSpawn(invocation.file, invocation.args, {
126
+ return withPnpmCommandCwd(args, cwd => probeSpawn(invocation.file, invocation.args, {
124
127
  stdio: capture ? "pipe" : "ignore",
125
128
  encoding: "utf8",
126
129
  timeout: 20_000,
127
130
  windowsHide: true,
128
- cwd: PNPM_READ_CWD,
129
- env: pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(probeEnv)),
131
+ cwd,
132
+ env: pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(owner ? pnpmOwnerEnvironment(owner, probeEnv) : probeEnv)),
130
133
  ...invocation.options,
131
- });
134
+ }));
132
135
  }
133
136
 
134
137
  /** Resolve the exact pnpm executable/group/bin that own this package. */
@@ -142,7 +145,8 @@ export function resolveCurrentPnpmGlobalOwner(
142
145
  packagePath: packageRoot(),
143
146
  commandPaths: deps.commandPaths ?? resolvePnpmCommands(),
144
147
  runningShimPath: runningPnpmShimPath(invoked),
145
- runPnpm: (commandPath, args, capture) => runPnpmCandidate(commandPath, args, capture, probeSpawn, deps.env),
148
+ runPnpm: (commandPath, args, capture, owner) => runPnpmCandidate(commandPath, args, capture, probeSpawn, deps.env, owner),
149
+ env: deps.env ?? process.env,
146
150
  });
147
151
  }
148
152
 
@@ -166,7 +170,9 @@ export function runOwnedPnpm(
166
170
  capture: boolean,
167
171
  stdio: "inherit" | "pipe" | "ignore" = capture ? "pipe" : "inherit",
168
172
  probeSpawn: typeof probeSpawnSync = probeSpawnSync,
169
- authorizeMutation: (kind: "package") => boolean = () => ["root", "bin", "list", "config", "view", "--version"].includes(args[0] ?? ""),
173
+ authorizeMutation: (kind: "package") => boolean = () => ["root", "bin", "list", "config", "view", "--version"].includes(args[0] ?? "")
174
+ || (args[0] === "store" && args[1] === "path" && args.length === 3
175
+ && args[2]?.startsWith("--dir=") === true && isAbsolute(args[2].slice("--dir=".length))),
170
176
  session?: Pick<ReturnType<typeof createOrchestratedChildSession>, "retainInstallerFence" | "noteUntrackedInstaller" | "confirmInstallerExit">,
171
177
  markerPath = join(getConfigDir(), "update-orchestrated.json"),
172
178
  ): { status: number | null; stdout?: string | null; stderr?: string | null; processTreeExited?: boolean } {
@@ -178,7 +184,7 @@ export function runOwnedPnpm(
178
184
  const env = pnpmReadEnvironment(unprivilegedOwnershipMutationEnvironment(target.env));
179
185
  if (process.platform === "win32") {
180
186
  session.noteUntrackedInstaller();
181
- const result = runWindowsInstallerSync({ file: target.bin, args: target.args, options: target.options }, { cwd, env, authorizeMutation });
187
+ const result = runWindowsInstallerSync({ file: target.bin, args: target.args, options: target.options }, { cwd, env, authorizeMutation, markerPath });
182
188
  if (result.processTreeExited && Number.isInteger(result.status)) session.confirmInstallerExit();
183
189
  else { session.retainInstallerFence(); return { ...result, processTreeExited: false }; }
184
190
  return result;
@@ -208,6 +214,7 @@ export function runOwnedPnpm(
208
214
 
209
215
  /** Re-read the owning group's active package and return its verified launcher. */
210
216
  export function resolvePnpmActiveLauncher(owner: PnpmGlobalOwner): string | null {
217
+ if (owner.globalStore && !Array.isArray(owner.virtualStoreDirs)) return null;
211
218
  const active = readPnpmGlobalPackage(
212
219
  PKG,
213
220
  (args, capture = false) => runOwnedPnpm(owner, args, capture),
@@ -473,7 +480,12 @@ export async function runUpdate(child?: Extract<OrchestratedChildArgs, { ok: tru
473
480
  } else {
474
481
  session = createLegacyUpdateSession({ home: getConfigDir() });
475
482
  const started = session.start();
476
- if (!started.ok) { console.error(`opencodex: ${started.error}`); process.exitCode = 1; return; }
483
+ if (!started.ok) {
484
+ console.error(`opencodex: ${started.error}`);
485
+ if (started.staleMarker) for (const line of staleUpdateMarkerHint(getConfigDir())) console.error(line);
486
+ process.exitCode = 1;
487
+ return;
488
+ }
477
489
  process.once("exit", () => session?.finishPreflight());
478
490
  }
479
491
  try { await runUpdateWithSession(child, session); }
@@ -687,6 +699,8 @@ async function runUpdateWithSession(child: Extract<OrchestratedChildArgs, { ok:
687
699
  // An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
688
700
  const env = mutation.controlEnvironment(withoutSiblingMarker(process.env));
689
701
  delete env.OCX_SERVICE;
702
+ // Not launched by a supervisor: none of its markers (src/lib/supervisor-markers.ts) may ride along.
703
+ for (const name of ["OCX_DESKTOP_SUPERVISED", "OCX_SERVICE_MANAGED", "OCX_WINDOWS_WRAPPER_PROTOCOL"]) delete env[name];
690
704
  const runtimeEnv = withProcessRuntimeProvenance(env);
691
705
  if (!homePolicy.authorizeMutation("runtime")) return "refused";
692
706
  const child = guardedSpawn(homePolicy.authorizeMutation, "runtime", process.execPath, [postUpdateLauncher, "start", "--port", String(capturedListen.port)], {
@@ -1007,6 +1021,7 @@ async function runUpdateWithSession(child: Extract<OrchestratedChildArgs, { ok:
1007
1021
  session.noteUntrackedInstaller();
1008
1022
  const supervised = runWindowsInstallerSync({ file: target.bin, args: target.args, options: target.options }, {
1009
1023
  env: mutation.unprivilegedEnvironment(), authorizeMutation: homePolicy.authorizeMutation,
1024
+ markerPath: join(getConfigDir(), "update-orchestrated.json"),
1010
1025
  });
1011
1026
  if (supervised.processTreeExited === true && Number.isInteger(supervised.status)) session.confirmInstallerExit();
1012
1027
  else session.retainInstallerFence();
@@ -1,4 +1,5 @@
1
1
  import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
2
+ import { isInMarkedPnpmCustomStore, isInPnpmGlobalStoreLinks } from "./pnpm-store-layout.mjs";
2
3
 
3
4
  const OPENCODEX_MISE_BACKEND = "npm:@bitkyc08/opencodex";
4
5
  const OPENCODEX_MISE_BACKEND_DIR = "npm-bitkyc08-opencodex";
@@ -252,7 +253,8 @@ function detectInstallCandidate(packagePath, exists) {
252
253
  // npm prefix such as `/opt/global/v11` from its directory name alone.
253
254
  if (
254
255
  /(?:^|\/)node_modules\/\.pnpm(?:\/|$)/i.test(normalized)
255
- || /(?:^|\/)store\/v\d+\/links(?:\/|$)/i.test(normalized)
256
+ || isInPnpmGlobalStoreLinks(normalized, exists)
257
+ || isInMarkedPnpmCustomStore(normalized, exists)
256
258
  ) return "pnpm";
257
259
 
258
260
  // `--preserve-symlinks` can leave a v10/v11 group path visible. Corroborate it with the
@@ -12,6 +12,8 @@ export function spawnWorkerPinnedStart(cmd: { bin: string; args: string[]; displ
12
12
  // An ordinary owner: a stray sibling marker would otherwise mark it before any probe.
13
13
  const env: NodeJS.ProcessEnv = withoutSiblingMarker(process.env);
14
14
  delete env.OCX_SERVICE;
15
+ // Not launched by a supervisor: none of its markers (src/lib/supervisor-markers.ts) may ride along.
16
+ for (const name of ["OCX_DESKTOP_SUPERVISED", "OCX_SERVICE_MANAGED", "OCX_WINDOWS_WRAPPER_PROTOCOL"]) delete env[name];
15
17
  report(`$ ${cmd.display}`);
16
18
  let stdio: "ignore" | [ "ignore", number, number ] = "ignore";
17
19
  let logFd: number | undefined;
@@ -1,39 +1,26 @@
1
- import { join } from "node:path";
2
- import { getConfigDir } from "../config";
3
- import { guardedStopWinsw, guardedStopWindows, guardedKillWindowsWrappers } from "./guarded-runtime-ops";
4
- import { readServiceBackend } from "../service";
1
+ import { guardedStopWindowsChecked } from "./guarded-runtime-ops";
5
2
  import type { UpdateMutationAuthorizer } from "./mutation-guard.mjs";
6
3
 
7
- /** Stop the installed Windows backend and best-effort kill surviving :loop wrappers. */
8
- export function stopWindowsServiceWrappersBestEffort(authorizeMutation: UpdateMutationAuthorizer): void {
9
- if (process.platform !== "win32") return;
10
- try {
11
- if (readServiceBackend() === "native") {
12
- if (!authorizeMutation("service")) return;
13
- guardedStopWinsw(authorizeMutation);
14
- return;
15
- }
16
- if (!authorizeMutation("service")) return;
17
- guardedStopWindows(authorizeMutation);
18
- } catch { /* already stopped */ }
19
- if (!authorizeMutation("service")) return;
20
- killWindowsServiceWrapperProcesses(authorizeMutation);
21
- }
4
+ /** Why an automatic update restart stopped instead of starting a runtime over a live service. */
5
+ export const WINDOWS_SERVICE_STOP_ABORT = "Automatic update restart stopped: the Windows service could not be proven stopped, "
6
+ + "so no runtime was started over it. Run 'ocx stop' from a terminal, then 'ocx start'.";
22
7
 
23
8
  /**
24
- * Best-effort termination of surviving Windows scheduler launcher/wrapper processes.
25
- * `schtasks /end` ends the task instance but often leaves wscript/cmd running the
26
- * `:loop` batch, which brings the proxy back during post-update reclaim.
9
+ * Stop the installed Windows backend before the updater replaces or restarts the runtime.
10
+ * Returns false when the restart must abort; true when nothing can relaunch the proxy.
27
11
  *
28
- * This used to match the bare filenames with -like '*name*', which could stop a
29
- * wrapper belonging to a DIFFERENT OpenCodex home under the same account. The
30
- * shared killer scopes to this home's canonical paths as complete tokens.
12
+ * Both backends use Part A of the checked stop (#7771) through the authorizer-gated
13
+ * variant: the service authorization runs at entry and before every terminate, and only
14
+ * stopped or absent lets the restart go on.
31
15
  */
32
- function killWindowsServiceWrapperProcesses(authorizeMutation: UpdateMutationAuthorizer): void {
33
- const paths = {
34
- scriptPath: join(getConfigDir(), "opencodex-service.cmd"),
35
- launcherPath: join(getConfigDir(), "opencodex-service-launcher.vbs"),
36
- };
37
- if (!authorizeMutation("service")) return;
38
- guardedKillWindowsWrappers(authorizeMutation, paths);
16
+ export async function stopWindowsServiceForRestart(authorizeMutation: UpdateMutationAuthorizer): Promise<boolean> {
17
+ if (process.platform !== "win32") return true;
18
+ if (!authorizeMutation("service")) return false;
19
+ try {
20
+ const outcome = await guardedStopWindowsChecked(authorizeMutation);
21
+ return outcome === "stopped" || outcome === "absent";
22
+ } catch {
23
+ // A refusal by the service authorizer (at entry or before a terminate) aborts too.
24
+ return false;
25
+ }
39
26
  }
package/src/update/job.ts CHANGED
@@ -22,7 +22,7 @@ import {
22
22
  type HealthzIdentity,
23
23
  } from "../server/proxy-liveness";
24
24
  import { isServiceInstalled, isServiceViable } from "../service";
25
- import { stopWindowsServiceWrappersBestEffort } from "./job-windows-restart";
25
+ import { stopWindowsServiceForRestart, WINDOWS_SERVICE_STOP_ABORT } from "./job-windows-restart";
26
26
  import { createUpdateServiceHomePolicy, inspectUpdateServiceHome, type UpdateServiceHomeInspector } from "./service-home-authority";
27
27
  import { runUpdateRestartWithOwnershipLease, type ServiceOwnershipResolution } from "./restart-ownership";
28
28
  import { restartServiceManagerAfterUpdate, unsettledManagerRestartFailure, unsupervisedRestartFailure, type ManagerRestartFn } from "./job-supervised-restart";
@@ -396,6 +396,10 @@ export function readUpdateJob(jobId?: string | null): UpdateJobState | null {
396
396
  function updateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?: string): UpdateJobState {
397
397
  const next = prepareUpdateJob(job, patch, logLine); writeJob(next); return next;
398
398
  }
399
+ /** A Windows service that could not be proven stopped aborts the restart (#7771). */
400
+ function windowsServiceStopAborted(job: UpdateJobState): false {
401
+ updateJob(job, { status: "failed", restarted: false, error: WINDOWS_SERVICE_STOP_ABORT }, WINDOWS_SERVICE_STOP_ABORT); return false;
402
+ }
399
403
  function prepareUpdateJob(job: UpdateJobState, patch: Partial<UpdateJobState>, logLine?: string): UpdateJobState {
400
404
  const current = readUpdateJob(job.id) ?? job;
401
405
  const next = {
@@ -954,7 +958,8 @@ export interface RestartIo {
954
958
  serviceInstalledFn?: () => boolean;
955
959
  serviceHomeAuthorityFn?: UpdateServiceHomeInspector;
956
960
  serviceHomeBaseline?: ReturnType<UpdateServiceHomeInspector>; // Worker delegation pins its original authority.
957
- stopServiceWrappersFn?: (authorizeMutation: UpdateMutationAuthorizer) => void;
961
+ /** Windows service stop before a restart; an explicit false aborts the restart (#7771). */
962
+ stopServiceWrappersFn?: (authorizeMutation: UpdateMutationAuthorizer) => boolean | void | Promise<boolean | void>;
958
963
  readPidFn?: typeof readPid;
959
964
  /**
960
965
  * After a service reinstall exits 0, only trust the service path when this is true.
@@ -1121,7 +1126,7 @@ async function restartAfterUpdate(
1121
1126
  if (!homePolicy.authorizeMutation("runtime")) return false; // a home change during the service-args import refuses before stop/reclaim
1122
1127
  // schtasks /end often leaves the hidden wrapper alive; its :loop respawns
1123
1128
  // `ocx start` and races reclaim, so end wrappers before the socket.
1124
- if (homePolicy.authorizeMutation("service")) (io.stopServiceWrappersFn ?? stopWindowsServiceWrappersBestEffort)(homePolicy.authorizeMutation);
1129
+ if (homePolicy.authorizeMutation("service") && await (io.stopServiceWrappersFn ?? stopWindowsServiceForRestart)(homePolicy.authorizeMutation) === false) return windowsServiceStopAborted(job);
1125
1130
  const preServiceAllow = reclaimKillAllowlist();
1126
1131
  const freed = await waitFn(port, hostname, reclaimOptsFor(preServiceAllow));
1127
1132
  if (!freed && !reclaimGate()) return false; // a latched denial already refused the job
@@ -1249,7 +1254,7 @@ async function restartAfterUpdate(
1249
1254
  // below are the path that repairs stuck Windows listeners.
1250
1255
  }
1251
1256
  }
1252
- if (serviceInstalled && homePolicy.authorizeMutation("service")) (io.stopServiceWrappersFn ?? stopWindowsServiceWrappersBestEffort)(homePolicy.authorizeMutation);
1257
+ if (serviceInstalled && homePolicy.authorizeMutation("service") && await (io.stopServiceWrappersFn ?? stopWindowsServiceForRestart)(homePolicy.authorizeMutation) === false) return windowsServiceStopAborted(job);
1253
1258
  // Reclaim before the pinned start: a busy old socket used to hop ports or fail health.
1254
1259
  const directAllow = reclaimKillAllowlist();
1255
1260
  const freed = await waitFn(port, hostname, reclaimOptsFor(directAllow));
@@ -1348,7 +1353,9 @@ async function restartAfterUpdate(
1348
1353
  lastChild = null;
1349
1354
  }
1350
1355
  if (!homePolicy.authorizeMutation("runtime")) return false;
1351
- if (preparePort(job, port, listPids, aliveFn, verifyOcx, () => { if (serviceInstalled && homePolicy.authorizeMutation("service")) (io.stopServiceWrappersFn ?? stopWindowsServiceWrappersBestEffort)(homePolicy.authorizeMutation); }, reclaimGate) === false) return false;
1356
+ // #7771: the service stop runs before the synchronous preparation so its outcome can abort.
1357
+ if (serviceInstalled && homePolicy.authorizeMutation("service") && await (io.stopServiceWrappersFn ?? stopWindowsServiceForRestart)(homePolicy.authorizeMutation) === false) return windowsServiceStopAborted(job);
1358
+ if (preparePort(job, port, listPids, aliveFn, verifyOcx, undefined, reclaimGate) === false) return false;
1352
1359
  const ready = await waitForGhost(
1353
1360
  port,
1354
1361
  hostname,
@@ -5,4 +5,15 @@ export declare function runWindowsInstallerSync(invocation: NpmInvocation, optio
5
5
  cwd?: string;
6
6
  timeoutMs?: number;
7
7
  authorizeMutation?: (kind: "package") => boolean;
8
+ markerPath?: string;
8
9
  }): { status: number | null; processTreeExited: boolean };
10
+ export declare function runNpmInstall(invocation: NpmInvocation | null, options?: {
11
+ env?: NodeJS.ProcessEnv;
12
+ timeoutMs?: number;
13
+ authorizeMutation?: (kind: "package") => boolean;
14
+ markerPath?: string;
15
+ }): Promise<{ status: number | null; processTreeExited: boolean; error?: { code?: string; message: string } }>;
16
+ export declare function setWindowsInstallerSupervisorForTests(seams: {
17
+ platform?: NodeJS.Platform;
18
+ launch?: (file: string, args: string[], options: { env: NodeJS.ProcessEnv; windowsHide: boolean; stdio: ["pipe", "pipe", "pipe"] }) => import("node:child_process").ChildProcess;
19
+ } | null): void;
@@ -3,16 +3,28 @@
3
3
  import { guardedSpawn, guardedSpawnSync, materializeMutationData } from "./mutation-guard.mjs";
4
4
  import { dirname, join, win32 } from "node:path";
5
5
  import { fileURLToPath } from "node:url";
6
+ import { publishWindowsInstallerPid } from "./windows-installer-marker.mjs";
7
+ import { isTestHomeGuardArmed } from "./test-home-guard.mjs";
6
8
 
7
9
  const JOIN_MS = 10000;
8
10
  const failure = message => ({ status: null, processTreeExited: false, error: { code: "EINSTALLJOIN", message } });
9
11
 
12
+ let windowsSupervisorSeamsForTests = null;
13
+ /**
14
+ * Test seam: drive the Windows supervisor branch with a fake platform and supervisor launcher. A
15
+ * fake launcher skips guardedSpawn, so the seam refuses outside a test process.
16
+ */
17
+ export function setWindowsInstallerSupervisorForTests(seams) {
18
+ if (seams !== null && !isTestHomeGuardArmed()) throw Error("the Windows installer supervisor seam is test-only");
19
+ windowsSupervisorSeamsForTests = seams;
20
+ }
21
+
10
22
  /** Bridge synchronous pnpm transactions to the same Windows Job Object barrier. */
11
- export function runWindowsInstallerSync(invocation, { env = process.env, cwd, timeoutMs = 180000, authorizeMutation = () => false } = {}) {
23
+ export function runWindowsInstallerSync(invocation, { env = process.env, cwd, timeoutMs = 180000, authorizeMutation = () => false, markerPath } = {}) {
12
24
  const moduleUrl = import.meta.url;
13
- const script = `import {readFileSync} from 'node:fs';import {runNpmInstall} from ${JSON.stringify(moduleUrl)};const input=JSON.parse(readFileSync(0,'utf8'));console.log(JSON.stringify(await runNpmInstall(input.invocation,{timeoutMs:input.timeoutMs,authorizeMutation:()=>true})));`;
25
+ const script = `import {readFileSync} from 'node:fs';import {runNpmInstall} from ${JSON.stringify(moduleUrl)};const input=JSON.parse(readFileSync(0,'utf8'));console.log(JSON.stringify(await runNpmInstall(input.invocation,{timeoutMs:input.timeoutMs,markerPath:input.markerPath,authorizeMutation:()=>true})));`;
14
26
  const result = guardedSpawnSync(authorizeMutation, "package", process.execPath, ["--input-type=module", "-e", script], {
15
- input: JSON.stringify({ invocation, timeoutMs }), env, cwd, encoding: "utf8", windowsHide: true, stdio: ["pipe", "pipe", "inherit"],
27
+ input: JSON.stringify({ invocation, timeoutMs, markerPath }), env, cwd, encoding: "utf8", windowsHide: true, stdio: ["pipe", "pipe", "inherit"],
16
28
  });
17
29
  try {
18
30
  const value = JSON.parse(result.stdout);
@@ -25,11 +37,12 @@ function quoteWindowsArg(value) {
25
37
  return '"' + value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\*)$/, "$1$1") + '"';
26
38
  }
27
39
 
28
- export async function runNpmInstall(invocation, { env = process.env, timeoutMs = 180000, authorizeMutation = () => false } = {}) {
40
+ export async function runNpmInstall(invocation, { env = process.env, timeoutMs = 180000, authorizeMutation = () => false, markerPath } = {}) {
29
41
  invocation = materializeMutationData(invocation);
30
42
  env = materializeMutationData(env);
31
43
  if (!invocation) return { status: 1, processTreeExited: true, error: { code: "ENOENT", message: "npm invocation unavailable" } };
32
- if (process.platform === "win32") {
44
+ const seams = windowsSupervisorSeamsForTests;
45
+ if ((seams?.platform ?? process.platform) === "win32") {
33
46
  // The PowerShell helper assigns npm to a kill-on-close Job Object before it
34
47
  // resumes the suspended process, then terminates the job on timeout and
35
48
  // waits for the job to become empty. An unconfirmed join retains the stage.
@@ -43,13 +56,26 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
43
56
  const supervisor = win32.join(root, "System32", "WindowsPowerShell", "v1.0", "powershell.exe");
44
57
  const helper = join(dirname(fileURLToPath(import.meta.url)), "npm-install-job.ps1");
45
58
  return new Promise(resolve => {
46
- const child = guardedSpawn(authorizeMutation, "package", supervisor, ["-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", helper], {
47
- env, windowsHide: true, stdio: ["pipe", "pipe", "pipe"],
59
+ const supervisorArgs = ["-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", helper];
60
+ const supervisorOptions = { env, windowsHide: true, stdio: ["pipe", "pipe", "pipe"] };
61
+ const child = seams?.launch ? seams.launch(supervisor, supervisorArgs, supervisorOptions) : guardedSpawn(authorizeMutation, "package", supervisor, supervisorArgs, {
62
+ ...supervisorOptions,
48
63
  });
49
64
  let output = "";
50
65
  let invalid = false;
51
66
  let spawned = false;
52
67
  let completed = false;
68
+ // Record the supervisor pid before it receives its request: the supervisor creates no installer
69
+ // until stdin closes, so a launcher killed after this point leaves a marker whose witness is
70
+ // the supervisor itself (#8524). "unrecorded" means nothing could be published and no
71
+ // installer will start; "live" means an earlier supervisor still runs and keeps its witness.
72
+ let witness = null;
73
+ if (markerPath !== undefined) {
74
+ try {
75
+ if (!Number.isSafeInteger(child.pid) || child.pid <= 0) throw Error("installer supervisor has no pid");
76
+ publishWindowsInstallerPid(markerPath, child.pid);
77
+ } catch (error) { witness = error?.code === "EINSTALLWITNESS" ? "live" : "unrecorded"; }
78
+ }
53
79
  const complete = result => {
54
80
  if (completed) return;
55
81
  completed = true;
@@ -57,6 +83,9 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
57
83
  child.stdin.destroy(); child.stdout.destroy(); child.stderr.destroy();
58
84
  resolve(result);
59
85
  };
86
+ const completeUnstarted = () => complete(witness === "live"
87
+ ? { status: null, processTreeExited: false, error: { code: "EINSTALLJOIN", message: "an earlier installer supervisor is still running; installer not started" } }
88
+ : { status: 1, processTreeExited: true, error: { code: "EINSTALLJOIN", message: "installer supervisor pid could not be recorded; installer not started" } });
60
89
  const watchdog = setTimeout(() => {
61
90
  child.kill();
62
91
  complete(failure(`npm supervisor exceeded ${timeoutMs} ms install budget and exit-confirmation budget; stage retained`));
@@ -69,10 +98,12 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
69
98
  else output += chunk.toString("utf8");
70
99
  });
71
100
  child.on("error", error => {
101
+ if (witness !== null) { if (!spawned) completeUnstarted(); return; }
72
102
  complete({ status: null, processTreeExited: !spawned, error: { code: error.code, message: error.message } });
73
103
  });
74
104
  child.on("close", status => {
75
105
  clearTimeout(watchdog);
106
+ if (witness !== null) { completeUnstarted(); return; }
76
107
  try {
77
108
  const result = JSON.parse(output);
78
109
  if (invalid || status !== 0 || typeof result.processTreeExited !== "boolean"
@@ -81,6 +112,12 @@ export async function runNpmInstall(invocation, { env = process.env, timeoutMs =
81
112
  } catch { complete(failure("npm supervisor did not confirm process-tree exit; stage retained")); }
82
113
  });
83
114
  child.stdin.on("error", () => { /* close/result decides whether the helper ran */ });
115
+ if (witness !== null) {
116
+ // No request: the supervisor never creates the job or the installer.
117
+ child.stdin.end();
118
+ child.kill();
119
+ return;
120
+ }
84
121
  const args = invocation.options?.windowsVerbatimArguments ? invocation.args.join(" ") : invocation.args.map(quoteWindowsArg).join(" ");
85
122
  child.stdin.end(JSON.stringify({ file: invocation.file, commandLine: quoteWindowsArg(invocation.file) + " " + args,
86
123
  cwd: process.cwd(), timeoutMs, joinMs: JOIN_MS }));
@@ -104,7 +104,7 @@ export async function inspectNodeOrchestratedIdentity(cliRoot: string, targetVer
104
104
  }
105
105
 
106
106
  export async function verifyOrchestratedChildIdentity(expected: OrchestratedExpect, targetVersion: string): Promise<boolean> {
107
- if (getConfigDir() !== expected.home) return false;
107
+ if (getConfigDir() !== expected.home || expected.pnpmOwner !== undefined) return false;
108
108
  const install = defaultDeps.install();
109
109
  const identity = await defaultDeps.identity();
110
110
  if (install.installer !== "bun" || install.cliRoot !== expected.cliRoot || (identity.kind !== "live" && identity.kind !== "absent")) return false;
@@ -5,7 +5,7 @@ import { createUpdatePlanToken } from "./orchestrated-token.mjs";
5
5
  import { waitForOrchestratedChild } from "./orchestrated-child.mjs";
6
6
  import { classifyOrchestratedOutcome } from "./orchestrated-outcome.mjs";
7
7
  import { verifyOrchestratedInstall } from "./orchestrated-tree.mjs";
8
- import { verifyOrchestratedPnpmInstall } from "./orchestrated-pnpm.mjs";
8
+ import { canonicalOrchestratedPnpmOwner, verifyOrchestratedPnpmInstall } from "./orchestrated-pnpm.mjs";
9
9
  import { resolvePnpmGlobalOwner } from "./pnpm-global-install.mjs";
10
10
  import { parseOrchestratedUpdateArgs } from "./orchestrated-arguments.mjs";
11
11
 
@@ -58,7 +58,8 @@ export async function applyNodeOrchestratedUpdate(request, deps) {
58
58
  const start = Date.now();
59
59
  channel = createOrchestratedResultChannel();
60
60
  const expect = encodeOrchestratedExpect({ home: deps.home, cliRoot: plan.cliPath, servingRoot: live?.servingRoot ?? null,
61
- runtimePid: live?.runtime.pid ?? null, planToken: plan.planToken });
61
+ runtimePid: live?.runtime.pid ?? null, planToken: plan.planToken,
62
+ ...(owner ? { pnpmOwner: canonicalOrchestratedPnpmOwner(owner) } : {}) });
62
63
  const args = [deps.launcher, "update", "--version", plan.targetVersion, "--orchestrated-expect", expect,
63
64
  "--orchestrated-result", channel.resultPath, ...(request.notAfter === undefined ? [] : ["--not-after", String(request.notAfter)])];
64
65
  const child = deps.spawn(process.execPath, args, { env: { ...process.env, OCX_UPDATE_ORCHESTRATED_CHILD: "1", OCX_UPDATE_RESULT_CAPABILITY: channel.capability }, stdio: ["ignore", 2, 2] });
@@ -1,4 +1,8 @@
1
1
  import type { PnpmGlobalOwner, RunPnpmCandidate } from "./pnpm-global-install.mjs";
2
+ import type { OrchestratedExpect } from "./orchestrated-session.mjs";
3
+
4
+ export declare function canonicalOrchestratedPnpmOwner(owner: PnpmGlobalOwner): NonNullable<OrchestratedExpect["pnpmOwner"]>;
5
+ export declare function matchesOrchestratedPnpmOwner(expected: OrchestratedExpect["pnpmOwner"], owner: PnpmGlobalOwner | undefined): boolean;
2
6
 
3
7
  export declare function verifyOrchestratedPnpmInstall(options: {
4
8
  owner: PnpmGlobalOwner;
@@ -1,10 +1,46 @@
1
1
  import { readFileSync, realpathSync, statSync } from "node:fs";
2
- import { join } from "node:path";
2
+ import { join, resolve } from "node:path";
3
3
  import { readPnpmGlobalPackage, resolvePnpmGlobalOwner } from "./pnpm-global-install.mjs";
4
4
  import { verifyPnpmInstallTree } from "./transactional-install.mjs";
5
5
 
6
6
  const PACKAGE_NAME = "@bitkyc08/opencodex";
7
7
 
8
+ const OWNER_PATHS = ["commandPath", "packagePath", "globalDir", "globalRoot", "globalBinDir"];
9
+
10
+ /**
11
+ * Freeze physical owner paths at observation time; failure to resolve any path refuses the update.
12
+ * A global-store owner also carries its canonical store, lexical store path and virtual-store
13
+ * directories; a legacy group carries none of them.
14
+ */
15
+ export function canonicalOrchestratedPnpmOwner(owner) {
16
+ const base = Object.fromEntries(OWNER_PATHS.map(field => [field, realpathSync.native(owner[field])]));
17
+ if (!owner.globalStore) {
18
+ if (owner.store !== undefined || owner.storePath !== undefined) throw new Error("pnpm legacy owner carries a store");
19
+ return base;
20
+ }
21
+ if (!Array.isArray(owner.virtualStoreDirs)) throw new Error("pnpm virtual-store configuration is unpinned");
22
+ const storePath = resolve(owner.storePath);
23
+ const store = realpathSync.native(owner.store);
24
+ if (realpathSync.native(storePath) !== store) throw new Error("pnpm store path changed");
25
+ return { ...base, store, storePath,
26
+ virtualStoreDirs: owner.virtualStoreDirs.map(path => realpathSync.native(path)) };
27
+ }
28
+
29
+ export function matchesOrchestratedPnpmOwner(expected, owner) {
30
+ if (!expected || !owner) return false;
31
+ try {
32
+ const actual = canonicalOrchestratedPnpmOwner(owner);
33
+ const equal = (left, right) => process.platform === "win32" ? left.toLowerCase() === right.toLowerCase() : left === right;
34
+ if (!OWNER_PATHS.every(field => equal(actual[field], expected[field]))) return false;
35
+ if ((expected.store === undefined) !== (actual.store === undefined)) return false;
36
+ if (actual.store === undefined) return true;
37
+ return equal(actual.store, expected.store)
38
+ && equal(actual.storePath, expected.storePath)
39
+ && Array.isArray(expected.virtualStoreDirs) && actual.virtualStoreDirs.length === expected.virtualStoreDirs.length
40
+ && actual.virtualStoreDirs.every((path, index) => equal(path, expected.virtualStoreDirs[index]));
41
+ } catch { return false; }
42
+ }
43
+
8
44
  /** Re-resolve the selected pnpm group and verify its active tree and generated shims. */
9
45
  export function verifyOrchestratedPnpmInstall({ owner, activeRoot, version, runPnpm }) {
10
46
  try {
@@ -12,21 +48,29 @@ export function verifyOrchestratedPnpmInstall({ owner, activeRoot, version, runP
12
48
  const result = realpathSync.native(path);
13
49
  return process.platform === "win32" ? result.toLowerCase() : result;
14
50
  };
15
- const verify = (path, expected) => {
51
+ // The lexical store path is compared without following links, folded like matchesOrchestratedPnpmOwner.
52
+ const lexicalKey = path => process.platform === "win32" ? resolve(path).toLowerCase() : resolve(path);
53
+ const verify = (path, expected, store, globalRoot, lexicalStore) => {
16
54
  try {
17
55
  const manifest = JSON.parse(readFileSync(join(path, "package.json"), "utf8"));
18
56
  const source = statSync(join(path, "src", "cli", "index.ts"));
19
57
  return { ok: manifest.version === expected && Boolean(manifest.dependencies?.bun && manifest.dependencies?.zod)
20
- && source.isFile() && source.size > 0 && verifyPnpmInstallTree(path, expected).ok };
58
+ && source.isFile() && source.size > 0 && verifyPnpmInstallTree(path, expected, store, globalRoot, lexicalStore).ok };
21
59
  } catch { return { ok: false }; }
22
60
  };
23
61
  const resolved = resolvePnpmGlobalOwner({ packageName: PACKAGE_NAME, packagePath: activeRoot,
24
- commandPaths: [owner.commandPath], runPnpm, verify });
62
+ commandPaths: [owner.commandPath], runPnpm, verify, requireStoreProof: owner.globalStore === true });
25
63
  if (!resolved.ok || key(resolved.owner.globalDir) !== key(owner.globalDir)
26
64
  || key(resolved.owner.globalRoot) !== key(owner.globalRoot)
27
- || key(resolved.owner.globalBinDir) !== key(owner.globalBinDir)) return false;
65
+ || key(resolved.owner.globalBinDir) !== key(owner.globalBinDir)
66
+ || Boolean(resolved.owner.globalStore) !== Boolean(owner.globalStore)) return false;
67
+ if (owner.globalStore && (key(resolved.owner.store) !== key(owner.store)
68
+ || lexicalKey(resolved.owner.storePath) !== lexicalKey(owner.storePath)
69
+ || !Array.isArray(owner.virtualStoreDirs) || !Array.isArray(resolved.owner.virtualStoreDirs)
70
+ || owner.virtualStoreDirs.length !== resolved.owner.virtualStoreDirs.length
71
+ || owner.virtualStoreDirs.some((path, index) => key(path) !== key(resolved.owner.virtualStoreDirs[index])))) return false;
28
72
  const active = readPnpmGlobalPackage(PACKAGE_NAME,
29
- (args, capture) => runPnpm(owner.commandPath, args, capture), verify,
73
+ (args, capture) => runPnpm(owner.commandPath, args, capture, owner), verify,
30
74
  { owner, expectedPackagePath: activeRoot, expectedGlobalRoot: owner.globalRoot, globalBinDir: owner.globalBinDir });
31
75
  return active.ok && active.version === version && key(active.path) === key(activeRoot);
32
76
  } catch { return false; }
@@ -4,6 +4,8 @@ export interface OrchestratedExpect {
4
4
  servingRoot: string | null;
5
5
  runtimePid: number | null;
6
6
  planToken: string;
7
+ /** Store fields are present only for a global virtual-store owner. */
8
+ pnpmOwner?: { commandPath: string; packagePath: string; globalDir: string; globalRoot: string; globalBinDir: string; store?: string; storePath?: string; virtualStoreDirs?: string[] };
7
9
  }
8
10
  export declare function encodeOrchestratedExpect(value: OrchestratedExpect): string;
9
11
  export declare function decodeOrchestratedExpect(encoded: string): OrchestratedExpect;
@@ -26,7 +28,7 @@ export declare function createOrchestratedChildSession(options: {
26
28
  pid?: number;
27
29
  verifyIdentity: () => boolean | Promise<boolean>;
28
30
  }): {
29
- start(): { ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight" };
31
+ start(): { ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight"; staleMarker?: true };
30
32
  finishPreflight(): void;
31
33
  enterMutation(): Promise<{ ok: true } | { ok: false; error: "sync-in-progress" | "update-in-flight" | "deadline-passed" | "plan-changed" }>;
32
34
  noteUntrackedInstaller(): void;
@@ -139,8 +139,17 @@ function publishResult(fd, value) {
139
139
  }
140
140
 
141
141
  function validateExpect(value) {
142
+ const keys = Object.keys(value ?? {}).sort().join(",");
143
+ const owner = value?.pnpmOwner;
142
144
  if (!value || typeof value !== "object" || Array.isArray(value)
143
- || Object.keys(value).sort().join(",") !== "cliRoot,home,planToken,runtimePid,servingRoot"
145
+ || !["cliRoot,home,planToken,runtimePid,servingRoot", "cliRoot,home,planToken,pnpmOwner,runtimePid,servingRoot"].includes(keys)
146
+ || (keys.includes(",pnpmOwner,") && (!owner || typeof owner !== "object" || Array.isArray(owner)
147
+ || !["commandPath,globalBinDir,globalDir,globalRoot,packagePath", "commandPath,globalBinDir,globalDir,globalRoot,packagePath,store,storePath,virtualStoreDirs"]
148
+ .includes(Object.keys(owner).sort().join(","))
149
+ || [owner.commandPath, owner.globalBinDir, owner.globalDir, owner.globalRoot, owner.packagePath].some(path => typeof path !== "string" || !isAbsolute(path))
150
+ || ("store" in owner && ([owner.store, owner.storePath].some(path => typeof path !== "string" || !isAbsolute(path))
151
+ || !Array.isArray(owner.virtualStoreDirs) || owner.virtualStoreDirs.length > 2
152
+ || owner.virtualStoreDirs.some(path => typeof path !== "string" || !isAbsolute(path))))))
144
153
  || typeof value.home !== "string" || !isAbsolute(value.home)
145
154
  || typeof value.cliRoot !== "string" || !isAbsolute(value.cliRoot)
146
155
  || (value.servingRoot !== null && (typeof value.servingRoot !== "string" || !isAbsolute(value.servingRoot)))
@@ -176,12 +185,16 @@ export function createOrchestratedChildSession({ home, resultPath, resultCapabil
176
185
  const result = value => { if (resultFd !== undefined) publishResult(resultFd, value); };
177
186
  const closeResult = () => { if (resultFd !== undefined) { const fd = resultFd; resultFd = undefined; closeSync(fd); } };
178
187
  let state = "new", mutex, startedAt, untrackedPending = false, retainFence = false;
179
- const marker = (phase, preserveInstaller = false, terminationUnconfirmed = false, retainFence = false) => {
188
+ const marker = (phase, preserveInstaller = false, terminationUnconfirmed = false, retainFence = false, dropWindowsWitness = false) => {
180
189
  let installer = {};
181
190
  if (preserveInstaller) {
182
191
  const current = JSON.parse(readFileSync(markerPath, "utf8"));
183
192
  if (current.pid !== pid || current.startedAt !== startedAt) throw new Error("orchestrated marker changed");
184
- if (current.installerPid !== undefined) installer.installerPid = current.installerPid;
193
+ // A Windows supervisor pid (no POSIX group beside it) only witnesses an unconfirmed installer;
194
+ // once its exit is confirmed it is dropped so a later run in this session can record its own.
195
+ if (current.installerPid !== undefined && !(dropWindowsWitness && current.installerPgid === undefined)) {
196
+ installer.installerPid = current.installerPid;
197
+ }
185
198
  if (current.installerPgid !== undefined) installer.installerPgid = current.installerPgid;
186
199
  }
187
200
  atomicJson(markerPath, { pid, phase, startedAt, ...installer,
@@ -199,10 +212,12 @@ export function createOrchestratedChildSession({ home, resultPath, resultCapabil
199
212
  return { ok: false, error };
200
213
  }
201
214
  mutex = acquired;
202
- if (inspectUpdateMarker(home) !== "free") {
215
+ const detail = {};
216
+ if (inspectUpdateMarker(home, { detail }) !== "free") {
203
217
  mutex.release(); mutex = undefined;
204
218
  result({ phase: "refused", error: "update-in-flight" }); state = "refused"; closeResult();
205
- return { ok: false, error: "update-in-flight" };
219
+ // staleMarker never enters the result record; it lets the launcher print recovery guidance.
220
+ return { ok: false, error: "update-in-flight", ...(detail.witnessless ? { staleMarker: true } : {}) };
206
221
  }
207
222
  try { startedAt = now(); marker("preflight"); }
208
223
  catch (error) { mutex.release(); mutex = undefined; throw error; }
@@ -241,7 +256,7 @@ export function createOrchestratedChildSession({ home, resultPath, resultCapabil
241
256
  },
242
257
  confirmInstallerExit() {
243
258
  if (state !== "mutating" || !untrackedPending) throw new Error("no untracked installer");
244
- marker("mutating", true); untrackedPending = false;
259
+ marker("mutating", true, false, false, true); untrackedPending = false;
245
260
  },
246
261
  retainInstallerFence() {
247
262
  if (state !== "mutating") throw new Error("orchestrated session is not mutating");