@bitkyc08/opencodex 2.100.2 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
package/src/cli/index.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/usr/bin/env bun
2
- import { serviceStayOutExitCode, WINDOWS_WRAPPER_PROTOCOL_ENV } from "../service/windows-wrapper-exit";
2
+ import { serviceStayOutExitCode } from "../service/windows-wrapper-exit";
3
3
  import { isSupervisedServiceChild, serviceChildOwnershipDecisionForClassifiedChild } from "../service/service-child-ownership";
4
- import { SERVICE_MANAGED_ENV } from "../service/state";
4
+ import { withoutSupervisorMarkers } from "../lib/supervisor-markers";
5
5
  import { raiseWindowsProxyPriority } from "../service/windows-process-priority";
6
6
  import { spawn } from "node:child_process";
7
7
  import { homedir } from "node:os";
@@ -79,7 +79,8 @@ import {
79
79
  quarantinePendingTeardown,
80
80
  } from "../config/pending-teardown";
81
81
  import { collectStatus, detectMissingCodexCatalogPath, hubStatusLines, missingCodexCatalogLines, remoteHubBannerLine, remoteHubStatusLines, runtimeSupervisorLine, statusDeadProxyLines, statusProxyUp, statusUnusedProxyLines } from "./status";
82
- import { endpointsToProve, everyEndpointProvenDownAsync, sharedTeardownAuthorized, type UninstallObservation } from "./uninstall-plan";
82
+ import { stopUninstallProxy } from "./uninstall-stop";
83
+ import { captureUninstallEndpointProof, endpointsToProve, respawnWindowRequired, sharedTeardownAuthorized, uninstallServiceRemoval, type UninstallObservation } from "./uninstall-plan";
83
84
  import { takeFlag } from "./runtime-api";
84
85
  import { parseStartOptions, StartArgsError } from "./start-args";
85
86
 
@@ -89,7 +90,7 @@ import {
89
90
  restartStartOutcome,
90
91
  waitForProxyReplacement,
91
92
  runTrayProxyStart,
92
- type ProxyRestartLive,
93
+ type ProxyRestartIo, type ProxyRestartLive,
93
94
  type ProxyRestartStartOutcome,
94
95
  } from "./tray-proxy";
95
96
  import { duplicateRuntimeMessage, runDesktopAwareProxyRestart } from "./desktop-runtime-guidance";
@@ -124,12 +125,13 @@ import {
124
125
  type GuardedStopSnapshot,
125
126
  type StopApproval,
126
127
  } from "./stop-approval";
127
- import { inspectGuardedManagerTarget, observeGuardedManagerStopped } from "../service/guarded-manager-target";
128
128
  import { summarizeStopRun, type StopOutcome, type StopRunRecord } from "./stop-report";
129
+ import { confirmGuardedFreed, inspectGuardedTarget, noServiceStop, observeGuardedStopped, orphanDiscoveryCap, stopGuardedManager, stopServiceForOcxStop, stopServiceForUninstall, stopWindowFailed, verifyUninstallStopWindow, windowsChildStopHeld, windowsPartAHolds, windowsPartAReceiptRecord, windowsPartBDue, windowsPartBOwnsPortWait, windowsStopRequiresReceipt } from "./stop-windows-checked";
129
130
  import { runCli } from "./root";
130
131
  import { isProcessAlive, ProxyOwnershipRefusedError, refusalNextStep, stopProxy } from "../lib/process-control";
131
132
  import { startupDataPlaneToken } from "../lib/service-secrets";
132
- import { assertNotAdminToken, diagnoseService, isServiceOwnershipError, proxyStillLiveAfterStop, serviceCommand, serviceEnvironmentOwnedHere, serviceStartableFromTray, serviceStatePaths, serviceStatusSummary, stopServiceIfInstalledDetailed, uninstallServiceIfInstalled, uninstallServiceDetailed } from "../service";
133
+ import { assertNotAdminToken, diagnoseService, isServiceOwnershipError, serviceCommand, serviceEnvironmentOwnedHere, serviceStartableFromTray, serviceStatePaths, serviceStatusSummary, uninstallServiceIfInstalled, uninstallServiceDetailed } from "../service";
134
+ import { completeWindowsServiceStopReceipt } from "../service/cli-windows-stop";
133
135
  import { acquireOwnershipMutationLease } from "../service/ownership-mutation-lease.mjs";
134
136
  import { formatStartupRoutingDetail, startupHealthSummary } from "../codex/autostart-health";
135
137
  import { injectSystemEnv, reconcileShellHook, revertSystemEnv, uninstallShellHook } from "../server/system-env";
