@bitkyc08/opencodex 2.100.1 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (624) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
  6. package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/index-DQtCRNAw.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +6 -4
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/native-exec.ts +3 -2
  38. package/src/adapters/cursor/protobuf-request.ts +8 -8
  39. package/src/adapters/cursor/tool-guidance.ts +3 -3
  40. package/src/adapters/cursor/tool-wording.ts +10 -1
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
  43. package/src/adapters/google-antigravity-wire.ts +15 -6
  44. package/src/adapters/google-truncation.ts +4 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +17 -4
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/openai-chat/tool-schema.ts +9 -0
  54. package/src/adapters/openai-responses/tool-schema.ts +18 -4
  55. package/src/adapters/run-turn-queue.ts +139 -5
  56. package/src/adapters/upstream-http-error.ts +4 -2
  57. package/src/adapters/zed.ts +3 -0
  58. package/src/advisor/consult.ts +15 -4
  59. package/src/advisor/context.ts +12 -3
  60. package/src/advisor/runtime.ts +35 -5
  61. package/src/advisor/settings.ts +8 -0
  62. package/src/advisor/synthetic-tool.ts +21 -8
  63. package/src/bridge/response-json.ts +11 -2
  64. package/src/bridge/sse.ts +51 -9
  65. package/src/claude/auth-detect.ts +21 -33
  66. package/src/claude/chat-tool-dispatch.ts +233 -0
  67. package/src/claude/desktop-3p.ts +11 -5
  68. package/src/claude/desktop-gateway-state.ts +2 -0
  69. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  70. package/src/claude/desktop-remote-store.ts +24 -4
  71. package/src/claude/inbound-content-options.ts +31 -16
  72. package/src/claude/inbound-tool-loading.ts +42 -17
  73. package/src/claude/outbound.ts +13 -3
  74. package/src/cli/account-api.ts +23 -1
  75. package/src/cli/account-auth.ts +54 -21
  76. package/src/cli/account-extended.ts +60 -6
  77. package/src/cli/account-key-quota.ts +56 -7
  78. package/src/cli/account.ts +5 -3
  79. package/src/cli/advisor.ts +7 -4
  80. package/src/cli/alias.ts +38 -1
  81. package/src/cli/capabilities-access-remote.ts +137 -2
  82. package/src/cli/capabilities-accounts.ts +3 -3
  83. package/src/cli/capabilities-agents-routing.ts +17 -10
  84. package/src/cli/capabilities-base.ts +43 -18
  85. package/src/cli/capabilities-integrations.ts +2 -2
  86. package/src/cli/capabilities-provider-models.ts +18 -2
  87. package/src/cli/capabilities-route-to.ts +43 -0
  88. package/src/cli/capabilities.ts +2 -0
  89. package/src/cli/capability-contracts.ts +1 -1
  90. package/src/cli/claude-desktop.ts +30 -11
  91. package/src/cli/claude.ts +36 -17
  92. package/src/cli/codex-launcher.ts +3 -1
  93. package/src/cli/codex-shim-autorestore.ts +5 -42
  94. package/src/cli/config-command.ts +38 -2
  95. package/src/cli/config-root-startup.ts +34 -0
  96. package/src/cli/connect.ts +124 -19
  97. package/src/cli/desktop-runtime-guidance.ts +1 -1
  98. package/src/cli/disconnect-runtime.ts +168 -0
  99. package/src/cli/dispatch.ts +54 -12
  100. package/src/cli/export-command.ts +1 -1
  101. package/src/cli/gui-pair-client.ts +29 -5
  102. package/src/cli/gui.ts +10 -5
  103. package/src/cli/help-catalog.ts +11 -0
  104. package/src/cli/help.ts +5 -4
  105. package/src/cli/hub.ts +18 -1
  106. package/src/cli/index.ts +83 -92
  107. package/src/cli/inspect.ts +11 -2
  108. package/src/cli/integrations.ts +26 -1
  109. package/src/cli/link-capture.ts +64 -0
  110. package/src/cli/link-child-ops.ts +314 -0
  111. package/src/cli/link-cleanup.ts +8 -5
  112. package/src/cli/link-diagnostics.ts +67 -0
  113. package/src/cli/link-enrollment.ts +158 -12
  114. package/src/cli/link-operations.ts +52 -0
  115. package/src/cli/link-recover.ts +152 -0
  116. package/src/cli/link-routes.ts +87 -0
  117. package/src/cli/link-status-child.ts +137 -0
  118. package/src/cli/link-status-traffic.ts +34 -0
  119. package/src/cli/link.ts +327 -37
  120. package/src/cli/message-command.ts +1 -1
  121. package/src/cli/message-mcp-command.ts +23 -10
  122. package/src/cli/models-runtime.ts +3 -3
  123. package/src/cli/opencode.ts +3 -1
  124. package/src/cli/pi-sync.ts +35 -0
  125. package/src/cli/preflight-exemptions.ts +46 -0
  126. package/src/cli/registry.ts +29 -12
  127. package/src/cli/restart-failure.ts +5 -2
  128. package/src/cli/root.ts +5 -1
  129. package/src/cli/route-to.ts +172 -0
  130. package/src/cli/runtime-api.ts +5 -8
  131. package/src/cli/status.ts +3 -1
  132. package/src/cli/stop-approval.ts +66 -19
  133. package/src/cli/stop-report.ts +23 -0
  134. package/src/cli/stop-windows-checked.ts +304 -0
  135. package/src/cli/sync-command.ts +70 -13
  136. package/src/cli/sync-fanout.ts +81 -99
  137. package/src/cli/sync-flags.ts +40 -3
  138. package/src/cli/sync-link-status.ts +18 -2
  139. package/src/cli/sync-update-guard.ts +7 -2
  140. package/src/cli/system-restart-client.ts +3 -2
  141. package/src/cli/uninstall-plan.ts +77 -5
  142. package/src/cli/uninstall-stop.ts +152 -0
  143. package/src/cli/v2-input.ts +10 -6
  144. package/src/cli/v2-local-output.ts +3 -2
  145. package/src/cli/v2-runtime.ts +10 -3
  146. package/src/cli/v2.ts +22 -7
  147. package/src/client/connect.ts +321 -34
  148. package/src/client/link-home-features.ts +27 -0
  149. package/src/client/link-home.ts +92 -4
  150. package/src/client/link-ingress.ts +21 -3
  151. package/src/client/link-join.ts +12 -2
  152. package/src/client/link-parity-reporter.ts +60 -6
  153. package/src/client/link-readiness.ts +16 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel-status.ts +76 -0
  161. package/src/client/link-tunnel.ts +56 -5
  162. package/src/client/link-websocket-limits.ts +89 -0
  163. package/src/client/link-websocket.ts +586 -0
  164. package/src/client/link-ws-advertisement.ts +100 -0
  165. package/src/client/link-ws-framer.ts +241 -0
  166. package/src/client/link-ws-transport.ts +177 -0
  167. package/src/client/machine-api.ts +13 -2
  168. package/src/client/machine-listener.ts +48 -7
  169. package/src/client/route-intent-apply.ts +293 -0
  170. package/src/client/route-intent-file-originals.ts +97 -0
  171. package/src/client/route-intent-native-originals.ts +201 -0
  172. package/src/client/route-intent-watch.ts +141 -0
  173. package/src/client/runtime-restart.ts +127 -5
  174. package/src/client/runtime.ts +61 -15
  175. package/src/client/state.ts +30 -0
  176. package/src/client/sync-expectation.ts +36 -2
  177. package/src/client/sync-runtime.ts +7 -0
  178. package/src/clients/config-export/alias-selectors.ts +63 -40
  179. package/src/clients/config-export/contracts.ts +2 -0
  180. package/src/clients/config-export/nested-selectors.ts +42 -0
  181. package/src/clients/config-export.ts +36 -4
  182. package/src/codex/account-resume-health.ts +41 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/login-flow.ts +6 -0
  187. package/src/codex/auth-api/routes.ts +35 -2
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +21 -6
  190. package/src/codex/catalog/gather-capture.ts +10 -2
  191. package/src/codex/catalog/parsing.ts +7 -3
  192. package/src/codex/catalog/provider-models.ts +67 -23
  193. package/src/codex/catalog/retained-sync.ts +2 -1
  194. package/src/codex/catalog/routed-gather.ts +1 -1
  195. package/src/codex/catalog-auto-refresh.ts +11 -0
  196. package/src/codex/cli-update-job.ts +35 -13
  197. package/src/codex/convergence-types.ts +2 -0
  198. package/src/codex/convergence.ts +2 -2
  199. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  200. package/src/codex/features.ts +2 -2
  201. package/src/codex/history-provider.ts +31 -0
  202. package/src/codex/inject/multi-agent-v2.ts +9 -3
  203. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  204. package/src/codex/inject/plan.ts +20 -2
  205. package/src/codex/inject.ts +2 -0
  206. package/src/codex/journal-config-restore.ts +217 -0
  207. package/src/codex/journal.ts +75 -6
  208. package/src/codex/main-account.ts +23 -30
  209. package/src/codex/native-main-auth-file.ts +104 -0
  210. package/src/codex/native-profile-manager.ts +4 -3
  211. package/src/codex/native-profile-store.ts +3 -61
  212. package/src/codex/orca-import.ts +10 -1
  213. package/src/codex/quota-history.ts +13 -0
  214. package/src/codex/quota-window-conflict.ts +103 -0
  215. package/src/codex/quota.ts +134 -7
  216. package/src/codex/subagent-model-fallback.ts +3 -1
  217. package/src/codex/websocket-activity.ts +171 -16
  218. package/src/codex/websocket-registry.ts +11 -4
  219. package/src/combos/cooldown-store.ts +228 -0
  220. package/src/combos/failover.ts +760 -35
  221. package/src/config/dashboard-trusted-proxy.ts +83 -0
  222. package/src/config/diagnostics.ts +28 -0
  223. package/src/config/feature-flags.ts +9 -0
  224. package/src/config/live-reconcile.ts +10 -1
  225. package/src/config/load-degrade.ts +12 -1
  226. package/src/config/multi-agent-surface.ts +28 -5
  227. package/src/config/pending-teardown.ts +60 -3
  228. package/src/config/process-state.ts +175 -4
  229. package/src/config/provider-validation.ts +4 -4
  230. package/src/config/salvage.ts +1 -0
  231. package/src/config/schema/config-schema.ts +12 -3
  232. package/src/config/schema/leaf-validators.ts +43 -14
  233. package/src/config/windows-process-command-line.ts +107 -0
  234. package/src/generated/compatibility-version.json +1077 -429
  235. package/src/generated/model-metadata.ts +1 -1
  236. package/src/images/loop.ts +3 -0
  237. package/src/integrations/model-name-guard.ts +25 -0
  238. package/src/integrations/route-intent-catalog.ts +26 -0
  239. package/src/integrations/route-intent-connected.ts +262 -0
  240. package/src/integrations/route-intent-contract.ts +55 -0
  241. package/src/integrations/route-intent-disconnect.ts +109 -0
  242. package/src/integrations/route-intent-initial.ts +64 -0
  243. package/src/integrations/route-intent-state.ts +117 -0
  244. package/src/integrations/route-intent-tick.ts +65 -0
  245. package/src/integrations/route-intent.ts +212 -0
  246. package/src/integrations/writer.ts +44 -11
  247. package/src/lib/catalog-etag.ts +10 -0
  248. package/src/lib/client-error-body.ts +15 -0
  249. package/src/lib/client-retry-after.ts +29 -0
  250. package/src/lib/config-ownership.ts +13 -0
  251. package/src/lib/context-overflow-verdict.ts +266 -9
  252. package/src/lib/desktop-gui-origin.ts +28 -0
  253. package/src/lib/errors.ts +1 -1
  254. package/src/lib/failure-detail.ts +72 -3
  255. package/src/lib/gui-pair-capability.ts +2 -1
  256. package/src/lib/hard-refusal.ts +259 -0
  257. package/src/lib/messages-error-body.ts +4 -1
  258. package/src/lib/outbound-credential-registry.ts +362 -4
  259. package/src/lib/paced-stream.ts +34 -0
  260. package/src/lib/passive-key-fetch-proof.ts +30 -0
  261. package/src/lib/passive-read.ts +5 -0
  262. package/src/lib/process-control.ts +76 -12
  263. package/src/lib/redact.ts +84 -8
  264. package/src/lib/state-store-registrations.ts +11 -0
  265. package/src/lib/state-store-sweeper.ts +4 -0
  266. package/src/lib/supervisor-markers.ts +18 -0
  267. package/src/lib/terminal-safe-text.ts +58 -0
  268. package/src/lib/translator-budget.ts +3 -2
  269. package/src/lib/upstream-retry.ts +14 -4
  270. package/src/link/alias-lock.ts +119 -0
  271. package/src/link/child-activity.ts +83 -0
  272. package/src/link/child-binary-cache-fill.d.mts +50 -0
  273. package/src/link/child-binary-cache-fill.mjs +494 -0
  274. package/src/link/child-binary-cache-start.ts +73 -0
  275. package/src/link/child-binary-source.ts +12 -5
  276. package/src/link/child-catalog-freshness.ts +149 -0
  277. package/src/link/child-gated-ocx.ts +135 -0
  278. package/src/link/child-observations.ts +206 -0
  279. package/src/link/child-observe.ts +121 -0
  280. package/src/link/child-ops-engine.ts +230 -0
  281. package/src/link/child-ops-host.ts +138 -0
  282. package/src/link/child-ops-runners.ts +319 -0
  283. package/src/link/child-ops-scheduler.ts +207 -0
  284. package/src/link/child-ops-types.ts +89 -0
  285. package/src/link/child-parity.ts +23 -4
  286. package/src/link/child-policy.ts +93 -0
  287. package/src/link/child-update-contract.ts +174 -0
  288. package/src/link/codex-settings.ts +1 -1
  289. package/src/link/compatibility.ts +18 -1
  290. package/src/link/diagnostics-read.ts +163 -0
  291. package/src/link/diagnostics.ts +20 -7
  292. package/src/link/explicit-route.ts +209 -0
  293. package/src/link/link-recover.ts +113 -0
  294. package/src/link/management-routes.ts +3 -1
  295. package/src/link/operation-recovery-slot.ts +44 -0
  296. package/src/link/operations-journal.ts +408 -0
  297. package/src/link/paths.ts +5 -0
  298. package/src/link/peer-report.ts +1 -1
  299. package/src/link/relay-auth.ts +14 -0
  300. package/src/link/remote-plant.ts +152 -14
  301. package/src/link/remote-platform.ts +21 -10
  302. package/src/link/remote-probe.ts +11 -3
  303. package/src/link/remote-windows.ts +88 -12
  304. package/src/link/request-compression.ts +30 -0
  305. package/src/link/residual-recovery.ts +54 -0
  306. package/src/link/retirement.ts +128 -0
  307. package/src/link/route-intent-watch.ts +41 -0
  308. package/src/link/route-intent.ts +209 -0
  309. package/src/link/route-proof.ts +82 -0
  310. package/src/link/route-rounds.ts +579 -0
  311. package/src/link/route-select.ts +95 -0
  312. package/src/link/route-trust.ts +96 -0
  313. package/src/link/ssh-argv.ts +285 -43
  314. package/src/link/ssh-capture-redact.ts +253 -0
  315. package/src/link/ssh-capture.ts +497 -0
  316. package/src/link/ssh-runner.ts +141 -14
  317. package/src/link/status-projection.ts +160 -0
  318. package/src/link/store.ts +54 -1
  319. package/src/link/supervisor.ts +543 -55
  320. package/src/link/sync-fanout-classify.ts +114 -0
  321. package/src/link/sync-then-restart.ts +65 -0
  322. package/src/link/tombstones.ts +209 -0
  323. package/src/link/traffic.ts +178 -0
  324. package/src/link/tunnel-state.ts +10 -4
  325. package/src/link/ws-activity-holds.ts +474 -0
  326. package/src/local-credentials/publication-fence.ts +20 -1
  327. package/src/messaging/mcp-queue-rpc.ts +3 -2
  328. package/src/messaging/mcp-queue-server.ts +21 -1
  329. package/src/messaging/mcp-reply-tools.ts +24 -9
  330. package/src/messaging/mcp-reply-wait.ts +70 -0
  331. package/src/messaging/mcp-resume-tools.ts +25 -0
  332. package/src/messaging/remote-enrollment.ts +3 -3
  333. package/src/messaging/remote-tunnels.ts +2 -2
  334. package/src/messaging/resume-permissions.ts +27 -0
  335. package/src/messaging/rpc.ts +46 -2
  336. package/src/oauth/account-resume-health.ts +60 -0
  337. package/src/oauth/anthropic-continuity.ts +23 -7
  338. package/src/oauth/anthropic-routing.ts +5 -2
  339. package/src/oauth/anthropic.ts +22 -2
  340. package/src/oauth/claude-keychain-read.ts +78 -68
  341. package/src/oauth/index.ts +25 -6
  342. package/src/oauth/local-token-detect.ts +8 -29
  343. package/src/oauth/login-cli-errors.ts +5 -1
  344. package/src/oauth/login-cli.ts +33 -18
  345. package/src/oauth/login-flow-state.ts +26 -3
  346. package/src/oauth/meta-muse.ts +1 -1
  347. package/src/oauth/store.ts +51 -1
  348. package/src/oauth/xai.ts +248 -14
  349. package/src/protocols/contract.ts +4 -0
  350. package/src/protocols/encoders/messages.ts +1 -0
  351. package/src/providers/alias-template.ts +48 -0
  352. package/src/providers/anthropic-billing-ownership.ts +2 -0
  353. package/src/providers/anthropic-output-caps.ts +46 -0
  354. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  355. package/src/providers/antigravity-effort-families.ts +11 -3
  356. package/src/providers/antigravity-models.ts +32 -9
  357. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  358. package/src/providers/api-key-pause-state.ts +23 -0
  359. package/src/providers/api-key-pause.ts +71 -10
  360. package/src/providers/api-key-resolve.ts +49 -7
  361. package/src/providers/api-key-response-ownership.ts +2 -0
  362. package/src/providers/api-key-selection-capture.ts +3 -1
  363. package/src/providers/api-key-selection.ts +54 -11
  364. package/src/providers/api-keys.ts +24 -7
  365. package/src/providers/cache-affinity-identity.ts +73 -0
  366. package/src/providers/cache-affinity.ts +256 -0
  367. package/src/providers/claude-cli-usage-state.ts +11 -6
  368. package/src/providers/claude-cli-usage.ts +27 -9
  369. package/src/providers/codex-capacity.ts +11 -2
  370. package/src/providers/default-aliases.ts +98 -20
  371. package/src/providers/google-vertex-model-discovery.ts +510 -0
  372. package/src/providers/key-failover.ts +136 -14
  373. package/src/providers/key-store.ts +3 -3
  374. package/src/providers/kiro-models.ts +3 -5
  375. package/src/providers/label.ts +31 -5
  376. package/src/providers/mistral-transport.ts +17 -4
  377. package/src/providers/model-discovery-config.ts +31 -0
  378. package/src/providers/model-discovery-diagnostic.ts +34 -3
  379. package/src/providers/model-discovery.ts +43 -7
  380. package/src/providers/model-rename-fields.ts +5 -0
  381. package/src/providers/muse-key-quota.ts +14 -6
  382. package/src/providers/new-model-policy-runtime.ts +17 -4
  383. package/src/providers/new-model-policy.ts +30 -4
  384. package/src/providers/openai-sidecar.ts +15 -2
  385. package/src/providers/passive-key-observation.ts +252 -0
  386. package/src/providers/provider-id-rewrite.ts +3 -0
  387. package/src/providers/quota/account-cache.ts +53 -34
  388. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  389. package/src/providers/quota/anthropic-usage-windows.ts +19 -9
  390. package/src/providers/quota/passive-key-limits.ts +272 -0
  391. package/src/providers/quota/passive-wire-model.ts +126 -0
  392. package/src/providers/quota/report-cache.ts +112 -5
  393. package/src/providers/quota/vendor-probes-key.ts +73 -0
  394. package/src/providers/quota/vendor-probes-oauth.ts +57 -3
  395. package/src/providers/quota-key-accounts.ts +22 -10
  396. package/src/providers/quota-mistral-budget.ts +18 -0
  397. package/src/providers/quota-types.ts +43 -0
  398. package/src/providers/quota.ts +31 -32
  399. package/src/providers/reasoning-metadata.ts +1051 -12
  400. package/src/providers/registry/entries-core.ts +34 -16
  401. package/src/providers/registry/entries-extended.ts +32 -0
  402. package/src/providers/registry/model-seeds.ts +35 -0
  403. package/src/providers/resolved-model-policy.ts +7 -0
  404. package/src/providers/routed-config.ts +8 -3
  405. package/src/providers/xai-transport.ts +3 -0
  406. package/src/quota/reset-observer.ts +4 -2
  407. package/src/quota/reset-seen-store.ts +9 -0
  408. package/src/quota/window-mapping.ts +1 -0
  409. package/src/quota-pool/assemble.ts +4 -1
  410. package/src/remote/features.ts +17 -0
  411. package/src/responses/anthropic-progress.ts +10 -4
  412. package/src/responses/citation-markers.ts +231 -0
  413. package/src/responses/hosted-tool-policy.ts +56 -12
  414. package/src/responses/spill-store.ts +5 -1
  415. package/src/responses/state/replay-input.ts +50 -0
  416. package/src/responses/state/replay-owner.ts +24 -0
  417. package/src/responses/state/snapshot-codec.ts +9 -0
  418. package/src/responses/state/spill-queue.ts +1 -0
  419. package/src/responses/state.ts +42 -60
  420. package/src/router.ts +4 -2
  421. package/src/routing/home-route-capture.ts +123 -0
  422. package/src/routing/home-route-intent.ts +200 -0
  423. package/src/routing/route-intent-state.ts +178 -0
  424. package/src/routing/route-to-live-settings.ts +35 -0
  425. package/src/routing/route-to-local.ts +145 -0
  426. package/src/routing/route-to-status.ts +94 -0
  427. package/src/routing/route-to-sync-child.ts +32 -0
  428. package/src/server/adapter-resolve.ts +21 -1
  429. package/src/server/admitted-http-turn.ts +3 -0
  430. package/src/server/auth-cors.ts +109 -8
  431. package/src/server/bare-upstream-error.ts +220 -0
  432. package/src/server/catalog-download.ts +3 -5
  433. package/src/server/chat-native.ts +25 -7
  434. package/src/server/claude-messages.ts +8 -5
  435. package/src/server/codex-model-list.ts +2 -1
  436. package/src/server/configured-credentials.ts +37 -5
  437. package/src/server/gui-desktop-authorization.ts +36 -0
  438. package/src/server/gui-pair-delivery.ts +6 -3
  439. package/src/server/gui-session.ts +10 -1
  440. package/src/server/images.ts +41 -13
  441. package/src/server/inbound-body-admission.ts +17 -4
  442. package/src/server/index/link-listener.ts +203 -11
  443. package/src/server/index/link-management.ts +15 -1
  444. package/src/server/index/link-relay-sessions.ts +128 -8
  445. package/src/server/index/link-websocket-limits.ts +136 -0
  446. package/src/server/index/link-websocket.ts +692 -0
  447. package/src/server/index/optional-listeners.ts +115 -7
  448. package/src/server/index/route-intent-watch.ts +47 -0
  449. package/src/server/index/serve-contract.ts +86 -0
  450. package/src/server/index/serve-options.ts +35 -86
  451. package/src/server/index/startup-warnings.ts +8 -2
  452. package/src/server/index/websocket-handler.ts +26 -4
  453. package/src/server/index.ts +12 -2
  454. package/src/server/inference/client-encoder-delivery.ts +2 -0
  455. package/src/server/inspection-tee.ts +39 -2
  456. package/src/server/lifecycle.ts +2 -0
  457. package/src/server/link-turn.ts +137 -0
  458. package/src/server/management/advisor-routes.ts +10 -2
  459. package/src/server/management/agent-settings-routes.ts +50 -16
  460. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  461. package/src/server/management/config-routes.ts +7 -1
  462. package/src/server/management/context.ts +9 -2
  463. package/src/server/management/desktop-authorization.ts +41 -0
  464. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  465. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  466. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  467. package/src/server/management/home-integration-decision.ts +89 -0
  468. package/src/server/management/integration-routes.ts +208 -81
  469. package/src/server/management/link-child-ops-routes.ts +218 -0
  470. package/src/server/management/link-child-preflight.ts +31 -0
  471. package/src/server/management/link-diagnostics-route.ts +29 -0
  472. package/src/server/management/link-enrollment.ts +199 -47
  473. package/src/server/management/link-operation.ts +609 -0
  474. package/src/server/management/link-recover-route.ts +103 -0
  475. package/src/server/management/link-route-edit.ts +173 -0
  476. package/src/server/management/link-route-request.ts +62 -0
  477. package/src/server/management/link-route-state.ts +92 -6
  478. package/src/server/management/link-routes.ts +563 -51
  479. package/src/server/management/link-traffic-status.ts +13 -0
  480. package/src/server/management/model-routes.ts +122 -36
  481. package/src/server/management/model-rows.ts +2 -1
  482. package/src/server/management/native-integration-routes.ts +176 -70
  483. package/src/server/management/oauth-account-routes.ts +69 -17
  484. package/src/server/management/protocol-routes.ts +7 -0
  485. package/src/server/management/provider-completion-test.ts +4 -4
  486. package/src/server/management/provider-overwrite-carry.ts +39 -3
  487. package/src/server/management/provider-routes.ts +80 -72
  488. package/src/server/management/provider-routing-quota.ts +45 -0
  489. package/src/server/management/route-registry.ts +25 -3
  490. package/src/server/management/route-to-routes.ts +257 -0
  491. package/src/server/management/system-restart.ts +4 -2
  492. package/src/server/management/usage-aggregate-cache.ts +101 -66
  493. package/src/server/management-api.ts +17 -3
  494. package/src/server/management-auth.ts +13 -1
  495. package/src/server/messages-native-preflight.ts +27 -4
  496. package/src/server/messages-native.ts +22 -5
  497. package/src/server/persistent-gui-session.ts +6 -3
  498. package/src/server/proxy-liveness.ts +33 -6
  499. package/src/server/relay-eager.ts +36 -12
  500. package/src/server/relay.ts +183 -116
  501. package/src/server/request-body-facts.ts +48 -0
  502. package/src/server/request-decompress.ts +65 -2
  503. package/src/server/request-log-account-rotation.ts +6 -0
  504. package/src/server/request-log-attempt-usage.ts +69 -0
  505. package/src/server/request-log-cache-affinity.ts +60 -0
  506. package/src/server/request-log-conversation.ts +45 -2
  507. package/src/server/request-log-failure-detail.ts +59 -1
  508. package/src/server/request-log-terminal-status.ts +210 -24
  509. package/src/server/request-log.ts +71 -79
  510. package/src/server/responses/adapter-continuation.ts +2 -1
  511. package/src/server/responses/adapter-delivery.ts +2 -0
  512. package/src/server/responses/adapter-dispatch.ts +40 -51
  513. package/src/server/responses/advisor-plan-slot.ts +33 -1
  514. package/src/server/responses/advisor-question.ts +21 -0
  515. package/src/server/responses/advisor-slot.ts +10 -3
  516. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  517. package/src/server/responses/buffered-sse-json.ts +9 -3
  518. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  519. package/src/server/responses/codex-tool-catalog.ts +156 -0
  520. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  521. package/src/server/responses/combo-stream-preflight.ts +701 -81
  522. package/src/server/responses/compact.ts +47 -12
  523. package/src/server/responses/context-overflow.ts +58 -2
  524. package/src/server/responses/core-codex-account.ts +17 -3
  525. package/src/server/responses/core-combo-failure.ts +37 -4
  526. package/src/server/responses/core-combo-native.ts +3 -1
  527. package/src/server/responses/core-combo.ts +62 -7
  528. package/src/server/responses/core-errors.ts +8 -3
  529. package/src/server/responses/core-lifetime.ts +3 -2
  530. package/src/server/responses/core-normalize.ts +3 -1
  531. package/src/server/responses/core-opaque-recovery.ts +45 -2
  532. package/src/server/responses/core-options.ts +18 -0
  533. package/src/server/responses/core.ts +2 -0
  534. package/src/server/responses/fetch-helpers.ts +15 -10
  535. package/src/server/responses/native-replay-guard.ts +57 -0
  536. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  537. package/src/server/responses/outbound-request-body.ts +29 -0
  538. package/src/server/responses/passthrough-completion.ts +105 -8
  539. package/src/server/responses/passthrough-delivery.ts +31 -11
  540. package/src/server/responses/passthrough-dispatch.ts +99 -106
  541. package/src/server/responses/policy-fallback.ts +13 -1
  542. package/src/server/responses/request-prepare.ts +50 -6
  543. package/src/server/responses/request-transport.ts +53 -17
  544. package/src/server/responses/reset-replay.ts +104 -4
  545. package/src/server/responses/run-turn-execution.ts +58 -30
  546. package/src/server/responses/sidecar-execution.ts +14 -0
  547. package/src/server/responses/terminal-error-redaction.ts +222 -25
  548. package/src/server/responses/ws-upstream.ts +2 -2
  549. package/src/server/sse-payload-rewrite.ts +3 -2
  550. package/src/server/stop-service-route.ts +85 -0
  551. package/src/server/system-env-shell.ts +12 -1
  552. package/src/server/system-env.ts +5 -3
  553. package/src/server/windows-tcp-drop.ts +21 -4
  554. package/src/server/workflow-refusal.ts +8 -0
  555. package/src/server/ws-bridge.ts +191 -12
  556. package/src/service/cli-windows-stop.ts +189 -0
  557. package/src/service/cli.ts +41 -12
  558. package/src/service/disconnected-client-restart.ts +60 -0
  559. package/src/service/guarded-manager-target.ts +18 -1
  560. package/src/service/health.ts +99 -6
  561. package/src/service/launchd.ts +84 -31
  562. package/src/service/orchestration.ts +418 -91
  563. package/src/service/repair.ts +223 -6
  564. package/src/service/restart-proxy-stop.ts +79 -0
  565. package/src/service/service-child-ownership.ts +6 -2
  566. package/src/service/windows-checked-stop-live.ts +467 -0
  567. package/src/service/windows-checked-stop.ts +435 -0
  568. package/src/service/windows-command-line-token.ts +23 -0
  569. package/src/service/windows-guarded-manager.ts +77 -34
  570. package/src/service/windows-ops.ts +38 -56
  571. package/src/service/windows-process-evidence.ts +292 -0
  572. package/src/service/windows-process-native.ts +262 -0
  573. package/src/service/windows-service-stop.ts +321 -0
  574. package/src/service/windows-stop-binding.ts +187 -0
  575. package/src/service/windows-stop-budget.ts +123 -0
  576. package/src/service/windows-stop-confirm.ts +158 -0
  577. package/src/service/windows-stop-deadline.ts +56 -0
  578. package/src/service.ts +2 -2
  579. package/src/types/claude-tool-loading.ts +48 -0
  580. package/src/types/config.ts +47 -53
  581. package/src/types/link.ts +20 -0
  582. package/src/types/multi-agent.ts +13 -0
  583. package/src/types/provider.ts +68 -2
  584. package/src/types/request.ts +4 -0
  585. package/src/types.ts +4 -0
  586. package/src/update/guarded-runtime-ops.ts +5 -7
  587. package/src/update/index.ts +25 -10
  588. package/src/update/install-detection.mjs +3 -1
  589. package/src/update/job-pinned-start.ts +2 -0
  590. package/src/update/job-windows-restart.ts +19 -32
  591. package/src/update/job.ts +12 -5
  592. package/src/update/npm-install.d.mts +11 -0
  593. package/src/update/npm-install.mjs +44 -7
  594. package/src/update/orchestrated-entry.ts +1 -1
  595. package/src/update/orchestrated-node-driver.mjs +3 -2
  596. package/src/update/orchestrated-pnpm.d.mts +4 -0
  597. package/src/update/orchestrated-pnpm.mjs +50 -6
  598. package/src/update/orchestrated-session.d.mts +3 -1
  599. package/src/update/orchestrated-session.mjs +21 -6
  600. package/src/update/pnpm-global-install.d.mts +21 -3
  601. package/src/update/pnpm-global-install.mjs +322 -19
  602. package/src/update/pnpm-store-layout.mjs +46 -0
  603. package/src/update/sync-update-mutex.d.mts +3 -2
  604. package/src/update/sync-update-mutex.mjs +57 -8
  605. package/src/update/transactional-install.d.mts +3 -1
  606. package/src/update/transactional-install.mjs +545 -12
  607. package/src/update/windows-installer-marker.d.mts +1 -0
  608. package/src/update/windows-installer-marker.mjs +44 -0
  609. package/src/usage/expected-prices.ts +8 -0
  610. package/src/usage/filter-index.ts +326 -77
  611. package/src/usage/ledger-scanner.ts +15 -0
  612. package/src/usage/link-log-fields.ts +48 -0
  613. package/src/usage/log.ts +43 -2
  614. package/src/usage/request-body.ts +37 -0
  615. package/src/web-search/loop.ts +3 -0
  616. package/src/web-search/parse.ts +21 -2
  617. package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
  618. package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
  619. package/gui/dist/assets/index-Bziu8gTy.css +0 -2
  620. package/gui/dist/assets/index-OYzhQUNP.js +0 -94
  621. package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
  622. package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
  623. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
  624. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -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,22 +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
