@bitkyc08/opencodex 2.100.2 → 2.100.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -9,6 +9,7 @@ import {
9
9
  type ClientCatalogReadiness,
10
10
  } from "../client/catalog-compatibility";
11
11
  import {
12
+ assertDisconnectExpectation,
12
13
  disconnectClient,
13
14
  revokeConnectedClientKey,
14
15
  rotateConnectedClientKey,
@@ -17,7 +18,9 @@ import {
17
18
  import { inspectClientRotationRecoveryGate, readClientConnectionState } from "../client/state";
18
19
  import { readClientLinkState } from "../client/link-state";
19
20
  import { probeLinkTunnelStatus, type LinkTunnelStatus } from "../client/link-tunnel-status";
20
- import { teardownClientLink } from "../client/link-teardown";
21
+ import { teardownClientLink, type ClientLinkTeardownResult } from "../client/link-teardown";
22
+ import { ClientSyncExpectationError } from "../client/sync-expectation";
23
+ import { SYNC_EXPECTATION_MISMATCH_EXIT } from "./sync-expectation";
21
24
  import { reapOrphanTunnel } from "../client/link-tunnel";
22
25
  import { readServiceApiTokenState } from "../lib/service-secrets";
23
26
  import type { ClientLifecycleLockDeps } from "../client/lifecycle-lock";
@@ -27,6 +30,7 @@ import { createSshRunner, type SshRunner } from "../link/ssh-runner";
27
30
  import type { OrphanTunnelResult } from "../client/link-tunnel";
28
31
  import { inspectRemoteDesktopStore } from "../claude/desktop-remote-store";
29
32
  import type { OcxConnectedClientId } from "../types";
33
+ import { ROUTE_CLIENT_IDS, isRouteClientId } from "../link/route-intent";
30
34
  import {
31
35
  CliUsageError,
32
36
  csv,
@@ -76,7 +80,7 @@ export interface ClientCatalogProbeDeps extends CatalogCompatibilityDeps {
76
80
 
77
81
  export const CONNECT_USAGE = `Usage:
78
82
  ocx connect --link --key-stdin --tunnel-port <port> --link-id <id>
79
- [--clients codex,claude] [--catalog-timeout <seconds>] [--no-sync]
83
+ [--clients <id,...>] [--catalog-timeout <seconds>] [--no-sync]
80
84
  ocx connect <url> [--management-url <url>]
81
85
  (--pairing-code-stdin | --admin-token-stdin)
82
86
  [--clients codex,claude] [--management-transport direct|relay]
@@ -84,12 +88,32 @@ export const CONNECT_USAGE = `Usage:
84
88
  ocx connect status [--json]
85
89
  ocx connect rotate (--pairing-code-stdin | --admin-token-stdin)
86
90
  [--json]
87
- ocx connect revoke --admin-token-stdin [--json]`;
91
+ ocx connect revoke --admin-token-stdin [--json]
92
+ Link client ids: ${ROUTE_CLIENT_IDS.join(", ")}`;
88
93
 
89
94
  export const DISCONNECT_USAGE = `Usage:
90
- ocx disconnect [--keep-catalog] [--json]
95
+ ocx disconnect [--keep-catalog] [--recover-config --yes] [--json] [--expect-link <link id>]
91
96
  ocx disconnect --orphaned-token --yes [--json]`;
92
97
 
98
+ const DISCONNECT_LINK_ID = /^lnk_[0-9a-f]{16}$/;
99
+
100
+ /** --expect-link <id> or --expect-link=<id>, given at most once; removed from args. */
101
+ function takeExpectLink(args: string[]): string | undefined {
102
+ let found: string | undefined;
103
+ for (let index = 0; index < args.length;) {
104
+ const arg = args[index]!;
105
+ let value: string | undefined;
106
+ if (arg === "--expect-link") { value = args[index + 1] ?? ""; args.splice(index, 2); }
107
+ else if (arg.startsWith("--expect-link=")) { value = arg.slice("--expect-link=".length); args.splice(index, 1); }
108
+ else { index += 1; continue; }
109
+ if (found !== undefined || !DISCONNECT_LINK_ID.test(value)) {
110
+ throw new CliUsageError("--expect-link needs one link id of the form lnk_ followed by 16 hex digits (see ocx connect status --json).", DISCONNECT_USAGE);
111
+ }
112
+ found = value;
113
+ }
114
+ return found;
115
+ }
116
+
93
117
  export type ClientConnectionStatus = {
94
118
  state: "disconnected" | "connected" | "invalid" | "mismatched";
95
119
  reason?: string;
@@ -251,8 +275,8 @@ export function collectClientConnectionStatus(
251
275
 
252
276
  function parseClients(raw: string | undefined): OcxConnectedClientId[] {
253
277
  const values = csv(raw) ?? ["codex", "claude"];
254
- if (values.length < 1 || values.some(value => value !== "codex" && value !== "claude")) {
255
- throw new CliUsageError("--clients must contain codex and/or claude", CONNECT_USAGE);
278
+ if (values.length < 1 || values.some(value => !isRouteClientId(value))) {
279
+ throw new CliUsageError(`--clients must contain route client ids: ${ROUTE_CLIENT_IDS.join(", ")}`, CONNECT_USAGE);
256
280
  }
257
281
  return values as OcxConnectedClientId[];
258
282
  }
@@ -422,6 +446,9 @@ async function runHubConnect(argv: string[], deps: ClientCommandDeps): Promise<v
422
446
  if (!serverUrl || serverUrl.startsWith("--")) throw new CliUsageError("hub URL is required", CONNECT_USAGE);
423
447
  const managementUrl = takeOption(args, "--management-url");
424
448
  const clients = parseClients(takeOption(args, "--clients"));
449
+ if (clients.some(client => client !== "codex" && client !== "claude")) {
450
+ throw new CliUsageError("Hub connections support only codex and claude; use Link for other clients", CONNECT_USAGE);
451
+ }
425
452
  const catalogTimeoutSeconds = takeIntegerOption(args, "--catalog-timeout", { min: 1 });
426
453
  if (catalogTimeoutSeconds !== undefined && catalogTimeoutSeconds > 120) {
427
454
  throw new CliUsageError("--catalog-timeout must be an integer between 1 and 120", CONNECT_USAGE);
@@ -463,9 +490,9 @@ async function runHubConnect(argv: string[], deps: ClientCommandDeps): Promise<v
463
490
  // only the first half is what #4207 was filed for, so the catalog now on disk is checked
464
491
  // against the Codex CLI that will read it.
465
492
  const readiness = inspectInstalledCatalogReadiness(installedCatalogFileState(), deps.catalogProbeDeps ?? {});
466
- const report = connectCompletionReport(connection, clients, readiness);
493
+ const report = connectCompletionReport(connection, connection.selectedClients, readiness);
467
494
  for (const line of report.lines) console.log(line);
468
- printCodexShimReadiness(clients);
495
+ printCodexShimReadiness(connection.selectedClients);
469
496
  if (report.failure) throw new Error(report.failure);
470
497
  }
471
498
 
@@ -478,7 +505,8 @@ async function runLinkConnect(argv: string[], deps: ClientCommandDeps): Promise<
478
505
  const managementTransport = takeOption(args, "--management-transport");
479
506
  const pairing = takeFlag(args, "--pairing-code-stdin");
480
507
  const admin = takeFlag(args, "--admin-token-stdin");
481
- const clients = parseClients(takeOption(args, "--clients"));
508
+ const rawClients = takeOption(args, "--clients");
509
+ const clients = parseClients(rawClients);
482
510
  const catalogTimeoutSeconds = takeIntegerOption(args, "--catalog-timeout", { min: 1 });
483
511
  if (catalogTimeoutSeconds !== undefined && catalogTimeoutSeconds > 120) {
484
512
  throw new CliUsageError("--catalog-timeout must be an integer between 1 and 120", CONNECT_USAGE);
@@ -500,6 +528,7 @@ async function runLinkConnect(argv: string[], deps: ClientCommandDeps): Promise<
500
528
  managementUrl: `http://127.0.0.1:${rawPort}`,
501
529
  credential: { kind: "link", ...credential },
502
530
  selectedClients: clients,
531
+ selectedClientsExplicit: rawClients !== undefined,
503
532
  managementTransport: "direct",
504
533
  transport: "link",
505
534
  link: { tunnelPort: rawPort, linkId },
@@ -513,9 +542,9 @@ async function runLinkConnect(argv: string[], deps: ClientCommandDeps): Promise<
513
542
  throw terminalSafeError(error);
514
543
  });
515
544
  const readiness = inspectInstalledCatalogReadiness(installedCatalogFileState(), deps.catalogProbeDeps ?? {});
516
- const report = connectCompletionReport(connection, clients, readiness);
545
+ const report = connectCompletionReport(connection, connection.selectedClients, readiness);
517
546
  for (const line of report.lines) console.log(line);
518
- printCodexShimReadiness(clients);
547
+ printCodexShimReadiness(connection.selectedClients);
519
548
  if (report.failure) throw new Error(report.failure);
520
549
  }
521
550
 
@@ -568,15 +597,21 @@ export async function handleDisconnectCommand(
568
597
  argv: string[],
569
598
  deps: Pick<ClientCommandDeps, "lifecycleLockDeps" | "linkTeardownDeps"> & { orphanRecoveryDeps?: OrphanTokenRecoveryDeps } = {},
570
599
  ): Promise<number> {
571
- return runCliAction(async () => {
600
+ let mismatch: { phase: string; reason: string } | null = null;
601
+ const code = await runCliAction(async () => {
572
602
  const args = [...argv];
573
603
  const keepCatalog = takeFlag(args, "--keep-catalog");
574
604
  const wantsJson = takeFlag(args, "--json");
575
605
  const orphanedToken = takeFlag(args, "--orphaned-token");
606
+ const recoverConfig = takeFlag(args, "--recover-config");
576
607
  const yes = takeFlag(args, "--yes");
608
+ const expectLink = takeExpectLink(args);
577
609
  rejectArgs(args, DISCONNECT_USAGE, { redactValues: true });
610
+ if (recoverConfig && (!yes || orphanedToken)) throw new CliUsageError("--recover-config requires --yes and cannot be combined with --orphaned-token", DISCONNECT_USAGE);
611
+ // A Home's link-bound disconnect never asks for config recovery; that stays a person's own plain disconnect.
612
+ if (recoverConfig && expectLink !== undefined) throw new CliUsageError("--recover-config cannot be combined with --expect-link", DISCONNECT_USAGE);
578
613
  if (orphanedToken) {
579
- if (!yes || keepCatalog) throw new CliUsageError("--orphaned-token requires --yes and cannot be combined with --keep-catalog", DISCONNECT_USAGE);
614
+ if (!yes || keepCatalog || expectLink !== undefined) throw new CliUsageError("--orphaned-token requires --yes and cannot be combined with --keep-catalog or --expect-link", DISCONNECT_USAGE);
580
615
  const backup = await recoverOrphanedTokens({ ...deps.orphanRecoveryDeps, lifecycleLockDeps: deps.lifecycleLockDeps });
581
616
  const restore = "Stop OpenCodex and move the saved files back into its config directory only if the destination names are absent.";
582
617
  printData({ ...backup, restore }, wantsJson, [
@@ -585,8 +620,21 @@ export async function handleDisconnectCommand(
585
620
  ]);
586
621
  return;
587
622
  }
588
- if (yes) throw new CliUsageError("--yes requires --orphaned-token", DISCONNECT_USAGE);
589
- const teardown = await teardownClientLink({
623
+ if (yes && !recoverConfig) throw new CliUsageError("--yes requires --orphaned-token or --recover-config", DISCONNECT_USAGE);
624
+ // A Home's revoke names the link it means; checked before the client-link teardown touches anything,
625
+ // and again inside disconnectClient under the locks it writes under. A client-initiated link (its sidecar, or the
626
+ // marker that survives a lost sidecar, names this link) needs the client-link teardown this path skips, so the
627
+ // same check refuses it before anything changes.
628
+ if (expectLink !== undefined) {
629
+ try { assertDisconnectExpectation(expectLink, deps); } catch (error) {
630
+ if (error instanceof ClientSyncExpectationError) { mismatch = error; return; }
631
+ throw error;
632
+ }
633
+ }
634
+ // A Home's link-bound disconnect (--expect-link) comes from the Home that owns that link's tunnel and record,
635
+ // and it is sent only for Home-initiated links, which have no client-link sidecar. Running this Child's
636
+ // client-link teardown there would only open a gap between the identity check and the locked disconnect.
637
+ const teardown: ClientLinkTeardownResult = expectLink !== undefined ? { linkId: null, homeRevoke: "not_applicable", tunnel: null } : await teardownClientLink({
590
638
  readSidecar: readClientLinkState,
591
639
  connectedLinkId: () => {
592
640
  const state = readClientConnectionState();
@@ -599,7 +647,22 @@ export async function handleDisconnectCommand(
599
647
  knownHostsFile: deps.linkTeardownDeps?.knownHostsFile ?? linkKnownHostsPath(),
600
648
  timeoutMs: deps.linkTeardownDeps?.timeoutMs,
601
649
  });
602
- const result = await disconnectClient({ keepCatalog }, deps);
650
+ const result = await disconnectClient({ keepCatalog, recoverConfig, ...(expectLink !== undefined ? { expectLink } : {}) }, deps).catch((error: unknown) => {
651
+ if (error instanceof ClientSyncExpectationError) { mismatch = error; return null; }
652
+ // The bare code left a Home-driven leave with nothing to act on; the remedy already exists.
653
+ if (error instanceof Error && error.message === "client_catalog_ownership_changed") {
654
+ throw new Error("client_catalog_ownership_changed: the Codex model catalog (opencodex-catalog.json in the Codex home) matches neither the catalog this connection wrote nor the one recorded before it connected, so something changed it after connecting and disconnect will not overwrite it. To disconnect and leave that file as it is, run: ocx disconnect --keep-catalog");
655
+ }
656
+ throw error;
657
+ });
658
+ if (!result) return;
659
+ if (result.nativeIntentOnly) {
660
+ printData(result, wantsJson, [
661
+ "Not connected; restored the standalone native switches an interrupted Remote Link enrollment had changed.",
662
+ ...(result.tokenRemoved ? ["Removed the service token that enrollment left behind."] : []),
663
+ ]);
664
+ return;
665
+ }
603
666
  const payload = {
604
667
  ...result,
605
668
  homeRevoke: teardown.homeRevoke,
@@ -611,6 +674,7 @@ export async function handleDisconnectCommand(
611
674
  };
612
675
  printData(payload, wantsJson, [
613
676
  "Disconnected locally; native Codex state was restored.",
677
+ ...(result.recoveryBackupDir ? [`Codex recovery snapshot: ${result.recoveryBackupDir}/snapshot.json (private; retained for manual inspection).`] : []),
614
678
  ...(result.desktopRestoration === "standard_fallback"
615
679
  ? ["Previous Desktop settings were not recorded; the managed profile was switched to standard mode."] : []),
616
680
  ...(result.restartRequired ? ["Fully quit and reopen Claude Desktop; local cleanup cannot revoke an in-memory credential."] : []),
@@ -623,4 +687,12 @@ export async function handleDisconnectCommand(
623
687
  : `The hub key ${result.apiKeyId} is still valid. Revoke it from Integrations → API Keys.`,
624
688
  ]);
625
689
  });
690
+ if (mismatch) {
691
+ // As ocx sync --expect-link: one human line, then the JSON a Home parses as the last stderr line.
692
+ const refused: { phase: string; reason: string } = mismatch;
693
+ console.error(`Disconnect refused (${refused.phase}: ${refused.reason}); nothing was changed.${refused.reason === "client_initiated_link" ? " This machine joined its Home itself; run ocx disconnect without --expect-link." : ""}`);
694
+ console.error(JSON.stringify({ phase: refused.phase, reason: refused.reason }));
695
+ return SYNC_EXPECTATION_MISMATCH_EXIT;
696
+ }
697
+ return code;
626
698
  }
@@ -19,7 +19,7 @@ export function duplicateRuntimeMessage(
19
19
  if (pid != null && latch.observe(evidence)) {
20
20
  const supervisor = evidence.kind === "desktop" ? `, ${evidence.app}` : "";
21
21
  return `OpenCodex Desktop supervises the running proxy (pid ${pid}${supervisor}, port ${port}). `
22
- + "Use the running proxy, or quit OpenCodex before starting it from this CLI.";
22
+ + "Use the running proxy (restart it with 'ocx restart', re-point Codex with 'ocx sync'), or quit OpenCodex before starting it from this CLI.";
23
23
  }
24
24
  return `⚠️ Proxy already running (PID ${pid ?? "unknown"}, port ${port}). Use 'ocx stop' first.`;
25
25
  }
@@ -0,0 +1,178 @@
1
+ /**
2
+ * `ocx disconnect` ends the connection in the durable state; the runtime that served it keeps
3
+ * running until something restarts it. Left alone it still answered as a client, so the machine
4
+ * was neither a working Child nor standalone, and a Home could not link it again. Disconnect
5
+ * therefore restarts that runtime itself (the same restart as `ocx restart`, which a disconnected
6
+ * client runtime hands to whichever owner holds it), bound to the runtime generation it observed,
7
+ * and exits 0 only when no client runtime remained or a live standalone runtime answers afterwards.
8
+ * Every other outcome exits 1, so a Home-driven leave stops before its own `ocx restart`. One
9
+ * exception keeps the runtime on purpose: a record stating `legacy-flag` (only a bare OCX_SERVICE=1, so
10
+ * its owner cannot be proven; #8545) gets no restart request and exits 0 with the re-register advice,
11
+ * because the disconnect itself completed and a later `ocx restart` refuses it with the same advice.
12
+ */
13
+ import type { ProxyRestartIo, ProxyRestartLive, ProxyRestartRequestOutcome } from "./tray-proxy";
14
+ import { LEGACY_FLAG_RESTART_OWNER, RESTART_OWNERS, type RestartOwner } from "../client/runtime-restart";
15
+ import { LEGACY_FLAG_OWNER_ADVICE } from "./restart-failure";
16
+
17
+ function isHandledRestartOwner(value: string | undefined): value is RestartOwner {
18
+ return value !== undefined && (RESTART_OWNERS as readonly string[]).includes(value);
19
+ }
20
+
21
+ /**
22
+ * One runtime process: its runtime record. The attestation secret is created per process
23
+ * (src/lib/local-management-attestation.ts createLocalAttestationSecret), so a new process at a
24
+ * reused pid has a different one.
25
+ */
26
+ export interface RuntimeGeneration {
27
+ pid: number;
28
+ port: number;
29
+ hostname?: string;
30
+ attestationSecret: string;
31
+ /** The owner the runtime classified from positive evidence, legacy-flag for a bare flag; absent for an older runtime. */
32
+ restartOwner?: string;
33
+ }
34
+
35
+ export type DisconnectClientState =
36
+ | { kind: "disconnected" }
37
+ | { kind: "connected" }
38
+ | { kind: "invalid" | "mismatched"; reason: string };
39
+
40
+ export interface DisconnectRuntimeDeps {
41
+ /** Liveness that separates a confirmed absence from a probe that could not decide. */
42
+ observe: () => Promise<
43
+ | { kind: "live"; live: { pid: number | null; port: number; role?: string } }
44
+ | { kind: "absent" | "unknown"; live: null }
45
+ >;
46
+ /** The runtime record of the observed runtime, only when it names that pid and port. */
47
+ capture: (live: { pid: number | null; port: number }) => RuntimeGeneration | null;
48
+ /** The durable client state, read right before the restart. */
49
+ connectionState: () => DisconnectClientState;
50
+ /**
51
+ * `ocx restart` bound to this generation (see {@link bindRestartToRuntime}). `refusedBy` names a
52
+ * supervisor that refused it: an owning service manager whose relaunch could not be proven.
53
+ */
54
+ restart: (target: RuntimeGeneration) => Promise<{ ok: boolean; refusedBy?: "service-unproven" }>;
55
+ json: boolean;
56
+ info?: (line: string) => void;
57
+ error?: (line: string) => void;
58
+ }
59
+
60
+ /**
61
+ * Bind a restart to one runtime generation. The restart discovers its target again, and a connect
62
+ * that committed in between can have started a new client runtime there, even at a reused pid.
63
+ * The request goes out only for the captured pid and port, and the runtime record it attests and
64
+ * derives the restart capability from is the captured one: a different process cannot prove that
65
+ * secret, so it is refused before the restart request is sent, and its listener would reject the
66
+ * capability anyway. A runtime that is gone gets no generic start.
67
+ */
68
+ export function bindRestartToRuntime(
69
+ io: ProxyRestartIo,
70
+ target: RuntimeGeneration,
71
+ request: (previous: ProxyRestartLive, readRuntime: (pid: number) => RuntimeGeneration | null) => ProxyRestartRequestOutcome | Promise<ProxyRestartRequestOutcome>,
72
+ ): ProxyRestartIo {
73
+ return {
74
+ ...io,
75
+ startWhenStopped: () => ({ status: "skipped" }),
76
+ requestInPlaceRestart: previous => (previous.pid !== target.pid || previous.port !== target.port
77
+ ? { accepted: false, uncertain: false, error: new Error("restart_target_changed") }
78
+ : request(previous, pid => (pid === target.pid ? target : null))),
79
+ };
80
+ }
81
+
82
+ /** What is known about the runtime answering when the advice is given. */
83
+ export type AnsweringRuntime =
84
+ | { kind: "captured"; pid: number | null; refusedBy?: "service-unproven" }
85
+ | { kind: "different"; pid: number | null }
86
+ | { kind: "unknown" }
87
+ | { kind: "none" };
88
+
89
+ /**
90
+ * The only source of recovery advice for every exit-1 outcome of this step. A plain
91
+ * `ocx restart` is advised only while the state read now is disconnected and either the captured
92
+ * runtime is still the one answering, or nothing answers at all (a start, nothing to interrupt).
93
+ * Any other state gets what was seen and `ocx status` inspection, never a restart.
94
+ */
95
+ export function recoveryAdvice(state: DisconnectClientState, answering: AnsweringRuntime): string {
96
+ if (state.kind === "connected") {
97
+ return "A new connection is in use on this machine; inspect it with ocx status and ocx connect status and do not restart it. If this machine should leave its Home, run ocx disconnect again.";
98
+ }
99
+ if (state.kind !== "disconnected") {
100
+ return `The client state is ${state.kind} (${state.reason}). Inspect it with ocx connect status and ocx status, fix the client state, then run ocx disconnect again.`;
101
+ }
102
+ switch (answering.kind) {
103
+ case "captured": return answering.refusedBy
104
+ ? `The client runtime${answering.pid ? ` (pid ${answering.pid})` : ""} still serves the old connection, and its service manager did not allow a restart from here. Restart it through the manager: ocx service restart (check ocx service status).`
105
+ : `The client runtime${answering.pid ? ` (pid ${answering.pid})` : ""} still serves the old connection. Run on this machine: ocx restart`;
106
+ case "different": return `A different client runtime${answering.pid ? ` (pid ${answering.pid})` : ""} answers now, so it was not restarted; inspect it with ocx status and ocx connect status before restarting anything.`;
107
+ case "unknown": return "Which runtime answers could not be determined; inspect with ocx status and ocx connect status, and restart a client runtime only while ocx connect status reports disconnected.";
108
+ case "none": return "No runtime answers; start one with ocx restart (or the desktop app or ocx service start, whichever owns it).";
109
+ }
110
+ }
111
+
112
+ /**
113
+ * Exit 0 only when no client runtime remains and the state is disconnected: read once after the
114
+ * observation when no runtime or a non-client runtime answered, and again after a restart. Every
115
+ * exit-1 outcome is a headline plus {@link recoveryAdvice} computed from the state read at that point.
116
+ */
117
+ export async function restartRuntimeAfterDisconnect(deps: DisconnectRuntimeDeps): Promise<number> {
118
+ const info = deps.info ?? (line => console.log(line));
119
+ const error = deps.error ?? (line => console.error(line));
120
+ const fail = (headline: string, answering: AnsweringRuntime): number => {
121
+ error(`${headline} ${recoveryAdvice(deps.connectionState(), answering)}`);
122
+ return 1;
123
+ };
124
+ const observed = await deps.observe();
125
+ if (observed.kind === "unknown") {
126
+ return fail("Disconnected, but this machine could not confirm whether the client runtime stopped: a recorded OpenCodex process did not answer.", { kind: "unknown" });
127
+ }
128
+ const client = observed.kind === "live" && observed.live.role === "client" ? observed.live : null;
129
+ // Captured before the state is read: a runtime a later connect starts is a later generation.
130
+ const target = client ? deps.capture(client) : null;
131
+ if (client && !target) {
132
+ return fail(`Disconnected, but this machine could not identify the running client runtime${client.pid ? ` (pid ${client.pid})` : ""}: its runtime record is missing or names another process, so it was not restarted.`, { kind: "unknown" });
133
+ }
134
+ // A bare OCX_SERVICE=1 runtime is kept and nothing is stopped on inference (#8545 owner decision): no
135
+ // restart request, the disconnect's own exit 0, and the advice to re-register the service once.
136
+ if (target?.restartOwner === LEGACY_FLAG_RESTART_OWNER) {
137
+ error(`Disconnected, but the client runtime${client?.pid ? ` (pid ${client.pid})` : ""} was kept and still serves the old connection; nothing was stopped. ${LEGACY_FLAG_OWNER_ADVICE}`);
138
+ return 0;
139
+ }
140
+ // Only a record that states an owner this step handles (written by a runtime with this change:
141
+ // the desktop app, a service manager with a current marker, or no supervisor) is restarted. A
142
+ // record from a runtime started before restartOwner existed, or naming a later value, is left
143
+ // exactly as origin/dev's `ocx disconnect` left it: no restart request, the disconnect's own exit 0.
144
+ if (target && !isHandledRestartOwner(target.restartOwner)) return 0;
145
+ const before = deps.connectionState();
146
+ if (before.kind !== "disconnected") {
147
+ error(`Disconnect finished, but the client runtime was not restarted. ${recoveryAdvice(before, { kind: "unknown" })}`);
148
+ return 1;
149
+ }
150
+ if (!client || !target) return 0;
151
+ // A --json caller reads one document from stdout; restart progress goes to stderr.
152
+ const originalLog = console.log;
153
+ if (deps.json) console.log = (...args: unknown[]) => console.error(...args);
154
+ let ok = false;
155
+ let refusedBy: "service-unproven" | undefined;
156
+ try { ({ ok, refusedBy } = await deps.restart(target)); } finally { console.log = originalLog; }
157
+ const after = await deps.observe();
158
+ if (after.kind === "live" && after.live.role !== "client") {
159
+ const late = deps.connectionState();
160
+ if (late.kind !== "disconnected") {
161
+ error(`The client runtime was restarted, but the client state changed meanwhile. ${recoveryAdvice(late, { kind: "unknown" })}`);
162
+ return 1;
163
+ }
164
+ (deps.json ? error : info)("The client runtime was restarted; this machine now runs standalone OpenCodex.");
165
+ return 0;
166
+ }
167
+ if (after.kind === "live") {
168
+ const answering = deps.capture(after.live);
169
+ const who: AnsweringRuntime = !answering ? { kind: "unknown" }
170
+ : answering.attestationSecret === target.attestationSecret ? { kind: "captured", pid: after.live.pid, ...(refusedBy ? { refusedBy } : {}) }
171
+ : { kind: "different", pid: after.live.pid };
172
+ if (ok && who.kind === "captured") {
173
+ return fail("The restart completed, but the runtime still answers as a client.", { kind: "unknown" });
174
+ }
175
+ return fail(ok ? "The restart completed, but a client runtime answers." : "Disconnected, but the restart did not complete.", who);
176
+ }
177
+ return fail("Disconnected, but this machine could not confirm a standalone runtime afterwards.", after.kind === "absent" ? { kind: "none" } : { kind: "unknown" });
178
+ }
@@ -1,4 +1,4 @@
1
- import type { ProxyRestartStartOutcome } from "./tray-proxy";
1
+ import type { ProxyRestartIo, ProxyRestartStartOutcome } from "./tray-proxy";
2
2
  import type { RestartSupervisor } from "./restart-failure";
3
3
  /**
4
4
  * Registry-driven command dispatch (Phase 3 of the CLI deepening).
@@ -21,11 +21,11 @@ import { printUnknownCommand } from "./help-recovery";
21
21
  import {
22
22
  HUB_GATED_SKIP_MESSAGE,
23
23
  localClientSkipMessage,
24
- setIntegrationEnabled,
25
24
  shouldSyncCodexOnStart,
26
25
  type LocalClientSkipReason,
27
26
  } from "../codex/desired-state";
28
27
  import { siblingSkipMessage } from "../codex/sibling-start";
28
+ import { setHomeIntegrationEnabled, type HomeIntegrationResult } from "../routing/home-route-capture";
29
29
  import { syncModelsToCodex } from "../codex/sync";
30
30
  import { collectOrcaCodexHomeDiagnostic } from "../codex/home";
31
31
  import { restoreNativeCodexAsync, type CodexNativeRestoreResult } from "../codex/inject";
@@ -35,6 +35,7 @@ import { normalizeUpdateChannel, runGuiUpdateWorker } from "../update/job";
35
35
  import { isJsonOption, takeFlag } from "./runtime-api";
36
36
  import { printStopSummary, type StopOutcome } from "./stop-report";
37
37
  import { parseStopApproval, type StopApproval } from "./stop-approval";
38
+ import { resolveStopDeadlineMs, setStopDeadlineMs } from "../service/windows-stop-deadline";
38
39
  import type { ResolveArgs } from "./resolve";
39
40
  import type { ClientConnectionState } from "../client/state";
40
41
  import { OCX_NATIVE_REPLAY_RECOVERY_NOTE } from "../responses/compaction";
@@ -60,7 +61,8 @@ export interface CliDispatchDeps {
60
61
  handleTrayProxyStart: (existingIsSuccess?: boolean) => Promise<boolean>;
61
62
  handleTrayProxyRestart: () => Promise<void>;
62
63
  handleRestartStartWhenStopped: (recoveringLiveRestart?: boolean) => Promise<ProxyRestartStartOutcome>;
63
- handleProxyRestart: (startWhenStopped: (recoveringLiveRestart: boolean) => Promise<ProxyRestartStartOutcome>, onSupervised?: (supervisor: RestartSupervisor) => void) => Promise<boolean>;
64
+ /** `bindIo` lets a caller bind the restart to one target (ocx disconnect: src/cli/disconnect-runtime.ts). */
65
+ handleProxyRestart: (startWhenStopped: (recoveringLiveRestart: boolean) => Promise<ProxyRestartStartOutcome>, onSupervised?: (supervisor: RestartSupervisor) => void, bindIo?: (io: ProxyRestartIo, deadlineAt: number) => ProxyRestartIo) => Promise<boolean>;
64
66
  handleUninstall: () => Promise<void>;
65
67
  handleStatus: () => Promise<void>;
66
68
  handleRecoverHistory: () => Promise<void>;
@@ -89,6 +91,12 @@ export function selectDefaultGuiUrl(
89
91
  return `http://${guiHost}:${live?.port ?? config.port ?? 10100}`;
90
92
  }
91
93
 
94
+ /** An unavailable route-intent file names the file to repair; the other refusals keep their reason. */
95
+ function desiredStateRefusal(desired: Extract<HomeIntegrationResult, { ok: false }>): string {
96
+ return desired.reason === "unavailable" ? `Codex desired state was not saved (unavailable): ${desired.message}`
97
+ : `Codex desired state was not saved (${desired.reason}).`;
98
+ }
99
+
92
100
  const commandRunners: Record<string, CommandRunner> = {
93
101
  init: async () => {
94
102
  const { runInit } = await import("./init");
@@ -110,9 +118,11 @@ const commandRunners: Record<string, CommandRunner> = {
110
118
  stop: async deps => {
111
119
  const parsed = parseStopApproval(deps.args.slice(1));
112
120
  if (!parsed.ok) {
113
- console.error("Usage: ocx stop [--json [--expect-pid <pid> --expect-port <port> --expect-hostname <host> --expect-config-home <home> --expect-cli-version <version> --expect-compatibility-token <hex>]]");
121
+ console.error("Usage: ocx stop [--deadline-ms <ms>] [--json [--expect-pid <pid> --expect-port <port> --expect-hostname <host> --expect-config-home <home> --expect-cli-version <version> --expect-compatibility-token <hex>]]");
114
122
  return 64;
115
123
  }
124
+ // #7771: the Windows checked stop's deadline, from this process's start (flag, then env, then 60 s).
125
+ setStopDeadlineMs(resolveStopDeadlineMs(parsed.deadlineMs));
116
126
  // Downtime warning lives HERE, not in handleStop: `restart`/tray-restart callers
117
127
  // re-start the proxy immediately, so warning there would contradict the next line.
118
128
  const warning = "⚠️ Codex/Claude requests through the proxy will fail until it is restarted ('ocx start' or 'ocx service start').";
@@ -173,13 +183,13 @@ const commandRunners: Record<string, CommandRunner> = {
173
183
  if (!live) {
174
184
  return emitBack(false, "No running proxy found. Run 'ocx start' — it injects opencodex automatically.", 1);
175
185
  }
176
- const desired = setIntegrationEnabled("codex", true);
186
+ const desired = setHomeIntegrationEnabled("codex", true);
177
187
  if (!desired.ok) {
178
- return emitBack(false, `Codex desired state was not saved (${desired.reason}).`, desired.reason === "conflict" ? 2 : 1);
188
+ return emitBack(false, desiredStateRefusal(desired), desired.reason === "conflict" ? 2 : 1);
179
189
  }
180
190
  const synced = await syncModelsToCodex(live.port);
181
191
  if (synced.status === "skipped") {
182
- // `setIntegrationEnabled` above just committed ON, so a skip here is NOT the toggle and
192
+ // `setHomeIntegrationEnabled` above just committed ON, so a skip here is NOT the toggle and
183
193
  // is not a competing writer either — on a hub it is the role gate. Telling the operator
184
194
  // to "retry after the competing integration change finishes" sent them waiting for a
185
195
  // writer that does not exist (#4236).
@@ -200,15 +210,15 @@ const commandRunners: Record<string, CommandRunner> = {
200
210
  if (removeProviderTable && !restoreJson) {
201
211
  console.log("⚠️ Removing [model_providers.opencodex] means conversations already tagged opencodex will stop opening.");
202
212
  }
203
- const desired = setIntegrationEnabled("codex", false);
213
+ const desired = setHomeIntegrationEnabled("codex", false);
204
214
  if (!desired.ok) {
205
215
  if (restoreJson) {
206
216
  // Machine-readable contract: every restore --json outcome emits one
207
217
  // schema-complete envelope on stdout, including pre-machinery failures.
208
218
  const { skippedRestoreEnvelope } = await import("../codex/inject");
209
- console.log(JSON.stringify(skippedRestoreEnvelope(false, `Codex desired state was not saved (${desired.reason}).`)));
219
+ console.log(JSON.stringify(skippedRestoreEnvelope(false, desiredStateRefusal(desired))));
210
220
  } else {
211
- console.error(`Codex desired state was not saved (${desired.reason}).`);
221
+ console.error(desiredStateRefusal(desired));
212
222
  }
213
223
  return desired.reason === "conflict" ? 2 : 1;
214
224
  }
@@ -377,6 +387,7 @@ const commandRunners: Record<string, CommandRunner> = {
377
387
  // It is deliberately not `--code`: that name carries a secret value everywhere else in the
378
388
  // CLI (`ocx account login <provider> --code <value>`) and its operand is scrubbed from stderr.
379
389
  const codeMode = loginArgs.includes("--headless");
390
+ const acceptAntigravityRisk = loginArgs.includes("--accept-antigravity-risk");
380
391
  const positional = loginArgs.filter(arg => !arg.startsWith("--"));
381
392
  // 'ocx login codex' is the command people type first, and until now it answered with
382
393
  // the full provider wall because the Codex pool lives behind 'ocx account login'.
@@ -397,7 +408,7 @@ const commandRunners: Record<string, CommandRunner> = {
397
408
  return code ?? 1;
398
409
  }
399
410
  const { handleLogin } = await import("../oauth/login-cli");
400
- await handleLogin(positional[0], {}, { codeMode });
411
+ await handleLogin(positional[0], {}, { codeMode, acceptAntigravityRisk });
401
412
  return 0;
402
413
  },
403
414
  logout: async deps => {
@@ -423,7 +434,35 @@ const commandRunners: Record<string, CommandRunner> = {
423
434
  },
424
435
  disconnect: async deps => {
425
436
  const { handleDisconnectCommand } = await import("./connect");
426
- return await handleDisconnectCommand(deps.args.slice(1));
437
+ const code = await handleDisconnectCommand(deps.args.slice(1));
438
+ // Token recovery refuses any live client runtime and leaves nothing to restart.
439
+ if (code !== 0 || deps.args.includes("--orphaned-token")) return code;
440
+ const { bindRestartToRuntime, restartRuntimeAfterDisconnect } = await import("./disconnect-runtime");
441
+ const { observeProxyLiveness } = await import("../server/proxy-liveness");
442
+ const { readClientConnectionStateWithEvidence } = await import("../client/state");
443
+ const { readRuntimePort } = await import("../config/process-state");
444
+ const { requestBoundSystemRestart } = await import("./system-restart-client");
445
+ return await restartRuntimeAfterDisconnect({
446
+ observe: () => observeProxyLiveness({ attempts: 2 }),
447
+ capture: live => {
448
+ if (live.pid === null) return null;
449
+ const record = readRuntimePort(live.pid);
450
+ return record?.attestationSecret && record.pid === live.pid && record.port === live.port
451
+ ? { ...record, attestationSecret: record.attestationSecret } : null;
452
+ },
453
+ connectionState: () => {
454
+ const state = readClientConnectionStateWithEvidence();
455
+ return state.kind === "invalid" || state.kind === "mismatched" ? { kind: state.kind, reason: state.reason } : { kind: state.kind };
456
+ },
457
+ restart: async target => {
458
+ let refusedBy: "service-unproven" | undefined;
459
+ const ok = await deps.handleProxyRestart(deps.handleRestartStartWhenStopped, supervisor => { if (supervisor === "service-unproven") refusedBy = supervisor; }, (io, deadlineAt) =>
460
+ bindRestartToRuntime(io, target, (previous, readRuntime) =>
461
+ requestBoundSystemRestart(previous as Parameters<typeof requestBoundSystemRestart>[0], deadlineAt, { readRuntime: readRuntime as typeof readRuntimePort })));
462
+ return { ok, ...(refusedBy ? { refusedBy } : {}) };
463
+ },
464
+ json: deps.args.includes("--json"),
465
+ });
427
466
  },
428
467
  catalog: async deps => {
429
468
  const { handleCatalogCommand } = await import("./catalog");
@@ -612,6 +651,11 @@ const commandRunners: Record<string, CommandRunner> = {
612
651
  return 0;
613
652
  },
614
653
  update: async deps => {
654
+ // #8246: the headless Windows Desktop updater has its own grammar (including --json) and never
655
+ // reaches the package or orchestrated updater.
656
+ if (deps.args.slice(1).includes("--desktop") && !hasHelpFlag(deps.args.slice(1))) {
657
+ return (await import("../desktop-update/cli")).runHeadlessDesktopUpdateCommand(deps.args.slice(1));
658
+ }
615
659
  const { isOrchestratedUpdateArgv, parseOrchestratedChildArgs } = await import("../update/orchestrated-arguments.mjs");
616
660
  if (process.env.OCX_UPDATE_ORCHESTRATED_CHILD === "1" && deps.args.slice(1).some(arg => /^--orchestrated-(expect|result)(?:=|$)/.test(arg))) {
617
661
  const child = parseOrchestratedChildArgs(deps.args.slice(1), process.env);
@@ -752,8 +796,12 @@ const commandRunners: Record<string, CommandRunner> = {
752
796
  return await handleCompanionCommand(deps.args.slice(1), { findLiveProxy: deps.findLiveProxy });
753
797
  },
754
798
  route: async deps => {
799
+ if (deps.args[1] === "to") {
800
+ const { handleRouteToCommand } = await import("./route-to");
801
+ return await handleRouteToCommand(deps.args.slice(2), { findLiveProxy: deps.findLiveProxy });
802
+ }
755
803
  if (deps.args[1] !== "combo" && deps.args[1] !== "policy") {
756
- console.error("Usage: ocx route <combo|policy> <subcommand>");
804
+ console.error("Usage: ocx route <to|combo|policy> <subcommand>");
757
805
  return 2;
758
806
  }
759
807
  if (deps.args[1] === "combo") {
@@ -174,7 +174,7 @@ export async function handleExportCommand(argv: string[], deps: ExportCommandDep
174
174
  const spec = EXPORT_CLIENTS[client];
175
175
  const root = await runtimeBaseUrl(deps);
176
176
  let built: { document: unknown; text: string };
177
- if (modelNames !== undefined || client === "t3code" || client === "raycast" || client === "droid" || client === "qoder" || client === "qoder-cn" || client === "workbuddy" || client === "workbuddy-ai") {
177
+ if (modelNames !== undefined || client === "pi" || client === "t3code" || client === "raycast" || client === "droid" || client === "qoder" || client === "qoder-cn" || client === "workbuddy" || client === "workbuddy-ai") {
178
178
  // The dial address alone cannot distinguish a wildcard authenticated bind
179
179
  // from loopback. Let the live server resolve its admission/listener policy;
180
180
  // saved config can differ from the process serving this request.
@@ -17,6 +17,7 @@ import {
17
17
  GUI_PAIR_METHOD,
18
18
  GUI_PAIR_NONCE_HEADER,
19
19
  GUI_PAIR_PATH,
20
+ DESKTOP_GUI_PAIR_PATH,
20
21
  canonicalGuiBrowserOrigin,
21
22
  canonicalHttpOrigin,
22
23
  createGuiPairCapability,
@@ -34,6 +35,7 @@ export type GuiPairRequestResult =
34
35
  | { kind: "unavailable"; reason: "unattested-target" | "runtime-mismatch" | "attestation" | "capability" | "transport" | "rejected" | "local-intent" | "origin-refused" | "rate-limited" };
35
36
 
36
37
  export interface GuiPairClientDeps {
38
+ desktopPurpose?: boolean;
37
39
  fetchImpl?: typeof fetch;
38
40
  readRuntime?: (pid: number) => RuntimePortState | null;
39
41
  createChallenge?: () => string;
@@ -150,11 +152,12 @@ export async function requestBoundGuiPairingGrant(
150
152
  return { kind: "unavailable", reason: "runtime-mismatch" };
151
153
  }
152
154
  const expiresAt = (deps.now ?? Date.now)() + GUI_PAIR_CAPABILITY_TTL_MS;
155
+ const path = deps.desktopPurpose ? DESKTOP_GUI_PAIR_PATH : GUI_PAIR_PATH;
153
156
  const capability = createGuiPairCapability(
154
157
  runtime.attestationSecret,
155
158
  challenge,
156
159
  GUI_PAIR_METHOD,
157
- GUI_PAIR_PATH,
160
+ path,
158
161
  browserOrigin,
159
162
  target.pid,
160
163
  target.port,
@@ -163,10 +166,10 @@ export async function requestBoundGuiPairingGrant(
163
166
  if (!capability) return { kind: "unavailable", reason: "capability" };
164
167
  let intent: GuiPairIntent | undefined;
165
168
  try {
166
- if (deps.requireLocalIntent !== false) intent = (deps.createIntent ?? createGuiPairIntent)(capability);
169
+ if (deps.desktopPurpose || deps.requireLocalIntent !== false) intent = (deps.createIntent ?? createGuiPairIntent)(capability);
167
170
  } catch { return { kind: "unavailable", reason: "local-intent" }; }
168
171
  try {
169
- const response = await fetchImpl(`${baseUrl}${GUI_PAIR_PATH}`, {
172
+ const response = await fetchImpl(`${baseUrl}${path}`, {
170
173
  method: GUI_PAIR_METHOD,
171
174
  headers: {
172
175
  "Content-Length": "0",