@@ -806,15 +808,13 @@ async function handleStart(options: { block?: boolean } = {}) {
806
808
  }
807
809
 
808
810
  function detachedStartEnvironment(): NodeJS.ProcessEnv {
809
- const env: NodeJS.ProcessEnv = withoutSiblingMarker(process.env);
811
+ const env: NodeJS.ProcessEnv = withoutSupervisorMarkers(withoutSiblingMarker(process.env));
810
812
  // Only a real service wrapper may claim supervision. A detached ensure/tray child is an
811
813
  // ordinary owner, never a sibling: while live it maintains routing, and on exit restores it.
812
814
  // The supervisor markers ride along whenever this runs inside a service child's
813
815
  // environment, so they must leave with OCX_SERVICE — otherwise the child would
814
816
  // answer the ownership gate as a managed job it is not.
815
817
  delete env.OCX_SERVICE;
816
- delete env[SERVICE_MANAGED_ENV];
817
- delete env[WINDOWS_WRAPPER_PROTOCOL_ENV];
818
818
  return withProcessRuntimeProvenance(env);
819
819
  }
820
820
 
@@ -957,10 +957,10 @@ async function handleTrayProxyStart(existingIsSuccess = true): Promise<boolean>
957
957
  const PROXY_RESTART_OBSERVE_MS = MEMORY_DRAIN_RESTART_MS + REPLACEMENT_READY_TIMEOUT_MS + 15_000;
958
958
  /** Reserve confirmation time within the shared restart deadline. */
959
959
  async function handleProxyRestart(
960
- startWhenStopped: (recoveringLiveRestart: boolean) => Promise<ProxyRestartStartOutcome>, onSupervised?: (supervisor: RestartSupervisor) => void,
960
+ startWhenStopped: (recoveringLiveRestart: boolean) => Promise<ProxyRestartStartOutcome>, onSupervised?: (supervisor: RestartSupervisor) => void, bindIo: (io: ProxyRestartIo, deadlineAt: number) => ProxyRestartIo = io => io,
961
961
  ): Promise<boolean> {
962
962
  const deadlineAt = Date.now() + PROXY_RESTART_OBSERVE_MS;
963
- const result = await runDesktopAwareProxyRestart({
963
+ const result = await runDesktopAwareProxyRestart({ ...bindIo({
964
964
  findLive: () => discoverStableProxyForRestart({
965
965
  findLive: () => findLiveProxy({ deadlineAt, attempts: 2, acceptPackageTreeFenced: true }),
966
966
  expired: () => Date.now() >= deadlineAt,
@@ -977,7 +977,7 @@ async function handleProxyRestart(
977
977
  recheckAfterFailedStart: () => recheckRestartFailedStart(end => discoverStableProxyForRestart({
978
978
  findLive: () => findLiveProxy({ deadlineAt: end, attempts: 2, acceptPackageTreeFenced: true }), expired: () => Date.now() >= end,
979
979
  })),
980
- });
980
+ }, deadlineAt) });
981
981
  if (!result.ok && result.phase === "request" && result.error instanceof UpdateRestartRequired) {
982
982
  const candidate = result.error.candidate();
983
983
  console.log(`🔄 Running proxy ${candidate.target.version} is older than this CLI (${candidate.cliVersion}); restarting it from the current installation...`);
@@ -1028,7 +1028,7 @@ async function handleStop(approval?: StopApproval) {
1028
1028
  catch { return null; }
1029
1029
  },
1030
1030
  describeTrackedRuntimeTarget,
1031
- () => inspectGuardedManagerTarget(approval.pid, approval.port),
1031
+ () => inspectGuardedTarget(approval.pid, approval.port),
1032
1032
  snapshot => handleStopUnlocked(snapshot),
1033
1033
  );
1034
1034
  }
@@ -1148,11 +1148,10 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1148
1148
  if (teardownNonce || stoppingSibling) return;
1149
1149
  if (connectedClientSkip) return;
1150
1150
  try {
1151
- teardownNonce = claimPendingTeardown(endpoint, endpointSource, process.pid, handoverRequested ? "update-restart" : undefined).nonce;
1151
+ teardownNonce = claimPendingTeardown(endpoint, endpointSource, process.pid, handoverRequested ? "update-restart" : undefined, windowsPartAReceiptRecord()).nonce;
1152
1152
  } catch (err) {
1153
- // Without a receipt the proxy performs its own teardown, which is the pre-#3008
1154
- // behaviour: correct for every backend that cannot respawn, and merely early for
1155
- // Task Scheduler. Losing the deferral is far better than losing the stop.
1153
+ // Windows wrappers can relaunch the proxy, so an undeferred stop is unsafe.
1154
+ if (windowsStopRequiresReceipt()) { ownershipBlocked = true; stopFailed = true; throw err; }
1156
1155
  console.warn(`⚠️ Could not record the deferred-teardown receipt: ${err instanceof Error ? err.message : String(err)}`);
1157
1156
  }
1158
1157
  };
@@ -1173,8 +1172,11 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1173
1172
  // truthful, so the entry-time skip snapshot cannot stand in for this check.
1174
1173
  acceptNotOwnedTeardown: notOwnedTeardownIsAcceptable(readClientConnectionState(), stoppingSibling),
1175
1174
  // Only an exact endpoint may direct the request; the configured fallback is a guess
1176
- // good enough to record an obligation against, not to POST a stop to.
1175
+ // good enough to record an obligation against, not to POST a stop to. Never re-read the
1176
+ // record here: one published since would send the receipt to a port it does not name.
1177
1177
  runtimeEndpoint: exact ?? undefined,
1178
+ runtimeEndpointOnly: true,
1179
+ skipPortWait: windowsPartBOwnsPortWait(), // #7771: Part B owns the Windows port wait on both paths.
1178
1180
  });
