@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
@@ -23,10 +23,10 @@ use crate::journal::{
23
23
  use crate::parity::LinkChildParityReport;
24
24
  use crate::platform::{
25
25
  DirectoryIdentity, FileLock, LockAcquireError, PurgeExecutableOutcome, SecretBytes,
26
- constant_time_eq, directory_identity, ensure_private_dir, format_iso8601_utc, now_epoch_ms,
27
- purge_managed_executable, random_hex, reject_symlink, resolve_codex_home,
28
- resolve_opencodex_home, resolve_user_home, volatile_zero_bytes, write_private_atomic,
29
- write_regular_atomic,
26
+ constant_time_eq, directory_identity, ensure_private_dir, format_iso8601_utc,
27
+ hold_managed_plant_in_use, now_epoch_ms, purge_managed_executable, random_hex, reject_symlink,
28
+ resolve_codex_home, resolve_opencodex_home, resolve_user_home, volatile_zero_bytes,
29
+ write_private_atomic, write_regular_atomic,
30
30
  };
31
31
  use crate::relay::{
32
32
  RelayCredentials, UpstreamError, fetch_home_authenticated, post_child_parity_report,
@@ -675,12 +675,20 @@ fn cmd_attach_or_connect(args: &[String], native_attach_default_start: bool) ->
675
675
  return 1;
676
676
  }
677
677
  };
678
+ // A receipt from an earlier detach of this link must not vouch for this new attachment.
679
+ if let Err(e) =
680
+ remove_optional_file(&detach_receipt_path(&local_paths.opencodex_home, &link_id))
681
+ {
682
+ eprintln!("attach failed clearing an earlier detach receipt: {e}");
683
+ return 1;
684
+ }
678
685
 
679
686
  if !matches!(rollback_pending(&local_paths), Ok(false)) {
680
687
  eprintln!("attach refused: incomplete attach requires detach recovery");
681
688
  return 1;
682
689
  }
