@bitkyc08/opencodex 2.100.1 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (624) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
  6. package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/index-DQtCRNAw.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +6 -4
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/native-exec.ts +3 -2
  38. package/src/adapters/cursor/protobuf-request.ts +8 -8
  39. package/src/adapters/cursor/tool-guidance.ts +3 -3
  40. package/src/adapters/cursor/tool-wording.ts +10 -1
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
  43. package/src/adapters/google-antigravity-wire.ts +15 -6
  44. package/src/adapters/google-truncation.ts +4 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +17 -4
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/openai-chat/tool-schema.ts +9 -0
  54. package/src/adapters/openai-responses/tool-schema.ts +18 -4
  55. package/src/adapters/run-turn-queue.ts +139 -5
  56. package/src/adapters/upstream-http-error.ts +4 -2
  57. package/src/adapters/zed.ts +3 -0
  58. package/src/advisor/consult.ts +15 -4
  59. package/src/advisor/context.ts +12 -3
  60. package/src/advisor/runtime.ts +35 -5
  61. package/src/advisor/settings.ts +8 -0
  62. package/src/advisor/synthetic-tool.ts +21 -8
  63. package/src/bridge/response-json.ts +11 -2
  64. package/src/bridge/sse.ts +51 -9
  65. package/src/claude/auth-detect.ts +21 -33
  66. package/src/claude/chat-tool-dispatch.ts +233 -0
  67. package/src/claude/desktop-3p.ts +11 -5
  68. package/src/claude/desktop-gateway-state.ts +2 -0
  69. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  70. package/src/claude/desktop-remote-store.ts +24 -4
  71. package/src/claude/inbound-content-options.ts +31 -16
  72. package/src/claude/inbound-tool-loading.ts +42 -17
  73. package/src/claude/outbound.ts +13 -3
  74. package/src/cli/account-api.ts +23 -1
  75. package/src/cli/account-auth.ts +54 -21
  76. package/src/cli/account-extended.ts +60 -6
  77. package/src/cli/account-key-quota.ts +56 -7
  78. package/src/cli/account.ts +5 -3
  79. package/src/cli/advisor.ts +7 -4
  80. package/src/cli/alias.ts +38 -1
  81. package/src/cli/capabilities-access-remote.ts +137 -2
  82. package/src/cli/capabilities-accounts.ts +3 -3
  83. package/src/cli/capabilities-agents-routing.ts +17 -10
  84. package/src/cli/capabilities-base.ts +43 -18
  85. package/src/cli/capabilities-integrations.ts +2 -2
  86. package/src/cli/capabilities-provider-models.ts +18 -2
  87. package/src/cli/capabilities-route-to.ts +43 -0
  88. package/src/cli/capabilities.ts +2 -0
  89. package/src/cli/capability-contracts.ts +1 -1
  90. package/src/cli/claude-desktop.ts +30 -11
  91. package/src/cli/claude.ts +36 -17
  92. package/src/cli/codex-launcher.ts +3 -1
  93. package/src/cli/codex-shim-autorestore.ts +5 -42
  94. package/src/cli/config-command.ts +38 -2
  95. package/src/cli/config-root-startup.ts +34 -0
  96. package/src/cli/connect.ts +124 -19
  97. package/src/cli/desktop-runtime-guidance.ts +1 -1
  98. package/src/cli/disconnect-runtime.ts +168 -0
  99. package/src/cli/dispatch.ts +54 -12
  100. package/src/cli/export-command.ts +1 -1
  101. package/src/cli/gui-pair-client.ts +29 -5
  102. package/src/cli/gui.ts +10 -5
  103. package/src/cli/help-catalog.ts +11 -0
  104. package/src/cli/help.ts +5 -4
  105. package/src/cli/hub.ts +18 -1
  106. package/src/cli/index.ts +83 -92
  107. package/src/cli/inspect.ts +11 -2
  108. package/src/cli/integrations.ts +26 -1
  109. package/src/cli/link-capture.ts +64 -0
  110. package/src/cli/link-child-ops.ts +314 -0
  111. package/src/cli/link-cleanup.ts +8 -5
  112. package/src/cli/link-diagnostics.ts +67 -0
  113. package/src/cli/link-enrollment.ts +158 -12
  114. package/src/cli/link-operations.ts +52 -0
  115. package/src/cli/link-recover.ts +152 -0
  116. package/src/cli/link-routes.ts +87 -0
  117. package/src/cli/link-status-child.ts +137 -0
  118. package/src/cli/link-status-traffic.ts +34 -0
  119. package/src/cli/link.ts +327 -37
  120. package/src/cli/message-command.ts +1 -1
  121. package/src/cli/message-mcp-command.ts +23 -10
  122. package/src/cli/models-runtime.ts +3 -3
  123. package/src/cli/opencode.ts +3 -1
  124. package/src/cli/pi-sync.ts +35 -0
  125. package/src/cli/preflight-exemptions.ts +46 -0
  126. package/src/cli/registry.ts +29 -12
  127. package/src/cli/restart-failure.ts +5 -2
  128. package/src/cli/root.ts +5 -1
  129. package/src/cli/route-to.ts +172 -0
  130. package/src/cli/runtime-api.ts +5 -8
  131. package/src/cli/status.ts +3 -1
  132. package/src/cli/stop-approval.ts +66 -19
  133. package/src/cli/stop-report.ts +23 -0
  134. package/src/cli/stop-windows-checked.ts +304 -0
  135. package/src/cli/sync-command.ts +70 -13
  136. package/src/cli/sync-fanout.ts +81 -99
  137. package/src/cli/sync-flags.ts +40 -3
  138. package/src/cli/sync-link-status.ts +18 -2
  139. package/src/cli/sync-update-guard.ts +7 -2
  140. package/src/cli/system-restart-client.ts +3 -2
  141. package/src/cli/uninstall-plan.ts +77 -5
  142. package/src/cli/uninstall-stop.ts +152 -0
  143. package/src/cli/v2-input.ts +10 -6
  144. package/src/cli/v2-local-output.ts +3 -2
  145. package/src/cli/v2-runtime.ts +10 -3
  146. package/src/cli/v2.ts +22 -7
  147. package/src/client/connect.ts +321 -34
  148. package/src/client/link-home-features.ts +27 -0
  149. package/src/client/link-home.ts +92 -4
  150. package/src/client/link-ingress.ts +21 -3
  151. package/src/client/link-join.ts +12 -2
  152. package/src/client/link-parity-reporter.ts +60 -6
  153. package/src/client/link-readiness.ts +16 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel-status.ts +76 -0
  161. package/src/client/link-tunnel.ts +56 -5
  162. package/src/client/link-websocket-limits.ts +89 -0
  163. package/src/client/link-websocket.ts +586 -0
  164. package/src/client/link-ws-advertisement.ts +100 -0
  165. package/src/client/link-ws-framer.ts +241 -0
  166. package/src/client/link-ws-transport.ts +177 -0
  167. package/src/client/machine-api.ts +13 -2
  168. package/src/client/machine-listener.ts +48 -7
  169. package/src/client/route-intent-apply.ts +293 -0
  170. package/src/client/route-intent-file-originals.ts +97 -0
  171. package/src/client/route-intent-native-originals.ts +201 -0
  172. package/src/client/route-intent-watch.ts +141 -0
  173. package/src/client/runtime-restart.ts +127 -5
  174. package/src/client/runtime.ts +61 -15
  175. package/src/client/state.ts +30 -0
  176. package/src/client/sync-expectation.ts +36 -2
  177. package/src/client/sync-runtime.ts +7 -0
  178. package/src/clients/config-export/alias-selectors.ts +63 -40
  179. package/src/clients/config-export/contracts.ts +2 -0
  180. package/src/clients/config-export/nested-selectors.ts +42 -0
  181. package/src/clients/config-export.ts +36 -4
  182. package/src/codex/account-resume-health.ts +41 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/login-flow.ts +6 -0
  187. package/src/codex/auth-api/routes.ts +35 -2
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +21 -6
  190. package/src/codex/catalog/gather-capture.ts +10 -2
  191. package/src/codex/catalog/parsing.ts +7 -3
  192. package/src/codex/catalog/provider-models.ts +67 -23
  193. package/src/codex/catalog/retained-sync.ts +2 -1
  194. package/src/codex/catalog/routed-gather.ts +1 -1
  195. package/src/codex/catalog-auto-refresh.ts +11 -0
  196. package/src/codex/cli-update-job.ts +35 -13
  197. package/src/codex/convergence-types.ts +2 -0
  198. package/src/codex/convergence.ts +2 -2
  199. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  200. package/src/codex/features.ts +2 -2
  201. package/src/codex/history-provider.ts +31 -0
  202. package/src/codex/inject/multi-agent-v2.ts +9 -3
  203. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  204. package/src/codex/inject/plan.ts +20 -2
  205. package/src/codex/inject.ts +2 -0
  206. package/src/codex/journal-config-restore.ts +217 -0
  207. package/src/codex/journal.ts +75 -6
  208. package/src/codex/main-account.ts +23 -30
  209. package/src/codex/native-main-auth-file.ts +104 -0
  210. package/src/codex/native-profile-manager.ts +4 -3
  211. package/src/codex/native-profile-store.ts +3 -61
  212. package/src/codex/orca-import.ts +10 -1
  213. package/src/codex/quota-history.ts +13 -0
  214. package/src/codex/quota-window-conflict.ts +103 -0
  215. package/src/codex/quota.ts +134 -7
  216. package/src/codex/subagent-model-fallback.ts +3 -1
  217. package/src/codex/websocket-activity.ts +171 -16
  218. package/src/codex/websocket-registry.ts +11 -4
  219. package/src/combos/cooldown-store.ts +228 -0
  220. package/src/combos/failover.ts +760 -35
  221. package/src/config/dashboard-trusted-proxy.ts +83 -0
  222. package/src/config/diagnostics.ts +28 -0
  223. package/src/config/feature-flags.ts +9 -0
  224. package/src/config/live-reconcile.ts +10 -1
  225. package/src/config/load-degrade.ts +12 -1
  226. package/src/config/multi-agent-surface.ts +28 -5
  227. package/src/config/pending-teardown.ts +60 -3
  228. package/src/config/process-state.ts +175 -4
  229. package/src/config/provider-validation.ts +4 -4
  230. package/src/config/salvage.ts +1 -0
  231. package/src/config/schema/config-schema.ts +12 -3
  232. package/src/config/schema/leaf-validators.ts +43 -14
  233. package/src/config/windows-process-command-line.ts +107 -0
  234. package/src/generated/compatibility-version.json +1077 -429
  235. package/src/generated/model-metadata.ts +1 -1
  236. package/src/images/loop.ts +3 -0
  237. package/src/integrations/model-name-guard.ts +25 -0
  238. package/src/integrations/route-intent-catalog.ts +26 -0
  239. package/src/integrations/route-intent-connected.ts +262 -0
  240. package/src/integrations/route-intent-contract.ts +55 -0
  241. package/src/integrations/route-intent-disconnect.ts +109 -0
  242. package/src/integrations/route-intent-initial.ts +64 -0
  243. package/src/integrations/route-intent-state.ts +117 -0
  244. package/src/integrations/route-intent-tick.ts +65 -0
  245. package/src/integrations/route-intent.ts +212 -0
  246. package/src/integrations/writer.ts +44 -11
  247. package/src/lib/catalog-etag.ts +10 -0
  248. package/src/lib/client-error-body.ts +15 -0
  249. package/src/lib/client-retry-after.ts +29 -0
  250. package/src/lib/config-ownership.ts +13 -0
  251. package/src/lib/context-overflow-verdict.ts +266 -9
  252. package/src/lib/desktop-gui-origin.ts +28 -0
  253. package/src/lib/errors.ts +1 -1
  254. package/src/lib/failure-detail.ts +72 -3
  255. package/src/lib/gui-pair-capability.ts +2 -1
  256. package/src/lib/hard-refusal.ts +259 -0
  257. package/src/lib/messages-error-body.ts +4 -1
  258. package/src/lib/outbound-credential-registry.ts +362 -4
  259. package/src/lib/paced-stream.ts +34 -0
  260. package/src/lib/passive-key-fetch-proof.ts +30 -0
  261. package/src/lib/passive-read.ts +5 -0
  262. package/src/lib/process-control.ts +76 -12
  263. package/src/lib/redact.ts +84 -8
  264. package/src/lib/state-store-registrations.ts +11 -0
  265. package/src/lib/state-store-sweeper.ts +4 -0
  266. package/src/lib/supervisor-markers.ts +18 -0
  267. package/src/lib/terminal-safe-text.ts +58 -0
  268. package/src/lib/translator-budget.ts +3 -2
  269. package/src/lib/upstream-retry.ts +14 -4
  270. package/src/link/alias-lock.ts +119 -0
  271. package/src/link/child-activity.ts +83 -0
  272. package/src/link/child-binary-cache-fill.d.mts +50 -0
  273. package/src/link/child-binary-cache-fill.mjs +494 -0
  274. package/src/link/child-binary-cache-start.ts +73 -0
  275. package/src/link/child-binary-source.ts +12 -5
  276. package/src/link/child-catalog-freshness.ts +149 -0
  277. package/src/link/child-gated-ocx.ts +135 -0
  278. package/src/link/child-observations.ts +206 -0
  279. package/src/link/child-observe.ts +121 -0
  280. package/src/link/child-ops-engine.ts +230 -0
  281. package/src/link/child-ops-host.ts +138 -0
  282. package/src/link/child-ops-runners.ts +319 -0
  283. package/src/link/child-ops-scheduler.ts +207 -0
  284. package/src/link/child-ops-types.ts +89 -0
  285. package/src/link/child-parity.ts +23 -4
  286. package/src/link/child-policy.ts +93 -0
  287. package/src/link/child-update-contract.ts +174 -0
  288. package/src/link/codex-settings.ts +1 -1
  289. package/src/link/compatibility.ts +18 -1
  290. package/src/link/diagnostics-read.ts +163 -0
  291. package/src/link/diagnostics.ts +20 -7
  292. package/src/link/explicit-route.ts +209 -0
  293. package/src/link/link-recover.ts +113 -0
  294. package/src/link/management-routes.ts +3 -1
  295. package/src/link/operation-recovery-slot.ts +44 -0
  296. package/src/link/operations-journal.ts +408 -0
  297. package/src/link/paths.ts +5 -0
  298. package/src/link/peer-report.ts +1 -1
  299. package/src/link/relay-auth.ts +14 -0
  300. package/src/link/remote-plant.ts +152 -14
  301. package/src/link/remote-platform.ts +21 -10
  302. package/src/link/remote-probe.ts +11 -3
  303. package/src/link/remote-windows.ts +88 -12
  304. package/src/link/request-compression.ts +30 -0
  305. package/src/link/residual-recovery.ts +54 -0
  306. package/src/link/retirement.ts +128 -0
  307. package/src/link/route-intent-watch.ts +41 -0
  308. package/src/link/route-intent.ts +209 -0
  309. package/src/link/route-proof.ts +82 -0
  310. package/src/link/route-rounds.ts +579 -0
  311. package/src/link/route-select.ts +95 -0
  312. package/src/link/route-trust.ts +96 -0
  313. package/src/link/ssh-argv.ts +285 -43
  314. package/src/link/ssh-capture-redact.ts +253 -0
  315. package/src/link/ssh-capture.ts +497 -0
  316. package/src/link/ssh-runner.ts +141 -14
  317. package/src/link/status-projection.ts +160 -0
  318. package/src/link/store.ts +54 -1
  319. package/src/link/supervisor.ts +543 -55
  320. package/src/link/sync-fanout-classify.ts +114 -0
  321. package/src/link/sync-then-restart.ts +65 -0
  322. package/src/link/tombstones.ts +209 -0
  323. package/src/link/traffic.ts +178 -0
  324. package/src/link/tunnel-state.ts +10 -4
  325. package/src/link/ws-activity-holds.ts +474 -0
  326. package/src/local-credentials/publication-fence.ts +20 -1
  327. package/src/messaging/mcp-queue-rpc.ts +3 -2
  328. package/src/messaging/mcp-queue-server.ts +21 -1
  329. package/src/messaging/mcp-reply-tools.ts +24 -9
  330. package/src/messaging/mcp-reply-wait.ts +70 -0
  331. package/src/messaging/mcp-resume-tools.ts +25 -0
  332. package/src/messaging/remote-enrollment.ts +3 -3
  333. package/src/messaging/remote-tunnels.ts +2 -2
  334. package/src/messaging/resume-permissions.ts +27 -0
  335. package/src/messaging/rpc.ts +46 -2
  336. package/src/oauth/account-resume-health.ts +60 -0
  337. package/src/oauth/anthropic-continuity.ts +23 -7
  338. package/src/oauth/anthropic-routing.ts +5 -2
  339. package/src/oauth/anthropic.ts +22 -2
  340. package/src/oauth/claude-keychain-read.ts +78 -68
  341. package/src/oauth/index.ts +25 -6
  342. package/src/oauth/local-token-detect.ts +8 -29
  343. package/src/oauth/login-cli-errors.ts +5 -1
  344. package/src/oauth/login-cli.ts +33 -18
  345. package/src/oauth/login-flow-state.ts +26 -3
  346. package/src/oauth/meta-muse.ts +1 -1
  347. package/src/oauth/store.ts +51 -1
  348. package/src/oauth/xai.ts +248 -14
  349. package/src/protocols/contract.ts +4 -0
  350. package/src/protocols/encoders/messages.ts +1 -0
  351. package/src/providers/alias-template.ts +48 -0
  352. package/src/providers/anthropic-billing-ownership.ts +2 -0
  353. package/src/providers/anthropic-output-caps.ts +46 -0
  354. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  355. package/src/providers/antigravity-effort-families.ts +11 -3
  356. package/src/providers/antigravity-models.ts +32 -9
  357. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  358. package/src/providers/api-key-pause-state.ts +23 -0
  359. package/src/providers/api-key-pause.ts +71 -10
  360. package/src/providers/api-key-resolve.ts +49 -7
  361. package/src/providers/api-key-response-ownership.ts +2 -0
  362. package/src/providers/api-key-selection-capture.ts +3 -1
  363. package/src/providers/api-key-selection.ts +54 -11
  364. package/src/providers/api-keys.ts +24 -7
  365. package/src/providers/cache-affinity-identity.ts +73 -0
  366. package/src/providers/cache-affinity.ts +256 -0
  367. package/src/providers/claude-cli-usage-state.ts +11 -6
  368. package/src/providers/claude-cli-usage.ts +27 -9
  369. package/src/providers/codex-capacity.ts +11 -2
  370. package/src/providers/default-aliases.ts +98 -20
  371. package/src/providers/google-vertex-model-discovery.ts +510 -0
  372. package/src/providers/key-failover.ts +136 -14
  373. package/src/providers/key-store.ts +3 -3
  374. package/src/providers/kiro-models.ts +3 -5
  375. package/src/providers/label.ts +31 -5
  376. package/src/providers/mistral-transport.ts +17 -4
  377. package/src/providers/model-discovery-config.ts +31 -0
  378. package/src/providers/model-discovery-diagnostic.ts +34 -3
  379. package/src/providers/model-discovery.ts +43 -7
  380. package/src/providers/model-rename-fields.ts +5 -0
  381. package/src/providers/muse-key-quota.ts +14 -6
  382. package/src/providers/new-model-policy-runtime.ts +17 -4
  383. package/src/providers/new-model-policy.ts +30 -4
  384. package/src/providers/openai-sidecar.ts +15 -2
  385. package/src/providers/passive-key-observation.ts +252 -0
  386. package/src/providers/provider-id-rewrite.ts +3 -0
  387. package/src/providers/quota/account-cache.ts +53 -34
  388. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  389. package/src/providers/quota/anthropic-usage-windows.ts +19 -9
  390. package/src/providers/quota/passive-key-limits.ts +272 -0
  391. package/src/providers/quota/passive-wire-model.ts +126 -0
  392. package/src/providers/quota/report-cache.ts +112 -5
  393. package/src/providers/quota/vendor-probes-key.ts +73 -0
  394. package/src/providers/quota/vendor-probes-oauth.ts +57 -3
  395. package/src/providers/quota-key-accounts.ts +22 -10
  396. package/src/providers/quota-mistral-budget.ts +18 -0
  397. package/src/providers/quota-types.ts +43 -0
  398. package/src/providers/quota.ts +31 -32
  399. package/src/providers/reasoning-metadata.ts +1051 -12
  400. package/src/providers/registry/entries-core.ts +34 -16
  401. package/src/providers/registry/entries-extended.ts +32 -0
  402. package/src/providers/registry/model-seeds.ts +35 -0
  403. package/src/providers/resolved-model-policy.ts +7 -0
  404. package/src/providers/routed-config.ts +8 -3
  405. package/src/providers/xai-transport.ts +3 -0
  406. package/src/quota/reset-observer.ts +4 -2
  407. package/src/quota/reset-seen-store.ts +9 -0
  408. package/src/quota/window-mapping.ts +1 -0
  409. package/src/quota-pool/assemble.ts +4 -1
  410. package/src/remote/features.ts +17 -0
  411. package/src/responses/anthropic-progress.ts +10 -4
  412. package/src/responses/citation-markers.ts +231 -0
  413. package/src/responses/hosted-tool-policy.ts +56 -12
  414. package/src/responses/spill-store.ts +5 -1
  415. package/src/responses/state/replay-input.ts +50 -0
  416. package/src/responses/state/replay-owner.ts +24 -0
  417. package/src/responses/state/snapshot-codec.ts +9 -0
  418. package/src/responses/state/spill-queue.ts +1 -0
  419. package/src/responses/state.ts +42 -60
  420. package/src/router.ts +4 -2
  421. package/src/routing/home-route-capture.ts +123 -0
  422. package/src/routing/home-route-intent.ts +200 -0
  423. package/src/routing/route-intent-state.ts +178 -0
  424. package/src/routing/route-to-live-settings.ts +35 -0
  425. package/src/routing/route-to-local.ts +145 -0
  426. package/src/routing/route-to-status.ts +94 -0
  427. package/src/routing/route-to-sync-child.ts +32 -0
  428. package/src/server/adapter-resolve.ts +21 -1
  429. package/src/server/admitted-http-turn.ts +3 -0
  430. package/src/server/auth-cors.ts +109 -8
  431. package/src/server/bare-upstream-error.ts +220 -0
  432. package/src/server/catalog-download.ts +3 -5
  433. package/src/server/chat-native.ts +25 -7
  434. package/src/server/claude-messages.ts +8 -5
  435. package/src/server/codex-model-list.ts +2 -1
  436. package/src/server/configured-credentials.ts +37 -5
  437. package/src/server/gui-desktop-authorization.ts +36 -0
  438. package/src/server/gui-pair-delivery.ts +6 -3
  439. package/src/server/gui-session.ts +10 -1
  440. package/src/server/images.ts +41 -13
  441. package/src/server/inbound-body-admission.ts +17 -4
  442. package/src/server/index/link-listener.ts +203 -11
  443. package/src/server/index/link-management.ts +15 -1
  444. package/src/server/index/link-relay-sessions.ts +128 -8
  445. package/src/server/index/link-websocket-limits.ts +136 -0
  446. package/src/server/index/link-websocket.ts +692 -0
  447. package/src/server/index/optional-listeners.ts +115 -7
  448. package/src/server/index/route-intent-watch.ts +47 -0
  449. package/src/server/index/serve-contract.ts +86 -0
  450. package/src/server/index/serve-options.ts +35 -86
  451. package/src/server/index/startup-warnings.ts +8 -2
  452. package/src/server/index/websocket-handler.ts +26 -4
  453. package/src/server/index.ts +12 -2
  454. package/src/server/inference/client-encoder-delivery.ts +2 -0
  455. package/src/server/inspection-tee.ts +39 -2
  456. package/src/server/lifecycle.ts +2 -0
  457. package/src/server/link-turn.ts +137 -0
  458. package/src/server/management/advisor-routes.ts +10 -2
  459. package/src/server/management/agent-settings-routes.ts +50 -16
  460. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  461. package/src/server/management/config-routes.ts +7 -1
  462. package/src/server/management/context.ts +9 -2
  463. package/src/server/management/desktop-authorization.ts +41 -0
  464. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  465. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  466. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  467. package/src/server/management/home-integration-decision.ts +89 -0
  468. package/src/server/management/integration-routes.ts +208 -81
  469. package/src/server/management/link-child-ops-routes.ts +218 -0
  470. package/src/server/management/link-child-preflight.ts +31 -0
  471. package/src/server/management/link-diagnostics-route.ts +29 -0
  472. package/src/server/management/link-enrollment.ts +199 -47
  473. package/src/server/management/link-operation.ts +609 -0
  474. package/src/server/management/link-recover-route.ts +103 -0
  475. package/src/server/management/link-route-edit.ts +173 -0
  476. package/src/server/management/link-route-request.ts +62 -0
  477. package/src/server/management/link-route-state.ts +92 -6
  478. package/src/server/management/link-routes.ts +563 -51
  479. package/src/server/management/link-traffic-status.ts +13 -0
  480. package/src/server/management/model-routes.ts +122 -36
  481. package/src/server/management/model-rows.ts +2 -1
  482. package/src/server/management/native-integration-routes.ts +176 -70
  483. package/src/server/management/oauth-account-routes.ts +69 -17
  484. package/src/server/management/protocol-routes.ts +7 -0
  485. package/src/server/management/provider-completion-test.ts +4 -4
  486. package/src/server/management/provider-overwrite-carry.ts +39 -3
  487. package/src/server/management/provider-routes.ts +80 -72
  488. package/src/server/management/provider-routing-quota.ts +45 -0
  489. package/src/server/management/route-registry.ts +25 -3
  490. package/src/server/management/route-to-routes.ts +257 -0
  491. package/src/server/management/system-restart.ts +4 -2
  492. package/src/server/management/usage-aggregate-cache.ts +101 -66
  493. package/src/server/management-api.ts +17 -3
  494. package/src/server/management-auth.ts +13 -1
  495. package/src/server/messages-native-preflight.ts +27 -4
  496. package/src/server/messages-native.ts +22 -5
  497. package/src/server/persistent-gui-session.ts +6 -3
  498. package/src/server/proxy-liveness.ts +33 -6
  499. package/src/server/relay-eager.ts +36 -12
  500. package/src/server/relay.ts +183 -116
  501. package/src/server/request-body-facts.ts +48 -0
  502. package/src/server/request-decompress.ts +65 -2
  503. package/src/server/request-log-account-rotation.ts +6 -0
  504. package/src/server/request-log-attempt-usage.ts +69 -0
  505. package/src/server/request-log-cache-affinity.ts +60 -0
  506. package/src/server/request-log-conversation.ts +45 -2
  507. package/src/server/request-log-failure-detail.ts +59 -1
  508. package/src/server/request-log-terminal-status.ts +210 -24
  509. package/src/server/request-log.ts +71 -79
  510. package/src/server/responses/adapter-continuation.ts +2 -1
  511. package/src/server/responses/adapter-delivery.ts +2 -0
  512. package/src/server/responses/adapter-dispatch.ts +40 -51
  513. package/src/server/responses/advisor-plan-slot.ts +33 -1
  514. package/src/server/responses/advisor-question.ts +21 -0
  515. package/src/server/responses/advisor-slot.ts +10 -3
  516. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  517. package/src/server/responses/buffered-sse-json.ts +9 -3
  518. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  519. package/src/server/responses/codex-tool-catalog.ts +156 -0
  520. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  521. package/src/server/responses/combo-stream-preflight.ts +701 -81
  522. package/src/server/responses/compact.ts +47 -12
  523. package/src/server/responses/context-overflow.ts +58 -2
  524. package/src/server/responses/core-codex-account.ts +17 -3
  525. package/src/server/responses/core-combo-failure.ts +37 -4
  526. package/src/server/responses/core-combo-native.ts +3 -1
  527. package/src/server/responses/core-combo.ts +62 -7
  528. package/src/server/responses/core-errors.ts +8 -3
  529. package/src/server/responses/core-lifetime.ts +3 -2
  530. package/src/server/responses/core-normalize.ts +3 -1
  531. package/src/server/responses/core-opaque-recovery.ts +45 -2
  532. package/src/server/responses/core-options.ts +18 -0
  533. package/src/server/responses/core.ts +2 -0
  534. package/src/server/responses/fetch-helpers.ts +15 -10
  535. package/src/server/responses/native-replay-guard.ts +57 -0
  536. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  537. package/src/server/responses/outbound-request-body.ts +29 -0
  538. package/src/server/responses/passthrough-completion.ts +105 -8
  539. package/src/server/responses/passthrough-delivery.ts +31 -11
  540. package/src/server/responses/passthrough-dispatch.ts +99 -106
  541. package/src/server/responses/policy-fallback.ts +13 -1
  542. package/src/server/responses/request-prepare.ts +50 -6
  543. package/src/server/responses/request-transport.ts +53 -17
  544. package/src/server/responses/reset-replay.ts +104 -4
  545. package/src/server/responses/run-turn-execution.ts +58 -30
  546. package/src/server/responses/sidecar-execution.ts +14 -0
  547. package/src/server/responses/terminal-error-redaction.ts +222 -25
  548. package/src/server/responses/ws-upstream.ts +2 -2
  549. package/src/server/sse-payload-rewrite.ts +3 -2
  550. package/src/server/stop-service-route.ts +85 -0
  551. package/src/server/system-env-shell.ts +12 -1
  552. package/src/server/system-env.ts +5 -3
  553. package/src/server/windows-tcp-drop.ts +21 -4
  554. package/src/server/workflow-refusal.ts +8 -0
  555. package/src/server/ws-bridge.ts +191 -12
  556. package/src/service/cli-windows-stop.ts +189 -0
  557. package/src/service/cli.ts +41 -12
  558. package/src/service/disconnected-client-restart.ts +60 -0
  559. package/src/service/guarded-manager-target.ts +18 -1
  560. package/src/service/health.ts +99 -6
  561. package/src/service/launchd.ts +84 -31
  562. package/src/service/orchestration.ts +418 -91
  563. package/src/service/repair.ts +223 -6
  564. package/src/service/restart-proxy-stop.ts +79 -0
  565. package/src/service/service-child-ownership.ts +6 -2
  566. package/src/service/windows-checked-stop-live.ts +467 -0
  567. package/src/service/windows-checked-stop.ts +435 -0
  568. package/src/service/windows-command-line-token.ts +23 -0
  569. package/src/service/windows-guarded-manager.ts +77 -34
  570. package/src/service/windows-ops.ts +38 -56
  571. package/src/service/windows-process-evidence.ts +292 -0
  572. package/src/service/windows-process-native.ts +262 -0
  573. package/src/service/windows-service-stop.ts +321 -0
  574. package/src/service/windows-stop-binding.ts +187 -0
  575. package/src/service/windows-stop-budget.ts +123 -0
  576. package/src/service/windows-stop-confirm.ts +158 -0
  577. package/src/service/windows-stop-deadline.ts +56 -0
  578. package/src/service.ts +2 -2
  579. package/src/types/claude-tool-loading.ts +48 -0
  580. package/src/types/config.ts +47 -53
  581. package/src/types/link.ts +20 -0
  582. package/src/types/multi-agent.ts +13 -0
  583. package/src/types/provider.ts +68 -2
  584. package/src/types/request.ts +4 -0
  585. package/src/types.ts +4 -0
  586. package/src/update/guarded-runtime-ops.ts +5 -7
  587. package/src/update/index.ts +25 -10
  588. package/src/update/install-detection.mjs +3 -1
  589. package/src/update/job-pinned-start.ts +2 -0
  590. package/src/update/job-windows-restart.ts +19 -32
  591. package/src/update/job.ts +12 -5
  592. package/src/update/npm-install.d.mts +11 -0
  593. package/src/update/npm-install.mjs +44 -7
  594. package/src/update/orchestrated-entry.ts +1 -1
  595. package/src/update/orchestrated-node-driver.mjs +3 -2
  596. package/src/update/orchestrated-pnpm.d.mts +4 -0
  597. package/src/update/orchestrated-pnpm.mjs +50 -6
  598. package/src/update/orchestrated-session.d.mts +3 -1
  599. package/src/update/orchestrated-session.mjs +21 -6
  600. package/src/update/pnpm-global-install.d.mts +21 -3
  601. package/src/update/pnpm-global-install.mjs +322 -19
  602. package/src/update/pnpm-store-layout.mjs +46 -0
  603. package/src/update/sync-update-mutex.d.mts +3 -2
  604. package/src/update/sync-update-mutex.mjs +57 -8
  605. package/src/update/transactional-install.d.mts +3 -1
  606. package/src/update/transactional-install.mjs +545 -12
  607. package/src/update/windows-installer-marker.d.mts +1 -0
  608. package/src/update/windows-installer-marker.mjs +44 -0
  609. package/src/usage/expected-prices.ts +8 -0
  610. package/src/usage/filter-index.ts +326 -77
  611. package/src/usage/ledger-scanner.ts +15 -0
  612. package/src/usage/link-log-fields.ts +48 -0
  613. package/src/usage/log.ts +43 -2
  614. package/src/usage/request-body.ts +37 -0
  615. package/src/web-search/loop.ts +3 -0
  616. package/src/web-search/parse.ts +21 -2
  617. package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
  618. package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
  619. package/gui/dist/assets/index-Bziu8gTy.css +0 -2
  620. package/gui/dist/assets/index-OYzhQUNP.js +0 -94
  621. package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
  622. package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
  623. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
  624. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -30,6 +30,37 @@ export function childConfigFailureHint(result: { code: number; stderr: string })
