@bitkyc08/opencodex 2.100.2 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -1,6 +1,10 @@
1
1
  import { autoRestoreCodexShim, autoRestoreCodexShimAsync } from "../codex/shim";
2
2
  import { codexShimAutoRestoreEnabled, readConfigDiagnostics } from "../config";
3
- import { isOrchestratedUpdateArgv } from "../update/orchestrated-arguments.mjs";
3
+ import { skipsCodexShimAutoRestore } from "./preflight-exemptions";
4
+
5
+ // Re-exported for existing importers; the list itself lives in a leaf module so a caller that
6
+ // only needs it (the config-root startup wait) does not link the shim repair machinery.
7
+ export { skipsCodexShimAutoRestore };
4
8
 
5
9
  export interface CodexShimAutoRestoreCliDeps {
6
10
  env: NodeJS.ProcessEnv;
@@ -16,47 +20,6 @@ const DEFAULT_DEPS: CodexShimAutoRestoreCliDeps = {
16
20
  readConfig: readConfigDiagnostics,
17
21
  };
18
22
 
19
- /** Identify command namespaces whose execution must not trigger automatic shim repair. */
20
- export function skipsCodexShimAutoRestore(command: string | undefined, args: string[]): boolean {
21
- if (command === "uninstall" || command === "remove") return true;
22
- // Contract discovery and orchestrated update must validate before any repair.
23
- if (command === "capabilities") return true;
24
- if (command === "update" && isOrchestratedUpdateArgv(args)) return true;
25
- if (command === "sync") return true;
26
- if (command === "status" || command === "doctor") return true;
27
- // Explicit orphan-token recovery must not mutate Codex before its guards run.
28
- if (command === "disconnect" && args.includes("--orphaned-token")) return true;
29
- // The launcher owns shim handoff after classifying routing, including native fast paths.
30
- if (command === "codex") return true;
31
- // Exec admission only observes the selected target; it must never repair a shim first.
32
- if (command === "internal" && args[1] === "codex-exec-target") return true;
33
- // `lab` is read-only inspection; it must not trigger shim side effects.
34
- if (command === "lab") return true;
35
- // Local messaging owns its helpers; even malformed usage must not repair/start anything.
36
- if (command === "message") return true;
37
- // `resolve` is read-only inspection for embedding shells: a lookup made to populate
38
- // a consent surface must not trigger a shim repair side effect first.
39
- if (command === "resolve") return true;
40
- // Local model inventory is read-only; mutations and live commands keep preflight.
41
- if (command === "models" || command === "model") {
42
- const subcommand = args[1];
43
- if (!subcommand || subcommand.startsWith("-") || subcommand === "list" || subcommand === "list-custom") return true;
44
- }
45
- // `service status --json` is a passive inventory read for peers such as GOAT: a shim repair
46
- // before dispatch would change the installation it was asked only to describe.
47
- // Flags may precede the verb (`ocx service --json status`), exactly as parseServiceArgs reads it.
48
- if (command === "service" && args.includes("--json")
49
- && args.slice(1).find(arg => !arg.startsWith("--")) === "status") return true;
50
- // The desktop's approval-bound stop must validate its snapshot before any unrelated
51
- // CLI repair changes the installation it was approved against.
52
- if (command === "stop" && args.some(arg => arg.startsWith("--expect-"))) return true;
53
- // The entire updater-inspection namespace is zero-effect, including malformed
54
- // or future actions. A later `apply` implementation must own its preflight.
55
- if (command === "system" && args[1] === "codex-cli-update") return true;
56
- if (command === "__update-badge") return true;
57
- return command === "codex-shim" && ["install", "status", "uninstall", "remove"].includes(args[1] ?? "");
58
- }
59
-
60
23
  export function maybeAutoRestoreCodexShim(
61
24
  command: string | undefined,
62
25
  args: string[],
@@ -18,7 +18,8 @@ const USAGE = `Usage:
18
18
  ocx config unset <dot.path> [--json]
19
19
  ocx config validate [path|-] [--json]
20
20
  ocx config export <path|-> [--json]
21
- ocx config import <path|-> --yes [--json]`;
21
+ ocx config import <path|-> --yes [--json]
22
+ Entering v2-plaintext requires: ocx v2 mode v2-plaintext --acknowledge-plaintext-agent-messages`;
22
23
 
23
24
  /**
24
25
  * Keys whose VALUE is a credential and must never be printed by display commands.
@@ -230,6 +231,12 @@ function validate(value: unknown): OcxConfig {
230
231
  return normalizeVisionConfig(result.config);
231
232
  }
232
233
 
234
+ function requireDedicatedPlaintextTransition(current: OcxConfig, candidate: OcxConfig): void {
235
+ if (candidate.multiAgentMode === "v2-plaintext" && current.multiAgentMode !== "v2-plaintext") {
236
+ throw new CliUsageError("Entering v2-plaintext requires ocx v2 mode v2-plaintext --acknowledge-plaintext-agent-messages. Task text may remain in history, provider requests and debug state. Complete that transition before restoring a config with this mode.");
237
+ }
238
+ }
239
+
233
240
  export async function handleConfigCommand(argv: string[]): Promise<number> {
234
241
  let outcome = 0;
235
242
  const status = await runCliAction(async () => {
@@ -293,6 +300,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
293
300
  const candidate = structuredClone(fresh) as unknown as Record<string, unknown>;
294
301
  setPath(candidate, path, raw === undefined ? undefined : parseValue(raw), action === "unset");
295
302
  const config = validate(candidate);
303
+ requireDedicatedPlaintextTransition(fresh, config);
296
304
  savedValue = action === "unset" ? null : getPath(config, path);
297
305
  // Setting the order here is the operator restating it, exactly as through
298
306
  // `ocx account priority` or the management route, so it releases the manual pin
@@ -357,6 +365,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
357
365
  if (!yes) throw new CliUsageError("import requires --yes", USAGE);
358
366
  rejectArgs(args, USAGE);
359
367
  await withConfigDirHardeningSettled(getConfigDir(), () => {
368
+ // Reject invalid authority before lock preparation creates coordination files.
360
369
  const current = readCliConfigForMutation();
361
370
  const rawInput = loadInput(path);
362
371
  if (rawInput && typeof rawInput === "object" && !Array.isArray(rawInput) && Object.hasOwn(rawInput, "telemetry")) {
@@ -364,6 +373,9 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
364
373
  console.warn("Note: ignored telemetry block during config import; use `ocx telemetry` to manage telemetry consent.");
365
374
  }
366
375
  const imported = validate(rawInput);
376
+ // Do not hold the shared lock while reading stdin. Recheck the live mode and
377
+ // the active client connection, then save in the same synchronous transaction;
378
+ // saveConfig reuses this transaction.
367
379
  withConfigMutationLockSync(() => {
368
380
  const client = readClientConnectionState();
369
381
  if (client.kind === "connected" && (imported.runtimeRole !== "client"
@@ -376,6 +388,7 @@ export async function handleConfigCommand(argv: string[]): Promise<number> {
376
388
  } else {
377
389
  delete imported.telemetry;
378
390
  }
391
+ requireDedicatedPlaintextTransition(readCliConfigForMutation(), imported);
379
392
  saveConfig(imported);
380
393
  });
381
394
  });
@@ -0,0 +1,34 @@
1
+ import { getConfigDir, hardenConfigDir, withConfigDirHardeningSettled } from "../config/paths";
2
+ import { WindowsSecretAclSettleTimeoutError, windowsSecretAclApplies } from "../lib/windows-secret-acl";
3
+ import { skipsCodexShimAutoRestore } from "./preflight-exemptions";
4
+
5
+ /**
6
+ * Wait once, before a CLI command does its first write, for the optional config-root ACL flight
7
+ * (#7815). On Windows, loadConfig() starts an unawaited icacls harden of the config root, and its
8
+ * inheritance work can drop a grant a concurrent writer just applied. Admitted writers already
9
+ * wait for it themselves; this covers the synchronous writers a CLI command reaches before them.
10
+ *
11
+ * Skipped where waiting would itself be the side effect or the delay matters:
12
+ * - the commands skipsCodexShimAutoRestore exempts from preflight repair (read-only, hot-path
13
+ * and validate-first commands). Adding a command there also removes this wait for it;
14
+ * - every "internal" helper and every hidden "__*" helper, launched by other processes under their
15
+ * own budgets (startup health, tray start/restart/host, version refresh, the GUI update worker);
16
+ * - "start", the long-lived server, and "ensure", which the Windows Codex shim runs before every
17
+ * launch to start it: the wait would run before Bun.serve and spend up to one ACL deadline of
18
+ * fixed budgets (update-restart marker, ensure readiness, Desktop cold start, service start
19
+ * timeouts, each Codex launch). The server's synchronous writers are documented residual.
20
+ *
21
+ * Bounded by one ACL deadline, which also drains timed-out icacls children. A timeout lets the
22
+ * command proceed: writers that admit through withConfigDirHardeningSettled still refuse alone.
23
+ */
24
+ export async function settleConfigRootForCli(command: string | undefined, args: readonly string[]): Promise<void> {
25
+ if (!windowsSecretAclApplies()) return;
26
+ if (command === undefined || command === "start" || command === "ensure" || command === "internal"
27
+ || command.startsWith("__") || skipsCodexShimAutoRestore(command, [...args])) return;
28
+ hardenConfigDir();
29
+ try {
30
+ await withConfigDirHardeningSettled(getConfigDir(), () => undefined);
31
+ } catch (error) {
32
+ if (!(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
33
+ }
34
+ }
@@ -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,168 @@
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`.
9
+ */
10
+ import type { ProxyRestartIo, ProxyRestartLive, ProxyRestartRequestOutcome } from "./tray-proxy";
11
+ import { RESTART_OWNERS, type RestartOwner } from "../client/runtime-restart";
12
+
13
+ function isHandledRestartOwner(value: string | undefined): value is RestartOwner {
14
+ return value !== undefined && (RESTART_OWNERS as readonly string[]).includes(value);
15
+ }
16
+
17
+ /**
18
+ * One runtime process: its runtime record. The attestation secret is created per process
19
+ * (src/lib/local-management-attestation.ts createLocalAttestationSecret), so a new process at a
20
+ * reused pid has a different one.
21
+ */
22
+ export interface RuntimeGeneration {
23
+ pid: number;
24
+ port: number;
25
+ hostname?: string;
26
+ attestationSecret: string;
27
+ /** The owner the runtime classified from positive evidence; absent for a bare flag or an older runtime. */
28
+ restartOwner?: string;
29
+ }
30
+
31
+ export type DisconnectClientState =
32
+ | { kind: "disconnected" }
33
+ | { kind: "connected" }
34
+ | { kind: "invalid" | "mismatched"; reason: string };
35
+
36
+ export interface DisconnectRuntimeDeps {
37
+ /** Liveness that separates a confirmed absence from a probe that could not decide. */
38
+ observe: () => Promise<
39
+ | { kind: "live"; live: { pid: number | null; port: number; role?: string } }
40
+ | { kind: "absent" | "unknown"; live: null }
41
+ >;
42
+ /** The runtime record of the observed runtime, only when it names that pid and port. */
43
+ capture: (live: { pid: number | null; port: number }) => RuntimeGeneration | null;
44
+ /** The durable client state, read right before the restart. */
45
+ connectionState: () => DisconnectClientState;
46
+ /**
47
+ * `ocx restart` bound to this generation (see {@link bindRestartToRuntime}). `refusedBy` names a
48
+ * supervisor that refused it: an owning service manager whose relaunch could not be proven.
49
+ */
50
+ restart: (target: RuntimeGeneration) => Promise<{ ok: boolean; refusedBy?: "service-unproven" }>;
51
+ json: boolean;
52
+ info?: (line: string) => void;
53
+ error?: (line: string) => void;
54
+ }
55
+
56
+ /**
57
+ * Bind a restart to one runtime generation. The restart discovers its target again, and a connect
58
+ * that committed in between can have started a new client runtime there, even at a reused pid.
59
+ * The request goes out only for the captured pid and port, and the runtime record it attests and
60
+ * derives the restart capability from is the captured one: a different process cannot prove that
61
+ * secret, so it is refused before the restart request is sent, and its listener would reject the
62
+ * capability anyway. A runtime that is gone gets no generic start.
63
+ */
64
+ export function bindRestartToRuntime(
65
+ io: ProxyRestartIo,
66
+ target: RuntimeGeneration,
67
+ request: (previous: ProxyRestartLive, readRuntime: (pid: number) => RuntimeGeneration | null) => ProxyRestartRequestOutcome | Promise<ProxyRestartRequestOutcome>,
68
+ ): ProxyRestartIo {
69
+ return {
70
+ ...io,
71
+ startWhenStopped: () => ({ status: "skipped" }),
72
+ requestInPlaceRestart: previous => (previous.pid !== target.pid || previous.port !== target.port
73
+ ? { accepted: false, uncertain: false, error: new Error("restart_target_changed") }
74
+ : request(previous, pid => (pid === target.pid ? target : null))),
75
+ };
76
+ }
77
+
78
+ /** What is known about the runtime answering when the advice is given. */
79
+ export type AnsweringRuntime =
80
+ | { kind: "captured"; pid: number | null; refusedBy?: "service-unproven" }
81
+ | { kind: "different"; pid: number | null }
82
+ | { kind: "unknown" }
83
+ | { kind: "none" };
84
+
85
+ /**
86
+ * The only source of recovery advice for every exit-1 outcome of this step. A plain
87
+ * `ocx restart` is advised only while the state read now is disconnected and either the captured
88
+ * runtime is still the one answering, or nothing answers at all (a start, nothing to interrupt).
89
+ * Any other state gets what was seen and `ocx status` inspection, never a restart.
90
+ */
91
+ export function recoveryAdvice(state: DisconnectClientState, answering: AnsweringRuntime): string {
92
+ if (state.kind === "connected") {
93
+ 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.";
94
+ }
95
+ if (state.kind !== "disconnected") {
96
+ 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.`;
97
+ }
98
+ switch (answering.kind) {
99
+ case "captured": return answering.refusedBy
100
+ ? `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).`
101
+ : `The client runtime${answering.pid ? ` (pid ${answering.pid})` : ""} still serves the old connection. Run on this machine: ocx restart`;
102
+ 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.`;
103
+ 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.";
104
+ case "none": return "No runtime answers; start one with ocx restart (or the desktop app or ocx service start, whichever owns it).";
105
+ }
106
+ }
107
+
108
+ /**
109
+ * Exit 0 only when no client runtime remains and the state is disconnected: read once after the
110
+ * observation when no runtime or a non-client runtime answered, and again after a restart. Every
111
+ * exit-1 outcome is a headline plus {@link recoveryAdvice} computed from the state read at that point.
112
+ */
113
+ export async function restartRuntimeAfterDisconnect(deps: DisconnectRuntimeDeps): Promise<number> {
114
+ const info = deps.info ?? (line => console.log(line));
115
+ const error = deps.error ?? (line => console.error(line));
116
+ const fail = (headline: string, answering: AnsweringRuntime): number => {
117
+ error(`${headline} ${recoveryAdvice(deps.connectionState(), answering)}`);
118
+ return 1;
119
+ };
120
+ const observed = await deps.observe();
121
+ if (observed.kind === "unknown") {
122
+ return fail("Disconnected, but this machine could not confirm whether the client runtime stopped: a recorded OpenCodex process did not answer.", { kind: "unknown" });
123
+ }
124
+ const client = observed.kind === "live" && observed.live.role === "client" ? observed.live : null;
125
+ // Captured before the state is read: a runtime a later connect starts is a later generation.
126
+ const target = client ? deps.capture(client) : null;
127
+ if (client && !target) {
128
+ 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" });
129
+ }
130
+ // Only a record that states an owner this step handles (written by a runtime with this change:
131
+ // the desktop app, a service manager with a current marker, or no supervisor) is restarted. Any
132
+ // other record, a bare OCX_SERVICE=1 runtime or one started before this change, is left exactly
133
+ // as origin/dev's `ocx disconnect` left it: no restart request, the disconnect's own exit 0.
134
+ if (target && !isHandledRestartOwner(target.restartOwner)) return 0;
135
+ const before = deps.connectionState();
136
+ if (before.kind !== "disconnected") {
137
+ error(`Disconnect finished, but the client runtime was not restarted. ${recoveryAdvice(before, { kind: "unknown" })}`);
138
+ return 1;
139
+ }
140
+ if (!client || !target) return 0;
141
+ // A --json caller reads one document from stdout; restart progress goes to stderr.
142
+ const originalLog = console.log;
143
+ if (deps.json) console.log = (...args: unknown[]) => console.error(...args);
144
+ let ok = false;
145
+ let refusedBy: "service-unproven" | undefined;
146
+ try { ({ ok, refusedBy } = await deps.restart(target)); } finally { console.log = originalLog; }
147
+ const after = await deps.observe();
148
+ if (after.kind === "live" && after.live.role !== "client") {
149
+ const late = deps.connectionState();
150
+ if (late.kind !== "disconnected") {
151
+ error(`The client runtime was restarted, but the client state changed meanwhile. ${recoveryAdvice(late, { kind: "unknown" })}`);
152
+ return 1;
153
+ }
154
+ (deps.json ? error : info)("The client runtime was restarted; this machine now runs standalone OpenCodex.");
155
+ return 0;
156
+ }
157
+ if (after.kind === "live") {
158
+ const answering = deps.capture(after.live);
159
+ const who: AnsweringRuntime = !answering ? { kind: "unknown" }
160
+ : answering.attestationSecret === target.attestationSecret ? { kind: "captured", pid: after.live.pid, ...(refusedBy ? { refusedBy } : {}) }
161
+ : { kind: "different", pid: after.live.pid };
162
+ if (ok && who.kind === "captured") {
163
+ return fail("The restart completed, but the runtime still answers as a client.", { kind: "unknown" });
164
+ }
165
+ return fail(ok ? "The restart completed, but a client runtime answers." : "Disconnected, but the restart did not complete.", who);
166
+ }
167
+ return fail("Disconnected, but this machine could not confirm a standalone runtime afterwards.", after.kind === "absent" ? { kind: "none" } : { kind: "unknown" });
168
+ }