@bitkyc08/opencodex 2.100.1 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (624) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
  6. package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/index-DQtCRNAw.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +6 -4
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/native-exec.ts +3 -2
  38. package/src/adapters/cursor/protobuf-request.ts +8 -8
  39. package/src/adapters/cursor/tool-guidance.ts +3 -3
  40. package/src/adapters/cursor/tool-wording.ts +10 -1
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
  43. package/src/adapters/google-antigravity-wire.ts +15 -6
  44. package/src/adapters/google-truncation.ts +4 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +17 -4
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/openai-chat/tool-schema.ts +9 -0
  54. package/src/adapters/openai-responses/tool-schema.ts +18 -4
  55. package/src/adapters/run-turn-queue.ts +139 -5
  56. package/src/adapters/upstream-http-error.ts +4 -2
  57. package/src/adapters/zed.ts +3 -0
  58. package/src/advisor/consult.ts +15 -4
  59. package/src/advisor/context.ts +12 -3
  60. package/src/advisor/runtime.ts +35 -5
  61. package/src/advisor/settings.ts +8 -0
  62. package/src/advisor/synthetic-tool.ts +21 -8
  63. package/src/bridge/response-json.ts +11 -2
  64. package/src/bridge/sse.ts +51 -9
  65. package/src/claude/auth-detect.ts +21 -33
  66. package/src/claude/chat-tool-dispatch.ts +233 -0
  67. package/src/claude/desktop-3p.ts +11 -5
  68. package/src/claude/desktop-gateway-state.ts +2 -0
  69. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  70. package/src/claude/desktop-remote-store.ts +24 -4
  71. package/src/claude/inbound-content-options.ts +31 -16
  72. package/src/claude/inbound-tool-loading.ts +42 -17
  73. package/src/claude/outbound.ts +13 -3
  74. package/src/cli/account-api.ts +23 -1
  75. package/src/cli/account-auth.ts +54 -21
  76. package/src/cli/account-extended.ts +60 -6
  77. package/src/cli/account-key-quota.ts +56 -7
  78. package/src/cli/account.ts +5 -3
  79. package/src/cli/advisor.ts +7 -4
  80. package/src/cli/alias.ts +38 -1
  81. package/src/cli/capabilities-access-remote.ts +137 -2
  82. package/src/cli/capabilities-accounts.ts +3 -3
  83. package/src/cli/capabilities-agents-routing.ts +17 -10
  84. package/src/cli/capabilities-base.ts +43 -18
  85. package/src/cli/capabilities-integrations.ts +2 -2
  86. package/src/cli/capabilities-provider-models.ts +18 -2
  87. package/src/cli/capabilities-route-to.ts +43 -0
  88. package/src/cli/capabilities.ts +2 -0
  89. package/src/cli/capability-contracts.ts +1 -1
  90. package/src/cli/claude-desktop.ts +30 -11
  91. package/src/cli/claude.ts +36 -17
  92. package/src/cli/codex-launcher.ts +3 -1
  93. package/src/cli/codex-shim-autorestore.ts +5 -42
  94. package/src/cli/config-command.ts +38 -2
  95. package/src/cli/config-root-startup.ts +34 -0
  96. package/src/cli/connect.ts +124 -19
  97. package/src/cli/desktop-runtime-guidance.ts +1 -1
  98. package/src/cli/disconnect-runtime.ts +168 -0
  99. package/src/cli/dispatch.ts +54 -12
  100. package/src/cli/export-command.ts +1 -1
  101. package/src/cli/gui-pair-client.ts +29 -5
  102. package/src/cli/gui.ts +10 -5
  103. package/src/cli/help-catalog.ts +11 -0
  104. package/src/cli/help.ts +5 -4
  105. package/src/cli/hub.ts +18 -1
  106. package/src/cli/index.ts +83 -92
  107. package/src/cli/inspect.ts +11 -2
  108. package/src/cli/integrations.ts +26 -1
  109. package/src/cli/link-capture.ts +64 -0
  110. package/src/cli/link-child-ops.ts +314 -0
  111. package/src/cli/link-cleanup.ts +8 -5
  112. package/src/cli/link-diagnostics.ts +67 -0
  113. package/src/cli/link-enrollment.ts +158 -12
  114. package/src/cli/link-operations.ts +52 -0
  115. package/src/cli/link-recover.ts +152 -0
  116. package/src/cli/link-routes.ts +87 -0
  117. package/src/cli/link-status-child.ts +137 -0
  118. package/src/cli/link-status-traffic.ts +34 -0
  119. package/src/cli/link.ts +327 -37
  120. package/src/cli/message-command.ts +1 -1
  121. package/src/cli/message-mcp-command.ts +23 -10
  122. package/src/cli/models-runtime.ts +3 -3
  123. package/src/cli/opencode.ts +3 -1
  124. package/src/cli/pi-sync.ts +35 -0
  125. package/src/cli/preflight-exemptions.ts +46 -0
  126. package/src/cli/registry.ts +29 -12
  127. package/src/cli/restart-failure.ts +5 -2
  128. package/src/cli/root.ts +5 -1
  129. package/src/cli/route-to.ts +172 -0
  130. package/src/cli/runtime-api.ts +5 -8
  131. package/src/cli/status.ts +3 -1
  132. package/src/cli/stop-approval.ts +66 -19
  133. package/src/cli/stop-report.ts +23 -0
  134. package/src/cli/stop-windows-checked.ts +304 -0
  135. package/src/cli/sync-command.ts +70 -13
  136. package/src/cli/sync-fanout.ts +81 -99
  137. package/src/cli/sync-flags.ts +40 -3
  138. package/src/cli/sync-link-status.ts +18 -2
  139. package/src/cli/sync-update-guard.ts +7 -2
  140. package/src/cli/system-restart-client.ts +3 -2
  141. package/src/cli/uninstall-plan.ts +77 -5
  142. package/src/cli/uninstall-stop.ts +152 -0
  143. package/src/cli/v2-input.ts +10 -6
  144. package/src/cli/v2-local-output.ts +3 -2
  145. package/src/cli/v2-runtime.ts +10 -3
  146. package/src/cli/v2.ts +22 -7
  147. package/src/client/connect.ts +321 -34
  148. package/src/client/link-home-features.ts +27 -0
  149. package/src/client/link-home.ts +92 -4
  150. package/src/client/link-ingress.ts +21 -3
  151. package/src/client/link-join.ts +12 -2
  152. package/src/client/link-parity-reporter.ts +60 -6
  153. package/src/client/link-readiness.ts +16 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel-status.ts +76 -0
  161. package/src/client/link-tunnel.ts +56 -5
  162. package/src/client/link-websocket-limits.ts +89 -0
  163. package/src/client/link-websocket.ts +586 -0
  164. package/src/client/link-ws-advertisement.ts +100 -0
  165. package/src/client/link-ws-framer.ts +241 -0
  166. package/src/client/link-ws-transport.ts +177 -0
  167. package/src/client/machine-api.ts +13 -2
  168. package/src/client/machine-listener.ts +48 -7
  169. package/src/client/route-intent-apply.ts +293 -0
  170. package/src/client/route-intent-file-originals.ts +97 -0
  171. package/src/client/route-intent-native-originals.ts +201 -0
  172. package/src/client/route-intent-watch.ts +141 -0
  173. package/src/client/runtime-restart.ts +127 -5
  174. package/src/client/runtime.ts +61 -15
  175. package/src/client/state.ts +30 -0
  176. package/src/client/sync-expectation.ts +36 -2
  177. package/src/client/sync-runtime.ts +7 -0
  178. package/src/clients/config-export/alias-selectors.ts +63 -40
  179. package/src/clients/config-export/contracts.ts +2 -0
  180. package/src/clients/config-export/nested-selectors.ts +42 -0
  181. package/src/clients/config-export.ts +36 -4
  182. package/src/codex/account-resume-health.ts +41 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/login-flow.ts +6 -0
  187. package/src/codex/auth-api/routes.ts +35 -2
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +21 -6
  190. package/src/codex/catalog/gather-capture.ts +10 -2
  191. package/src/codex/catalog/parsing.ts +7 -3
  192. package/src/codex/catalog/provider-models.ts +67 -23
  193. package/src/codex/catalog/retained-sync.ts +2 -1
  194. package/src/codex/catalog/routed-gather.ts +1 -1
  195. package/src/codex/catalog-auto-refresh.ts +11 -0
  196. package/src/codex/cli-update-job.ts +35 -13
  197. package/src/codex/convergence-types.ts +2 -0
  198. package/src/codex/convergence.ts +2 -2
  199. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  200. package/src/codex/features.ts +2 -2
  201. package/src/codex/history-provider.ts +31 -0
  202. package/src/codex/inject/multi-agent-v2.ts +9 -3
  203. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  204. package/src/codex/inject/plan.ts +20 -2
  205. package/src/codex/inject.ts +2 -0
  206. package/src/codex/journal-config-restore.ts +217 -0
  207. package/src/codex/journal.ts +75 -6
  208. package/src/codex/main-account.ts +23 -30
  209. package/src/codex/native-main-auth-file.ts +104 -0
  210. package/src/codex/native-profile-manager.ts +4 -3
  211. package/src/codex/native-profile-store.ts +3 -61
  212. package/src/codex/orca-import.ts +10 -1
  213. package/src/codex/quota-history.ts +13 -0
  214. package/src/codex/quota-window-conflict.ts +103 -0
  215. package/src/codex/quota.ts +134 -7
  216. package/src/codex/subagent-model-fallback.ts +3 -1
  217. package/src/codex/websocket-activity.ts +171 -16
  218. package/src/codex/websocket-registry.ts +11 -4
  219. package/src/combos/cooldown-store.ts +228 -0
  220. package/src/combos/failover.ts +760 -35
  221. package/src/config/dashboard-trusted-proxy.ts +83 -0
  222. package/src/config/diagnostics.ts +28 -0
  223. package/src/config/feature-flags.ts +9 -0
  224. package/src/config/live-reconcile.ts +10 -1
  225. package/src/config/load-degrade.ts +12 -1
  226. package/src/config/multi-agent-surface.ts +28 -5
  227. package/src/config/pending-teardown.ts +60 -3
  228. package/src/config/process-state.ts +175 -4
  229. package/src/config/provider-validation.ts +4 -4
  230. package/src/config/salvage.ts +1 -0
  231. package/src/config/schema/config-schema.ts +12 -3
  232. package/src/config/schema/leaf-validators.ts +43 -14
  233. package/src/config/windows-process-command-line.ts +107 -0
  234. package/src/generated/compatibility-version.json +1077 -429
  235. package/src/generated/model-metadata.ts +1 -1
  236. package/src/images/loop.ts +3 -0
  237. package/src/integrations/model-name-guard.ts +25 -0
  238. package/src/integrations/route-intent-catalog.ts +26 -0
  239. package/src/integrations/route-intent-connected.ts +262 -0
  240. package/src/integrations/route-intent-contract.ts +55 -0
  241. package/src/integrations/route-intent-disconnect.ts +109 -0
  242. package/src/integrations/route-intent-initial.ts +64 -0
  243. package/src/integrations/route-intent-state.ts +117 -0
  244. package/src/integrations/route-intent-tick.ts +65 -0
  245. package/src/integrations/route-intent.ts +212 -0
  246. package/src/integrations/writer.ts +44 -11
  247. package/src/lib/catalog-etag.ts +10 -0
  248. package/src/lib/client-error-body.ts +15 -0
  249. package/src/lib/client-retry-after.ts +29 -0
  250. package/src/lib/config-ownership.ts +13 -0
  251. package/src/lib/context-overflow-verdict.ts +266 -9
  252. package/src/lib/desktop-gui-origin.ts +28 -0
  253. package/src/lib/errors.ts +1 -1
  254. package/src/lib/failure-detail.ts +72 -3
  255. package/src/lib/gui-pair-capability.ts +2 -1
  256. package/src/lib/hard-refusal.ts +259 -0
  257. package/src/lib/messages-error-body.ts +4 -1
  258. package/src/lib/outbound-credential-registry.ts +362 -4
  259. package/src/lib/paced-stream.ts +34 -0
  260. package/src/lib/passive-key-fetch-proof.ts +30 -0
  261. package/src/lib/passive-read.ts +5 -0
  262. package/src/lib/process-control.ts +76 -12
  263. package/src/lib/redact.ts +84 -8
  264. package/src/lib/state-store-registrations.ts +11 -0
  265. package/src/lib/state-store-sweeper.ts +4 -0
  266. package/src/lib/supervisor-markers.ts +18 -0
  267. package/src/lib/terminal-safe-text.ts +58 -0
  268. package/src/lib/translator-budget.ts +3 -2
  269. package/src/lib/upstream-retry.ts +14 -4
  270. package/src/link/alias-lock.ts +119 -0
  271. package/src/link/child-activity.ts +83 -0
  272. package/src/link/child-binary-cache-fill.d.mts +50 -0
  273. package/src/link/child-binary-cache-fill.mjs +494 -0
  274. package/src/link/child-binary-cache-start.ts +73 -0
  275. package/src/link/child-binary-source.ts +12 -5
  276. package/src/link/child-catalog-freshness.ts +149 -0
  277. package/src/link/child-gated-ocx.ts +135 -0
  278. package/src/link/child-observations.ts +206 -0
  279. package/src/link/child-observe.ts +121 -0
  280. package/src/link/child-ops-engine.ts +230 -0
  281. package/src/link/child-ops-host.ts +138 -0
  282. package/src/link/child-ops-runners.ts +319 -0
  283. package/src/link/child-ops-scheduler.ts +207 -0
  284. package/src/link/child-ops-types.ts +89 -0
  285. package/src/link/child-parity.ts +23 -4
  286. package/src/link/child-policy.ts +93 -0
  287. package/src/link/child-update-contract.ts +174 -0
  288. package/src/link/codex-settings.ts +1 -1
  289. package/src/link/compatibility.ts +18 -1
  290. package/src/link/diagnostics-read.ts +163 -0
  291. package/src/link/diagnostics.ts +20 -7
  292. package/src/link/explicit-route.ts +209 -0
  293. package/src/link/link-recover.ts +113 -0
  294. package/src/link/management-routes.ts +3 -1
  295. package/src/link/operation-recovery-slot.ts +44 -0
  296. package/src/link/operations-journal.ts +408 -0
  297. package/src/link/paths.ts +5 -0
  298. package/src/link/peer-report.ts +1 -1
  299. package/src/link/relay-auth.ts +14 -0
  300. package/src/link/remote-plant.ts +152 -14
  301. package/src/link/remote-platform.ts +21 -10
  302. package/src/link/remote-probe.ts +11 -3
  303. package/src/link/remote-windows.ts +88 -12
  304. package/src/link/request-compression.ts +30 -0
  305. package/src/link/residual-recovery.ts +54 -0
  306. package/src/link/retirement.ts +128 -0
  307. package/src/link/route-intent-watch.ts +41 -0
  308. package/src/link/route-intent.ts +209 -0
  309. package/src/link/route-proof.ts +82 -0
  310. package/src/link/route-rounds.ts +579 -0
  311. package/src/link/route-select.ts +95 -0
  312. package/src/link/route-trust.ts +96 -0
  313. package/src/link/ssh-argv.ts +285 -43
  314. package/src/link/ssh-capture-redact.ts +253 -0
  315. package/src/link/ssh-capture.ts +497 -0
  316. package/src/link/ssh-runner.ts +141 -14
  317. package/src/link/status-projection.ts +160 -0
  318. package/src/link/store.ts +54 -1
  319. package/src/link/supervisor.ts +543 -55
  320. package/src/link/sync-fanout-classify.ts +114 -0
  321. package/src/link/sync-then-restart.ts +65 -0
  322. package/src/link/tombstones.ts +209 -0
  323. package/src/link/traffic.ts +178 -0
  324. package/src/link/tunnel-state.ts +10 -4
  325. package/src/link/ws-activity-holds.ts +474 -0
  326. package/src/local-credentials/publication-fence.ts +20 -1
  327. package/src/messaging/mcp-queue-rpc.ts +3 -2
  328. package/src/messaging/mcp-queue-server.ts +21 -1
  329. package/src/messaging/mcp-reply-tools.ts +24 -9
  330. package/src/messaging/mcp-reply-wait.ts +70 -0
  331. package/src/messaging/mcp-resume-tools.ts +25 -0
  332. package/src/messaging/remote-enrollment.ts +3 -3
  333. package/src/messaging/remote-tunnels.ts +2 -2
  334. package/src/messaging/resume-permissions.ts +27 -0
  335. package/src/messaging/rpc.ts +46 -2
  336. package/src/oauth/account-resume-health.ts +60 -0
  337. package/src/oauth/anthropic-continuity.ts +23 -7
  338. package/src/oauth/anthropic-routing.ts +5 -2
  339. package/src/oauth/anthropic.ts +22 -2
  340. package/src/oauth/claude-keychain-read.ts +78 -68
  341. package/src/oauth/index.ts +25 -6
  342. package/src/oauth/local-token-detect.ts +8 -29
  343. package/src/oauth/login-cli-errors.ts +5 -1
  344. package/src/oauth/login-cli.ts +33 -18
  345. package/src/oauth/login-flow-state.ts +26 -3
  346. package/src/oauth/meta-muse.ts +1 -1
  347. package/src/oauth/store.ts +51 -1
  348. package/src/oauth/xai.ts +248 -14
  349. package/src/protocols/contract.ts +4 -0
  350. package/src/protocols/encoders/messages.ts +1 -0
  351. package/src/providers/alias-template.ts +48 -0
  352. package/src/providers/anthropic-billing-ownership.ts +2 -0
  353. package/src/providers/anthropic-output-caps.ts +46 -0
  354. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  355. package/src/providers/antigravity-effort-families.ts +11 -3
  356. package/src/providers/antigravity-models.ts +32 -9
  357. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  358. package/src/providers/api-key-pause-state.ts +23 -0
  359. package/src/providers/api-key-pause.ts +71 -10
  360. package/src/providers/api-key-resolve.ts +49 -7
  361. package/src/providers/api-key-response-ownership.ts +2 -0
  362. package/src/providers/api-key-selection-capture.ts +3 -1
  363. package/src/providers/api-key-selection.ts +54 -11
  364. package/src/providers/api-keys.ts +24 -7
  365. package/src/providers/cache-affinity-identity.ts +73 -0
  366. package/src/providers/cache-affinity.ts +256 -0
  367. package/src/providers/claude-cli-usage-state.ts +11 -6
  368. package/src/providers/claude-cli-usage.ts +27 -9
  369. package/src/providers/codex-capacity.ts +11 -2
  370. package/src/providers/default-aliases.ts +98 -20
  371. package/src/providers/google-vertex-model-discovery.ts +510 -0
  372. package/src/providers/key-failover.ts +136 -14
  373. package/src/providers/key-store.ts +3 -3
  374. package/src/providers/kiro-models.ts +3 -5
  375. package/src/providers/label.ts +31 -5
  376. package/src/providers/mistral-transport.ts +17 -4
  377. package/src/providers/model-discovery-config.ts +31 -0
  378. package/src/providers/model-discovery-diagnostic.ts +34 -3
  379. package/src/providers/model-discovery.ts +43 -7
  380. package/src/providers/model-rename-fields.ts +5 -0
  381. package/src/providers/muse-key-quota.ts +14 -6
  382. package/src/providers/new-model-policy-runtime.ts +17 -4
  383. package/src/providers/new-model-policy.ts +30 -4
  384. package/src/providers/openai-sidecar.ts +15 -2
  385. package/src/providers/passive-key-observation.ts +252 -0
  386. package/src/providers/provider-id-rewrite.ts +3 -0
  387. package/src/providers/quota/account-cache.ts +53 -34
  388. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  389. package/src/providers/quota/anthropic-usage-windows.ts +19 -9
  390. package/src/providers/quota/passive-key-limits.ts +272 -0
  391. package/src/providers/quota/passive-wire-model.ts +126 -0
  392. package/src/providers/quota/report-cache.ts +112 -5
  393. package/src/providers/quota/vendor-probes-key.ts +73 -0
  394. package/src/providers/quota/vendor-probes-oauth.ts +57 -3
  395. package/src/providers/quota-key-accounts.ts +22 -10
  396. package/src/providers/quota-mistral-budget.ts +18 -0
  397. package/src/providers/quota-types.ts +43 -0
  398. package/src/providers/quota.ts +31 -32
  399. package/src/providers/reasoning-metadata.ts +1051 -12
  400. package/src/providers/registry/entries-core.ts +34 -16
  401. package/src/providers/registry/entries-extended.ts +32 -0
  402. package/src/providers/registry/model-seeds.ts +35 -0
  403. package/src/providers/resolved-model-policy.ts +7 -0
  404. package/src/providers/routed-config.ts +8 -3
  405. package/src/providers/xai-transport.ts +3 -0
  406. package/src/quota/reset-observer.ts +4 -2
  407. package/src/quota/reset-seen-store.ts +9 -0
  408. package/src/quota/window-mapping.ts +1 -0
  409. package/src/quota-pool/assemble.ts +4 -1
  410. package/src/remote/features.ts +17 -0
  411. package/src/responses/anthropic-progress.ts +10 -4
  412. package/src/responses/citation-markers.ts +231 -0
  413. package/src/responses/hosted-tool-policy.ts +56 -12
  414. package/src/responses/spill-store.ts +5 -1
  415. package/src/responses/state/replay-input.ts +50 -0
  416. package/src/responses/state/replay-owner.ts +24 -0
  417. package/src/responses/state/snapshot-codec.ts +9 -0
  418. package/src/responses/state/spill-queue.ts +1 -0
  419. package/src/responses/state.ts +42 -60
  420. package/src/router.ts +4 -2
  421. package/src/routing/home-route-capture.ts +123 -0
  422. package/src/routing/home-route-intent.ts +200 -0
  423. package/src/routing/route-intent-state.ts +178 -0
  424. package/src/routing/route-to-live-settings.ts +35 -0
  425. package/src/routing/route-to-local.ts +145 -0
  426. package/src/routing/route-to-status.ts +94 -0
  427. package/src/routing/route-to-sync-child.ts +32 -0
  428. package/src/server/adapter-resolve.ts +21 -1
  429. package/src/server/admitted-http-turn.ts +3 -0
  430. package/src/server/auth-cors.ts +109 -8
  431. package/src/server/bare-upstream-error.ts +220 -0
  432. package/src/server/catalog-download.ts +3 -5
  433. package/src/server/chat-native.ts +25 -7
  434. package/src/server/claude-messages.ts +8 -5
  435. package/src/server/codex-model-list.ts +2 -1
  436. package/src/server/configured-credentials.ts +37 -5
  437. package/src/server/gui-desktop-authorization.ts +36 -0
  438. package/src/server/gui-pair-delivery.ts +6 -3
  439. package/src/server/gui-session.ts +10 -1
  440. package/src/server/images.ts +41 -13
  441. package/src/server/inbound-body-admission.ts +17 -4
  442. package/src/server/index/link-listener.ts +203 -11
  443. package/src/server/index/link-management.ts +15 -1
  444. package/src/server/index/link-relay-sessions.ts +128 -8
  445. package/src/server/index/link-websocket-limits.ts +136 -0
  446. package/src/server/index/link-websocket.ts +692 -0
  447. package/src/server/index/optional-listeners.ts +115 -7
  448. package/src/server/index/route-intent-watch.ts +47 -0
  449. package/src/server/index/serve-contract.ts +86 -0
  450. package/src/server/index/serve-options.ts +35 -86
  451. package/src/server/index/startup-warnings.ts +8 -2
  452. package/src/server/index/websocket-handler.ts +26 -4
  453. package/src/server/index.ts +12 -2
  454. package/src/server/inference/client-encoder-delivery.ts +2 -0
  455. package/src/server/inspection-tee.ts +39 -2
  456. package/src/server/lifecycle.ts +2 -0
  457. package/src/server/link-turn.ts +137 -0
  458. package/src/server/management/advisor-routes.ts +10 -2
  459. package/src/server/management/agent-settings-routes.ts +50 -16
  460. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  461. package/src/server/management/config-routes.ts +7 -1
  462. package/src/server/management/context.ts +9 -2
  463. package/src/server/management/desktop-authorization.ts +41 -0
  464. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  465. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  466. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  467. package/src/server/management/home-integration-decision.ts +89 -0
  468. package/src/server/management/integration-routes.ts +208 -81
  469. package/src/server/management/link-child-ops-routes.ts +218 -0
  470. package/src/server/management/link-child-preflight.ts +31 -0
  471. package/src/server/management/link-diagnostics-route.ts +29 -0
  472. package/src/server/management/link-enrollment.ts +199 -47
  473. package/src/server/management/link-operation.ts +609 -0
  474. package/src/server/management/link-recover-route.ts +103 -0
  475. package/src/server/management/link-route-edit.ts +173 -0
  476. package/src/server/management/link-route-request.ts +62 -0
  477. package/src/server/management/link-route-state.ts +92 -6
  478. package/src/server/management/link-routes.ts +563 -51
  479. package/src/server/management/link-traffic-status.ts +13 -0
  480. package/src/server/management/model-routes.ts +122 -36
  481. package/src/server/management/model-rows.ts +2 -1
  482. package/src/server/management/native-integration-routes.ts +176 -70
  483. package/src/server/management/oauth-account-routes.ts +69 -17
  484. package/src/server/management/protocol-routes.ts +7 -0
  485. package/src/server/management/provider-completion-test.ts +4 -4
  486. package/src/server/management/provider-overwrite-carry.ts +39 -3
  487. package/src/server/management/provider-routes.ts +80 -72
  488. package/src/server/management/provider-routing-quota.ts +45 -0
  489. package/src/server/management/route-registry.ts +25 -3
  490. package/src/server/management/route-to-routes.ts +257 -0
  491. package/src/server/management/system-restart.ts +4 -2
  492. package/src/server/management/usage-aggregate-cache.ts +101 -66
  493. package/src/server/management-api.ts +17 -3
  494. package/src/server/management-auth.ts +13 -1
  495. package/src/server/messages-native-preflight.ts +27 -4
  496. package/src/server/messages-native.ts +22 -5
  497. package/src/server/persistent-gui-session.ts +6 -3
  498. package/src/server/proxy-liveness.ts +33 -6
  499. package/src/server/relay-eager.ts +36 -12
  500. package/src/server/relay.ts +183 -116
  501. package/src/server/request-body-facts.ts +48 -0
  502. package/src/server/request-decompress.ts +65 -2
  503. package/src/server/request-log-account-rotation.ts +6 -0
  504. package/src/server/request-log-attempt-usage.ts +69 -0
  505. package/src/server/request-log-cache-affinity.ts +60 -0
  506. package/src/server/request-log-conversation.ts +45 -2
  507. package/src/server/request-log-failure-detail.ts +59 -1
  508. package/src/server/request-log-terminal-status.ts +210 -24
  509. package/src/server/request-log.ts +71 -79
  510. package/src/server/responses/adapter-continuation.ts +2 -1
  511. package/src/server/responses/adapter-delivery.ts +2 -0
  512. package/src/server/responses/adapter-dispatch.ts +40 -51
  513. package/src/server/responses/advisor-plan-slot.ts +33 -1
  514. package/src/server/responses/advisor-question.ts +21 -0
  515. package/src/server/responses/advisor-slot.ts +10 -3
  516. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  517. package/src/server/responses/buffered-sse-json.ts +9 -3
  518. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  519. package/src/server/responses/codex-tool-catalog.ts +156 -0
  520. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  521. package/src/server/responses/combo-stream-preflight.ts +701 -81
  522. package/src/server/responses/compact.ts +47 -12
  523. package/src/server/responses/context-overflow.ts +58 -2
  524. package/src/server/responses/core-codex-account.ts +17 -3
  525. package/src/server/responses/core-combo-failure.ts +37 -4
  526. package/src/server/responses/core-combo-native.ts +3 -1
  527. package/src/server/responses/core-combo.ts +62 -7
  528. package/src/server/responses/core-errors.ts +8 -3
  529. package/src/server/responses/core-lifetime.ts +3 -2
  530. package/src/server/responses/core-normalize.ts +3 -1
  531. package/src/server/responses/core-opaque-recovery.ts +45 -2
  532. package/src/server/responses/core-options.ts +18 -0
  533. package/src/server/responses/core.ts +2 -0
  534. package/src/server/responses/fetch-helpers.ts +15 -10
  535. package/src/server/responses/native-replay-guard.ts +57 -0
  536. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  537. package/src/server/responses/outbound-request-body.ts +29 -0
  538. package/src/server/responses/passthrough-completion.ts +105 -8
  539. package/src/server/responses/passthrough-delivery.ts +31 -11
  540. package/src/server/responses/passthrough-dispatch.ts +99 -106
  541. package/src/server/responses/policy-fallback.ts +13 -1
  542. package/src/server/responses/request-prepare.ts +50 -6
  543. package/src/server/responses/request-transport.ts +53 -17
  544. package/src/server/responses/reset-replay.ts +104 -4
  545. package/src/server/responses/run-turn-execution.ts +58 -30
  546. package/src/server/responses/sidecar-execution.ts +14 -0
  547. package/src/server/responses/terminal-error-redaction.ts +222 -25
  548. package/src/server/responses/ws-upstream.ts +2 -2
  549. package/src/server/sse-payload-rewrite.ts +3 -2
  550. package/src/server/stop-service-route.ts +85 -0
  551. package/src/server/system-env-shell.ts +12 -1
  552. package/src/server/system-env.ts +5 -3
  553. package/src/server/windows-tcp-drop.ts +21 -4
  554. package/src/server/workflow-refusal.ts +8 -0
  555. package/src/server/ws-bridge.ts +191 -12
  556. package/src/service/cli-windows-stop.ts +189 -0
  557. package/src/service/cli.ts +41 -12
  558. package/src/service/disconnected-client-restart.ts +60 -0
  559. package/src/service/guarded-manager-target.ts +18 -1
  560. package/src/service/health.ts +99 -6
  561. package/src/service/launchd.ts +84 -31
  562. package/src/service/orchestration.ts +418 -91
  563. package/src/service/repair.ts +223 -6
  564. package/src/service/restart-proxy-stop.ts +79 -0
  565. package/src/service/service-child-ownership.ts +6 -2
  566. package/src/service/windows-checked-stop-live.ts +467 -0
  567. package/src/service/windows-checked-stop.ts +435 -0
  568. package/src/service/windows-command-line-token.ts +23 -0
  569. package/src/service/windows-guarded-manager.ts +77 -34
  570. package/src/service/windows-ops.ts +38 -56
  571. package/src/service/windows-process-evidence.ts +292 -0
  572. package/src/service/windows-process-native.ts +262 -0
  573. package/src/service/windows-service-stop.ts +321 -0
  574. package/src/service/windows-stop-binding.ts +187 -0
  575. package/src/service/windows-stop-budget.ts +123 -0
  576. package/src/service/windows-stop-confirm.ts +158 -0
  577. package/src/service/windows-stop-deadline.ts +56 -0
  578. package/src/service.ts +2 -2
  579. package/src/types/claude-tool-loading.ts +48 -0
  580. package/src/types/config.ts +47 -53
  581. package/src/types/link.ts +20 -0
  582. package/src/types/multi-agent.ts +13 -0
  583. package/src/types/provider.ts +68 -2
  584. package/src/types/request.ts +4 -0
  585. package/src/types.ts +4 -0
  586. package/src/update/guarded-runtime-ops.ts +5 -7
  587. package/src/update/index.ts +25 -10
  588. package/src/update/install-detection.mjs +3 -1
  589. package/src/update/job-pinned-start.ts +2 -0
  590. package/src/update/job-windows-restart.ts +19 -32
  591. package/src/update/job.ts +12 -5
  592. package/src/update/npm-install.d.mts +11 -0
  593. package/src/update/npm-install.mjs +44 -7
  594. package/src/update/orchestrated-entry.ts +1 -1
  595. package/src/update/orchestrated-node-driver.mjs +3 -2
  596. package/src/update/orchestrated-pnpm.d.mts +4 -0
  597. package/src/update/orchestrated-pnpm.mjs +50 -6
  598. package/src/update/orchestrated-session.d.mts +3 -1
  599. package/src/update/orchestrated-session.mjs +21 -6
  600. package/src/update/pnpm-global-install.d.mts +21 -3
  601. package/src/update/pnpm-global-install.mjs +322 -19
  602. package/src/update/pnpm-store-layout.mjs +46 -0
  603. package/src/update/sync-update-mutex.d.mts +3 -2
  604. package/src/update/sync-update-mutex.mjs +57 -8
  605. package/src/update/transactional-install.d.mts +3 -1
  606. package/src/update/transactional-install.mjs +545 -12
  607. package/src/update/windows-installer-marker.d.mts +1 -0
  608. package/src/update/windows-installer-marker.mjs +44 -0
  609. package/src/usage/expected-prices.ts +8 -0
  610. package/src/usage/filter-index.ts +326 -77
  611. package/src/usage/ledger-scanner.ts +15 -0
  612. package/src/usage/link-log-fields.ts +48 -0
  613. package/src/usage/log.ts +43 -2
  614. package/src/usage/request-body.ts +37 -0
  615. package/src/web-search/loop.ts +3 -0
  616. package/src/web-search/parse.ts +21 -2
  617. package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
  618. package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
  619. package/gui/dist/assets/index-Bziu8gTy.css +0 -2
  620. package/gui/dist/assets/index-OYzhQUNP.js +0 -94
  621. package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
  622. package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
  623. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
  624. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -1,26 +1,39 @@