- return { ...classifySyncResult(result), exit: result.code };
221
- } catch (error) {
222
- if (error instanceof FanoutProcessError) return { state: error.reason === "deadline-exceeded" || error.reason === "termination-unconfirmed" ? "timed-out" : "failed", reason: error.reason, exit: null };
223
- throw error;
224
- }
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 };
225
282
  },
226
283
  });
227
284
  if (flags.json) originalLog(renderFanoutJson(document));
@@ -1,105 +1,30 @@
1
- import { compareStrictSemver, parseStrictSemver } from "../lib/strict-semver";
2
1
  import type { LinkRecord, LinkStore } from "../link/store";
3
- import type { LinkStatusDto } from "../link/status-projection";
2
+ import type { ChildRestartRequest } from "../link/ssh-argv";
3
+ import type { SyncThenRestart } from "../link/sync-then-restart";
4
+ import type { LinkStatusPayload } from "./link";
4
5
  import { LinkStatusError } from "./sync-link-status";
6
+ import { childSkipHint } from "../link/sync-fanout-classify";
5
7
 
6
- export const REMOTE_LINK_SYNC_MESSAGE = "Remote Link Home catalog synchronized.";
7
- export const STALE_REMOTE_CATALOG_MESSAGE = "Home unavailable; retained and applied the last-known-good remote catalog (stale).";
8
+ export { classifySyncResult, classifyVersionProbe, parseOcxVersion, REMOTE_LINK_SYNC_MESSAGE,
9
+ STALE_REMOTE_CATALOG_MESSAGE, type ChildVerdict } from "../link/sync-fanout-classify";
8
10
  export const SYNC_FANOUT_PARTIAL_EXIT = 6;
