@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
@@ -3,6 +3,8 @@ import { homedir } from "node:os";
3
3
  const DEFAULT_OUTPUT_BYTES = 64 * 1024;
4
4
  const MAX_OUTPUT_BYTES = 4 * 1024 * 1024;
5
5
  const TUNNEL_OUTPUT_EXIT_GRACE_MS = 250;
6
+ /** A tapped stderr line longer than this is handed to the tap in pieces, so memory stays bounded. */
7
+ const TAP_LINE_MAX_CHARS = 16 * 1024;
6
8
  const HINT_MAX_CHARS = 160;
7
9
  // Written as escapes on purpose: invisible and bidi controls must never sit literally in source.
8
10
  const ANSI_SEQUENCE = /\u001b\][^\u0007\u001b]*(?:\u0007|\u001b\\)|\u001b\[[0-?]*[ -/]*[@-~]|\u001b[@-_]/g;
@@ -84,22 +86,96 @@ export interface SshRunner {
84
86
  stdin?: string | Uint8Array;
85
87
  timeoutMs?: number;
86
88
  maxOutputBytes?: number;
89
+ /**
90
+ * Opt-in confirmed termination. With a signal, a timeout and an abort share one cleanup:
91
+ * SIGTERM, SIGKILL after RUN_KILL_GRACE_MS, and the call settles once the exit is observed or
92
+ * RUN_KILL_GRACE_MS after the SIGKILL, with SshRunnerError.exitConfirmed saying which.
93
+ * An already aborted signal spawns nothing. Without a signal, behaviour is unchanged.
94
+ */
95
+ signal?: AbortSignal;
87
96
  }): Promise<SshRunResult>;
88
- spawnTunnel(argv: readonly string[]): SshChild;
97
+ spawnTunnel(argv: readonly string[], options?: SshTunnelOptions): SshChild;
98
+ }
99
+
100
+ export interface SshTunnelOptions {
101
+ /**
102
+ * Opt-in SSH capture (src/link/ssh-capture.ts): called with every stderr line as it arrives.
103
+ * Returns whether the line belongs in the stderr text the exit classifier reads; the 64 KiB cap
104
+ * applies to that text only, so verbose ssh output cannot end a healthy tunnel.
105
+ */
106
+ stderrLine?: (line: string) => boolean;
89
107
  }
90
108
 