1
+ import { isResumeProfile } from "../messaging/resume-permissions";
1
2
  import { isAbsolute } from "node:path";
2
3
  import type { QueueMcpOptions } from "../messaging/mcp-queue-rpc";
3
4
 
4
5
  /** Validate all syntax before importing the MCP host or resolving any executable/home. */
5
6
  export function parseQueueMcpArgs(argv: readonly string[]): QueueMcpOptions | null {
6
- const reads = argv.filter(arg => arg === "--allow-reply-read").length;
7
- if (reads > 1) return null;
8
- const paths = argv.filter(arg => arg !== "--allow-reply-read");
9
- if (paths.length !== 4) return null;
7
+ let reads = false, resume = false;
10
8
  const values: Record<string, string> = {};
11
- for (let i = 0; i < paths.length; i += 2) {
12
- const flag = paths[i]!, value = paths[i + 1]!;
13
- if (!["--codex", "--codex-home"].includes(flag) || values[flag] !== undefined
14
- || !value || !isAbsolute(value) || /[\x00-\x1f]/.test(value)) return null;
9
+ for (let i = 0; i < argv.length; i++) {
10
+ const flag = argv[i]!;
11
+ if (flag === "--allow-reply-read") {
12
+ if (reads) return null;
13
+ reads = true;
14
+ continue;
15
+ }
16
+ if (flag === "--allow-resume") {
17
+ if (resume) return null;
18
+ resume = true;
19
+ continue;
20
+ }
21
+ const value = argv[++i];
22
+ if (!["--codex", "--codex-home", "--resume-socket", "--resume-permissions"].includes(flag) || values[flag] !== undefined
23
+ || !value || (flag === "--resume-permissions" ? !isResumeProfile(value) : !isAbsolute(value)) || /[\x00-\x1f]/.test(value)) return null;
15
24
  values[flag] = value;
16
25
  }
17
- return values["--codex"] && values["--codex-home"] ? { codex: values["--codex"], codexHome: values["--codex-home"], ...(reads ? { allowReplyRead: true } : {}) } : null;
26
+ if (!values["--codex"] || !values["--codex-home"] || (resume
27
+ ? !values["--resume-socket"] || !values["--resume-permissions"]
28
+ : values["--resume-socket"] || values["--resume-permissions"])) return null;
29
+ return { codex: values["--codex"], codexHome: values["--codex-home"], ...(reads ? { allowReplyRead: true } : {}),
30
+ ...(resume ? { allowResume: true, resumeSocket: values["--resume-socket"], resumePermissions: values["--resume-permissions"] } : {}) };
18
31
  }
19
32
 
20
33
  export async function runMessageMcpCommand(argv: readonly string[]): Promise<number> {
21
34
  const options = parseQueueMcpArgs(argv);
22
35
  if (!options) {
23
- console.error("Usage: ocx message mcp --codex <absolute-cli-path> --codex-home <absolute-existing-home> [--allow-reply-read]");
36
+ console.error("Usage: ocx message mcp --codex <absolute-cli-path> --codex-home <absolute-existing-home> [--allow-reply-read] [--allow-resume --resume-socket <absolute-existing-unix-socket> --resume-permissions <profile-id>]");
24
37
  return 64;
25
38
  }
26
39
  if (process.platform === "win32") {
@@ -44,7 +44,7 @@ const USAGE = `Usage:
44
44
  ocx models selected <provider> [--set <id,id...>|--clear] [--json]
45
45
  ocx models preset show [--provider <name>] [--json]
46
46
  ocx models preset apply <provider> [--all] [--json]
47
- ocx models new-policy [on|off] [--provider <name>] [--json]
47
+ ocx models new-policy [on|off|admit] [--provider <name>] [--json]
48
48
  ocx models new-arrivals [--json]
49
49
  ${MODELS_CONTEXT_USAGE}
50
50
  ocx models shadow <status|set> [model|-] [--enabled <on|off>] [--json]
@@ -355,7 +355,7 @@ async function setModelSettings(argv: string[], deps: RuntimeApiDeps): Promise<v
355
355
  if (Object.keys(patch).length > 0) {
356
356
  throw new CliUsageError("--reset clears every override and cannot be combined with other options", USAGE);
357
357
  }
358
- for (const key of ["contextWindow", "inputModalities", "reasoningEfforts", "defaultReasoningEffort"]) patch[key] = null;
358
+ for (const key of ["contextWindow", "inputModalities", "responsesCustomTools", "reasoningEfforts", "defaultReasoningEffort"]) patch[key] = null;
359
359
  }
360
360
  if (Object.keys(patch).length === 0) throw new CliUsageError("at least one setting or --reset is required", USAGE);
361
361
  const result = await runtimeRequest<{ changed?: boolean; hasOverrides?: boolean; saved?: boolean; catalogRefresh?: { status?: string; retryable?: boolean } }>("/api/model-settings", {
@@ -507,7 +507,7 @@ async function newPolicy(argv: string[], deps: RuntimeApiDeps): Promise<void> {
507
507
  const state = args[0] && !args[0].startsWith("--") ? args.shift()!.toLowerCase() : undefined;
508
508
  const provider = takeOption(args, "--provider")?.trim();
509
509
  const wantsJson = takeFlag(args, "--json");
510
- if (state !== undefined && state !== "on" && state !== "off") throw new CliUsageError("new policy must be on or off", USAGE);
510
+ if (state !== undefined && state !== "on" && state !== "off" && state !== "admit") throw new CliUsageError("new policy must be on, off or admit", USAGE);
511
511
  rejectArgs(args, USAGE);
512
512
  if (!state) {
513
513
  const result = await runtimeRequest<{ policy: string; providers: Record<string, string> }>("/api/model-discovery", {}, deps);
@@ -54,6 +54,7 @@ import { withProcessRuntimeProvenance } from "../lib/bun-runtime";
54
54
  import { selfLaunchArgv } from "../lib/self-launch-argv";
55
55
  import { withoutSiblingMarker } from "../codex/sibling-start";
56
56
  import { parseJsonc } from "../lib/jsonc";
57
+ import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
57
58
  export { parseJsonc };
58
59
 
59
60
  /**
@@ -575,7 +576,8 @@ export function opencodeProxyStartEnv(base: OpencodeLaunchEnv = process.env): Op
575
576
  const withTokenFile = base.OPENCODEX_API_AUTH_TOKEN?.trim()
576
577
  ? base
577
578
  : serviceTokenLookupEnv(base);
578
- return { ...withTokenFile, OCX_SERVICE: "1" };
579
+ // A shell a supervised runtime handed to a tool carries its supervisor's markers; this proxy is not its.
580
+ return withoutSupervisorMarkers({ ...withTokenFile, OCX_SERVICE: "1" });
579
581
  }
580
582
 
581
583
  /**
@@ -0,0 +1,35 @@
1
+ import type { OwnedIntegrationRefreshOutcome } from "../integrations/owned-refresh";
2
+ import { createIntegrationStateStore, type IntegrationStateStore } from "../integrations/store";
3
+ import { runtimeRequest, type RuntimeApiDeps } from "./runtime-api";
4
+
5
+ /** Kept in step with `PI_SYNC_PATH` in src/server/management/integration-routes.ts. */
6
+ export const PI_SYNC_ROUTE = "/api/client-integrations/pi/sync";
7
+
8
+ /**
9
+ * Refresh an already-connected Pi file through the running proxy.
10
+ *
11
+ * Pi may carry raw nested selectors, and only the proxy that serves them can prove each one
12
+ * routes to the same model (#8172). The CLI's saved configuration and its in-process router
13
+ * cache are not that proof, so there is deliberately no local fallback: a refusal or an older
14
+ * proxy without the route is reported as a Pi outcome and the file is left as it is.
15
+ */
16
+ export async function refreshPiThroughServer(
17
+ deps: RuntimeApiDeps & { store?: IntegrationStateStore; request?: typeof runtimeRequest } = {},
18
+ ): Promise<OwnedIntegrationRefreshOutcome[]> {
19
+ // The ownership record is the user's opt-in; an unconnected Pi never reaches the server.
20
+ const record = (deps.store ?? createIntegrationStateStore()).readRecords().pi;
21
+ if (!record || record.clientId !== "pi") return [];
22
+ try {
23
+ const result = await (deps.request ?? runtimeRequest)<{ results?: OwnedIntegrationRefreshOutcome[] }>(
24
+ PI_SYNC_ROUTE,
25
+ { method: "POST", headers: { "content-type": "application/json" }, body: "{}" },
26
+ deps,
27
+ );
28
+ if (!Array.isArray(result.results)) {
29
+ return [{ client: "pi", ok: false, reason: "The running proxy does not support Pi synchronization; restart it to refresh Pi." }];
30
+ }
31
+ return result.results.filter(outcome => outcome.client === "pi");
32
+ } catch (error) {
33
+ return [{ client: "pi", ok: false, reason: error instanceof Error ? error.message : String(error) }];
34
+ }
35
+ }
@@ -0,0 +1,46 @@
1
+ import { isOrchestratedUpdateArgv } from "../update/orchestrated-arguments.mjs";
2
+
3
+ /** Identify command namespaces whose execution must not trigger automatic shim repair. */
4
+ export function skipsCodexShimAutoRestore(command: string | undefined, args: string[]): boolean {
5
+ if (command === "uninstall" || command === "remove") return true;
6
+ // Contract discovery and orchestrated update must validate before any repair.
7
+ if (command === "capabilities") return true;
8
+ // Reading the bounded link diagnostics file must not repair, harden or create anything first.
9
+ if (command === "link" && args[1] === "diagnostics") return true;
10
+ if (command === "update" && isOrchestratedUpdateArgv(args)) return true;
11
+ if (command === "sync") return true;
12
+ if (command === "status" || command === "doctor") return true;
13
+ // Explicit orphan-token recovery must not mutate Codex before its guards run.
14
+ if (command === "disconnect" && args.includes("--orphaned-token")) return true;
15
+ // A Home's link-bound disconnect (--expect-link) must refuse a mismatch with nothing changed, repairs included.
16
+ if (command === "disconnect" && args.some(arg => arg === "--expect-link" || arg.startsWith("--expect-link="))) return true;
17
+ // The launcher owns shim handoff after classifying routing, including native fast paths.
18
+ if (command === "codex") return true;
19
+ // Exec admission only observes the selected target; it must never repair a shim first.
20
+ if (command === "internal" && args[1] === "codex-exec-target") return true;
21
+ // `lab` is read-only inspection; it must not trigger shim side effects.
22
+ if (command === "lab") return true;
23
+ // Local messaging owns its helpers; even malformed usage must not repair/start anything.
24
+ if (command === "message") return true;
25
+ // `resolve` is read-only inspection for embedding shells: a lookup made to populate
26
+ // a consent surface must not trigger a shim repair side effect first.
27
+ if (command === "resolve") return true;
28
+ // Local model inventory is read-only; mutations and live commands keep preflight.
29
+ if (command === "models" || command === "model") {
30
+ const subcommand = args[1];
31
+ if (!subcommand || subcommand.startsWith("-") || subcommand === "list" || subcommand === "list-custom") return true;
32
+ }
33
+ // `service status --json` is a passive inventory read for peers such as GOAT: a shim repair
34
+ // before dispatch would change the installation it was asked only to describe.
35
+ // Flags may precede the verb (`ocx service --json status`), exactly as parseServiceArgs reads it.
36
+ if (command === "service" && args.includes("--json")
37
+ && args.slice(1).find(arg => !arg.startsWith("--")) === "status") return true;
38
+ // The desktop's approval-bound stop must validate its snapshot before any unrelated
39
+ // CLI repair changes the installation it was approved against.
40
+ if (command === "stop" && args.some(arg => arg.startsWith("--expect-"))) return true;
41
+ // The entire updater-inspection namespace is zero-effect, including malformed
42
+ // or future actions. A later `apply` implementation must own its preflight.
43
+ if (command === "system" && args[1] === "codex-cli-update") return true;
44
+ if (command === "__update-badge") return true;
45
+ return command === "codex-shim" && ["install", "status", "uninstall", "remove"].includes(args[1] ?? "");
46
+ }
@@ -51,11 +51,12 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
51
51
  },
52
52
  {
53
53
  name: "stop",
54
- usage: "ocx stop [--json]",
54
+ usage: "ocx stop [--json] [--deadline-ms <ms>]",
55
55
  summary: "Stop the proxy; preserve connected-client integrations, restore native Codex config for standalone owners.",
56
56
  details: [
57
57
  "--json keeps the stop path unchanged and prints one structured summary document on stdout; human output moves to stderr.",
58
58
  "Exit codes are identical with and without --json: 0, 1, 79 (history cleanup incomplete), 80 (teardown deferred).",
59
+ "--deadline-ms <ms> Windows: finish the service stop within <ms> of this command's start, or refuse up front with nothing changed (default 60000; OCX_STOP_DEADLINE_MS is read when the flag is absent).",
59
60
  ],
60
61
  },
61
62
  {
@@ -152,16 +153,27 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
152
153
  },
153
154
  {
154
155
  name: "link",
155
- usage: "ocx link <port|issue|status|revoke|reconnect|cleanup>",
156
+ usage: "ocx link <port|issue|status|diagnostics|revoke|reconnect|cleanup|check|update|sync|restart-codex|capture|policy>",
156
157
  summary: "Allocate and manage a loopback remote home link.",
157
158
  details: [
158
159
  "Port: ocx link port [--json]",
159
160
  "Issue: ocx link issue --alias <alias> --tunnel-port <port> [--json]",
160
161
  "Status: ocx link status [--json]",
162
+ "Diagnostics: ocx link diagnostics [--limit <n>] [--since <iso-time|epoch-ms>] [--json]",
161
163
  "Revoke: ocx link revoke --link-id <id> [--force --yes] [--json]",
162
164
  "Reconnect: ocx link reconnect --link-id <id> [--json]",
163
165
  "Cleanup: ocx link cleanup [--link-id <id>] [--json]",
164
- "Issue, status, revoke, and reconnect use the running proxy's loopback management API and admin token.",
166
+ "Check: ocx link check (--link-id <id> | --all) [--no-wait] [--json]",
167
+ "Update: ocx link update (--link-id <id> | --all) --yes [--no-wait] [--json]",
168
+ "Sync: ocx link sync (--link-id <id> | --all) [--no-wait] [--json]",
169
+ "Sync with a restart: ocx link sync --link-id <id> (--restart-app-server-only | --restart-codex --yes) [--ignore-activity] [--no-wait] [--json]",
170
+ "Restart Codex: ocx link restart-codex --link-id <id> [--scope app-server|codex] --yes [--ignore-activity] [--no-wait] [--json]",
171
+ "Capture: ocx link capture <start [--minutes <1-60>]|stop|status> [--json]",
172
+ "Policy: ocx link policy [--updates off|notify|auto-when-idle] [--catalog-fanout auto|manual] [--child-codex-restart never|app-server-when-idle] [--idle-after-minutes <1-60>] [--json]",
173
+ "Activity holds: ocx link activity clear --link-id <id> [--json]",
174
+ "Issue, status, revoke, reconnect, check, update, sync, restart-codex, policy and activity use the running proxy's loopback management API and admin token; update, sync and restart-codex act only on Home-initiated links.",
175
+ "Capture is a local file operation on this machine; it needs no running proxy, works on a Home and a Child, and no sync or remote input can start it.",
176
+ "Diagnostics reads this computer's link diagnostics file directly and needs no running proxy.",
165
177
  ],
166
178
  },
167
179
  {
@@ -178,16 +190,19 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
178
190
  },
179
191
  {
180
192
  name: "disconnect",
181
- usage: "ocx disconnect [--keep-catalog] [--json]",
193
+ usage: "ocx disconnect [--keep-catalog] [--recover-config --yes] [--json] [--expect-link <linkId>]",
182
194
  summary: "Restore local client state offline and clear the remote-hub connection.",
195
+ details: [
196
+ "--expect-link <linkId> disconnects only when this machine is a connected Remote Link Child of that link, or, once its connection is already cleared, finishes the unfinished disconnect. A Home's revoke sends it so a delayed revoke of an old link cannot disconnect a newer one. Any other state (disconnected with no unfinished disconnect, another link or key, a hub client, a pending key rotation or connect, another connection's unfinished disconnect while connected, unreadable state) changes nothing, exits 5, and prints {\"phase\":\"child_link_mismatch\",\"reason\":...} as the last stderr line. A client-initiated link (this machine joined its Home itself, shown by its sidecar or by the marker that outlives a lost sidecar) is refused the same way (reason client_initiated_link); disconnect it without --expect-link. A malformed or repeated flag, or one combined with --orphaned-token or --recover-config, exits 2.",
197
+ ],
183
198
  },
184
199
  {
185
200
  name: "sync",
186
- usage: "ocx sync [--expect-link <linkId> | --expect-hub-key <apiKeyId>] [--local-only] [--json] [--restart-codex] [--restart-app-server-only]",
201
+ usage: "ocx sync [--expect-link <linkId> | --expect-hub-key <apiKeyId>] [--overwrite-conflict [--overwrite-client <id>]] [--local-only] [--json] [--restart-codex] [--restart-app-server-only] [--child <linkId>]... [--restart-children[=app-server] | --restart-children=codex --yes]",
187
202
  summary: "Fetch provider models and inject them into Codex config.",
188
203
  details: [
189
204
  "A current Home catalog fans out to linked Children; --local-only disables fan-out and --json emits the result. Partial fan-out exits 6.",
190
- "Fan-out never requests a Codex app or app-server restart on a Child; use GOAT or ocx sync --restart-codex on the Child. The Child's pinned sync may restart its OpenCodex client runtime after applying changed Home settings.",
205
+ "--child <linkId> (repeatable) limits fan-out to those links; the others report not-selected. A Child held by a Child operation is skipped as child-busy. Fan-out requests no Codex restart on a Child unless --restart-children[=app-server] or --restart-children=codex --yes is given; the Home then skips the restart, never the sync, for a Child with a model request in flight (restart-skipped:link-active), on Windows Children, and on ocx-child, and exits 6. The Child's pinned sync may restart its OpenCodex client runtime after applying changed Home settings.",
191
206
  "After writing the catalog, warns if long-lived Codex app-server processes are still running.",
192
207
  "An update in flight or an unavailable update/sync mutex refuses without changes: update-in-flight, exit 7. Another sync reports sync-in-progress, exit 1.",
193
208
  "--restart-codex restarts the app-servers AND fully quits and relaunches the Codex desktop app on macOS, Linux and Windows, after catalog/cache writes or a committed configuration change. It ends live conversations.",
@@ -244,6 +259,7 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
244
259
  summary: "OAuth or API-key login for a provider.",
245
260
  details: [
246
261
  "--headless (anthropic, anthropic2): no browser and no local port; approve in any browser and paste the displayed code.",
262
+ "--headless (xai): device authorization instead of the loopback callback; no local port, confirm the printed short code in any browser, nothing to paste.",
247
263
  "Codex/ChatGPT: ocx login codex runs the Codex account-pool login (same flow as ocx account login codex).",
248
264
  "That one needs a running proxy; the OAuth and API-key providers log in locally.",
249
265
  "'chatgpt' and 'openai' are the same route; an OpenAI platform API key is 'ocx login openai-apikey'.",
@@ -252,10 +268,11 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
252
268
  { name: "logout", usage: "ocx logout <provider>", summary: "Remove a stored provider login." },
253
269
  {
254
270
  name: "gui",
255
- usage: "ocx gui [pair --origin <browser-origin> [--json]]",
271
+ usage: "ocx gui [pair [--desktop] --origin <browser-origin> [--json]]",
256
272
  summary: "Open the opencodex dashboard or create a secret single-use remote pairing grant.",
257
273
  details: [
258
274
  "Pairing requires an explicit allowed --origin; there is no localhost or config-derived default.",
275
+ "--desktop authorizes only Desktop compatibility actions in an existing standalone local dashboard session, for at most five minutes; it does not authorize Remote Link or key disclosure.",
259
276
  "The printed grant is secret, single-use, short-lived, and must not be persisted.",
260
277
  ],
261
278
  },
@@ -406,9 +423,9 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
406
423
  details: [
407
424
  "ocx advisor and ocx advisor status read the resolved settings; use --json for machine-readable output.",
408
425
  "ocx advisor on requires current context-sharing consent. Pass --ack-context-sharing to record consent v1 and enable. ocx advisor off disables the sidecar without granting consent.",
409
- "ocx advisor consent records consent v1 after printing the disclosure. ocx advisor consent --revoke removes it and stops task-context transfer.",
410
- "ocx advisor set updates --model, --effort, --policy and --timeout-ms; the model may be any routable model string (bare native, provider/model, or account-qualified). set does not grant consent.",
411
- "policy manual consults only when the worker calls the synthetic advisor tool; policy preflight also attempts one automatic consultation per task with a stable conversation identity, once the task shows orientation evidence. Without a stable identity, each eligible request may trigger another consultation. Both require current consent before any task context is sent.",
426
+ "ocx advisor consent records consent v1 after printing the disclosure. ocx advisor consent --revoke removes it: consultations not yet dispatched are blocked, while a dispatched consultation cannot be cancelled and task content already sent cannot be retracted.",
427
+ "ocx advisor set updates --model, --effort, --policy, --context-mode, --max-consultations and --timeout-ms; the model may be any routable model string (bare native, provider/model, or account-qualified). set does not grant consent.",
428
+ "In the default context mode, policy manual consults only when the worker calls the synthetic advisor tool; policy preflight also attempts one automatic consultation per task with a stable conversation identity, once the task shows orientation evidence. Without a stable identity, each eligible request may trigger another consultation. Both require current consent before any task context is sent. The question-only mode pauses automatic consultations.",
412
429
  ],
413
430
  },
414
431
  {
@@ -431,8 +448,8 @@ export const CLI_COMMANDS: CliCommandEntry[] = [
431
448
  },
432
449
  {
433
450
  name: "route",
434
- usage: "ocx route <combo|policy> <subcommand>",
435
- summary: "Manage combo routing and routing profiles.",
451
+ usage: "ocx route <combo|policy|to> <subcommand>",
452
+ summary: "Manage combo routing, routing profiles and per-device client intent.",
436
453
  },
437
454
  {
438
455
  name: "effort",
@@ -1,12 +1,13 @@
1
1
  import type { ProxyRestartResult } from "./tray-proxy";
2
2
 
3
- export type RestartSupervisor = "desktop" | "service";
3
+ export type RestartSupervisor = "desktop" | "service" | "service-unproven";
4
4
 
5
5
  /** Only the bound client's explicit refusal establishes a supervisor for sync. */
6
6
  export function supervisedRestartRefusal(result: ProxyRestartResult): RestartSupervisor | null {
7
7
  if (result.ok || result.phase !== "request" || !(result.error instanceof Error)) return null;
8
8
  if (result.error.message === "restart_supervised_desktop") return "desktop";
9
9
  if (result.error.message === "restart_supervised_service") return "service";
10
+ if (result.error.message === "restart_supervised_service-unproven") return "service-unproven";
10
11
  return null;
11
12
  }
12
13
 
@@ -35,8 +36,10 @@ export function reportRestartFailure(result: Extract<ProxyRestartResult, { ok: f
35
36
  console.error(`The proxy's package files are unsettled. Wait for the install to finish, then run \`ocx restart\`. ${INCOMPLETE_INSTALL_RECOVERY}`);
36
37
  } else if (code === "restart_supervised_service") {
37
38
  console.error("Restart not performed; the running client runtime was kept. Its background service owns it: run `ocx service restart`.");
39
+ } else if (code === "restart_supervised_service-unproven") {
40
+ console.error("Restart not performed; the running client runtime was kept. A service manager started it (systemd opencodex-proxy.service, launchd com.opencodex.proxy or the Windows OpenCodex service), but it is not enabled or its relaunch could not be verified: restart it through the manager with 'ocx service restart', or check 'ocx service status'.");
38
41
  } else if (code === "restart_supervised_desktop") {
39
- console.error("Restart not performed; the running client runtime was kept. The OpenCodex desktop app owns it: restart it from the app.");
42
+ console.error("Restart not performed; the running client runtime was kept. The OpenCodex desktop app owns it while its connection is current: use Quit in the OpenCodex tray menu, then reopen it. After `ocx disconnect`, `ocx restart` hands it to the app.");
40
43
  } else {
41
44
  console.error("Proxy restart request could not be confirmed; no fallback stop/start was attempted. Run `ocx status` to inspect ownership and runtime state.");
42
45
  }
package/src/cli/root.ts CHANGED
@@ -19,6 +19,7 @@ import { findCommand } from "./registry";
19
19
  import { printUnknownCommand } from "./help-recovery";
20
20
  import { noteCredentialArgv, redactSecretArgs } from "./secret-args";
21
21
  import { maybeNoticeVersionSkew } from "./version-skew-notice";
22
+ import { settleConfigRootForCli } from "./config-root-startup";
22
23
  import { isOrchestratedUpdateArgv } from "../update/orchestrated-arguments.mjs";
23
24
 
24
25
  export interface CliHead {
@@ -140,7 +141,7 @@ export async function runCli(argv: string[]): Promise<CliHead> {
140
141
  process.exit(1);
141
142
  }
142
143
  if (head.command === "stop" && !parseStopApproval(head.args.slice(1)).ok) {
143
- 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>]]");
144
+ 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>]]");
144
145
  process.exit(64);