30
30
  return "ocx config show --json on the Child did not print a configuration with a valid port";
31
31
  }
32
32
 
33
+
34
+ /**
35
+ * Why a full Child cannot be enrolled as it stands, and the Child command that fixes it. Each of
36
+ * these used to share one phase name ("Child restart preflight"), which left the Home operator to
37
+ * reproduce the probe over SSH. Kept under the 160 code point hint cap.
38
+ */
39
+ export function childRoleRefusalHint(runtimeRole: unknown): string {
40
+ return runtimeRole === "client"
41
+ ? "The Child is still linked to a Home (config runtimeRole client). On the Child run: ocx disconnect, then ocx restart."
42
+ : `The Child is a Hub (config runtimeRole ${runtimeRole === "hub" ? "hub" : "unknown"}). On the Child run: ocx hub disable, then retry.`;
43
+ }
44
+
45
+ export function childHealthRefusalHint(health: unknown, port: number): string {
46
+ const body = health && typeof health === "object" && !Array.isArray(health) ? health as Record<string, unknown> : null;
47
+ if (!body || body.service !== "opencodex") {
48
+ return `No OpenCodex answered /healthz on the Child's port ${port}. On the Child run: ocx start (or ocx service start).`;
49
+ }
50
+ if (body.port !== port) {
51
+ const seen = typeof body.port === "number" ? String(body.port) : "another port";
52
+ return `The Child's runtime answers as port ${seen} but its config port is ${port}. On the Child run: ocx restart.`;
53
+ }
54
+ if (body.role === "client") {
55
+ return `The Child still serves a client runtime (/healthz role client on port ${port}). On the Child run: ocx restart.`;
56
+ }
57
+ if (body.role !== undefined && body.role !== "standalone") {
58
+ return `The Child serves a Hub runtime (/healthz role hub on port ${port}). On the Child run: ocx hub disable, then ocx restart.`;
59
+ }
60
+ return `The Child's runtime advertises no restart capability v1 on port ${port}. Update OpenCodex on the Child, then run: ocx restart.`;
61
+ }
62
+
63
+
33
64
  /** `ocx config validate --json` prints one small object; this bounds a misbehaving Child. */