1179
1181
  // A valid receipt means the proxy deferred shared teardown to this process. If the
1180
1182
  // receipt could not be written, the proxy restores it itself and the caller must not
@@ -1192,22 +1194,23 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1192
1194
  try {
1193
1195
  const serviceStop = snapshot
1194
1196
  ? (guardedStep = await runGuardedManagerStep(snapshot, {
1195
- revalidateManager: () => inspectGuardedManagerTarget(snapshot.approval.pid, snapshot.approval.port),
1197
+ revalidateManager: () => inspectGuardedTarget(snapshot.approval.pid, snapshot.approval.port),
1196
1198
  stopManager: () => {
1197
1199
  if (approvedEndpoint) claimTeardown(approvedEndpoint, "exact");
1198
- return stopServiceIfInstalledDetailed();
1200
+ return stopGuardedManager({ approvedPort: snapshot.approval.port, receiptNonce: () => teardownNonce, inheritedReceipts: inheritedTeardowns.length });
1199
1201
  },
1200
1202
  signalApproved: () => stopWithDeferral(snapshot.approval.pid, approvedEndpoint),
1201
1203
  settle: () => settleApprovedTarget(snapshot.approval),
1202
- managerState: () => observeGuardedManagerStopped(snapshot.manager),
1204
+ confirmFreed: () => confirmGuardedFreed(record),
1205
+ managerState: () => observeGuardedStopped(snapshot.manager),
1203
1206
  })).service
1204
1207
  // A sibling never runs under a service manager: an installed one belongs to the live owner,
1205
1208
  // and its ownership check would fail this stop and skip the stale-record purge below.
1206
1209
  // #7423: a manager stop takes the proxy down itself, so a handover claims its receipt first.
1207
- : stoppingSibling || connectedClientAlreadyStopped ? "absent" : (claimHandoverBeforeManager(), stopServiceIfInstalledDetailed());
1210
+ : stoppingSibling || connectedClientAlreadyStopped ? noServiceStop() : (claimHandoverBeforeManager(), await stopServiceForOcxStop({ receiptNonce: () => teardownNonce, inheritedReceipts: inheritedTeardowns.length }));
1208
1211
  record.service = serviceStop;
1209
1212
  stoppedService = serviceStop === "stopped" || serviceStop === "stopped-respawnable";
1210
- schedulerCanRespawn = serviceStop === "stopped-respawnable";
1213
+ schedulerCanRespawn = serviceStop === "stopped-respawnable" || windowsPartBDue();
1211
1214
  // No "won't respawn" claim here: a stopped Task Scheduler can still respawn through
1212
1215
  // its wrapper, which the verification below is what actually settles.
1213
1216
  if (stoppedService) console.log("🛑 Service manager stopped.");
@@ -1225,12 +1228,13 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1225
1228
  console.error("❌ The Windows Task Scheduler state could not be read, so this stop cannot tell whether a wrapper would respawn the proxy.");
1226
1229
  console.error(" Run 'ocx service status' to see the query error, repair Task Scheduler access, then retry.");
1227
1230
  }
