@bitkyc08/opencodex 2.100.2 → 2.100.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -0,0 +1,304 @@
1
+ /**
2
+ * ocx stop's side of the checked Windows service stop (#7771, 030 "Two parts").
3
+ *
4
+ * handleStopUnlocked in src/cli/index.ts keeps its structure; the Windows-specific
5
+ * decisions live here so that file does not grow:
6
+ *
7
+ * - snapshotless: Part A runs as the service stop, with admission against the stop
8
+ * deadline. A result other than stopped/absent holds the child stop (no POST), and a
9
+ * stopped result makes Part B replace the old respawn re-poll;
10
+ * - guarded: the manager inspection reads the evidence snapshot (windowsProcessSnapshot,
11
+ * native creation times on x64) once per inspection, and Part A binds against the
12
+ * revalidation's snapshot; Part B runs after settle on the approved endpoint, and its
13
+ * final enumeration is the one the manager-state checks share;
14
+ * - the teardown receipt carries the Part A record, so /api/stop skips a second Part A.
15
+ *
16
+ * Off Windows every function keeps today's behavior and timing.
17
+ */
18
+ import { recordPendingTeardownPartA, type PendingTeardownPartA } from "../config/pending-teardown";
19
+ import { readPid } from "../config/process-state";
20
+ import { observeGuardedManagerStopped, inspectGuardedManagerTarget, type GuardedManagerTarget } from "../service/guarded-manager-target";
21
+ // Through the barrel, like every other stop-path call, so the parent-stop fixtures can see it.
22
+ import { proxyStillLiveAfterStop, stopServiceIfInstalledDetailed, stopServiceIfInstalledReport } from "../service";
23
+ import type { ServiceStopOutcome } from "../service/orchestration";
24
+ import type { WindowsCheckedStopResult } from "../service/windows-checked-stop";
25
+ import { readScheduleServicePid, windowsProcessSnapshot, type WindowsStopProcessEntry } from "../service/windows-process-evidence";
26
+ import {
27
+ confirmWindowsServiceStop,
28
+ describeWindowsPartA,
29
+ describeWindowsPartB,
30
+ windowsPartARecord,
31
+ windowsServiceStopHooks,
32
+ windowsServiceStopPort,
33
+ windowsStopAdmission,
34
+ windowsStopReason,
35
+ windowsStopRemainingMs,
36
+ } from "../service/windows-service-stop";
37
+ import { WINDOWS_STOP_CAPS } from "../service/windows-stop-budget";
38
+ import type { StopRunRecord } from "./stop-report";
39
+
40
+ const EVIDENCE_SNAPSHOT_TIMEOUT_MS = 5_000;
41
+ const SCHEDULE_PID_TIMEOUT_MS = 2_000;
42
+ const ORPHAN_DISCOVERY_CAP_MS = WINDOWS_STOP_CAPS.orphanDiscovery;
43
+
44
+ interface WindowsStopState {
45
+ platform: NodeJS.Platform;
46
+ result: WindowsCheckedStopResult | null;
47
+ snapshotless: boolean;
48
+ port: number | null;
49
+ /** The evidence the last guarded inspection read; the bind reuses it. */
50
+ evidence: { snapshot: readonly WindowsStopProcessEntry[] | null; schedulePid: number | null } | null;
51
+ /** Part B's final enumeration, which the guarded manager-state checks share. */
52
+ partBSnapshot: readonly WindowsStopProcessEntry[] | null;
53
+ }
54
+
55
+ const state: WindowsStopState = {
56
+ platform: process.platform, result: null, snapshotless: false, port: null, evidence: null, partBSnapshot: null,
57
+ };
58
+
59
+ /** Test-only: simulate the platform the stop wiring acts for, and start from a clean run. */
60
+ export function resetOcxWindowsStopForTests(platform: NodeJS.Platform | null = null): void {
61
+ state.platform = platform ?? process.platform;
62
+ state.result = null;
63
+ state.snapshotless = false;
64
+ state.port = null;
65
+ state.evidence = null;
66
+ state.partBSnapshot = null;
67
+ }
68
+
69
+ function windows(): boolean {
70
+ return state.platform === "win32";
71
+ }
72
+
73
+ export function windowsStopRequiresReceipt(): boolean {
74
+ return windows();
75
+ }
76
+
77
+ function begin(snapshotless: boolean): void {
78
+ state.result = null;
79
+ state.snapshotless = snapshotless;
80
+ state.port = null;
81
+ state.partBSnapshot = null;
82
+ }
83
+
84
+ function annotate(nonce: string | undefined): void {
85
+ const record = state.result ? windowsPartARecord(state.result) : null;
86
+ if (!nonce || !record) return;
87
+ try {
88
+ recordPendingTeardownPartA(nonce, record);
89
+ } catch {
90
+ // Without the record the route runs its own capped Part A, which is today's behavior.
91
+ }
92
+ }
93
+
94
+ /** A stop that never reaches the service manager (a sibling, an already-stopped client). */
95
+ export function noServiceStop(): ServiceStopOutcome {
96
+ begin(false);
97
+ return "absent";
98
+ }
99
+
100
+ /** The snapshotless service stop: Part A on Windows, today's manager stop elsewhere. */
101
+ export async function stopServiceForOcxStop(io: {
102
+ receiptNonce: () => string | undefined;
103
+ inheritedReceipts: number;
104
+ }): Promise<ServiceStopOutcome> {
105
+ begin(true);
106
+ if (!windows()) return stopServiceIfInstalledDetailed();
107
+ state.port = windowsServiceStopPort();
108
+ const report = await stopServiceIfInstalledReport({
109
+ admission: windowsStopAdmission({ orphanDiscovery: readPid() === null, inheritedReceipts: io.inheritedReceipts }),
110
+ }, state.platform);
111
+ state.result = report.windows;
112
+ annotate(io.receiptNonce());
113
+ return report.outcome;
114
+ }
115
+
116
+ /** The record a receipt claimed after Part A carries (null before Part A or off Windows). */
117
+ export function windowsPartAReceiptRecord(): PendingTeardownPartA | null {
118
+ return state.result ? windowsPartARecord(state.result) : null;
119
+ }
120
+
121
+ /** Part A held the child stop; handleStopUnlocked skips the POST branch entirely. */
122
+ export function windowsChildStopHeld(): boolean {
123
+ const outcome = state.result?.outcome;
124
+ return windows() && state.snapshotless && outcome !== "stopped" && outcome !== "absent";
125
+ }
126
+
127
+ /** ocx uninstall's service stop: Part A on Windows (60 s deadline), today's stop elsewhere. */
128
+ export async function stopServiceForUninstall(): Promise<ServiceStopOutcome> {
129
+ begin(true);
130
+ if (!windows()) return stopServiceIfInstalledDetailed();
131
+ state.port = windowsServiceStopPort();
132
+ const report = await stopServiceIfInstalledReport({
133
+ admission: windowsStopAdmission({ orphanDiscovery: readPid() === null }),
134
+ }, state.platform);
135
+ state.result = report.windows;
136
+ return report.outcome;
137
+ }
138
+
139
+ /**
140
+ * ocx uninstall's restart-window check after the service was removed: Part B on Windows
141
+ * after a Part A stopped, the legacy re-poll otherwise. Throws when the window fails; a
142
+ * port held by another program does not stop an uninstall.
143
+ */
144
+ export async function verifyUninstallStopWindow(): Promise<void> {
145
+ if (!windowsPartBDue()) {
146
+ const survivor = await proxyStillLiveAfterStop({ canRespawn: true });
147
+ if (survivor) throw new Error(`a proxy is still listening on port ${survivor.port} after the service was removed; it is being respawned`);
148
+ return;
149
+ }
150
+ const result = await confirmWindowsServiceStop({ port: state.port ?? windowsServiceStopPort(), remainingMs: windowsStopRemainingMs() });
151
+ if (result.outcome === "freed") return;
152
+ if (result.outcome === "port-held-by-foreign") {
153
+ console.warn("⚠️ " + describeWindowsPartB(result));
154
+ return;
155
+ }
156
+ throw new Error(describeWindowsPartB(result));
157
+ }
158
+
159
+ /** Snapshotless Windows only: Part A stopped, so Part B confirms the port afterwards. */
160
+ export function windowsPartBDue(): boolean {
161
+ return windows() && state.snapshotless && state.result?.outcome === "stopped";
162
+ }
163
+
164
+ /**
165
+ * Part B owns the port wait after a stopped Part A on BOTH Windows paths (#7771).
166
+ *
167
+ * `windowsPartBDue` stays snapshotless-only because it also gates the legacy respawn
168
+ * re-poll (`schedulerCanRespawn`). This predicate is only about the port wait: on the
169
+ * guarded path Part B runs after `settle`, so `stopProxy`'s legacy 15 s
170
+ * `waitForStoppedPort` must not run on top of it.
171
+ */
172
+ export function windowsPartBOwnsPortWait(): boolean {
173
+ return windows() && state.result?.outcome === "stopped";
174
+ }
175
+
176
+ /**
177
+ * A Part A result other than stopped/absent holds the child stop (030 "Two parts"): no
178
+ * POST, the shared teardown skipped, proxy unknown. Records the additive reason.
179
+ */
180
+ export function windowsPartAHolds(record: StopRunRecord): boolean {
181
+ const result = state.result;
182
+ if (!windows() || !result || result.outcome === "stopped" || result.outcome === "absent") return false;
183
+ const reason = windowsStopReason(result);
184
+ if (reason) record.serviceStopReason = reason;
185
+ console.error(" " + describeWindowsPartA(result));
186
+ if (!state.snapshotless) return true;
187
+ record.proxy = "unknown";
188
+ console.error(" The proxy was left running and the shared teardown skipped: the service could relaunch it.");
189
+ return true;
190
+ }
191
+
192
+ /** Orphan discovery after a checked Windows stop is capped at 3 s (030 "Time budget"). */
193
+ export function orphanDiscoveryCap(): { deadlineAt?: number } {
194
+ return windowsPartBDue() ? { deadlineAt: Date.now() + ORPHAN_DISCOVERY_CAP_MS } : {};
195
+ }
196
+
197
+ /**
198
+ * After the child stop: true when the stop has to fail and hold the shared teardown.
199
+ * Windows runs Part B; a legacy respawnable stop keeps the old re-poll.
200
+ */
201
+ export async function stopWindowFailed(record: StopRunRecord): Promise<boolean> {
202
+ if (!windowsPartBDue()) {
203
+ const survivor = await proxyStillLiveAfterStop({ canRespawn: true });
204
+ if (!survivor) return false;
205
+ record.proxy = "respawned";
206
+ console.error("❌ A proxy is still listening on port " + survivor.port + " after the service stop; it is being respawned.");
207
+ console.error(" Skipping shared teardown: restoring client config while the proxy runs leaves both pointing at each other.");
208
+ return true;
209
+ }
210
+ const result = await confirmWindowsServiceStop({ port: state.port ?? windowsServiceStopPort(), remainingMs: windowsStopRemainingMs() });
211
+ record.portHeldByForeign = result.portHeldByForeign;
212
+ if (result.outcome === "freed") return false;
213
+ if (result.outcome === "port-held-by-foreign") {
214
+ console.warn("⚠️ " + describeWindowsPartB(result));
215
+ return false;
216
+ }
217
+ if (result.outcome === "survived") record.proxy = "respawned";
218
+ else {
219
+ record.proxy = "unknown";
220
+ record.serviceStopReason = "evidence-unreadable";
221
+ }
222
+ console.error("❌ " + describeWindowsPartB(result));
223
+ console.error(" Skipping shared teardown: restoring client config while the proxy runs leaves both pointing at each other.");
224
+ return true;
225
+ }
226
+
227
+ async function readEvidence(): Promise<NonNullable<WindowsStopState["evidence"]>> {
228
+ const hooks = windowsServiceStopHooks();
229
+ const [snapshot, schedulePid] = await Promise.all([
230
+ hooks?.snapshot ? hooks.snapshot() : windowsProcessSnapshot({ timeoutMs: EVIDENCE_SNAPSHOT_TIMEOUT_MS }),
231
+ hooks?.schedulePid ? hooks.schedulePid() : readScheduleServicePid({ timeoutMs: SCHEDULE_PID_TIMEOUT_MS }),
232
+ ]);
233
+ return { snapshot, schedulePid };
234
+ }
235
+
236
+ /**
237
+ * The guarded manager inspection. On Windows the process table is the evidence snapshot
238
+ * with creation times, read once here and kept: Part A binds against exactly this table.
239
+ */
240
+ export async function inspectGuardedTarget(
241
+ approvedPid: number,
242
+ approvedPort: number,
243
+ inspect: typeof inspectGuardedManagerTarget = inspectGuardedManagerTarget,
244
+ ): Promise<GuardedManagerTarget> {
245
+ if (!windows()) return inspect(approvedPid, approvedPort);
246
+ const evidence = await readEvidence();
247
+ state.evidence = evidence;
248
+ return inspect(approvedPid, approvedPort, {
249
+ win: {
250
+ winProcs: () => (evidence.snapshot ? [...evidence.snapshot] : null),
251
+ winSchedulePid: () => evidence.schedulePid,
252
+ },
253
+ });
254
+ }
255
+
256
+ /** The guarded stopManager: Part A on Windows, binding on the revalidation's snapshot. */
257
+ export async function stopGuardedManager(io: {
258
+ approvedPort: number;
259
+ receiptNonce: () => string | undefined;
260
+ inheritedReceipts: number;
261
+ }): Promise<ServiceStopOutcome> {
262
+ begin(false);
263
+ if (!windows()) return stopServiceIfInstalledDetailed();
264
+ state.port = io.approvedPort;
265
+ const report = await stopServiceIfInstalledReport({
266
+ admission: windowsStopAdmission({ orphanDiscovery: false, inheritedReceipts: io.inheritedReceipts }),
267
+ ...(state.evidence?.snapshot ? { bindSnapshot: state.evidence.snapshot } : {}),
268
+ }, state.platform);
269
+ state.result = report.windows;
270
+ annotate(io.receiptNonce());
271
+ return report.outcome;
272
+ }
273
+
274
+ /** The guarded Part B, after settle, on the approved endpoint. Off Windows: nothing to do. */
275
+ export async function confirmGuardedFreed(record: StopRunRecord): Promise<boolean> {
276
+ if (!windows() || state.snapshotless || state.result?.outcome !== "stopped" || state.port === null) return true;
277
+ const result = await confirmWindowsServiceStop({
278
+ port: state.port,
279
+ remainingMs: windowsStopRemainingMs(),
280
+ snapshot: async timeoutMs => {
281
+ const snapshot = await windowsProcessSnapshot({ timeoutMs });
282
+ state.partBSnapshot = snapshot;
283
+ return snapshot;
284
+ },
285
+ });
286
+ record.portHeldByForeign = result.portHeldByForeign;
287
+ if (result.outcome === "freed") return true;
288
+ if (result.outcome === "port-held-by-foreign") {
289
+ console.warn("⚠️ " + describeWindowsPartB(result));
290
+ return true;
291
+ }
292
+ if (result.outcome !== "survived") record.serviceStopReason = "evidence-unreadable";
293
+ console.error("❌ " + describeWindowsPartB(result));
294
+ return false;
295
+ }
296
+
297
+ /** The guarded manager-state checks; on Windows they share Part B's final enumeration. */
298
+ export function observeGuardedStopped(
299
+ manager: Exclude<GuardedManagerTarget, { kind: "unknown" }>,
300
+ observe: typeof observeGuardedManagerStopped = observeGuardedManagerStopped,
301
+ ): ReturnType<typeof observeGuardedManagerStopped> {
302
+ const snapshot = windows() ? state.partBSnapshot : null;
303
+ return snapshot ? observe(manager, { win: { winProcs: () => [...snapshot] } }) : observe(manager);
304
+ }
@@ -10,13 +10,23 @@ import { readLinkStore } from "../link/store";
10
10
  import { linkKnownHostsPath, linkStorePath } from "../link/paths";