34
65
  export const CHILD_CONFIG_VALIDATE_MAX_OUTPUT_BYTES = 16 * 1024;
35
66
 
@@ -0,0 +1,29 @@
1
+ import { LINK_DIAGNOSTICS_DEFAULT_LIMIT, LINK_DIAGNOSTICS_MAX_LIMIT, LINK_DIAGNOSTICS_SCHEMA, readLinkDiagnostics } from "../../link/diagnostics-read";
2
+
3
+ export const LINK_DIAGNOSTICS_ROUTE = "/api/link/diagnostics";
4
+
5
+ function integerParam(url: URL, name: string, min: number, max: number): number | undefined | null {
6
+ const raw = url.searchParams.get(name);
7
+ if (raw === null) return undefined;
8
+ if (!/^\d{1,16}$/.test(raw)) return null;
9
+ const value = Number(raw);
10
+ return Number.isSafeInteger(value) && value >= min && value <= max ? value : null;
11
+ }
12
+
13
+ /**
14
+ * The body of `GET /api/link/diagnostics`: this runtime's bounded link diagnostics, re-sanitized
15
+ * on read by `readLinkDiagnostics`. It reads the file and nothing else, needs no link lifecycle,
16
+ * and omits the local file path. Callers authorize first: `link-routes.ts` on a standalone, Home
17
+ * or Hub, and `src/client/machine-listener.ts` (dashboard session only) on a connected Child.
18
+ * Kept free of the link route state so the Child's listener can serve it without that graph.
19
+ */
20
+ export async function linkDiagnosticsResponse(url: URL): Promise<Response> {
21
+ const limit = integerParam(url, "limit", 1, LINK_DIAGNOSTICS_MAX_LIMIT);
22
+ const since = integerParam(url, "since", 0, Number.MAX_SAFE_INTEGER);
23
+ if (limit === null || since === null) {
24
+ return Response.json({ error: { code: "invalid_query", message: "limit must be 1-" + LINK_DIAGNOSTICS_MAX_LIMIT + " and since a non-negative epoch-millisecond time." } },
25
+ { status: 400, headers: { "cache-control": "no-store" } });
26
+ }
27
+ const result = await readLinkDiagnostics({ limit: limit ?? LINK_DIAGNOSTICS_DEFAULT_LIMIT, since });
28
+ return Response.json({ schema: LINK_DIAGNOSTICS_SCHEMA, ...result }, { headers: { "cache-control": "no-store" } });
29
+ }
@@ -1,31 +1,58 @@
1
+ import { seedRouteDeviceClients } from "../../routing/home-route-intent";
1
2
  import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