1231
+ ownershipBlocked = windowsPartAHolds(record) || ownershipBlocked; // #7771: no POST and no shared teardown.
1228
1232
  } catch (err) {
1229
1233
  record.service = "error";
1230
- if (isServiceOwnershipError(err)) {
1234
+ if (isServiceOwnershipError(err) || windowsChildStopHeld()) {
1231
1235
  ownershipBlocked = true;
1232
1236
  stopFailed = true;
1233
- console.error(`❌ ${err.message}`);
1237
+ console.error(`❌ ${err instanceof Error ? err.message : String(err)}`);
1234
1238
  console.error(" Skipping shared teardown (native Codex restore, Grok config): the installed service is still running.");
1235
1239
  } else {
1236
1240
  console.error(`⚠️ Service manager stop failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -1239,7 +1243,7 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1239
1243
 
1240
1244
  if (snapshot) {
1241
1245
  if (guardedStep?.effect === "approval-changed") {
1242
- return approvalChanged(guardedStep.detail);
1246
+ return approvalChanged(guardedStep.detail, guardedStep.stopReason);
1243
1247
  }
1244
1248
  if (guardedStep?.effect === "manager-still-active") {
1245
1249
  return managerStillActive(record.service, record);
@@ -1255,7 +1259,7 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1255
1259
  record.proxy = "unknown";
1256
1260
  console.error("The approved runtime could not be verified after the guarded stop step.");
1257
1261
  }
1258
- } else {
1262
+ } else if (windowsChildStopHeld()) { /* #7771: Part A did not prove the manager stopped, so no POST. */ } else {
1259
1263
  const pid = readPid();
1260
1264
  if (pid) {
1261
1265
  try {
@@ -1263,8 +1267,8 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1263
1267
  // the proxy's shutdown handlers actually run; taskkill /F is the fallback inside.
1264
1268
  // Shared teardown is deferred to this process: it happens after the respawn
1265
1269
  // verification below, so a survivor does not get its client config pulled first.
1266
- // The receipt goes down first — the proxy honours the deferral only when it can
1267
- // see one, so an unrecordable claim degrades to the child doing its own teardown.
1270
+ // The receipt goes down first; Windows refuses if it cannot be recorded.
1271
+ // Other platforms retain the existing undeferred fallback.
1268
1272
  nativeRestoreHandledByProxy = await stopWithDeferral(pid);
1269
1273
  console.log(`✅ Proxy (PID ${pid}) stopped.`);
1270
1274
  removePid(pid);
@@ -1296,7 +1300,7 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1296
1300
  const staleRuntimePid = readRuntimePort()?.pid ?? null;
1297
1301
  // Orphan recovery: a live proxy can outlive its pid file (crash, manual delete,
1298
1302
  // corrupt file). Identity-checked liveness still finds it via the runtime record.
1299
- const live = await findLiveProxy({ acceptPackageTreeFenced: true });
1303
+ const live = await findLiveProxy({ acceptPackageTreeFenced: true, ...orphanDiscoveryCap() });
1300
1304
  if (siblingStopFoundOwner(siblingOfPort, live)) {
1301
1305
  record.proxy = "not-running";
1302
1306
  console.log(`The sibling instance is already gone; the proxy on port ${siblingOfPort} was left running.`);
@@ -1357,21 +1361,13 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1357
1361
  // Environment ownership is independent from service ownership. Roll back current-home
1358
1362
  // variables (the helper refuses foreign markers on its own) unless a sibling never set them.
1359
1363
  if (!stoppingSibling) { try { revertSystemEnv(); } catch { /* best-effort */ } }
1360
- // A stopped Windows scheduler is not a proven-down proxy. `killWindowsSchedulerWrappers`
1361
- // is explicitly best-effort and the `:loop` wrapper respawns its child after ~5s, so an
1362
- // immediate probe can see a dead interval and an update can start replacing files right
1363
- // before the proxy comes back. Poll across the restart window before this stop is allowed
1364
- // to report anything but failure (#3008) — and ONLY for that backend, since making every
1365
- // launchd and systemd stop wait seven seconds would be a regression in ordinary use.
1364
+ // A stopped Windows service is not a proven-down proxy: the `:loop` wrapper relaunches its
1365
+ // child about 5 s later, so an immediate probe can see a dead interval (#764, #3008). On
1366
+ // Windows Part B of the checked stop (#7771) holds the port free across that window and
1367
+ // re-enumerates the wrappers; only then may the stop report anything but failure. launchd
1368
+ // and systemd are down when they say so and pay no wait.
1366
1369
  if (schedulerCanRespawn && !ownershipBlocked) {
1367
- const survivor = await proxyStillLiveAfterStop({ canRespawn: true });
1368
- if (survivor) {
1369
- stopFailed = true;
1370
- record.proxy = "respawned";
1371
- console.error(`❌ A proxy is still listening on port ${survivor.port} after the service stop; it is being respawned.`);
1372
- console.error(" Skipping shared teardown: restoring client config while the proxy runs leaves both pointing at each other.");
1373
- ownershipBlocked = true;
1374
- }
1370
+ if (await stopWindowFailed(record)) { stopFailed = true; ownershipBlocked = true; }
1375
1371
  }
1376
1372
  // Recovering somebody else's abandoned obligation is not the same act as finishing this
1377
1373
  // run's own. This run stopped a proxy and verified the result; the inherited case has no
@@ -1523,7 +1519,7 @@ async function handleStopUnlocked(snapshot?: GuardedStopSnapshot) {
1523
1519
  };
1524
1520
  const summary = summarizeStopRun(record, signals);
1525
1521
  if (snapshot && !stopFailed) {
1526
- return guardFinalStopSummary(record, () => observeGuardedManagerStopped(snapshot.manager),
1522
+ return guardFinalStopSummary(record, () => observeGuardedStopped(snapshot.manager),
1527
1523
  () => ({ ok: !stopFailed, summary }));
1528
1524
  }
1529
1525
  return { ok: !stopFailed, summary };
@@ -1533,17 +1529,8 @@ async function handleUninstall() {
1533
1529
  // Before every teardown step: an elevated run must not act on a home another account can change.
1534
1530
  const privilegeRefusal = uninstallPrivilegeRefusal(getConfigDir());
1535
1531
  if (privilegeRefusal) { console.error(`❌ ${privilegeRefusal}`); process.exit(1); }
1536
- /** Definitive "nothing is answering" on the endpoint this home would serve. */
1537
- const proxyEndpointProvenDown = async (): Promise<boolean> => {
1538
- try {
1539
- // Every candidate, not just the preferred one: a stale runtime record pointing at a
1540
- // closed port would otherwise "prove" a live proxy on the configured port is gone.
1541
- const endpoints = endpointsToProve(readRuntimePort(), loadConfig());
1542
- return await everyEndpointProvenDownAsync(endpoints, probeEndpointLiveness);
1543
- } catch {
1544
- return false;
1545
- }
1546
- };
1532
+ /** Definitive "nothing is answering" on every endpoint this home could serve, captured before the stop. */
1533
+ const proxyEndpointProvenDown = captureUninstallEndpointProof(() => endpointsToProve(readRuntimePort(), loadConfig()), probeEndpointLiveness);
1547
1534
  const failures: string[] = [];
1548
1535
 
1549
1536
  const runStep = async (label: string, step: () => void | boolean | Promise<void | boolean>) => {
@@ -1569,8 +1556,11 @@ async function handleUninstall() {
1569
1556
  serviceRemoval: null,
1570
1557
  respawnWindowVerified: false,
1571
1558
  };
1572
- await runStep("service stopped", () => {
1573
- const outcome = stopServiceIfInstalledDetailed();
1559
+ // The receipt an uninstall's Windows proxy stop claimed; discharged only after Part B
1560
+ // and the shared restore succeeded, kept for recovery otherwise (#7771, #3008).
1561
+ let uninstallStopNonce: string | undefined;
1562
+ await runStep("service stopped", async () => {
1563
+ const outcome = await stopServiceForUninstall();
1574
1564
  observed.serviceStop = outcome;
1575
1565
  if (outcome === "absent") return false;
1576
1566
  if (outcome === "failed") {
@@ -1583,39 +1573,35 @@ async function handleUninstall() {
1583
1573
  });
1584
1574
 
1585
1575
  await runStep("proxy stopped", async () => {
1586
- const pid = readPid();
1587
- if (!pid) {
1588
- // A missing pid file is not proof that nothing is serving: a proxy can outlive its
1589
- // record (crash, manual delete, corrupt file), which is exactly why `ocx stop` falls
1590
- // back to identity-checked discovery. Without this, uninstall restored shared config
1591
- // and reported success while that proxy kept running (#3008).
1592
- const live = await findLiveProxy();
1593
- if (!live) {
1594
- // A miss is not proof: `findLiveProxy` collapses a timeout and a transport failure
1595
- // into the same null as a dead endpoint. Ask the tri-state probe, which only says
1596
- // "dead" for a refused connection or a definitive non-OpenCodex answer (#3008).
1597
- observed.proxyProvenDown = await proxyEndpointProvenDown();
1598
- if (!observed.proxyProvenDown) {
1599
- throw new Error("no proxy could be found, but its endpoint could not be confirmed down either; confirm nothing is serving, then rerun");
1600
- }
1601
- return false;
1602
- }
1603
- if (!live.pid) {
1604
- throw new Error(`a proxy is answering on port ${live.port} but no process id could be resolved for it; stop it from the home that started it, then rerun`);
1605
- }
1606
- await stopProxy(live.pid);
1607
- observed.proxyProvenDown = true;
1608
- return true;
1609
- }
1610
- await stopProxy(pid);
1611
- removePid(pid);
1612
- removeRuntimePort(pid);
1613
- observed.proxyProvenDown = true;
1614
- return true;
1576
+ // #7771 / #3008: on Windows this claims the teardown receipt before the child stop and
1577
+ // forbids the forced fallback when Part A did not prove the manager stopped, so shared
1578
+ // client config is never restored under a wrapper that can relaunch the proxy.
1579
+ const result = await stopUninstallProxy({
1580
+ platform: process.platform,
1581
+ serviceStop: observed.serviceStop,
1582
+ readPid,
1583
+ findLiveProxy,
1584
+ endpointProvenDown: proxyEndpointProvenDown,
1585
+ partARecord: windowsPartAReceiptRecord,
1586
+ stop: (target, io) => stopProxy(target, io),
1587
+ removeTracked: pid => {
1588
+ removePid(pid);
1589
+ removeRuntimePort(pid);
1590
+ },
1591
+ portWaitOwned: windowsPartBOwnsPortWait,
1592
+ });
1593
+ uninstallStopNonce = result.nonce;
1594
+ observed.proxyProvenDown = result.provenDown;
1595
+ return result.changed;
1615
1596
  });
1616
1597
 
1617
1598
  await runStep("service removed", () => {
1618
- const outcome = uninstallServiceDetailed();
1599
+ // Windows only: a Part A that failed (or could not read the state, or left a wrapper
1600
+ // that can still respawn) leaves a manager this uninstall cannot account for. Deleting
1601
+ // its registration would remove the evidence without stopping the wrapper, and
1602
+ // `ocx service uninstall` refuses in the same states. The failure stays recorded so the
1603
+ // shared teardown below stays blocked.
1604
+ const outcome = uninstallServiceRemoval(observed, uninstallServiceDetailed);
1619
1605
  observed.serviceRemoval = outcome;
1620
1606
  // "absent" and "removed" are both fine; a failure is not, and it used to look like
1621
1607
  // absence on darwin and linux.
@@ -1626,10 +1612,9 @@ async function handleUninstall() {
1626
1612
  // Only Task Scheduler can respawn through a surviving wrapper, and removing the
1627
1613
  // registration does not prove the running one died. Poll the same window `ocx stop` does
1628
1614
  // before shared config is allowed down (#764, #3008).
1629
- if (observed.serviceStop === "stopped-respawnable") {
1615
+ if (respawnWindowRequired(observed)) {
1630
1616
  await runStep("respawn window verified", async () => {
1631
- const survivor = await proxyStillLiveAfterStop({ canRespawn: true });
1632
- if (survivor) throw new Error(`a proxy is still listening on port ${survivor.port} after the service was removed; it is being respawned`);
1617
+ await verifyUninstallStopWindow(); // Windows: Part B (#7771); otherwise the legacy re-poll.
1633
1618
  // A null from that poll is not proof either: its identity probe returns null on a
1634
1619
  // timeout, so a respawned-but-unresponsive proxy looks the same as none. Require the
1635
1620
  // tri-state probe to say dead on every candidate before calling the window verified.
@@ -1674,6 +1659,12 @@ async function handleUninstall() {
1674
1659
  console.error(" 'ocx restore' is an interim step if you need native routing back before then.");
1675
1660
  }
1676
1661
 
1662
+ // The obligation the proxy stop deferred is discharged only now: Part B and the shared
1663
+ // restore both succeeded. Otherwise the receipt stays for the next stop to finish.
1664
+ if (uninstallStopNonce && failures.length === 0) {
1665
+ completeWindowsServiceStopReceipt(uninstallStopNonce);
1666
+ }
1667
+
1677
1668
  await runStep("system env vars reverted", () => {
1678
1669
  const r = revertSystemEnv();
1679
1670
  if (!r.reverted && r.reason !== "no tracking file" && r.reason !== "not macOS") throw new Error(r.reason ?? "revert failed");
@@ -1979,7 +1970,7 @@ process.exit(await dispatchCommand(head, {
1979
1970
  detached: true,
1980
1971
  stdio: "ignore",
1981
1972
  windowsHide: true,
1982
- env: withProcessRuntimeProvenance(withoutSiblingMarker(process.env)),
1973
+ env: withProcessRuntimeProvenance(withoutSupervisorMarkers(withoutSiblingMarker(process.env))),
1983
1974
  });
1984
1975
  child.unref();
1985
1976
  },
@@ -109,8 +109,17 @@ async function nativeIntegration(argv: string[], deps: RuntimeApiDeps): Promise<
109
109
  throw new CliUsageError(`expected on or off after ${action}`, USAGE);
110
110
  }
111
111
 
112
- // Toggling rewrites the client's own config file, which is why each client has its own route
113
- // rather than one route with a client parameter.
112
+ // A native switch is a Home-only decision. The native route (/api/native-integrations/<client>)
113
+ // writes the Home's switch, records no Home route intent, and runs the client's own transition
114
+ // (Claude Desktop first-party included); Children keep inheriting their saved default. A Child
115
+ // refuses here with the Home command for its own device.
116
+ const { readLinkChildContext } = await import("./link-child");
117
+ const routeDeps = deps as import("./route-to").RouteToDeps;
118
+ if ((routeDeps.readChildContext ?? readLinkChildContext)()) {
119
+ const { routeToAction } = await import("./route-to");
120
+ await routeToAction([action, state, ...(wantsJson ? ["--json"] : [])], routeDeps);
121
+ return;
122
+ }
114
123
  const result = await runtimeRequest(`/api/native-integrations/${action}`, {
115
124
  method: "PUT",
116
125
  headers: { "content-type": "application/json" },
@@ -15,6 +15,7 @@ import {
15
15
  import { clientIntegrationPath, validateAsideProfile } from "./integration-input";
16
16
  import { asideProfileRecoveryLines } from "./aside-profile-recovery";
17
17
  import type { IntegrationClientId } from "../integrations/registry";
18
+ import type { RouteToDeps } from "./route-to";
18
19
 
19
20
  const CLAUDE_USAGE = `Usage:
20
21
  ocx claude config [status] [--json]
@@ -240,10 +241,31 @@ export async function handleClientIntegrationCommand(
240
241
  const { handleIntegrationAsideSync } = await import("./integration-aside-sync");
241
242
  return handleIntegrationAsideSync(argv.slice(1), deps);
242
243
  }
244
+ // Enable and disable are the Home's own decision, like the dashboard toggle: the server records
245
+ // it so ocx sync keeps it, and linked Children keep their defaults (ocx route to <client> on|off
246
+ // changes those). On a Child the Home decides, so a plain toggle goes to route-to, which refuses
247
+ // and prints the Home command.
248
+ const toggle = ["enable", "disable"].includes(argv[0] ?? "");
249
+ if (toggle && !argv.some(arg => ["--profile", "--preview", "--plan-fingerprint", "--reasoning-default", "--clear-reasoning-defaults"]
250
+ .some(flag => arg === flag || arg.startsWith(`${flag}=`)))) {
251
+ const { readLinkChildContext } = await import("./link-child");
252
+ if (((deps as RouteToDeps).readChildContext ?? readLinkChildContext)()) {
253
+ return runCliAction(async () => {
254
+ const { integrationOption } = await import("./integration-input");
255
+ const { routeToAction } = await import("./route-to");
256
+ const args = argv.slice(1);
257
+ const client = integrationOption(args, "--client");
258
+ if (!client) throw new CliUsageError("--client <id> is required", CLIENT_USAGE);
259
+ await routeToAction([client, argv[0] === "enable" ? "on" : "off", ...args], deps);
260
+ });
261
+ }
262
+ }
243
263
  if (argv[0] === "preview" || argv.some(arg => ["--preview", "--plan-fingerprint", "--reasoning-default", "--clear-reasoning-defaults", "--model-names"]
244
264
  .some(flag => arg === flag || arg.startsWith(`${flag}=`)))) {
245
265
  const { handleIntegrationPreviewCommand } = await import("./integration-preview");
246
- return handleIntegrationPreviewCommand(argv, deps, expectedClientId);
266
+ const code = await handleIntegrationPreviewCommand(argv, deps, expectedClientId);
267
+ if (code === 0 && toggle) console.error(HOME_ONLY_NOTE);
268
+ return code;
247
269
  }
248
270
  return runCliAction(async () => {
249
271
  const args = [...argv];
@@ -357,9 +379,12 @@ export async function handleClientIntegrationCommand(
357
379
  ? batch.results.map(row => `aside:${String(row.profileId)} ${String(row.message ?? (row.ok ? "updated" : "refused"))}${row.residual === true ? " Recovery did not finish." : ""}${typeof row.snapshotPath === "string" ? ` Backup: ${row.snapshotPath}` : ""}`)
358
380
  : [String(batch.message ?? `${client} ${action}d.`)]);
359
381
  if (batch.ok === false) throw new RuntimeApiError(batch.message ?? "Some Aside profiles could not be updated", 207, result);
382
+ console.error(HOME_ONLY_NOTE);
360
383
  });
361
384
  }
362
385
 
386
+ const HOME_ONLY_NOTE = "This changed this machine only; linked Children keep their route defaults (ocx route to <client> on|off changes those).";
387
+
363
388
  export const INTEGRATION_USAGE = { claude: CLAUDE_USAGE, grok: GROK_USAGE, client: CLIENT_USAGE };
364
389
 
365
390
  const ZCODE_USAGE = `Usage:
@@ -0,0 +1,64 @@
1
+ import { getConfigDir } from "../config/paths";
2
+ import { linkDir } from "../link/paths";
3
+ import {
4
+ readSshCaptureStatus, SSH_CAPTURE_DEFAULT_MINUTES, SSH_CAPTURE_MAX_MINUTES, startSshCapture, stopSshCapture,
5
+ type SshCaptureStatus,
6
+ } from "../link/ssh-capture";
7
+ import { CliUsageError, printData, rejectArgs, takeIntegerOption, takeJsonFlag } from "./runtime-api";
8
+
9
+ export const LINK_CAPTURE_USAGE = [
10
+ "ocx link capture start [--minutes <1-" + SSH_CAPTURE_MAX_MINUTES + ">] [--json]",
11
+ "ocx link capture stop [--json]",
12
+ "ocx link capture status [--json]",
13
+ ];
14
+
15
+ export interface LinkCaptureDeps {
16
+ /** Test seam: the link directory whose ssh-capture/ the command manages. */
17
+ captureLinkDir?: string;
18
+ /** Test seam: the clock the capture window and retention read. */
19
+ captureNow?: () => number;
20
+ }
21
+
22
+ function statusLines(status: SshCaptureStatus, verb: "start" | "stop" | "status"): string[] {
23
+ const lines = [status.enabled
24
+ ? "SSH capture: on until " + status.expiresAt + " (the next tunnel attempt runs ssh with LogLevel=DEBUG1)"
25
+ : "SSH capture: off (the next tunnel attempt runs ssh with LogLevel=ERROR)"];
26
+ if (verb === "start") {
27
+ lines.push("A tunnel that is already connected keeps its log level until it reconnects. On the Home,",
28
+ "ocx link reconnect --link-id <id> starts a new attempt now.");
29
+ }
30
+ lines.push("Directory: " + status.directory);
31
+ if (status.removed > 0) lines.push("Deleted " + status.removed + " capture file(s) past retention or beyond the file limit.");
32
+ if (status.files.length === 0) lines.push("No capture files.");
33
+ else {
34
+ lines.push("Capture files (deleted " + status.retentionHours + " h after their last write):");
35
+ for (const file of status.files) {
36
+ lines.push(" " + file.name + " " + file.bytes + " bytes last write " + file.lastWriteAt + " deleted after " + file.deleteAfter);
37
+ }
38
+ }
39
+ return lines;
40
+ }
41
+
42
+ /** ocx link capture: a local file operation on this machine; it needs no running proxy and no token. */
43
+ export async function runLinkCapture(args: string[], deps: LinkCaptureDeps, usage: string): Promise<void> {
44
+ const verb = args.shift();
45
+ const json = takeJsonFlag(args);
46
+ const directory = deps.captureLinkDir ?? linkDir(getConfigDir());
47
+ const now = (deps.captureNow ?? Date.now)();
48
+ let status: SshCaptureStatus;
49
+ if (verb === "start") {
50
+ const minutes = takeIntegerOption(args, "--minutes", { min: 1, max: SSH_CAPTURE_MAX_MINUTES }) ?? SSH_CAPTURE_DEFAULT_MINUTES;
51
+ rejectArgs(args, usage);
52
+ status = startSshCapture({ linkDirectory: directory, now, minutes });
53
+ } else if (verb === "stop") {
54
+ rejectArgs(args, usage);
55
+ status = stopSshCapture(directory, now);
56
+ } else if (verb === "status") {
57
+ rejectArgs(args, usage);
58
+ status = readSshCaptureStatus(directory, now);
59
+ } else {
60
+ throw new CliUsageError("link capture requires one of: start, stop, status", usage);
61
+ }
62
+ printData(status, json, statusLines(status, verb));
63
+ }
64
+