@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
@@ -0,0 +1,201 @@
1
+ /**
2
+ * Standalone native originals for a linked Child.
3
+ *
4
+ * A Child applying its Home's route intent writes the Child's own native switches
5
+ * (clientIntegrations.codex|grok|claude-desktop, claudeCode.enabled, and as side effects
6
+ * claudeCode.authModeMigratedAt and apiSurfaces.messages). This private, machine-scoped
7
+ * record remembers, per field, the value that existed before route intent first changed it
8
+ * (absent is a value: null), plus the last value this writer published and any value it was
9
+ * about to publish (pending). It is captured once and never overwritten by later syncs or
10
+ * connects, and it is not bound to a link: it means "the standalone value before route intent
11
+ * touched it", which stays true after a crashed connect followed by a different link.
12
+ *
13
+ * Callers hold the client lifecycle lock; every function here takes the config mutation lock,
14
+ * preserving the documented lifecycle -> config order. Writes are write-ahead: the original and
15
+ * pending value reach this file before the atomic config write, and the value is marked
16
+ * published after it. Restore (disconnect, failed enrollment) puts the original back only for a
17
+ * field whose current value this writer published or had pending; any other value is the
18
+ * person's own edit and is kept. The record is removed only after the restored config is read
19
+ * back and verified, so an interrupted restore is retried safely by the next disconnect.
20
+ *
21
+ * Limit (ABA): a person who sets a field to exactly the value this writer published cannot be
22
+ * told apart from the writer, and that field is restored. The Child's local opt-out list is the
23
+ * person's own choice and is not part of this record.
24
+ */
25
+ import { chmodSync, lstatSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
26
+ import { join } from "node:path";
27
+ import { atomicWriteFile, isMissingPathError } from "../config/atomic-write";
28
+ import { withConfigMutationLockSync } from "../config/mutation-lock";
29
+ import { mutatePersistedConfig, readConfigForAdmittedMutation } from "../config/persisted-mutation";
30
+ import { deleteConfigObjectChildKey } from "../config/rebase-provenance";
31
+ import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
32
+ import { hardenSecretDir } from "../lib/windows-secret-acl";
33
+ import { linkDir } from "../link/paths";
34
+ import type { OcxConfig } from "../types";
35
+
36
+ export const NATIVE_INTENT_FIELDS = ["codex", "grok", "claude-desktop", "claude", "claudeMigratedAt", "messages"] as const;
37
+ export type NativeIntentField = typeof NATIVE_INTENT_FIELDS[number];
38
+ /** null means the key is absent; anything else is the exact persisted value. */
39
+ export type NativeIntentSlot = boolean | string | Record<string, unknown> | null;
40
+ export type NativeIntentFields = Record<NativeIntentField, NativeIntentSlot>;
41
+ type Entry = { original: NativeIntentSlot; published?: NativeIntentSlot; pending?: NativeIntentSlot };
42
+ export type NativeIntentOriginals = { version: 1; fields: Partial<Record<NativeIntentField, Entry>> };
43
+
44
+ const RECORD_MAX_BYTES = 16 * 1024;
45
+ const unsafe = (): never => {
46
+ throw new Error(`Native intent originals record is unreadable; inspect or remove ${nativeIntentOriginalsPath()} and retry`);
47
+ };
48
+ const isRecord = (value: unknown): value is Record<string, unknown> => value !== null && typeof value === "object" && !Array.isArray(value);
49
+ const sameSlot = (a: unknown, b: unknown): boolean => JSON.stringify(a) === JSON.stringify(b);
50
+
51
+ export function nativeIntentOriginalsPath(): string { return join(linkDir(), "native-intent-originals.json"); }
52
+
53
+ const integrationField = (field: NativeIntentField): field is "codex" | "grok" | "claude-desktop" =>
54
+ field === "codex" || field === "grok" || field === "claude-desktop";
55
+ const parentKey = (field: NativeIntentField) => integrationField(field) ? "clientIntegrations" as const
56
+ : field === "messages" ? "apiSurfaces" as const : "claudeCode" as const;
57
+ const childKey = (field: NativeIntentField): string => integrationField(field) ? field
58
+ : field === "messages" ? "messages" : field === "claude" ? "enabled" : "authModeMigratedAt";
59
+
60
+ export function readNativeIntentField(config: OcxConfig, field: NativeIntentField): NativeIntentSlot {
61
+ const parent = (config as unknown as Record<string, unknown>)[parentKey(field)];
62
+ if (!isRecord(parent) || !Object.hasOwn(parent, childKey(field)) || parent[childKey(field)] === undefined) return null;
63
+ return structuredClone(parent[childKey(field)]) as NativeIntentSlot;
64
+ }
65
+
66
+ export function nativeIntentFields(config: OcxConfig): NativeIntentFields {
67
+ return Object.fromEntries(NATIVE_INTENT_FIELDS.map(field => [field, readNativeIntentField(config, field)])) as NativeIntentFields;
68
+ }
69
+
70
+ function writeNativeIntentField(config: OcxConfig, field: NativeIntentField, value: NativeIntentSlot): void {
71
+ const key = parentKey(field);
72
+ if (value === null) { deleteConfigObjectChildKey(config, key, childKey(field)); return; }
73
+ const record = config as unknown as Record<string, unknown>;
74
+ const parent = isRecord(record[key]) ? record[key] as Record<string, unknown> : {};
75
+ record[key] = { ...parent, [childKey(field)]: structuredClone(value) };
76
+ }
77
+
78
+ function validSlot(field: NativeIntentField, value: unknown): value is NativeIntentSlot {
79
+ if (value === null) return true;
80
+ if (field === "claudeMigratedAt") return typeof value === "string" && value.length <= 64;
81
+ if (field === "messages") return isRecord(value) && Object.values(value).every(item => item === null || ["boolean", "string", "number"].includes(typeof item));
82
+ return typeof value === "boolean";
83
+ }
84
+
85
+ function parse(value: unknown): NativeIntentOriginals {
86
+ if (!isRecord(value) || value.version !== 1 || !isRecord(value.fields) || Object.keys(value).length !== 2) return unsafe();
87
+ for (const [field, entry] of Object.entries(value.fields)) {
88
+ if (!(NATIVE_INTENT_FIELDS as readonly string[]).includes(field) || !isRecord(entry) || !Object.hasOwn(entry, "original")) return unsafe();
89
+ for (const [key, slot] of Object.entries(entry)) {
90
+ if (!["original", "published", "pending"].includes(key) || !validSlot(field as NativeIntentField, slot)) return unsafe();
91
+ }
92
+ }
93
+ return value as NativeIntentOriginals;
94
+ }
95
+
96
+ /** Missing reads as null. A present but unsafe or malformed record refuses rather than losing originals. */
97
+ export function readNativeIntentOriginals(): NativeIntentOriginals | null {
98
+ const path = nativeIntentOriginalsPath();
99
+ let stat;
100
+ try { stat = lstatSync(path); } catch (error) { if (isMissingPathError(error)) return null; throw error; }
101
+ if (!stat.isFile() || stat.size > RECORD_MAX_BYTES) return unsafe();
102
+ let value: unknown;
103
+ try { value = JSON.parse(readFileSync(path, "utf8")); } catch { return unsafe(); }
104
+ return parse(value);
105
+ }
106
+
107
+ function writeRecord(record: NativeIntentOriginals): void {
108
+ parse(record);
109
+ const path = nativeIntentOriginalsPath(), dir = linkDir();
110
+ assertNotRealHomeUnderTest(join(dir, ".."));
111
+ const body = `${JSON.stringify(record, null, 2)}\n`;
112
+ if (Buffer.byteLength(body) > RECORD_MAX_BYTES) unsafe();
113
+ mkdirSync(dir, { recursive: true, mode: 0o700 });
114
+ if (process.platform === "win32") hardenSecretDir(dir, { required: true });
115
+ else chmodSync(dir, 0o700);
116
+ atomicWriteFile(path, body);
117
+ if (process.platform !== "win32") chmodSync(path, 0o600);
118
+ }
119
+
120
+ function clearRecord(): void {
121
+ assertNotRealHomeUnderTest(join(linkDir(), ".."));
122
+ try { unlinkSync(nativeIntentOriginalsPath()); } catch (error) { if (!isMissingPathError(error)) throw error; }
123
+ }
124
+
125
+ /** True when the value is one this writer published or was about to publish. */
126
+ function ownedByWriter(entry: Entry, current: NativeIntentSlot): boolean {
127
+ return (Object.hasOwn(entry, "published") && sameSlot(entry.published, current))
128
+ || (Object.hasOwn(entry, "pending") && sameSlot(entry.pending, current));
129
+ }
130
+
131
+ /**
132
+ * Write-ahead half: call under the config mutation lock before the atomic config write. Only
133
+ * fields that actually change are recorded, so a no-op toggle claims nothing. The first capture
134
+ * of a field keeps its original forever; a pending value a crash left behind and the config
135
+ * shows is promoted to published first.
136
+ */
137
+ export function prepareNativeIntentWrite(before: NativeIntentFields, after: NativeIntentFields): boolean {
138
+ return withConfigMutationLockSync(() => {
139
+ const changed = NATIVE_INTENT_FIELDS.filter(field => !sameSlot(before[field], after[field]));
140
+ if (!changed.length) return false;
141
+ const record = readNativeIntentOriginals() ?? { version: 1 as const, fields: {} };
142
+ for (const field of changed) {
143
+ const entry: Entry = record.fields[field] ?? { original: structuredClone(before[field]) };
144
+ if (Object.hasOwn(entry, "pending") && sameSlot(entry.pending, before[field])) entry.published = entry.pending;
145
+ entry.pending = structuredClone(after[field]);
146
+ record.fields[field] = entry;
147
+ }
148
+ writeRecord(record);
149
+ return true;
150
+ });
151
+ }
152
+
153
+ /** Completion half: mark each pending value the committed config now shows as published. */
154
+ export function publishNativeIntentWrite(actual: NativeIntentFields): void {
155
+ withConfigMutationLockSync(() => {
156
+ const record = readNativeIntentOriginals();
157
+ if (!record) return;
158
+ let changed = false;
159
+ for (const field of NATIVE_INTENT_FIELDS) {
160
+ const entry = record.fields[field];
161
+ if (!entry || !Object.hasOwn(entry, "pending") || !sameSlot(entry.pending, actual[field])) continue;
162
+ entry.published = entry.pending;
163
+ delete entry.pending;
164
+ changed = true;
165
+ }
166
+ if (changed) writeRecord(record);
167
+ });
168
+ }
169
+
170
+ /**
171
+ * Restore standalone values and remove the record once the restored config is verified.
172
+ * Idempotent: a retry after an interrupted restore finds the original or the person's own
173
+ * value and only removes the record. Returns whether a record existed.
174
+ */
175
+ export function restoreNativeIntentOriginals(guard: () => void): boolean {
176
+ return withConfigMutationLockSync(() => {
177
+ guard();
178
+ const record = readNativeIntentOriginals();
179
+ if (!record) return false;
180
+ const fields = Object.entries(record.fields) as [NativeIntentField, Entry][];
181
+ const result = mutatePersistedConfig(config => {
182
+ guard();
183
+ let changed = false;
184
+ for (const [field, entry] of fields) {
185
+ const current = readNativeIntentField(config, field);
186
+ if (!ownedByWriter(entry, current) || sameSlot(current, entry.original)) continue;
187
+ writeNativeIntentField(config, field, entry.original);
188
+ changed = true;
189
+ }
190
+ return { changed, value: config };
191
+ });
192
+ if (result.status === "unavailable") throw new Error(`Standalone native intent could not be restored (${result.reason})`);
193
+ const verified = nativeIntentFields(readConfigForAdmittedMutation());
194
+ if (fields.some(([field, entry]) => ownedByWriter(entry, verified[field]) && !sameSlot(verified[field], entry.original))) {
195
+ throw new Error("Standalone native intent restore was not verified; rerun the operation");
196
+ }
197
+ guard();
198
+ clearRecord();
199
+ return true;
200
+ });
201
+ }
@@ -0,0 +1,141 @@
1
+ /** Child-owned watch: authenticated reads only; local reconciliation stays with the runtime scheduler. */
2
+ import type { OcxClientConnectionConfig } from "../types";
3
+ import { LINK_ROUTE_INTENT_PATH } from "../link/management-routes";
4
+ import { parseHomeRouteIntentDocument, routeIntentDigest, ROUTE_INTENT_DIGEST_PATTERN, type HomeRouteIntentDocument } from "../link/route-intent";
5
+ import { ROUTE_INTENT_AFTER_HEADER, ROUTE_INTENT_WAKE_HEADER, ROUTE_INTENT_WATCH_HEADER } from "../link/route-intent-watch";
6
+ import { readBoundedResponseBytes } from "../lib/bounded-body";
7
+ import { signalWithTimeout } from "../lib/abort";
8
+ import { fetchBoundLinkRelay } from "./link-relay-transport";
9
+
10
+ const WATCH_READ_TIMEOUT_MS = 40_000; // Home wait (30 s), relay proof and bounded body share one budget.
11
+ const WATCH_MAX_BYTES = 64 * 1024;
12
+ const WATCH_MAX_HEADER_BYTES = 8 * 1024;
13
+ const WATCH_RETRY_MS = 5_000;
14
+ export type RouteIntentWatchKey = string | (() => string | null);
15
+ export interface RouteIntentWatchReadDeps {
16
+ /** Trusted complete-send test seam; production always uses the connection-bound relay. */
17
+ fetchImpl?: typeof fetch;
18
+ signal?: AbortSignal;
19
+ timeoutMs?: number;
20
+ }
21
+ export type RouteIntentWatchResult = { kind: "fresh"; document: HomeRouteIntentDocument; watchSupported: boolean; wakeReason?: "changed" | "notified" | "timeout" }
22
+ | { kind: "unsupported" } | { kind: "cancelled" } | { kind: "failed"; reason: "route_intent_watch_unavailable" };
23
+
24
+ function cancel(response: Response): void {
25
+ try { void response.body?.cancel().catch(() => {}); } catch { /* no untrusted cleanup can extend the deadline */ }
26
+ }
27
+ /** No selectors, redirects, management writes, cached fallback or durable receipt writes. */
28
+ export async function watchHomeRouteIntent(
29
+ connection: OcxClientConnectionConfig, key: RouteIntentWatchKey, afterDigest?: string, deps: RouteIntentWatchReadDeps = {},
30
+ ): Promise<RouteIntentWatchResult> {
31
+ const failed = (): RouteIntentWatchResult => ({ kind: "failed", reason: "route_intent_watch_unavailable" });
32
+ if (deps.signal?.aborted) return { kind: "cancelled" };
33
+ if (connection.transport !== "link" || !connection.link || !connection.apiKeyId
34
+ || (afterDigest !== undefined && !ROUTE_INTENT_DIGEST_PATTERN.test(afterDigest))) return failed();
35
+ const budget = deps.timeoutMs ?? WATCH_READ_TIMEOUT_MS;
36
+ if (!Number.isInteger(budget) || budget < 1 || budget > WATCH_READ_TIMEOUT_MS) return failed();
37
+ const deadline = signalWithTimeout(budget, deps.signal);
38
+ let response: Response | undefined;
39
+ try {
40
+ // A long-lived runtime survives key rotation. Never retain the resolved credential across GETs.
41
+ const admissionKey = typeof key === "function" ? key() : key;
42
+ if (!admissionKey) return failed();
43
+ const target = { tunnelPort: connection.link.tunnelPort, linkId: connection.link.linkId, apiKeyId: connection.apiKeyId, admissionKey };
44
+ const destination = `http://127.0.0.1:${target.tunnelPort}${LINK_ROUTE_INTENT_PATH}`;
45
+ const init: RequestInit = { method: "GET", redirect: "manual", signal: deadline.signal,
46
+ headers: { accept: "application/json", authorization: `Bearer ${admissionKey}`, [ROUTE_INTENT_WATCH_HEADER]: "1",
47
+ ...(afterDigest === undefined ? {} : { [ROUTE_INTENT_AFTER_HEADER]: afterDigest }) } };
48
+ response = deps.fetchImpl ? await deps.fetchImpl(destination, init) : await fetchBoundLinkRelay(target, destination, init);
49
+ if (response.status === 404) return { kind: "unsupported" };
50
+ if (response.status !== 200) return failed();
51
+ let headerBytes = 0;
52
+ for (const [name, value] of response.headers) headerBytes += Buffer.byteLength(name) + Buffer.byteLength(value) + 4;
53
+ const support = response.headers.get(ROUTE_INTENT_WATCH_HEADER);
54
+ const wakeReason = response.headers.get(ROUTE_INTENT_WAKE_HEADER);
55
+ const declared = response.headers.get("content-length");
56
+ if (headerBytes > WATCH_MAX_HEADER_BYTES || (support !== null && support !== "1")
57
+ || (wakeReason !== null && wakeReason !== "changed" && wakeReason !== "notified" && wakeReason !== "timeout")
58
+ || response.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() !== "application/json"
59
+ || (declared !== null && (!/^\d+$/.test(declared) || Number(declared) > WATCH_MAX_BYTES))) return failed();
60
+ const read = await readBoundedResponseBytes(response, { maxBytes: WATCH_MAX_BYTES, signal: deadline.signal });
61
+ if (read.oversized) return failed();
62
+ const document = parseHomeRouteIntentDocument(JSON.parse(new TextDecoder("utf-8", { fatal: true }).decode(read.bytes)));
63
+ return document ? { kind: "fresh", document, watchSupported: support === "1", ...(wakeReason === null ? {} : { wakeReason }) } : failed();
64
+ } catch { return deps.signal?.aborted ? { kind: "cancelled" } : failed(); }
65
+ finally { if (response) cancel(response); deadline.cleanup(); }
66
+ }
67
+
68
+ export interface RouteIntentRuntimeWatchDeps extends Omit<RouteIntentWatchReadDeps, "signal"> {
69
+ /** Share this with the periodic tick. Resolve after apply/report; reject busy/failure to retain the event. */
70
+ requestSync: () => Promise<unknown>;
71
+ setTimer?: (callback: () => void, ms: number) => unknown;
72
+ clearTimer?: (timer: unknown) => void;
73
+ }
74
+ export interface RouteIntentRuntimeWatch { stop(): void }
75
+ const liveWatches = new Map<string, RouteIntentRuntimeWatch>();
76
+
77
+ /** One GET per live link; one in-flight scheduler request plus one coalesced pending event. */
78
+ export function startRouteIntentWatch(
79
+ connection: OcxClientConnectionConfig, key: RouteIntentWatchKey, deps: RouteIntentRuntimeWatchDeps,
80
+ ): RouteIntentRuntimeWatch {
81
+ if (connection.transport !== "link" || !connection.link) return { stop() {} };
82
+ const linkId = connection.link.linkId;
83
+ const existing = liveWatches.get(linkId);
84
+ if (existing) return existing;
85
+ // Do not let caller mutation redirect a long-lived watch onto a different connection.
86
+ const owner = structuredClone(connection);
87
+ const abort = new AbortController();
88
+ const set = deps.setTimer ?? ((cb, ms) => { const timer = setTimeout(cb, ms); timer.unref(); return timer; });
89
+ const clear = deps.clearTimer ?? (timer => clearTimeout(timer as ReturnType<typeof setTimeout>));
90
+ let timer: unknown, retry: unknown;
91
+ let stopped = false, syncing = false, pending = false;
92
+ let after: string | undefined;
93
+ const drain = async () => {
94
+ if (stopped || syncing) return;
95
+ syncing = true;
96
+ try {
97
+ while (pending && !stopped) {
98
+ pending = false;
99
+ try { await deps.requestSync(); }
100
+ catch {
101
+ pending = true;
102
+ if (!stopped) retry = set(() => { retry = undefined; void drain(); }, WATCH_RETRY_MS);
103
+ break;
104
+ }
105
+ }
106
+ } finally { syncing = false; }
107
+ };
108
+ const request = () => {
109
+ pending = true;
110
+ if (retry === undefined) void drain();
111
+ };
112
+ const schedule = (ms: number) => { if (!stopped) timer = set(() => { timer = undefined; void poll(); }, ms); };
113
+ const poll = async () => {
114
+ if (stopped) return;
115
+ const started = Date.now();
116
+ const result = await watchHomeRouteIntent(owner, key, after, { ...deps, signal: abort.signal });
117
+ if (stopped || result.kind === "cancelled") return;
118
+ // A pre-watch Home answers immediately forever. Its existing periodic sync remains authoritative.
119
+ if (result.kind === "unsupported" || (result.kind === "fresh" && !result.watchSupported)) return;
120
+ if (result.kind === "failed") { schedule(WATCH_RETRY_MS); return; }
121
+ const next = routeIntentDigest(result.document);
122
+ const unchanged = after === next;
123
+ after = next;
124
+ if (!unchanged || result.wakeReason !== "timeout") request();
125
+ // Broken peers advertising support but never waiting cannot make a tight loop.
126
+ schedule(unchanged ? Math.max(0, 1_000 - (Date.now() - started)) : 0);
127
+ };
128
+ const handle: RouteIntentRuntimeWatch = { stop() {
129
+ if (stopped) return;
130
+ stopped = true; pending = false;
131
+ abort.abort();
132
+ if (timer !== undefined) clear(timer);
133
+ if (retry !== undefined) clear(retry);
134
+ timer = retry = undefined;
135
+ liveWatches.delete(linkId);
136
+ // An already-entered local apply is owned/fenced by requestSync, never cancelled mid-write here.
137
+ } };
138
+ liveWatches.set(linkId, handle);
139
+ schedule(0);
140
+ return handle;
141
+ }
@@ -8,6 +8,11 @@
8
8
  * - Under the desktop app or a viable service supervisor the restart is refused (409
9
9
  * `restart_supervised`) and the runtime keeps serving. The supervisor owns this process and its
10
10
  * port; handing off to it means exiting before anything proves the replacement can start.
11
+ * - Unless the connection it serves is no longer the durable one (`ocx disconnect`, or a newer
12
+ * connect). Then there is nothing to keep, and under every owner the restart hands off to the
13
+ * standalone recycle, which exits the way that owner relaunches (desktop 75, service 1) or spawns
14
+ * its own replacement. Without this a Home-driven leave over SSH could not finish under the
15
+ * desktop app or a service: `ocx restart` refused and the stale client runtime kept serving.
11
16
  * - Otherwise the listener drains, a replacement `ocx start` is spawned and must answer within the
12
17
  * budget. Success exits this process. A replacement that exited, or never answered and was then
13
18
  * stopped, leaves this process to bind the port again, start a fresh tunnel supervisor and
@@ -22,11 +27,22 @@ import {
22
27
  isDesktopSupervised,
23
28
  } from "../lib/system-restart-contract";
24
29
  import type { OcxClientConnectionConfig } from "../types";
30
+ import { isMarkedSupervisedServiceChild } from "../service/service-child-ownership";
25
31
  import { sameClientConnectionOwner, type readClientConnectionState } from "./state";
26
32
 
27
33
  type ClientConnectionState = ReturnType<typeof readClientConnectionState>;
28
34
 
29
- export type ClientRestartSupervisor = "service" | "desktop";
35
+ /**
36
+ * `service-unproven`: a service manager's marker shows it launched and owns this process, but its
37
+ * relaunch cannot be proven (for example a systemd unit started by hand while disabled). Neither
38
+ * exiting for it nor detaching from it is safe, so the restart is refused.
39
+ */
40
+ export type ClientRestartSupervisor = "service" | "desktop" | "service-unproven";
41
+
42
+ /** Verdicts that keep the runtime: an owner exists, but exiting for it or detaching is not proven safe. */
43
+ export function restartRefusedByOwner(supervisor: ClientRestartSupervisor | null): supervisor is "service-unproven" {
44
+ return supervisor === "service-unproven";
45
+ }
30
46
 
31
47
  export type ClientRestartAdmission =
32
48
  | { kind: "accepted"; alreadyRestarting: boolean }
@@ -38,6 +54,23 @@ export interface ClientRestartIo {
38
54
  stopping?: () => boolean;
39
55
  /** Which supervisor owns this process, or null when it starts its own replacement. */
40
56
  supervisor(): Promise<ClientRestartSupervisor | null>;
57
+ /** The durable connection is no longer the one this runtime serves. */
58
+ connectionChanged?: () => boolean;
59
+ /**
60
+ * Positive evidence of who owns this process ({@link restartOwnerProven}). Without it the
61
+ * ended-connection recycle is never reached and the restart is origin/dev's.
62
+ */
63
+ ownerProven?: () => boolean;
64
+ /**
65
+ * Hand off to what the durable state now calls for; exits the process for its owner to relaunch.
66
+ * Receives the same supervisor verdict as the refusal path (a service only when it is viable).
67
+ */
68
+ recycle?: (supervisor: ClientRestartSupervisor | null) => Promise<void>;
69
+ /**
70
+ * Fence syncs before anything stops: resolves false when they could not be fenced, and the
71
+ * restart is then abandoned with this runtime still serving.
72
+ */
73
+ fence?: () => Promise<boolean>;
41
74
  /** Stop the tunnel supervisor and the listener, giving in-flight requests up to `drainMs`. */
42
75
  stop(drainMs: number): Promise<void>;
43
76
  /** Start the replacement; resolves once it answers, rejects when none survives. */
@@ -73,6 +106,15 @@ export function createClientRestartController(io: ClientRestartIo): ClientRestar
73
106
  const run = async (acceptedAt: number): Promise<void> => {
74
107
  // Let the 202 reach the CLI before the listener starts closing.
75
108
  await sleep(200);
109
+ // A sync already past admission must stand down before the teardown. Without that fence it
110
+ // could commit while the listener closes, so the restart does not start; the CLI sees this
111
+ // process still serving and reports the restart as failed.
112
+ let fenced = false;
113
+ try { fenced = io.fence ? await io.fence() : true; } catch (error) { warn(`[client] restart: syncs could not be fenced (${failureCode(error)})`); }
114
+ if (!fenced) {
115
+ warn("[client] restart: in-flight syncs could not be fenced; this runtime keeps serving");
116
+ return;
117
+ }
76
118
  try {
77
119
  await io.stop(CLIENT_RESTART_DRAIN_MS);
78
120
  } catch (error) {
@@ -97,6 +139,26 @@ export function createClientRestartController(io: ClientRestartIo): ClientRestar
97
139
  hasHandoff: () => flight !== null,
98
140
  async request() {
99
141
  if (io.stopping?.()) return { kind: "stopping" };
142
+ // Only positive ownership evidence opens the ended-connection recycle; without it (a bare
143
+ // OCX_SERVICE=1) the request takes origin/dev's path below.
144
+ if (io.recycle && (io.ownerProven?.() ?? true) && io.connectionChanged?.()) {
145
+ if (flight) return { kind: "accepted", alreadyRestarting: true };
146
+ // An owner that cannot be proven to relaunch this process keeps it, connection ended or not.
147
+ const owner = await io.supervisor();
148
+ if (io.stopping?.()) return { kind: "stopping" };
149
+ if (restartRefusedByOwner(owner)) return { kind: "supervised", supervisor: owner };
150
+ if (flight) return { kind: "accepted", alreadyRestarting: true };
151
+ const recycle = io.recycle, changed = io.connectionChanged;
152
+ // Let the 202 reach the CLI before the listener closes, then confirm the connection is
153
+ // still ended: a connect that committed meanwhile keeps this runtime (the CLI reports kept).
154
+ // The recheck is the last step before the recycle, after the (asynchronous) supervisor lookup.
155
+ flight = sleep(200).then(async () => {
156
+ const supervisor = await io.supervisor();
157
+ if (restartRefusedByOwner(supervisor)) { warn("[client] restart: this runtime's owner could not be proven to relaunch it; it keeps serving"); return; }
158
+ if (changed()) await recycle(supervisor);
159
+ }).finally(() => { flight = null; });
160
+ return { kind: "accepted", alreadyRestarting: false };
161
+ }
100
162
  const supervisor = await io.supervisor();
101
163
  if (io.stopping?.()) return { kind: "stopping" };
102
164
  if (supervisor) return { kind: "supervised", supervisor };
@@ -112,11 +174,59 @@ export function createClientRestartController(io: ClientRestartIo): ClientRestar
112
174
 
113
175
  /** Production supervision check: the desktop app, then a service that will really relaunch us. */
114
176
  export async function clientRestartSupervisor(): Promise<ClientRestartSupervisor | null> {
115
- if (isDesktopSupervised()) return "desktop";
116
- if (process.env.OCX_SERVICE !== "1") return null;
117
- // Same viability test as the standalone restart: stale service assets would not relaunch.
177
+ const { diagnoseService } = await import("../service/diagnostics");
118
178
  const { isServiceViable } = await import("../service/orchestration");
119
- return isServiceViable() ? "service" : null;
179
+ return classifyClientRestartSupervisor({ desktop: isDesktopSupervised(), env: process.env, diagnose: diagnoseService, legacyServiceViable: isServiceViable });
180
+ }
181
+
182
+ /**
183
+ * Positive evidence of who owns this process: the desktop app, a service manager's marker
184
+ * (OCX_SERVICE_MANAGED or the Windows wrapper's protocol marker, read from the environment only),
185
+ * or no OCX_SERVICE at all (every service OpenCodex registers sets it). No inference: a legacy
186
+ * Windows service recognised only from its parent's command line counts as a bare OCX_SERVICE=1.
187
+ * A bare OCX_SERVICE=1 is none of these: a service registered before the manager marker existed
188
+ * and the proxies of ocx claude, ocx codex and ocx opencode all carry it.
189
+ */
190
+ export function restartOwnerProven(input: { desktop: boolean; env: NodeJS.ProcessEnv; managed?: (env: NodeJS.ProcessEnv) => boolean }): boolean {
191
+ return restartOwnerEvidence(input) !== null;
192
+ }
193
+
194
+ /** The owners this change handles, as a client runtime states them in its record (`restartOwner`). */
195
+ export type RestartOwner = "desktop" | "service-manager" | "none";
196
+ export const RESTART_OWNERS: readonly RestartOwner[] = ["desktop", "service-manager", "none"];
197
+
198
+ /** The classified owner from positive evidence, or null for a bare OCX_SERVICE=1 ({@link restartOwnerProven}). */
199
+ export function restartOwnerEvidence(input: { desktop: boolean; env: NodeJS.ProcessEnv; managed?: (env: NodeJS.ProcessEnv) => boolean }): RestartOwner | null {
200
+ if (input.desktop) return "desktop";
201
+ if ((input.managed ?? isMarkedSupervisedServiceChild)(input.env)) return "service-manager";
202
+ return input.env.OCX_SERVICE !== "1" ? "none" : null;
203
+ }
204
+
205
+ /**
206
+ * Ownership and relaunch are separate facts. With a manager's marker, only a service diagnostic
207
+ * that is viable and running lets this process exit for the manager to relaunch it; otherwise it is
208
+ * `service-unproven` and keeps the runtime. A bare OCX_SERVICE=1 keeps origin/dev's decision
209
+ * unchanged (b1148220574917c8 src/client/runtime-restart.ts:114-119): a viable service, else none.
210
+ */
211
+ export function classifyClientRestartSupervisor(input: {
212
+ desktop: boolean;
213
+ env: NodeJS.ProcessEnv;
214
+ diagnose: () => { viable: boolean; running: boolean };
215
+ /** origin/dev's check for a bare OCX_SERVICE=1: src/service/orchestration.ts isServiceViable. */
216
+ legacyServiceViable: () => boolean;
217
+ /** Manager-launched evidence; defaults to the current markers only (isMarkedSupervisedServiceChild). */
218
+ managed?: (env: NodeJS.ProcessEnv) => boolean;
219
+ }): ClientRestartSupervisor | null {
220
+ if (input.desktop) return "desktop";
221
+ // The managed marker (launchd, systemd, WinSW) or the Windows wrapper's protocol marker.
222
+ if (!(input.managed ?? isMarkedSupervisedServiceChild)(input.env)) {
223
+ if (input.env.OCX_SERVICE !== "1") return null;
224
+ return input.legacyServiceViable() ? "service" : null;
225
+ }
226
+ // Relaunch needs positive evidence: viable AND running (launchd's viable also covers an
227
+ // unknown load state for its other callers; running there means loaded).
228
+ const diagnostic = input.diagnose();
229
+ return diagnostic.viable && diagnostic.running ? "service" : "service-unproven";
120
230
  }
121
231
 
122
232
  /**
@@ -133,3 +243,15 @@ export function clientRestartRollbackAction(
133
243
  ? "resume"
134
244
  : "recycle";
135
245
  }
246
+
247
+ /**
248
+ * Whether the served connection has provably ended: the durable state is disconnected, or names a
249
+ * different connection. Unreadable or mismatched state is not proof, so a supervised restart keeps
250
+ * refusing on it instead of exiting a runtime whose link may still work.
251
+ */
252
+ export function clientConnectionEnded(served: OcxClientConnectionConfig, current: ClientConnectionState): boolean {
253
+ // Callers pass readClientConnectionStateWithEvidence(): "disconnected" then means a saved config
254
+ // with no client, never a missing file.
255
+ if (current.kind === "disconnected") return true;
256
+ return current.kind === "connected" && clientRestartRollbackAction(served, current) === "recycle";
257
+ }