145
146
  }
146
147
  const uninstallError = uninstallArgsError(head.command, head.args);
@@ -161,6 +162,9 @@ export async function runCli(argv: string[]): Promise<CliHead> {
161
162
  process.exit(SYNC_EXPECTATION_USAGE_EXIT);
162
163
  }
163
164
  }
165
+ // Before any preflight or command write: wait once for the config-root ACL flight (#7815).
166
+ // Commands skipsCodexShimAutoRestore exempts are skipped there too; see config-root-startup.
167
+ await settleConfigRootForCli(head.command, head.args);
164
168
  await maybeNoticeVersionSkew(head.command, head.args);
165
169
  await maybeAutoRestoreCodexShimAsync(head.command, head.args);
166
170
  return head;
@@ -0,0 +1,172 @@
1
+ import {
2
+ CliUsageError, RuntimeApiError, printData, rejectArgs, runCliAction, runtimeRequest, terminalSafeText,
3
+ type RuntimeApiDeps,
4
+ } from "./runtime-api";
5
+ import { integrationFlag, integrationOption } from "./integration-input";
6
+ import { readLinkChildContext, linkChildRefusal, type LinkChildContext } from "./link-child";
7
+ import { isRouteClientId, parseRouteClientIntent } from "../link/route-intent";
8
+ import type { RouteToStatus } from "../routing/route-to-status";
9
+
10
+ export const ROUTE_TO_USAGE = `Usage:
11
+ ocx route to status [--device <alias|id|all|this>] [--json]
12
+ ocx route to sync [--device <alias|id|all|this>] [--overwrite-conflict] [--json]
13
+ ocx route to <client> <on|off|inherit> [--device <alias|id|this>] [--accounts <all|none|userId,...>] [--model-names <alias|routed>] [--overwrite-conflict] [--json]
14
+ ocx route to <client> <off|inherit> --local [--device this] [--json]`;
15
+
16
+ const loadLocal = () => import("../routing/route-to-local");
17
+ export interface RouteToDeps extends RuntimeApiDeps {
18
+ readChildContext?: () => LinkChildContext | null;
19
+ loadLocal?: typeof loadLocal;
20
+ }
21
+
22
+ export function routeToStatusLines(status: RouteToStatus): string[] {
23
+ return ["DEVICE CLIENT INTENT SOURCE APPLIED TARGET", ...status.devices.flatMap(device =>
24
+ device.routeIntent === "unsupported" ? [`${device.alias || device.id} route intent unsupported (${device.reason ?? "unsupported"})`]
25
+ : device.clients.map(row => [device.alias || device.id, row.client, row.intent, row.source,
26
+ row.applied ?? "-", row.target ?? "-"].join(" "))),
27
+ ...(status.syncs ?? []).map(row => `sync ${row.id}: ${row.state}${row.reason ? ` (${row.reason})` : ""}`),
28
+ ...(status.deferred ? [`Local reconciliation deferred: Home intent or the Child catalog is unavailable${status.deferred.clients.length ? ` (${status.deferred.clients.join(", ")})` : ""}.`] : [])];
29
+ }
30
+
31
+ function accountsOption(raw: string | undefined): "all" | "none" | string[] | undefined {
32
+ if (raw === undefined || raw === "all" || raw === "none") return raw;
33
+ const values = raw.split(",").map(value => value.trim());
34
+ if (!parseRouteClientIntent({ enabled: true, accounts: values }, "aside")
35
+ || values.some(value => value === "all" || value === "none")) {
36
+ throw new CliUsageError("--accounts requires all, none, or unique Aside userIds (not u/N slots)", ROUTE_TO_USAGE);
37
+ }
38
+ return values;
39
+ }
40
+
41
+ /** Shared with legacy toggle aliases, inside their existing error boundary. */
42
+ export async function routeToAction(argv: string[], deps: RouteToDeps = {}): Promise<void> {
43
+ const args = [...argv];
44
+ const json = integrationFlag(args, "--json");
45
+ const local = integrationFlag(args, "--local");
46
+ const overwriteConflict = integrationFlag(args, "--overwrite-conflict");
47
+ const device = integrationOption(args, "--device");
48
+ const accounts = accountsOption(integrationOption(args, "--accounts"));
49
+ const modelNames = integrationOption(args, "--model-names");
50
+ const subject = args.shift() ?? "status";
51
+ const read = subject === "status";
52
+ const sync = subject === "sync";
53
+ const client = read || sync ? undefined : subject;
54
+ const action = client === undefined ? undefined : args.shift();
55
+ rejectArgs(args, ROUTE_TO_USAGE);
56
+ if (device !== undefined && (!device.trim() || /[\x00-\x20\x7f]/.test(device))) {
57
+ throw new CliUsageError("--device requires an alias, id, all or this", ROUTE_TO_USAGE);
58
+ }
59
+ if (client !== undefined && !isRouteClientId(client)) {
60
+ throw new CliUsageError("Expected a supported route-to client", ROUTE_TO_USAGE);
61
+ }
62
+ if (client !== undefined && !["on", "off", "inherit"].includes(action ?? "")) {
63
+ throw new CliUsageError("Expected a supported client and on, off or inherit", ROUTE_TO_USAGE);
64
+ }
65
+ if (client !== undefined && device === "all") {
66
+ throw new CliUsageError("--device all applies only to status or sync; omit --device to change the Home default", ROUTE_TO_USAGE);
67
+ }
68
+ if (modelNames !== undefined && (modelNames !== "alias" && modelNames !== "routed")) {
69
+ throw new CliUsageError("--model-names must be alias or routed", ROUTE_TO_USAGE);
70
+ }
71
+ if (accounts !== undefined && (client !== "aside" || action !== "on")) {
72
+ throw new CliUsageError("--accounts requires aside on", ROUTE_TO_USAGE);
73
+ }
74
+ if (modelNames !== undefined && (action !== "on" || (client !== "hermes" && client !== "commandcode"))) {
75
+ throw new CliUsageError("--model-names requires hermes or commandcode on", ROUTE_TO_USAGE);
76
+ }
77
+ if (overwriteConflict && !sync && action !== "on") {
78
+ throw new CliUsageError("--overwrite-conflict applies only to on or sync", ROUTE_TO_USAGE);
79
+ }
80
+ if (local && (client === undefined || !["off", "inherit"].includes(action ?? "") || overwriteConflict)) {
81
+ throw new CliUsageError("--local supports only client off or inherit", ROUTE_TO_USAGE);
82
+ }
83
+ if (action === "inherit" && device === undefined && !local) {
84
+ throw new CliUsageError("inherit requires --device or --local", ROUTE_TO_USAGE);
85
+ }
86
+
87
+ // Detect Child before runtimeRequest: these operations must never enter its Home relay.
88
+ const child = (deps.readChildContext ?? readLinkChildContext)();
89
+ let result: unknown;
90
+ let requestFailure: RuntimeApiError | undefined;
91
+ if (child) {
92
+ if (device !== undefined && device !== "this" && device !== child.linkId) {
93
+ throw new CliUsageError("A Child can target only --device this or its own link id", ROUTE_TO_USAGE);
94
+ }
95
+ if (client !== undefined && !local) {
96
+ const command = ["ocx route to", client, action, "--device", child.linkId,
97
+ ...(accounts === undefined ? [] : ["--accounts", Array.isArray(accounts) ? accounts.join(",") : accounts]),
98
+ ...(modelNames === undefined ? [] : ["--model-names", modelNames]),
99
+ ...(overwriteConflict ? ["--overwrite-conflict"] : [])].join(" ");
100
+ throw new RuntimeApiError(`${linkChildRefusal(child)}\nRun on the Home: ${command}`, 409, null);
101
+ }
102
+ const api = await (deps.loadLocal ?? loadLocal)();
103
+ result = read ? await api.readLocalRouteToStatus(child)
104
+ : sync ? await api.syncLocalRouteTo(child, overwriteConflict)
105
+ : await api.setLocalRouteToOff(child, client!, action === "off");
106
+ } else {
107
+ if (local) throw new CliUsageError("--local requires a Remote Link Child", ROUTE_TO_USAGE);
108
+ const body = { ...(device === undefined ? {} : { device }),
109
+ ...(overwriteConflict ? { overwriteConflict: true } : {}) };
110
+ try {
111
+ result = read ? await runtimeRequest(`/api/route-to${device === undefined ? "" : `?device=${encodeURIComponent(device)}`}`, { redirect: "error" }, deps)
112
+ : await runtimeRequest(sync ? "/api/route-to/sync" : "/api/route-to", {
113
+ method: sync ? "POST" : "PUT", redirect: "error",
114
+ headers: { "content-type": "application/json" },
115
+ body: JSON.stringify(sync ? body : { client, action, ...body,
116
+ ...(accounts === undefined ? {} : { accounts }), ...(modelNames === undefined ? {} : { modelNames }) }),
117
+ }, deps);
118
+ } catch (error) {
119
+ if (!(error instanceof RuntimeApiError) || !error.body || typeof error.body !== "object"
120
+ || !("schema" in error.body) || error.body.schema !== "ocx.route-to/1") throw error;
121
+ requestFailure = error;
122
+ result = error.body;
123
+ }
124
+ }
125
+ const status = result as RouteToStatus;
126
+ if (!status || status.schema !== "ocx.route-to/1" || !Array.isArray(status.devices) || status.devices.length === 0
127
+ || (status.deferred !== undefined && (!status.deferred || status.deferred.reason !== "intent_or_catalog_pending"
128
+ || !Array.isArray(status.deferred.clients) || status.deferred.clients.some(client => !isRouteClientId(client))))
129
+ || (status.syncs !== undefined && (!Array.isArray(status.syncs) || status.syncs.some(row => !row || typeof row.id !== "string"
130
+ || !["synced", "failed", "pending", "unsupported"].includes(row.state) || (row.reason !== undefined && typeof row.reason !== "string"))))
131
+ || (status.warnings !== undefined && (!Array.isArray(status.warnings) || status.warnings.some(row => typeof row !== "string")))
132
+ || status.devices.some(row => !row || typeof row.id !== "string" || !Array.isArray(row.clients)
133
+ || (row.routeIntent === undefined ? row.clients.length === 0
134
+ : row.routeIntent !== "unsupported" || row.clients.length !== 0 || typeof row.reason !== "string")
135
+ || (row.alias !== undefined && typeof row.alias !== "string")
136
+ || row.clients.some(client => !client || !isRouteClientId(client.client)
137
+ || (client.intent !== "on" && client.intent !== "off" && !(client.intent === "unresolved" && client.client === "aside"))
138
+ || !["builtin", "default", "device", "native", "local"].includes(client.source)
139
+ || (client.applied !== null && !["current", "stale", "not_installed", "conflict", "failed"].includes(client.applied))
140
+ || (client.target !== undefined && typeof client.target !== "string")))) {
141
+ throw new RuntimeApiError("Invalid route-to status response; outcome is unverified. Read status before retrying.", 502, null);
142
+ }
143
+ if (!read) {
144
+ const requested = child?.linkId ?? (device === undefined || device === "this" ? "home" : device);
145
+ const matching = status.devices.filter(row => row.id === requested || row.alias === requested);
146
+ if ((requested !== "all" && matching.length !== 1)
147
+ || (client !== undefined && !matching[0]?.clients.some(row => row.client === client))) {
148
+ throw new RuntimeApiError("Invalid route-to status response; requested device/client is unverified. Read status before retrying.", 502, null);
149
+ }
150
+ }
151
+ printData(status, json, routeToStatusLines(status));
152
+ // Notices about a client the request left alone; the JSON body carries them too.
153
+ for (const warning of status.warnings ?? []) console.error(terminalSafeText(warning));
154
+ if (requestFailure) throw requestFailure;
155
+ if (status.syncs?.some(row => row.state === "failed")) {
156
+ throw new RuntimeApiError("Route sync failed for one or more devices. Read status before retrying.", 502, null);
157
+ }
158
+ if (sync && status.deferred) {
159
+ throw new RuntimeApiError("Local route sync is deferred; not all client configurations were reconciled. Retry when the Home and Child catalog are available.", 503, null);
160
+ }
161
+ const failedClients = status.devices.flatMap(row => row.clients.filter(entry => entry.applied === "failed" || entry.applied === "conflict"));
162
+ if (!read && failedClients.some(entry => client === undefined || entry.client === client)) {
163
+ throw new RuntimeApiError("Route intent returned unresolved client failures or conflicts. Read status before retrying.", 409, null);
164
+ }
165
+ if (!read && client !== undefined && failedClients.length > 0) {
166
+ console.error("Route status includes unresolved failures or conflicts for other clients; review their status.");
167
+ }
168
+ }
169
+
170
+ export function handleRouteToCommand(argv: string[], deps: RouteToDeps = {}): Promise<number> {
171
+ return runCliAction(() => routeToAction(argv, deps));
172
+ }
@@ -11,6 +11,7 @@
11
11
  */