2
3
  import { tmpdir } from "node:os";
3
4
  import { join } from "node:path";
4
5
  import { assertSshAlias, buildExecArgv, buildFingerprintArgv, buildProbeArgv, REMOTE_COMMAND_NOT_FOUND, remoteOcxArgv } from "../../link/ssh-argv";
5
6
  import { plantUnavailableGuidance, resolveChildBinarySource } from "../../link/child-binary-source";
6
7
  import { parseFingerprintLine } from "../../link/fingerprint";
8
+ import { confirmedLineTrust as confirmedLineTrustIn, type ConfirmedLineTrust } from "../../link/route-trust";
7
9
  import { isDetachedEphemeralChildConfig } from "../../link/ephemeral-child";
8
- import { classifyChildAttachConflict, classifyPlantFailure, inspectRemoteChildRuntime, remotePlantChildArgv, remotePurgePlantedChildArgv } from "../../link/remote-plant";
10
+ import { classifyChildAttachConflict, classifyPlantFailure, inspectRemoteChildRuntime, parseFullInstallCensus, remoteFullInstallCensusArgv, remotePlantChildArgv, remotePurgePlantedChildArgv } from "../../link/remote-plant";
9
11
  import { requireRemotePlatform } from "../../link/remote-platform";
10
12
  import { LINK_CATALOG_MAX_BYTES, LINK_RELAY_VERIFY_MS, isChildHealth, linkCommandBudget, linkRestartBudget, parseChildHttp, remoteChildHttpArgv, REMOTE_CURL_PREFLIGHT } from "../../link/remote-probe";