683
- let mut guard = match CodexHomeGuard::acquire(&local_paths, true, true, ClaimPolicy::Attach) {
690
+ // The ownership record names this link (schema /2) before any CODEX_HOME write.
691
+ let mut guard = match CodexHomeGuard::acquire_for_attach(&local_paths, true, true, &link_id) {
684
692
  Ok(guard) => guard,
685
693
  Err(e) => {
686
694
  eprintln!("attach refused: {}", e.message());
@@ -909,6 +917,7 @@ fn attach_locked(guard: &mut CodexHomeGuard, request: AttachRequest) -> Result<(
909
917
  document: settings_doc,
910
918
  }),
911
919
  };
920
+ crate::test_hooks::barrier("attach-before-state-write");
912
921
  if let Err(e) = write_child_state(&paths.state_file, &state) {
913
922
  let restored = rollback.restore_and_report(guard);
914
923
  eprintln!("{e}");
@@ -1092,6 +1101,21 @@ fn cmd_serve(args: &[String]) -> u8 {
1092
1101
  eprintln!("serve refused: {e}");
1093
1102
  return 1;
1094
1103
  }
1104
+ // Held for the life of this relay, so no purge removes the binary it runs from.
1105
+ let local_appdata = std::env::var_os("LOCALAPPDATA")
1106
+ .filter(|v| !v.is_empty())
1107
+ .map(PathBuf::from);
1108
+ let _in_use = match std::env::current_exe()
1109
+ .map_err(|e| format!("cannot resolve the current executable: {e}"))
1110
+ .and_then(|exe| {
1111
+ hold_managed_plant_in_use(&exe, &resolve_user_home(), local_appdata.as_deref())
1112
+ }) {
1113
+ Ok(lock) => lock,
1114
+ Err(e) => {
1115
+ eprintln!("serve refused: {e}");
1116
+ return 1;
1117
+ }
1118
+ };
1095
1119
  let port = listen_port.unwrap_or(state.listen_port);
1096
1120
  if port != state.listen_port {
1097
1121
  eprintln!("serve refused: listen port does not match child state");
@@ -1539,17 +1563,41 @@ pub fn detach_with_exe(args: &[String], current_exe_override: Option<&Path>) ->
1539
1563
  let mut keep_catalog = false;
1540
1564
  let mut json_mode = false;
1541
1565
  let mut purge = false;
1542
- for arg in args {
1543
- match arg.as_str() {
1566
+ let mut expect_link: Option<String> = None;
1567
+ let usage = || {
1568
+ eprintln!(
1569
+ "Usage: ocx-child detach [--keep-catalog] [--purge] [--json] [--expect-link <link id>]"
1570
+ );
1571
+ 2
1572
+ };
1573
+ let mut i = 0;
1574
+ while i < args.len() {
1575
+ let arg = args[i].as_str();
1576
+ i += 1;
1577
+ match arg {
1544
1578
  "--keep-catalog" => keep_catalog = true,
1545
1579
  "--json" => json_mode = true,
1546
1580
  "--purge" => purge = true,
1547
- _ => {
1548
- eprintln!("Usage: ocx-child detach [--keep-catalog] [--purge] [--json]");
1549
- return 2;
1581
+ "--expect-link" if expect_link.is_none() => {
1582
+ expect_link = args.get(i).cloned();
1583
+ i += 1;
1584
+ if expect_link.is_none() {
1585
+ return usage();
1586
+ }
1550
1587
  }
1588
+ _ => match arg.strip_prefix("--expect-link=") {
1589
+ Some(value) if expect_link.is_none() => expect_link = Some(value.to_owned()),
1590
+ _ => return usage(),
1591
+ },
1551
1592
  }
1552
1593
  }
1594
+ if let Some(id) = &expect_link
1595
+ && !is_valid_link_id(id)
1596
+ {
1597
+ eprintln!("--expect-link needs a link id of the form lnk_ followed by 16 hex digits.");
1598
+ return 2;
1599
+ }
1600
+ let expect = expect_link.as_deref();
1553
1601
  let local_paths = current_paths();
1554
1602
  let lock = match FileLock::acquire_blocking(&local_paths.lock_file) {
1555
1603
  Ok(l) => l,
@@ -1562,26 +1610,61 @@ pub fn detach_with_exe(args: &[String], current_exe_override: Option<&Path>) ->
1562
1610
  match CodexHomeGuard::acquire(&local_paths, true, false, ClaimPolicy::Detach) {
1563
1611
  Ok(guard) => guard,
1564
1612
  Err(CodexHomeError::Missing) => {
1613
+ if let Some(link) = expect
1614
+ && let Some((record, path)) = first_child_record(&local_paths)
1615
+ {
1616
+ return refuse_expected_link(
1617
+ json_mode,
1618
+ ExpectLinkRefusal::Residual,
1619
+ link,
1620
+ record,
1621
+ &path,
1622
+ "Codex home does not exist while child recovery records remain",
1623
+ );
1624
+ }
1565
1625
  if let Err(code) = detach_without_codex_home(&local_paths) {
1566
1626
  return code;
1567
1627
  }
1568
- drop(lock);
1569
- let purged = match purge_after_detach(purge, current_exe_override) {
1628
+ let purged = match purge_with_receipt(
1629
+ purge,
1630
+ current_exe_override,
1631
+ &local_paths.opencodex_home,
1632
+ expect,
1633
+ crate::journal::DetachOutcome::NotAttached,
1634
+ ) {
1570
1635
  Ok(purged) => purged,
1571
1636
  Err(code) => return code,
1572
1637
  };
1638
+ drop(lock);
1573
1639
  print_detached(
1574
1640
  json_mode,
1575
1641
  crate::journal::DetachOutcome::NotAttached,
1576
1642
  purged,
1643
+ expect,
1577
1644
  );
1578
1645
  return 0;
1579
1646
  }
1647
+ Err(CodexHomeError::Refused(msg)) if expect.is_some() => {
1648
+ return refuse_expected_link(
1649
+ json_mode,
1650
+ ExpectLinkRefusal::Conflict,
1651
+ expect.unwrap_or_default(),
1652
+ "codex-home-owner",
1653
+ &local_paths.codex_owner_path(),
1654
+ &msg,
1655
+ );
1656
+ }
1580
1657
  Err(e) => {
1581
1658
  eprintln!("detach refused: {}", e.message());
1582
1659
  return 1;
1583
1660
  }
1584
1661
  };
1662
+ if let Some(link) = expect {
1663
+ if let Err(code) = check_expected_link(&codex_guard, link, json_mode) {
1664
+ return code;
1665
+ }
1666
+ crate::test_hooks::barrier("expect-link-checked");
1667
+ }
1585
1668
  let paths = codex_guard.paths().clone();
1586
1669
  if let Err(e) = codex_guard.set_phase(OwnershipPhase::Detaching) {
1587
1670
  eprintln!("detach failed recording Codex home ownership phase: {e}");
@@ -1675,21 +1758,301 @@ pub fn detach_with_exe(args: &[String], current_exe_override: Option<&Path>) ->
1675
1758
  drop(_startup_gate);
1676
1759
  let _ = remove_optional_file(&paths.child_dir.join("daemon-start.lock"));
1677
1760
  let _ = fs::remove_dir(&paths.child_dir);
1678
- drop(lock);
1679
- let purged = match purge_after_detach(purge, current_exe_override) {
1761
+ let purged = match purge_with_receipt(
1762
+ purge,
1763
+ current_exe_override,
1764
+ &paths.opencodex_home,
1765
+ expect,
1766
+ outcome,
1767
+ ) {
1680
1768
  Ok(purged) => purged,
1681
1769
  Err(code) => return code,
1682
1770
  };
1683
- print_detached(json_mode, outcome, purged);
1771
+ drop(lock);
1772
+ print_detached(json_mode, outcome, purged, expect);
1684
1773
  0
1685
1774
  }
1686
1775
 
1776
+ #[derive(Clone, Copy)]
1777
+ enum ExpectLinkRefusal {
1778
+ /// Leftover state this command will not restore; the owning home's plain detach can.
1779
+ Residual,
1780
+ /// The Child belongs to another link or home, or its records cannot be read.
1781
+ Conflict,
1782
+ }
1783
+
1784
+ /// Refuse `detach --expect-link` without changing anything: exit 6 residual, exit 5 conflict.
1785
+ fn refuse_expected_link(
1786
+ json_mode: bool,
1787
+ kind: ExpectLinkRefusal,
1788
+ link_id: &str,
1789
+ record: &str,
1790
+ path: &Path,
1791
+ reason: &str,
1792
+ ) -> u8 {
1793
+ let (outcome, code) = match kind {
1794
+ ExpectLinkRefusal::Residual => ("residual", 6),
1795
+ ExpectLinkRefusal::Conflict => ("conflict", 5),
1796
+ };
1797
+ if json_mode {
1798
+ println!(
1799
+ "{}",
1800
+ serde_json::json!({
1801
+ "restored": false,
1802
+ "outcome": outcome,
1803
+ "linkId": link_id,
1804
+ "record": record,
1805
+ "path": path.display().to_string(),
1806
+ "reason": reason,
1807
+ "purged": false,
1808
+ })
1809
+ );
1810
+ }
1811
+ eprintln!(
1812
+ "detach --expect-link {link_id} refused ({outcome}): {reason}; record {}; nothing was restored.",
1813
+ path.display()
1814
+ );
1815
+ code
1816
+ }
1817
+
1818
+ /// The first child recovery record that exists, by the name a refusal reports.
1819
+ fn first_child_record(paths: &ChildPaths) -> Option<(&'static str, PathBuf)> {
1820
+ [
1821
+ ("child-state", &paths.state_file),
1822
+ ("attach-rollback", &paths.rollback_file),
1823
+ ("codex-journal", &paths.journal_file),
1824
+ ("link-key", &paths.key_file),
1825
+ ("catalog-backup", &paths.catalog_backup_file),
1826
+ ]
1827
+ .into_iter()
1828
+ .find(|(_, path)| fs::symlink_metadata(path).is_ok())
1829
+ .map(|(name, path)| (name, path.clone()))
1830
+ }
1831
+
1832
+ /// The link an unresolved attach rollback would put back: `None` without a snapshot,
1833
+ /// `Some(None)` for a first attach (no prior state), `Some(Some(id))` for a re-attach. The
1834
+ /// snapshot is parsed and checked exactly as `AttachRollbackSnapshot::recover` will, so a
1835
+ /// record recovery would refuse is refused here, before anything changes.
1836
+ fn rollback_prior_link(paths: &ChildPaths) -> Result<Option<Option<String>>, String> {
1837
+ reject_symlink(&paths.rollback_file)?;
1838
+ let mut bytes = match fs::File::open(&paths.rollback_file) {
1839
+ Ok(file) => {
1840
+ let mut bytes = Vec::new();
1841
+ file.take(MAX_ROLLBACK_BYTES + 1)
1842
+ .read_to_end(&mut bytes)
1843
+ .map_err(|e| format!("cannot read rollback snapshot: {e}"))?;
1844
+ bytes
1845
+ }
1846
+ Err(e) if e.kind() == io::ErrorKind::NotFound => return Ok(None),
1847
+ Err(e) => return Err(format!("cannot open rollback snapshot: {e}")),
1848
+ };
1849
+ let parsed = if bytes.len() as u64 > MAX_ROLLBACK_BYTES {
1850
+ Err("rollback snapshot exceeds size limit".to_owned())
1851
+ } else {
1852
+ serde_json::from_slice::<AttachRollbackRecord>(&bytes)
1853
+ .map_err(|e| format!("malformed rollback snapshot: {e}"))
1854
+ };
1855
+ volatile_zero_bytes(&mut bytes);
1856
+ let record = parsed?;
1857
+ let (ocx, codex) = AttachRollbackSnapshot::canonical_homes(paths)?;
1858
+ if record.schema != "ocx.child.attach-rollback/1"
1859
+ || record.opencodex_home != ocx
1860
+ || record.codex_home != codex
1861
+ || record.opencodex_home_identity != directory_identity(Path::new(&ocx))?
1862
+ || record.codex_home_identity != directory_identity(Path::new(&codex))?
1863
+ {
1864
+ return Err("rollback snapshot belongs to a different home".to_owned());
1865
+ }
1866
+ // Attach reads an unreadable state.json as no prior state but still snapshots its bytes: such a
1867
+ // snapshot would put back an earlier attachment whose link nobody can name, so it is refused.
1868
+ if record.prior_state.is_none()
1869
+ && (record.state_bytes.is_some()
1870
+ || record.journal.is_some()
1871
+ || record.key.is_some()
1872
+ || record.catalog_backup.is_some())
1873
+ {
1874
+ return Err(
1875
+ "rollback snapshot holds an earlier attachment's files but no readable prior state"
1876
+ .to_owned(),
1877
+ );
1878
+ }
1879
+ Ok(Some(
1880
+ record
1881
+ .prior_state
1882
+ .as_ref()
1883
+ .map(|prior| prior.link_id.clone()),
1884
+ ))
1885
+ }
1886
+
1887
+ fn detach_receipt_path(opencodex_home: &Path, link_id: &str) -> PathBuf {
1888
+ opencodex_home
1889
+ .join("link-receipts")
1890
+ .join(format!("{link_id}.json"))
1891
+ }
1892
+
1893
+ /// Durable, link-bound proof that `detach --expect-link` restored this Child, kept in
1894
+ /// `$OPENCODEX_HOME/link-receipts/<link id>.json` after the child directory is gone, so a Home
1895
+ /// whose answer was lost after the purge can still read it. It records the restore only: whether
1896
+ /// the planted binary is gone is read from the binary itself. An attach of the same link removes
1897
+ /// it under the lifecycle lock before it changes anything. Holds no credential.
1898
+ fn write_detach_receipt(
1899
+ opencodex_home: &Path,
1900
+ link_id: &str,
1901
+ outcome: crate::journal::DetachOutcome,
1902
+ ) -> Result<(), String> {
1903
+ let path = detach_receipt_path(opencodex_home, link_id);
1904
+ if let Some(dir) = path.parent() {
1905
+ ensure_private_dir(dir)?;
1906
+ }
1907
+ let body = serde_json::json!({
1908
+ "schema": "ocx.child.detach-receipt/1",
1909
+ "linkId": link_id,
1910
+ "restored": true,
1911
+ "outcome": format!("{outcome:?}"),
1912
+ });
1913
+ write_private_atomic(&path, format!("{body}\n").as_bytes())
1914
+ }
1915
+
1916
+ /// Purge under the lifecycle lock; with `--expect-link`, the restore receipt is durable before
1917
+ /// the purge starts, so a crash or a lost answer at any later point stays provable.
1918
+ fn purge_with_receipt(
1919
+ purge: bool,
1920
+ current_exe_override: Option<&Path>,
1921
+ opencodex_home: &Path,
1922
+ expect: Option<&str>,
1923
+ outcome: crate::journal::DetachOutcome,
1924
+ ) -> Result<bool, u8> {
1925
+ if let Some(link_id) = expect
1926
+ && let Err(e) = write_detach_receipt(opencodex_home, link_id, outcome)
1927
+ {
1928
+ eprintln!("detach could not record its receipt: {e}");
1929
+ return Err(1);
1930
+ }
1931
+ purge_after_detach(purge, current_exe_override)
1932
+ }
1933
+
1934
+ /// Restore only when both `state.json` and the ownership record name `link_id`, and an
1935
+ /// unresolved attach rollback would not put back another link; or when nothing at all is left.
1936
+ /// Runs with the lifecycle and `CODEX_HOME` locks held, which the restore keeps, so no other
1937
+ /// enrollment can run between this check and the restore.
1938
+ fn check_expected_link(guard: &CodexHomeGuard, link_id: &str, json_mode: bool) -> Result<(), u8> {
1939
+ let paths = guard.paths();
1940
+ let owner_path = paths.codex_owner_path();
1941
+ let state_path = &paths.state_file;
1942
+ let refuse = |kind, record, path: &Path, reason: &str| {
1943
+ Err(refuse_expected_link(
1944
+ json_mode, kind, link_id, record, path, reason,
1945
+ ))
1946
+ };
1947
+ let state = read_child_state(state_path);
1948
+ if let StateReadOutcome::Invalid(e) = &state {
1949
+ return refuse(
1950
+ ExpectLinkRefusal::Conflict,
1951
+ "child-state",
1952
+ state_path,
1953
+ &format!("the Child state cannot be read ({e})"),
1954
+ );
1955
+ }
1956
+ let rollback = match rollback_prior_link(paths) {
1957
+ Ok(rollback) => rollback,
1958
+ Err(e) => {
1959
+ return refuse(
1960
+ ExpectLinkRefusal::Conflict,
1961
+ "attach-rollback",
1962
+ &paths.rollback_file,
1963
+ &format!("the attach rollback snapshot cannot be read ({e})"),
1964
+ );
1965
+ }
1966
+ };
1967
+ let owner = guard.owner_record();
1968
+ // Every link the records name. More than one means an attach replaced another link's
1969
+ // attachment. An interrupted one (phase attaching, or a rollback left) that also names this
1970
+ // link is residual: a plain detach would restore that other link and then remove it, so the
1971
+ // bound detach leaves it. Any other mix is a conflict.
1972
+ let mut named: Vec<(&'static str, PathBuf, String)> = Vec::new();
1973
+ if let StateReadOutcome::Valid(st) = &state {
1974
+ named.push(("child-state", state_path.clone(), st.link_id.clone()));
1975
+ }
1976
+ if let Some(id) = owner.and_then(|r| r.link_id.clone()) {
1977
+ named.push(("codex-home-owner", owner_path.clone(), id));
1978
+ }
1979
+ if let Some(Some(id)) = &rollback {
1980
+ named.push(("attach-rollback", paths.rollback_file.clone(), id.clone()));
1981
+ }
1982
+ if let Some((record, path, _)) = named.iter().find(|(_, _, id)| id != link_id) {
1983
+ let interrupted =
1984
+ rollback.is_some() || owner.is_some_and(|r| r.phase == OwnershipPhase::Attaching);
1985
+ return if interrupted && named.iter().any(|(_, _, id)| id == link_id) {
1986
+ refuse(
1987
+ ExpectLinkRefusal::Residual,
1988
+ record,
1989
+ path,
1990
+ "an interrupted attach replaced another link's attachment; a plain detach would restore and remove that link",
1991
+ )
1992
+ } else {
1993
+ refuse(
1994
+ ExpectLinkRefusal::Conflict,
1995
+ record,
1996
+ path,
1997
+ "the Child is linked to another link",
1998
+ )
1999
+ };
2000
+ }
2001
+ let state_names_link = matches!(state, StateReadOutcome::Valid(_));
2002
+ // The record names this link without its state: an attach of it stopped before its state write (phase attaching), or a
2003
+ // detach of it stopped after marking the record detaching, whether before or after it removed state.json, and possibly
2004
+ // while it restored an attach rollback (#8691 review). The bound detach finishes either as a plain one would. Any
2005
+ // rollback left names no link (the machine had none) or this one, since one naming another link was refused above, so
2006
+ // restoring it puts back no other link.
2007
+ let own_interrupted = owner.is_some_and(|r| {
2008
+ matches!(
2009
+ r.phase,
2010
+ OwnershipPhase::Attaching | OwnershipPhase::Detaching
2011
+ )
2012
+ }) && rollback
2013
+ .as_ref()
2014
+ .is_none_or(|prior| prior.as_deref().is_none_or(|id| id == link_id));
2015
+ match owner.map(|r| r.link_id.as_deref()) {
2016
+ Some(None) => refuse(
2017
+ ExpectLinkRefusal::Residual,
2018
+ "codex-home-owner",
2019
+ &owner_path,
2020
+ "the ownership record names no link (schema /1)",
2021
+ ),
2022
+ Some(Some(_)) if state_names_link => Ok(()),
2023
+ Some(Some(_)) if own_interrupted => Ok(()),
2024
+ Some(Some(_)) => refuse(
2025
+ ExpectLinkRefusal::Residual,
2026
+ "codex-home-owner",
2027
+ &owner_path,
2028
+ "the Child state is missing while the ownership record names this link outside an interrupted attach or detach",
2029
+ ),
2030
+ None if state_names_link => refuse(
2031
+ ExpectLinkRefusal::Residual,
2032
+ "child-state",
2033
+ state_path,
2034
+ "the Child state names this link but no ownership record does",
2035
+ ),
2036
+ None => match first_child_record(paths) {
2037
+ Some((record, path)) => refuse(
2038
+ ExpectLinkRefusal::Residual,
2039
+ record,
2040
+ &path,
2041
+ "a child recovery record remains without state or ownership record",
2042
+ ),
2043
+ None => Ok(()),
2044
+ },
2045
+ }
2046
+ }
2047
+
1687
2048
  /// Removes the running binary when `--purge` was requested and it sits in the managed plant
1688
- /// directory. Runs only after every recovery record is gone and the lifecycle lock is released.
2049
+ /// directory. Runs only after every recovery record is gone, while the caller still holds the
2050
+ /// lifecycle lock, so an attach waiting on that lock cannot start before the binary is gone.
1689
2051
  fn purge_after_detach(purge: bool, current_exe_override: Option<&Path>) -> Result<bool, u8> {
1690
2052
  if !purge {
1691
2053
  return Ok(false);
1692
2054
  }
2055
+ crate::test_hooks::barrier("purge-before-remove");
1693
2056
  let exe = match current_exe_override {
1694
2057
  Some(p) => p.to_path_buf(),
1695
2058
  None => match std::env::current_exe() {
@@ -1707,6 +2070,14 @@ fn purge_after_detach(purge: bool, current_exe_override: Option<&Path>) -> Resul
1707
2070
  match purge_managed_executable(&exe, &user_home, local_appdata.as_deref()) {
1708
2071
  Ok(PurgeExecutableOutcome::Removed) => Ok(true),
1709
2072
  Ok(PurgeExecutableOutcome::SkippedUnmanagedPath) => Ok(false),
2073
+ Ok(PurgeExecutableOutcome::InUse) => {
2074
+ // A fixed line the Home matches (remote-plant.ts PURGE_KEPT_IN_USE_MARKER).
2075
+ eprintln!("ocx-purge-kept:binary_in_use");
2076
+ eprintln!(
2077
+ "detach --purge kept the planted ocx-child: another ocx-child relay is running from it"
2078
+ );
2079
+ Ok(false)
2080
+ }
1710
2081
  Err(e) => {
1711
2082
  eprintln!("detach --purge failed: {e}");
1712
2083
  Err(1)
@@ -1714,11 +2085,22 @@ fn purge_after_detach(purge: bool, current_exe_override: Option<&Path>) -> Resul
1714
2085
  }
1715
2086
  }
1716
2087
 
1717
- fn print_detached(json_mode: bool, outcome: crate::journal::DetachOutcome, purged: bool) {
2088
+ fn print_detached(
2089
+ json_mode: bool,
2090
+ outcome: crate::journal::DetachOutcome,
2091
+ purged: bool,
2092
+ expect_link: Option<&str>,
2093
+ ) {
1718
2094
  if json_mode {
1719
- println!(
1720
- "{{\"restored\":true,\"outcome\":\"{outcome:?}\",\"daemonRunning\":false,\"purged\":{purged}}}"
1721
- );
2095
+ match expect_link {
2096
+ // A receipt bound to the link the caller expected.
2097
+ Some(link_id) => println!(
2098
+ "{{\"restored\":true,\"outcome\":\"{outcome:?}\",\"daemonRunning\":false,\"purged\":{purged},\"linkId\":\"{link_id}\"}}"
2099
+ ),
2100
+ None => println!(
2101
+ "{{\"restored\":true,\"outcome\":\"{outcome:?}\",\"daemonRunning\":false,\"purged\":{purged}}}"
2102
+ ),
2103
+ }
1722
2104
  } else {
1723
2105
  println!(
1724
2106
  "Disconnected ephemeral Remote Link Child ({outcome:?}, purged={purged}); zero background daemon running."