@bitkyc08/opencodex 2.100.2 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (561) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/{quota-summary-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +3 -3
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -0,0 +1,117 @@
1
+ import { mkdirSync, unlinkSync } from "node:fs";
2
+ import { join } from "node:path";
3
+ import { atomicWriteFileNoFollow } from "../config/atomic-write";
4
+ import { getConfigDir } from "../config/paths";
5
+ import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
6
+ import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
7
+ import { ROUTE_CLIENT_IDS, isRouteClientId, parseHomeRouteIntentDocument, parseRouteClientIntent, type HomeRouteIntentDocument, type RouteClientId } from "../link/route-intent";
8
+ import type { RouteIntentReceipt } from "./route-intent-contract";
9
+
10
+ export function routeIntentStatePath(): string { return join(getConfigDir(), "route-intent"); }
11
+
12
+ function readJson(path: string, maxBytes = 16 * 1024 * 1024): unknown {
13
+ try { return JSON.parse(readBoundedRegularFileSync(path, maxBytes).toString("utf8")); }
14
+ catch (error) {
15
+ if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
16
+ throw new Error("Local route intent state is unreadable; preserve it for recovery");
17
+ }
18
+ }
19
+
20
+ export function readLocalRouteIntentOff(statePath = routeIntentStatePath()): RouteClientId[] {
21
+ const raw = readJson(join(statePath, "local-off.json"), 64 * 1024);
22
+ if (raw === undefined) return [];
23
+ if (!raw || typeof raw !== "object" || !("version" in raw) || raw.version !== 1 || !("clients" in raw)
24
+ || !Array.isArray(raw.clients) || raw.clients.some(id => !ROUTE_CLIENT_IDS.includes(id))
25
+ || new Set(raw.clients).size !== raw.clients.length) throw new Error("Invalid local route intent opt-outs");
26
+ return raw.clients;
27
+ }
28
+
29
+ export function effectiveRouteIntent(document: HomeRouteIntentDocument, statePath = routeIntentStatePath(), localOff?: readonly RouteClientId[]) {
30
+ const clients = structuredClone(document.clients);
31
+ const sources: RouteIntentReceipt["sources"] = { ...document.sources };
32
+ for (const id of localOff ?? readLocalRouteIntentOff(statePath)) {
33
+ clients[id] = { ...clients[id], enabled: false };
34
+ sources[id] = "local";
35
+ }
36
+ return { clients, sources, selectedClients: ROUTE_CLIENT_IDS.filter(id => clients[id].enabled) };
37
+ }
38
+
39
+ export function writeRouteIntentReceipt(receipt: RouteIntentReceipt, statePath = routeIntentStatePath()): void {
40
+ assertNotRealHomeUnderTest(statePath);
41
+ mkdirSync(statePath, { recursive: true, mode: 0o700 });
42
+ const body = JSON.stringify(receipt);
43
+ if (Buffer.byteLength(body) > 16 * 1024 * 1024) throw new Error("Local route intent receipt is too large");
44
+ atomicWriteFileNoFollow(join(statePath, "receipt.json"), body);
45
+ }
46
+
47
+ export function readRouteIntentReceipt(statePath = routeIntentStatePath()): RouteIntentReceipt | null {
48
+ try { return readRouteIntentReceiptStrict(statePath); } catch { return null; }
49
+ }
50
+
51
+ /** Cleanup must distinguish absence from corrupt, unsafe, or incomplete ownership evidence. */
52
+ export function readRouteIntentReceiptStrict(statePath = routeIntentStatePath()): RouteIntentReceipt | null {
53
+ const raw = readJson(join(statePath, "receipt.json")) as RouteIntentReceipt | undefined;
54
+ if (raw === undefined) return null;
55
+ if (!raw || raw.version !== 1 || !parseHomeRouteIntentDocument(raw.document, { allowNative: true }) || !Array.isArray(raw.outcomes)
56
+ || raw.outcomes.length !== ROUTE_CLIENT_IDS.length || new Set(raw.outcomes.map(row => row?.client)).size !== ROUTE_CLIENT_IDS.length
57
+ || !raw.clients || !raw.sources || !Array.isArray(raw.selectedClients) || new Set(raw.selectedClients).size !== raw.selectedClients.length
58
+ || raw.selectedClients.some(id => !isRouteClientId(id)) || typeof raw.appliedAt !== "string" || !Number.isFinite(Date.parse(raw.appliedAt))
59
+ || (raw.linkId !== undefined && !/^lnk_[0-9a-f]{16}$/.test(raw.linkId))
60
+ || (raw.models !== undefined && (!Array.isArray(raw.models) || raw.models.some(row => !row || typeof row.namespaced !== "string" || typeof row.provider !== "string" || typeof row.id !== "string")))
61
+ || !(raw.appliedRouteIntentDigest === null || (typeof raw.appliedRouteIntentDigest === "string" && /^[0-9a-f]{64}$/.test(raw.appliedRouteIntentDigest)))
62
+ || raw.outcomes.some(row => !row || !isRouteClientId(row.client) || !["current", "stale", "not_installed", "conflict", "failed"].includes(row.outcome))
63
+ || ROUTE_CLIENT_IDS.some(id => !parseRouteClientIntent(raw.clients[id], id) || !["builtin", "default", "device", "native", "local"].includes(raw.sources[id])
64
+ || raw.selectedClients.includes(id) !== raw.clients[id].enabled)) throw new Error("Route intent receipt is malformed; preserve it and repair before disconnect");
65
+ return raw;
66
+ }
67
+
68
+ export function clearRouteIntentReceipt(statePath = routeIntentStatePath()): void {
69
+ assertNotRealHomeUnderTest(statePath);
70
+ try { unlinkSync(join(statePath, "receipt.json")); }
71
+ catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; }
72
+ }
73
+
74
+ /**
75
+ * Link-bound proof that no route apply has begun for one committed Link connection. Connect writes
76
+ * it with the connection; the first route apply removes it before changing any client. Disconnect
77
+ * reads a matching proof as evidence that a missing receipt was never written, so a `--no-sync`
78
+ * enrollment over standalone integrations can still disconnect. Anything unreadable is no proof.
79
+ */
80
+ export interface RouteIntentUnappliedProof { version: 1; linkId: string; connectedAt: string }
81
+ const UNAPPLIED_PROOF = "unapplied.json";
82
+
83
+ export function writeRouteIntentUnappliedProof(linkId: string, connectedAt: string, statePath = routeIntentStatePath()): void {
84
+ if (!/^lnk_[0-9a-f]{16}$/.test(linkId) || !Number.isFinite(Date.parse(connectedAt))) throw new Error("Invalid route intent apply proof");
85
+ assertNotRealHomeUnderTest(statePath);
86
+ mkdirSync(statePath, { recursive: true, mode: 0o700 });
87
+ atomicWriteFileNoFollow(join(statePath, UNAPPLIED_PROOF), JSON.stringify({ version: 1, linkId, connectedAt } satisfies RouteIntentUnappliedProof));
88
+ }
89
+
90
+ export function readRouteIntentUnappliedProof(statePath = routeIntentStatePath()): RouteIntentUnappliedProof | null {
91
+ let raw: unknown;
92
+ try { raw = readJson(join(statePath, UNAPPLIED_PROOF), 4 * 1024); } catch { return null; }
93
+ if (!raw || typeof raw !== "object" || Array.isArray(raw) || Object.keys(raw).sort().join(",") !== "connectedAt,linkId,version") return null;
94
+ const value = raw as Record<string, unknown>;
95
+ return value.version === 1 && typeof value.linkId === "string" && /^lnk_[0-9a-f]{16}$/.test(value.linkId)
96
+ && typeof value.connectedAt === "string" ? { version: 1, linkId: value.linkId, connectedAt: value.connectedAt } : null;
97
+ }
98
+
99
+ export function clearRouteIntentUnappliedProof(statePath = routeIntentStatePath()): void {
100
+ assertNotRealHomeUnderTest(statePath);
101
+ try { unlinkSync(join(statePath, UNAPPLIED_PROOF)); }
102
+ catch (error) { if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error; }
103
+ }
104
+
105
+ /** true opts out; false drops the override and inherits the Home again. Never enables locally. */
106
+ export function setLocalRouteIntentOff(client: RouteClientId, off: boolean, statePath = routeIntentStatePath()): void {
107
+ if (!ROUTE_CLIENT_IDS.includes(client) || typeof off !== "boolean") throw new Error("Invalid local route intent override");
108
+ const clients = new Set(readLocalRouteIntentOff(statePath));
109
+ if (off) clients.add(client); else clients.delete(client);
110
+ assertNotRealHomeUnderTest(statePath);
111
+ mkdirSync(statePath, { recursive: true, mode: 0o700 });
112
+ // Invalidate before publishing the override: failure cannot leave an old success claim.
113
+ const receipt = readRouteIntentReceiptStrict(statePath);
114
+ if (receipt) writeRouteIntentReceipt({ ...receipt, appliedRouteIntentDigest: null,
115
+ outcomes: receipt.outcomes.map(row => row.client === client ? { ...row, outcome: "stale" } : row) }, statePath);
116
+ atomicWriteFileNoFollow(join(statePath, "local-off.json"), JSON.stringify({ version: 1, clients: [...clients].sort() }));
117
+ }
@@ -0,0 +1,65 @@
1
+ import type { OcxClientConnectionConfig } from "../types";
2
+
3
+ export interface RouteIntentTickDeps {
4
+ sync?: () => Promise<unknown>;
5
+ onApplied?: () => void | Promise<void>;
6
+ setTimer?: (callback: () => void, ms: number) => unknown;
7
+ clearTimer?: (timer: unknown) => void;
8
+ }
9
+ export interface RouteIntentTick { stop(): void; requestSync(): Promise<unknown> }
10
+
11
+ /** Periodic and Home-requested applies share one queue and the existing sync ownership fences. */
12
+ export function startRouteIntentTick(connection: OcxClientConnectionConfig, deps: RouteIntentTickDeps = {}): RouteIntentTick {
13
+ if (connection.transport !== "link" || !connection.link) return { stop() {}, requestSync: async () => { throw new Error("not_a_link_child"); } };
14
+ const linkId = connection.link.linkId;
15
+ const sync = deps.sync ?? (async () => {
16
+ const { syncConnectedClient } = await import("../client/connect");
17
+ return syncConnectedClient({ expect: { kind: "link", linkId } });
18
+ });
19
+ const set = deps.setTimer ?? ((callback, ms) => { const timer = setTimeout(callback, ms); timer.unref(); return timer; });
20
+ const clear = deps.clearTimer ?? (timer => clearTimeout(timer as ReturnType<typeof setTimeout>));
21
+ let stopped = false, running = false, queued = false;
22
+ let timer: unknown;
23
+ const waiters: Array<{ resolve: (result: unknown) => void; reject: (error: unknown) => void }> = [];
24
+ const schedule = (ms: number) => {
25
+ if (!stopped) timer = set(() => { timer = undefined; queued = true; void drain(); }, ms);
26
+ };
27
+ const drain = async () => {
28
+ if (stopped || running) return;
29
+ running = true;
30
+ let delay = 60_000;
31
+ try {
32
+ do {
33
+ queued = false;
34
+ const batch = waiters.splice(0);
35
+ try {
36
+ const result = await sync();
37
+ await deps.onApplied?.();
38
+ for (const waiter of batch) waiter.resolve(result);
39
+ delay = 60_000;
40
+ } catch (error) {
41
+ for (const waiter of batch) waiter.reject(error);
42
+ delay = 5_000;
43
+ }
44
+ } while (queued && !stopped);
45
+ } finally { running = false; schedule(delay); }
46
+ };
47
+ schedule(2_000);
48
+ return {
49
+ requestSync() {
50
+ if (stopped) return Promise.reject(new Error("client_runtime_stopping"));
51
+ if (timer !== undefined) clear(timer);
52
+ timer = undefined;
53
+ queued = true;
54
+ const result = new Promise<unknown>((resolve, reject) => waiters.push({ resolve, reject }));
55
+ void drain();
56
+ return result;
57
+ },
58
+ stop() {
59
+ stopped = true; queued = false;
60
+ if (timer !== undefined) clear(timer);
61
+ timer = undefined;
62
+ for (const waiter of waiters.splice(0)) waiter.reject(new Error("client_runtime_stopping"));
63
+ },
64
+ };
65
+ }
@@ -0,0 +1,212 @@
1
+ /** Device-local intent controller. All client mutations go through the existing writers. */
2
+ import { existsSync } from "node:fs";
3
+ import { homedir } from "node:os";
4
+ import { join } from "node:path";
5
+ import { routeClientIntentDigest, routeIntentDigest, ROUTE_CLIENT_IDS, type RouteClientId, type RouteClientIntent } from "../link/route-intent";
6
+ import { isIntegrationClientId, type IntegrationClientId } from "./registry";
7
+ import { readIntegrationState } from "./state";
8
+ import { createIntegrationStateStore } from "./store";
9
+ import { applyIntegrationCoordinated, disableIntegrationCoordinated, overwriteIntegrationCoordinated, refreshIntegrationCoordinated,
10
+ type IntegrationWriteInput, type WriteOutcome } from "./writer";
11
+ import { createAsideProfileContext, asideProfileScope, asideWriteInput, asideRootStore, listAsideProfileStores } from "./aside-profile-context";
12
+ import { asideHomeDir } from "../clients/config-export";
13
+ import { readBoundedRegularFileSync } from "../lib/bounded-file-read";
14
+ import type { RouteClientOutcome, RouteIntentApplyInput, RouteIntentReceipt } from "./route-intent-contract";
15
+ import { effectiveRouteIntent, readRouteIntentReceipt, routeIntentStatePath, writeRouteIntentReceipt } from "./route-intent-state";
16
+ export { clearRouteIntentReceipt, effectiveRouteIntent, readLocalRouteIntentOff, readRouteIntentReceipt, readRouteIntentReceiptStrict, routeIntentStatePath, setLocalRouteIntentOff } from "./route-intent-state";
17
+ export type { RouteClientOutcome, RouteIntentApplyInput, RouteIntentReceipt } from "./route-intent-contract";
18
+
19
+ const flights = new Set<string>();
20
+
21
+ function project(client: RouteClientId, result: WriteOutcome, target: string): RouteClientOutcome {
22
+ return { client, target, outcome: result.ok ? "current" : result.reason === "not_installed" ? "not_installed"
23
+ : result.state === "conflict" ? "conflict" : "failed", message: result.message };
24
+ }
25
+
26
+ async function writeClient(input: RouteIntentApplyInput, bound: IntegrationWriteInput, intent: RouteClientIntent): Promise<RouteClientOutcome> {
27
+ const state = readIntegrationState(bound);
28
+ // An off intent never adopts an unowned block, including foreign blocks.
29
+ if (!intent.enabled && !bound.store?.readRecords()[bound.clientId]) {
30
+ return { client: bound.clientId, outcome: "current", target: state.configPath };
31
+ }
32
+ if (!intent.enabled && input.recoverConflicts && state.state === "conflict") {
33
+ // A durable record is mandatory above; this cannot adopt an unowned foreign block.
34
+ // Overwrite snapshots the edited preimage through the existing private journal. Unsafe
35
+ // paths, blocked containers and unrepresentable contributions retain their ordinary refusal.
36
+ const recovered = await overwriteIntegrationCoordinated(bound, { guard: () => { input.beforeWrite?.(); return null; } });
37
+ if (!recovered.ok) return project(bound.clientId, recovered, state.configPath);
38
+ }
39
+ const operation = !intent.enabled ? disableIntegrationCoordinated
40
+ : input.overwriteConflict ? overwriteIntegrationCoordinated
41
+ : state.state === "absent" ? applyIntegrationCoordinated : refreshIntegrationCoordinated;
42
+ const result = await operation(bound, { guard: () => { input.beforeWrite?.(); return null; } });
43
+ // A refresh of a deleted owned block returns absent. Intent is still on, so that is stale.
44
+ const outcome = project(bound.clientId, result, state.configPath);
45
+ if (intent.enabled && result.ok && result.state === "absent") outcome.outcome = "stale";
46
+ return outcome;
47
+ }
48
+
49
+ function manifestText(root: string): string {
50
+ return readBoundedRegularFileSync(join(root, "accounts.json"), 4 * 1024 * 1024).toString("utf8");
51
+ }
52
+
53
+ async function applyAside(input: RouteIntentApplyInput, intent: RouteClientIntent): Promise<RouteClientOutcome> {
54
+ const root = asideHomeDir(input.env ?? process.env, input.home ?? homedir());
55
+ const ownershipInput = { ...input, port: input.config.port };
56
+ const rootStore = asideRootStore(ownershipInput);
57
+ const legacy = rootStore.readRecordsStrict().aside;
58
+ const owners = listAsideProfileStores(rootStore).flatMap(child => {
59
+ const records = child.store.readRecordsStrict();
60
+ if (Object.keys(records).some(id => id !== "aside")) throw new Error("Aside profile storage names another client");
61
+ return records.aside ? [{ profileId: child.profileId, record: records.aside }] : [];
62
+ });
63
+ const owned = Boolean(legacy) || owners.length > 0;
64
+ // No owned route means off is already proved, even without a usable account manifest.
65
+ if (!intent.enabled && !owned) return { client: "aside", outcome: "current" };
66
+ if (!existsSync(root)) {
67
+ if (owned) throw new Error("Aside installation is missing with retained route ownership");
68
+ return { client: "aside", outcome: "not_installed" };
69
+ }
70
+ const manifest = manifestText(root);
71
+ const ctx = createAsideProfileContext(ownershipInput);
72
+ // A removed manifest entry is not evidence that its owned file was cleaned up.
73
+ if ((legacy && !ctx.profiles.some(profile => profile.configPath === legacy.configPath))
74
+ || owners.some(owner => !ctx.profiles.some(profile => profile.id === owner.profileId && profile.configPath === owner.record.configPath))) {
75
+ throw new Error("Aside route ownership names a profile outside the account manifest");
76
+ }
77
+ if (manifestText(root) !== manifest) throw new Error("Aside account manifest changed during enumeration");
78
+ const raw: unknown = JSON.parse(manifest);
79
+ // Enumeration intentionally hides userIds. Prove that its entire profile roster was
80
+ // derived from the manifest snapshot whose userIds this operation selects.
81
+ const snapshot = raw as { currentAccountId: number; accounts?: Array<{ id: number; name?: string }> };
82
+ const roster = snapshot.accounts ?? [{ id: snapshot.currentAccountId }];
83
+ if (roster.length !== ctx.profiles.length || ctx.profiles.some((profile, index) => {
84
+ const account = roster[index];
85
+ return !account || account.id !== profile.id || (account.id === snapshot.currentAccountId) !== profile.current
86
+ || (typeof account.name === "string" ? account.name : undefined) !== profile.name;
87
+ })) throw new Error("Aside profile enumeration does not match the account identity snapshot");
88
+ const ids = new Map<number, string>();
89
+ if (raw && typeof raw === "object" && "accounts" in raw && Array.isArray(raw.accounts)) {
90
+ for (const account of raw.accounts) {
91
+ if (account && typeof account === "object" && Number.isSafeInteger(account.id) && typeof account.userId === "string") {
92
+ ids.set(account.id, account.userId);
93
+ }
94
+ }
95
+ }
96
+ const accounts = intent.accounts ?? "all";
97
+ const selected = ctx.profiles.filter(profile => accounts === "all" || (Array.isArray(accounts) && accounts.includes(ids.get(profile.id) ?? "")));
98
+ const results: RouteClientOutcome[] = [];
99
+ for (const profile of ctx.profiles) {
100
+ const scope = asideProfileScope(ctx, profile);
101
+ const enabled = intent.enabled && selected.includes(profile) && accounts !== "none";
102
+ if (!enabled && !scope.store.readRecords().aside) continue;
103
+ const bound = await asideWriteInput(ctx, scope);
104
+ results.push(await writeClient({ ...input, beforeWrite: () => {
105
+ input.beforeWrite?.(); scope.assertBoundary();
106
+ if (manifestText(root) !== manifest) throw new Error("Aside account identity changed during route apply");
107
+ } }, bound, { ...intent, enabled }));
108
+ }
109
+ const failure = results.find(row => row.outcome === "failed") ?? results.find(row => row.outcome === "conflict")
110
+ ?? results.find(row => row.outcome !== "current");
111
+ if (failure) return { ...failure, client: "aside" };
112
+ if (intent.enabled && accounts !== "none" && selected.length === 0) {
113
+ return { client: "aside", outcome: "not_installed", message: "No local Aside profile matches the requested userIds" };
114
+ }
115
+ // `--accounts none` (or an off intent) selects no profile: an empty slot list is no target at
116
+ // all, and the receipt and Home record outcome schemas reject an empty one.
117
+ const target = selected.map(profile => `u${profile.id}`).join(",");
118
+ return { client: "aside", outcome: "current", ...(target ? { target } : {}) };
119
+ }
120
+
121
+ async function applyClient(input: RouteIntentApplyInput, client: RouteClientId, intent: RouteClientIntent): Promise<RouteClientOutcome> {
122
+ if (client === "aside") return input.withFileWrites ? input.withFileWrites(() => applyAside(input, intent)) : applyAside(input, intent);
123
+ if (isIntegrationClientId(client)) {
124
+ const write = () => writeClient(input, { clientId: client, config: input.config, port: input.config.port, models: input.models,
125
+ env: input.env, home: input.home, store: input.store, modelNames: intent.modelNames }, intent);
126
+ return input.withFileWrites ? input.withFileWrites(write) : write();
127
+ }
128
+ if (input.applyNative) { input.beforeWrite?.(); return input.applyNative(client, intent); }
129
+ const previous = readRouteIntentReceipt(input.statePath);
130
+ return !intent.enabled && !previous?.clients[client]?.enabled
131
+ ? { client, outcome: "current" }
132
+ : { client, outcome: "failed", message: "This native client needs its existing local ownership adapter" };
133
+ }
134
+
135
+ /** Home and Child share the same local materializer; absent intent never calls this function. */
136
+ export async function materializeRouteIntent(input: RouteIntentApplyInput): Promise<RouteIntentReceipt> {
137
+ const path = input.statePath ?? routeIntentStatePath();
138
+ if (flights.has(path)) throw new Error("Local route intent apply is already running");
139
+ flights.add(path);
140
+ try {
141
+ input = { ...input, document: structuredClone(input.document), config: structuredClone(input.config), models: structuredClone([...input.models]),
142
+ store: input.store ?? createIntegrationStateStore() };
143
+ const effective = effectiveRouteIntent(input.document, path, input.localOff);
144
+ const previous = input.retainSkippedOutcomes ? readRouteIntentReceipt(path) : null;
145
+ const receipt: RouteIntentReceipt = { version: 1, models: input.models, ...(input.linkId ? { linkId: input.linkId } : {}), document: structuredClone(input.document), ...effective,
146
+ outcomes: ROUTE_CLIENT_IDS.map(client => ({ client, outcome: "stale" })),
147
+ appliedRouteIntentDigest: null, appliedAt: (input.now ?? (() => new Date()))().toISOString() };
148
+ // Withdraw the previous digest before any client can change, including a failed/aborted write.
149
+ const saveReceipt = () => input.withReceiptWrite
150
+ ? input.withReceiptWrite(() => writeRouteIntentReceipt(receipt, path)) : writeRouteIntentReceipt(receipt, path);
151
+ saveReceipt();
152
+ for (const client of ROUTE_CLIENT_IDS) {
153
+ if (input.onlyClients && !input.onlyClients.includes(client)) {
154
+ const kept = previous?.linkId === input.linkId
155
+ ? previous?.outcomes.find(row => row.client === client && row.intentDigest === routeClientIntentDigest(input.document, client)) : undefined;
156
+ if (kept) receipt.outcomes[ROUTE_CLIENT_IDS.indexOf(client)] = kept;
157
+ continue;
158
+ }
159
+ input.beforeWrite?.();
160
+ try {
161
+ receipt.outcomes[ROUTE_CLIENT_IDS.indexOf(client)] = { ...await applyClient({ ...input, overwriteConflict: input.overwriteConflict === true && (input.overwriteClient === undefined || input.overwriteClient === client) }, client, effective.clients[client]),
162
+ intentDigest: routeClientIntentDigest(input.document, client),
163
+ ...(effective.sources[client] === "local" ? { source: "local" as const } : {}) };
164
+ } catch {
165
+ input.beforeWrite?.(); // Ownership loss propagates instead of looking like a disk failure.
166
+ receipt.outcomes[ROUTE_CLIENT_IDS.indexOf(client)] = { client, outcome: "failed", intentDigest: routeClientIntentDigest(input.document, client),
167
+ ...(effective.sources[client] === "local" ? { source: "local" as const } : {}), message: "Local client could not be reconciled safely" };
168
+ }
169
+ }
170
+ input.beforeWrite?.();
171
+ // A local opt-out intentionally differs from the Home document; do not claim its digest.
172
+ const locallyChanged = ROUTE_CLIENT_IDS.some(id => effective.sources[id] === "local" && input.document.clients[id].enabled);
173
+ if (!locallyChanged && receipt.outcomes.every(row => row.outcome === "current")) receipt.appliedRouteIntentDigest = routeIntentDigest(input.document);
174
+ saveReceipt();
175
+ return receipt;
176
+ } finally { flights.delete(path); }
177
+ }
178
+
179
+ /**
180
+ * Put a standalone integration back: one still owned, or one the person changed (their own block),
181
+ * is kept as is; one the link disabled is applied again. An uninstalled client has nothing to do.
182
+ */
183
+ async function restoreStandaloneClient(input: RouteIntentApplyInput, client: IntegrationClientId, modelNames?: "alias" | "routed"): Promise<RouteClientOutcome> {
184
+ const bound: IntegrationWriteInput = { clientId: client, config: input.config, port: input.config.port, models: input.models,
185
+ env: input.env, home: input.home, store: input.store, modelNames };
186
+ const state = readIntegrationState(bound);
187
+ if (input.store?.readRecords()[client] || state.state !== "absent") return { client, outcome: "current", target: state.configPath };
188
+ const result = await applyIntegrationCoordinated(bound, { guard: () => { input.beforeWrite?.(); return null; } });
189
+ return result.ok || result.reason === "not_installed" ? { client, outcome: "current", target: state.configPath } : project(client, result, state.configPath);
190
+ }
191
+
192
+ /**
193
+ * Disconnect calls this while it holds its lifecycle fence, before clearing intent receipts.
194
+ * `standalone` names file clients the Child owned before linking; they are restored, not removed.
195
+ */
196
+ export async function cleanupRouteIntent(input: RouteIntentApplyInput,
197
+ standalone: Partial<Record<RouteClientId, { modelNames?: "alias" | "routed" }>> = {}): Promise<RouteClientOutcome[]> {
198
+ const receipt = readRouteIntentReceipt(input.statePath);
199
+ if (!receipt) return [];
200
+ const document = structuredClone(receipt.document);
201
+ for (const id of ROUTE_CLIENT_IDS) document.clients[id].enabled = false;
202
+ const kept = ROUTE_CLIENT_IDS.filter((id): id is IntegrationClientId => isIntegrationClientId(id) && id !== "aside" && Object.hasOwn(standalone, id));
203
+ const outcomes = (await materializeRouteIntent({ ...input, document, overwriteConflict: false,
204
+ onlyClients: ROUTE_CLIENT_IDS.filter(id => isIntegrationClientId(id) && !(kept as readonly string[]).includes(id)) }))
205
+ .outcomes.filter(row => isIntegrationClientId(row.client) && !(kept as readonly string[]).includes(row.client));
206
+ const store = input.store ?? createIntegrationStateStore();
207
+ for (const client of kept) {
208
+ const restore = () => restoreStandaloneClient({ ...input, store }, client, standalone[client]?.modelNames);
209
+ outcomes.push(input.withFileWrites ? await input.withFileWrites(restore) : await restore());
210
+ }
211
+ return outcomes;
212
+ }
@@ -77,6 +77,8 @@ function yamlRefusalReason(
77
77
  return `${configPath} uses YAML source opencodex cannot patch without risking unrelated comments or formatting, so ${outcome}`;
78
78
  }