9
11
 
10
- export type ChildVerdict = { state: "synced" | "skipped" | "failed"; reason: string | null };
11
- const failure = (reason: string): ChildVerdict => ({ state: "failed", reason });
12
- const skipped = (reason: string): ChildVerdict => ({ state: "skipped", reason });
13
- const minimum = parseStrictSemver("2.93.0")!;
14
-
15
- export function parseOcxVersion(output: string): string | null {
16
- const version = output.trim().replace(/^opencodex /, "");
17
- return parseStrictSemver(version) ? version : null;
18
- }
19
-
20
- export function classifyVersionProbe(output: string): "child-ocx-version-unknown" | "child-ocx-lacks-expect-link" | null {
21
- const version = parseOcxVersion(output);
22
- if (!version) return "child-ocx-version-unknown";
23
- return compareStrictSemver(parseStrictSemver(version)!, minimum) < 0 ? "child-ocx-lacks-expect-link" : null;
24
- }
25
-
26
- const mismatchReasons = new Set(["disconnected", "invalid_state", "disconnect_pending", "pending_operation", "hub_client", "link_client", "other_link", "other_key"]);
27
-
28
- function validDocument(value: unknown): "synced" | "stale" | null {
29
- if (!value || typeof value !== "object" || Array.isArray(value)) return null;
30
- const v = value as Record<string, unknown>;
31
- const keysAre = (object: Record<string, unknown>, keys: readonly string[]): boolean => Object.keys(object).length === keys.length && keys.every(key => Object.hasOwn(object, key));
32
- if (!keysAre(v, ["schema", "home", "fanout", "children"])) return null;
33
- if (v.schema !== "ocx.sync.fanout/1" || !v.home || typeof v.home !== "object" || Array.isArray(v.home)
34
- || !v.fanout || typeof v.fanout !== "object" || Array.isArray(v.fanout) || !Array.isArray(v.children)) return null;
35
- const home = v.home as Record<string, unknown>, fanout = v.fanout as Record<string, unknown>;
36
- if (!keysAre(home, ["state", "exit"]) || !keysAre(fanout, ["state", "reason"])) return null;
37
- if (home.exit !== 0 || (home.state !== "synced" && home.state !== "stale")) return null;
38
- if (fanout.state !== "not-applicable" || fanout.reason !== null || v.children.length !== 0) return null;
39
- return home.state;
40
- }
41
-
42
- export function classifySyncResult(result: { code: number; stdout: string; stderr: string }): ChildVerdict {
43
- const { code, stdout, stderr } = result;
44
- if (code === 255) return failure("ssh-failed");
45
- if (code === 127) return failure("child-ocx-not-found");
46
- if (code === 126) return failure("child-ocx-not-contained");
47
- if (code === 125) return skipped("child-platform-unsupported");
48
- const lines = stderr.split(/\r?\n/);
49
- const last = stderr.trimEnd().split(/\r?\n/).at(-1);
50
- if (code === 121) {
51
- if (last === "ocx-fanout:child-ocx-lacks-expect-link") return skipped("child-ocx-lacks-expect-link");
52
- if (last === "ocx-fanout:child-ocx-version-unknown") return skipped("child-ocx-version-unknown");
53
- return failure("child-sync-failed");
54
- }
55
- const markers = lines.map(line => /^ocx-fanout:selected:(.+)$/.exec(line)).filter(match => match !== null);
56
- if (markers.length !== 1 || !parseStrictSemver(markers[0]![1]!)) return failure("child-output-invalid");
57
- const outputLines = stdout.split(/\r?\n/);
58
- const delimiters = outputLines.flatMap((line, index) => line === "ocx-fanout:stdout-begin" ? [index] : []);
59
- if (delimiters.length !== 1) return failure("child-output-invalid");
60
- if (code === 5) {
61
- try {
62
- const detail: unknown = JSON.parse(last ?? "");
63
- if (detail && typeof detail === "object" && "phase" in detail && detail.phase === "child_link_mismatch"
64
- && "reason" in detail && typeof detail.reason === "string" && mismatchReasons.has(detail.reason)) return skipped(`child-link-mismatch:${detail.reason}`);
65
- } catch { /* The generic mismatch is the only safe fallback. */ }
66
- return skipped("child-link-mismatch");
67
- }
68
- if (code === 7) return skipped("child-updating");
69
- if (code !== 0) return failure("child-sync-failed");
70
- const text = outputLines.slice(delimiters[0]! + 1).join("\n").trim();
71
- if (text.startsWith("{")) {
72
- try {
73
- const state = validDocument(JSON.parse(text));
74
- if (state === "synced") return { state: "synced", reason: null };
75
- if (state === "stale") return failure("child-catalog-stale");
76
- } catch { /* Reject invalid or multiple JSON documents. */ }
77
- return failure("child-output-invalid");
78
- }
79
- if (text.includes(STALE_REMOTE_CATALOG_MESSAGE)) return failure("child-catalog-stale");
80
- if (text.includes(REMOTE_LINK_SYNC_MESSAGE)) return { state: "synced", reason: null };
81
- return failure("child-output-invalid");
82
- }
83
-
84
12
  export type HomeResult = { state: "synced" | "stale" | "skipped" | "failed"; exit: number };