12
12
  import { findLiveProxy, probeHostname, type LivenessIo, type LiveProxy } from "../server/proxy-liveness";
13
13
  import { runningProxyUpdateHeaders } from "../oauth/login-cli";
14
+ import { terminalSafeText } from "../lib/terminal-safe-text";
14
15
  import { redactSecretArgs } from "./secret-args";
15
16
  import type { LinkHomeDeps } from "../client/link-home";
16
17
  export { redactSecretArgs };
@@ -503,15 +504,11 @@ export function desktopSwitchApplyReason(reason: unknown): string {
503
504
  * connected `ocx sync` refresh both print them -- so the escaping sits beside `printData`, at the
504
505
  * one boundary that already separates human output from structured output. Structured output keeps
505
506
  * the exact value: escaping is a rendering decision for a tty, not a change to the data.
507
+ *
508
+ * Re-exported from `src/lib/terminal-safe-text.ts` because the OAuth device login prints the same
509
+ * class of untrusted value and importing this module from there would close an import cycle.
506
510
  */
507
- export function terminalSafeText(value: string): string {
508
- return value.replace(/[\x00-\x1f\x7f-\x9f\u2028\u2029]/g, character => {
509
- const code = character.charCodeAt(0);
510
- return code <= 0x7f
511
- ? `\\x${code.toString(16).padStart(2, "0")}`
512
- : `\\u${code.toString(16).padStart(4, "0")}`;
513
- });
514
- }
511
+ export { terminalSafeText };
515
512
 
516
513
  /**
517
514
  * The same rendering for a failure about to be printed or rethrown. The original is kept as
package/src/cli/status.ts CHANGED
@@ -753,9 +753,11 @@ export function unusedProxyWarningLines(input: {
753
753
  ];
754
754
  }
755
755
  if (!input.proxyUp) return [];
756
+ // `ocx start` refuses beside a live proxy (and under the desktop app); `ocx sync` writes the
757
+ // routing to the running one under every owner.
756
758
  return [
757
759
  "⚠️ Codex routing is native — the running proxy is unused.",
758
- " Codex requests go to OpenAI, not this proxy. Re-point with: ocx start",
760
+ " Codex requests go to OpenAI, not this proxy. Re-point with: ocx sync",
759
761
  ];
760
762
  }
761
763