91
109
  export class SshRunnerError extends Error {
92
- constructor(readonly code: "spawn" | "timeout" | "output_limit" | "decode", message: string, options?: ErrorOptions) {
110
+ /** Set on a confirmed-termination run (see SshRunner.run's signal): was the process seen to exit? */
111
+ exitConfirmed?: boolean;
112
+
113
+ constructor(readonly code: "spawn" | "timeout" | "output_limit" | "decode" | "aborted", message: string, options?: ErrorOptions) {
93
114
  super(message, options);
94
115
  this.name = "SshRunnerError";
95
116
  }
96
117
  }
97
118
 
98
- async function readOutput(stream: ReadableStream<Uint8Array>, maxBytes: number, kill?: () => void, fatalUtf8 = true, exited?: Promise<number>, signal?: AbortSignal): Promise<string> {
119
+ /** SIGTERM to SIGKILL, and SIGKILL to giving up on observing the exit, for confirmed-termination runs. */
120
+ export const RUN_KILL_GRACE_MS = 2_000;
121
+
122
+ export interface SshRunnerClock {
123
+ setTimeout: (callback: () => void, ms: number) => unknown;
124
+ clearTimeout: (timer: unknown) => void;
125
+ }
126
+
127
+ const REAL_CLOCK: SshRunnerClock = {
128
+ setTimeout: (callback, ms) => setTimeout(callback, ms),
129
+ clearTimeout: timer => clearTimeout(timer as ReturnType<typeof setTimeout>),
130
+ };
131
+
132
+ /** Splits decoded stderr into lines for a tap and keeps the lines it accepts. */
133
+ function createLineTap(tap: (line: string) => boolean) {
134
+ const decoder = new TextDecoder("utf-8", { fatal: false });
135
+ let pending = "";
136
+ let kept = "";
137
+ let keptBytes = 0;
138
+ // When a line is longer than TAP_LINE_MAX_CHARS it is offered in pieces; every later piece takes the
139
+ // first piece's decision, so the rest of a debug1: line can never reach the classifier.
140
+ let inherited: boolean | undefined;
141
+ const decide = (text: string): boolean => {
142
+ let keep = true;
143
+ try { keep = tap(text); } catch { /* A failing tap keeps the line, as an untapped stream would. */ }
144
+ return keep;
145
+ };
146
+ const offer = (line: string, complete: boolean): void => {
147
+ const text = line.endsWith("\r") ? line.slice(0, -1) : line;
148
+ const keep = inherited ?? decide(text);
149
+ inherited = complete ? undefined : keep;
150
+ if (!keep) return;
151
+ kept += `${text}\n`;
152
+ keptBytes += Buffer.byteLength(text) + 1;
153
+ };
154
+ const split = (): void => {
155
+ for (let index = pending.indexOf("\n"); index !== -1; index = pending.indexOf("\n")) {
156
+ offer(pending.slice(0, index), true);
157
+ pending = pending.slice(index + 1);
158
+ }
159
+ while (pending.length > TAP_LINE_MAX_CHARS) {
160
+ offer(pending.slice(0, TAP_LINE_MAX_CHARS), false);
161
+ pending = pending.slice(TAP_LINE_MAX_CHARS);
162
+ }
163
+ };
164
+ return {
165
+ push(bytes: Uint8Array): number { pending += decoder.decode(bytes, { stream: true }); split(); return keptBytes; },
166
+ end(): { text: string; bytes: number } {
167
+ pending += decoder.decode(); split(); if (pending) offer(pending, true); pending = "";
168
+ return { text: kept, bytes: keptBytes };
169
+ },
170
+ };
171
+ }
172
+
173
+ async function readOutput(stream: ReadableStream<Uint8Array>, maxBytes: number, kill?: () => void, fatalUtf8 = true, exited?: Promise<number>, signal?: AbortSignal, tap?: (line: string) => boolean): Promise<string> {
99
174
  const reader = stream.getReader();
100
175
  const chunks: Uint8Array[] = [];
101
176
  let total = 0;
102
177
  let finished = false;
178
+ const lines = tap ? createLineTap(tap) : undefined;
103
179
  let timer: ReturnType<typeof setTimeout> | undefined;
104
180
  const cancel = (): void => { void reader.cancel().catch(() => {}); };
105
181
  const onExit = (): void => {
@@ -114,13 +190,13 @@ async function readOutput(stream: ReadableStream<Uint8Array>, maxBytes: number,
114
190
  for (;;) {
115
191
  const next = await reader.read();
116
192
  if (next.done) break;
117
- total += next.value.byteLength;
193
+ total = lines ? lines.push(next.value) : total + next.value.byteLength;
118
194
  if (total > maxBytes) {
119
195
  kill?.();
120
196
  cancel();
121
197
  throw new SshRunnerError("output_limit", `ssh output exceeded ${maxBytes} bytes`);
122
198
  }
123
- chunks.push(next.value);
199
+ if (!lines) chunks.push(next.value);
124
200
  }
125
201
  } finally {
126
202
  finished = true;
@@ -128,6 +204,15 @@ async function readOutput(stream: ReadableStream<Uint8Array>, maxBytes: number,
128
204
  signal?.removeEventListener("abort", cancel);
129
205
  reader.releaseLock();
130
206
  }
207
+ if (lines) {
208
+ // The last line may arrive without a newline; it counts against the cap like any other.
209
+ const { text, bytes } = lines.end();
210
+ if (bytes > maxBytes) {
211
+ kill?.();
212
+ throw new SshRunnerError("output_limit", `ssh output exceeded ${maxBytes} bytes`);
213
+ }
214
+ return text;
215
+ }
131
216
  const bytes = new Uint8Array(total);
132
217
  let offset = 0;
133
218
  for (const chunk of chunks) {
@@ -150,16 +235,17 @@ function defaultKill(process: Bun.Subprocess, signal?: NodeJS.Signals): void {
150
235
  process.kill(signal);
151
236
  }
152
237
 
153
- export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: number; env?: () => SpawnEnv | undefined } = {}): SshRunner {
238
+ export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: number; env?: () => SpawnEnv | undefined; clock?: SshRunnerClock } = {}): SshRunner {
154
239
  const spawn = deps.spawn ?? ((argv, options) => Bun.spawn(argv, options));
155
240
  const defaultTimeoutMs = deps.timeoutMs ?? 30_000;
241
+ const clock = deps.clock ?? REAL_CLOCK;
156
242
  // Read per spawn so a PATH change reaches the next command; Windows passes no env key at all.
157
243
  const spawnEnv = (): { env?: SpawnEnv } => {
158
244
  const env = (deps.env ?? (() => linkSshSpawnEnv()))();
159
245
  return env ? { env } : {};
160
246
  };
161
247
 
162
- const spawnChild = (argv: readonly string[]): SshChild => {
248
+ const spawnChild = (argv: readonly string[], options: SshTunnelOptions = {}): SshChild => {
163
249
  let child: Bun.Subprocess;
164
250
  try {
165
251
  child = spawn([...argv], { stdin: "ignore", stdout: "pipe", stderr: "pipe", ...spawnEnv() });
@@ -167,7 +253,7 @@ export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: nu
167
253
  throw new SshRunnerError("spawn", `could not spawn ${argv[0] ?? "ssh"}`, { cause: error });
168
254
  }
169
255
  const stdout = readOutput(outputStream(child.stdout), DEFAULT_OUTPUT_BYTES, () => defaultKill(child, "SIGTERM"), true, child.exited);
170
- const stderr = readOutput(outputStream(child.stderr), DEFAULT_OUTPUT_BYTES, () => defaultKill(child, "SIGTERM"), false, child.exited);
256
+ const stderr = readOutput(outputStream(child.stderr), DEFAULT_OUTPUT_BYTES, () => defaultKill(child, "SIGTERM"), false, child.exited, undefined, options.stderrLine);
171
257
  void stdout.catch(() => {});
172
258
  void stderr.catch(() => {});
173
259
  return {
@@ -190,6 +276,7 @@ export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: nu
190
276
  if (!Number.isInteger(maxOutputBytes) || maxOutputBytes < 0 || maxOutputBytes > MAX_OUTPUT_BYTES) {
191
277
  throw new SshRunnerError("output_limit", `maxOutputBytes must be an integer between 0 and ${MAX_OUTPUT_BYTES}`);
192
278
  }
279
+ if (options.signal?.aborted) throw new SshRunnerError("aborted", "ssh command was aborted before it started");
193
280
  let child: Bun.Subprocess;
194
281
  try {
195
282
  child = spawn([...argv], {
@@ -205,12 +292,47 @@ export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: nu
205
292
  const cancellation = new AbortController();
206
293
  let stdout: Promise<string> | undefined;
207
294
  let stderr: Promise<string> | undefined;
208
- let timer: ReturnType<typeof setTimeout> | undefined;
295
+ let timer: unknown;
296
+ // Confirmed termination (opt-in through options.signal): one cleanup for timeout and abort.
297
+ const confirmed = options.signal !== undefined;
298
+ let terminating: Promise<never> | undefined;
299
+ const terminationTimers: unknown[] = [];
300
+ let onAbort: (() => void) | undefined;
301
+ const terminate = (code: "timeout" | "aborted"): Promise<never> => {
302
+ if (terminating) return terminating;
303
+ cancellation.abort();
304
+ try { defaultKill(child, "SIGTERM"); } catch { /* already gone */ }
305
+ terminating = new Promise<never>((_, reject) => {
306
+ let settled = false;
307
+ const settle = (exitConfirmed: boolean): void => {
308
+ if (settled) return;
309
+ settled = true;
310
+ for (const pending of terminationTimers.splice(0)) clock.clearTimeout(pending);
311
+ const error = new SshRunnerError(code, code === "timeout" ? `ssh command exceeded ${timeoutMs}ms` : "ssh command was aborted");
312
+ error.exitConfirmed = exitConfirmed;
313
+ reject(error);
314
+ };
315
+ child.exited.then(() => settle(true), () => settle(true));
316
+ terminationTimers.push(clock.setTimeout(() => {
317
+ if (settled) return;
318
+ try { defaultKill(child, "SIGKILL"); } catch { /* already gone */ }
319
+ terminationTimers.push(clock.setTimeout(() => settle(false), RUN_KILL_GRACE_MS));
320
+ }, RUN_KILL_GRACE_MS));
321
+ });
322
+ terminating.catch(() => {});
323
+ return terminating;
324
+ };
209
325
  const timeout = new Promise<never>((_, reject) => {
210
- timer = setTimeout(() => {
326
+ timer = clock.setTimeout(() => {
327
+ if (confirmed) { terminate("timeout").catch(reject); return; }
211
328
  reject(new SshRunnerError("timeout", `ssh command exceeded ${timeoutMs}ms`));
212
329
  }, timeoutMs);
213
330
  });
331
+ const aborted = new Promise<never>((_, reject) => {
332
+ if (!options.signal) return;
333
+ onAbort = () => { terminate("aborted").catch(reject); };
334
+ options.signal.addEventListener("abort", onAbort, { once: true });
335
+ });
214
336
  try {
215
337
  const outStream = outputStream(child.stdout), errStream = outputStream(child.stderr);
216
338
  stdout = readOutput(outStream, maxOutputBytes, undefined, true, undefined, cancellation.signal);
@@ -231,17 +353,22 @@ export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: nu
231
353
  // Observe all rejections immediately, including errors arriving after timeout. One
232
354
  // deadline covers stdin, exit and EOF: an inherited output pipe is still unfinished work.
233
355
  const [, code, out, err] = await Promise.race([
234
- Promise.all([stdin(), child.exited, stdout, stderr]), timeout,
356
+ Promise.all([stdin(), child.exited, stdout, stderr]), timeout, aborted,
235
357
  ]);
358
+ // An exit that lands after a timeout or abort began never turns into a result.
359
+ if (terminating) await terminating;
236
360
  return { code, stdout: out, stderr: err };
237
361
  } catch (error) {
362
+ // Once a timeout or abort began, its own error is the result, after its exit is settled.
363
+ if (terminating) await terminating;
238
364
  cancellation.abort();
239
365
  // Only terminate this local SSH child. A kill failure must not hide the original error.
240
366
  try { defaultKill(child, "SIGTERM"); } catch { /* Preserve the command failure when an already-gone child cannot be signalled. */ }
241
367
  if (error instanceof SshRunnerError) throw error;
242
368
  throw new SshRunnerError("spawn", "ssh command failed", { cause: error });
243
369
  } finally {
244
- if (timer !== undefined) clearTimeout(timer);
370
+ if (timer !== undefined) clock.clearTimeout(timer);
371
+ if (onAbort) options.signal?.removeEventListener("abort", onAbort);
245
372
  void child.exited.catch(() => {});
246
373
  // reader.cancel closes pending reads even if the source's cancel promise never settles.
247
374
  // Do not await stdin or process exit: neither is guaranteed to settle after SIGTERM.
@@ -251,8 +378,8 @@ export function createSshRunner(deps: { spawn?: typeof Bun.spawn; timeoutMs?: nu
251
378
  spawnTunnel,
252
379
  };
253
380
 
254
- function spawnTunnel(argv: readonly string[]): SshChild {
255
- return spawnChild(argv);
381
+ function spawnTunnel(argv: readonly string[], options?: SshTunnelOptions): SshChild {
382
+ return spawnChild(argv, options);
256
383
  }
257
384
  }
258
385
 
@@ -10,7 +10,9 @@ import { isLinkIdle, type LinkActivitySnapshot } from "./child-activity";
10
10
  import { catalogVerdict, type CatalogPull, type CatalogRevision, type CatalogState } from "./child-catalog-freshness";
11
11
  import type { ChildObservation, ChildOp, ChildOperationSummary } from "./child-observations";
12
12
  import type { InstallKind, UpdateRoute } from "./child-update-contract";
13
+ import type { LinkHoldsSummary } from "./ws-activity-holds";
13
14
  import { compareStrictSemver, parseStrictSemver } from "../lib/strict-semver";
15
+ import type { LinkTrafficCounters } from "./traffic";
14
16
 
15
17
  export type LinkWireState = "connecting" | "connected" | "reconnecting" | "failed" | "idle";
16
18
 
@@ -26,12 +28,25 @@ export interface LinkStatusDto {
26
28
  reason: string | null;
27
29
  tunnelPort: number;
28
30
  childKind?: "full" | "ephemeral";
31
+ /** Exclusive links only (structure/remote-link.md, "Explicit route"); absent on every other row. */
32
+ exclusive?: true;
33
+ explicitRoute?: import("./explicit-route").ExplicitRoute;
29
34
  /** Home only: what the link carried from this Child, and the compatibility verdict. */
30
35
  peer?: LinkPeerStatus;
31
36
  /** Home-initiated links on request (`?diagnostics=1`): retry progress and the last failure. */
32
37
  tunnel?: LinkTunnelDiagnostics;
33
38
  /** Home rows on request (`?children=1`): versions, update route, catalog freshness, activity and operations. */
34
39
  child?: LinkChildOpsStatus;
40
+ /** Links with several routes, on request (`?routes=1`): each route's rest and last outcome. */
41
+ routes?: LinkRouteWire[];
42
+ /** The route the proven tunnel uses and when it was proven; null while none is proven. */
43
+ route?: { name: string; index: number; since: string } | null;
44
+ /** Why the link cannot run its routes right now, or null. */
45
+ routeBlocked?: "ssh_client_unsupported" | "stop_unconfirmed" | null;
46
+ /** Rows on request (`?transport=1`): the live link WebSocket counters (design T4 section 9.3). */
47
+ ws?: LinkWsStatus;
48
+ /** On request (`?traffic=1`): body bytes this machine relayed or served for the link since `since`. */
49
+ traffic?: LinkTrafficCounters;
35
50
  }>;
36
51
  child: null | {
37
52
  alias: string;
@@ -59,6 +74,58 @@ function iso(at: number): string {
59
74
  return new Date(at).toISOString();
60
75
  }
61
76
 
77
+ /** One route of a multi-route link on the wire. The class is a fixed word, never ssh output. */
78
+ export interface LinkRouteWire {
79
+ name: string;
80
+ eligibleAt: string | null;
81
+ lastOutcome: { class: "transient" | "readiness" | "grant_unobserved" | "forward" | "auth" | "hostkey"; at: string } | null;
82
+ }
83
+
84
+ /**
85
+ * Add route fields to each link the supervisor runs with several routes. Opt-in like `tunnel`:
86
+ * an older `ocx link status` validates rows key by key. Route names are SSH host aliases; this
87
+ * document is served only to the Home's admin token or dashboard session, never over the relay.
88
+ */
89
+ export function attachLinkRoutes(dto: LinkStatusDto, supervisorStates: readonly LinkTunnelStatus[]): LinkStatusDto {
90
+ const byId = new Map(supervisorStates.map(status => [status.linkId, status]));
91
+ for (const link of dto.links) {
92
+ const status = byId.get(link.id);
93
+ if (!status || status.direction !== "hub-initiated" || !status.routes) continue;
94
+ const { routes, route, blocked } = status.routes;
95
+ link.routes = routes.map(entry => ({
96
+ name: entry.name,
97
+ eligibleAt: entry.eligibleAt === null ? null : iso(entry.eligibleAt),
98
+ lastOutcome: entry.lastOutcome ? { class: entry.lastOutcome.class, at: iso(entry.lastOutcome.at) } : null,
99
+ }));
100
+ link.route = route ? { name: route.name, index: route.index, since: iso(route.since) } : null;
101
+ link.routeBlocked = blocked;
102
+ }
103
+ return dto;
104
+ }
105
+
106
+ /** Why the Home refused a link WebSocket upgrade, as counted (design T4 section 9.3). */
107
+ export type LinkWsRefusal = "aborted" | "draining" | "unauthorized" | "unavailable" | "memory" | "cap" | "failed";
108
+ /** Why a link WebSocket closed: the Home's own fence, or the peer's close code. */
109
+ export type LinkWsCloseReason = "revoked" | "disabled" | "idle" | "age" | "client" | "dropped" | "other";
110
+ /** In memory, display only, reset at restart. */
111
+ export interface LinkWsCounters {
112
+ open: number;
113
+ upgrades: number;
114
+ refused: Partial<Record<LinkWsRefusal, number>>;
115
+ closes: Partial<Record<LinkWsCloseReason, number>>;
116
+ }
117
+ export interface LinkWsStatus extends LinkWsCounters { holds: number }
118
+
119
+ /** `?transport=1`: every row gets `ws`; a Home without counters reports zeros. Rows are the current links only. */
120
+ export function attachLinkTransport(dto: LinkStatusDto, counters: (linkId: string) => LinkWsCounters | null,
121
+ holds: (linkId: string) => number): LinkStatusDto {
122
+ for (const link of dto.links) {
123
+ const current = counters(link.id) ?? { open: 0, upgrades: 0, refused: {}, closes: {} };
124
+ link.ws = { open: current.open, upgrades: current.upgrades, refused: { ...current.refused }, closes: { ...current.closes }, holds: holds(link.id) };
125
+ }
126
+ return dto;
127
+ }
128
+
62
129
  /** Add `tunnel` to each Home-initiated link the supervisor reports. */
63
130
  export function attachLinkTunnelDiagnostics(dto: LinkStatusDto, supervisorStates: readonly LinkTunnelStatus[]): LinkStatusDto {
64
131
  const byId = new Map(supervisorStates.map(status => [status.linkId, status]));
@@ -80,6 +147,12 @@ export function attachLinkTunnelDiagnostics(dto: LinkStatusDto, supervisorStates
80
147
  return dto;
81
148
  }
82
149
 
150
+ /** Add `traffic` to every row (#3023). A Home counts in its hub-link listener, a Child in its link transport. */
151
+ export function attachLinkTraffic(dto: LinkStatusDto, traffic: (linkId: string) => LinkTrafficCounters): LinkStatusDto {
152
+ for (const link of dto.links) link.traffic = traffic(link.id);
153
+ return dto;
154
+ }
155
+
83
156
  /** Add this build's identity and, on a Home, each Child's observed peer status. */
84
157
  export function attachLinkPeers(dto: LinkStatusDto, local: LinkLocalPeer, observation: (linkId: string) => LinkPeerEntry): LinkStatusDto {
85
158
  if (dto.role === "home") {
@@ -99,6 +172,8 @@ export interface LinkChildOpsStatus {
99
172
  activity: { idle: boolean; inFlight: number; lastDataEndAt: number | null };
100
173
  activeJob: { jobId: string; op: ChildOp; state: "queued" | "running" } | null;
101
174
  lastOperation: ChildOperationSummary | null;
175
+ /** Link WebSocket activity holds and their reasons (D8); present only while something holds the link. */
176
+ holds?: LinkHoldsSummary;
102
177
  }
103
178
 
104
179
  export interface LinkChildOpsSources {
@@ -106,6 +181,8 @@ export interface LinkChildOpsSources {
106
181
  peerVersion(linkId: string): string | null; observation(linkId: string): ChildObservation | null;
107
182
  activity(linkId: string): LinkActivitySnapshot | null; catalogPull(linkId: string): CatalogPull | null;
108
183
  revision: CatalogRevision | null; activeJob(linkId: string): LinkChildOpsStatus["activeJob"];
184
+ /** Optional: a Home without link WebSocket holds omits the key on every row. */
185
+ holds?(linkId: string): LinkHoldsSummary | null;
109
186
  }
110
187
 
111
188
  function versionSkew(version: string | null, homeVersion: string): LinkChildOpsStatus["versionSkew"] {
@@ -139,6 +216,7 @@ export function attachLinkChildOps(dto: LinkStatusDto, sources: LinkChildOpsSour
139
216
  const ocxChild = installKind === "ocx-child" || link.childKind === "ephemeral";
140
217
  const pull = latestPull(sources.catalogPull(link.id), cached);
141
218
  const snapshot = sources.activity(link.id);
219
+ const held = sources.holds?.(link.id) ?? null;
142
220
  link.child = {
143
221
  homeVersion: sources.homeVersion, runningVersion, installedVersion, installKind,
144
222
  versionSkew: ocxChild ? "unknown" : versionSkew(installedVersion ?? runningVersion, sources.homeVersion),
@@ -150,6 +228,7 @@ export function attachLinkChildOps(dto: LinkStatusDto, sources: LinkChildOpsSour
150
228
  : { idle: false, inFlight: 0, lastDataEndAt: null },
151
229
  activeJob: sources.activeJob(link.id),
152
230
  lastOperation: cached?.lastOperation ?? null,
231
+ ...(held ? { holds: held } : {}),
153
232
  };
154
233
  }
155
234
  return dto;
@@ -182,10 +261,16 @@ function stateDetails(
182
261
  if (!status || status.state === "client-owned") {
183
262
  return { state: "idle", since: record.createdAt, reason: null };
184
263
  }
264
+ // An unsettled revoke keeps the tunnel down until it is resolved (src/link/operations-journal.ts, revokeSuspendsLink).
265
+ // It comes first: resolving it is the step to take, and an orphan of that link is reaped like any other meanwhile.
266
+ if (status.suspended) return { state: "failed", since: status.suspended.since, reason: "revoke_unsettled" };
185
267
  if (status.orphan === "orphan-unverified") {
186
268
  return { state: "failed", since: record.createdAt, reason: "stale tunnel may hold the port" };
187
269
  }
188
270
  const tunnel = status.state;
271
+ if (status.routes?.blocked === "ssh_client_unsupported" && !status.routes.route) {
272
+ return { state: "failed", since: new Date(tunnel.kind === "idle" ? Date.parse(record.createdAt) : tunnel.since).toISOString(), reason: "ssh_client_unsupported" };
273
+ }
189
274
  const reason = tunnel.kind === "failed" ? tunnel.reason : null;
190
275
  const since = tunnel.kind === "idle" ? record.createdAt : new Date(tunnel.since).toISOString();
191
276
  return { state: asWireState(tunnel), since, reason };
@@ -215,6 +300,8 @@ export function projectLinkStatus(
215
300
  ...stateDetails(record, byId.get(record.id), compensation),
216
301
  tunnelPort: record.tunnelPort,
217
302
  ...(record.childKind ? { childKind: record.childKind } : {}),
303
+ ...(record.exclusive ? { exclusive: true as const } : {}),
304
+ ...(record.explicitRoute ? { explicitRoute: { ...record.explicitRoute } } : {}),
218
305
  ...parity(record.id),
219
306
  }));
220
307
  const childRecord = config.runtimeRole === "client"
package/src/link/store.ts CHANGED
@@ -6,6 +6,7 @@ import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
6
6
  import { hardenSecretDir } from "../lib/windows-secret-acl";
7
7
  import { isLinkPort } from "./ports";
8
8
  import { assertSshAlias } from "./ssh-argv";
9
+ import { parseExplicitRoute, type ExplicitRoute } from "./explicit-route";
9
10
 
10
11
  /**
11
12
  * Persisted machine links. The file names hosts, ports, host-key fingerprints and data-key ids.
@@ -30,6 +31,22 @@ export interface LinkRecord {
30
31
  createdAt: string;
31
32
  remotePlatform?: "posix" | "windows";
32
33
  childKind?: LinkChildKind;
34
+ /**
35
+ * Ordered SSH routes to the same machine, direct routes first and the relay alias last.
36
+ * Absent means exactly [alias]; a list always contains alias, which stays the pinned host-key
37
+ * name (HostKeyAlias) and the destination of every exec operation. Hub-initiated links only.
38
+ */
39
+ routes?: string[];
40
+ /**
41
+ * How ssh reaches alias, passed on the command line for every command and tunnel of this link, so
42
+ * ssh_config cannot change it (src/link/explicit-route.ts). Fixed at enrollment; requires exclusive.
43
+ */
44
+ explicitRoute?: ExplicitRoute;
45
+ /**
46
+ * The link has exactly one route, its alias: no route list, and every route edit is refused.
47
+ * Hub-initiated links only; absent means today's editable route list.
48
+ */
49
+ exclusive?: true;
33
50
  }
34
51
 
35
52
  export interface LinkStore {
@@ -54,7 +71,10 @@ export function newLinkId(): string {
54
71
  return `lnk_${randomBytes(8).toString("hex")}`;
55
72
  }
56
73
 
57
- const RECORD_KEYS = new Set(["id", "alias", "direction", "hostKeyFingerprint", "tunnelPort", "apiKeyId", "createdAt", "remotePlatform", "childKind"]);
74
+ /** Most routes one link may list, the alias included. */
75
+ export const MAX_LINK_ROUTES = 8;
76
+
77
+ const RECORD_KEYS = new Set(["id", "alias", "direction", "hostKeyFingerprint", "tunnelPort", "apiKeyId", "createdAt", "remotePlatform", "childKind", "routes", "explicitRoute", "exclusive"]);
58
78
  const STORE_KEYS = new Set(["version", "listenerPort", "links"]);
59
79
  const API_KEY_ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,255}$/;
60
80
  const FINGERPRINT = /^[A-Z0-9]+:[A-Za-z0-9+/=]{16,128}$/;
@@ -69,6 +89,28 @@ function assertOnlyKeys(raw: Record<string, unknown>, allowed: Set<string>, wher
69
89
  const isListenerPort = (value: unknown): value is number =>
70
90
  typeof value === "number" && Number.isInteger(value) && value >= 1 && value <= 65535;
71
91
 
92
+ /** The routes the supervisor tries, in order. A one-route link is its alias. */
93
+ export function effectiveLinkRoutes(record: Pick<LinkRecord, "alias" | "routes">): string[] {
94
+ return record.routes ? [...record.routes] : [record.alias];
95
+ }
96
+
97
+ /**
98
+ * A valid route list, normalized: exactly [alias] becomes undefined so a one-route link keeps the
99
+ * record an older Home reads. Null when the list is invalid.
100
+ */
101
+ function parseRoutes(value: unknown, alias: string, direction: LinkDirection): string[] | undefined | null {
102
+ if (value === undefined) return undefined;
103
+ if (direction !== "hub-initiated" || !Array.isArray(value) || value.length < 1 || value.length > MAX_LINK_ROUTES) return null;
104
+ const seen = new Set<string>();
105
+ for (const route of value) {
106
+ if (typeof route !== "string" || seen.has(route)) return null;
107
+ try { assertSshAlias(route); } catch { return null; }
108
+ seen.add(route);
109
+ }
110
+ if (!seen.has(alias)) return null;
111
+ return value.length === 1 ? undefined : [...value as string[]];
112
+ }
113
+
72
114
  function parseRecord(value: unknown, index: number): LinkRecord {
73
115
  const fail = (field: string): never => { throw new LinkStoreError(`links[${index}].${field} is invalid`); };
74
116
  if (!value || typeof value !== "object" || Array.isArray(value)) throw new LinkStoreError(`links[${index}] is not an object`);
@@ -86,6 +128,14 @@ function parseRecord(value: unknown, index: number): LinkRecord {
86
128
  if (!isLinkPort(raw.tunnelPort)) fail("tunnelPort");
87
129
  if (typeof raw.apiKeyId !== "string" || !API_KEY_ID.test(raw.apiKeyId)) fail("apiKeyId");
88
130
  if (typeof raw.createdAt !== "string" || Number.isNaN(Date.parse(raw.createdAt))) fail("createdAt");
131
+ const routes = parseRoutes(raw.routes, raw.alias as string, raw.direction as LinkDirection);
132
+ if (routes === null) fail("routes");
133
+ // An exclusive link has one route, its alias; an explicit route is how that one route is reached.
134
+ if (raw.exclusive !== undefined && (raw.exclusive !== true || raw.direction !== "hub-initiated")) fail("exclusive");
135
+ if (raw.exclusive === true && raw.routes !== undefined) fail("routes");
136
+ const explicitRoute = raw.explicitRoute === undefined ? undefined : parseExplicitRoute(raw.explicitRoute);
137
+ if (explicitRoute === null) fail("explicitRoute");
138
+ if (explicitRoute && raw.exclusive !== true) fail("exclusive");
89
139
  return {
90
140
  id: raw.id as string,
91
141
  alias: raw.alias as string,
@@ -96,6 +146,9 @@ function parseRecord(value: unknown, index: number): LinkRecord {
96
146
  createdAt: raw.createdAt as string,
97
147
  ...(raw.remotePlatform === undefined ? {} : { remotePlatform: raw.remotePlatform as "posix" | "windows" }),
98
148
  ...(raw.childKind === undefined ? {} : { childKind: raw.childKind as LinkChildKind }),
149
+ ...(routes ? { routes } : {}),
150
+ ...(explicitRoute ? { explicitRoute } : {}),
151
+ ...(raw.exclusive === true ? { exclusive: true as const } : {}),
99
152
  };
100
153
  }
101
154