11
13
  import { newLinkId, type LinkStore } from "../../link/store";
14
+ import { residualRecovery } from "../../link/residual-recovery";
12
15
  import { SshRunnerError, boundHint, sshFailureHint, sshRunnerErrorHint, type SshRunResult } from "../../link/ssh-runner";
13
16
  import { withConfigMutationLockSync } from "../../config/mutation-lock";
14
17
  import type { ManagementContext } from "./context";
15
18
  import { readManagementJsonBodyOr } from "./body";
16
- import { fail, exactBody, port, isRecord, runnerFor, readStoreFor, writeStoreFor, knownHostsFile, putKnownHost, issueKey, compensateNewLink, type LinkRouteState } from "./link-route-state";
17
- import { CHILD_CONFIG_TOO_LARGE_HINT, CHILD_CONFIG_TOO_LARGE_MESSAGE, CHILD_CONFIG_VALIDATE_MAX_OUTPUT_BYTES, CHILD_PREFLIGHT_MAX_OUTPUT_BYTES, childConfigFailureReason } from "./link-child-preflight";
19
+ import { fail, exactBody, port, isRecord, runnerFor, readStoreFor, writeStoreFor, knownHostsFile, putConfirmedKnownHost, issueKey, compensateNewLink, keyCleanupFailed, revokeKeyIdempotent, type LinkRouteState } from "./link-route-state";
20
+ import { identityFileRefusal, routeFields, routeMismatch, routeOf, sameRouteRequest, splitRouteRequest } from "./link-route-request";
21
+ import { enrollOperationDigest, journalInUse, journalOpenFailure, NO_ENROLL_JOURNAL, openEnrollJournal, openEnrollmentConflict, replayOperation, underAliasLock, type EnrollJournal } from "./link-operation";
22
+ import { tombstoneNamesAlias } from "../../link/tombstones";
23
+ import { isOperationId } from "../../link/operations-journal";
24
+ import { CHILD_CONFIG_TOO_LARGE_HINT, CHILD_CONFIG_TOO_LARGE_MESSAGE, CHILD_CONFIG_VALIDATE_MAX_OUTPUT_BYTES, CHILD_PREFLIGHT_MAX_OUTPUT_BYTES, childConfigFailureReason, childHealthRefusalHint, childRoleRefusalHint } from "./link-child-preflight";
18
25
 
19
26
  const PROBE_TTL_MS = 5 * 60_000;
20
27
  const MIN_REMOTE_OCX = [2, 66, 0] as const;
21
28
  const REMOTE_OCX_VERSION = /^opencodex (\d{1,9})\.(\d{1,9})\.(\d{1,9})(-[0-9A-Za-z.-]{1,64})?(\+[0-9A-Za-z.-]{1,64})?(?=\s|$)/;
22
29
 