79
79
  import { withIntegrationWriterLock, type IntegrationWriterLockSeams } from "./writer-lock";
80
+ import { withConfigDirHardeningSettled } from "../config/paths";
81
+ import { WindowsSecretAclSettleTimeoutError } from "../lib/windows-secret-acl";
80
82
 
81
83
  /**
82
84
  * Owned by the planner so a plan can report a refusal without depending on the writer, and
@@ -953,14 +955,19 @@ function withClientLocks(
953
955
  const run = async (heldStoreLock: string | null): Promise<WriteOutcome> => {
954
956
  const refused = await options?.revalidate?.(frozen);
955
957
  if (refused) return refused;
956
- // A profile can appear while revalidation awaits. Acquire its lock and
957
- // repeat the validation before observing or mutating its document.
958
- const required = storeLockFile(frozen);
959
- if (required !== null && required !== heldStoreLock) {
960
- return withIntegrationWriterLock(required, () => run(required), options?.lockSeams, ".lock");
961
- }
962
- // No await between the last store probe and the synchronous transaction.
963
- return operation();
958
+ let required: string | null = null;
959
+ const outcome = await settledTransaction(frozen, () => {
960
+ // A profile can appear while revalidation or ACL admission awaits. Acquire its lock and
961
+ // repeat the validation before observing or mutating its document. The probe sits inside
962
+ // the admitted callback: no await between the last store probe and the transaction.
963
+ required = storeLockFile(frozen);
964
+ if (required !== null && required !== heldStoreLock) return null;
965
+ return operation();
966
+ });
967
+ if (outcome !== null) return outcome;
968
+ const lock = required as string | null;
969
+ if (lock === null) throw new Error("integration store lock probe returned no lock to acquire");
970
+ return withIntegrationWriterLock(lock, () => run(lock), options?.lockSeams, ".lock");
964
971
  };
965
972
  return withIntegrationWriterLock(frozen.resolvedPaths.configPath, () => {
966
973
  // Decide only after the outer lock has actually been acquired.
@@ -970,6 +977,30 @@ function withClientLocks(
970
977
  }, options?.lockSeams, suffix);
971
978
  }
972
979
 
980
+ /**
981
+ * Run one synchronous integration transaction after overlapping config-root ACL work (#7815).
982
+ *
983
+ * The transaction writes ownership records, the journal and snapshots under the integrations
984
+ * store with required ACLs. On Windows a config load can leave the optional config-root harden
985
+ * in flight, and its inheritance work can drop a grant this transaction just applied. The store
986
+ * root is the admission directory: settlement covers its ancestors, so the config-root flight is
987
+ * waited for. An admission that times out never entered the transaction and is refused without a
988
+ * write; a timeout thrown from inside the transaction keeps the transaction's own handling.
989
+ */
990
+ async function settledTransaction<T>(frozen: FrozenIntegrationInput, transaction: () => T): Promise<T | WriteRefused> {
991
+ let entered = false;
992
+ try {
993
+ return await withConfigDirHardeningSettled(frozen.store.root, () => {
994
+ entered = true;
995
+ return transaction();
996
+ });
997
+ } catch (error) {
998
+ if (entered || !(error instanceof WindowsSecretAclSettleTimeoutError)) throw error;
999
+ return refuse(frozen.clientId, "write_failed", "unsafe",
1000
+ "The opencodex config directory was still being secured, so nothing was written. Try again in a moment.");
1001
+ }
1002
+ }
1003
+
973
1004
  async function coordinatedWrite(
974
1005
  input: IntegrationWriteInput,
975
1006
  operation: (frozen: IntegrationWriteInput) => WriteOutcome,
@@ -984,14 +1015,16 @@ async function coordinatedWrite(
984
1015
  ?? staleModelNameRefusal(bound, input.config, operationKind) ?? operation(bound);
985
1016
  if (!spec.writerLock) {
986
1017
  const refused = await options?.revalidate?.(frozen);
987
- return refused ?? guarded(frozen);
1018
+ return refused ?? settledTransaction(frozen, () => guarded(frozen));
988
1019
  }
989
1020
 
990
1021
  // An absent client home is not created merely to acquire a sibling lock.
991
1022
  if (frozen.io.statKind(frozen.resolvedPaths.detectDir) !== "dir") {
992
1023
  const refused = await options?.revalidate?.(frozen);
993
1024
  if (refused) return refused;
994
- if (frozen.io.statKind(frozen.resolvedPaths.detectDir) !== "dir") return guarded(frozen);
1025
+ const absent = await settledTransaction(frozen, () =>
1026
+ frozen.io.statKind(frozen.resolvedPaths.detectDir) !== "dir" ? guarded(frozen) : null);
1027
+ if (absent !== null) return absent;
995
1028
  }
996
1029
  return withClientLocks(
997
1030
  frozen,
@@ -1042,7 +1075,7 @@ export async function restoreIntegrationCoordinated(
1042
1075
  ?? restoreIntegration({ ...frozen, opId: input.opId, confirmDrift: input.confirmDrift });
1043
1076
  if (!spec.writerLock) {
1044
1077
  const refused = await options?.revalidate?.(frozen);
1045
- return refused ?? run();
1078
+ return refused ?? settledTransaction(frozen, run);
1046
1079
  }
1047
1080
  if (frozen.io.statKind(frozen.resolvedPaths.detectDir) !== "dir") {
1048
1081
  return refuse(
@@ -64,3 +64,32 @@ export function formatClientRetryAfter(value: string | number | null | undefined
64
64
  if (seconds === undefined || !Number.isFinite(seconds)) return undefined;
65
65
  return String(Math.min(MAX_CLIENT_RETRY_AFTER_SECONDS, Math.ceil(seconds)));
66
66
  }
67
+
68
+ /**
69
+ * Compact client-facing wait, e.g. "45s", "2m", "3h", "2d", derived from the same
70
+ * clamped seconds {@link formatClientRetryAfter} would write. For client-visible
71
+ * messages that name the earliest retry; scheduling still reads the parsed evidence.
72
+ */
73
+ export function formatClientRetryIn(value: string | number | null | undefined, now = Date.now()): string | undefined {
74
+ const formatted = formatClientRetryAfter(value, now);
75
+ if (formatted === undefined) return undefined;
76
+ const seconds = Math.max(1, Number(formatted));
77
+ if (seconds < 60) return `${seconds}s`;
78
+ const minutes = Math.ceil(seconds / 60);
79
+ if (minutes < 60) return `${minutes}m`;
80
+ const hours = Math.ceil(minutes / 60);
81
+ if (hours < 24) return `${hours}h`;
82
+ return `${Math.ceil(hours / 24)}d`;
83
+ }
84
+
85
+ /**
86
+ * Name the earliest recovery inside a client-visible sentence: " (retry in ~2m)" goes before a
87
+ * trailing period, or at the end when there is none. Unusable advice leaves the message unchanged,
88
+ * so every listener that shows the same refusal shows the same wait.
89
+ */
90
+ export function appendClientRetryIn(message: string, value: string | number | null | undefined, now = Date.now()): string {
91
+ const retryIn = formatClientRetryIn(value, now);
92
+ if (retryIn === undefined) return message;
93
+ const suffix = ` (retry in ~${retryIn})`;
94
+ return message.endsWith(".") ? `${message.slice(0, -1)}${suffix}.` : `${message}${suffix}`;
95
+ }
@@ -651,6 +651,19 @@ export function recordOwnedConfigPath(configDir: string, candidatePath: string):
651
651
  return registerOwnedConfigPath(configDir, candidatePath) === "recorded";
652
652
  }
653
653
 
654
+ /**
655
+ * Read-only: whether the manifest lists `candidatePath` or one of its ancestors ("listed"), lists
656
+ * neither ("unlisted"), or the home has no ownership metadata ("unowned"). Writes nothing; throws
657
+ * {@link ConfigUninstallInProgressError} under an uninstall tombstone, as a registration would.
658
+ */
659
+ export function configPathOwnership(configDir: string, candidatePath: string): "listed" | "unlisted" | "unowned" {
660
+ const current = loadOwnership(configDir) ?? tombstonedManifestWithoutOwner(configDir);
661
+ if (!current) return "unowned";
662
+ if (current.manifest.uninstallStartedAt !== undefined && teardownDepth === 0) throw new ConfigUninstallInProgressError();
663
+ const parts = manifestRelativePath(configDir, candidatePath)?.split("/") ?? [];
664
+ return parts.some((_, index) => current.manifest.paths.includes(parts.slice(0, index + 1).join("/"))) ? "listed" : "unlisted";
665
+ }
666
+
654
667
  function entryExists(path: string): boolean {
655
668
  try {
656
669
  lstatSync(path);
@@ -0,0 +1,28 @@
1
+ import { canonicalHttpOrigin } from "./gui-pair-capability";
2
+
3
+ export const desktopGuiBinding = (config: { runtimeRole?: string; hostname?: string; port: number }): string =>
4
+ JSON.stringify([config.runtimeRole ?? "standalone", config.hostname ?? "127.0.0.1", config.port]);
5
+
6
+ /**
7
+ * Consent is only for this process's configured literal loopback origin, the same bind set
8
+ * `standaloneGuiPairingOrigin` admits: `127.0.0.1` or `::1`. The page may be opened through
9
+ * `localhost`, which is the browser's alias for that literal listener, but a `localhost` BIND is
10
+ * not admitted: `startServer` canonicalizes it to `127.0.0.1` before listening
11
+ * (`src/server/bind-host.ts`), so the configured spelling never names the origin that is served
12
+ * and the printed command could not succeed. No alias is ever normalized into another origin:
13
+ * the returned value is exactly `value`, so every caller's exact-origin, session and CSRF
14
+ * comparison keeps its meaning.
15
+ */
16
+ export function desktopGuiOrigin(config: { runtimeRole?: string; hostname?: string; port: number }, value: string): string | null {
17
+ const bind = config.hostname ?? "127.0.0.1";
18
+ if ((config.runtimeRole ?? "standalone") !== "standalone" || (bind !== "127.0.0.1" && bind !== "::1")) return null;
19
+ if (canonicalHttpOrigin(value) !== value) return null;
20
+ const origin = new URL(value);
21
+ if (origin.protocol !== "http:" || Number(origin.port || "80") !== config.port) return null;
22
+ return origin.hostname === "localhost" || origin.hostname === (bind === "::1" ? "[::1]" : bind) ? value : null;
23
+ }
24
+
25
+ export function hasDesktopForwardingHeaders(req: Request): boolean {
26
+ return [...req.headers.keys()].some(name => name === "forwarded" || name === "x-real-ip"
27
+ || name.startsWith("x-forwarded-") || name.startsWith("tailscale-"));
28
+ }
package/src/lib/errors.ts CHANGED
@@ -214,7 +214,7 @@ export function safetyRefusalCodeFromMessage(text: string): string | undefined {
214
214
  return undefined;
215
215
  }
216
216
 
217
- function isSubscriptionGateMessage(text: string): boolean {
217
+ export function isSubscriptionGateMessage(text: string): boolean {
218
218
  return (
219
219
  text.includes("requires a subscription") ||
220
220
  text.includes("requires subscription") ||
@@ -3,6 +3,7 @@ import { isLocalAttestationSecret } from "./local-management-attestation";
3
3
 
4
4
  export const GUI_PAIR_METHOD = "POST";
5
5
  export const GUI_PAIR_PATH = "/api/gui/pairing-grants";
6
+ export const DESKTOP_GUI_PAIR_PATH = "/api/gui/desktop-pairing-grants";
6
7
  export const GUI_PAIR_CAPABILITY_VERSION = "v2";
7
8
  export const GUI_PAIR_EXPECTED_PID_HEADER = "x-opencodex-gui-pair-expected-pid";
8
9
  export const GUI_PAIR_NONCE_HEADER = "x-opencodex-gui-pair-nonce";
@@ -92,7 +93,7 @@ function capabilityPayload(
92
93
  expiresAt: number,
93
94
  ): string | null {
94
95
  if (!BASE64URL_256.test(nonce)) return null;
95
- if (method !== GUI_PAIR_METHOD || path !== GUI_PAIR_PATH) return null;
96
+ if (method !== GUI_PAIR_METHOD || (path !== GUI_PAIR_PATH && path !== DESKTOP_GUI_PAIR_PATH)) return null;
96
97
  const canonicalOrigin = canonicalGuiBrowserOrigin(browserOrigin);
97
98
  if (!canonicalOrigin || canonicalOrigin !== browserOrigin) return null;
98
99
  if (!Number.isSafeInteger(pid) || pid <= 0) return null;
@@ -1,4 +1,5 @@
1
1
  import { carryReplayRefusal, isNonReplayableResponse, markResponseNonReplayable } from "./upstream-retry";
2
+ import { appendClientRetryIn } from "./client-retry-after";
2
3
  import {
3
4
  ANTHROPIC_ERROR_CODES, ANTHROPIC_ERROR_TYPES, CLAUDE_CONTEXT_OVERFLOW_MESSAGE,
4
5
  CLIENT_ERROR_CONTRACTS, clientErrorCodeMessage, actionableRefusalMessage, isProxyError, attachComboFailureEvidence, carryProxyError, proxyErrorPresentation, comboFailureEvidence, markProxyError, type ProxyErrorPresentation, type ClientErrorContract,
@@ -152,7 +153,9 @@ export async function normalizeMessagesProxyRefusal(req: Request, response: Resp
152
153
  if (message === undefined) throw new Error("Unknown local Messages presentation");
153
154
  const original = await response.clone().json() as Rec;
154
155
  const error = original.error as Rec;
155
- const next = { ...error, message: messagesOverflowPresentation(error.message) ? CLAUDE_CONTEXT_OVERFLOW_MESSAGE : message };
156
+ // A combo refusal keeps the earliest recovery the Responses body names; the header is already clamped seconds.
157
+ const presented = kind === "combo" ? appendClientRetryIn(message, response.headers.get("retry-after")) : message;
158
+ const next = { ...error, message: messagesOverflowPresentation(error.message) ? CLAUDE_CONTEXT_OVERFLOW_MESSAGE : presented };
156
159
  if (kind === "scope") delete (next as Rec).model;
157
160
  const headers = new Headers(response.headers); headers.delete("content-length");
158
161
  const out = carryProxyError(response, carryReplayRefusal(response, new Response(JSON.stringify({ ...original, error: next }), { status: response.status, headers })));