11
11
  import { buildExecArgv, remotePinnedSyncArgv } from "../link/ssh-argv";
12
12
  import { requireRemotePlatformFramed } from "../link/remote-platform";
13
+ import { pinnedSyncRanNothing, syncThenRestart, type PinnedRun } from "../link/sync-then-restart";
14
+ import type { ChildRestart } from "../link/child-ops-types";
13
15
  import { FanoutProcessError, fanoutSshRunner, runFanoutProcess } from "./sync-fanout-process";
14
16
  import { readHomeLinkStatus } from "./sync-link-status";
15
- import { classifySyncResult, fanoutExitCode, renderFanoutHuman, renderFanoutJson, runHomeFanout, REMOTE_LINK_SYNC_MESSAGE, STALE_REMOTE_CATALOG_MESSAGE, type HomeResult } from "./sync-fanout";
17
+ import { classifySyncResult, fanoutExitCode, renderFanoutHuman, renderFanoutJson, restartNote, runHomeFanout, REMOTE_LINK_SYNC_MESSAGE, STALE_REMOTE_CATALOG_MESSAGE, type ChildResult, type HomeResult } from "./sync-fanout";
16
18
 
17
19
  export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
18
20
  const flags = parseSyncFanoutFlags(deps.args.slice(1));
19
21
  if (!flags.ok) { console.error(flags.message); return 2; }