23
- /** Same-alias operations refuse overlap rather than overwrite a confirmed generation. */
24
- async function serialized(state: LinkRouteState, alias: string, action: () => Promise<Response>): Promise<Response> {
30
+ /**
31
+ * What a refused apply that may have left the Child connected answers: the closed words a client maps to its own guidance
32
+ * (residualKind: plant, only the managed binary's purge removes it, or enrollment; residualInstall for the latter, when the
33
+ * apply knew it), the attempt's link id and the Child's platform when known, and a recovery line bound to that id
34
+ * (src/link/residual-recovery.ts), which journalled replies share.
35
+ */
36
+ export function liveResidual(kind: "plant" | "ephemeral" | "full", platform: "posix" | "windows" | undefined, linkId: string): { residualKind: "plant" | "enrollment"; residualInstall?: "ephemeral" | "full"; linkId: string; recovery: string; remotePlatform?: "posix" | "windows" } {
37
+ return {
38
+ residualKind: kind === "plant" ? "plant" : "enrollment",
39
+ ...(kind === "plant" ? {} : { residualInstall: kind }),
40
+ ...(platform ? { remotePlatform: platform } : {}),
41
+ linkId,
42
+ recovery: residualRecovery(kind, linkId, platform),
43
+ };
44
+ }
45
+
46
+ /**
47
+ * Same-alias operations refuse overlap rather than overwrite a confirmed generation. Keyed without case, as OpenSSH
48
+ * matches known_hosts names and as the alias lock and the operation journal match aliases.
49
+ */
50
+ export async function serialized(state: LinkRouteState, alias: string, action: () => Promise<Response>): Promise<Response> {
25
51
  const operations = state.operations ??= new Set();
26
- if (operations.has(alias)) return fail("link_operation_in_progress", "A link operation for this alias is already running.", 409);
27
- operations.add(alias);
28
- try { return await action(); } finally { operations.delete(alias); }
52
+ const key = alias.toLowerCase();
53
+ if (operations.has(key)) return fail("link_operation_in_progress", "A link operation for this alias is already running.", 409);
54
+ operations.add(key);
55
+ try { return await action(); } finally { operations.delete(key); }
29
56
  }
30
57
 
31
58
  function remoteFailure(result: SshRunResult, code: string, message: string): Response | null {
@@ -44,7 +71,11 @@ function isOutdatedVersion(parts: readonly number[]): boolean {
44
71
  }
45
72
 
46
73
  export async function probe(ctx: ManagementContext, state: LinkRouteState): Promise<Response> {
47
- const value = await readManagementJsonBodyOr(ctx.req, null);
74
+ const split = splitRouteRequest(await readManagementJsonBodyOr(ctx.req, null));
75
+ if ("error" in split) return split.error;
76
+ const keyRefusal = identityFileRefusal(split.route.explicitRoute);
77
+ if (keyRefusal) return keyRefusal;
78
+ const value = split.body, wanted = split.route, route = wanted.explicitRoute, bound = routeFields(wanted);
48
79
  const body = exactBody(value, ["alias"]) ?? exactBody(value, ["alias", "includeVersion"]) ?? exactBody(value, ["alias", "includeVersion", "allowMissing"]);
49
80
  if (!body || typeof body.alias !== "string"
50
81
  || (body.includeVersion !== undefined && body.includeVersion !== true)
@@ -61,7 +92,7 @@ export async function probe(ctx: ManagementContext, state: LinkRouteState): Prom
61
92
  const runner = runnerFor(ctx), now = ctx.deps.now ?? Date.now;
62
93
  try {
63
94
  const started = now();
64
- const result = await runner.run(buildProbeArgv({ alias, tempKnownHostsFile: path }), { timeoutMs: 30_000 });
95
+ const result = await runner.run(buildProbeArgv({ alias, tempKnownHostsFile: path, route }), { timeoutMs: 30_000 });
65
96
  const latency = Math.max(0, now() - started);
66
97
  if (result.code !== 0 || result.stdout.trim() !== "ocx-link-probe") return fail("probe_failed", "SSH host probing failed.", 502, sshFailureHint(result.stderr));
67
98
  const fp = await runner.run(buildFingerprintArgv(path), { timeoutMs: 10_000 });
@@ -69,13 +100,13 @@ export async function probe(ctx: ManagementContext, state: LinkRouteState): Prom
69
100
  const parsed = parseFingerprintLine(fp.stdout.trim());
70
101
  const line = readFileSync(path, "utf8").trim().split(/\r?\n/).filter(Boolean).at(-1);
71
102
  if (!line) return fail("fingerprint_failed", "The SSH probe did not record a host key.", 502);
72
- const remotePlatform = await requireRemotePlatform(runner, alias, path);
103
+ const remotePlatform = await requireRemotePlatform(runner, alias, route, path);
73
104
  if (body.includeVersion === true && body.allowMissing === true) {
74
- const inspected = await inspectRemoteChildRuntime(runner, alias, path, remotePlatform);
105
+ const inspected = await inspectRemoteChildRuntime(runner, alias, route, path, remotePlatform);
75
106
  if (!inspected) return fail("version_probe_failed", "The remote OpenCodex runtime could not be inspected.", 502);
76
107
  if (inspected.runtimeKind === "missing") {
77
108
  const source = resolveBinary(inspected.targetTriple);
78
- state.pendingHosts.set(alias, { alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, knownHostLine: line, probedAt: now(), sshLatencyMs: latency, remotePlatform, runtimeKind: "missing", targetTriple: inspected.targetTriple });
109
+ state.pendingHosts.set(alias, { alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, knownHostLine: line, probedAt: now(), sshLatencyMs: latency, remotePlatform, runtimeKind: "missing", targetTriple: inspected.targetTriple, ...bound });
79
110
  state.confirmedHosts?.delete(alias);
80
111
  return Response.json({
81
112
  alias,
@@ -90,7 +121,7 @@ export async function probe(ctx: ManagementContext, state: LinkRouteState): Prom
90
121
  }
91
122
  const parsedVersion = parseVersion(inspected.ocxVersionLine ?? "");
92
123
  if (!parsedVersion) return fail("remote_ocx_unrecognized", "The remote ocx did not report an OpenCodex version.", 502);
93
- state.pendingHosts.set(alias, { alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, knownHostLine: line, probedAt: now(), sshLatencyMs: latency, remotePlatform, runtimeKind: inspected.runtimeKind, targetTriple: inspected.targetTriple });
124
+ state.pendingHosts.set(alias, { alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, knownHostLine: line, probedAt: now(), sshLatencyMs: latency, remotePlatform, runtimeKind: inspected.runtimeKind, targetTriple: inspected.targetTriple, ...bound });
94
125
  state.confirmedHosts?.delete(alias);
95
126
  return Response.json({
96
127
  alias,
@@ -104,14 +135,14 @@ export async function probe(ctx: ManagementContext, state: LinkRouteState): Prom
104
135
  }
105
136
  let ocxVersion: string | undefined;
106
137
  if (body.includeVersion === true) {
107
- const versionResult = await runner.run(buildExecArgv({ alias, argv: remoteOcxArgv(["--version"], remotePlatform), knownHostsFile: path }), { timeoutMs: 30_000 });
138
+ const versionResult = await runner.run(buildExecArgv({ alias, argv: remoteOcxArgv(["--version"], remotePlatform), knownHostsFile: path, route }), { timeoutMs: 30_000 });
108
139
  const denied = remoteFailure(versionResult, "version_probe_failed", "The remote ocx version could not be read.");
109
140
  if (denied) return denied;
110
141
  const parsedVersion = parseVersion(versionResult.stdout);
111
142
  if (!parsedVersion) return fail("remote_ocx_unrecognized", "The remote ocx did not report an OpenCodex version.", 502);
112
143
  ocxVersion = parsedVersion.version;
113
144
  }
114
- state.pendingHosts.set(alias, { alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, knownHostLine: line, probedAt: now(), sshLatencyMs: latency, remotePlatform });
145
+ state.pendingHosts.set(alias, { alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, knownHostLine: line, probedAt: now(), sshLatencyMs: latency, remotePlatform, ...bound });
115
146
  state.confirmedHosts?.delete(alias);
116
147
  return Response.json({ alias, fingerprint: parsed.fingerprint, keyType: parsed.keyType, ...(ocxVersion === undefined ? {} : { ocxVersion }) });
117
148
  } catch (error) { return fail("probe_failed", "SSH host probing failed.", 502, sshRunnerErrorHint(error)); }
@@ -120,7 +151,11 @@ export async function probe(ctx: ManagementContext, state: LinkRouteState): Prom
120
151
  }
121
152
 
122
153
  export async function confirmHost(ctx: ManagementContext, state: LinkRouteState): Promise<Response> {
123
- const value = await readManagementJsonBodyOr(ctx.req, null);
154
+ const split = splitRouteRequest(await readManagementJsonBodyOr(ctx.req, null));
155
+ if ("error" in split) return split.error;
156
+ const keyRefusal = identityFileRefusal(split.route.explicitRoute);
157
+ if (keyRefusal) return keyRefusal;
158
+ const value = split.body, wanted = split.route;
124
159
  const body = exactBody(value, ["alias", "fingerprint"]) ?? exactBody(value, ["alias", "fingerprint", "allowMissing"]);
125
160
  if (!body || typeof body.alias !== "string" || typeof body.fingerprint !== "string" || (body.allowMissing !== undefined && typeof body.allowMissing !== "boolean")) {
126
161
  return fail("invalid_body", "alias and fingerprint are required.", 400);
@@ -131,19 +166,21 @@ export async function confirmHost(ctx: ManagementContext, state: LinkRouteState)
131
166
  const pending = state.pendingHosts.get(alias), now = ctx.deps.now ?? Date.now;
132
167
  if (!pending || now() - pending.probedAt > PROBE_TTL_MS) return fail("host_confirmation_expired", "The SSH host probe has expired.", 409);
133
168
  if (pending.fingerprint !== body.fingerprint) return fail("host_fingerprint_mismatch", "The confirmed fingerprint does not match the probe.", 409);
169
+ if (!sameRouteRequest(routeOf(pending), wanted)) return routeMismatch();
170
+ const route = pending.explicitRoute ?? null;
134
171
  const dir = mkdtempSync(join(tmpdir(), "ocx-link-confirm-")), path = join(dir, "known_hosts");
135
172
  writeFileSync(path, pending.knownHostLine + "\n", { mode: 0o600 });
136
173
  try {
137
174
  const started = now();
138
175
  const runner = runnerFor(ctx);
139
- const remotePlatform = pending.remotePlatform ?? await requireRemotePlatform(runner, alias, path);
176
+ const remotePlatform = pending.remotePlatform ?? await requireRemotePlatform(runner, alias, route, path);
140
177
  if (body.allowMissing === true) {
141
- const inspected = await inspectRemoteChildRuntime(runner, alias, path, remotePlatform);
178
+ const inspected = await inspectRemoteChildRuntime(runner, alias, route, path, remotePlatform);
142
179
  if (!inspected) return fail("version_probe_failed", "The remote ocx version could not be confirmed.", 502);
143
180
  if (inspected.runtimeKind === "missing") {
144
181
  const source = resolveBinary(inspected.targetTriple);
145
182
  if (state.pendingHosts.get(alias) !== pending || now() - pending.probedAt > PROBE_TTL_MS) return fail("host_confirmation_expired", "The SSH host probe changed or expired.", 409);
146
- withConfigMutationLockSync(() => putKnownHost(knownHostsFile(ctx), alias, pending.knownHostLine));
183
+ if (!putConfirmedKnownHost(ctx, alias, pending.knownHostLine, pending.fingerprint)) return linkPinConflict();
147
184
  const confirmed = {
148
185
  ...pending,
149
186
  remotePlatform,
@@ -170,7 +207,7 @@ export async function confirmHost(ctx: ManagementContext, state: LinkRouteState)
170
207
  if (!version) return fail("remote_ocx_unrecognized", "The remote ocx did not report an OpenCodex version.", 502);
171
208
  if (isOutdatedVersion(version.parts)) return fail("remote_ocx_outdated", "The remote OpenCodex is older than 2.66.0.", 409, boundHint("opencodex " + version.version));
172
209
  if (state.pendingHosts.get(alias) !== pending || now() - pending.probedAt > PROBE_TTL_MS) return fail("host_confirmation_expired", "The SSH host probe changed or expired.", 409);
173
- withConfigMutationLockSync(() => putKnownHost(knownHostsFile(ctx), alias, pending.knownHostLine));
210
+ if (!putConfirmedKnownHost(ctx, alias, pending.knownHostLine, pending.fingerprint)) return linkPinConflict();
174
211
  const confirmed = { ...pending, remotePlatform, sshLatencyMs: Math.max(pending.sshLatencyMs ?? 0, now() - started), ocxVersion: version.version, runtimeKind: inspected.runtimeKind, targetTriple: inspected.targetTriple, plantable: false };
175
212
  (state.confirmedHosts ??= new Map()).set(alias, confirmed);
176
213
  state.pendingHosts.delete(alias);
@@ -183,14 +220,14 @@ export async function confirmHost(ctx: ManagementContext, state: LinkRouteState)
183
220
  plantable: false,
184
221
  });
185
222
  }
186
- const result = await runner.run(buildExecArgv({ alias, argv: remoteOcxArgv(["--version"], remotePlatform), knownHostsFile: path }), { timeoutMs: 30_000 });
223
+ const result = await runner.run(buildExecArgv({ alias, argv: remoteOcxArgv(["--version"], remotePlatform), knownHostsFile: path, route }), { timeoutMs: 30_000 });
187
224
  const denied = remoteFailure(result, "version_probe_failed", "The remote ocx version could not be confirmed.");
188
225
  if (denied) return denied;
189
226
  const version = parseVersion(result.stdout);
190
227
  if (!version) return fail("remote_ocx_unrecognized", "The remote ocx did not report an OpenCodex version.", 502);
191
228
  if (isOutdatedVersion(version.parts)) return fail("remote_ocx_outdated", "The remote OpenCodex is older than 2.66.0.", 409, boundHint("opencodex " + version.version));
192
229
  if (state.pendingHosts.get(alias) !== pending || now() - pending.probedAt > PROBE_TTL_MS) return fail("host_confirmation_expired", "The SSH host probe changed or expired.", 409);
193
- withConfigMutationLockSync(() => putKnownHost(knownHostsFile(ctx), alias, pending.knownHostLine));
230
+ if (!putConfirmedKnownHost(ctx, alias, pending.knownHostLine, pending.fingerprint)) return linkPinConflict();
194
231
  const confirmed = { ...pending, remotePlatform, sshLatencyMs: Math.max(pending.sshLatencyMs ?? 0, now() - started), ocxVersion: version.version };
195
232
  (state.confirmedHosts ??= new Map()).set(alias, confirmed);
196
233
  state.pendingHosts.delete(alias);
@@ -200,38 +237,102 @@ export async function confirmHost(ctx: ManagementContext, state: LinkRouteState)
200
237
  });
201
238
  }
202
239
 
240
+ function confirmedLineTrust(path: string, alias: string, line: string): ConfirmedLineTrust {
241
+ let text = "";
242
+ try { text = readFileSync(path, "utf8"); } catch { return "key_changed"; }
243
+ return confirmedLineTrustIn(text, alias, line);
244
+ }
245
+
246
+ function linkPinConflict(): Response {
247
+ return fail("link_pin_conflict", "A Home-initiated link already pins another key for this alias; remove that link before trusting another key.", 409);
248
+ }
249
+
250
+ const APPLY_KEYS = new Set(["alias", "fingerprint", "plant", "operationId", "requireEphemeral"]);
251
+
203
252
  function parsePort(stdout: string): number | null {
204
253
  try { const value: unknown = JSON.parse(stdout.trim()); return isRecord(value) && Object.keys(value).length === 1 && port(value.port) ? value.port : null; }
205
254
  catch { return null; }
206
255
  }
207
256
 
208
257
  export async function apply(ctx: ManagementContext, state: LinkRouteState): Promise<Response> {
209
- const value = await readManagementJsonBodyOr(ctx.req, null);
210
- const body = exactBody(value, ["alias"]) ?? exactBody(value, ["alias", "fingerprint"]) ?? exactBody(value, ["alias", "plant"]) ?? exactBody(value, ["alias", "fingerprint", "plant"]);
211
- if (!body || typeof body.alias !== "string" || (body.fingerprint !== undefined && typeof body.fingerprint !== "string") || (body.plant !== undefined && typeof body.plant !== "boolean")) {
258
+ const split = splitRouteRequest(await readManagementJsonBodyOr(ctx.req, null));
259
+ if ("error" in split) return split.error;
260
+ const value = split.body, wanted = split.route;
261
+ const body = isRecord(value) && Object.keys(value).every(key => APPLY_KEYS.has(key)) ? value : null;
262
+ if (!body || typeof body.alias !== "string" || (body.fingerprint !== undefined && typeof body.fingerprint !== "string") || (body.plant !== undefined && typeof body.plant !== "boolean")
263
+ || (body.operationId !== undefined && !isOperationId(body.operationId)) || (body.requireEphemeral !== undefined && body.requireEphemeral !== true)) {
212
264
  return fail("invalid_body", "alias and optional fingerprint/plant are required.", 400);
213
265
  }
214
266
  const alias = body.alias;
267
+ // A repeat replays without probing, so the fingerprint is what names the operation (the CLI requires it too).
268
+ if (body.operationId !== undefined && typeof body.fingerprint !== "string") return fail("invalid_body", "operationId requires fingerprint.", 400);
215
269
  const resolveBinary = ctx.deps.resolveChildBinarySource ?? resolveChildBinarySource;
270
+ // ocx link add --operation-id (structure/remote-link.md, "Operation journal"): replay, recovery and the reserved ids.
271
+ const operation = typeof body.operationId === "string" ? { id: body.operationId, digest: enrollOperationDigest({ alias,
272
+ ...(typeof body.fingerprint === "string" ? { fingerprint: body.fingerprint } : {}), route: wanted, requireEphemeral: body.requireEphemeral === true }) } : null;
273
+ // A tombstone for this alias means recover can run against the machine; it holds the alias lock, so this does too.
274
+ return underAliasLock(ctx, alias, operation !== null || journalInUse(ctx) || tombstoneNamesAlias(alias), async () => {
275
+ if (operation) {
276
+ const replay = await replayOperation(ctx, state, operation, "enroll");
277
+ if (replay) return replay;
278
+ }
279
+ const open = openEnrollmentConflict(ctx, alias, operation?.id);
280
+ if (open) return open;
216
281
  return serialized(state, alias, async () => {
217
282
  const confirmed = state.confirmedHosts?.get(alias), now = ctx.deps.now ?? Date.now;
218
283
  if (!confirmed) return fail("host_not_confirmed", "Confirm the SSH host before applying the link.", 409);
219
284
  if (now() - confirmed.probedAt > PROBE_TTL_MS) return fail("host_confirmation_expired", "The SSH host confirmation has expired.", 409);
220
285
  if (body.fingerprint !== undefined && body.fingerprint !== confirmed.fingerprint) return fail("host_fingerprint_mismatch", "The apply fingerprint does not match the confirmed host.", 409);
286
+ if (!sameRouteRequest(routeOf(confirmed), wanted)) return routeMismatch();
287
+ const route = confirmed.explicitRoute ?? null;
288
+ // After the replay above, before the journal entry and any SSH: a new operation needs a key ssh can use.
289
+ const keyRefusal = identityFileRefusal(route);
290
+ if (keyRefusal) return keyRefusal;
221
291
  if (readStoreFor(ctx).links.some(link => link.alias === alias && link.direction === "hub-initiated")) return fail("link_exists", "A link for this alias already exists.", 409);
222
292
  if (confirmed.runtimeKind === "missing" && body.plant !== true) {
223
293
  return fail("remote_ocx_missing", "ocx was not found on the remote host; confirm planting ocx-child before applying.", 409);
224
294
  }
295
+ let journal: EnrollJournal = NO_ENROLL_JOURNAL;
296
+ if (operation) {
297
+ try { journal = openEnrollJournal(ctx, operation, alias, routeFields(routeOf(confirmed))); } catch (error) {
298
+ return journalOpenFailure(error);
299
+ }
300
+ }
301
+ // The attempt's link id, fixed before anything changes on the Child: a residual answer binds the Child's step to it, even
302
+ // for a plant whose rollback failed before the link was stored.
303
+ const attemptLinkId = journal.reservedLinkId ?? newLinkId();
304
+ return journal.finish(await (async (): Promise<Response> => {
225
305
  const dir = mkdtempSync(join(tmpdir(), "ocx-link-apply-")), knownHosts = join(dir, "known_hosts");
226
306
  writeFileSync(knownHosts, confirmed.knownHostLine + "\n", { mode: 0o600 });
227
307
  const runner = runnerFor(ctx), budget = linkCommandBudget(confirmed.sshLatencyMs);
228
- const run = (argv: readonly string[], timeoutMs = budget, maxOutputBytes?: number) => runner.run(buildExecArgv({ alias, argv, knownHostsFile: knownHosts }), { timeoutMs, ...(maxOutputBytes === undefined ? {} : { maxOutputBytes }) });
229
- let remotePlatform: "posix" | "windows";
308
+ const run = (argv: readonly string[], timeoutMs = budget, maxOutputBytes?: number) => runner.run(buildExecArgv({ alias, argv, knownHostsFile: knownHosts, route }), { timeoutMs, ...(maxOutputBytes === undefined ? {} : { maxOutputBytes }) });
309
+ let remotePlatform: "posix" | "windows" | undefined;
310
+ const knownPlatform = (): "posix" | "windows" | undefined => remotePlatform;
230
311
  const ocx = (args: readonly string[]) => remoteOcxArgv(args, remotePlatform);
231
312
  let record: LinkStore["links"][number] | undefined, input: Uint8Array | undefined;
313
+ // A key issued for a record that has not passed the locked alias and trust checks. Until then a
314
+ // failure revokes only the key: compensation, which may store its record, is for a validated one.
315
+ let unvalidatedKeyId: string | undefined;
316
+ // The alias and trust checks a new record must pass under the mutation lock, both when it is
317
+ // first written and when compensation would store it again: no other Home-initiated link owns
318
+ // the alias in any case, and the live known_hosts still trusts exactly the confirmed key.
319
+ const linkCheck = (current: LinkStore, self?: string): "exists" | ConfirmedLineTrust => {
320
+ const wanted = alias.toLowerCase();
321
+ if (current.links.some(link => link.id !== self && link.alias.toLowerCase() === wanted && link.direction === "hub-initiated")) return "exists";
322
+ return confirmedLineTrust(knownHostsFile(ctx), alias, confirmed.knownHostLine);
323
+ };
232
324
  let ephemeralChild = confirmed.runtimeKind === "ephemeral", plantedFreshBinary = false, purgeRollbackFailed = false, remoteMayBeConnected = false, phase = "remote_port";
233
325
  const failed = async (response: Response): Promise<Response> => {
234
- const compensation = record ? await compensateNewLink(ctx, state, record) : null;
326
+ const own = record;
327
+ let compensation = own ? await compensateNewLink(ctx, state, own, current => linkCheck(current, own.id) === "trusted") : null;
328
+ if (!record && unvalidatedKeyId !== undefined) {
329
+ const keyId = unvalidatedKeyId;
330
+ unvalidatedKeyId = undefined;
331
+ if (!revokeKeyIdempotent(ctx, keyId)) {
332
+ console.warn("[link] apply failed before storing the link; its issued key could not be revoked");
333
+ compensation = keyCleanupFailed();
334
+ }
335
+ }
235
336
  if (plantedFreshBinary) {
236
337
  plantedFreshBinary = false;
237
338
  try {
@@ -246,23 +347,29 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
246
347
  const outcome = compensation ?? response;
247
348
  if (!remoteMayBeConnected) return outcome;
248
349
  const payload = await outcome.json() as Record<string, unknown>;
249
- const recovery = purgeRollbackFailed
250
- ? "Run ~/.cache/opencodex/bin/ocx-child detach --purge on the Child before retrying."
251
- : ephemeralChild
252
- ? "Run ocx-child detach (or ocx disconnect) on the Child before retrying."
253
- : "Run ocx disconnect and ocx restart on the Child before retrying.";
254
- return Response.json({ ...payload, residual: true, recovery }, { status: outcome.status });
350
+ const residual = liveResidual(purgeRollbackFailed ? "plant" : ephemeralChild ? "ephemeral" : "full", knownPlatform(), attemptLinkId);
351
+ return Response.json({ ...payload, residual: true, ...residual }, { status: outcome.status });
255
352
  };
256
353
  try {
257
- remotePlatform = confirmed.remotePlatform ?? await requireRemotePlatform(runner, alias, knownHosts);
354
+ remotePlatform = confirmed.remotePlatform ?? await requireRemotePlatform(runner, alias, route, knownHosts);
355
+ if (body.requireEphemeral === true) {
356
+ // Before any plant, key or Child change: a runnable full ocx anywhere the gated argv looks refuses.
357
+ phase = "full_install_census";
358
+ if (remotePlatform === "windows") return fail("require_ephemeral_unsupported", "--require-ephemeral is not supported for a Windows Child.", 409);
359
+ const census = await run(remoteFullInstallCensusArgv());
360
+ const verdict = census.code === 0 ? parseFullInstallCensus(census.stdout) : null;
361
+ if (verdict === null) return fail("full_install_census_failed", "The Child could not be checked for a full OpenCodex install.", 502, sshFailureHint(census.stderr));
362
+ if (verdict === "present") return fail("full_install_present", "A full OpenCodex install is on the Child; --require-ephemeral refuses it before any change.", 409);
363
+ }
258
364
  if (body.plant === true && confirmed.runtimeKind === "missing") {
259
365
  phase = "remote_plant";
260
366
  const source = resolveBinary(confirmed.targetTriple ?? null);
261
367
  if (!source.ok) return fail("remote_plant_unavailable", plantUnavailableGuidance(source.reason, confirmed.targetTriple ?? null), 409, source.reason);
262
368
  let planted: SshRunResult;
369
+ journal.intent("plant");
263
370
  try {
264
371
  planted = await runner.run(
265
- buildExecArgv({ alias, argv: remotePlantChildArgv(remotePlatform, source.artifact.sizeBytes, source.artifact.sha256), knownHostsFile: knownHosts }),
372
+ buildExecArgv({ alias, argv: remotePlantChildArgv(remotePlatform, source.artifact.sizeBytes, source.artifact.sha256), knownHostsFile: knownHosts, route }),
266
373
  { stdin: source.artifact.bytes, timeoutMs: Math.max(budget, 60_000) },
267
374
  );
268
375
  } catch (plantErr) {
@@ -277,6 +384,7 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
277
384
  return fail("remote_plant_failed", "Could not plant ocx-child on the remote host.", 502, sshFailureHint(planted.stderr));
278
385
  }
279
386
  plantedFreshBinary = true;
387
+ journal.done("plant");
280
388
  ephemeralChild = true;
281
389
  }
282
390
  phase = "remote_port";
@@ -285,6 +393,7 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
285
393
  if (denied) return await failed(denied);
286
394
  const remotePort = parsePort(chosen.stdout);
287
395
  if (!remotePort) return await failed(fail("remote_port_failed", "The remote link port could not be determined.", 502));
396
+ journal.port(remotePort);
288
397
  phase = "child_preflight";
289
398
  const configured = await run(ocx(["config", "show", "--json"]), budget, CHILD_PREFLIGHT_MAX_OUTPUT_BYTES);
290
399
  let childConfig: unknown = null;
@@ -293,7 +402,7 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
293
402
  const hint = await childConfigFailureReason(configured, () => run(ocx(["config", "validate", "--json"]), budget, CHILD_CONFIG_VALIDATE_MAX_OUTPUT_BYTES));
294
403
  return await failed(fail("child_preflight_failed", "The Child effective configuration could not be read.", 502, hint));
295
404
  }
296
- if ((childConfig.runtimeRole ?? "standalone") !== "standalone") return await failed(fail("child_restart_unsupported", "The Child must run standalone OpenCodex; an existing Hub or Child cannot be converted by Add Child.", 409));
405
+ if ((childConfig.runtimeRole ?? "standalone") !== "standalone") return await failed(fail("child_restart_unsupported", "The Child must run standalone OpenCodex; an existing Hub or Child cannot be converted by Add Child.", 409, childRoleRefusalHint(childConfig.runtimeRole)));
297
406
  const childPort = childConfig.port;
298
407
  if (remotePlatform === "posix" && (await run(REMOTE_CURL_PREFLIGHT)).code !== 0) return await failed(fail("child_curl_missing", "Install curl on the Child before connecting a Remote Link.", 409));
299
408
  const before = await run(remoteChildHttpArgv(childPort, "healthz", LINK_RELAY_VERIFY_MS, remotePlatform));
@@ -302,26 +411,65 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
302
411
  if (before.code === 255) return await failed(fail("child_preflight_failed", "The Child loopback port could not be inspected.", 502, sshFailureHint(before.stderr)));
303
412
  if (before.code === 0) return await failed(fail("child_port_busy", "The Child's target port is already in use; no Child files were modified.", 409));
304
413
  } else {
305
- const beforeHealth = before.code === 0 ? parseChildHttp(before.stdout) : null;
306
- if (!isChildHealth(beforeHealth, "standalone", childPort)) return await failed(fail("child_restart_unsupported", "The Child must run a standalone OpenCodex with bound restart support; update or disconnect it before linking.", 409));
414
+ let beforeHealth: unknown = null;
415
+ try { if (before.code === 0) beforeHealth = parseChildHttp(before.stdout); } catch { /* reported as nothing answering */ }
416
+ if (!isChildHealth(beforeHealth, "standalone", childPort)) return await failed(fail("child_restart_unsupported", "The Child must run a standalone OpenCodex with bound restart support; update or disconnect it before linking.", 409, childHealthRefusalHint(beforeHealth, childPort)));
307
417
  }
308
418
  state.confirmedHosts?.delete(alias);
309
419
  phase = "home_setup";
310
- const id = newLinkId(), issued = issueKey(ctx, "link:" + alias);
311
- record = { id, alias, direction: "hub-initiated", hostKeyFingerprint: confirmed.fingerprint, tunnelPort: remotePort, apiKeyId: issued.id, createdAt: new Date(now()).toISOString(), remotePlatform, childKind: ephemeralChild ? "ephemeral" : "full" };
312
- withConfigMutationLockSync(() => {
420
+ const id = attemptLinkId;
421
+ journal.intent("key_issued");
422
+ let issued: ReturnType<typeof issueKey>;
423
+ if (journal.reservedKeyId === undefined) issued = issueKey(ctx, "link:" + alias);
424
+ else {
425
+ // The config may be saved before issuing throws (a reconcile that fails afterwards), leaving the reserved key
426
+ // durable while memory says it is absent: never settle that as clean.
427
+ // failed() still rolls back a binary this apply planted; the key's own outcome stays unknown.
428
+ try { issued = issueKey(ctx, "link:" + alias, journal.reservedKeyId); } catch {
429
+ return await failed(fail("key_issue_uncertain", "Issuing the link key failed after it may have been saved; whether the reserved key exists is unknown.", 500));
430
+ }
431
+ }
432
+ unvalidatedKeyId = issued.id;
433
+ if (journal.reservedKeyId !== undefined && issued.id !== journal.reservedKeyId) return await failed(fail("key_reservation_failed", "The link key was not issued under its reserved id.", 500));
434
+ journal.done("key_issued");
435
+ const candidate: LinkStore["links"][number] = { id, alias, direction: "hub-initiated", hostKeyFingerprint: confirmed.fingerprint, tunnelPort: remotePort, apiKeyId: issued.id, createdAt: new Date(now()).toISOString(), remotePlatform, childKind: ephemeralChild ? "ephemeral" : "full", ...routeFields(routeOf(confirmed)) };
436
+ // Under the same lock as the store write: no Home-initiated link may own this alias in any
437
+ // case, and the live known_hosts must still trust exactly the confirmed key for it (another
438
+ // confirmation, under any spelling, may have replaced it since this one). Only a record that
439
+ // passed both becomes `record`, the one compensation handles; any earlier failure, an
440
+ // exception included, leaves it unset and revokes the key alone. A write that throws leaves
441
+ // its outcome unknown: compensation re-runs the same checks before it would store the record.
442
+ journal.intent("link_recorded");
443
+ const created = withConfigMutationLockSync((): "written" | "exists" | ConfirmedLineTrust => {
313
444
  const current = readStoreFor(ctx);
314
- if (current.links.some(link => link.alias === alias && link.direction === "hub-initiated")) throw new Error("link exists");
315
- writeStoreFor(ctx, { ...current, links: [...current.links, record!] });
445
+ const check = linkCheck(current);
446
+ if (check !== "trusted") return check;
447
+ record = candidate;
448
+ unvalidatedKeyId = undefined;
449
+ writeStoreFor(ctx, { ...current, links: [...current.links, candidate] });
450
+ return "written";
316
451
  });
452
+ if (created !== "written") {
453
+ // The record failed validation and was never stored; failed() revokes its key alone.
454
+ return await failed(created === "exists"
455
+ ? fail("link_exists", "A link for this alias already exists.", 409)
456
+ : created === "trust_file_unexpected"
457
+ ? fail("trust_file_unexpected", "The link known_hosts file has a pattern, host-list, marker or malformed line; remove that line, then probe and confirm the host again.", 409)
458
+ : fail("host_key_changed", "The confirmed host key is no longer the one trusted for this alias; probe and confirm the host again.", 409));
459
+ }
460
+ // An ephemeral ocx-child never reads route intent, so its enrollment saves none: seeding would
461
+ // also start ocx sync applying route intent to every Home client.
462
+ if (!ephemeralChild) withConfigMutationLockSync(() => seedRouteDeviceClients(ctx.config, ctx.version, id, undefined, readStoreFor(ctx).links.map(link => link.id)));
463
+ journal.done("link_recorded");
317
464
  await state.listener.ensureStarted();
318
465
  if (state.listener.status().state !== "listening") return await failed(fail("listener_unavailable", "The link listener is unavailable.", 503));
319
466
  await state.supervisor.ensureStarted();
320
467
  await state.supervisor.reload();
321
468
  phase = "remote_connect";
322
469
  input = new TextEncoder().encode(JSON.stringify({ apiKeyId: issued.id, key: issued.key }));
470
+ journal.intent("child_enrolled");
323
471
  remoteMayBeConnected = true;
324
- const connected = await runner.run(buildExecArgv({ alias, argv: ocx(["connect", "--link", "--key-stdin", "--tunnel-port", String(remotePort), "--link-id", id]), knownHostsFile: knownHosts }), { stdin: input, timeoutMs: budget });
472
+ const connected = await runner.run(buildExecArgv({ alias, argv: ocx(["connect", "--link", "--key-stdin", "--tunnel-port", String(remotePort), "--link-id", id]), knownHostsFile: knownHosts, route }), { stdin: input, timeoutMs: budget });
325
473
  if (connected.code !== 0) {
326
474
  const conflict = classifyChildAttachConflict(connected.stderr);
327
475
  if (conflict === "child_port_busy") {
@@ -336,6 +484,8 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
336
484
  const connectDenied = remoteFailure(connected, "remote_connect_failed", "The Child enrollment command failed.");
337
485
  if (connectDenied) return await failed(connectDenied);
338
486
  input.fill(0);
487
+ journal.done("child_enrolled");
488
+ journal.intent("relay_verified");
339
489
  phase = "child_restart";
340
490
  const restarted = await run(ocx(["restart"]), linkRestartBudget(confirmed.sshLatencyMs));
341
491
  if (restarted.code !== 0) return await failed(fail("child_restart_failed", "The Child restart could not be verified.", 502, sshFailureHint(restarted.stderr)));
@@ -351,6 +501,7 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
351
501
  let data: unknown = null;
352
502
  try { if (catalog.code === 0) data = parseChildHttp(catalog.stdout); } catch { /* malformed is not a completed catalog */ }
353
503
  if (!isRecord(data) || !Array.isArray(data.models) || !admitted || now() > deadline) return await failed(fail("child_relay_failed", "The Child did not relay a complete authenticated catalog through this Home.", 502));
504
+ journal.done("relay_verified");
354
505
  return Response.json({ linkId: id }, { status: 202 });
355
506
  } finally { unsubscribe(); }
356
507
  } catch (error) {
@@ -359,6 +510,7 @@ export async function apply(ctx: ManagementContext, state: LinkRouteState): Prom
359
510
  }
360
511
  return await failed(fail(phase + (error instanceof SshRunnerError && error.code === "timeout" ? "_timeout" : "_failed"), "Remote Link failed during " + phase.replaceAll("_", " ") + ".", 502, sshRunnerErrorHint(error)));
361
512
  } finally { input?.fill(0); rmSync(dir, { recursive: true, force: true }); }
513
+ })());
514
+ });
362
515
  });
363
516
  }
364
-