85
13
  export type ChildResult = { linkId: string; alias: string; state: "synced" | "skipped" | "failed" | "timed-out"; reason: string | null; exit: number | null; hint?: string };
86
14
  export type FanoutDocument = { schema: "ocx.sync.fanout/1"; home: HomeResult; fanout: { state: "ran" | "disabled" | "not-applicable" | "failed"; reason: string | null }; children: ChildResult[] };
87
-
88
- function childSkipHint(reason: string | null, alias: string): string {
89
- 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.`;
90
- if (reason === "child-updating") return "Wait for the Child update to finish, then retry sync.";
91
- 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.";
92
- if (reason === "child-link-mismatch:disconnected" || reason === "child-link-mismatch:other_link") return "Please re-link this Child to this Home, then retry sync.";
93
- 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.";
94
- if (reason === "child-ocx-version-unknown") return "Check the Child's selected OpenCodex installation and version, then retry sync.";
95
- if (reason === "child-platform-unsupported") return "Check the Child's platform and Remote Link setup before retrying sync.";
96
- return "Check the Child's sync status and retry sync.";
97
- }
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> };
98
20
 
99
21
  export async function runHomeFanout(deps: {
100
22
  home: HomeResult; catalogCurrent: boolean; localOnly?: boolean; applicable?: boolean;
101
- readStore: () => LinkStore; readLinkStatus: () => Promise<LinkStatusDto>;
102
- runChild: (link: LinkRecord, deadline: number) => Promise<Omit<ChildResult, "linkId" | "alias">>;
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
+ readStore: () => LinkStore; readLinkStatus: () => Promise<LinkStatusPayload>;
27
+ runChild: (link: LinkRecord, deadline: number, options: ChildRunOptions) => Promise<Omit<ChildResult, "linkId" | "alias">>;
103
28
  now?: () => number; deadlineMs?: number; concurrency?: number; terminationGraceMs?: number;
104
29
  }): Promise<FanoutDocument> {
105
30
  const result: FanoutDocument = { schema: "ocx.sync.fanout/1", home: deps.home, fanout: { state: deps.localOnly ? "disabled" : "not-applicable", reason: null }, children: [] };
@@ -109,17 +34,21 @@ export async function runHomeFanout(deps: {
109
34
  if (!store.links.length) return result;
110
35
  result.fanout.state = "ran";
111
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 });
112
- 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"));
113
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;
114
43
  if (skipReason) {
115
- 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));
116
45
  return result;
117
46
  }
118
- let status: LinkStatusDto;
47
+ let status: LinkStatusPayload;
119
48
  try { status = await deps.readLinkStatus(); }
120
49
  catch (error) {
121
50
  const reason = error instanceof LinkStatusError ? error.reason : "home-link-status-unavailable";
122
- 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));
123
52
  return result;
124
53
  }
125
54
  let cursor = 0;
@@ -128,20 +57,36 @@ export async function runHomeFanout(deps: {
128
57
  const index = cursor++;
129
58
  const link = store.links[index];
130
59
  if (!link) return;
131
- if (link.direction === "client-initiated") continue;
60
+ if (unselected(link) || link.direction === "client-initiated") continue;
132
61
  const wire = status.links.find(row => row.id === link.id);
133
62
  if (!wire) { result.children[index] = classify(link, "skipped", "link-not-in-runtime"); continue; }
134
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 };
135
77
  let timer: ReturnType<typeof setTimeout> | undefined;
136
78
  try {
137
79
  const budget = deps.deadlineMs ?? 180_000;
138
80
  const child = await Promise.race([
139
- deps.runChild(link, (deps.now ?? Date.now)() + budget),
81
+ deps.runChild(link, (deps.now ?? Date.now)() + budget, options),
140
82
  new Promise<Omit<ChildResult, "linkId" | "alias">>(resolve => {
141
83
  timer = setTimeout(() => resolve({ state: "timed-out", reason: "termination-unconfirmed", exit: null }), budget + (deps.terminationGraceMs ?? 3000));
142
84
  }),
143
85
  ]);
144
- result.children[index] = { linkId: link.id, alias: link.alias, ...child, ...(child.state === "skipped" ? { hint: childSkipHint(child.reason, link.alias) } : {}) };
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.
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;
89
+ result.children[index] = { linkId: link.id, alias: link.alias, state: child.state, reason: child.reason, exit: child.exit, ...(hint === undefined ? {} : { hint }) };
145
90
  } catch { result.children[index] = classify(link, "failed", "internal-error"); }
146
91
  finally { if (timer !== undefined) clearTimeout(timer); }
147
92
  }
@@ -150,9 +95,46 @@ export async function runHomeFanout(deps: {
150
95
  return result;
151
96
  }
152
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
+
153
132
  export function fanoutExitCode(document: FanoutDocument): number {
154
133
  if (document.home.exit !== 0) return document.home.exit;
155
- 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;
156
138
  }
157
139
 
158
140
  export function renderFanoutJson(document: FanoutDocument): string { return JSON.stringify(document); }
@@ -1,10 +1,47 @@
1
- export type SyncFanoutFlags = { ok: true; localOnly: boolean; json: boolean } | { ok: false; message: string };
1
+ import { isRouteClientId, type RouteClientId } from "../link/route-intent";
2
+ import type { ChildRestartRequest } from "../link/ssh-argv";
3
+
4
+ export type SyncFanoutFlags = {
5
+ ok: true; localOnly: boolean; json: boolean;
6
+ overwriteClient?: RouteClientId;
7
+ /** null: every link (today's behaviour). Otherwise the deduplicated ids given with --child. */
8
+ children: readonly string[] | null;
9
+ restartChildren: ChildRestartRequest | null;
10
+ } | { ok: false; message: string };
11
+
12
+ const LINK_ID = /^lnk_[0-9a-f]{16}$/;
2
13
 
3
14
  export function parseSyncFanoutFlags(args: readonly string[]): SyncFanoutFlags {
4
- for (const flag of ["--local-only", "--json"]) {
15
+ for (const flag of ["--local-only", "--json", "--overwrite-conflict"]) {
5
16
  if (args.filter(arg => arg === flag).length > 1 || args.some(arg => arg.startsWith(`${flag}=`))) {
6
17
  return { ok: false, message: `ocx sync accepts ${flag} once without a value.` };
7
18
  }
8
19
  }
9
- return { ok: true, localOnly: args.includes("--local-only"), json: args.includes("--json") };
20
+ const selectors = args.flatMap((arg, index) => arg === "--overwrite-client" ? [args[index + 1]] : arg.startsWith("--overwrite-client=") ? [arg.slice(19)] : []);
21
+ if (selectors.length > 1 || (selectors.length && (!args.includes("--overwrite-conflict") || !isRouteClientId(selectors[0])))) {
22
+ return { ok: false, message: "--overwrite-client needs one supported client and --overwrite-conflict." };
23
+ }
24
+ const children: string[] = [];
25
+ let restart: ChildRestartRequest | null = null, restartSeen = false;
26
+ for (let i = 0; i < args.length; i++) {
27
+ const arg = args[i]!;
28
+ if (arg === "--child" || arg.startsWith("--child=")) {
29
+ const value = arg === "--child" ? args[++i] : arg.slice("--child=".length);
30
+ if (value === undefined || !LINK_ID.test(value)) return { ok: false, message: "--child needs a link id of the form lnk_ followed by 16 hex digits (see ocx link status)." };
31
+ if (!children.includes(value)) children.push(value);
32
+ } else if (arg === "--restart-children" || arg.startsWith("--restart-children=")) {
33
+ if (restartSeen) return { ok: false, message: "ocx sync accepts --restart-children once." };
34
+ restartSeen = true;
35
+ const value = arg === "--restart-children" ? "app-server" : arg.slice("--restart-children=".length);
36
+ if (value !== "app-server" && value !== "codex") return { ok: false, message: "--restart-children accepts app-server (default) or codex." };
37
+ restart = value;
38
+ }
39
+ }
40
+ const localOnly = args.includes("--local-only");
41
+ if (localOnly && (children.length > 0 || restartSeen)) return { ok: false, message: "--local-only disables fan-out; it cannot be combined with --child or --restart-children." };
42
+ if (restart === "codex" && !args.includes("--yes")) {
43
+ return { ok: false, message: "--restart-children=codex quits and relaunches the Codex app on each selected Child and ends its conversations; pass --yes." };
44
+ }
45
+ return { ok: true, localOnly, json: args.includes("--json"), children: children.length ? children : null, restartChildren: restart,
46
+ ...(selectors.length ? { overwriteClient: selectors[0] as RouteClientId } : {}) };
10
47
  }
@@ -1,6 +1,7 @@
1
1
  import { runningProxyUpdateHeaders } from "../oauth/login-cli";
2
2
  import { runtimeBaseUrl, RuntimeApiError } from "./runtime-api";
3
3
  import { validateStatus, type LinkStatusPayload } from "./link";
4
+ import { validateChildOps } from "./link-status-child";
4
5
 
5
6
  export type LinkStatusFailure = "home-runtime-not-running" | "home-link-status-unauthorized" | "home-link-status-timeout" | "home-link-status-unavailable" | "home-link-status-invalid";
6
7
  export class LinkStatusError extends Error {
@@ -26,14 +27,29 @@ export async function readHomeLinkStatus(deadlineMs = 5000, deps: {
26
27
  if (controller.signal.aborted) throw new LinkStatusError("home-link-status-timeout");
27
28
  if (!base) throw new LinkStatusError("home-runtime-not-running");
28
29
  let response: Response;
29
- try { response = await (deps.fetchImpl ?? fetch)(`${base}/api/link/status`, { headers: (deps.headers ?? runningProxyUpdateHeaders)(), signal: controller.signal }); }
30
+ // wp2: children=1 adds each row's child block (activity, active job); an older Home ignores the query.
31
+ try { response = await (deps.fetchImpl ?? fetch)(`${base}/api/link/status?children=1`, { headers: (deps.headers ?? runningProxyUpdateHeaders)(), signal: controller.signal }); }
30
32
  catch (cause) { throw new LinkStatusError("home-link-status-unavailable", { cause }); }
31
33
  if (response.status === 401 || response.status === 403) throw new LinkStatusError("home-link-status-unauthorized");
32
34
  if (!response.ok) throw new LinkStatusError("home-link-status-unavailable");
33
35
  let text: string;
34
36
  try { text = await response.text(); } catch (cause) { throw new LinkStatusError("home-link-status-unavailable", { cause }); }
35
- try { return validateStatus(JSON.parse(text)); } catch (cause) { throw new LinkStatusError("home-link-status-invalid", { cause }); }
37
+ try { return validateStatus(withoutInvalidChildBlocks(JSON.parse(text))); } catch (cause) { throw new LinkStatusError("home-link-status-invalid", { cause }); }
36
38
  };
37
39
  try { return await Promise.race([work(), timeout]); }
38
40
  finally { if (timer !== undefined) clearTimeout(timer); controller.abort(); }
39
41
  }
42
+
43
+ /**
44
+ * 040 Revision 6: a row whose child block fails validation reads as a row without one (no busy skip, restarts withheld
45
+ * as activity-unknown); it never fails the whole status read, so the other rows keep their results.
46
+ */
47
+ function withoutInvalidChildBlocks(value: unknown): unknown {
48
+ if (!value || typeof value !== "object" || !Array.isArray((value as { links?: unknown }).links)) return value;
49
+ const links = (value as { links: unknown[] }).links.map((row, index) => {
50
+ if (!row || typeof row !== "object" || Array.isArray(row) || !Object.hasOwn(row, "child")) return row;
51
+ try { validateChildOps((row as { child: unknown }).child, index); return row; }
52
+ catch { const { child: _dropped, ...rest } = row as Record<string, unknown>; return rest; }
53
+ });
54
+ return { ...value, links };
55
+ }
@@ -1,5 +1,5 @@
1
1
  import { getConfigDir } from "../config/paths";
2
- import { acquireSyncGuard, inspectUpdateMarker, inspectUpdateSyncMutex, parentHoldsSyncMutex, refuseSync } from "../update/sync-update-mutex";
2
+ import { acquireSyncGuard, inspectUpdateMarker, inspectUpdateSyncMutex, parentHoldsSyncMutex, refuseSync, staleUpdateMarkerHint } from "../update/sync-update-mutex";
3
3
 
4
4
  /** Hold the home-scoped update/sync mutex until the complete sync operation settles. */
5
5
  export async function withSyncUpdateGuard(run: () => Promise<number>, args: readonly string[] = []): Promise<number> {
@@ -9,7 +9,12 @@ export async function withSyncUpdateGuard(run: () => Promise<number>, args: read
9
9
  while (!parentHoldsSyncMutex(home) && Date.now() < deadline) await new Promise(resolve => setTimeout(resolve, 20));
10
10
  if (!parentHoldsSyncMutex(home)) return refuseSync(inspectUpdateSyncMutex(home) === "sync" ? "sync-in-progress" : "update-in-flight", args);
11
11
  }
12
- if (parentHoldsSyncMutex(home)) return inspectUpdateMarker(home) === "free" ? await run() : refuseSync("update-in-flight", args);
12
+ if (parentHoldsSyncMutex(home)) {
13
+ const detail: { witnessless?: boolean } = {};
14
+ return inspectUpdateMarker(home, { detail }) === "free"
15
+ ? await run()
16
+ : refuseSync("update-in-flight", args, detail.witnessless ? staleUpdateMarkerHint(home) : []);
17
+ }
13
18
  const lease = acquireSyncGuard(home, args);
14
19
  if (lease.kind === "refused") return lease.exit;
15
20
  try {
@@ -226,13 +226,14 @@ export async function requestBoundSystemRestart(
226
226
  * A client runtime under the desktop app or a service answers 409 `restart_supervised` and keeps
227
227
  * serving (OCX-6). Read that small body and return the validated supervisor, or null.
228
228
  */
229
- async function supervisedRefusal(response: Response): Promise<"service" | "desktop" | null> {
229
+ async function supervisedRefusal(response: Response): Promise<"service" | "desktop" | "service-unproven" | null> {
230
230
  try {
231
231
  const read = await readBoundedResponseBytes(response, { maxBytes: 1024, signal: AbortSignal.timeout(SYSTEM_RESTART_REQUEST_TIMEOUT_MS) });
232
232
  if (read.oversized) return null;
233
233
  const body = JSON.parse(new TextDecoder().decode(read.bytes)) as { error?: { code?: unknown; supervisor?: unknown } } | null;
234
234
  if (body?.error?.code !== RESTART_SUPERVISED_ERROR) return null;
235
- return body.error.supervisor === "service" || body.error.supervisor === "desktop" ? body.error.supervisor : null;
235
+ const supervisor = body.error.supervisor;
236
+ return supervisor === "service" || supervisor === "desktop" || supervisor === "service-unproven" ? supervisor : null;
236
237
  } catch {
237
238
  return null;
238
239
  }