22
+ if (flags.children) {
23
+ // D16: an unknown id is a usage error before the Home sync changes anything.
24
+ let known: Set<string>;
25
+ try { known = new Set(readLinkStore(linkStorePath()).links.map(link => link.id)); }
26
+ catch { console.error("--child cannot be checked: the Remote Link store could not be read."); return 2; }
27
+ const unknown = flags.children.find(id => !known.has(id));
28
+ if (unknown) { console.error(`--child ${unknown} is not a link on this Home (see ocx link status).`); return 2; }
29
+ }
20
30
  const originalLog = console.log;
21
31
  if (flags.json) console.log = (...args: unknown[]) => console.error(...args);
22
32
  let applicable = false, catalogCurrent = false;
@@ -50,7 +60,8 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
50
60
  if (expectation || clientState.kind === "connected") {
51
61
  try {
52
62
  const { syncConnectedClient } = await import("../client/connect");
53
- const result = await syncConnectedClient(expectation ? { restartCodex, expect: expectation } : { restartCodex });
63
+ const result = await syncConnectedClient({ restartCodex, ...(expectation ? { expect: expectation } : {}),
64
+ ...(syncArgs.includes("--overwrite-conflict") ? { overwriteConflict: true, ...(flags.overwriteClient ? { overwriteClient: flags.overwriteClient } : {}) } : {}) });
54
65
  if (expectation) {
55
66
  // The root preflight skipped the shim repair for a pinned sync; the identity held, so
56
67
  // run it now, as an unpinned sync would have.
@@ -75,13 +86,25 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
75
86
  for (const line of describeHomeCodexSettings(settings.document.settings)) console.log(` ${terminalSafeText(line)}`);
76
87
  }
77
88
  }
89
+ if (result.routeIntent) {
90
+ for (const row of result.routeIntent.outcomes) {
91
+ if (row.outcome === "current") continue;
92
+ console.error(`Route to ${row.client}: ${row.outcome}.`);
93
+ if (row.outcome !== "not_installed") process.exitCode = 1;
94
+ }
95
+ }
78
96
  await handleConnectedSyncCatalogWrite(result, restartScope);
79
97
  if (result.applyRecordFailed) {
80
98
  console.error("The Home's Codex settings were applied, but the apply record could not be written; the client runtime was not restarted. Run 'ocx sync' again.");
81
99
  process.exitCode = 1;
82
100
  }
101
+ if (result.journalHandoverFailed) {
102
+ console.error("Codex routing was applied, but the Codex journal could not be handed to this connection (the Codex config was busy or changed, or the journal belongs to an earlier connection), so the client runtime was not restarted: the next OpenCodex restart could restore native routing. Run 'ocx sync' again; if it repeats, run 'ocx sync --restart-codex' after that restart.");
103
+ process.exitCode = 1;
104
+ }
83
105
  // OCX-6: a link Child's runtime must have started after the apply it serves under.
84
- if (link && result.appliedRecord) {
106
+ // Not after a failed handover: that restart is the one that would undo this routing.
107
+ if (link && result.appliedRecord && !result.journalHandoverFailed) {
85
108
  const { applyRestartMessage, restartRuntimeAfterApply } = await import("./link-apply-restart");
86
109
  const { sameClientConnectionOwner } = await import("../client/state");
87
110
  const applied = result.connection;
@@ -172,10 +195,13 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
172
195
  },
173
196
  config,
174
197
  port: live.port,
175
- }, ["mcode", "pi", "raycast", "omo", "cline", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "hermes", "t3code"]));
198
+ }, ["mcode", "raycast", "omo", "cline", "commandcode", "droid", "opencode", "kilo", "qoder", "qoder-cn", "workbuddy", "workbuddy-ai", "hermes", "t3code"]));
176
199
  } catch (error) {
177
200
  console.warn(`Client integrations were not refreshed: ${error instanceof Error ? error.message : String(error)}`);
178
201
  }
202
+ // Pi's raw nested selectors are proven by the serving proxy, so its refresh runs there.
203
+ const { refreshPiThroughServer } = await import("./pi-sync");
204
+ results.push(...await refreshPiThroughServer({ findLiveProxy: async () => live }));
179
205
  }
180
206
  // Even without a live proxy, report why Aside could not sync. Its server
181
207
  // owner is never bypassed, and another client's failure cannot hide it.
@@ -191,6 +217,18 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
191
217
  else if (result.reason) console.warn(`${label} integration was not refreshed: ${result.reason}${result.residual ? " Recovery did not finish." : ""}${result.snapshotPath ? ` Backup: ${result.snapshotPath}` : ""}`);
192
218
  }
193
219
  }
220
+ if (synced.status !== "refused") {
221
+ const { homeRouteIntentInUse, readRouteIntentState } = await import("../routing/route-intent-state");
222
+ if (homeRouteIntentInUse(readRouteIntentState())) {
223
+ const { syncHomeRouteTo } = await import("../routing/route-to-local");
224
+ const { packageVersion } = await import("../lib/package-version");
225
+ const outcomes = await syncHomeRouteTo({ ...deps.loadConfig(), ...(live ? { port: live.port } : {}) }, packageVersion("0.0.0"), syncArgs.includes("--overwrite-conflict"), flags.overwriteClient,
226
+ undefined, { onAsideUnresolved: message => console.warn(message) });
227
+ for (const row of outcomes) {
228
+ if (row.outcome !== "current" && row.outcome !== "not_installed") { console.error(`${row.client}: ${row.outcome}`); code = 1; }
229
+ }
230
+ }
231
+ }
194
232
  return code || (typeof process.exitCode === "number" ? process.exitCode : 0);
195
233
  };
196
234
  let code: number;
@@ -206,24 +244,41 @@ export async function runSyncCommand(deps: CliDispatchDeps): Promise<number> {
206
244
  if (code !== 0) state = "failed";
207
245
  const document = await runHomeFanout({
208
246
  home: { state, exit: code }, catalogCurrent, localOnly: flags.localOnly, applicable,
247
+ selected: flags.children === null ? null : new Set(flags.children), restartChildren: flags.restartChildren,
209
248
  readStore: () => readLinkStore(linkStorePath()), readLinkStatus: () => readHomeLinkStatus(),
210
- runChild: async (link, deadline) => {
249
+ runChild: async (link, deadline, options) => {
211
250
  const runner = fanoutSshRunner(deadline);
212
251
  let platform: "posix" | "windows";
213
- try { platform = link.remotePlatform ?? await requireRemotePlatformFramed(runner, link.alias, linkKnownHostsPath()); }
252
+ try { platform = link.remotePlatform ?? await requireRemotePlatformFramed(runner, link.alias, link.explicitRoute ?? null, linkKnownHostsPath()); }
214
253
  catch (error) {
215
254
  if (error instanceof FanoutProcessError && (error.reason === "deadline-exceeded" || error.reason === "termination-unconfirmed")) return { state: "timed-out", reason: error.reason, exit: null };
216
255
  return { state: "failed", reason: "platform-probe-failed", exit: null };
217
256
  }
218
- try {
219
- const result = await runFanoutProcess(buildExecArgv({ alias: link.alias, knownHostsFile: linkKnownHostsPath(), argv: remotePinnedSyncArgv(link.id, platform) }), { timeoutMs: Math.max(0, deadline - Date.now()) });
220
- // Pick the public fields: a verdict key that ocx.sync.fanout/1 does not define never reaches the document.
221
- const { state, reason } = classifySyncResult(result);
222
- return { state, reason, exit: result.code };
223
- } catch (error) {
224
- if (error instanceof FanoutProcessError) return { state: error.reason === "deadline-exceeded" || error.reason === "termination-unconfirmed" ? "timed-out" : "failed", reason: error.reason, exit: null };
225
- throw error;
226
- }
257
+ type Run = { state: ChildResult["state"]; reason: string | null; exit: number | null; executable?: "ocx-child" };
258
+ // An ephemeral ocx-child gets the plain catalog sync: it never reads route intent, so it
259
+ // has nothing to overwrite and refuses the flags.
260
+ const overwrite = link.childKind !== "ephemeral" && deps.args.includes("--overwrite-conflict");
261
+ const overwriteOptions = overwrite ? { overwrite: true, ...(flags.overwriteClient ? { overwriteClient: flags.overwriteClient } : {}) } : {};
262
+ const runPinned = async (restart: ChildRestart): Promise<PinnedRun<Run>> => {
263
+ // Revision 6: with the shared deadline spent before the restarting sync, nothing is sent to the Child.
264
+ if (restart !== "none" && deadline - Date.now() <= 0) return { sync: { state: "timed-out", reason: "deadline-exceeded", exit: null }, notRun: true };
265
+ try {
266
+ const result = await runFanoutProcess(buildExecArgv({ alias: link.alias, knownHostsFile: linkKnownHostsPath(), route: link.explicitRoute ?? null,
267
+ argv: remotePinnedSyncArgv(link.id, platform, { ...(restart === "none" ? {} : { restart }), ...overwriteOptions }) }), { timeoutMs: Math.max(0, deadline - Date.now()) });
268
+ const verdict = classifySyncResult(result, { expectSelectedKind: restart !== "none" });
269
+ return { sync: { ...verdict, exit: result.code }, notRun: pinnedSyncRanNothing(verdict, result) };
270
+ } catch (error) {
271
+ if (!(error instanceof FanoutProcessError)) throw error;
272
+ const timedOut = error.reason === "deadline-exceeded" || error.reason === "termination-unconfirmed";
273
+ return { sync: { state: timedOut ? "timed-out" : "failed", reason: error.reason, exit: null }, notRun: error.reason === "ssh-spawn-failed" };
274
+ }
275
+ };
276
+ const done = await syncThenRestart({ requested: options.restart ?? "none", platform, childKind: link.childKind,
277
+ runPinned, readActivity: options.readActivity });
278
+ // Pick the public fields: executable, withheld and second never reach ocx.sync.fanout/1.
279
+ const note = restartNote(done);
280
+ return note === null ? { state: done.sync.state, reason: done.sync.reason, exit: done.sync.exit }
281
+ : { state: "synced", reason: note, exit: done.sync.exit };
227
282
  },
228
283
  });
229
284
  if (flags.json) originalLog(renderFanoutJson(document));
@@ -1,6 +1,9 @@
1
1
  import type { LinkRecord, LinkStore } from "../link/store";
2
+ import type { ChildRestartRequest } from "../link/ssh-argv";
3
+ import type { SyncThenRestart } from "../link/sync-then-restart";
2
4
  import type { LinkStatusPayload } from "./link";
3
5
  import { LinkStatusError } from "./sync-link-status";
6
+ import { childSkipHint } from "../link/sync-fanout-classify";
4
7
 
5
8
  export { classifySyncResult, classifyVersionProbe, parseOcxVersion, REMOTE_LINK_SYNC_MESSAGE,
6
9
  STALE_REMOTE_CATALOG_MESSAGE, type ChildVerdict } from "../link/sync-fanout-classify";
@@ -9,22 +12,19 @@ export const SYNC_FANOUT_PARTIAL_EXIT = 6;
9
12
  export type HomeResult = { state: "synced" | "stale" | "skipped" | "failed"; exit: number };
10
13
  export type ChildResult = { linkId: string; alias: string; state: "synced" | "skipped" | "failed" | "timed-out"; reason: string | null; exit: number | null; hint?: string };
11
14
  export type FanoutDocument = { schema: "ocx.sync.fanout/1"; home: HomeResult; fanout: { state: "ran" | "disabled" | "not-applicable" | "failed"; reason: string | null }; children: ChildResult[] };
12
-
13
- function childSkipHint(reason: string | null, alias: string): string {
14
- if (reason === "child-ocx-lacks-expect-link") return `Update OpenCodex on ${alias} to >= 2.93.0 using the installer that owns its selected ocx. For Desktop on headless Windows, use Check for Updates in the signed-in Desktop tray.`;
15
- if (reason === "child-updating") return "Wait for the Child update to finish, then retry sync.";
16
- if (reason === "child-link-mismatch:pending_operation" || reason === "child-link-mismatch:disconnect_pending") return "Wait for the Child's link operation to finish, then check its link and retry sync.";
17
- if (reason === "child-link-mismatch:disconnected" || reason === "child-link-mismatch:other_link") return "Please re-link this Child to this Home, then retry sync.";
18
- if (reason?.startsWith("child-link-mismatch")) return "Check the Child's Remote Link connection and re-link it to this Home if needed, then retry sync.";
19
- if (reason === "child-ocx-version-unknown") return "Check the Child's selected OpenCodex installation and version, then retry sync.";
20
- if (reason === "child-platform-unsupported") return "Check the Child's platform and Remote Link setup before retrying sync.";
21
- return "Check the Child's sync status and retry sync.";
22
- }
15
+ /** The reason on a synced row whose requested restart did not certainly happen (040 decision 1). Each one exits 6. */
16
+ export type RestartNote = "restart-skipped:link-active" | "restart-skipped:activity-unknown" | "restart-skipped:windows"
17
+ | "restart-unsupported:ocx-child" | "restart-not-run" | "restart-result-unknown";
18
+ /** readActivity: a fresh status read for this link; null when unknown (D5: unknown is never idle). */
19
+ export type ChildRunOptions = { restart?: ChildRestartRequest; readActivity: () => Promise<{ inFlight: number } | null> };
23
20
 
24
21
  export async function runHomeFanout(deps: {
25
22
  home: HomeResult; catalogCurrent: boolean; localOnly?: boolean; applicable?: boolean;
23
+ /** null or absent: every link. Otherwise only these ids run; the rest read skipped/not-selected. */
24
+ selected?: ReadonlySet<string> | null;
25
+ restartChildren?: ChildRestartRequest | null;
26
26
  readStore: () => LinkStore; readLinkStatus: () => Promise<LinkStatusPayload>;
27
- runChild: (link: LinkRecord, deadline: number) => Promise<Omit<ChildResult, "linkId" | "alias">>;
27
+ runChild: (link: LinkRecord, deadline: number, options: ChildRunOptions) => Promise<Omit<ChildResult, "linkId" | "alias">>;
28
28
  now?: () => number; deadlineMs?: number; concurrency?: number; terminationGraceMs?: number;
29
29
  }): Promise<FanoutDocument> {
30
30
  const result: FanoutDocument = { schema: "ocx.sync.fanout/1", home: deps.home, fanout: { state: deps.localOnly ? "disabled" : "not-applicable", reason: null }, children: [] };
@@ -34,17 +34,21 @@ export async function runHomeFanout(deps: {
34
34
  if (!store.links.length) return result;
35
35
  result.fanout.state = "ran";
36
36
  const classify = (link: LinkRecord, state: ChildResult["state"], reason: string | null, exit: number | null = null): ChildResult => ({ linkId: link.id, alias: link.alias, state, reason, exit });
37
- result.children = store.links.map(link => classify(link, "skipped", link.direction === "client-initiated" ? "client-initiated-link" : "home-catalog-not-current"));
37
+ // Revision 6: selection is applied first in every branch, so an unselected link always reads not-selected.
38
+ const unselected = (link: LinkRecord): boolean => deps.selected != null && !deps.selected.has(link.id);
39
+ const rowFor = (link: LinkRecord, state: ChildResult["state"], reason: string | null): ChildResult =>
40
+ unselected(link) ? classify(link, "skipped", "not-selected") : classify(link, state, reason);
41
+ result.children = store.links.map(link => rowFor(link, "skipped", link.direction === "client-initiated" ? "client-initiated-link" : "home-catalog-not-current"));
38
42
  const skipReason = deps.home.state === "failed" || deps.home.exit !== 0 ? "home-sync-failed" : deps.home.state === "skipped" ? "home-sync-skipped" : !deps.catalogCurrent ? "home-catalog-not-current" : null;
39
43
  if (skipReason) {
40
- result.children = store.links.map(link => classify(link, "skipped", link.direction === "client-initiated" ? "client-initiated-link" : skipReason));
44
+ result.children = store.links.map(link => rowFor(link, "skipped", link.direction === "client-initiated" ? "client-initiated-link" : skipReason));
41
45
  return result;
42
46
  }
43
47
  let status: LinkStatusPayload;
44
48
  try { status = await deps.readLinkStatus(); }
45
49
  catch (error) {
46
50
  const reason = error instanceof LinkStatusError ? error.reason : "home-link-status-unavailable";
47
- result.children = store.links.map(link => link.direction === "client-initiated" ? classify(link, "skipped", "client-initiated-link") : classify(link, reason === "home-runtime-not-running" ? "skipped" : "failed", reason));
51
+ result.children = store.links.map(link => link.direction === "client-initiated" ? rowFor(link, "skipped", "client-initiated-link") : rowFor(link, reason === "home-runtime-not-running" ? "skipped" : "failed", reason));
48
52
  return result;
49
53
  }
50
54
  let cursor = 0;
@@ -53,21 +57,35 @@ export async function runHomeFanout(deps: {
53
57
  const index = cursor++;
54
58
  const link = store.links[index];
55
59
  if (!link) return;
56
- if (link.direction === "client-initiated") continue;
60
+ if (unselected(link) || link.direction === "client-initiated") continue;
57
61
  const wire = status.links.find(row => row.id === link.id);
58
62
  if (!wire) { result.children[index] = classify(link, "skipped", "link-not-in-runtime"); continue; }
59
63
  if (wire.state !== "connected") { result.children[index] = classify(link, "skipped", `tunnel-${wire.state}`); continue; }
64
+ // A Child operation (wp2/wp3 job) holds this Child: an intentional skip, no hint, no exit 6.
65
+ if (wire.child?.activeJob) { result.children[index] = classify(link, "skipped", "child-busy"); continue; }
66
+ // Decision 3 / 4529522035: a fresh read per Child, never the first one; a failed read or a row without child is unknown.
67
+ let unknownCause: ActivityUnknownCause = "read-failed";
68
+ const readActivity = async (): Promise<{ inFlight: number } | null> => {
69
+ let fresh: LinkStatusPayload;
70
+ try { fresh = await deps.readLinkStatus(); } catch { unknownCause = "read-failed"; return null; }
71
+ const row = fresh.links.find(candidate => candidate.id === link.id);
72
+ if (!row) { unknownCause = "read-failed"; return null; }
73
+ if (!row.child) { unknownCause = "absent"; return null; }
74
+ return row.child.activity;
75
+ };
76
+ const options: ChildRunOptions = deps.restartChildren ? { restart: deps.restartChildren, readActivity } : { readActivity };
60
77
  let timer: ReturnType<typeof setTimeout> | undefined;
61
78
  try {
62
79
  const budget = deps.deadlineMs ?? 180_000;
63
80
  const child = await Promise.race([
64
- deps.runChild(link, (deps.now ?? Date.now)() + budget),
81
+ deps.runChild(link, (deps.now ?? Date.now)() + budget, options),
65
82
  new Promise<Omit<ChildResult, "linkId" | "alias">>(resolve => {
66
83
  timer = setTimeout(() => resolve({ state: "timed-out", reason: "termination-unconfirmed", exit: null }), budget + (deps.terminationGraceMs ?? 3000));
67
84
  }),
68
85
  ]);
69
86
  // Build the row from the schema's own fields, so an extra key on a runner's result never reaches ocx.sync.fanout/1.
70
- const hint = child.state === "skipped" ? childSkipHint(child.reason, link.alias) : child.hint;
87
+ const hint = child.state === "skipped" ? childSkipHint(child.reason, link.alias)
88
+ : child.state === "synced" && child.reason?.startsWith("restart-") ? childRestartHint(child.reason, link, deps.restartChildren ?? "app-server", unknownCause) : child.hint;
71
89
  result.children[index] = { linkId: link.id, alias: link.alias, state: child.state, reason: child.reason, exit: child.exit, ...(hint === undefined ? {} : { hint }) };
72
90
  } catch { result.children[index] = classify(link, "failed", "internal-error"); }
73
91
  finally { if (timer !== undefined) clearTimeout(timer); }
@@ -77,9 +95,46 @@ export async function runHomeFanout(deps: {
77
95
  return result;
78
96
  }
79
97
 
98
+ /** Maps the shared sequence's result to a synced row's reason; null keeps the row as the sync reported it. */
99
+ export function restartNote(done: SyncThenRestart<{ state: string; reason: string | null }>): RestartNote | null {
100
+ if (!done.restart) return null;
101
+ // Reached only after a successful plain sync; done.sync is then the restarting sync's verdict.
102
+ if (done.restartUnknown) return "restart-result-unknown";
103
+ // Any failed plain sync keeps its own row, including on Windows or ocx-child (those are checked first).
104
+ if (done.sync.state !== "synced") return null;
105
+ switch (done.withheld) {
106
+ case undefined: case "sync-failed": return null;
107
+ case "platform": return "restart-skipped:windows";
108
+ case "ocx-child": return "restart-unsupported:ocx-child";
109
+ case "activity-unknown": return "restart-skipped:activity-unknown";
110
+ case "link-active": return "restart-skipped:link-active";
111
+ case "second-not-run": return "restart-not-run";
112
+ }
113
+ }
114
+
115
+ type ActivityUnknownCause = "absent" | "read-failed";
116
+
117
+ function childRestartHint(reason: string, link: LinkRecord, restart: ChildRestartRequest, cause: ActivityUnknownCause): string | undefined {
118
+ const retry = `ocx sync --child ${link.id} --restart-children${restart === "codex" ? "=codex --yes" : ""}`;
119
+ switch (reason as RestartNote) {
120
+ case "restart-skipped:link-active": return `A model request was running on ${link.alias}; its Codex was not restarted. Retry when it is idle: ${retry}.`;
121
+ case "restart-skipped:activity-unknown": return cause === "absent"
122
+ ? `This Home's OpenCodex runtime did not report ${link.alias}'s activity; restart or update it, then retry ${retry}.`
123
+ : `The Home could not read ${link.alias}'s activity (the status read failed or timed out); retry ${retry}.`;
124
+ case "restart-skipped:windows": return "Codex restarts over SSH are not supported on Windows Children; restart Codex on that machine.";
125
+ case "restart-unsupported:ocx-child": return "ocx-child does not restart Codex; restart the Codex app or its app-servers on that machine.";
126
+ case "restart-not-run": return `The restart was not sent to ${link.alias}; check its sync status and retry ${retry}.`;
127
+ case "restart-result-unknown": return `The restart was sent to ${link.alias} but its result is unknown; check Codex on that machine.`;
128
+ default: return undefined;
129
+ }
130
+ }
131
+
80
132
  export function fanoutExitCode(document: FanoutDocument): number {
81
133
  if (document.home.exit !== 0) return document.home.exit;
82
- return document.fanout.state === "failed" || document.children.some(child => child.state === "failed" || child.state === "timed-out" || (child.state === "skipped" && child.hint !== undefined)) ? SYNC_FANOUT_PARTIAL_EXIT : 0;
134
+ return document.fanout.state === "failed" || document.children.some(child => child.state === "failed" || child.state === "timed-out"
135
+ || (child.state === "skipped" && child.hint !== undefined)
136
+ // A requested restart that did not certainly happen (040 decision 2).
137
+ || (child.state === "synced" && child.reason?.startsWith("restart-") === true)) ? SYNC_FANOUT_PARTIAL_EXIT : 0;
83
138
  }
84
139
 
85
140
  export function renderFanoutJson(document: FanoutDocument): string { return JSON.stringify(document); }